Merge tag 'drm-for-v4.16-part2-fixes' of git://people.freedesktop.org/~airlied/linux

[sfrench/cifs-2.6.git] / arch / arm / mach-davinci / da830.c

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index ed0b7002a9b5938e194f107d8224ec7d1438b245..57ab18cf2a89796f5a0c4f828d95c41f579b13c7 100644 (file)
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -417,7 +417,7 @@ static struct clk_lookup da830_clks[] = {
        CLK("davinci-mcasp.0",  NULL,           &mcasp0_clk),
        CLK("davinci-mcasp.1",  NULL,           &mcasp1_clk),
        CLK("davinci-mcasp.2",  NULL,           &mcasp2_clk),
-       CLK("musb-da8xx",       "usb20",        &usb20_clk),
+       CLK("musb-da8xx",       NULL,           &usb20_clk),
        CLK("cppi41-dmaengine", NULL,           &cppi41_clk),
        CLK(NULL,               "aemif",        &aemif_clk),
        CLK(NULL,               "aintc",        &aintc_clk),
@@ -426,7 +426,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-da8xx",       "usb11",        &usb11_clk),
+       CLK("ohci-da8xx",       NULL,   &usb11_clk),
        CLK(NULL,               "emif3",        &emif3_clk),
        CLK(NULL,               "arm",          &arm_clk),
        CLK(NULL,               "rmii",         &rmii_clk),