usb: omap: Move the usb phy code to the usb/phy directory
authorDan Murphy <dmurphy@ti.com>
Fri, 11 Oct 2013 17:28:16 +0000 (12:28 -0500)
committerMarek Vasut <marex@denx.de>
Sun, 20 Oct 2013 21:42:41 +0000 (23:42 +0200)
Moving the usb/phy code from xhci-omap to the usb/phy directory
and moving the associated phy code over to the new file.

Newer TI processors adding xHCI support will have different PHY configurations
so therefore abstracting this code away will prevent messing around with the
xhci-omap file itself.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
drivers/usb/host/xhci-omap.c
drivers/usb/phy/Makefile
drivers/usb/phy/omap_usb_phy.c [new file with mode: 0644]
include/linux/usb/xhci-omap.h

index 4f98c777a424612be2123db8788ece82105d071d..7292ed817e2a2ce3eff045730d89a911ae9b54d6 100644 (file)
@@ -27,161 +27,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static struct omap_xhci omap;
 
-struct usb_dpll_params {
-       u16     m;
-       u8      n;
-       u8      freq:3;
-       u8      sd;
-       u32     mf;
-};
-
-#define        NUM_USB_CLKS            6
-
-static struct usb_dpll_params omap_usb3_dpll_params[NUM_USB_CLKS] = {
-       {1250, 5, 4, 20, 0},            /* 12 MHz */
-       {3125, 20, 4, 20, 0},           /* 16.8 MHz */
-       {1172, 8, 4, 20, 65537},        /* 19.2 MHz */
-       {1250, 12, 4, 20, 0},           /* 26 MHz */
-       {3125, 47, 4, 20, 92843},       /* 38.4 MHz */
-       {1000, 7, 4, 10, 0},        /* 20 MHz */
-};
-
-static void omap_usb_dpll_relock(struct omap_usb3_phy *phy_regs)
-{
-       u32 val;
-
-       writel(SET_PLL_GO, &phy_regs->pll_go);
-       do {
-               val = readl(&phy_regs->pll_status);
-                       if (val & PLL_LOCK)
-                               break;
-       } while (1);
-}
-
-static void omap_usb_dpll_lock(struct omap_usb3_phy *phy_regs)
-{
-       u32 clk_index = get_sys_clk_index();
-       u32 val;
-
-       val = readl(&phy_regs->pll_config_1);
-       val &= ~PLL_REGN_MASK;
-       val |= omap_usb3_dpll_params[clk_index].n << PLL_REGN_SHIFT;
-       writel(val, &phy_regs->pll_config_1);
-
-       val = readl(&phy_regs->pll_config_2);
-       val &= ~PLL_SELFREQDCO_MASK;
-       val |= omap_usb3_dpll_params[clk_index].freq << PLL_SELFREQDCO_SHIFT;
-       writel(val, &phy_regs->pll_config_2);
-
-       val = readl(&phy_regs->pll_config_1);
-       val &= ~PLL_REGM_MASK;
-       val |= omap_usb3_dpll_params[clk_index].m << PLL_REGM_SHIFT;
-       writel(val, &phy_regs->pll_config_1);
-
-       val = readl(&phy_regs->pll_config_4);
-       val &= ~PLL_REGM_F_MASK;
-       val |= omap_usb3_dpll_params[clk_index].mf << PLL_REGM_F_SHIFT;
-       writel(val, &phy_regs->pll_config_4);
-
-       val = readl(&phy_regs->pll_config_3);
-       val &= ~PLL_SD_MASK;
-       val |= omap_usb3_dpll_params[clk_index].sd << PLL_SD_SHIFT;
-       writel(val, &phy_regs->pll_config_3);
-
-       omap_usb_dpll_relock(phy_regs);
-}
-
-static void usb3_phy_partial_powerup(struct omap_usb3_phy *phy_regs)
-{
-       u32 rate = get_sys_clk_freq()/1000000;
-       u32 val;
-
-       val = readl((*ctrl)->control_phy_power_usb);
-       val &= ~(USB3_PWRCTL_CLK_CMD_MASK | USB3_PWRCTL_CLK_FREQ_MASK);
-       val |= (USB3_PHY_PARTIAL_RX_POWERON | USB3_PHY_TX_RX_POWERON);
-       val |= rate << USB3_PWRCTL_CLK_FREQ_SHIFT;
-
-       writel(val, (*ctrl)->control_phy_power_usb);
-}
-
-static void usb3_phy_power(int on)
-{
-       u32 val;
-
-       val = readl((*ctrl)->control_phy_power_usb);
-       if (on) {
-               val &= ~USB3_PWRCTL_CLK_CMD_MASK;
-               val |= USB3_PHY_TX_RX_POWERON;
-       } else {
-               val &= (~USB3_PWRCTL_CLK_CMD_MASK & ~USB3_PHY_TX_RX_POWERON);
-       }
-
-       writel(val, (*ctrl)->control_phy_power_usb);
-}
-
-static void dwc_usb3_phy_init(struct omap_usb3_phy *phy_regs)
-{
-       omap_usb_dpll_lock(phy_regs);
-
-       usb3_phy_partial_powerup(phy_regs);
-       /*
-        * Give enough time for the PHY to partially power-up before
-        * powering it up completely. delay value suggested by the HW
-        * team.
-        */
-       mdelay(100);
-       usb3_phy_power(1);
-}
-
-static void omap_enable_phy_clocks(struct omap_xhci *omap)
-{
-       u32     val;
-
-       /* Setting OCP2SCP1 register */
-       setbits_le32((*prcm)->cm_l3init_ocp2scp1_clkctrl,
-                    OCP2SCP1_CLKCTRL_MODULEMODE_HW);
-
-       /* Turn on 32K AON clk */
-       setbits_le32((*prcm)->cm_coreaon_usb_phy_core_clkctrl,
-                    USBPHY_CORE_CLKCTRL_OPTFCLKEN_CLK32K);
-
-       /* Setting CM_L3INIT_CLKSTCTRL to 0x0 i.e NO sleep */
-       writel(0x0, (*prcm)->cm_l3init_clkstctrl);
-
-       val = (USBOTGSS_DMADISABLE |
-                       USBOTGSS_STANDBYMODE_SMRT_WKUP |
-                       USBOTGSS_IDLEMODE_NOIDLE);
-       writel(val, &omap->otg_wrapper->sysconfig);
-
-       /* Clear the utmi OTG status */
-       val = readl(&omap->otg_wrapper->utmi_otg_status);
-       writel(val, &omap->otg_wrapper->utmi_otg_status);
-
-       /* Enable interrupts */
-       writel(USBOTGSS_COREIRQ_EN, &omap->otg_wrapper->irqenable_set_0);
-       val = (USBOTGSS_IRQ_SET_1_IDPULLUP_FALL_EN |
-                       USBOTGSS_IRQ_SET_1_DISCHRGVBUS_FALL_EN |
-                       USBOTGSS_IRQ_SET_1_CHRGVBUS_FALL_EN     |
-                       USBOTGSS_IRQ_SET_1_DRVVBUS_FALL_EN      |
-                       USBOTGSS_IRQ_SET_1_IDPULLUP_RISE_EN     |
-                       USBOTGSS_IRQ_SET_1_DISCHRGVBUS_RISE_EN  |
-                       USBOTGSS_IRQ_SET_1_CHRGVBUS_RISE_EN |
-                       USBOTGSS_IRQ_SET_1_DRVVBUS_RISE_EN |
-                       USBOTGSS_IRQ_SET_1_OEVT_EN);
-       writel(val, &omap->otg_wrapper->irqenable_set_1);
-
-       /* Clear the IRQ status */
-       val = readl(&omap->otg_wrapper->irqstatus_1);
-       writel(val, &omap->otg_wrapper->irqstatus_1);
-       val = readl(&omap->otg_wrapper->irqstatus_0);
-       writel(val, &omap->otg_wrapper->irqstatus_0);
-
-       /* Enable the USB OTG Super speed clocks */
-       val = (OPTFCLKEN_REFCLK960M | OTG_SS_CLKCTRL_MODULEMODE_HW);
-       setbits_le32((*prcm)->cm_l3init_usb_otg_ss_clkctrl, val);
-
-};
-
 inline int __board_usb_init(int index, enum board_usb_init_type init)
 {
        return 0;
@@ -201,19 +46,7 @@ static void dwc3_core_soft_reset(struct dwc3 *dwc3_reg)
        /* Before Resetting PHY, put Core in Reset */
        setbits_le32(&dwc3_reg->g_ctl, DWC3_GCTL_CORESOFTRESET);
 
-       /* Assert USB3 PHY reset */
-       setbits_le32(&dwc3_reg->g_usb3pipectl[0], DWC3_GUSB3PIPECTL_PHYSOFTRST);
-
-       /* Assert USB2 PHY reset */
-       setbits_le32(&dwc3_reg->g_usb2phycfg, DWC3_GUSB2PHYCFG_PHYSOFTRST);
-
-       mdelay(100);
-
-       /* Clear USB3 PHY reset */
-       clrbits_le32(&dwc3_reg->g_usb3pipectl[0], DWC3_GUSB3PIPECTL_PHYSOFTRST);
-
-       /* Clear USB2 PHY reset */
-       clrbits_le32(&dwc3_reg->g_usb2phycfg, DWC3_GUSB2PHYCFG_PHYSOFTRST);
+       omap_reset_usb_phy(dwc3_reg);
 
        /* After PHYs are stable we can take Core out of reset state */
        clrbits_le32(&dwc3_reg->g_ctl, DWC3_GCTL_CORESOFTRESET);
@@ -267,7 +100,7 @@ static int omap_xhci_core_init(struct omap_xhci *omap)
 
        omap_enable_phy_clocks(omap);
 
-       dwc_usb3_phy_init(omap->usb3_phy);
+       omap_usb3_phy_init(omap->usb3_phy);
 
        ret = dwc3_core_init(omap->dwc3_reg);
        if (ret) {
index f93121a3aab2302290fcab697e12f63d1d9e77b7..5beec7854ce5983b084d3c8141e2dd4ec6a849a7 100644 (file)
@@ -10,6 +10,7 @@ include $(TOPDIR)/config.mk
 LIB    := $(obj)libusb_phy.o
 
 COBJS-$(CONFIG_TWL4030_USB) += twl4030.o
+COBJS-$(CONFIG_OMAP_USB_PHY) += omap_usb_phy.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
diff --git a/drivers/usb/phy/omap_usb_phy.c b/drivers/usb/phy/omap_usb_phy.c
new file mode 100644 (file)
index 0000000..ed727bf
--- /dev/null
@@ -0,0 +1,197 @@
+/*
+ * OMAP USB PHY Support
+ *
+ * (C) Copyright 2013
+ * Texas Instruments, <www.ti.com>
+ *
+ * Author: Dan Murphy <dmurphy@ti.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <usb.h>
+#include <asm-generic/errno.h>
+#include <asm/omap_common.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/sys_proto.h>
+
+#include <linux/compat.h>
+#include <linux/usb/dwc3.h>
+#include <linux/usb/xhci-omap.h>
+
+#include "../host/xhci.h"
+
+struct usb_dpll_params {
+       u16     m;
+       u8      n;
+       u8      freq:3;
+       u8      sd;
+       u32     mf;
+};
+
+#define        NUM_USB_CLKS            6
+
+static struct usb_dpll_params omap_usb3_dpll_params[NUM_USB_CLKS] = {
+       {1250, 5, 4, 20, 0},            /* 12 MHz */
+       {3125, 20, 4, 20, 0},           /* 16.8 MHz */
+       {1172, 8, 4, 20, 65537},        /* 19.2 MHz */
+       {1250, 12, 4, 20, 0},           /* 26 MHz */
+       {3125, 47, 4, 20, 92843},       /* 38.4 MHz */
+       {1000, 7, 4, 10, 0},        /* 20 MHz */
+};
+
+static void omap_usb_dpll_relock(struct omap_usb3_phy *phy_regs)
+{
+       u32 val;
+
+       writel(SET_PLL_GO, &phy_regs->pll_go);
+       do {
+               val = readl(&phy_regs->pll_status);
+                       if (val & PLL_LOCK)
+                               break;
+       } while (1);
+}
+
+static void omap_usb_dpll_lock(struct omap_usb3_phy *phy_regs)
+{
+       u32 clk_index = get_sys_clk_index();
+       u32 val;
+
+       val = readl(&phy_regs->pll_config_1);
+       val &= ~PLL_REGN_MASK;
+       val |= omap_usb3_dpll_params[clk_index].n << PLL_REGN_SHIFT;
+       writel(val, &phy_regs->pll_config_1);
+
+       val = readl(&phy_regs->pll_config_2);
+       val &= ~PLL_SELFREQDCO_MASK;
+       val |= omap_usb3_dpll_params[clk_index].freq << PLL_SELFREQDCO_SHIFT;
+       writel(val, &phy_regs->pll_config_2);
+
+       val = readl(&phy_regs->pll_config_1);
+       val &= ~PLL_REGM_MASK;
+       val |= omap_usb3_dpll_params[clk_index].m << PLL_REGM_SHIFT;
+       writel(val, &phy_regs->pll_config_1);
+
+       val = readl(&phy_regs->pll_config_4);
+       val &= ~PLL_REGM_F_MASK;
+       val |= omap_usb3_dpll_params[clk_index].mf << PLL_REGM_F_SHIFT;
+       writel(val, &phy_regs->pll_config_4);
+
+       val = readl(&phy_regs->pll_config_3);
+       val &= ~PLL_SD_MASK;
+       val |= omap_usb3_dpll_params[clk_index].sd << PLL_SD_SHIFT;
+       writel(val, &phy_regs->pll_config_3);
+
+       omap_usb_dpll_relock(phy_regs);
+}
+
+static void usb3_phy_partial_powerup(struct omap_usb3_phy *phy_regs)
+{
+       u32 rate = get_sys_clk_freq()/1000000;
+       u32 val;
+
+       val = readl((*ctrl)->control_phy_power_usb);
+       val &= ~(USB3_PWRCTL_CLK_CMD_MASK | USB3_PWRCTL_CLK_FREQ_MASK);
+       val |= (USB3_PHY_PARTIAL_RX_POWERON | USB3_PHY_TX_RX_POWERON);
+       val |= rate << USB3_PWRCTL_CLK_FREQ_SHIFT;
+
+       writel(val, (*ctrl)->control_phy_power_usb);
+}
+
+void usb3_phy_power(int on)
+{
+       u32 val;
+
+       val = readl((*ctrl)->control_phy_power_usb);
+       if (on) {
+               val &= ~USB3_PWRCTL_CLK_CMD_MASK;
+               val |= USB3_PHY_TX_RX_POWERON;
+       } else {
+               val &= (~USB3_PWRCTL_CLK_CMD_MASK & ~USB3_PHY_TX_RX_POWERON);
+       }
+
+       writel(val, (*ctrl)->control_phy_power_usb);
+}
+
+void omap_usb3_phy_init(struct omap_usb3_phy *phy_regs)
+{
+       omap_usb_dpll_lock(phy_regs);
+
+       usb3_phy_partial_powerup(phy_regs);
+       /*
+        * Give enough time for the PHY to partially power-up before
+        * powering it up completely. delay value suggested by the HW
+        * team.
+        */
+       mdelay(100);
+       usb3_phy_power(1);
+}
+
+void omap_enable_phy_clocks(struct omap_xhci *omap)
+{
+       u32     val;
+
+       /* Setting OCP2SCP1 register */
+       setbits_le32((*prcm)->cm_l3init_ocp2scp1_clkctrl,
+                    OCP2SCP1_CLKCTRL_MODULEMODE_HW);
+
+       /* Turn on 32K AON clk */
+       setbits_le32((*prcm)->cm_coreaon_usb_phy_core_clkctrl,
+                    USBPHY_CORE_CLKCTRL_OPTFCLKEN_CLK32K);
+
+       /* Setting CM_L3INIT_CLKSTCTRL to 0x0 i.e NO sleep */
+       writel(0x0, (*prcm)->cm_l3init_clkstctrl);
+
+       val = (USBOTGSS_DMADISABLE |
+                       USBOTGSS_STANDBYMODE_SMRT_WKUP |
+                       USBOTGSS_IDLEMODE_NOIDLE);
+       writel(val, &omap->otg_wrapper->sysconfig);
+
+       /* Clear the utmi OTG status */
+       val = readl(&omap->otg_wrapper->utmi_otg_status);
+       writel(val, &omap->otg_wrapper->utmi_otg_status);
+
+       /* Enable interrupts */
+       writel(USBOTGSS_COREIRQ_EN, &omap->otg_wrapper->irqenable_set_0);
+       val = (USBOTGSS_IRQ_SET_1_IDPULLUP_FALL_EN |
+                       USBOTGSS_IRQ_SET_1_DISCHRGVBUS_FALL_EN |
+                       USBOTGSS_IRQ_SET_1_CHRGVBUS_FALL_EN     |
+                       USBOTGSS_IRQ_SET_1_DRVVBUS_FALL_EN      |
+                       USBOTGSS_IRQ_SET_1_IDPULLUP_RISE_EN     |
+                       USBOTGSS_IRQ_SET_1_DISCHRGVBUS_RISE_EN  |
+                       USBOTGSS_IRQ_SET_1_CHRGVBUS_RISE_EN |
+                       USBOTGSS_IRQ_SET_1_DRVVBUS_RISE_EN |
+                       USBOTGSS_IRQ_SET_1_OEVT_EN);
+       writel(val, &omap->otg_wrapper->irqenable_set_1);
+
+       /* Clear the IRQ status */
+       val = readl(&omap->otg_wrapper->irqstatus_1);
+       writel(val, &omap->otg_wrapper->irqstatus_1);
+       val = readl(&omap->otg_wrapper->irqstatus_0);
+       writel(val, &omap->otg_wrapper->irqstatus_0);
+
+       /* Enable the USB OTG Super speed clocks */
+       val = (OPTFCLKEN_REFCLK960M | OTG_SS_CLKCTRL_MODULEMODE_HW);
+       setbits_le32((*prcm)->cm_l3init_usb_otg_ss_clkctrl, val);
+
+};
+
+void omap_reset_usb_phy(struct dwc3 *dwc3_reg)
+{
+       /* Assert USB3 PHY reset */
+       setbits_le32(&dwc3_reg->g_usb3pipectl[0], DWC3_GUSB3PIPECTL_PHYSOFTRST);
+
+       /* Assert USB2 PHY reset */
+       setbits_le32(&dwc3_reg->g_usb2phycfg, DWC3_GUSB2PHYCFG_PHYSOFTRST);
+
+       mdelay(100);
+
+       /* Clear USB3 PHY reset */
+       clrbits_le32(&dwc3_reg->g_usb3pipectl[0], DWC3_GUSB3PIPECTL_PHYSOFTRST);
+
+       /* Clear USB2 PHY reset */
+       clrbits_le32(&dwc3_reg->g_usb2phycfg, DWC3_GUSB2PHYCFG_PHYSOFTRST);
+
+}
+
index b557a434d2ef5a0a762317caac6ca97ceb58e9ae..a73c0f9c48ed4ceac9a5d131f41cbaffc9a1b506 100644 (file)
@@ -121,4 +121,10 @@ struct omap_xhci {
        struct dwc3 *dwc3_reg;
 };
 
+/* USB PHY functions */
+void omap_enable_phy_clocks(struct omap_xhci *omap);
+void omap_usb3_phy_init(struct omap_usb3_phy *phy_regs);
+void omap_reset_usb_phy(struct dwc3 *dwc3_reg);
+void usb3_phy_power(int on);
+
 #endif /* _ASM_ARCH_XHCI_OMAP_H_ */