[PATCH v3 0/2]: Add legacy display init for IGEPv2 board

linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH v3 0/2]: Add legacy display init for IGEPv2 board
@ 2013-10-09  9:19 Javier Martinez Canillas
  2013-10-09  9:19 ` [PATCH v3 1/2] ARM: OMAP2+: pdata-quirks: add " Javier Martinez Canillas
  2013-10-09  9:19 ` [PATCH v3 2/2] ARM: OMAP: igep0020: use display init from dss-common Javier Martinez Canillas
  0 siblings, 2 replies; 5+ messages in thread
From: Javier Martinez Canillas @ 2013-10-09  9:19 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Tomy Valkeinen, Enric Balletbo i Serra, bcousson, linux-omap

Hi Tony,

This is a third version of the patch-set that adds legacy display init
for IGEPv2 boards that is needed to have display working when using DT.

You said to already had queued v2 on your omap-for-v3.13/quirk branch
but there were a few issues pointed out by Tomi Valkeinen that I addresed
here so it would be great if you can drop that patch and apply the following:

[PATCH v3 1/2] ARM: OMAP2+: pdata-quirks: add legacy display init for IGEPv2 board
[PATCH v3 2/2] ARM: OMAP: igep0020: use display init from dss-common

If it is already too late then I can repost these as an incremental patch.

Thanks a lot and best regards,
Javier

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v3 1/2] ARM: OMAP2+: pdata-quirks: add legacy display init for IGEPv2 board
  2013-10-09  9:19 [PATCH v3 0/2]: Add legacy display init for IGEPv2 board Javier Martinez Canillas
@ 2013-10-09  9:19 ` Javier Martinez Canillas
  2013-10-09  9:19 ` [PATCH v3 2/2] ARM: OMAP: igep0020: use display init from dss-common Javier Martinez Canillas
  1 sibling, 0 replies; 5+ messages in thread
From: Javier Martinez Canillas @ 2013-10-09  9:19 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Tomy Valkeinen, Enric Balletbo i Serra, bcousson, linux-omap,
	Javier Martinez Canillas

IGEPv2 board has both an DVI and TFP410 video interfaces but
DSS support for DeviceTree has not yet landed in mainline so
is necessary to init the displays using legacy platform code.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---

Changes since v2:
 - Don't mix display devices for different; suggested by Tomi Valkeinen
 - Remove the display setup from the board file and use the one in dss-common
   as suggested by Tomi Valkeinen

Changes since v1:
 - Remove duplicate entry in pdata_quirks[] due silly copy & paste error.

 arch/arm/mach-omap2/dss-common.c   | 44 ++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/dss-common.h   |  1 +
 arch/arm/mach-omap2/pdata-quirks.c |  6 ++++++
 3 files changed, 51 insertions(+)

diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c
index bf89eff..365bfd3 100644
--- a/arch/arm/mach-omap2/dss-common.c
+++ b/arch/arm/mach-omap2/dss-common.c
@@ -213,3 +213,47 @@ void __init omap_4430sdp_display_init_of(void)
 	platform_device_register(&sdp4430_tpd_device);
 	platform_device_register(&sdp4430_hdmi_connector_device);
 }
+
+
+/* OMAP3 IGEPv2 data */
+
+#define IGEP2_DVI_TFP410_POWER_DOWN_GPIO	170
+
+/* DVI Connector */
+static struct connector_dvi_platform_data omap3_igep2_dvi_connector_pdata = {
+	.name                   = "dvi",
+	.source                 = "tfp410.0",
+	.i2c_bus_num            = 3,
+};
+
+static struct platform_device omap3_igep2_dvi_connector_device = {
+	.name                   = "connector-dvi",
+	.id                     = 0,
+	.dev.platform_data      = &omap3_igep2_dvi_connector_pdata,
+};
+
+/* TFP410 DPI-to-DVI chip */
+static struct encoder_tfp410_platform_data omap3_igep2_tfp410_pdata = {
+	.name                   = "tfp410.0",
+	.source                 = "dpi.0",
+	.data_lines             = 24,
+	.power_down_gpio        = IGEP2_DVI_TFP410_POWER_DOWN_GPIO,
+};
+
+static struct platform_device omap3_igep2_tfp410_device = {
+	.name                   = "tfp410",
+	.id                     = 0,
+	.dev.platform_data      = &omap3_igep2_tfp410_pdata,
+};
+
+static struct omap_dss_board_info igep2_dss_data = {
+	.default_display_name = "dvi",
+};
+
+void __init omap3_igep2_display_init_of(void)
+{
+	omap_display_init(&igep2_dss_data);
+
+	platform_device_register(&omap3_igep2_tfp410_device);
+	platform_device_register(&omap3_igep2_dvi_connector_device);
+}
diff --git a/arch/arm/mach-omap2/dss-common.h b/arch/arm/mach-omap2/dss-common.h
index c28fe3c..a9becf0 100644
--- a/arch/arm/mach-omap2/dss-common.h
+++ b/arch/arm/mach-omap2/dss-common.h
@@ -8,5 +8,6 @@
 
 void __init omap4_panda_display_init_of(void);
 void __init omap_4430sdp_display_init_of(void);
