USB: EHCI: Tegra: Fix wrong register definition
PATCH 1/1 USB: EHCI: Tegra: Fix wrong register definition
Fix the issue that EHCI registers, hostpc[0] and usbmode_ex, are not correctly accessed on Tegra3 platform.
Signed-off-by Jim Lin <[email protected]>
--- include/linux/usb/ehci_def.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
include/linux/usb/ehci_def.h +3 -3
@@ -171,18 +171,18 @@ struct ehci_regs {#define USBMODE_CM_HC (3<<0)/* host controller mode */ #define USBMODE_CM_IDLE (0<<0)/* idle state */ -u32 reserved4[7 ]; +u32 reserved4[6 ];/* Moorestown has some non-standard registers, partially due to the fact that * its EHCI controller has both TT and LPM support. HOSTPCx are extensions to * PORTSCx */ /* HOSTPC: offset 0x84 */ -u32 hostpc[0 ];/* HOSTPC extension */ +u32 hostpc[1 ];/* HOSTPC extension */ #define HOSTPC_PHCD (1<<22)/* Phy clock disable */ #define HOSTPC_PSPD (3<<25)/* Port speed detection */ -u32 reserved5[17 ]; +u32 reserved5[16 ];/* USBMODE_EX: offset 0xc8 */ u32 usbmode_ex;/* USB Device mode extension */
Signature · 1 line
1.7.3
Quoted 24 lines · Jim Lin
Fix the issue that EHCI registers, hostpc[0] and
usbmode_ex, are not correctly accessed on Tegra3 platform.Signed-off-by Jim Lin <[email protected]>--- include/linux/usb/ehci_def.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)include/linux/usb/ehci_def.h +1
-1@@ -171,18 +171,18 @@ struct ehci_regs {#define USBMODE_CM_HC (3<<0)/* host controller mode */ #define USBMODE_CM_IDLE (0<<0)/* idle state */ -u32 reserved4[7 ]; +u32 reserved4[6 ];/* Moorestown has some non-standard registers, partially due to the fact that * its EHCI controller has both TT and LPM support. HOSTPCx are extensions to * PORTSCx */ /* HOSTPC: offset 0x84 */
include/linux/usb/ehci_def.h struct ehci_regs { · line 188
Quoted 10 lines
include/linux/usb/ehci_def.h +2
-2-u32 hostpc[0 ];/* HOSTPC extension */ +u32 hostpc[1 ];/* HOSTPC extension */ #define HOSTPC_PHCD (1<<22)/* Phy clock disable */ #define HOSTPC_PSPD (3<<25)/* Port speed detection */ -u32 reserved5[17 ]; +u32 reserved5[16 ];/* USBMODE_EX: offset 0xc8 */ u32 usbmode_ex;/* USB Device mode extension */
I was _certain_ this had been done correctly. Oh well, it just goes to show you can't be too careful. Thanks for fixing the mistake in reserved4.
By the way, it is certain that the HOSTPC register will never be used on controllers having more than one port? If that's not certain, you should leave the array size of hostpc set to 0.
Acked-by Alan Stern <[email protected]>
Alan Stern