Skip to contentSkip to conversation

ARM: OMAP: Fix OMAP1 compilation after MPUIO check change.

PATCH Jonathan McDowell 3 participants 3 messages Aug 9, 2006 – Aug 11, 2006

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Jonathan McDowell

author
#0 lore raw

The recent MPUIO range change fix breaks compilation if CONFIG_ARCH_OMAP24XX isn't defined; it should be OMAP_MAX_GPIO_LINES not MAX_GPIO_LINES I believe. This one liner fixes it.

Signed-off-by Jonathan McDowell <[email protected]>

-----

arch/arm/plat-omap/gpio.c +1 -1
index d5221b2..b27ba0e 100644
@@ -216,7 +216,7 @@ static inline int gpio_valid(int gpio)
 		return -1;
 #ifndef CONFIG_ARCH_OMAP24XX
 	if (OMAP_GPIO_IS_MPUIO(gpio)) {
-		if (gpio >= MAX_GPIO_LINES + 16)
+		if (gpio >= OMAP_MAX_GPIO_LINES + 16)
 			return -1;
 		return 0;
 	}

-----

J.

Signature · 1 line
noodles is not a sign of poor table manners
#1 lore raw
Quoted 4 lines · Jonathan McDowell

The recent MPUIO range change fix breaks compilation if CONFIG_ARCH_OMAP24XX isn't defined; it should be OMAP_MAX_GPIO_LINES not MAX_GPIO_LINES I believe. This one liner fixes it.

Thanks, this works for me on my 1611 H2 with today's 2.6.18-rc4 from git. Mark.

#2 lore raw
Quoted 8 lines · Mark Howell
Quoted 4 lines · Jonathan McDowell

The recent MPUIO range change fix breaks compilation if CONFIG_ARCH_OMAP24XX isn't defined; it should be OMAP_MAX_GPIO_LINES not MAX_GPIO_LINES I believe. This one liner fixes it.

Thanks, this works for me on my 1611 H2 with today's 2.6.18-rc4 from git. Mark.

Good to hear! Pushing today.

Tony