Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 19e874c6d75b58f7707b0b80a7fcbf5dbdf750bc

Authored by Lukasz Majewski
Committed by Stefano Babic
1 parent 1b20e3a281
Exists in smarc_8mq_lf_v2020.04 and in 10 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

DM: mmc: Switch display5 board to use DM_MMC and BLK (USDHC) 

After this commit the display5 device would use eMMC driver supporting
driver model (DM_MMC and BLK).

Signed-off-by: Lukasz Majewski <lukma@denx.de>

Showing 4 changed files with 1 additions and 29 deletions Side-by-side Diff

arch/arm/mach-imx/mx6/Kconfig
Diff comments   View file @ 19e874c
... ... @@ -198,6 +198,7 @@
198 198 bool "LWN DISPLAY5 board"
199 199 select DM
200 200 select DM_I2C
  201 + select DM_MMC
201 202 select DM_GPIO
202 203 select DM_SERIAL
203 204 select SUPPORT_SPL
board/liebherr/display5/common.c
Diff comments   View file @ 19e874c
... ... @@ -109,13 +109,7 @@
109 109 SETUP_IOMUX_PADS(usdhc4_pads);
110 110 }
111 111  
112   -void displ5_set_iomux_usdhc(void)
113   -{
114   - SETUP_IOMUX_PADS(usdhc4_pads);
115   -}
116   -
117 112 #else
118 113 void displ5_set_iomux_usdhc_spl(void) {}
119   -void displ5_set_iomux_usdhc(void) {}
120 114 #endif
board/liebherr/display5/common.h
Diff comments   View file @ 19e874c
... ... @@ -36,7 +36,6 @@
36 36 void displ5_set_iomux_ecspi_spl(void);
37 37 void displ5_set_iomux_ecspi(void);
38 38 void displ5_set_iomux_usdhc_spl(void);
39   -void displ5_set_iomux_usdhc(void);
40 39 void displ5_set_iomux_misc_spl(void);
41 40  
42 41 #endif /* __DISPL5_COMMON_H_ */
board/liebherr/display5/display5.c
Diff comments   View file @ 19e874c
... ... @@ -20,8 +20,6 @@
20 20 #include <asm/mach-imx/iomux-v3.h>
21 21 #include <asm/mach-imx/boot_mode.h>
22 22 #include <asm/mach-imx/spi.h>
23   -#include <mmc.h>
24   -#include <fsl_esdhc_imx.h>
25 23 #include <miiphy.h>
26 24 #include <netdev.h>
27 25 #include <i2c.h>
... ... @@ -141,26 +139,6 @@
141 139 /* Emergency recovery pin */
142 140 MX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),
143 141 };
144   -
145   -#ifdef CONFIG_FSL_ESDHC_IMX
146   -struct fsl_esdhc_cfg usdhc_cfg[1] = {
147   - { USDHC4_BASE_ADDR, 0, 8, },
148   -};
149   -
150   -int board_mmc_getcd(struct mmc *mmc)
151   -{
152   - return 1;
153   -}
154   -
155   -int board_mmc_init(bd_t *bis)
156   -{
157   - displ5_set_iomux_usdhc();
158   -
159   - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
160   -
161   - return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
162   -}
163   -#endif /* CONFIG_FSL_ESDHC_IMX */
164 142  
165 143 static void displ5_setup_ecspi(void)
166 144 {