Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 105 insertions, 87 deletions

diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index a3e2b49aa39f..8d74318ed495 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -20,6 +20,7 @@
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/usb/musb.h>
+#include <sound/tlv320aic3x.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
@@ -45,8 +46,7 @@ static struct device *mmc_device;
 #define TUSB6010_GPIO_ENABLE    0
 #define TUSB6010_DMACHAN        0x3f
 
-#if defined(CONFIG_USB_TUSB6010) || \
-        defined(CONFIG_USB_TUSB6010_MODULE)
+#ifdef CONFIG_USB_MUSB_TUSB6010
 /*
  * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and
  * 1.5 V voltage regulators of PM companion chip. Companion chip will then
@@ -106,14 +106,13 @@ static void __init n8x0_usb_init(void)
         static char     announce[] __initdata = KERN_INFO "TUSB 6010\n";
 
         /* PM companion chip power control pin */
-        ret = gpio_request(TUSB6010_GPIO_ENABLE, "TUSB6010 enable");
+        ret = gpio_request_one(TUSB6010_GPIO_ENABLE, GPIOF_OUT_INIT_LOW,
+                               "TUSB6010 enable");
         if (ret != 0) {
                 printk(KERN_ERR "Could not get TUSB power GPIO%i\n",
                        TUSB6010_GPIO_ENABLE);
                 return;
         }
-        gpio_direction_output(TUSB6010_GPIO_ENABLE, 0);
-
         tusb_set_power(0);
 
         ret = tusb6010_setup_interface(&tusb_data, TUSB6010_REFCLK_19, 2,
@@ -133,7 +132,7 @@ err:
 
 static void __init n8x0_usb_init(void) {}
 
-#endif /*CONFIG_USB_TUSB6010 */
+#endif /*CONFIG_USB_MUSB_TUSB6010 */
 
 
 static struct omap2_mcspi_device_config p54spi_mcspi_config = {
@@ -183,23 +182,15 @@ static struct mtd_partition onenand_partitions[] = {
         },
 };
 
-static struct omap_onenand_platform_data board_onenand_data = {
-        .cs             = 0,
-        .gpio_irq       = 26,
-        .parts          = onenand_partitions,
-        .nr_parts       = ARRAY_SIZE(onenand_partitions),
-        .flags          = ONENAND_SYNC_READ,
+static struct omap_onenand_platform_data board_onenand_data[] = {
+        {
+                .cs             = 0,
+                .gpio_irq       = 26,
+                .parts          = onenand_partitions,
+                .nr_parts       = ARRAY_SIZE(onenand_partitions),
+                .flags          = ONENAND_SYNC_READ,
+        }
 };
-
-static void __init n8x0_onenand_init(void)
-{
-        gpmc_onenand_init(&board_onenand_data);
-}
-
-#else
-
-static void __init n8x0_onenand_init(void) {}
-
 #endif
 
 #if defined(CONFIG_MENELAUS) &&                                         \
@@ -383,15 +374,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask)
         omap_mmc_notify_cover_event(mmc_device, index, *openp);
 }
 
