sh: sh_mobile usbf clock framework support

[safe/jmp/linux-2.6] / arch / sh / kernel / cpu / sh4a / setup-sh7722.c

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index ef77ee1..4953e74 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -62,7 +62,7 @@ static struct resource usbf_resources[] = {
 
 static struct platform_device usbf_device = {
        .name           = "m66592_udc",
-       .id             = -1,
+       .id             = 0, /* "usbf0" clock */
        .dev = {
                .dma_mask               = NULL,
                .coherent_dma_mask      = 0xffffffff,
@@ -87,6 +87,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,
 };
@@ -197,8 +198,6 @@ static int __init sh7722_devices_setup(void)
        clk_always_enable("mstp026"); /* XYMEM */
        clk_always_enable("mstp022"); /* INTC */
        clk_always_enable("mstp020"); /* SuperHyway */
-       clk_always_enable("mstp109"); /* I2C */
-       clk_always_enable("mstp211"); /* USB */
        clk_always_enable("mstp202"); /* VEU */
        clk_always_enable("mstp201"); /* VPU */