From mboxrd@z Thu Jan 1 00:00:00 1970 From: balbi@ti.com (Felipe Balbi) Date: Mon, 11 May 2015 10:55:47 -0500 Subject: [PATCH 1/3] phy-sun4i-usb: Add a sunxi specific function for setting squelch-detect In-Reply-To: <554F2CCE.4090906@redhat.com> References: <1427626248-6257-1-git-send-email-hdegoede@redhat.com> <1427626248-6257-2-git-send-email-hdegoede@redhat.com> <20150508160636.GD16571@saruman.tx.rr.com> <554F2CCE.4090906@redhat.com> Message-ID: <20150511155547.GG19476@saruman.tx.rr.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, On Sun, May 10, 2015 at 12:02:54PM +0200, Hans de Goede wrote: > Hi, > > On 08-05-15 18:06, Felipe Balbi wrote: > >Hi, > > > >On Sun, Mar 29, 2015 at 12:50:46PM +0200, Hans de Goede wrote: > >>The sunxi otg phy has a bug where it wrongly detects a high speed squelch > >>when reset on the root port gets de-asserted with a lo-speed device. > >> > >>The workaround for this is to disable squelch detect before de-asserting > >>reset, and re-enabling it after the reset de-assert is done. Add a sunxi > >>specific phy function to allow the sunxi-musb glue to do this. > >> > >>Signed-off-by: Hans de Goede > >>--- > >> drivers/phy/phy-sun4i-usb.c | 9 +++++++++ > >> include/linux/phy/phy-sun4i-usb.h | 26 ++++++++++++++++++++++++++ > >> 2 files changed, 35 insertions(+) > >> create mode 100644 include/linux/phy/phy-sun4i-usb.h > >> > >>diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c > >>index 221e8ab..01eb08d 100644 > >>--- a/drivers/phy/phy-sun4i-usb.c > >>+++ b/drivers/phy/phy-sun4i-usb.c > >>@@ -33,6 +33,7 @@ > >> #include > >> #include > >> #include > >>+#include > >> #include > >> #include > >> #include > >>@@ -75,6 +76,7 @@ > >> #define PHY_OTG_FUNC_EN 0x28 > >> #define PHY_VBUS_DET_EN 0x29 > >> #define PHY_DISCON_TH_SEL 0x2a > >>+#define PHY_SQUELCH_DETECT 0x3c > >> > >> #define MAX_PHYS 3 > >> > >>@@ -322,6 +324,13 @@ static int sun4i_usb_phy_power_off(struct phy *_phy) > >> return 0; > >> } > >> > >>+void sun4i_usb_phy_set_squelch_detect(struct phy *_phy, bool enabled) > >>+{ > >>+ struct sun4i_usb_phy *phy = phy_get_drvdata(_phy); > >>+ > >>+ sun4i_usb_phy_write(phy, PHY_SQUELCH_DETECT, enabled ? 0 : 2, 2); > >>+} > >>+ > >> static struct phy_ops sun4i_usb_phy_ops = { > >> .init = sun4i_usb_phy_init, > >> .exit = sun4i_usb_phy_exit, > >>diff --git a/include/linux/phy/phy-sun4i-usb.h b/include/linux/phy/phy-sun4i-usb.h > >>new file mode 100644 > >>index 0000000..50aed92 > >>--- /dev/null > >>+++ b/include/linux/phy/phy-sun4i-usb.h > >>@@ -0,0 +1,26 @@ > >>+/* > >>+ * Copyright (c) 2015 Hans de Goede > >>+ * > >>+ * This program is free software; you can redistribute it and/or modify > >>+ * it under the terms of the GNU General Public License version 2 and > >>+ * only version 2 as published by the Free Software Foundation. > >>+ * > >>+ * This program is distributed in the hope that it will be useful, > >>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > >>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > >>+ * GNU General Public License for more details. > >>+ */ > >>+ > >>+#ifndef PHY_SUN4I_USB_H_ > >>+#define PHY_SUN4I_USB_H_ > >>+ > >>+#include "phy.h" > >>+ > >>+/** > >>+ * sun4i_usb_phy_set_squelch_detect() - Enable/disable squelch detect > >>+ * @phy: reference to a sun4i usb phy > >>+ * @enabled: wether to enable or disable squelch detect > >>+ */ > >>+void sun4i_usb_phy_set_squelch_detect(struct phy *phy, bool enabled); > > > >breaks build if MUSB=y and SUN41_PHY=m > > Ah, good one. So I assume that it is ok to fix this by doing: > > --- a/drivers/usb/musb/Kconfig > +++ b/drivers/usb/musb/Kconfig > @@ -66,6 +66,7 @@ config USB_MUSB_SUNXI > tristate "Allwinner (sunxi)" > depends on ARCH_SUNXI > depends on NOP_USB_XCEIV > + depends on PHY_SUN4I_USB I would prefer not exporting any function from phy to musb. Perhaps figure out with Kishon how "set_squelch" can be added to PHY fwk ? > Also I've not heard anything back from you wrt my other musb > sunxi preparation patches and the actual musb-sunxi patch? are > those all ready for merging? I'm a little iffy with all the function rewriting again because of a new set of limitations with a new platform. I'll review them more carefully maybe today or tomorrow. cheers -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: Re: [PATCH 1/3] phy-sun4i-usb: Add a sunxi specific function for setting squelch-detect Date: Mon, 11 May 2015 10:55:47 -0500 Message-ID: <20150511155547.GG19476@saruman.tx.rr.com> References: <1427626248-6257-1-git-send-email-hdegoede@redhat.com> <1427626248-6257-2-git-send-email-hdegoede@redhat.com> <20150508160636.GD16571@saruman.tx.rr.com> <554F2CCE.4090906@redhat.com> Reply-To: balbi-l0cyMroinI0@public.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3607uds81ZQvwCD0" Return-path: Content-Disposition: inline In-Reply-To: <554F2CCE.4090906-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Hans de Goede Cc: balbi-l0cyMroinI0@public.gmane.org, Kishon Vijay Abraham I , Maxime Ripard , Chen-Yu Tsai , Roman Byshko , linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree , linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org List-Id: devicetree@vger.kernel.org --3607uds81ZQvwCD0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Sun, May 10, 2015 at 12:02:54PM +0200, Hans de Goede wrote: > Hi, >=20 > On 08-05-15 18:06, Felipe Balbi wrote: > >Hi, > > > >On Sun, Mar 29, 2015 at 12:50:46PM +0200, Hans de Goede wrote: > >>The sunxi otg phy has a bug where it wrongly detects a high speed squel= ch > >>when reset on the root port gets de-asserted with a lo-speed device. > >> > >>The workaround for this is to disable squelch detect before de-assertin= g > >>reset, and re-enabling it after the reset de-assert is done. Add a sunx= i > >>specific phy function to allow the sunxi-musb glue to do this. > >> > >>Signed-off-by: Hans de Goede > >>--- > >> drivers/phy/phy-sun4i-usb.c | 9 +++++++++ > >> include/linux/phy/phy-sun4i-usb.h | 26 ++++++++++++++++++++++++++ > >> 2 files changed, 35 insertions(+) > >> create mode 100644 include/linux/phy/phy-sun4i-usb.h > >> > >>diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c > >>index 221e8ab..01eb08d 100644 > >>--- a/drivers/phy/phy-sun4i-usb.c > >>+++ b/drivers/phy/phy-sun4i-usb.c > >>@@ -33,6 +33,7 @@ > >> #include > >> #include > >> #include > >>+#include > >> #include > >> #include > >> #include > >>@@ -75,6 +76,7 @@ > >> #define PHY_OTG_FUNC_EN 0x28 > >> #define PHY_VBUS_DET_EN 0x29 > >> #define PHY_DISCON_TH_SEL 0x2a > >>+#define PHY_SQUELCH_DETECT 0x3c > >> > >> #define MAX_PHYS 3 > >> > >>@@ -322,6 +324,13 @@ static int sun4i_usb_phy_power_off(struct phy *_ph= y) > >> return 0; > >> } > >> > >>+void sun4i_usb_phy_set_squelch_detect(struct phy *_phy, bool enabled) > >>+{ > >>+ struct sun4i_usb_phy *phy =3D phy_get_drvdata(_phy); > >>+ > >>+ sun4i_usb_phy_write(phy, PHY_SQUELCH_DETECT, enabled ? 0 : 2, 2); > >>+} > >>+ > >> static struct phy_ops sun4i_usb_phy_ops =3D { > >> .init =3D sun4i_usb_phy_init, > >> .exit =3D sun4i_usb_phy_exit, > >>diff --git a/include/linux/phy/phy-sun4i-usb.h b/include/linux/phy/phy-= sun4i-usb.h > >>new file mode 100644 > >>index 0000000..50aed92 > >>--- /dev/null > >>+++ b/include/linux/phy/phy-sun4i-usb.h > >>@@ -0,0 +1,26 @@ > >>+/* > >>+ * Copyright (c) 2015 Hans de Goede > >>+ * > >>+ * This program is free software; you can redistribute it and/or modif= y > >>+ * it under the terms of the GNU General Public License version 2 and > >>+ * only version 2 as published by the Free Software Foundation. > >>+ * > >>+ * This program is distributed in the hope that it will be useful, > >>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > >>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > >>+ * GNU General Public License for more details. > >>+ */ > >>+ > >>+#ifndef PHY_SUN4I_USB_H_ > >>+#define PHY_SUN4I_USB_H_ > >>+ > >>+#include "phy.h" > >>+ > >>+/** > >>+ * sun4i_usb_phy_set_squelch_detect() - Enable/disable squelch detect > >>+ * @phy: reference to a sun4i usb phy > >>+ * @enabled: wether to enable or disable squelch detect > >>+ */ > >>+void sun4i_usb_phy_set_squelch_detect(struct phy *phy, bool enabled); > > > >breaks build if MUSB=3Dy and SUN41_PHY=3Dm >=20 > Ah, good one. So I assume that it is ok to fix this by doing: >=20 > --- a/drivers/usb/musb/Kconfig > +++ b/drivers/usb/musb/Kconfig > @@ -66,6 +66,7 @@ config USB_MUSB_SUNXI > tristate "Allwinner (sunxi)" > depends on ARCH_SUNXI > depends on NOP_USB_XCEIV > + depends on PHY_SUN4I_USB I would prefer not exporting any function from phy to musb. Perhaps figure out with Kishon how "set_squelch" can be added to PHY fwk ? > Also I've not heard anything back from you wrt my other musb > sunxi preparation patches and the actual musb-sunxi patch=C2=B8 are > those all ready for merging? I'm a little iffy with all the function rewriting again because of a new set of limitations with a new platform. I'll review them more carefully maybe today or tomorrow. cheers --=20 balbi --=20 You received this message because you are subscribed to the Google Groups "= linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org For more options, visit https://groups.google.com/d/optout. --3607uds81ZQvwCD0 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVUNEDAAoJEIaOsuA1yqREbg8QAIMSnsQ9djHo9ISPHephf89t knik046TC9RmD6xNsrc9KuiX2QNNgDyOL2NTePbFDk1njBQTRUb670NIParvbIYn vMN+woBUpOeV07TImHg64aLxA5uPbf354Y0RiT3kyo6QFt4GfA4MZCsWjTk2eUo8 O/sfFNsNp+1R3+j01oBSuqJOQvKz1jV6EWOJFVTH6R8/EwBO2ODok8cF7YZU+Hd1 ZbSIXpCbtRCCW9LJoi3njyqJxhv9mnPzkwZAEeaCkKmhxEINVv7ouZqrWlFzNO28 JPbOJUV5UsZI1XSbxuc8VbD8p36KE44PWzBgF8Ut/rSFyBlKPRZ0LD8rVUAYqJYy JQmlPd4u8Z4wA/OicxWXuIro0+uzUfPtfyhoaFkuBvroG0n7OaP7vMu/8HOQfl8e JqrgEeh2rxbLCpQ8SLwTe2051gPAb69euLJ0B+Aig5WbxucQEdDbKBQ5xuJI/RkS V17aJoEC9agva17HewArr/U0xlbxWIHwXT6Fagpnzk60xKKVBSXdHzoC1vzxj4G7 51Xv7v+yj31xr1VaCepgDDPRtUrLMS3LJucUfrvegDyfY3D3WVbERT1gLK/g1TGN NsW4o2Vl68kuN0R83wCZngz7hJTcuSOIkM/wXYjQoT7BkljsGmzKkY1lOtnLqbkZ L1tTYtjtJFdG9f4ArvcH =S49M -----END PGP SIGNATURE----- --3607uds81ZQvwCD0--