Subject: [PATCH] ppc/83xx Use CONFIG_FSL_ESDHC to enable sdhc clk

U-Boot Superseded Rini van Zetten 3 participants 5 messages Apr 7, 2010 – Apr 14, 2010

Share & tools

Rini van Zetten

author

2010-04-07 09:37 UTC #0 lore raw

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/85xx

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

---
  cpu/mpc83xx/speed.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)

cpu/mpc83xx/speed.c +2 -2

index bde7e92..346c391 100644
@@ -455,7 +455,7 @@ int get_clocks(void)
  #if defined(CONFIG_MPC8315)
  	gd->tdm_clk = tdm_clk;
  #endif
-#if defined(CONFIG_MPC837x)
+#if defined(CONFIG_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(CONFIG_FSL_ESDHC)
  	printf("  SDHC:                %-4s MHz\n", strmhz(buf, gd->sdhc_clk));
  #endif
  #if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)

Signature · 1 line

1.6.3.3

Kumar Gala

2010-04-07 13:06 UTC #1 lore raw

Quoted 14 lines · Rini van Zetten

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/85xx
Signed-off-by Rini <[email protected]>
---
 cpu/mpc83xx/speed.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
cpu/mpc83xx/speed.c +0 -0
index bde7e92..346c391 100644

cpu/mpc83xx/speed.c int get_clocks(void) · line 457

Quoted 3 lines

cpu/mpc83xx/speed.c +0 -0

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

you are missing some other cases in this file

Quoted 21 lines

cpu/mpc83xx/speed.c +2 -2

-#if defined(CONFIG_MPC837x)
+#if defined(CONFIG_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(CONFIG_FSL_ESDHC)
 	printf("  SDHC:                %-4s MHz\n", strmhz(buf, gd->sdhc_clk));
 #endif
 #if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)

Signature · 6 lines

1.6.3.3

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Rini van Zetten

author

2010-04-07 13:24 UTC #2 lore raw

Kumar Gala schreef:

Quoted 11 lines · Rini van Zetten

Quoted 10 lines
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/85xx
Signed-off-by Rini <[email protected]>
---
 cpu/mpc83xx/speed.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Quoted 10 lines

cpu/mpc83xx/speed.c int get_clocks(void) · line 457
Quoted 8 lines
cpu/mpc83xx/speed.c +0 -0
index bde7e92..346c391 100644
@@ -455,7 +455,7 @@ int get_clocks(void)
 #if defined(CONFIG_MPC8315)
 	gd->tdm_clk = tdm_clk;
 #endif
you are missing some other cases in this file

You are right, sorry for that. I will repost a new patch.

Quoted 22 lines

cpu/mpc83xx/speed.c +2 -2

-#if defined(CONFIG_MPC837x)
+#if defined(CONFIG_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(CONFIG_FSL_ESDHC)
 	printf("  SDHC:                %-4s MHz\n", strmhz(buf, gd->sdhc_clk));
 #endif
 #if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)

Signature · 6 lines

1.6.3.3

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Rini van Zetten

author

2010-04-07 13:32 UTC #3 lore raw

PATCH v2 1/1 ppc/83xx Use CONFIG_FSL_ESDHC to enable sdhc clk

In reply to Kumar Gala

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

---

v2 : added some missed cases in the file

  cpu/mpc83xx/speed.c |   10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)

cpu/mpc83xx/speed.c +5 -5

index bde7e92..500eef1 100644
@@ -116,7 +116,7 @@ int get_clocks(void)
  #if defined(CONFIG_MPC8315)
  	u32 tdm_clk;
  #endif
-#if defined(CONFIG_MPC837x)
+#if defined(CONFIG_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(CONFIG_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(CONFIG_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(CONFIG_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(CONFIG_FSL_ESDHC)
  	printf("  SDHC:                %-4s MHz\n", strmhz(buf, gd->sdhc_clk));
  #endif
  #if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)

Signature · 1 line

1.6.3.3

Kim Phillips

2010-04-14 02:06 UTC #4 lore raw

PATCH v2 1/1 ppc/83xx Use CONFIG_FSL_ESDHC to enable sdhc clk

Quoted 6 lines · On Wed, 7 Apr 2010 15:32:52 +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]>
---

Hi Rini,

Thanks for this, but I get the following when trying to git am it:

Applying: ppc/83xx Use CONFIG_FSL_ESDHC to enable sdhc clk Using index info to reconstruct a base tree...
error: patch failed: cpu/mpc83xx/speed.c:116
error: cpu/mpc83xx/speed.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 ppc/83xx Use CONFIG_FSL_ESDHC to enable sdhc clk

can you please consult:

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/email-clients.txt;h=945ff3fda4337b089515dfced483fee7b941edcf;hb=HEAD

for how to use your User-Agent: Thunderbird 2.0.0.24 (X11/20100317), and try submitting again? Try the submit-apply cycle by emailing the patch to yourself first, and see if you can apply it successfully.

And whilst you're there, please prepend patch subject with "mpc83xx:" (instead of "ppc/83xx"), and word wrap your commit message to 75 characters, so it is instantly viewable without having to scroll horizontally during a git log session.

Technically you shouldn't have to rebase on top of the latest (today's) arch/ file location changes, but if you do I won't complain.

Thanks,

Kim