diff options
| author | Ye Li <ye.li@nxp.com> | 2017-05-22 03:39:48 -0500 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-05-22 03:55:46 -0500 |
| commit | a4461cb2d050d7556fb163b8241a05a76ec42e69 (patch) | |
| tree | ff045af591bdd1b6e98d6d46d79e794236e07d55 | |
| parent | 965249c753cb56df48de578ed97a294ab88fb597 (diff) | |
| download | u-boot-imx-a4461cb2d050d7556fb163b8241a05a76ec42e69.zip u-boot-imx-a4461cb2d050d7556fb163b8241a05a76ec42e69.tar.gz u-boot-imx-a4461cb2d050d7556fb163b8241a05a76ec42e69.tar.bz2 | |
MLK-14958 mx6slevk: Move setup_spi to board_init
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>
(cherry picked from commit 7c1b220f77313d9df84dbaf0da6ac820e85cba9a)
| -rw-r--r-- | board/freescale/mx6slevk/mx6slevk.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index f541425..33e7ef6 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -536,7 +536,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); @@ -545,7 +545,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 */ @@ -626,9 +626,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; } @@ -839,6 +837,10 @@ int board_init(void) #endif #endif +#ifdef CONFIG_MXC_SPI + setup_spi(); +#endif + return 0; } |