usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs
Subsystems (2)
PATCH v2 1/1 usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs
From: Igor Opaniuk <[email protected]>
This fixes the issues with calculation of controller indexes in ehci_usb_bind() for iMX7, as USB controllers on iMX7 SoCs aren't placed next to each other, and their addresses incremented by 0x10000.
Example of USB nodes for iMX7S/D:
usbotg1: usb at 30b10000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b10000 0x200>;
^^^^^^^^^^
....
usbotg2: usb at 30b20000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b20000 0x200>;
^^^^^^^^^^....
usbh: usb at 30b30000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b30000 0x200>;
^^^^^^^^^^....
Which was leading to usb enumeration issues:
Colibri iMX7 # usb start
starting USB...
Bus usb at 30b10000: USB EHCI 1.00
Bus usb at 30b20000: probe failed, error -22
scanning bus usb at 30b10000 for devices... 1 USB Device(s) found
scanning usb for storage devices... 0 Storage Device(s) found
---
v2:
- removed ifdefs and used runtime check of SoC
drivers/usb/host/ehci-mx6.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/usb/host/ehci-mx6.c +8 -7
@@ -513,10 +513,11 @@ static int ehci_usb_bind(struct udevice *dev)* from which it derives offsets in the PHY and ANATOP register sets. * * Here we attempt to calculate these indexes from DT information as -* well as we can. The USB controllers on all existing iMX6/iMX7 SoCs -* are placed next to each other, at addresses incremented by 0x200. -* Thus, the index is derived from the multiple of 0x200 offset from -* the first controller address. +* well as we can. The USB controllers on all existing iMX6 SoCs +* are placed next to each other, at addresses incremented by 0x200, +* and iMX7 their addresses are shifted by 0x10000. +* Thus, the index is derived from the multiple of 0x200 (0x10000 for +* iMX7) offset from the first controller address. * * However, to complete conversion of this driver to DT probing, the * following has to be done:
@@ -531,10 +532,10 @@ static int ehci_usb_bind(struct udevice *dev)* With these changes in place, the ad-hoc indexing goes away and * the driver is fully converted to DT probing. */ -fdt_size_t size; -fdt_addr_t addr =devfdt_get_addr_size_index (dev,0 , &size); +u32 controller_spacing =is_mx7 () ?0x10000 :0x200 ; +fdt_addr_t addr =devfdt_get_addr_index (dev,0 ); - dev->req_seq = (addr -USB_BASE_ADDR ) / size; + dev->req_seq = (addr -USB_BASE_ADDR ) / controller_spacing;return 0 ; }
Signature · 1 line
2.17.1
PATCH v2 1/1 usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs
Quoted 34 lines · Igor Opaniuk
From: Igor Opaniuk <[email protected]>
This fixes the issues with calculation of controller indexes in
ehci_usb_bind()for iMX7, as USB controllers on iMX7 SoCs aren't placed next to each other, and their addresses incremented by0x10000.Example of USB nodes for iMX7S/D:
usbotg1: usb at 30b10000 { compatible = "fsl,imx7d-usb", "fsl,imx27-usb"; reg = <0x30b10000 0x200>; ^^^^^^^^^^ .... usbotg2: usb at 30b20000 { compatible = "fsl,imx7d-usb", "fsl,imx27-usb"; reg = <0x30b20000 0x200>; ^^^^^^^^^^....
usbh: usb at 30b30000 { compatible = "fsl,imx7d-usb", "fsl,imx27-usb"; reg = <0x30b30000 0x200>; ^^^^^^^^^^....
Which was leading to usb enumeration issues:
Colibri iMX7 # usb start
starting USB...
Bus usb at30b10000: USB EHCI 1.00
Bus usb at30b20000: probe failed, error -22
scanning bus usb at30b10000for devices... 1 USB Device(s) found
scanning usb for storage devices... 0 Storage Device(s) found
Quoted 2 lines
Fixes 501547cec1("usb: ehci-mx6: Fix bus enumeration for DM case")Signed-off-by Igor Opaniuk <[email protected]>
Quoted 53 lines
---
v2:
- removed ifdefs and used runtime check of SoCdrivers/usb/host/ehci-mx6.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)drivers/usb/host/ehci- renamed from drivers/usb/host/ehci-mx6.c +0
-0
mx6.c
indexe9e6ed596d..7d46091f94100644drivers/usb/host/ehci-mx6.c +0
-0@@ -513,10 +513,11 @@ static int ehci_usb_bind(struct udevice *dev)* from which it derives offsets in the PHY and ANATOP register sets.
drivers/usb/host/ehci-mx6.c +0
-0* * Here we attempt to calculate these indexes from DT information as
drivers/usb/host/ehci-mx6.c +0
-1-* well as we can. The USB controllers on all existing iMX6/iMX7 SoCs
drivers/usb/host/ehci-mx6.c +0
-1-* are placed next to each other, at addresses incremented by
0x200.drivers/usb/host/ehci-mx6.c +0
-1-* Thus, the index is derived from the multiple of 0x200 offset from
drivers/usb/host/ehci-mx6.c +1
-1-* the first controller address. +* well as we can. The USB controllers on all existing iMX6 SoCs
drivers/usb/host/ehci-mx6.c +1
-0+* are placed next to each other, at addresses incremented by
0x200,drivers/usb/host/ehci-mx6.c +2
-0+* and iMX7 their addresses are shifted by 0x10000. +* Thus, the index is derived from the multiple of 0x200 (
0x10000fordrivers/usb/host/ehci-mx6.c +1
-0+* iMX7) offset from the first controller address. * * However, to complete conversion of this driver to DT probing, the
drivers/usb/host/ehci-mx6.c +0
-0* following has to be done: @@ -531,10 +532,10 @@ static int ehci_usb_bind(struct udevice *dev)* With these changes in place, the ad-hoc indexing goes away and
drivers/usb/host/ehci-mx6.c +3
-3* the driver is fully converted to DT probing. */ -fdt_size_t size; -fdt_addr_t addr =devfdt_get_addr_size_index (dev,0 , &size); +u32 controller_spacing =is_mx7 () ?0x10000 :0x200 ; +fdt_addr_t addr =devfdt_get_addr_index (dev,0 ); - dev->req_seq = (addr -USB_BASE_ADDR ) / size; + dev->req_seq = (addr -USB_BASE_ADDR ) / controller_spacing;return 0 ; }
Marek Vasut
AppliedPATCH v2 1/1 usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs
In reply to Igor OpaniukQuoted 7 lines · Igor Opaniuk
From: Igor Opaniuk <[email protected]>
This fixes the issues with calculation of controller indexes in
ehci_usb_bind()for iMX7, as USB controllers on iMX7 SoCs aren't placed next to each other, and their addresses incremented by0x10000.Example of USB nodes for iMX7S/D:
[...]
Applied, thanks.