add clock bugfix

3 files changed, 50 insertions, 22 deletions

diff --git a/patches.armadillo800/0094-ARM-mach-shmobile-Convert-sh_clk_mstp32_register-to-.patch b/patches.armadillo800/0094-ARM-mach-shmobile-Convert-sh_clk_mstp32_register-to-.patch
index 0b7bb32b076a7e..fcda70d9f18b7b 100644
--- a/patches.armadillo800/0094-ARM-mach-shmobile-Convert-sh_clk_mstp32_register-to-.patch
+++ b/patches.armadillo800/0094-ARM-mach-shmobile-Convert-sh_clk_mstp32_register-to-.patch
@@ -16,16 +16,14 @@ Conflicts:
 
 Signed-off-by: Simon Horman <horms@verge.net.au>
 ---
- arch/arm/mach-shmobile/clock-r8a7740.c | 2 +-
- arch/arm/mach-shmobile/clock-r8a7779.c | 2 +-
- arch/arm/mach-shmobile/clock-sh7367.c  | 2 +-
- arch/arm/mach-shmobile/clock-sh7372.c  | 2 +-
- arch/arm/mach-shmobile/clock-sh7377.c  | 2 +-
- arch/arm/mach-shmobile/clock-sh73a0.c  | 2 +-
+ arch/arm/mach-shmobile/clock-r8a7740.c |    2 +-
+ arch/arm/mach-shmobile/clock-r8a7779.c |    2 +-
+ arch/arm/mach-shmobile/clock-sh7367.c  |    2 +-
+ arch/arm/mach-shmobile/clock-sh7372.c  |    2 +-
+ arch/arm/mach-shmobile/clock-sh7377.c  |    2 +-
+ arch/arm/mach-shmobile/clock-sh73a0.c  |    2 +-
  6 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
-index daf3eac..ad5fccc 100644
 --- a/arch/arm/mach-shmobile/clock-r8a7740.c
 +++ b/arch/arm/mach-shmobile/clock-r8a7740.c
 @@ -636,7 +636,7 @@ void __init r8a7740_clock_init(u8 md_ck)
@@ -37,11 +35,9 @@ index daf3eac..ad5fccc 100644
  
  	for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)
  		ret = clk_register(late_main_clks[k]);
-diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
-index 7d6e9fe..339c62c 100644
 --- a/arch/arm/mach-shmobile/clock-r8a7779.c
 +++ b/arch/arm/mach-shmobile/clock-r8a7779.c
-@@ -162,7 +162,7 @@ void __init r8a7779_clock_init(void)
+@@ -163,7 +163,7 @@ void __init r8a7779_clock_init(void)
  		ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);
  
  	if (!ret)
@@ -50,8 +46,6 @@ index 7d6e9fe..339c62c 100644
  
  	for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)
  		ret = clk_register(late_main_clks[k]);
-diff --git a/arch/arm/mach-shmobile/clock-sh7367.c b/arch/arm/mach-shmobile/clock-sh7367.c
-index 006e7b5..162b791 100644
 --- a/arch/arm/mach-shmobile/clock-sh7367.c
 +++ b/arch/arm/mach-shmobile/clock-sh7367.c
 @@ -344,7 +344,7 @@ void __init sh7367_clock_init(void)
@@ -63,8 +57,6 @@ index 006e7b5..162b791 100644
  
  	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
  
-diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
-index 94d1f88..5a2894b 100644
 --- a/arch/arm/mach-shmobile/clock-sh7372.c
 +++ b/arch/arm/mach-shmobile/clock-sh7372.c
 @@ -704,7 +704,7 @@ void __init sh7372_clock_init(void)
@@ -76,8 +68,6 @@ index 94d1f88..5a2894b 100644
  
  	for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)
  		ret = clk_register(late_main_clks[k]);
-diff --git a/arch/arm/mach-shmobile/clock-sh7377.c b/arch/arm/mach-shmobile/clock-sh7377.c
-index 0798a15..85f2a3e 100644
 --- a/arch/arm/mach-shmobile/clock-sh7377.c
 +++ b/arch/arm/mach-shmobile/clock-sh7377.c
 @@ -355,7 +355,7 @@ void __init sh7377_clock_init(void)
@@ -89,8 +79,6 @@ index 0798a15..85f2a3e 100644
  
  	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
  
-diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
-index 472d1f5..f6788be 100644
 --- a/arch/arm/mach-shmobile/clock-sh73a0.c
 +++ b/arch/arm/mach-shmobile/clock-sh73a0.c
 @@ -612,7 +612,7 @@ void __init sh73a0_clock_init(void)
@@ -102,6 +90,3 @@ index 472d1f5..f6788be 100644
  
  	for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)
  		ret = clk_register(late_main_clks[k]);
--- 
-1.8.0.197.g5a90748
-
diff --git a/patches.marzen/arm-shmobile-r8a7779-correct-tmu-clock-support.patch b/patches.marzen/arm-shmobile-r8a7779-correct-tmu-clock-support.patch
new file mode 100644
index 00000000000000..0c57c003572700
--- /dev/null
+++ b/patches.marzen/arm-shmobile-r8a7779-correct-tmu-clock-support.patch
@@ -0,0 +1,42 @@
+From horms@vergenet.net Mon Feb  4 19:50:02 2013
+From: Simon Horman <horms+renesas@verge.net.au>
+Date: Tue,  5 Feb 2013 12:49:54 +0900
+Subject: ARM: shmobile: r8a7779: Correct TMU clock support
+To: ltsi-dev@lists.linuxfoundation.org
+Cc: Greg KH <gregkh@linuxfoundation.org>
+Message-ID: <1360036194-3787-2-git-send-email-horms+renesas@verge.net.au>
+
+
+During code review it was noticed that the clock value for
+TMU01 was incorrect and the value for TMU02 was missing.
+
+For reference: As of 3.8-rc6 there are no in-tree consumes of these clocks.
+
+Reported-by: Denis Oliver Kropp <dok@directfb.org>
+Reviewed-by: Magnus Damm <damm@opensource.se>
+Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+(cherry picked from commit 58079fa7d54a0929d304054ee759187a2ccd3cdf)
+
+Conflicts:
+	arch/arm/mach-shmobile/clock-r8a7779.c
+
+N.B: commit is in the renesas tree on kernel.org and intended
+for inclusion in 3.9.
+
+Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+---
+ arch/arm/mach-shmobile/clock-r8a7779.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/mach-shmobile/clock-r8a7779.c
++++ b/arch/arm/mach-shmobile/clock-r8a7779.c
+@@ -142,7 +142,8 @@ static struct clk_lookup lookups[] = {
+ 
+ 	/* MSTP32 clocks */
+ 	CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */
+-	CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP016]), /* TMU01 */
++	CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP015]), /* TMU01 */
++	CLKDEV_DEV_ID("sh_tmu.2", &mstp_clks[MSTP014]), /* TMU02 */
+ 	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
+ 	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
+ 	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
diff --git a/series b/series
index b4298a3f690bb7..8b81fb040ba61f 100644
--- a/series
+++ b/series
@@ -304,6 +304,7 @@ patches.marzen/0097-mmc-sh_mmcif-add-regulator-support.patch
 patches.marzen/0098-mmc-sh-mmcif-add-OF-support-make-platform-data-optio.patch
 patches.marzen/0099-mmc-sh_mmcif-support-generic-card-detection.patch
 patches.marzen/arm-mach-shmobile-marzen-defconfig-update.patch
+patches.marzen/arm-shmobile-r8a7779-correct-tmu-clock-support.patch
 
 #############################################################################
 # Armadillo 800 board support