+void __init omap3_igep2_display_init_of(void);
 
 #endif
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 3d472db..9113e70 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -74,6 +74,11 @@ static void __init hsmmc2_internal_input_clk(void)
 	reg |= OMAP2_MMCSDIO2ADPCLKISEL;
 	omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1);
 }
+
+static void __init omap3_igep0020_legacy_init(void)
+{
+	omap3_igep2_display_init_of();
+}
 #endif /* CONFIG_ARCH_OMAP3 */
 
 #ifdef CONFIG_ARCH_OMAP4
@@ -103,6 +108,7 @@ static struct pdata_init pdata_quirks[] __initdata = {
 #ifdef CONFIG_ARCH_OMAP3
 	{ "nokia,omap3-n9", hsmmc2_internal_input_clk, },
 	{ "nokia,omap3-n950", hsmmc2_internal_input_clk, },
+	{ "isee,omap3-igep0020", omap3_igep0020_legacy_init, },
 #endif
 #ifdef CONFIG_ARCH_OMAP4
 	{ "ti,omap4-sdp", omap4_sdp_legacy_init, },
-- 
1.8.4.rc3


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH v3 2/2] ARM: OMAP: igep0020: use display init from dss-common
  2013-10-09  9:19 [PATCH v3 0/2]: Add legacy display init for IGEPv2 board Javier Martinez Canillas
  2013-10-09  9:19 ` [PATCH v3 1/2] ARM: OMAP2+: pdata-quirks: add " Javier Martinez Canillas
@ 2013-10-09  9:19 ` Javier Martinez Canillas
  2013-10-09  9:27   ` Tomi Valkeinen
  1 sibling, 1 reply; 5+ messages in thread
From: Javier Martinez Canillas @ 2013-10-09  9:19 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Tomy Valkeinen, Enric Balletbo i Serra, bcousson, linux-omap,
	Javier Martinez Canillas

Now that display information and setup is made from dss-common
there is no need to have this code in the board file.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---

Changes since v2:
 - None, this is a new patch added for v3.

 arch/arm/mach-omap2/board-igep0020.c | 41 +++---------------------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 06dbb2d..d648d50 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -43,6 +43,7 @@
 #include "board-flash.h"
 #include "control.h"
 #include "gpmc-onenand.h"
+#include "dss-common.h"
 
 #define IGEP2_SMSC911X_CS       5
 #define IGEP2_SMSC911X_GPIO     176
@@ -50,7 +51,6 @@
 #define IGEP2_GPIO_LED0_GREEN   26
 #define IGEP2_GPIO_LED0_RED     27
 #define IGEP2_GPIO_LED1_RED     28
-#define IGEP2_GPIO_DVI_PUP      170
 
 #define IGEP2_RB_GPIO_WIFI_NPD     94
 #define IGEP2_RB_GPIO_WIFI_NRESET  95
@@ -429,41 +429,6 @@ static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = {
 	.setup		= igep_twl_gpio_setup,
 };
 
-static struct connector_dvi_platform_data omap3stalker_dvi_connector_pdata = {
-	.name                   = "dvi",
-	.source                 = "tfp410.0",
-	.i2c_bus_num            = 3,
-};
-
-static struct platform_device omap3stalker_dvi_connector_device = {
-	.name                   = "connector-dvi",
-	.id                     = 0,
-	.dev.platform_data      = &omap3stalker_dvi_connector_pdata,
-};
-
-static struct encoder_tfp410_platform_data omap3stalker_tfp410_pdata = {
-	.name                   = "tfp410.0",
-	.source                 = "dpi.0",
-	.data_lines             = 24,
-	.power_down_gpio        = IGEP2_GPIO_DVI_PUP,
-};
-
-static struct platform_device omap3stalker_tfp410_device = {
-	.name                   = "tfp410",
-	.id                     = 0,
-	.dev.platform_data      = &omap3stalker_tfp410_pdata,
-};
-
-static struct omap_dss_board_info igep2_dss_data = {
-	.default_display_name = "dvi",
-};
-
-static struct platform_device *igep_devices[] __initdata = {
-	&igep_vwlan_device,
-	&omap3stalker_tfp410_device,
-	&omap3stalker_dvi_connector_device,
-};
-
 static int igep2_keymap[] = {
 	KEY(0, 0, KEY_LEFT),
 	KEY(0, 1, KEY_RIGHT),
@@ -663,7 +628,8 @@ static void __init igep_init(void)
 
 	/* Register I2C busses and drivers */
 	igep_i2c_init();
-	platform_add_devices(igep_devices, ARRAY_SIZE(igep_devices));
+	platform_device_register(&igep_vwlan_device);
+	omap3_igep2_display_init_of();
 	omap_serial_init();
 	omap_sdrc_init(m65kxxxxam_sdrc_params,
 				  m65kxxxxam_sdrc_params);
@@ -681,7 +647,6 @@ static void __init igep_init(void)
 	igep_wlan_bt_init();
 
 	if (machine_is_igep0020()) {
-		omap_display_init(&igep2_dss_data);
 		igep2_init_smsc911x();
 		usbhs_init_phys(igep2_phy_data, ARRAY_SIZE(igep2_phy_data));
 		usbhs_init(&igep2_usbhs_bdata);
-- 
1.8.4.rc3


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH v3 2/2] ARM: OMAP: igep0020: use display init from dss-common
  2013-10-09  9:19 ` [PATCH v3 2/2] ARM: OMAP: igep0020: use display init from dss-common Javier Martinez Canillas
