Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / arch / arm / mach-mx5 / board-mx51_efikamx.c

diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
index f84452f..b7946f8 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_efikamx.c
+++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
@@ -43,18 +43,22 @@
 
 #define        MX51_USB_PLL_DIV_24_MHZ 0x01
 
-#define EFIKAMX_PCBID0         (2*32 + 16)
-#define EFIKAMX_PCBID1         (2*32 + 17)
-#define EFIKAMX_PCBID2         (2*32 + 11)
+#define EFIKAMX_PCBID0         IMX_GPIO_NR(3, 16)
+#define EFIKAMX_PCBID1         IMX_GPIO_NR(3, 17)
+#define EFIKAMX_PCBID2         IMX_GPIO_NR(3, 11)
 
-#define EFIKAMX_BLUE_LED       (2*32 + 13)
-#define EFIKAMX_GREEN_LED      (2*32 + 14)
-#define EFIKAMX_RED_LED                (2*32 + 15)
+#define EFIKAMX_BLUE_LED       IMX_GPIO_NR(3, 13)
+#define EFIKAMX_GREEN_LED      IMX_GPIO_NR(3, 14)
+#define EFIKAMX_RED_LED                IMX_GPIO_NR(3, 15)
 
-#define EFIKAMX_POWER_KEY      (1*32 + 31)
+#define EFIKAMX_POWER_KEY      IMX_GPIO_NR(2, 31)
 
-#define EFIKAMX_SPI_CS0                (3*32 + 24)
-#define EFIKAMX_SPI_CS1                (3*32 + 25)
+#define EFIKAMX_SPI_CS0                IMX_GPIO_NR(4, 24)
+#define EFIKAMX_SPI_CS1                IMX_GPIO_NR(4, 25)
+
+/* board 1.1 doesn't have same reset gpio */
+#define EFIKAMX_RESET1_1       IMX_GPIO_NR(3, 2)
+#define EFIKAMX_RESET          IMX_GPIO_NR(1, 4)
 
 /* the pci ids pin have pull up. they're driven low according to board id */
 #define MX51_PAD_PCBID0        IOMUX_PAD(0x518, 0x130, 3, 0x0,   0, PAD_CTL_PUS_100K_UP)
@@ -90,15 +94,15 @@ static iomux_v3_cfg_t mx51efikamx_pads[] = {
        MX51_PAD_SD2_DATA3__SD2_DATA3,
 
        /* SD/MMC WP/CD */
-       MX51_PAD_GPIO_1_0__ESDHC1_CD,
-       MX51_PAD_GPIO_1_1__ESDHC1_WP,
-       MX51_PAD_GPIO_1_7__ESDHC2_WP,
-       MX51_PAD_GPIO_1_8__ESDHC2_CD,
+       MX51_PAD_GPIO1_0__SD1_CD,
+       MX51_PAD_GPIO1_1__SD1_WP,
+       MX51_PAD_GPIO1_7__SD2_WP,
+       MX51_PAD_GPIO1_8__SD2_CD,
 
        /* leds */
-       MX51_PAD_CSI1_D9__GPIO_3_13,
-       MX51_PAD_CSI1_VSYNC__GPIO_3_14,
-       MX51_PAD_CSI1_HSYNC__GPIO_3_15,
+       MX51_PAD_CSI1_D9__GPIO3_13,
+       MX51_PAD_CSI1_VSYNC__GPIO3_14,
+       MX51_PAD_CSI1_HSYNC__GPIO3_15,
 
        /* power key */
        MX51_PAD_PWRKEY,
@@ -106,10 +110,14 @@ static iomux_v3_cfg_t mx51efikamx_pads[] = {
        /* spi */
        MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI,
        MX51_PAD_CSPI1_MISO__ECSPI1_MISO,
-       MX51_PAD_CSPI1_SS0__GPIO_4_24,
-       MX51_PAD_CSPI1_SS1__GPIO_4_25,
+       MX51_PAD_CSPI1_SS0__GPIO4_24,
+       MX51_PAD_CSPI1_SS1__GPIO4_25,
        MX51_PAD_CSPI1_RDY__ECSPI1_RDY,
        MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK,
+
+       /* reset */
+       MX51_PAD_DI1_PIN13__GPIO3_2,
+       MX51_PAD_GPIO1_4__GPIO1_4,
 };
 
 /* Serial ports */
@@ -140,6 +148,8 @@ static int initialize_otg_port(struct platform_device *pdev)
        void __iomem *usb_base;
        void __iomem *usbother_base;
        usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
+       if (!usb_base)
+               return -ENOMEM;
        usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
 
        /* Set the PHY clock to 19.2MHz */
@@ -296,6 +306,14 @@ static const struct spi_imx_master mx51_efikamx_spi_pdata __initconst = {
        .num_chipselect = ARRAY_SIZE(mx51_efikamx_spi_cs),
 };
 
+void mx51_efikamx_reset(void)
+{
+       if (system_rev == 0x11)
+               gpio_direction_output(EFIKAMX_RESET1_1, 0);
+       else
+               gpio_direction_output(EFIKAMX_RESET, 0);
+}
+
 static void __init mxc_board_init(void)
 {
        mxc_iomux_v3_setup_multiple_pads(mx51efikamx_pads,
@@ -303,11 +321,11 @@ static void __init mxc_board_init(void)
        mx51_efikamx_board_id();
        mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config);
        mxc_init_imx_uart();
-       imx51_add_esdhc(0, NULL);
+       imx51_add_sdhci_esdhc_imx(0, NULL);
 
        /* on < 1.2 boards both SD controllers are used */
        if (system_rev < 0x12) {
-               imx51_add_esdhc(1, NULL);
+               imx51_add_sdhci_esdhc_imx(1, NULL);
                mx51_efikamx_leds[2].default_trigger = "mmc1";
        }
 
@@ -317,6 +335,14 @@ static void __init mxc_board_init(void)
        spi_register_board_info(mx51_efikamx_spi_board_info,
                ARRAY_SIZE(mx51_efikamx_spi_board_info));
        imx51_add_ecspi(0, &mx51_efikamx_spi_pdata);
+
+       if (system_rev == 0x11) {
+               gpio_request(EFIKAMX_RESET1_1, "reset");
+               gpio_direction_output(EFIKAMX_RESET1_1, 1);
+       } else {
+               gpio_request(EFIKAMX_RESET, "reset");
+               gpio_direction_output(EFIKAMX_RESET, 1);
+       }
 }
 
 static void __init mx51_efikamx_timer_init(void)