Skip to contentSkip to conversation

MX2: devices.c: Fix typo in imx21 usb mem resource address

PATCH New Lars-Peter Clausen 2 participants 2 messages Apr 11, 2010

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

PATCH 1/1 MX2: devices.c: Fix typo in imx21 usb mem resource address

---
 arch/arm/mach-mx2/devices.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mx2/devices.c +2 -2
index b91e412..67182e1 100644
@@ -483,8 +483,8 @@ int __init mxc_register_gpios(void)
 #ifdef CONFIG_MACH_MX21
 static struct resource mx21_usbhc_resources[] = {
 	{
-		.start	= MX21_BASE_ADDR,
-		.end	= MX21_BASE_ADDR + 0x1FFF,
+		.start	= MX21_USBOTG_BASE_ADDR,
+		.end	= MX21_USBOTG_BASE_ADDR + 0x1FFF,
 		.flags	= IORESOURCE_MEM,
 	},
 	{
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH 1/1 MX2: devices.c: Fix typo in imx21 usb mem resource address

Hello,

this was introduced by

988addf (Merge branch 'origin' into devel-stable)

when trying to fix a (logic) merge conflict.

Quoted 10 lines · Lars-Peter Clausen
---
 arch/arm/mach-mx2/devices.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mx2/devices.c +0 -0
index b91e412..67182e1 100644

arch/arm/mach-mx2/devices.c int __init mxc_register_gpios(void) · line 487

Quoted 7 lines
arch/arm/mach-mx2/devices.c +2 -2
@@ -483,8 +483,8 @@ int __init mxc_register_gpios(void)
 #ifdef CONFIG_MACH_MX21
 static struct resource mx21_usbhc_resources[] = {
 	{
-		.start	= MX21_BASE_ADDR,
-		.end	= MX21_BASE_ADDR + 0x1FFF,
+		.start	= MX21_USBOTG_BASE_ADDR,
+		.end	= MX21_USBOTG_BASE_ADDR + 0x1FFF,

Would you mind making this

	... + 0x1fff,

as this is the only line left using capital letters for hex numbers in that file.

Thanks
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |