1 files changed, 6 insertions, 13 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
index e17db39b97a..839ae97a7fd 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
@@ -32,6 +32,7 @@ static struct resource iic_resources[] = {
 
 static struct platform_device iic_device = {
         .name           = "i2c-sh_mobile",
+        .id             = 0, /* "i2c0" clock */
         .num_resources  = ARRAY_SIZE(iic_resources),
         .resource       = iic_resources,
 };
@@ -176,19 +177,11 @@ static struct platform_device *sh7366_devices[] __initdata = {
 
 static int __init sh7366_devices_setup(void)
 {
-        clk_always_enable("mstp031"); /* TLB */
-        clk_always_enable("mstp030"); /* IC */
-        clk_always_enable("mstp029"); /* OC */
-        clk_always_enable("mstp028"); /* RSMEM */
-        clk_always_enable("mstp026"); /* XYMEM */
-        clk_always_enable("mstp023"); /* INTC3 */
-        clk_always_enable("mstp022"); /* INTC */
-        clk_always_enable("mstp020"); /* SuperHyway */
-        clk_always_enable("mstp109"); /* I2C */
-        clk_always_enable("mstp211"); /* USB */
-        clk_always_enable("mstp207"); /* VEU-2 */
-        clk_always_enable("mstp202"); /* VEU-1 */
-        clk_always_enable("mstp201"); /* VPU */
+        clk_always_enable("rsmem0"); /* RSMEM */
+        clk_always_enable("xymem0"); /* XYMEM */
+        clk_always_enable("veu1"); /* VEU-2 */
+        clk_always_enable("veu0"); /* VEU-1 */
+        clk_always_enable("vpu0"); /* VPU */
 
         platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20);
         platform_resource_setup_memory(&veu0_device, "veu0", 2 << 20);