1 files changed, 51 insertions, 52 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index d0e3178f8fe9..19eb0479d26d 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -145,8 +145,58 @@ static struct platform_device da850_evm_nandflash_device = {
         .resource       = da850_evm_nandflash_resource,
 };
 
+static struct platform_device *da850_evm_devices[] __initdata = {
+        &da850_evm_nandflash_device,
+        &da850_evm_norflash_device,
+};
+
+#define DA8XX_AEMIF_CE2CFG_OFFSET       0x10
+#define DA8XX_AEMIF_ASIZE_16BIT         0x1
+
+static void __init da850_evm_init_nor(void)
+{
+        void __iomem *aemif_addr;
+
+        aemif_addr = ioremap(DA8XX_AEMIF_CTL_BASE, SZ_32K);
+
+        /* Configure data bus width of CS2 to 16 bit */
+        writel(readl(aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET) |
+                DA8XX_AEMIF_ASIZE_16BIT,
+                aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET);
+
+        iounmap(aemif_addr);
+}
+
 static u32 ui_card_detected;
-static void da850_evm_setup_nor_nand(void);
+
+#if defined(CONFIG_MMC_DAVINCI) || \
+    defined(CONFIG_MMC_DAVINCI_MODULE)
+#define HAS_MMC 1
+#else
+#define HAS_MMC 0
+#endif
+
+static void da850_evm_setup_nor_nand(void)
+{
+        int ret = 0;
+
+        if (ui_card_detected & !HAS_MMC) {
+                ret = da8xx_pinmux_setup(da850_nand_pins);
+                if (ret)
+                        pr_warning("da850_evm_init: nand mux setup failed: "
+                                        "%d\n", ret);
+
+                ret = da8xx_pinmux_setup(da850_nor_pins);
+                if (ret)
+                        pr_warning("da850_evm_init: nor mux setup failed: %d\n",
+                                ret);
+
+                da850_evm_init_nor();
+
+                platform_add_devices(da850_evm_devices,
+                                        ARRAY_SIZE(da850_evm_devices));
+        }
+}
 
 #ifdef CONFIG_DA850_UI_RMII
 static inline void da850_evm_setup_emac_rmii(int rmii_sel)
@@ -249,11 +299,6 @@ static struct davinci_uart_config da850_evm_uart_config __initdata = {
         .enabled_uarts = 0x7,
 };
 
-static struct platform_device *da850_evm_devices[] __initdata = {
-        &da850_evm_nandflash_device,
-        &da850_evm_norflash_device,
-};
-
 /* davinci da850 evm audio machine driver */
 static u8 da850_iis_serializer_direction[] = {
         INACTIVE_MODE,  INACTIVE_MODE,  INACTIVE_MODE,  INACTIVE_MODE,
@@ -324,23 +369,6 @@ static int da850_lcd_hw_init(void)
         return 0;
 }
 
-#define DA8XX_AEMIF_CE2CFG_OFFSET       0x10
-#define DA8XX_AEMIF_ASIZE_16BIT         0x1
-
-static void __init da850_evm_init_nor(void)
-{
-        void __iomem *aemif_addr;
-
-        aemif_addr = ioremap(DA8XX_AEMIF_CTL_BASE, SZ_32K);
-
-        /* Configure data bus width of CS2 to 16 bit */
-        writel(readl(aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET) |
-                DA8XX_AEMIF_ASIZE_16BIT,
-                aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET);
-
-        iounmap(aemif_addr);
-}
-
 /* TPS65070 voltage regulator support */
 
 /* 3.3V */
@@ -488,35 +516,6 @@ static int __init pmic_tps65070_init(void)
                                         ARRAY_SIZE(da850evm_tps65070_info));
 }
 
-#if defined(CONFIG_MMC_DAVINCI) || \
-    defined(CONFIG_MMC_DAVINCI_MODULE)
-#define HAS_MMC 1
-#else
-#define HAS_MMC 0
-#endif
-
-static void da850_evm_setup_nor_nand(void)
-{
-        int ret = 0;
-
-        if (ui_card_detected & !HAS_MMC) {
-                ret = da8xx_pinmux_setup(da850_nand_pins);
-                if (ret)
-                        pr_warning("da850_evm_init: nand mux setup failed: "
-                                        "%d\n", ret);
-
-                ret = da8xx_pinmux_setup(da850_nor_pins);
-                if (ret)
-                        pr_warning("da850_evm_init: nor mux setup failed: %d\n",
-                                ret);
-
-                da850_evm_init_nor();
-
-                platform_add_devices(da850_evm_devices,
-                                        ARRAY_SIZE(da850_evm_devices));
-        }
-}
-
 static const short da850_evm_lcdc_pins[] = {
         DA850_GPIO2_8, DA850_GPIO2_15,
         -1