sh: drop static UIO clocks for sh7722, sh7723 and sh7724

The Runtime PM patch for UIO driver implements coarse grained
dynamic power management for UIO devices. With that patch in
place we can get rid of the static clock configuration. Which
in turn makes it possible for cpuidle to enter deeper sleep.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 10 insertions, 10 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
index 5b1bbbe63b1b..ea38b554dc05 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
@@ -164,11 +164,11 @@ static struct clk mstp_clks[] = {
         SH_HWBLK_CLK("2dg0", -1, B_CLK, HWBLK_2DG, 0),
         SH_HWBLK_CLK("siu0", -1, B_CLK, HWBLK_SIU, 0),
         SH_HWBLK_CLK("vou0", -1, B_CLK, HWBLK_VOU, 0),
-        SH_HWBLK_CLK("jpu0", -1, B_CLK, HWBLK_JPU, CLK_ENABLE_ON_INIT),
+        SH_HWBLK_CLK("jpu0", -1, B_CLK, HWBLK_JPU, 0),
         SH_HWBLK_CLK("beu0", -1, B_CLK, HWBLK_BEU, 0),
         SH_HWBLK_CLK("ceu0", -1, B_CLK, HWBLK_CEU, 0),
-        SH_HWBLK_CLK("veu0", -1, B_CLK, HWBLK_VEU, CLK_ENABLE_ON_INIT),
-        SH_HWBLK_CLK("vpu0", -1, B_CLK, HWBLK_VPU, CLK_ENABLE_ON_INIT),
+        SH_HWBLK_CLK("veu0", -1, B_CLK, HWBLK_VEU, 0),
+        SH_HWBLK_CLK("vpu0", -1, B_CLK, HWBLK_VPU, 0),
         SH_HWBLK_CLK("lcdc0", -1, P_CLK, HWBLK_LCDC, 0),
 };
 
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
index e5c63911403c..20a31c2255a8 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
@@ -190,12 +190,12 @@ static struct clk mstp_clks[] = {
         SH_HWBLK_CLK("usb0", -1, B_CLK, HWBLK_USB, 0),
         SH_HWBLK_CLK("2dg0", -1, B_CLK, HWBLK_2DG, 0),
         SH_HWBLK_CLK("siu0", -1, B_CLK, HWBLK_SIU, 0),
-        SH_HWBLK_CLK("veu1", -1, B_CLK, HWBLK_VEU2H1, CLK_ENABLE_ON_INIT),
+        SH_HWBLK_CLK("veu1", -1, B_CLK, HWBLK_VEU2H1, 0),
         SH_HWBLK_CLK("vou0", -1, B_CLK, HWBLK_VOU, 0),
         SH_HWBLK_CLK("beu0", -1, B_CLK, HWBLK_BEU, 0),
         SH_HWBLK_CLK("ceu0", -1, B_CLK, HWBLK_CEU, 0),
-        SH_HWBLK_CLK("veu0", -1, B_CLK, HWBLK_VEU2H0, CLK_ENABLE_ON_INIT),
-        SH_HWBLK_CLK("vpu0", -1, B_CLK, HWBLK_VPU, CLK_ENABLE_ON_INIT),
+        SH_HWBLK_CLK("veu0", -1, B_CLK, HWBLK_VEU2H0, 0),
+        SH_HWBLK_CLK("vpu0", -1, B_CLK, HWBLK_VPU, 0),
         SH_HWBLK_CLK("lcdc0", -1, B_CLK, HWBLK_LCDC, 0),
 };
 
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
index 34611d97378e..a0c4ec25bcbc 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
@@ -204,17 +204,17 @@ static struct clk mstp_clks[] = {
         SH_HWBLK_CLK("2dg0", -1, B_CLK, HWBLK_2DG, 0),
         SH_HWBLK_CLK("sdhi0", -1, B_CLK, HWBLK_SDHI0, 0),
         SH_HWBLK_CLK("sdhi1", -1, B_CLK, HWBLK_SDHI1, 0),
-        SH_HWBLK_CLK("veu1", -1, B_CLK, HWBLK_VEU1, CLK_ENABLE_ON_INIT),
+        SH_HWBLK_CLK("veu1", -1, B_CLK, HWBLK_VEU1, 0),
         SH_HWBLK_CLK("ceu1", -1, B_CLK, HWBLK_CEU1, 0),
         SH_HWBLK_CLK("beu1", -1, B_CLK, HWBLK_BEU1, 0),
         SH_HWBLK_CLK("2ddmac0", -1, SH_CLK, HWBLK_2DDMAC, 0),
         SH_HWBLK_CLK("spu0", -1, B_CLK, HWBLK_SPU, 0),
-        SH_HWBLK_CLK("jpu0", -1, B_CLK, HWBLK_JPU, CLK_ENABLE_ON_INIT),
+        SH_HWBLK_CLK("jpu0", -1, B_CLK, HWBLK_JPU, 0),
         SH_HWBLK_CLK("vou0", -1, B_CLK, HWBLK_VOU, 0),
         SH_HWBLK_CLK("beu0", -1, B_CLK, HWBLK_BEU0, 0),
         SH_HWBLK_CLK("ceu0", -1, B_CLK, HWBLK_CEU0, 0),
-        SH_HWBLK_CLK("veu0", -1, B_CLK, HWBLK_VEU0, CLK_ENABLE_ON_INIT),
-        SH_HWBLK_CLK("vpu0", -1, B_CLK, HWBLK_VPU, CLK_ENABLE_ON_INIT),
+        SH_HWBLK_CLK("veu0", -1, B_CLK, HWBLK_VEU0, 0),
+        SH_HWBLK_CLK("vpu0", -1, B_CLK, HWBLK_VPU, 0),
         SH_HWBLK_CLK("lcdc0", -1, B_CLK, HWBLK_LCDC, 0),
 };