Skip to contentSkip to conversation

usb: ehci-mx6: Remove MX6Q_ARM2 related ifdefery

PATCH In review Fabio Estevam 3 participants 3 messages May 19, 2022 – Jul 25, 2022

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

PATCH 1/1 usb: ehci-mx6: Remove MX6Q_ARM2 related ifdefery

From: Fabio Estevam <[email protected]>

The imx6q arm2 board support has been removed from U-Boot as it did not get converted to DM.

Remove the MX6Q_ARM2 related ifdefery in the driver.

---
 drivers/usb/host/ehci-mx6.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/usb/host/ehci-mx6.c +0 -5
index 060b02accc5c..e30449b55e47 100644
@@ -272,12 +272,7 @@ static void usb_oc_config(struct usbnc_regs *usbnc, int index)
 {
 	void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]);
 
-#if CONFIG_MACH_TYPE == MACH_TYPE_MX6Q_ARM2
-	/* mx6qarm2 seems to required a different setting*/
-	clrbits_le32(ctrl, UCTRL_OVER_CUR_POL);
-#else
 	setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
-#endif
 
 	setbits_le32(ctrl, UCTRL_OVER_CUR_DIS);
 
Signature · 1 line
2.25.1
#1 lore raw

Hi Fabio

Quoted 18 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

The imx6q arm2 board support has been removed from U-Boot as it did not get converted to DM.

Remove the MX6Q_ARM2 related ifdefery in the driver.

---
 drivers/usb/host/ehci-mx6.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/usb/host/ehci-mx6.c +0 -0
index 060b02accc5c..e30449b55e47 100644

drivers/usb/host/ehci-mx6.c static void usb_oc_config(struct usbnc_regs *usbnc, int index) · line 276

Quoted 10 lines
drivers/usb/host/ehci-mx6.c +0 -5
@@ -272,12 +272,7 @@ static void usb_oc_config(struct usbnc_regs *usbnc, int index)
 {
        void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]);
 
-#if CONFIG_MACH_TYPE == MACH_TYPE_MX6Q_ARM2
-       /* mx6qarm2 seems to required a different setting*/
-       clrbits_le32(ctrl, UCTRL_OVER_CUR_POL);
-#else
        setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
-#endif
 

Is this supported by linux as dts property? If so can you just convert it and drop the define?

Michael

Quoted 6 lines
drivers/usb/host/ehci-mx6.c +0 -1
        setbits_le32(ctrl, UCTRL_OVER_CUR_DIS);
 
 
--

2.25.1

--
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
[email protected]
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
[email protected]
www.amarulasolutions.com

#2 lore raw

PATCH 1/1 usb: ehci-mx6: Remove MX6Q_ARM2 related ifdefery

In reply to Fabio Estevam
Quoted 5 lines

From: Fabio Estevam <[email protected]>
The imx6q arm2 board support has been removed from U-Boot as it did not get converted to DM.
Remove the MX6Q_ARM2 related ifdefery in the driver.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================