Input: bf54x-keys - add infrastructure for keypad wakeups

[linux-2.6] / arch / arm / mach-orion / kurobox_pro-setup.c

diff --git a/arch/arm/mach-orion/kurobox_pro-setup.c b/arch/arm/mach-orion/kurobox_pro-setup.c
index 9bdd987edbb67d5752a0d5763ceebdcce05a61f9..785a07bdf1e24681f63b28a0a603f43a2c89e00e 100644 (file)
--- a/arch/arm/mach-orion/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion/kurobox_pro-setup.c
@@ -17,6 +17,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/i2c.h>
+#include <linux/ata_platform.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
@@ -166,6 +167,13 @@ static struct i2c_board_info __initdata kurobox_pro_i2c_rtc = {
        .addr           = 0x32,
 };
 
+/*****************************************************************************
+ * SATA
+ ****************************************************************************/
+static struct mv_sata_platform_data kurobox_pro_sata_data = {
+       .n_ports        = 2,
+};
+
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
@@ -220,6 +228,7 @@ static void __init kurobox_pro_init(void)
        platform_add_devices(kurobox_pro_devices, ARRAY_SIZE(kurobox_pro_devices));
        i2c_register_board_info(0, &kurobox_pro_i2c_rtc, 1);
        orion_eth_init(&kurobox_pro_eth_data);
+       orion_sata_init(&kurobox_pro_sata_data);
 }
 
 MACHINE_START(KUROBOX_PRO, "Buffalo/Revogear Kurobox Pro")
@@ -231,4 +240,5 @@ MACHINE_START(KUROBOX_PRO, "Buffalo/Revogear Kurobox Pro")
        .map_io         = orion_map_io,
        .init_irq       = orion_init_irq,
        .timer          = &orion_timer,
+       .fixup          = tag_fixup_mem32,
 MACHINE_END