ARM: OMAP2+: N900: remove omapdss init for DT boot

PATCH In review Sebastian Reichel 4 participants 6 messages Apr 8, 2014 – Apr 18, 2014

Subsystems (3)

Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Sebastian Reichel

author

2014-04-08 20:51 UTC #0 lore raw

PATCH 1/1 ARM: OMAP2+: N900: remove omapdss init for DT boot

Do not try to initialize display for DT boot, since omapdss is now initialized via Device Tree. Without this patch the display subsystem does not properly come up.

Signed-off-by Sebastian Reichel <[email protected]>

---
Hi,

This patch should be added to 3.15-rc to make display initialization via DT possible. Sorry for not noticing earlier, that this was missing in Tomi's patchset.

-- Sebastian

---
 arch/arm/mach-omap2/board-rx51-video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-omap2/board-rx51-video.c +1 -1

index 43a90c8..9cfebc5 100644
@@ -48,7 +48,7 @@ static struct omap_dss_board_info rx51_dss_board_info = {
 
 static int __init rx51_video_init(void)
 {
-	if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
+	if (!machine_is_nokia_rx51())
 		return 0;
 
 	if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) {

Signature · 1 line

1.9.1

Aaro Koskinen

maintainer

2014-04-08 21:44 UTC #1 lore raw

Hi,

Quoted 22 lines · Sebastian Reichel

Do not try to initialize display for DT boot, since omapdss is now initialized via Device Tree. Without this patch the display subsystem does not properly come up.
Signed-off-by Sebastian Reichel <[email protected]>
---
Hi,
This patch should be added to 3.15-rc to make display initialization via DT possible. Sorry for not noticing earlier, that this was missing in Tomi's patchset.
-- Sebastian
---
 arch/arm/mach-omap2/board-rx51-video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/board-rx51-video.c +0 -0
index 43a90c8..9cfebc5 100644

arch/arm/mach-omap2/board-rx51-video.c static struct omap_dss_board_info rx51_dss_board_info = { · line 52

Quoted 6 lines

arch/arm/mach-omap2/board-rx51-video.c +1 -1

@@ -48,7 +48,7 @@ static struct omap_dss_board_info rx51_dss_board_info = {
 
 static int __init rx51_video_init(void)
 {
-	if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
+	if (!machine_is_nokia_rx51())
 		return 0;

Shouldn't we delete the whole file, since non-DT boot is not anymore supported?

Tony Lindgren

maintainer

2014-04-08 22:24 UTC #2 lore raw

Quoted 26 lines · Aaro Koskinen

Hi,
Quoted 23 lines · Sebastian Reichel
Do not try to initialize display for DT boot, since omapdss is now initialized via Device Tree. Without this patch the display subsystem does not properly come up.
Signed-off-by Sebastian Reichel <[email protected]>
---
Hi,
This patch should be added to 3.15-rc to make display initialization via DT possible. Sorry for not noticing earlier, that this was missing in Tomi's patchset.
-- Sebastian
---
 arch/arm/mach-omap2/board-rx51-video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/board-rx51-video.c +0 -0
index 43a90c8..9cfebc5 100644
@@ -48,7 +48,7 @@ static struct omap_dss_board_info rx51_dss_board_info = {
 

Quoted 8 lines

arch/arm/mach-omap2/board-rx51-video.c static struct omap_dss_board_info rx51_dss_board_info = { · line 52
Quoted 5 lines
arch/arm/mach-omap2/board-rx51-video.c +1 -1
 static int __init rx51_video_init(void)
 {
-	if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
+	if (!machine_is_nokia_rx51())
 		return 0;
Shouldn't we delete the whole file, since non-DT boot is not anymore supported?

Legacy support is still there for omap3 until the DSS displays are converted.

Regards,

Tony

Aaro Koskinen

maintainer

2014-04-08 23:13 UTC #3 lore raw

Quoted 6 lines · Tony Lindgren

Quoted 2 lines · Aaro Koskinen
Shouldn't we delete the whole file, since non-DT boot is not anymore supported?
Legacy support is still there for omap3 until the DSS displays are converted.

Sorry, I was confused. It seems on omap2 (N800 etc.) the legacy boot is not supported anymore, and I thought it's the same for omap3. Sorry for the noise.

Tomi Valkeinen

Acked-by on v1 1/1

2014-04-09 06:27 UTC #4 lore raw

In reply to Sebastian Reichel

Quoted 23 lines · Sebastian Reichel

Do not try to initialize display for DT boot, since omapdss is now initialized via Device Tree. Without this patch the display subsystem does not properly come up.
Signed-off-by Sebastian Reichel <[email protected]>
---
Hi,
This patch should be added to 3.15-rc to make display initialization via DT possible. Sorry for not noticing earlier, that this was missing in Tomi's patchset.
-- Sebastian
---
 arch/arm/mach-omap2/board-rx51-video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/board-rx51-video.c +0 -0
index 43a90c8..9cfebc5 100644

arch/arm/mach-omap2/board-rx51-video.c static struct omap_dss_board_info rx51_dss_board_info = { · line 54

Quoted 8 lines

arch/arm/mach-omap2/board-rx51-video.c +1 -1

@@ -48,7 +48,7 @@ static struct omap_dss_board_info rx51_dss_board_info = {
 
 static int __init rx51_video_init(void)
 {
-	if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
+	if (!machine_is_nokia_rx51())
 		return 0;
 
 	if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) {

Acked-by Tomi Valkeinen <[email protected]>

Tomi

Tony Lindgren

maintainer

2014-04-18 22:43 UTC #5 lore raw

Quoted 30 lines · Tomi Valkeinen

Quoted 29 lines · Sebastian Reichel
Do not try to initialize display for DT boot, since omapdss is now initialized via Device Tree. Without this patch the display subsystem does not properly come up.
Signed-off-by Sebastian Reichel <[email protected]>
---
Hi,
This patch should be added to 3.15-rc to make display initialization via DT possible. Sorry for not noticing earlier, that this was missing in Tomi's patchset.
-- Sebastian
---
 arch/arm/mach-omap2/board-rx51-video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/board-rx51-video.c +1 -1
index 43a90c8..9cfebc5 100644
@@ -48,7 +48,7 @@ static struct omap_dss_board_info rx51_dss_board_info = {
 
 static int __init rx51_video_init(void)
 {
-	if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
+	if (!machine_is_nokia_rx51())
 		return 0;
 

Quoted 4 lines

arch/arm/mach-omap2/board-rx51-video.c static struct omap_dss_board_info rx51_dss_board_info = { · line 54
Quoted 2 lines
arch/arm/mach-omap2/board-rx51-video.c +0 -0
 	if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) {
Acked-by Tomi Valkeinen <[email protected]>

Applying into omap-for-v3.15/fixes thanks.

Tony