Commit 99e8232b authored by Peter Chen's avatar Peter Chen Committed by Felipe Balbi

usb: phy: phy-mxs-usb: add imx7ulp support

At imx7ulp, the USB related analog register is located in PHY register
region too, so we need to control PLL at PHY driver directly.
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 8cf8bde2
...@@ -17,9 +17,11 @@ ...@@ -17,9 +17,11 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/iopoll.h>
#define DRIVER_NAME "mxs_phy" #define DRIVER_NAME "mxs_phy"
/* Register Macro */
#define HW_USBPHY_PWD 0x00 #define HW_USBPHY_PWD 0x00
#define HW_USBPHY_TX 0x10 #define HW_USBPHY_TX 0x10
#define HW_USBPHY_CTRL 0x30 #define HW_USBPHY_CTRL 0x30
...@@ -37,6 +39,11 @@ ...@@ -37,6 +39,11 @@
#define GM_USBPHY_TX_TXCAL45DN(x) (((x) & 0xf) << 8) #define GM_USBPHY_TX_TXCAL45DN(x) (((x) & 0xf) << 8)
#define GM_USBPHY_TX_D_CAL(x) (((x) & 0xf) << 0) #define GM_USBPHY_TX_D_CAL(x) (((x) & 0xf) << 0)
/* imx7ulp */
#define HW_USBPHY_PLL_SIC 0xa0
#define HW_USBPHY_PLL_SIC_SET 0xa4
#define HW_USBPHY_PLL_SIC_CLR 0xa8
#define BM_USBPHY_CTRL_SFTRST BIT(31) #define BM_USBPHY_CTRL_SFTRST BIT(31)
#define BM_USBPHY_CTRL_CLKGATE BIT(30) #define BM_USBPHY_CTRL_CLKGATE BIT(30)
#define BM_USBPHY_CTRL_OTG_ID_VALUE BIT(27) #define BM_USBPHY_CTRL_OTG_ID_VALUE BIT(27)
...@@ -55,6 +62,12 @@ ...@@ -55,6 +62,12 @@
#define BM_USBPHY_IP_FIX (BIT(17) | BIT(18)) #define BM_USBPHY_IP_FIX (BIT(17) | BIT(18))
#define BM_USBPHY_DEBUG_CLKGATE BIT(30) #define BM_USBPHY_DEBUG_CLKGATE BIT(30)
/* imx7ulp */
#define BM_USBPHY_PLL_LOCK BIT(31)
#define BM_USBPHY_PLL_REG_ENABLE BIT(21)
#define BM_USBPHY_PLL_BYPASS BIT(16)
#define BM_USBPHY_PLL_POWER BIT(12)
#define BM_USBPHY_PLL_EN_USB_CLKS BIT(6)
/* Anatop Registers */ /* Anatop Registers */
#define ANADIG_ANA_MISC0 0x150 #define ANADIG_ANA_MISC0 0x150
...@@ -168,6 +181,9 @@ static const struct mxs_phy_data imx6ul_phy_data = { ...@@ -168,6 +181,9 @@ static const struct mxs_phy_data imx6ul_phy_data = {
.flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS, .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS,
}; };
static const struct mxs_phy_data imx7ulp_phy_data = {
};
static const struct of_device_id mxs_phy_dt_ids[] = { static const struct of_device_id mxs_phy_dt_ids[] = {
{ .compatible = "fsl,imx6sx-usbphy", .data = &imx6sx_phy_data, }, { .compatible = "fsl,imx6sx-usbphy", .data = &imx6sx_phy_data, },
{ .compatible = "fsl,imx6sl-usbphy", .data = &imx6sl_phy_data, }, { .compatible = "fsl,imx6sl-usbphy", .data = &imx6sl_phy_data, },
...@@ -175,6 +191,7 @@ static const struct of_device_id mxs_phy_dt_ids[] = { ...@@ -175,6 +191,7 @@ static const struct of_device_id mxs_phy_dt_ids[] = {
{ .compatible = "fsl,imx23-usbphy", .data = &imx23_phy_data, }, { .compatible = "fsl,imx23-usbphy", .data = &imx23_phy_data, },
{ .compatible = "fsl,vf610-usbphy", .data = &vf610_phy_data, }, { .compatible = "fsl,vf610-usbphy", .data = &vf610_phy_data, },
{ .compatible = "fsl,imx6ul-usbphy", .data = &imx6ul_phy_data, }, { .compatible = "fsl,imx6ul-usbphy", .data = &imx6ul_phy_data, },
{ .compatible = "fsl,imx7ulp-usbphy", .data = &imx7ulp_phy_data, },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, mxs_phy_dt_ids); MODULE_DEVICE_TABLE(of, mxs_phy_dt_ids);
...@@ -199,6 +216,11 @@ static inline bool is_imx6sl_phy(struct mxs_phy *mxs_phy) ...@@ -199,6 +216,11 @@ static inline bool is_imx6sl_phy(struct mxs_phy *mxs_phy)
return mxs_phy->data == &imx6sl_phy_data; return mxs_phy->data == &imx6sl_phy_data;
} }
static inline bool is_imx7ulp_phy(struct mxs_phy *mxs_phy)
{
return mxs_phy->data == &imx7ulp_phy_data;
}
/* /*
* PHY needs some 32K cycles to switch from 32K clock to * PHY needs some 32K cycles to switch from 32K clock to
* bus (such as AHB/AXI, etc) clock. * bus (such as AHB/AXI, etc) clock.
...@@ -222,14 +244,49 @@ static void mxs_phy_tx_init(struct mxs_phy *mxs_phy) ...@@ -222,14 +244,49 @@ static void mxs_phy_tx_init(struct mxs_phy *mxs_phy)
} }
} }
static int mxs_phy_pll_enable(void __iomem *base, bool enable)
{
int ret = 0;
if (enable) {
u32 value;
writel(BM_USBPHY_PLL_REG_ENABLE, base + HW_USBPHY_PLL_SIC_SET);
writel(BM_USBPHY_PLL_BYPASS, base + HW_USBPHY_PLL_SIC_CLR);
writel(BM_USBPHY_PLL_POWER, base + HW_USBPHY_PLL_SIC_SET);
ret = readl_poll_timeout(base + HW_USBPHY_PLL_SIC,
value, (value & BM_USBPHY_PLL_LOCK) != 0,
100, 10000);
if (ret)
return ret;
writel(BM_USBPHY_PLL_EN_USB_CLKS, base +
HW_USBPHY_PLL_SIC_SET);
} else {
writel(BM_USBPHY_PLL_EN_USB_CLKS, base +
HW_USBPHY_PLL_SIC_CLR);
writel(BM_USBPHY_PLL_POWER, base + HW_USBPHY_PLL_SIC_CLR);
writel(BM_USBPHY_PLL_BYPASS, base + HW_USBPHY_PLL_SIC_SET);
writel(BM_USBPHY_PLL_REG_ENABLE, base + HW_USBPHY_PLL_SIC_CLR);
}
return ret;
}
static int mxs_phy_hw_init(struct mxs_phy *mxs_phy) static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
{ {
int ret; int ret;
void __iomem *base = mxs_phy->phy.io_priv; void __iomem *base = mxs_phy->phy.io_priv;
ret = stmp_reset_block(base + HW_USBPHY_CTRL); if (is_imx7ulp_phy(mxs_phy)) {
ret = mxs_phy_pll_enable(base, true);
if (ret) if (ret)
return ret; return ret;
}
ret = stmp_reset_block(base + HW_USBPHY_CTRL);
if (ret)
goto disable_pll;
/* Power up the PHY */ /* Power up the PHY */
writel(0, base + HW_USBPHY_PWD); writel(0, base + HW_USBPHY_PWD);
...@@ -267,6 +324,11 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy) ...@@ -267,6 +324,11 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
mxs_phy_tx_init(mxs_phy); mxs_phy_tx_init(mxs_phy);
return 0; return 0;
disable_pll:
if (is_imx7ulp_phy(mxs_phy))
mxs_phy_pll_enable(base, false);
return ret;
} }
/* Return true if the vbus is there */ /* Return true if the vbus is there */
...@@ -388,6 +450,9 @@ static void mxs_phy_shutdown(struct usb_phy *phy) ...@@ -388,6 +450,9 @@ static void mxs_phy_shutdown(struct usb_phy *phy)
writel(BM_USBPHY_CTRL_CLKGATE, writel(BM_USBPHY_CTRL_CLKGATE,
phy->io_priv + HW_USBPHY_CTRL_SET); phy->io_priv + HW_USBPHY_CTRL_SET);
if (is_imx7ulp_phy(mxs_phy))
mxs_phy_pll_enable(phy->io_priv, false);
clk_disable_unprepare(mxs_phy->clk); clk_disable_unprepare(mxs_phy->clk);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment