t23: fix MSC boot for 1BIT devices

gtxaspec · Dec 7, 2024 · dd2c53e · dd2c53e
1 parent 0ac6eed
commit dd2c53e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/boards.cfg b/boards.cfg
@@ -74,6 +74,7 @@ isvp_t10_msc0               mips   xburst   isvp_t10    ingenic   t10   isvp_t10
 isvp_t20_msc0               mips   xburst   isvp_t20    ingenic   t20   isvp_t20:SPL_MMC_SUPPORT,ENV_IS_IN_MMC,GPT_CREATOR,JZ_MMC_MSC0,SFC_COMMAND,LITE_VERSION
 isvp_t21_msc0               mips   xburst   isvp_t21    ingenic   t21   isvp_t21:SPL_MMC_SUPPORT,ENV_IS_IN_MMC,GPT_CREATOR,JZ_MMC_MSC0,SFC_COMMAND
 isvp_t23n_msc0              mips   xburst   isvp_t23    ingenic   t23   isvp_t23:SPL_MMC_SUPPORT,ENV_IS_IN_MMC,GPT_CREATOR,JZ_MMC_MSC0,SFC_COMMAND,T23N
+isvp_t23n_msc0_mmc1bit      mips   xburst   isvp_t23    ingenic   t23   isvp_t23:SPL_MMC_SUPPORT,ENV_IS_IN_MMC,GPT_CREATOR,JZ_MMC_MSC0,SFC_COMMAND,T23N,JZ_MMC_1BIT
 isvp_t23n_msc0_hp           mips   xburst   isvp_t23    ingenic   t23   isvp_t23:SPL_MMC_SUPPORT,ENV_IS_IN_MMC,GPT_CREATOR,JZ_MMC_MSC0,SFC_COMMAND,T23N,HP
 isvp_t23n_msc0_lp           mips   xburst   isvp_t23    ingenic   t23   isvp_t23:SPL_MMC_SUPPORT,ENV_IS_IN_MMC,GPT_CREATOR,JZ_MMC_MSC0,SFC_COMMAND,T23N,LP
 isvp_t23n_msc1              mips   xburst   isvp_t23    ingenic   t23   isvp_t23:SPL_MMC_SUPPORT,ENV_IS_IN_MMC,GPT_CREATOR,JZ_MMC_MSC1,SFC_COMMAND,T23N

diff --git a/build.sh b/build.sh
@@ -31,7 +31,9 @@ pick_a_soc() {
 		"isvp_t21_sfcnor"		"Ingenic T21N"		\
 		"isvp_t21_msc0"			"Ingenic T21N  MSC0"	\
 		"isvp_t23n_sfcnor"		"Ingenic T23N"		\
+		"isvp_t23n_sfcnor_mmc1bit"	"Ingenic T23N 1BIT MMC"	\
 		"isvp_t23n_msc0"		"Ingenic T23N  MSC0"	\
+		"isvp_t23n_msc0_mmc1bit"	"Ingenic T23N  MSC0 1BIT MMC" \
 		"isvp_t30_sfcnor_lite"		"Ingenic T30L"		\
 		"isvp_t30_sfcnor"		"Ingenic T30N"		\
 		"isvp_t30_sfcnor_ddr128M"	"Ingenic T30X"		\

diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
@@ -347,9 +347,13 @@ static void jz_mmc_init_one(int idx, int controller, uintptr_t base, int clock)
 	mmc->f_max = 24000000;
 #ifdef CONFIG_JZ_MMC_MSC0_PA_8BIT
 	mmc->host_caps = MMC_MODE_8BIT | MMC_MODE_HC;
+#else
+#ifdef CONFIG_JZ_MMC_1BIT
+	mmc->host_caps = MMC_MODE_HS | MMC_MODE_HC;
 #else
 	mmc->host_caps = MMC_MODE_4BIT | MMC_MODE_HC;
 #endif
+#endif
 #else
 	mmc->f_max = 52000000;
 #ifndef CONFIG_FPGA