Kconfig: USB: Migrate CONFIG_USB_EHCI to CONFIG_USB_EHCI_HCD

[platform/kernel/u-boot.git] / arch / arm / mach-uniphier / clk / clk-ld11.c

diff --git a/arch/arm/mach-uniphier/clk/clk-ld11.c b/arch/arm/mach-uniphier/clk/clk-ld11.c
index 92a0733..0266e7e 100644 (file)
--- a/arch/arm/mach-uniphier/clk/clk-ld11.c
+++ b/arch/arm/mach-uniphier/clk/clk-ld11.c
@@ -5,17 +5,21 @@
  */
 
 #include <common.h>
+#include <spl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
 #include "../init.h"
+#include "../sc64-regs.h"
 #include "../sg-regs.h"
 
+#define SDCTRL_EMMC_HW_RESET   0x59810280
+
 void uniphier_ld11_clk_init(void)
 {
-       if (readl(SG_PINMON0) & BIT(27)) {
-               /* if booted without stand-by MPU */
-
+       /* if booted from a device other than USB, without stand-by MPU */
+       if ((readl(SG_PINMON0) & BIT(27)) &&
+           uniphier_boot_device_raw() != BOOT_DEVICE_USB) {
                writel(1, SG_ETPHYPSHUT);
                writel(1, SG_ETPHYCNT);
 
@@ -25,4 +29,26 @@ void uniphier_ld11_clk_init(void)
                writel(3, SG_ETPHYPSHUT);
                writel(7, SG_ETPHYCNT);
        }
+
+       /* TODO: use "mmc-pwrseq-emmc" */
+       writel(1, SDCTRL_EMMC_HW_RESET);
+
+#ifdef CONFIG_USB_EHCI_HCD
+       {
+               /* FIXME: the current clk driver can not handle parents */
+               u32 tmp;
+               int ch;
+
+               tmp = readl(SC_CLKCTRL4);
+               tmp |= SC_CLKCTRL4_MIO | SC_CLKCTRL4_STDMAC;
+               writel(tmp, SC_CLKCTRL4);
+
+               for (ch = 0; ch < 3; ch++) {
+                       void __iomem *phyctrl = (void __iomem *)SG_USBPHYCTRL;
+
+                       writel(0x82280600, phyctrl + 8 * ch);
+                       writel(0x00000106, phyctrl + 8 * ch + 4);
+               }
+       }
+#endif
 }