Skip to contentSkip to conversation

omap3: beaglexm: fix user button.

PATCH New Javier Martin 3 participants 3 messages Mar 17, 2011 – Mar 18, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Javier Martin

author
#0 lore raw

PATCH 1/1 omap3: beaglexm: fix user button.

User push button in Beagleboard xM is 4 instead of 7.

Signed-off-by Javier Martin <[email protected]>
---
 arch/arm/mach-omap2/board-omap3beagle.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-omap3beagle.c +4 -0
index 46d814a..abf87d1 100644
@@ -615,6 +615,10 @@ static void __init omap3_beagle_init(void)
 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 	omap3_beagle_init_rev();
 	omap3_beagle_i2c_init();
+	/* xM version uses pin 4 instead of 7 for user button */
+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
+		gpio_buttons[0].gpio = 4;
+	}
 	platform_add_devices(omap3_beagle_devices,
 			ARRAY_SIZE(omap3_beagle_devices));
 	omap_serial_init();
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 omap3: beaglexm: fix user button.

Op 17 mrt 2011, om 13:44 heeft Javier Martin het volgende geschreven:

Quoted 12 lines

User push button in Beagleboard xM is 4 instead of 7.

Signed-off-by Javier Martin <[email protected]>

---
arch/arm/mach-omap2/board-omap3beagle.c | 4 ++++

1 files changed, 4 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-omap3beagle.c +0 -0
index 46d814a..abf87d1 100644

arch/arm/mach-omap2/board-omap3beagle.c static void __init omap3_beagle_init(void) · line 624

Quoted 10 lines
arch/arm/mach-omap2/board-omap3beagle.c +4 -0
@@ -615,6 +615,10 @@ static void __init omap3_beagle_init(void)
 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 	omap3_beagle_init_rev();
 	omap3_beagle_i2c_init();
+	/* xM version uses pin 4 instead of 7 for user button */
+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
+		gpio_buttons[0].gpio = 4;
+	}
 	platform_add_devices(omap3_beagle_devices,
 			ARRAY_SIZE(omap3_beagle_devices));
 	omap_serial_init();

I (well, Jason) has a changed queued up for that which included xM revision C support as well. What are the odds of such a patch getting into .39rc? If the odds aren't good I would suggest to wait for Jason to send the complete patch that fixes the above and similar issues for xM-C.

regards,

Koen

#2 lore raw

PATCH 1/1 omap3: beaglexm: fix user button.

In reply to Javier Martin

Hello.

Quoted 3 lines · Javier Martin

User push button in Beagleboard xM is 4 instead of 7.

Signed-off-by Javier Martin<[email protected]>

[...]

arch/arm/mach-omap2/board-omap3beagle.c static void __init omap3_beagle_init(void) · line 621

Quoted 12 lines
arch/arm/mach-omap2/board-omap3beagle.c +4 -0
index 46d814a..abf87d1 100644
@@ -615,6 +615,10 @@ static void __init omap3_beagle_init(void)
  	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
  	omap3_beagle_init_rev();
  	omap3_beagle_i2c_init();
+	/* xM version uses pin 4 instead of 7 for user button */
+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
+		gpio_buttons[0].gpio = 4;
+	}

I think checkpatch.pl should warn about unneeded {}.

WBR, Sergei