Skip to contentSkip to conversation

mpc83xx: Use CONFIG_FSL_ESDHC to enable sdhc clk

PATCH New Rini van Zetten 2 participants 2 messages Apr 15, 2010

lore
Share & tools
lore

Rini van Zetten

author
#0 lore raw

PATCH v3 1/1 mpc83xx: Use CONFIG_FSL_ESDHC to enable sdhc clk

Enable eSDHC Clock based on generic CONFIG_FSL_ESDHC define instead of a platform define.
This will enable all the 83xx platforms to use sdhc_clk based on CONFIG_FSL_ESDHC.
It's the same patch as commit 6b9ea08c5010eab5ad1056bc9bf033afb672d9cc for the ppc/85x

Signed-off-by Rini <[email protected]>

---

v3 : changed to new arch/ file location and mail agent issues fixed v2 : added some missed cases in the file

 arch/ppc/cpu/mpc83xx/speed.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
arch/ppc/cpu/mpc83xx/speed.c +5 -5
index bde7e92..d9bc1ca 100644
@@ -116,7 +116,7 @@ int get_clocks(void)
 #if defined(CONFIG_MPC8315)
 	u32 tdm_clk;
 #endif
-#if defined(CONFIG_MPC837x)
+#if defined(ONFIG_FSL_ESDHC)
 	u32 sdhc_clk;
 #endif
 	u32 enc_clk;

@@ -274,7 +274,7 @@ int get_clocks(void)
 		return -7;
 	}
 
-#if defined(CONFIG_MPC837x)
+#if defined(ONFIG_FSL_ESDHC)
 	switch ((sccr & SCCR_SDHCCM) >> SCCR_SDHCCM_SHIFT) {
 	case 0:
 		sdhc_clk = 0;

@@ -321,7 +321,7 @@ int get_clocks(void)
 	i2c1_clk = enc_clk;
 #elif defined(CONFIG_MPC831x)
 	i2c1_clk = enc_clk;
-#elif defined(CONFIG_MPC837x)
+#elif defined(ONFIG_FSL_ESDHC)
 	i2c1_clk = sdhc_clk;
 #endif
 #if !defined(CONFIG_MPC832x)

@@ -455,7 +455,7 @@ int get_clocks(void)
 #if defined(CONFIG_MPC8315)
 	gd->tdm_clk = tdm_clk;
 #endif
-#if defined(CONFIG_MPC837x)
+#if defined(ONFIG_FSL_ESDHC)
 	gd->sdhc_clk = sdhc_clk;
 #endif
 	gd->core_clk = core_clk;

@@ -522,7 +522,7 @@ int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 #if defined(CONFIG_MPC8315)
 	printf("  TDM:                 %-4s MHz\n", strmhz(buf, gd->tdm_clk));
 #endif
-#if defined(CONFIG_MPC837x)
+#if defined(ONFIG_FSL_ESDHC)
 	printf("  SDHC:                %-4s MHz\n", strmhz(buf, gd->sdhc_clk));
 #endif
 #if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)

-- 1.6.3.3

#1 lore raw

PATCH v3 1/1 mpc83xx: Use CONFIG_FSL_ESDHC to enable sdhc clk

Quoted 21 lines · On Thu, 15 Apr 2010 16:03:05 +0200 Rini van Zetten <[email protected]> wrote:

Enable eSDHC Clock based on generic CONFIG_FSL_ESDHC define instead of a platform define.
This will enable all the 83xx platforms to use sdhc_clk based on CONFIG_FSL_ESDHC.
It's the same patch as commit 6b9ea08c5010eab5ad1056bc9bf033afb672d9cc for the ppc/85x

Signed-off-by Rini <[email protected]>

---

v3 : changed to new arch/ file location and mail agent issues fixed v2 : added some missed cases in the file

 arch/ppc/cpu/mpc83xx/speed.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
arch/ppc/cpu/mpc83xx/speed.c +0 -0
index bde7e92..d9bc1ca 100644

arch/ppc/cpu/mpc83xx/speed.c int get_clocks(void) · line 119

Quoted 5 lines
arch/ppc/cpu/mpc83xx/speed.c +1 -1
@@ -116,7 +116,7 @@ int get_clocks(void)
 #if defined(CONFIG_MPC8315)
 	u32 tdm_clk;
 #endif
-#if defined(CONFIG_MPC837x)
+#if defined(ONFIG_FSL_ESDHC)

applied and pushed to u-boot-mpc83xx after fixing up s/(ONFIG/(CONFIG/g.

Kim