summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/da8xx-dt.c
diff options
context:
space:
mode:
authorDavid Lechner <david@lechnology.com>2018-05-18 11:48:13 -0500
committerSekhar Nori <nsekhar@ti.com>2018-06-26 15:49:12 +0530
commit5411bad4ea16622d4204dc590567000b194e5cc2 (patch)
treeee48b420da9b5a22303997e2c53b9fae993e1401 /arch/arm/mach-davinci/da8xx-dt.c
parent81df7d85364f28df6e13a76c7119533140a3b176 (diff)
downloadlinux-5411bad4ea16622d4204dc590567000b194e5cc2.tar.bz2
ARM: davinci: da8xx: add new USB PHY clock init using common clock framework
This adds the new USB PHY clock init in mach-davinci/usb-da8xx.c using the new common clock framework drivers. The #ifdefs are needed to prevent compile errors until the entire ARCH_DAVINCI is converted. Signed-off-by: David Lechner <david@lechnology.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/da8xx-dt.c')
-rw-r--r--arch/arm/mach-davinci/da8xx-dt.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 91dd9cb6d113..c4edf051ef9b 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -69,6 +69,12 @@ static void __init da850_init_machine(void)
da850_register_clocks();
+#ifdef CONFIG_COMMON_CLK
+ ret = da8xx_register_usb_phy_clocks();
+ if (ret)
+ pr_warn("%s: USB PHY CLK registration failed: %d\n",
+ __func__, ret);
+#else
ret = da8xx_register_usb20_phy_clk(false);
if (ret)
pr_warn("%s: registering USB 2.0 PHY clock failed: %d",
@@ -77,7 +83,7 @@ static void __init da850_init_machine(void)
if (ret)
pr_warn("%s: registering USB 1.1 PHY clock failed: %d",
__func__, ret);
-
+#endif
ret = da850_register_sata_refclk(sata_refclkpn);
if (ret)
pr_warn("%s: registering SATA REFCLK failed: %d",