Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-zesty-kernel.git] / arch / arm / mach-davinci / da8xx-dt.c

diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index cd97f783ecf297002fc5202afbd0f4f67c42f6b5..9ee44da6eb7b85312b30260e29a295b1162f9112 100644 (file)
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -38,6 +38,10 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
                       NULL),
        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-da8xx", NULL),
+       OF_DEV_AUXDATA("ti,da830-musb", 0x01e00000, "musb-da8xx", NULL),
+       OF_DEV_AUXDATA("ti,da830-usb-phy", 0x01c1417c, "da8xx-usb-phy", NULL),
        {}
 };
 
@@ -45,7 +49,19 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
 
 static void __init da850_init_machine(void)
 {
+       int ret;
+
+       ret = da8xx_register_usb20_phy_clk(false);
+       if (ret)
+               pr_warn("%s: registering USB 2.0 PHY clock failed: %d",
+                       __func__, ret);
+       ret = da8xx_register_usb11_phy_clk(false);
+       if (ret)
+               pr_warn("%s: registering USB 1.1 PHY clock failed: %d",
+                       __func__, ret);
+
        of_platform_default_populate(NULL, da850_auxdata_lookup, NULL);
+       davinci_pm_init();
 }
 
 static const char *const da850_boards_compat[] __initconst = {