-void n8x0_mmc_slot1_cover_handler(void *arg, int closed_state)
-{
-        if (mmc_device == NULL)
-                return;
-
-        slot1_cover_open = !closed_state;
-        omap_mmc_notify_cover_event(mmc_device, 0, closed_state);
-}
-
 static int n8x0_mmc_late_init(struct device *dev)
 {
         int r, bit, *openp;
@@ -511,8 +493,12 @@ static struct omap_mmc_platform_data mmc1_data = {
 
 static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC];
 
-void __init n8x0_mmc_init(void)
+static struct gpio n810_emmc_gpios[] __initdata = {
+        { N810_EMMC_VSD_GPIO, GPIOF_OUT_INIT_LOW,  "MMC slot 2 Vddf" },
+        { N810_EMMC_VIO_GPIO, GPIOF_OUT_INIT_LOW,  "MMC slot 2 Vdd"  },
+};
 
+static void __init n8x0_mmc_init(void)
 {
         int err;
 
@@ -529,42 +515,28 @@ void __init n8x0_mmc_init(void)
                 mmc1_data.slots[1].ban_openended = 1;
         }
 
-        err = gpio_request(N8X0_SLOT_SWITCH_GPIO, "MMC slot switch");
+        err = gpio_request_one(N8X0_SLOT_SWITCH_GPIO, GPIOF_OUT_INIT_LOW,
+                               "MMC slot switch");
         if (err)
                 return;
 
-        gpio_direction_output(N8X0_SLOT_SWITCH_GPIO, 0);
-
         if (machine_is_nokia_n810()) {
-                err = gpio_request(N810_EMMC_VSD_GPIO, "MMC slot 2 Vddf");
+                err = gpio_request_array(n810_emmc_gpios,
+                                         ARRAY_SIZE(n810_emmc_gpios));
                 if (err) {
                         gpio_free(N8X0_SLOT_SWITCH_GPIO);
                         return;
                 }
-                gpio_direction_output(N810_EMMC_VSD_GPIO, 0);
-
-                err = gpio_request(N810_EMMC_VIO_GPIO, "MMC slot 2 Vdd");
-                if (err) {
-                        gpio_free(N8X0_SLOT_SWITCH_GPIO);
-                        gpio_free(N810_EMMC_VSD_GPIO);
-                        return;
-                }
-                gpio_direction_output(N810_EMMC_VIO_GPIO, 0);
         }
 
         mmc_data[0] = &mmc1_data;
-        omap2_init_mmc(mmc_data, OMAP24XX_NR_MMC);
+        omap242x_init_mmc(mmc_data);
 }
 #else
 
 void __init n8x0_mmc_init(void)
 {
 }
-
-void n8x0_mmc_slot1_cover_handler(void *arg, int state)
-{
-}
-
 #endif  /* CONFIG_MMC_OMAP */
 
 #ifdef CONFIG_MENELAUS
@@ -614,29 +586,35 @@ static int n8x0_menelaus_late_init(struct device *dev)
         return 0;
 }
 
-static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] = {
+#else
+static int n8x0_menelaus_late_init(struct device *dev)
+{
+        return 0;
+}
+#endif
+
+static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
+        .late_init = n8x0_menelaus_late_init,
+};
+
+static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] __initdata = {
         {
                 I2C_BOARD_INFO("menelaus", 0x72),
                 .irq = INT_24XX_SYS_NIRQ,
+                .platform_data = &n8x0_menelaus_platform_data,
         },
 };
 
-static struct menelaus_platform_data n8x0_menelaus_platform_data = {
-        .late_init = n8x0_menelaus_late_init,
+static struct aic3x_pdata n810_aic33_data __initdata = {
+        .gpio_reset = 118,
 };
 
-static void __init n8x0_menelaus_init(void)
-{
-        n8x0_i2c_board_info_1[0].platform_data = &n8x0_menelaus_platform_data;
-        omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,
-                              ARRAY_SIZE(n8x0_i2c_board_info_1));
-}
-
-#else
-static inline void __init n8x0_menelaus_init(void)
-{
-}
-#endif
+static struct i2c_board_info n810_i2c_board_info_2[] __initdata = {
+        {
+                I2C_BOARD_INFO("tlv320aic3x", 0x18),
+                .platform_data = &n810_aic33_data,
+        },
+};
 
 static void __init n8x0_map_io(void)
 {
@@ -644,19 +622,58 @@ static void __init n8x0_map_io(void)
         omap242x_map_common_io();
 }
 
