ARM: davinci: da8xx: Fix ohci device name

While the clk lookup table is making reference to "ohci"
other subsystems (such as phy) are trying to match "ohci.0"

Since there is a single ohci instance, instead of changing
the clk name, change the dev id to -1, and add the "-da8xx"
postfix to match the driver name that will also be changed
in a subsequent patch.

Signed-off-by: Axel Haslam <ahaslam@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 41459bd91c855af408003bdfebf20b0e497debd3..073c458d0c67a71216de7177241e2157e975b4f3 100644 (file)
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -420,7 +420,7 @@ static struct clk_lookup da830_clks[] = {
        CLK("davinci_mdio.0",   "fck",          &emac_clk),
        CLK(NULL,               "gpio",         &gpio_clk),
        CLK("i2c_davinci.2",    NULL,           &i2c1_clk),
-       CLK("ohci",             "usb11",        &usb11_clk),
+       CLK("ohci-da8xx",       "usb11",        &usb11_clk),
        CLK(NULL,               "emif3",        &emif3_clk),
        CLK(NULL,               "arm",          &arm_clk),
        CLK(NULL,               "rmii",         &rmii_clk),

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 196e262b714745450dc335b4f274f3bd962887d3..396155604e809df8145ee745dcb37001130f4400 100644 (file)
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -503,7 +503,7 @@ static struct clk_lookup da850_clks[] = {
        CLK("da830-mmc.1",      NULL,           &mmcsd1_clk),
        CLK("ti-aemif",         NULL,           &aemif_clk),
        CLK(NULL,               "aemif",        &aemif_clk),
-       CLK("ohci",             "usb11",        &usb11_clk),
+       CLK("ohci-da8xx",       "usb11",        &usb11_clk),
        CLK("musb-da8xx",       "usb20",        &usb20_clk),
        CLK("spi_davinci.0",    NULL,           &spi0_clk),
        CLK("spi_davinci.1",    NULL,           &spi1_clk),

diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index e87ff2b66f1244973d5c4b6067eebbf5a369648f..3b169e4e6e2e887acc44aef968c738eb0a591e3e 100644 (file)
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -39,7 +39,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL),
        OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL),
        OF_DEV_AUXDATA("ti,da850-tilcdc", 0x01e13000, "da8xx_lcdc.0", NULL),
-       OF_DEV_AUXDATA("ti,da830-ohci", 0x01e25000, "ohci", NULL),
+       OF_DEV_AUXDATA("ti,da830-ohci", 0x01e25000, "ohci-da8xx", NULL),
        OF_DEV_AUXDATA("ti,da830-musb", 0x01e00000, "musb-da8xx", NULL),
        OF_DEV_AUXDATA("ti,da830-usb-phy", 0x01c1417c, "da8xx-usb-phy", NULL),
        {}

diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c
index b010e5f80c5fb2da20d1437ea2370d3e6352f7ba..c6feecf7ae242f36ce02ff1c2c43a8c4ad6807d1 100644 (file)
--- a/arch/arm/mach-davinci/usb-da8xx.c
+++ b/arch/arm/mach-davinci/usb-da8xx.c
@@ -109,8 +109,8 @@ static struct resource da8xx_usb11_resources[] = {
 static u64 da8xx_usb11_dma_mask = DMA_BIT_MASK(32);
 
 static struct platform_device da8xx_usb11_device = {
-       .name           = "ohci",
-       .id             = 0,
+       .name           = "ohci-da8xx",
+       .id             = -1,
        .dev = {
                .dma_mask               = &da8xx_usb11_dma_mask,
                .coherent_dma_mask      = DMA_BIT_MASK(32),