2019-05-29 07:03:31

by Andrey Smirnov

Subject: [PATCH] usb: phy: mxs: Disable external charger detect in mxs_phy_hw_init()

Since this driver already handles changer detction state, copy the
workaround code currently residing in arch/arm/mach-imx/anatop.c into
this drier to consolidate the places modifying it.

Signed-off-by: Andrey Smirnov <[email protected]>
Cc: Chris Healy <[email protected]>
Cc: Felipe Balbi <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---

The intent of this patch is to consolidate all of the code maipulating
charge detection state to a signle place and if this patch is agreed
upon I plan to follow it up with this change:

https://github.com/ndreys/linux/commit/7248f2b85b4706760fd33d2ff970e2ea12d3bea7

Thanks,
Andrey Smirnov

drivers/usb/phy/phy-mxs-usb.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 1b1bb0ad40c3..6fa16ab31e2e 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -63,6 +63,7 @@

#define ANADIG_USB1_CHRG_DETECT_SET 0x1b4
#define ANADIG_USB1_CHRG_DETECT_CLR 0x1b8
+#define ANADIG_USB2_CHRG_DETECT_SET 0x214
#define ANADIG_USB1_CHRG_DETECT_EN_B BIT(20)
#define ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B BIT(19)
#define ANADIG_USB1_CHRG_DETECT_CHK_CONTACT BIT(18)
@@ -250,6 +251,19 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
if (mxs_phy->data->flags & MXS_PHY_NEED_IP_FIX)
writel(BM_USBPHY_IP_FIX, base + HW_USBPHY_IP_SET);

+ if (mxs_phy->regmap_anatop) {
+ unsigned int reg = mxs_phy->port_id ?
+ ANADIG_USB1_CHRG_DETECT_SET :
+ ANADIG_USB2_CHRG_DETECT_SET;
+ /*
+ * The external charger detector needs to be disabled,
+ * or the signal at DP will be poor
+ */
+ regmap_write(mxs_phy->regmap_anatop, reg,
+ ANADIG_USB1_CHRG_DETECT_EN_B |
+ ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B);
+ }
+
mxs_phy_tx_init(mxs_phy);

return 0;
--
2.21.0

2019-05-29 08:05:11

by Peter Chen

Subject: Re: [PATCH] usb: phy: mxs: Disable external charger detect in mxs_phy_hw_init()

On Wed, May 29, 2019 at 3:01 PM Andrey Smirnov <[email protected]> wrote:
>
> Since this driver already handles changer detction state, copy the
> workaround code currently residing in arch/arm/mach-imx/anatop.c into
> this drier to consolidate the places modifying it.
>
> Signed-off-by: Andrey Smirnov <[email protected]>
> Cc: Chris Healy <[email protected]>
> Cc: Felipe Balbi <[email protected]>
> Cc: Shawn Guo <[email protected]>
> Cc: Fabio Estevam <[email protected]>
> Cc: NXP Linux Team <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
>
> The intent of this patch is to consolidate all of the code maipulating
> charge detection state to a signle place and if this patch is agreed
> upon I plan to follow it up with this change:
>
> https://github.com/ndreys/linux/commit/7248f2b85b4706760fd33d2ff970e2ea12d3bea7
>
> Thanks,
> Andrey Smirnov
>
> drivers/usb/phy/phy-mxs-usb.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
> index 1b1bb0ad40c3..6fa16ab31e2e 100644
> --- a/drivers/usb/phy/phy-mxs-usb.c
> +++ b/drivers/usb/phy/phy-mxs-usb.c
> @@ -63,6 +63,7 @@
>
> #define ANADIG_USB1_CHRG_DETECT_SET 0x1b4
> #define ANADIG_USB1_CHRG_DETECT_CLR 0x1b8
> +#define ANADIG_USB2_CHRG_DETECT_SET 0x214
> #define ANADIG_USB1_CHRG_DETECT_EN_B BIT(20)
> #define ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B BIT(19)
> #define ANADIG_USB1_CHRG_DETECT_CHK_CONTACT BIT(18)
> @@ -250,6 +251,19 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
> if (mxs_phy->data->flags & MXS_PHY_NEED_IP_FIX)
> writel(BM_USBPHY_IP_FIX, base + HW_USBPHY_IP_SET);
>
> + if (mxs_phy->regmap_anatop) {
> + unsigned int reg = mxs_phy->port_id ?
> + ANADIG_USB1_CHRG_DETECT_SET :
> + ANADIG_USB2_CHRG_DETECT_SET;
> + /*
> + * The external charger detector needs to be disabled,
> + * or the signal at DP will be poor
> + */
> + regmap_write(mxs_phy->regmap_anatop, reg,
> + ANADIG_USB1_CHRG_DETECT_EN_B |
> + ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B);
> + }
> +
> mxs_phy_tx_init(mxs_phy);
>
> return 0;
> --
> 2.21.0
>

