Texas Instruments Limited, 800 Pavilion Drive, Northampton, NN4 7YL. Registered in England & Wales under company number 00574102 ________________________________________ From: Fernandes, Joel A Sent: 03 June 2011 23:56 To: linux-omap@xxxxxxxxxxxxxxx Cc: beagle@xxxxxxxxxxx - Ultra-low cost OMAP3 board (May contain non-TIers); beagleboard@xxxxxxxxxxxxxxxx; Maupin, Chase Subject: [beagle] [PATCH v6] OMAP3: beagle: add support for beagleboard xM revision C The USB enable GPIO has been in beagleboard xM revision C The USER button has been moved since beagleboard xM Also, board specific initialization has been moved to beagle_config struct and initialized in omap3_beagle_init_rev. Default values in struct are for xMC. Signed-off-by: Joel A Fernandes <joelagnel@xxxxxx> Signed-off-by: Koen Kooi <koen@xxxxxxxxxxxxxxxxxxxxx> --- arch/arm/mach-omap2/board-omap3beagle.c | 70 ++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 7f21d24..261fb53 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -276,9 +297,7 @@ static int beagle_twl_gpio_setup(struct device *dev, * high / others active low) * DVI reset GPIO is different between beagle revisions */ - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { - usb_pwr_level = GPIOF_OUT_INIT_HIGH; - beagle_dvi_device.reset_gpio = 129; + if (cpu_is_omap3630()) { PLease add a comment like "valid for all xM versions" to the above. @@ -526,7 +545,7 @@ static void __init beagle_opp_init(void) } /* Custom OPP enabled for XM */ - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + if (cpu_is_omap3630()) { same @@ -566,6 +585,9 @@ static void __init omap3_beagle_init(void) omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_beagle_init_rev(); omap3_beagle_i2c_init(); + + gpio_buttons[0].gpio = beagle_config.usr_button_gpio; + And please move that into static struct gpio_keys_button gpio_buttons[] = { { .code = BTN_EXTRA, .gpio = 7, <- there .desc = "user", .wakeup = 1, }, } regards, Koen -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html