On 11-09-20, 14:16, Mauro Carvalho Chehab wrote:
> From: Yu Chen <cheny...@huawei.com>
>
> There are some problems at the initialization part of this phy.
> Solve them.
Why not fold this into patch 1?
>
> Signed-off-by: Yu Chen <cheny...@huawei.com>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>
> ---
> drivers/phy/hisilicon/phy-hi3670-usb3.c | 70 +++++++++++--------------
> 1 file changed, 32 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/phy/hisilicon/phy-hi3670-usb3.c
> b/drivers/phy/hisilicon/phy-hi3670-usb3.c
> index 4e04ac97728d..1d4caf7a2aaf 100644
> --- a/drivers/phy/hisilicon/phy-hi3670-usb3.c
> +++ b/drivers/phy/hisilicon/phy-hi3670-usb3.c
> @@ -63,6 +63,7 @@
> #define TCA_INTR_STS (0x208)
> #define TCA_GCFG (0x210)
> #define TCA_TCPC (0x214)
> +#define TCA_SYSMODE_CFG (0x218)
> #define TCA_VBUS_CTRL (0x240)
>
> #define CTRL0_USB3_VBUSVLD BIT(7)
> @@ -109,12 +110,16 @@
> #define CLK_RST_SUSPEND_CLK_EN BIT(0)
>
> #define GCFG_ROLE_HSTDEV BIT(4)
> +#define GCFG_OP_MODE (3 << 0)
> +#define GCFG_OP_MODE_CTRL_SYNC_MODE BIT(0)
>
> #define TCPC_VALID BIT(4)
> #define TCPC_LOW_POWER_EN BIT(3)
> #define TCPC_MUX_CONTROL_MASK (3 << 0)
> #define TCPC_MUX_CONTROL_USB31 (1 << 0)
>
> +#define SYSMODE_CFG_TYPEC_DISABLE BIT(3)
> +
> #define VBUS_CTRL_POWERPRESENT_OVERRD (3 << 2)
> #define VBUS_CTRL_VBUSVALID_OVERRD (3 << 0)
>
> @@ -363,6 +368,11 @@ static int kirin970_config_phy_clock(struct
> kirin970_priv *priv)
> if (ret)
> goto out;
>
> + /* enable usb_tcxo_en */
> + ret = regmap_write(priv->pctrl, PCTRL_PERI_CTRL3,
> + USB_TCXO_EN |
> + (USB_TCXO_EN << PCTRL_PERI_CTRL3_MSK_START));
> +
> /* select usbphy clk from abb */
> mask = SC_CLK_USB3PHY_3MUX1_SEL;
> ret = regmap_update_bits(priv->pctrl,
> @@ -437,7 +447,13 @@ static int kirin970_config_tca(struct kirin970_priv
> *priv)
> goto out;
>
> ret = regmap_update_bits(priv->usb31misc, TCA_GCFG,
> - GCFG_ROLE_HSTDEV, GCFG_ROLE_HSTDEV);
> + GCFG_ROLE_HSTDEV | GCFG_OP_MODE,
> + GCFG_ROLE_HSTDEV | GCFG_OP_MODE_CTRL_SYNC_MODE);
> + if (ret)
> + goto out;
> +
> + ret = regmap_update_bits(priv->usb31misc, TCA_SYSMODE_CFG,
> + SYSMODE_CFG_TYPEC_DISABLE, 0);
> if (ret)
> goto out;
>
> @@ -461,18 +477,15 @@ static int kirin970_config_tca(struct kirin970_priv
> *priv)
> return ret;
> }
>
> -static int kirin970_phy_exit(struct phy *phy);
> -
> static int kirin970_phy_init(struct phy *phy)
> {
> struct kirin970_priv *priv = phy_get_drvdata(phy);
> u32 val;
> int ret;
>
> - kirin970_phy_exit(phy);
> - dev_info(priv->dev, "%s in\n", __func__);
> /* assert controller */
> - val = CFGA0_VAUX_RESET | CFGA0_USB31C_RESET;
> + val = CFGA0_VAUX_RESET | CFGA0_USB31C_RESET |
> + CFGA0_USB3PHY_RESET | CFGA0_USB2PHY_POR;
> ret = regmap_update_bits(priv->usb31misc, USB_MISC_CFGA0, val, 0);
> if (ret)
> goto out;
> @@ -493,6 +506,14 @@ static int kirin970_phy_init(struct phy *phy)
> if (ret)
> goto out;
>
> + /* Deassert phy */
> + val = CFGA0_USB3PHY_RESET | CFGA0_USB2PHY_POR;
> + ret = regmap_update_bits(priv->usb31misc, USB_MISC_CFGA0, val, val);
> + if (ret)
> + goto out;
> +
> + udelay(100);
> +
> /* Tell the PHY power is stable */
> val = CFG54_USB3_PHY0_ANA_PWR_EN | CFG54_PHY0_PCS_PWR_STABLE |
> CFG54_PHY0_PMA_PWR_STABLE;
> @@ -512,14 +533,6 @@ static int kirin970_phy_init(struct phy *phy)
> if (ret)
> goto out;
>
> - /* Deassert phy */
> - val = CFGA0_USB3PHY_RESET | CFGA0_USB2PHY_POR;
> - ret = regmap_update_bits(priv->usb31misc, USB_MISC_CFGA0, val, val);
> - if (ret)
> - goto out;
> -
> - udelay(100);
> -
> /* Deassert controller */
> val = CFGA0_VAUX_RESET | CFGA0_USB31C_RESET;
> ret = regmap_update_bits(priv->usb31misc, USB_MISC_CFGA0, val, val);
> @@ -545,29 +558,6 @@ static int kirin970_phy_init(struct phy *phy)
> if (ret)
> goto out;
>
> - {
> - ret = regmap_read(priv->peri_crg, 0x4c,
> - &val);
> - if (!ret)
> - dev_info(priv->dev, "peri_crg 0x4c %x\n", val);
> - ret = regmap_read(priv->peri_crg, 0x404,
> - &val);
> - if (!ret)
> - dev_info(priv->dev, "peri_crg 0x404 %x\n", val);
> - ret = regmap_read(priv->peri_crg, 0xc,
> - &val);
> - if (!ret)
> - dev_info(priv->dev, "peri_crg 0xc %x\n", val);
> - ret = regmap_read(priv->peri_crg, 0xac,
> - &val);
> - if (!ret)
> - dev_info(priv->dev, "peri_crg 0xac %x\n", val);
> - ret = regmap_read(priv->pctrl, 0x10,
> - &val);
> - if (!ret)
> - dev_info(priv->dev, "pctrl 0x10 %x\n", val);
> - }
> -
> return 0;
> out:
> dev_err(priv->dev, "failed to init phy ret: %d\n", ret);
> @@ -586,7 +576,11 @@ static int kirin970_phy_exit(struct phy *phy)
> if (ret)
> goto out;
>
> - if (!kirin970_is_abbclk_seleted(priv)) {
> + if (kirin970_is_abbclk_seleted(priv)) {
> + /* disable usb_tcxo_en */
> + ret = regmap_write(priv->pctrl, PCTRL_PERI_CTRL3,
> + USB_TCXO_EN << PCTRL_PERI_CTRL3_MSK_START);
> + } else {
> ret = regmap_write(priv->peri_crg, PERI_CRG_PERDIS6,
> GT_CLK_USB2PHY_REF);
> if (ret)
> --
> 2.26.2
--
~Vinod