Reviewed-by: Peter Chen <[email protected]>

2019-06-05 09:23:28

by Shawn Guo

Subject: Re: [PATCH] usb: phy: mxs: Disable external charger detect in mxs_phy_hw_init()

On Tue, May 28, 2019 at 11:59:48PM -0700, Andrey Smirnov wrote:
> Since this driver already handles changer detction state, copy the
> workaround code currently residing in arch/arm/mach-imx/anatop.c into
> this drier to consolidate the places modifying it.
>
> Signed-off-by: Andrey Smirnov <[email protected]>
> Cc: Chris Healy <[email protected]>
> Cc: Felipe Balbi <[email protected]>
> Cc: Shawn Guo <[email protected]>
> Cc: Fabio Estevam <[email protected]>
> Cc: NXP Linux Team <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]

Acked-by: Shawn Guo <[email protected]>

> ---
>
> The intent of this patch is to consolidate all of the code maipulating
> charge detection state to a signle place and if this patch is agreed
> upon I plan to follow it up with this change:
>
> https://github.com/ndreys/linux/commit/7248f2b85b4706760fd33d2ff970e2ea12d3bea7
>
> Thanks,
> Andrey Smirnov
>
> drivers/usb/phy/phy-mxs-usb.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
> index 1b1bb0ad40c3..6fa16ab31e2e 100644
> --- a/drivers/usb/phy/phy-mxs-usb.c
> +++ b/drivers/usb/phy/phy-mxs-usb.c
> @@ -63,6 +63,7 @@
>
> #define ANADIG_USB1_CHRG_DETECT_SET 0x1b4
> #define ANADIG_USB1_CHRG_DETECT_CLR 0x1b8
> +#define ANADIG_USB2_CHRG_DETECT_SET 0x214
> #define ANADIG_USB1_CHRG_DETECT_EN_B BIT(20)
> #define ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B BIT(19)
> #define ANADIG_USB1_CHRG_DETECT_CHK_CONTACT BIT(18)
> @@ -250,6 +251,19 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
> if (mxs_phy->data->flags & MXS_PHY_NEED_IP_FIX)
> writel(BM_USBPHY_IP_FIX, base + HW_USBPHY_IP_SET);
>
> + if (mxs_phy->regmap_anatop) {
> + unsigned int reg = mxs_phy->port_id ?
> + ANADIG_USB1_CHRG_DETECT_SET :
> + ANADIG_USB2_CHRG_DETECT_SET;
> + /*
> + * The external charger detector needs to be disabled,
> + * or the signal at DP will be poor
> + */
> + regmap_write(mxs_phy->regmap_anatop, reg,
> + ANADIG_USB1_CHRG_DETECT_EN_B |
> + ANADIG_USB1_CHRG_DETECT_CHK_CHRG_B);
> + }
> +
> mxs_phy_tx_init(mxs_phy);
>
> return 0;
> --
> 2.21.0
>