MLK-14958 mx6slevk: Move setup_spi to board_init
authorYe Li <ye.li@nxp.com>
Mon, 22 May 2017 08:39:48 +0000 (03:39 -0500)
committerJason Liu <jason.hui.liu@nxp.com>
Thu, 2 Nov 2017 18:36:48 +0000 (02:36 +0800)
Current setup_spi is in board_early_init_f which is too early, so gpio_request
can't reserve the gpio successfully. Move it to board_init.

Signed-off-by: Ye Li <ye.li@nxp.com>
board/freescale/mx6slevk/mx6slevk.c

index 7296602..7a11f13 100644 (file)
@@ -538,7 +538,7 @@ void ldo_mode_set(int ldo_bypass)
 
                /* decrease VDDARM for 400Mhz DQ:1.1V, DL:1.275V */
                pmic_clrsetbits(dev, PFUZE100_SW1ABVOL, 0x3f, 0x20);
-               
+
                /* increase VDDSOC to 1.3V */
                pmic_clrsetbits(dev, PFUZE100_SW1CVOL, 0x3f, 0x28);
 
@@ -547,7 +547,7 @@ void ldo_mode_set(int ldo_bypass)
                        vddarm = 0x1b;
                else
                        vddarm = 0x23;
-               
+
                pmic_clrsetbits(dev, PFUZE100_SW1ABVOL, 0x3f, vddarm);
 
                /* decrease VDDSOC to 1.175V */
@@ -628,9 +628,7 @@ int board_ehci_hcd_init(int port)
 int board_early_init_f(void)
 {
        setup_iomux_uart();
-#ifdef CONFIG_MXC_SPI
-       setup_spi();
-#endif
+
        return 0;
 }
 
@@ -841,6 +839,10 @@ int board_init(void)
 #endif
 #endif
 
+#ifdef CONFIG_MXC_SPI
+       setup_spi();
+#endif
+
        return 0;
 }