Pārlūkot izejas kodu

omap2: Fix GPIO numbers and smc91x for 2430sdp

Fix GPIO numbers and smc91x for 2430sdp. The earlier code
had cut and paste errors from 3430sdp code. Also, 2430
has five GPIO banks for a total of 160 GPIO lines.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren 15 gadi atpakaļ
vecāks
revīzija
25d6f63093
2 mainītis faili ar 4 papildinājumiem un 6 dzēšanām
  1. 1 5
      arch/arm/mach-omap2/board-2430sdp.c
  2. 3 1
      arch/arm/plat-omap/gpio.c

+ 1 - 5
arch/arm/mach-omap2/board-2430sdp.c

@@ -122,11 +122,7 @@ static struct omap_smc91x_platform_data board_smc91x_data = {
 
 
 static void __init board_smc91x_init(void)
 static void __init board_smc91x_init(void)
 {
 {
-	if (omap_rev() > OMAP3430_REV_ES1_0)
-		board_smc91x_data.gpio_irq = 6;
-	else
-		board_smc91x_data.gpio_irq = 29;
-
+	omap_mux_init_gpio(149, OMAP_PIN_INPUT);
 	gpmc_smc91x_init(&board_smc91x_data);
 	gpmc_smc91x_init(&board_smc91x_data);
 }
 }
 
 

+ 3 - 1
arch/arm/plat-omap/gpio.c

@@ -390,7 +390,9 @@ static inline int gpio_valid(int gpio)
 		return 0;
 		return 0;
 	if (cpu_is_omap7xx() && gpio < 192)
 	if (cpu_is_omap7xx() && gpio < 192)
 		return 0;
 		return 0;
-	if (cpu_is_omap24xx() && gpio < 128)
+	if (cpu_is_omap2420() && gpio < 128)
+		return 0;
+	if (cpu_is_omap2430() && gpio < 160)
 		return 0;
 		return 0;
 	if ((cpu_is_omap34xx() || cpu_is_omap44xx()) && gpio < 192)
 	if ((cpu_is_omap34xx() || cpu_is_omap44xx()) && gpio < 192)
 		return 0;
 		return 0;