summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorSinan Akman <sinan@writeme.com>2020-04-04 01:16:47 -0400
committerTom Rini <trini@konsulko.com>2021-02-21 18:46:41 -0500
commita2c48cb757bf24d83334f327f9e3ef13d9f0adc6 (patch)
tree292da830d4cadef008b65032318d68a70d3651b2 /board
parentcbc3cd02a138fcb9d6e8bf1c15bbf2468ee1fbc4 (diff)
downloadu-boot-a2c48cb757bf24d83334f327f9e3ef13d9f0adc6.tar.gz
u-boot-a2c48cb757bf24d83334f327f9e3ef13d9f0adc6.tar.xz
u-boot-a2c48cb757bf24d83334f327f9e3ef13d9f0adc6.zip
mpc8379erdb: Convert to DM_MMC
Signed-off-by: Sinan Akman <sinan@writeme.com>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mpc837xerdb/mpc837xerdb.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 81d31f19c4..624e92ef9c 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -139,8 +139,8 @@ int checkboard(void)
int board_early_init_f(void)
{
-#ifdef CONFIG_FSL_SERDES
immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
+#ifdef CONFIG_FSL_SERDES
u32 spridr = in_be32(&immr->sysconf.spridr);
/* we check only part num, and don't look for CPU revisions */
@@ -167,10 +167,16 @@ int board_early_init_f(void)
break;
}
#endif /* CONFIG_FSL_SERDES */
+
+#ifdef CONFIG_FSL_ESDHC
+ clrsetbits_be32(&immr->sysconf.sicrl, SICRL_USB_B, SICRL_USB_B_SD);
+ clrsetbits_be32(&immr->sysconf.sicrh, SICRH_SPI, SICRH_SPI_SD);
+#endif
return 0;
}
#ifdef CONFIG_FSL_ESDHC
+#if !(CONFIG_IS_ENABLED(DM_MMC))
int board_mmc_init(struct bd_info *bd)
{
struct immap __iomem *im = (struct immap __iomem *)CONFIG_SYS_IMMR;
@@ -189,6 +195,7 @@ int board_mmc_init(struct bd_info *bd)
return fsl_esdhc_mmc_init(bd);
}
#endif
+#endif
/*
* Miscellaneous late-boot configurations