From 19fe60d2d723c403620caaf297956a3303c5d155 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Fri, 28 Jan 2011 02:10:37 -0200 Subject: omap3: beaglexm: fix DVI initialization Function beagle_twl_gpio_setup is called after beagle_display_init, what makes lets reset_gpio with an invalid value at the time it request the gpio. As a side effect the DVI reset GPIO is not properly set. Also removing old code that power down DVI in a hardcoded way, as it's not necessary anymore. Tested with Beagle-xM and C4. Signed-off-by: Ricardo Salveti de Araujo --- arch/arm/mach-omap2/board-omap3beagle.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 34b0cb4d189..831e98d2ebb 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -244,6 +244,12 @@ static void __init beagle_display_init(void) { int r; + /* DVI reset GPIO is different between beagle revisions */ + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) + beagle_dvi_device.reset_gpio = 129; + else + beagle_dvi_device.reset_gpio = 170; + r = gpio_request(beagle_dvi_device.reset_gpio, "DVI reset"); if (r < 0) { printk(KERN_ERR "Unable to get DVI reset GPIO\n"); @@ -320,12 +326,6 @@ static int beagle_twl_gpio_setup(struct device *dev, else gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); - /* DVI reset GPIO is different between beagle revisions */ - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) - beagle_dvi_device.reset_gpio = 129; - else - beagle_dvi_device.reset_gpio = 170; - /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; @@ -665,11 +665,6 @@ static void __init omap3_beagle_init(void) omap_display_init(&beagle_dss_data); omap_serial_init(); - omap_mux_init_gpio(170, OMAP_PIN_INPUT); - gpio_request(170, "DVI_nPD"); - /* REVISIT leave DVI powered down until it's needed ... */ - gpio_direction_output(170, true); - usb_musb_init(&musb_board_data); usbhs_init(&usbhs_bdata); omap3beagle_flash_init(); -- cgit v1.2.3 From c635e295e4d49d5d6d224da5b85987aa21603a7c Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 26 Apr 2011 01:59:58 -0300 Subject: omap3: beagle: detect new xM revision B The xM B uses a DM3730 ES1.1 over the ES1.0 on xM A's, no other board changes. BugLink: http://bugs.launchpad.net/bugs/770679 Signed-off-by: Robert Nelson Signed-off-by: Ricardo Salveti de Araujo --- arch/arm/mach-omap2/board-omap3beagle.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 831e98d2ebb..ef1b129f440 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -62,7 +62,8 @@ * AXBX = GPIO173, GPIO172, GPIO171: 1 1 1 * C1_3 = GPIO173, GPIO172, GPIO171: 1 1 0 * C4 = GPIO173, GPIO172, GPIO171: 1 0 1 - * XM = GPIO173, GPIO172, GPIO171: 0 0 0 + * XMA = GPIO173, GPIO172, GPIO171: 0 0 0 + * XMB = GPIO173, GPIO172, GPIO171: 0 0 1 */ enum { OMAP3BEAGLE_BOARD_UNKN = 0, @@ -121,7 +122,11 @@ static void __init omap3_beagle_init_rev(void) omap3_beagle_version = OMAP3BEAGLE_BOARD_C4; break; case 0: - printk(KERN_INFO "OMAP3 Beagle Rev: xM\n"); + printk(KERN_INFO "OMAP3 Beagle Rev: xM A\n"); + omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; + break; + case 1: + printk(KERN_INFO "OMAP3 Beagle Rev: xM B\n"); omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; break; default: -- cgit v1.2.3 From 644e870df08d063705718daef2dfc4cc233c881d Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 26 Apr 2011 02:09:44 -0300 Subject: omap3: beagle: detect new xM revision C Beagle xM rev C has nEN_USB_PWR inverted again, so we need proper check for revision C. BugLink: http://bugs.launchpad.net/bugs/770679 Signed-off-by: Robert Nelson Signed-off-by: Ricardo Salveti de Araujo --- arch/arm/mach-omap2/board-omap3beagle.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index ef1b129f440..b64b705b8dd 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -64,6 +64,7 @@ * C4 = GPIO173, GPIO172, GPIO171: 1 0 1 * XMA = GPIO173, GPIO172, GPIO171: 0 0 0 * XMB = GPIO173, GPIO172, GPIO171: 0 0 1 + * XMC = GPIO173, GPIO172, GPIO171: 0 1 0 */ enum { OMAP3BEAGLE_BOARD_UNKN = 0, @@ -71,6 +72,7 @@ enum { OMAP3BEAGLE_BOARD_C1_3, OMAP3BEAGLE_BOARD_C4, OMAP3BEAGLE_BOARD_XM, + OMAP3BEAGLE_BOARD_XMC, }; static u8 omap3_beagle_version; @@ -129,6 +131,10 @@ static void __init omap3_beagle_init_rev(void) printk(KERN_INFO "OMAP3 Beagle Rev: xM B\n"); omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; break; + case 2: + printk(KERN_INFO "OMAP3 Beagle Rev: xM C\n"); + omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC; + break; default: printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev); omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN; @@ -250,7 +256,8 @@ static void __init beagle_display_init(void) int r; /* DVI reset GPIO is different between beagle revisions */ - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) + if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) || + (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)) beagle_dvi_device.reset_gpio = 129; else beagle_dvi_device.reset_gpio = 170; @@ -290,7 +297,8 @@ static int beagle_twl_gpio_setup(struct device *dev, { int r; - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) || + (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)) { mmc[0].gpio_wp = -EINVAL; } else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) { @@ -310,7 +318,8 @@ static int beagle_twl_gpio_setup(struct device *dev, /* REVISIT: need ehci-omap hooks for external VBUS * power switch and overcurrent detect */ - if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) { + if ((omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) && + (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC)) { r = gpio_request(gpio + 1, "EHCI_nOC"); if (!r) { r = gpio_direction_input(gpio + 1); @@ -340,7 +349,8 @@ static int beagle_twl_gpio_setup(struct device *dev, * P7/P8 revisions(prototype): Camera EN * A2+ revisions (production): LDO (supplies DVI, serial, led blocks) */ - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) || + (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)) { r = gpio_request(gpio + 1, "nDVI_PWR_EN"); if (!r) { r = gpio_direction_output(gpio + 1, 0); -- cgit v1.2.3 From 0ca81733d6335fe29203d7e58fd4d5e5bff2593f Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 26 Apr 2011 02:12:11 -0300 Subject: omap3: beagle: if rev unknown, assume xM revision C BugLink: http://bugs.launchpad.net/bugs/770679 Signed-off-by: Robert Nelson Signed-off-by: Ricardo Salveti de Araujo --- arch/arm/mach-omap2/board-omap3beagle.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index b64b705b8dd..4fcd1300d5d 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -136,8 +136,9 @@ static void __init omap3_beagle_init_rev(void) omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC; break; default: - printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev); - omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN; + printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd, " + "assuming xM C or newer\n", beagle_rev); + omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC; } return; -- cgit v1.2.3