@ 2013-10-09  9:27   ` Tomi Valkeinen
  2013-10-09 14:58     ` Tony Lindgren
  0 siblings, 1 reply; 5+ messages in thread
From: Tomi Valkeinen @ 2013-10-09  9:27 UTC (permalink / raw)
  To: Javier Martinez Canillas, Tony Lindgren
  Cc: Enric Balletbo i Serra, bcousson, linux-omap

[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]

On 09/10/13 12:19, Javier Martinez Canillas wrote:
> Now that display information and setup is made from dss-common
> there is no need to have this code in the board file.
> 
> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
> ---
> 
> Changes since v2:
>  - None, this is a new patch added for v3.
> 
>  arch/arm/mach-omap2/board-igep0020.c | 41 +++---------------------------------
>  1 file changed, 3 insertions(+), 38 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
> index 06dbb2d..d648d50 100644
> --- a/arch/arm/mach-omap2/board-igep0020.c
> +++ b/arch/arm/mach-omap2/board-igep0020.c
> @@ -43,6 +43,7 @@
>  #include "board-flash.h"
>  #include "control.h"
>  #include "gpmc-onenand.h"
> +#include "dss-common.h"

I didn't try, but I think these can be now removed from the board file:

#include <video/omapdss.h>
#include <video/omap-panel-data.h>

For the series:

Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

 Tomi



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v3 2/2] ARM: OMAP: igep0020: use display init from dss-common
  2013-10-09  9:27   ` Tomi Valkeinen
@ 2013-10-09 14:58     ` Tony Lindgren
  0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2013-10-09 14:58 UTC (permalink / raw)
  To: Tomi Valkeinen
  Cc: Javier Martinez Canillas, Enric Balletbo i Serra, bcousson,
	linux-omap

* Tomi Valkeinen <tomi.valkeinen@ti.com> [131009 02:35]:
> On 09/10/13 12:19, Javier Martinez Canillas wrote:
> > Now that display information and setup is made from dss-common
> > there is no need to have this code in the board file.
> > 
> > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
> > ---
> > 
> > Changes since v2:
> >  - None, this is a new patch added for v3.
> > 
> >  arch/arm/mach-omap2/board-igep0020.c | 41 +++---------------------------------
> >  1 file changed, 3 insertions(+), 38 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
> > index 06dbb2d..d648d50 100644
> > --- a/arch/arm/mach-omap2/board-igep0020.c
> > +++ b/arch/arm/mach-omap2/board-igep0020.c
> > @@ -43,6 +43,7 @@
> >  #include "board-flash.h"
> >  #include "control.h"
> >  #include "gpmc-onenand.h"
> > +#include "dss-common.h"
> 
> I didn't try, but I think these can be now removed from the board file:
> 
> #include <video/omapdss.h>
> #include <video/omap-panel-data.h>
> 
> For the series:
> 
> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

Applying these instead of the earlier versions into
omap-for-v3.13/quirk branch.

Regards,

Tony

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-10-09 14:58 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-09  9:19 [PATCH v3 0/2]: Add legacy display init for IGEPv2 board Javier Martinez Canillas
2013-10-09  9:19 ` [PATCH v3 1/2] ARM: OMAP2+: pdata-quirks: add " Javier Martinez Canillas
2013-10-09  9:19 ` [PATCH v3 2/2] ARM: OMAP: igep0020: use display init from dss-common Javier Martinez Canillas
2013-10-09  9:27   ` Tomi Valkeinen
2013-10-09 14:58     ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).