Skip to contentSkip to conversation

phy: sun4i-usb: Align H6 initialization logic with the kernel

PATCH New Roman Stratiienko 2 participants 3 messages May 12, 2020 – Jun 1, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 phy: sun4i-usb: Align H6 initialization logic with the kernel

H6 SOC needs additional initialization of PHY registers. Corresponding changes can be found in the kernel patch [1].

Without this changes there is no enumeration of 'musb' gadget.

[1] - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ae409cc7c3cdb9ac4a1dba3eae70efec3d6b6c79

Fixes 35fa673e0e5f ("sunxi: phy: Add USB PHY support for Allwinner H6")

---
CC: Ondrej Jirman <[email protected]>
CC: Icenowy Zheng <[email protected]>
CC: Marek Vasut <[email protected]>
CC: linux-sunxi at googlegroups.com

---
 drivers/phy/allwinner/phy-sun4i-usb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/phy/allwinner/phy-sun4i-usb.c +4 -2
index 612c428cf5..688ee7d4cc 100644
@@ -279,7 +279,8 @@ static int sun4i_usb_phy_init(struct phy *phy)
 		return ret;
 	}
 
-	if (data->cfg->type == sun8i_a83t_phy) {
+	if (data->cfg->type == sun8i_a83t_phy ||
+	    data->cfg->type == sun50i_h6_phy) {
 		if (phy->id == 0) {
 			val = readl(data->base + data->cfg->phyctl_offset);
 			val |= PHY_CTL_VBUSVLDEXT;
@@ -321,7 +322,8 @@ static int sun4i_usb_phy_exit(struct phy *phy)
 	int ret;
 
 	if (phy->id == 0) {
-		if (data->cfg->type == sun8i_a83t_phy) {
+		if (data->cfg->type == sun8i_a83t_phy ||
+		    data->cfg->type == sun50i_h6_phy) {
 			void __iomem *phyctl = data->base +
 				data->cfg->phyctl_offset;
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 phy: sun4i-usb: Align H6 initialization logic with the kernel

CC jagan at amarulasolutions.com

??, 12 ??? 2020 ?. ? 21:25, Roman Stratiienko <[email protected]>:

Quoted 46 lines

H6 SOC needs additional initialization of PHY registers. Corresponding changes can be found in the kernel patch [1].

Without this changes there is no enumeration of 'musb' gadget.

[1] - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ae409cc7c3cdb9ac4a1dba3eae70efec3d6b6c79

Fixes 35fa673e0e5f ("sunxi: phy: Add USB PHY support for Allwinner H6")

---
CC: Ondrej Jirman <[email protected]>
CC: Icenowy Zheng <[email protected]>
CC: Marek Vasut <[email protected]>
CC: linux-sunxi at googlegroups.com

---
 drivers/phy/allwinner/phy-sun4i-usb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/phy/allwinner/phy-sun4i-usb.c +4 -3
index 612c428cf5..688ee7d4cc 100644
@@ -279,7 +279,8 @@ static int sun4i_usb_phy_init(struct phy *phy)
                return ret;
        }
 
-       if (data->cfg->type == sun8i_a83t_phy) {
+       if (data->cfg->type == sun8i_a83t_phy ||
+           data->cfg->type == sun50i_h6_phy) {
                if (phy->id == 0) {
                        val = readl(data->base + data->cfg->phyctl_offset);
                        val |= PHY_CTL_VBUSVLDEXT;
@@ -321,7 +322,8 @@ static int sun4i_usb_phy_exit(struct phy *phy)
        int ret;
 
        if (phy->id == 0) {
-               if (data->cfg->type == sun8i_a83t_phy) {
+               if (data->cfg->type == sun8i_a83t_phy ||
+                   data->cfg->type == sun50i_h6_phy) {
                        void __iomem *phyctl = data->base +
                                data->cfg->phyctl_offset;
 
--

2.25.1

#2 lore raw

PATCH 1/1 phy: sun4i-usb: Align H6 initialization logic with the kernel

In reply to Roman Stratiienko
Quoted 11 lines · Roman Stratiienko

H6 SOC needs additional initialization of PHY registers. Corresponding changes can be found in the kernel patch [1].

Without this changes there is no enumeration of 'musb' gadget.

[1] - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ae409cc7c3cdb9ac4a1dba3eae70efec3d6b6c79

Fixes 35fa673e0e5f ("sunxi: phy: Add USB PHY support for Allwinner H6")

---

Applied to u-boot-sunxi/master