diff options
author | Lokesh Vutla <lokeshvutla@ti.com> | 2013-06-13 06:53:58 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-06-18 06:10:53 -0400 |
commit | 8fb61e8d84e673eebf31e564a83bb71a50b1ed48 (patch) | |
tree | 14181a193a223b5195e11ad8b2600d207a56d67b /arch/arm | |
parent | 863c9638f451085dd223a307d7b7ce16457fe31b (diff) |
ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN
On 37xx EVM non-dt boot fails with current mainline,
because of broken GPIO numbering in the board file
that uses hardcoded GPIOs.
So marking omap3_evm_display_init() with CONFIG_BROKEN
for now as suggested by Tony as per the below link:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg90399.html
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Tested-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index f76d0de7b406..8c026269baca 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -174,6 +174,7 @@ static struct panel_sharp_ls037v7dw01_data omap3_evm_lcd_data = { | |||
174 | .ud_gpio = OMAP3EVM_LCD_PANEL_UD, | 174 | .ud_gpio = OMAP3EVM_LCD_PANEL_UD, |
175 | }; | 175 | }; |
176 | 176 | ||
177 | #ifdef CONFIG_BROKEN | ||
177 | static void __init omap3_evm_display_init(void) | 178 | static void __init omap3_evm_display_init(void) |
178 | { | 179 | { |
179 | int r; | 180 | int r; |
@@ -193,6 +194,7 @@ static void __init omap3_evm_display_init(void) | |||
193 | else | 194 | else |
194 | gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1); | 195 | gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1); |
195 | } | 196 | } |
197 | #endif | ||
196 | 198 | ||
197 | static struct omap_dss_device omap3_evm_lcd_device = { | 199 | static struct omap_dss_device omap3_evm_lcd_device = { |
198 | .name = "lcd", | 200 | .name = "lcd", |
@@ -715,7 +717,9 @@ static void __init omap3_evm_init(void) | |||
715 | 717 | ||
716 | omap_ads7846_init(1, OMAP3_EVM_TS_GPIO, 310, NULL); | 718 | omap_ads7846_init(1, OMAP3_EVM_TS_GPIO, 310, NULL); |
717 | omap3evm_init_smsc911x(); | 719 | omap3evm_init_smsc911x(); |
720 | #ifdef CONFIG_BROKEN | ||
718 | omap3_evm_display_init(); | 721 | omap3_evm_display_init(); |
722 | #endif | ||
719 | omap3_evm_wl12xx_init(); | 723 | omap3_evm_wl12xx_init(); |
720 | omap_twl4030_audio_init("omap3evm", NULL); | 724 | omap_twl4030_audio_init("omap3evm", NULL); |
721 | } | 725 | } |