-static void __init n8x0_init_irq(void)
+static void __init n8x0_init_early(void)
 {
-        omap2_init_common_hw(NULL, NULL);
-        omap_init_irq();
-        omap_gpio_init();
+        omap2_init_common_infrastructure();
+        omap2_init_common_devices(NULL, NULL);
 }
 
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
+        /* I2S codec port pins for McBSP block */
+        OMAP2420_MUX(EAC_AC_SCLK, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
+        OMAP2420_MUX(EAC_AC_FS, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
+        OMAP2420_MUX(EAC_AC_DIN, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
+        OMAP2420_MUX(EAC_AC_DOUT, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
         { .reg_offset = OMAP_MUX_TERMINATOR },
 };
+
+static struct omap_device_pad serial2_pads[] __initdata = {
+        {
+                .name   = "uart3_rx_irrx.uart3_rx_irrx",
+                .flags  = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+                .enable = OMAP_MUX_MODE0,
+                .idle   = OMAP_MUX_MODE3        /* Mux as GPIO for idle */
+        },
+};
+
+static inline void board_serial_init(void)
+{
+        struct omap_board_data bdata;
+
+        bdata.flags = 0;
+        bdata.pads = NULL;
+        bdata.pads_cnt = 0;
+
+        bdata.id = 0;
+        omap_serial_init_port(&bdata);
+
+        bdata.id = 1;
+        omap_serial_init_port(&bdata);
+
+        bdata.id = 2;
+        bdata.pads = serial2_pads;
+        bdata.pads_cnt = ARRAY_SIZE(serial2_pads);
+        omap_serial_init_port(&bdata);
+}
+
 #else
-#define board_mux       NULL
+
+static inline void board_serial_init(void)
+{
+        omap_serial_init();
+}
+
 #endif
 
 static void __init n8x0_init_machine(void)
@@ -665,43 +682,44 @@ static void __init n8x0_init_machine(void)
         /* FIXME: add n810 spi devices */
         spi_register_board_info(n800_spi_board_info,
                                 ARRAY_SIZE(n800_spi_board_info));
-
-        omap_serial_init();
-        n8x0_menelaus_init();
-        n8x0_onenand_init();
+        omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,
+                              ARRAY_SIZE(n8x0_i2c_board_info_1));
+        omap_register_i2c_bus(2, 400, NULL, 0);
+        if (machine_is_nokia_n810())
+                i2c_register_board_info(2, n810_i2c_board_info_2,
+                                        ARRAY_SIZE(n810_i2c_board_info_2));
+        board_serial_init();
+        gpmc_onenand_init(board_onenand_data);
         n8x0_mmc_init();
         n8x0_usb_init();
 }
 
 MACHINE_START(NOKIA_N800, "Nokia N800")
-        .phys_io        = 0x48000000,
-        .io_pg_offst    = ((0xfa000000) >> 18) & 0xfffc,
         .boot_params    = 0x80000100,
-        .map_io         = n8x0_map_io,
         .reserve        = omap_reserve,
-        .init_irq       = n8x0_init_irq,
+        .map_io         = n8x0_map_io,
+        .init_early     = n8x0_init_early,
+        .init_irq       = omap_init_irq,
         .init_machine   = n8x0_init_machine,
         .timer          = &omap_timer,
 MACHINE_END
 
 MACHINE_START(NOKIA_N810, "Nokia N810")
-        .phys_io        = 0x48000000,
-        .io_pg_offst    = ((0xfa000000) >> 18) & 0xfffc,
         .boot_params    = 0x80000100,
-        .map_io         = n8x0_map_io,
         .reserve        = omap_reserve,
-        .init_irq       = n8x0_init_irq,
+        .map_io         = n8x0_map_io,
+        .init_early     = n8x0_init_early,
+        .init_irq       = omap_init_irq,
         .init_machine   = n8x0_init_machine,
         .timer          = &omap_timer,
 MACHINE_END
 
 MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
-        .phys_io        = 0x48000000,
-        .io_pg_offst    = ((0xfa000000) >> 18) & 0xfffc,
         .boot_params    = 0x80000100,
-        .map_io         = n8x0_map_io,
         .reserve        = omap_reserve,
-        .init_irq       = n8x0_init_irq,
+        .map_io         = n8x0_map_io,
+        .init_early     = n8x0_init_early,
+        .init_irq       = omap_init_irq,
         .init_machine   = n8x0_init_machine,
         .timer          = &omap_timer,
 MACHINE_END