diff options
author | Koen Kooi <koen@openembedded.org> | 2010-06-07 12:14:52 +0200 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2010-06-07 12:57:16 +0200 |
commit | 87ec7b6c9a418455f3d05139a0832c73eba292c7 (patch) | |
tree | cb73d57a7c21d24d5c72f7289af6d04a1df04e14 /recipes/linux/linux-omap-psp-2.6.32/0048-HACK-try-to-poweron-stuff-on-xM-rev-A.patch | |
parent | 144015f3021e08f8cc0afa6f54ffdfd79067b990 (diff) |
linux-omap-psp 2.6.32: rebase patches onto new baseline
Diffstat (limited to 'recipes/linux/linux-omap-psp-2.6.32/0048-HACK-try-to-poweron-stuff-on-xM-rev-A.patch')
-rw-r--r-- | recipes/linux/linux-omap-psp-2.6.32/0048-HACK-try-to-poweron-stuff-on-xM-rev-A.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0048-HACK-try-to-poweron-stuff-on-xM-rev-A.patch b/recipes/linux/linux-omap-psp-2.6.32/0048-HACK-try-to-poweron-stuff-on-xM-rev-A.patch new file mode 100644 index 0000000000..19a235ac37 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/0048-HACK-try-to-poweron-stuff-on-xM-rev-A.patch @@ -0,0 +1,60 @@ +From 258a962bea2da43df6f70fd264a0e23b65669176 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Tue, 4 May 2010 17:04:27 +0200 +Subject: [PATCH 48/48] HACK: try to poweron stuff on xM rev A + +--- + arch/arm/mach-omap2/board-omap3beagle.c | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index b313350..7f0e241 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -237,7 +237,6 @@ static struct omap_dss_device beagle_dvi_device = { + .name = "dvi", + .driver_name = "generic_panel", + .phy.dpi.data_lines = 24, +- .reset_gpio = 170, + .platform_enable = beagle_enable_dvi, + .platform_disable = beagle_disable_dvi, + }; +@@ -364,6 +363,9 @@ static int beagle_twl_gpio_setup(struct device *dev, + */ + + if (cpu_is_omap3630()) { ++ /* DVI reset GPIO is different between revisions */ ++ beagle_dvi_device.reset_gpio = 129; ++ + /* Power on DVI, Serial and PWR led */ + gpio_request(gpio + 1, "nDVI_PWR_EN"); + gpio_direction_output(gpio + 1, 0); +@@ -374,9 +376,12 @@ static int beagle_twl_gpio_setup(struct device *dev, + + /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ + gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); +- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); ++ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); + } + else { ++ /* DVI reset GPIO is different between revisions */ ++ beagle_dvi_device.reset_gpio = 170; ++ + gpio_request(gpio + 1, "EHCI_nOC"); + gpio_direction_input(gpio + 1); + +@@ -735,11 +740,6 @@ static void __init omap3_beagle_init(void) + ARRAY_SIZE(omap3_beagle_devices)); + 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); +- + if(!strcmp(expansionboard_name, "zippy")) + { + printk(KERN_INFO "Beagle expansionboard: initializing enc28j60\n"); +-- +1.6.6.1 + |