[PATCH] ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN

[PATCH] ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN

[Lokesh Vutla]

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 at vger.kernel.org/msg90399.html

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 arch/arm/mach-omap2/board-omap3evm.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index f76d0de..278bf25 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 = {
 	.ud_gpio = OMAP3EVM_LCD_PANEL_UD,
 };
 
+#ifdef CONFIG_BROKEN
 static void __init omap3_evm_display_init(void)
 {
 	int r;
@@ -193,6 +194,7 @@ static void __init omap3_evm_display_init(void)
 	else
 		gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
 }
+#endif
 
 static struct omap_dss_device omap3_evm_lcd_device = {
 	.name			= "lcd",
@@ -715,7 +717,9 @@ static void __init omap3_evm_init(void)
 
 	omap_ads7846_init(1, OMAP3_EVM_TS_GPIO, 310, NULL);
 	omap3evm_init_smsc911x();
+#ifdef CONFIG_BROKEN
 	omap3_evm_display_init();
+#endif
 	omap3_evm_wl12xx_init();
 	omap_twl4030_audio_init("omap3evm", NULL);
 }
-- 
1.7.9.5

[PATCH] ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN

[Paul Walmsley]

On Thu, 13 Jun 2013, Lokesh Vutla wrote:

> 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 at vger.kernel.org/msg90399.html
> 
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> ---

Tested-by: Paul Walmsley <paul@pwsan.com>

- Paul

[PATCH] ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [130613 19:44]:
> On Thu, 13 Jun 2013, Lokesh Vutla wrote:
> 
> > 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 at vger.kernel.org/msg90399.html
> > 
> > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> ---
> 
> Tested-by: Paul Walmsley <paul@pwsan.com>

Thanks applying into omap-for-v3.11/board.

Regards,

Tony

[PATCH] ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN

[Paul Walmsley]

On Tue, 18 Jun 2013, Tony Lindgren wrote:

> * Paul Walmsley <paul@pwsan.com> [130613 19:44]:
> > On Thu, 13 Jun 2013, Lokesh Vutla wrote:
> > 
> > > 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 at vger.kernel.org/msg90399.html
> > > 
> > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> ---
> > 
> > Tested-by: Paul Walmsley <paul@pwsan.com>
> 
> Thanks applying into omap-for-v3.11/board.

This one is probably a candidate for v3.10-rc...  Otherwise 37xx EVM won't 
boot on v3.10.


- Paul

[PATCH] ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN

[Paul Walmsley]

From: Lokesh Vutla <lokeshvutla@ti.com>

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 at 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>

---

Hi -stablers,

OMAP37xx EVM does not boot on v3.10 without this patch, so please consider 
it for the v3.10 stable releases.  It is upstream already as commit ID 
8fb61e8d84e673eebf31e564a83bb71a50b1ed48.  Perhaps if I had managed to 
test it sooner, we could have gotten it up during v3.10-rc, but, alas, 
stable it is...

 arch/arm/mach-omap2/board-omap3evm.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index f76d0de..278bf25 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 = {
 	.ud_gpio = OMAP3EVM_LCD_PANEL_UD,
 };
 
+#ifdef CONFIG_BROKEN
 static void __init omap3_evm_display_init(void)
 {
 	int r;
@@ -193,6 +194,7 @@ static void __init omap3_evm_display_init(void)
 	else
 		gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
 }
+#endif
 
 static struct omap_dss_device omap3_evm_lcd_device = {
 	.name			= "lcd",
@@ -715,7 +717,9 @@ static void __init omap3_evm_init(void)
 
 	omap_ads7846_init(1, OMAP3_EVM_TS_GPIO, 310, NULL);
 	omap3evm_init_smsc911x();
+#ifdef CONFIG_BROKEN
 	omap3_evm_display_init();
+#endif
 	omap3_evm_wl12xx_init();
 	omap_twl4030_audio_init("omap3evm", NULL);
 }
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN

[Sergei Shtylyov]

Hello.

On 22-07-2013 9:29, Paul Walmsley wrote:

> From: Lokesh Vutla <lokeshvutla@ti.com>

> 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 at 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>

> ---

> Hi -stablers,

> OMAP37xx EVM does not boot on v3.10 without this patch, so please consider
> it for the v3.10 stable releases.  It is upstream already as commit ID
> 8fb61e8d84e673eebf31e564a83bb71a50b1ed48.  Perhaps if I had managed to
> test it sooner, we could have gotten it up during v3.10-rc, but, alas,
> stable it is...

>   arch/arm/mach-omap2/board-omap3evm.c |    4 ++++
>   1 file changed, 4 insertions(+)

> diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> index f76d0de..278bf25 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 = {
>   	.ud_gpio = OMAP3EVM_LCD_PANEL_UD,
>   };
>
> +#ifdef CONFIG_BROKEN
>   static void __init omap3_evm_display_init(void)
>   {
>   	int r;
> @@ -193,6 +194,7 @@ static void __init omap3_evm_display_init(void)
>   	else
>   		gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
>   }

    Perhaps it's better to follow what Documentation/SubmittingPatches suggests:

#else
static inline __init void omap3_evm_display_init(void) {}

> +#endif
>
>   static struct omap_dss_device omap3_evm_lcd_device = {
>   	.name			= "lcd",
> @@ -715,7 +717,9 @@ static void __init omap3_evm_init(void)
>
>   	omap_ads7846_init(1, OMAP3_EVM_TS_GPIO, 310, NULL);
>   	omap3evm_init_smsc911x();
> +#ifdef CONFIG_BROKEN
>   	omap3_evm_display_init();
> +#endif

    ... and eliminate #ifdef here?

WBR, Sergei

[PATCH] ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN

[Paul Walmsley]

Hi Sergei

On Mon, 22 Jul 2013, Sergei Shtylyov wrote:

>    Perhaps it's better to follow what Documentation/SubmittingPatches
> suggests:
> 
> #else
> static inline __init void omap3_evm_display_init(void) {}

...

>    ... and eliminate #ifdef here?

While I agree with you in principle, the original patch is already merged.  
In my view, it's not worth checking in another patch on top of it to 
address such a cosmetic, non-functional issue.  I certainly don't think 
it's worth delaying getting v3.10-stable to boot on 37xx EVM...


- Paul