* [PATCH v3 01/27] ARM: OMAP: rx51-video: Do not set TV connector_type
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
@ 2016-06-03 10:52 ` Peter Ujfalusi
2016-06-03 10:52 ` [PATCH v3 02/27] ARM/video: omap2: Move omap_display_init declaration to mach-omap2/display.h Peter Ujfalusi
` (23 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:52 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
OMAP_DSS_VENC_TYPE_COMPOSITE is 0. There is no need to explicitly set the
connector_type.
This change is needed for the omapdss header cleanup.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-omap2/board-rx51-video.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 9cfebc5c7455..b76f84245ad9 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -32,7 +32,6 @@
static struct connector_atv_platform_data rx51_tv_pdata = {
.name = "tv",
.source = "venc.0",
- .connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,
.invert_polarity = false,
};
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 02/27] ARM/video: omap2: Move omap_display_init declaration to mach-omap2/display.h
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
2016-06-03 10:52 ` [PATCH v3 01/27] ARM: OMAP: rx51-video: Do not set TV connector_type Peter Ujfalusi
@ 2016-06-03 10:52 ` Peter Ujfalusi
2016-06-03 10:52 ` [PATCH v3 03/27] video/platform_data: omapdss: Create new header file for platform data Peter Ujfalusi
` (22 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:52 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The omap_display_init() is implemented in the mach-omap2/display.c so the
declaration should have been there as well.
Change the board files to include display.h to avoid build breakage at the
same time.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-omap2/board-ldp.c | 1 +
arch/arm/mach-omap2/board-rx51-video.c | 1 +
arch/arm/mach-omap2/display.h | 5 +++++
include/video/omapdss.h | 3 ---
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index d9c3ffc39329..f364a1b779f0 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -47,6 +47,7 @@
#include "hsmmc.h"
#include "control.h"
#include "common-board-devices.h"
+#include "display.h"
#define LDP_SMSC911X_CS 1
#define LDP_SMSC911X_GPIO 152
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index b76f84245ad9..9866ec06a395 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -22,6 +22,7 @@
#include "soc.h"
#include "board-rx51.h"
+#include "display.h"
#include "mux.h"
diff --git a/arch/arm/mach-omap2/display.h b/arch/arm/mach-omap2/display.h
index 7375854b16c7..78f253005279 100644
--- a/arch/arm/mach-omap2/display.h
+++ b/arch/arm/mach-omap2/display.h
@@ -33,4 +33,9 @@ int omap_init_vout(void);
struct device_node * __init omapdss_find_dss_of_node(void);
+struct omap_dss_board_info;
+
+/* Init with the board info */
+int omap_display_init(struct omap_dss_board_info *board_data);
+
#endif
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 8e14ad7327c9..0c7ae93ebd76 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -330,9 +330,6 @@ struct omap_dss_board_info {
enum omapdss_version version;
};
-/* Init with the board info */
-extern int omap_display_init(struct omap_dss_board_info *board_data);
-
struct omap_video_timings {
/* Unit: pixels */
u16 x_res;
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 03/27] video/platform_data: omapdss: Create new header file for platform data
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
2016-06-03 10:52 ` [PATCH v3 01/27] ARM: OMAP: rx51-video: Do not set TV connector_type Peter Ujfalusi
2016-06-03 10:52 ` [PATCH v3 02/27] ARM/video: omap2: Move omap_display_init declaration to mach-omap2/display.h Peter Ujfalusi
@ 2016-06-03 10:52 ` Peter Ujfalusi
2016-06-03 10:52 ` [PATCH v3 04/27] ARM: OMAP2: Use the platform_data header for omapdss Peter Ujfalusi
` (21 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:52 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
Create a new header file for platform data used by omapdss.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
include/linux/platform_data/omapdss.h | 42 +++++++++++++++++++++++++++++++++++
include/video/omapdss.h | 28 +----------------------
2 files changed, 43 insertions(+), 27 deletions(-)
create mode 100644 include/linux/platform_data/omapdss.h
diff --git a/include/linux/platform_data/omapdss.h b/include/linux/platform_data/omapdss.h
new file mode 100644
index 000000000000..dbb875abc44a
--- /dev/null
+++ b/include/linux/platform_data/omapdss.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016 Texas Instruments, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __OMAPDSS_PDATA_H
+#define __OMAPDSS_PDATA_H
+
+enum omapdss_version {
+ OMAPDSS_VER_UNKNOWN = 0,
+ OMAPDSS_VER_OMAP24xx,
+ OMAPDSS_VER_OMAP34xx_ES1, /* OMAP3430 ES1.0, 2.0 */
+ OMAPDSS_VER_OMAP34xx_ES3, /* OMAP3430 ES3.0+ */
+ OMAPDSS_VER_OMAP3630,
+ OMAPDSS_VER_AM35xx,
+ OMAPDSS_VER_OMAP4430_ES1, /* OMAP4430 ES1.0 */
+ OMAPDSS_VER_OMAP4430_ES2, /* OMAP4430 ES2.0, 2.1, 2.2 */
+ OMAPDSS_VER_OMAP4, /* All other OMAP4s */
+ OMAPDSS_VER_OMAP5,
+ OMAPDSS_VER_AM43xx,
+ OMAPDSS_VER_DRA7xx,
+};
+
+struct omap_dss_device;
+
+/* Board specific data */
+struct omap_dss_board_info {
+ int num_devices;
+ struct omap_dss_device **devices;
+ struct omap_dss_device *default_device;
+ const char *default_display_name;
+ int (*dsi_enable_pads)(int dsi_id, unsigned int lane_mask);
+ void (*dsi_disable_pads)(int dsi_id, unsigned int lane_mask);
+ int (*set_min_bus_tput)(struct device *dev, unsigned long r);
+ enum omapdss_version version;
+};
+
+#endif /* __OMAPDSS_PDATA_H */
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 0c7ae93ebd76..53ada70cf23c 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -22,6 +22,7 @@
#include <linux/kobject.h>
#include <linux/device.h>
#include <linux/interrupt.h>
+#include <linux/platform_data/omapdss.h>
#include <video/videomode.h>
@@ -303,33 +304,6 @@ struct omap_dss_dsi_config {
enum omap_dss_dsi_trans_mode trans_mode;
};
-enum omapdss_version {
- OMAPDSS_VER_UNKNOWN = 0,
- OMAPDSS_VER_OMAP24xx,
- OMAPDSS_VER_OMAP34xx_ES1, /* OMAP3430 ES1.0, 2.0 */
- OMAPDSS_VER_OMAP34xx_ES3, /* OMAP3430 ES3.0+ */
- OMAPDSS_VER_OMAP3630,
- OMAPDSS_VER_AM35xx,
- OMAPDSS_VER_OMAP4430_ES1, /* OMAP4430 ES1.0 */
- OMAPDSS_VER_OMAP4430_ES2, /* OMAP4430 ES2.0, 2.1, 2.2 */
- OMAPDSS_VER_OMAP4, /* All other OMAP4s */
- OMAPDSS_VER_OMAP5,
- OMAPDSS_VER_AM43xx,
- OMAPDSS_VER_DRA7xx,
-};
-
-/* Board specific data */
-struct omap_dss_board_info {
- int num_devices;
- struct omap_dss_device **devices;
- struct omap_dss_device *default_device;
- const char *default_display_name;
- int (*dsi_enable_pads)(int dsi_id, unsigned lane_mask);
- void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask);
- int (*set_min_bus_tput)(struct device *dev, unsigned long r);
- enum omapdss_version version;
-};
-
struct omap_video_timings {
/* Unit: pixels */
u16 x_res;
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 04/27] ARM: OMAP2: Use the platform_data header for omapdss
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (2 preceding siblings ...)
2016-06-03 10:52 ` [PATCH v3 03/27] video/platform_data: omapdss: Create new header file for platform data Peter Ujfalusi
@ 2016-06-03 10:52 ` Peter Ujfalusi
2016-06-03 10:52 ` [PATCH v3 05/27] omapfb: panel-tpo-td028ttec1: Remove legacy boot support Peter Ujfalusi
` (20 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:52 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
Instead of the full omapdss internal header, include only the platform_data
header.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-omap2/board-ldp.c | 2 +-
arch/arm/mach-omap2/board-rx51-video.c | 2 +-
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/dss-common.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index f364a1b779f0..390795b334c3 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -39,7 +39,7 @@
#include "gpmc.h"
#include "gpmc-smsc911x.h"
-#include <video/omapdss.h>
+#include <linux/platform_data/omapdss.h>
#include <video/omap-panel-data.h>
#include "board-flash.h"
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 9866ec06a395..180c6aa633bd 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -15,7 +15,7 @@
#include <linux/spi/spi.h>
#include <linux/mm.h>
#include <asm/mach-types.h>
-#include <video/omapdss.h>
+#include <linux/platform_data/omapdss.h>
#include <video/omap-panel-data.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 6ab13d18c636..70b3eaf085e4 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -29,7 +29,7 @@
#include <linux/mfd/syscon.h>
#include <linux/regmap.h>
-#include <video/omapdss.h>
+#include <linux/platform_data/omapdss.h>
#include "omap_hwmod.h"
#include "omap_device.h"
#include "omap-pm.h"
diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c
index ea2be0f5953b..1d583bc0b1a9 100644
--- a/arch/arm/mach-omap2/dss-common.c
+++ b/arch/arm/mach-omap2/dss-common.c
@@ -27,7 +27,7 @@
#include <linux/gpio.h>
#include <linux/platform_device.h>
-#include <video/omapdss.h>
+#include <linux/platform_data/omapdss.h>
#include <video/omap-panel-data.h>
#include "soc.h"
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 05/27] omapfb: panel-tpo-td028ttec1: Remove legacy boot support
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (3 preceding siblings ...)
2016-06-03 10:52 ` [PATCH v3 04/27] ARM: OMAP2: Use the platform_data header for omapdss Peter Ujfalusi
@ 2016-06-03 10:52 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 06/27] omapfb: panel-nec-nl8048hl11: " Peter Ujfalusi
` (19 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:52 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
.../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 43 +++-------------------
include/video/omap-panel-data.h | 13 -------
2 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
index 4d657f3ab679..f4dc023868ae 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
@@ -29,7 +29,6 @@
#include <linux/spi/spi.h>
#include <linux/gpio.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
struct panel_drv_data {
struct omap_dss_device dssdev;
@@ -365,31 +364,6 @@ static struct omap_dss_driver td028ttec1_ops = {
.check_timings = td028ttec1_panel_check_timings,
};
-static int td028ttec1_panel_probe_pdata(struct spi_device *spi)
-{
- const struct panel_tpo_td028ttec1_platform_data *pdata;
- struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
- struct omap_dss_device *dssdev, *in;
-
- pdata = dev_get_platdata(&spi->dev);
-
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
- dev_err(&spi->dev, "failed to find video source '%s'\n",
- pdata->source);
- return -EPROBE_DEFER;
- }
-
- ddata->in = in;
-
- ddata->data_lines = pdata->data_lines;
-
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
- return 0;
-}
-
static int td028ttec1_probe_of(struct spi_device *spi)
{
struct device_node *node = spi->dev.of_node;
@@ -415,6 +389,9 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
dev_dbg(&spi->dev, "%s\n", __func__);
+ if (!spi->dev.of_node)
+ return -ENODEV;
+
spi->bits_per_word = 9;
spi->mode = SPI_MODE_3;
@@ -432,17 +409,9 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
ddata->spi_dev = spi;
- if (dev_get_platdata(&spi->dev)) {
- r = td028ttec1_panel_probe_pdata(spi);
- if (r)
- return r;
- } else if (spi->dev.of_node) {
- r = td028ttec1_probe_of(spi);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
+ r = td028ttec1_probe_of(spi);
+ if (r)
+ return r;
ddata->videomode = td028ttec1_panel_timings;
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index 56830d1dc762..fbdaa4c3ae96 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -223,17 +223,4 @@ struct panel_nec_nl8048hl11_platform_data {
int qvga_gpio;
};
-/**
- * panel-tpo-td028ttec1 platform data
- * @name: name for display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- */
-struct panel_tpo_td028ttec1_platform_data {
- const char *name;
- const char *source;
-
- int data_lines;
-};
-
#endif /* __OMAP_PANEL_DATA_H */
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 06/27] omapfb: panel-nec-nl8048hl11: Remove legacy boot support
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (4 preceding siblings ...)
2016-06-03 10:52 ` [PATCH v3 05/27] omapfb: panel-tpo-td028ttec1: Remove legacy boot support Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 07/27] omapfb: panel-tpo-td043mtea1: " Peter Ujfalusi
` (18 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
.../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 45 +++-------------------
include/video/omap-panel-data.h | 18 ---------
2 files changed, 6 insertions(+), 57 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
index 8a928c9a2fc9..3852cea3c947 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
@@ -19,7 +19,6 @@
#include <linux/of_gpio.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
struct panel_drv_data {
struct omap_dss_device dssdev;
@@ -233,33 +232,6 @@ static struct omap_dss_driver nec_8048_ops = {
};
-static int nec_8048_probe_pdata(struct spi_device *spi)
-{
- const struct panel_nec_nl8048hl11_platform_data *pdata;
- struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
- struct omap_dss_device *dssdev, *in;
-
- pdata = dev_get_platdata(&spi->dev);
-
- ddata->qvga_gpio = pdata->qvga_gpio;
- ddata->res_gpio = pdata->res_gpio;
-
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
- dev_err(&spi->dev, "failed to find video source '%s'\n",
- pdata->source);
- return -EPROBE_DEFER;
- }
- ddata->in = in;
-
- ddata->data_lines = pdata->data_lines;
-
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
- return 0;
-}
-
static int nec_8048_probe_of(struct spi_device *spi)
{
struct device_node *node = spi->dev.of_node;
@@ -296,6 +268,9 @@ static int nec_8048_probe(struct spi_device *spi)
dev_dbg(&spi->dev, "%s\n", __func__);
+ if (!spi->dev.of_node)
+ return -ENODEV;
+
spi->mode = SPI_MODE_0;
spi->bits_per_word = 32;
@@ -315,17 +290,9 @@ static int nec_8048_probe(struct spi_device *spi)
ddata->spi = spi;
- if (dev_get_platdata(&spi->dev)) {
- r = nec_8048_probe_pdata(spi);
- if (r)
- return r;
- } else if (spi->dev.of_node) {
- r = nec_8048_probe_of(spi);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
+ r = nec_8048_probe_of(spi);
+ if (r)
+ return r;
if (gpio_is_valid(ddata->qvga_gpio)) {
r = devm_gpio_request_one(&spi->dev, ddata->qvga_gpio,
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index fbdaa4c3ae96..a0c95cd1ed11 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -205,22 +205,4 @@ struct panel_tpo_td043mtea1_platform_data {
int nreset_gpio;
};
-/**
- * panel-nec-nl8048hl11 platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- * @res_gpio: reset signal
- * @qvga_gpio: selection for resolution(QVGA/WVGA)
- */
-struct panel_nec_nl8048hl11_platform_data {
- const char *name;
- const char *source;
-
- int data_lines;
-
- int res_gpio;
- int qvga_gpio;
-};
-
#endif /* __OMAP_PANEL_DATA_H */
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 07/27] omapfb: panel-tpo-td043mtea1: Remove legacy boot support
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (5 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 06/27] omapfb: panel-nec-nl8048hl11: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 08/27] omapfb: panel-sharp-ls037v7dw01: " Peter Ujfalusi
` (17 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
.../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 44 +++-------------------
include/video/omap-panel-data.h | 16 --------
2 files changed, 6 insertions(+), 54 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
index 68e3b68a2920..f49e60da5bd3 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
@@ -20,7 +20,6 @@
#include <linux/of_gpio.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
#define TPO_R02_MODE(x) ((x) & 7)
#define TPO_R02_MODE_800x480 7
@@ -465,32 +464,6 @@ static struct omap_dss_driver tpo_td043_ops = {
};
-static int tpo_td043_probe_pdata(struct spi_device *spi)
-{
- const struct panel_tpo_td043mtea1_platform_data *pdata;
- struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
- struct omap_dss_device *dssdev, *in;
-
- pdata = dev_get_platdata(&spi->dev);
-
- ddata->nreset_gpio = pdata->nreset_gpio;
-
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
- dev_err(&spi->dev, "failed to find video source '%s'\n",
- pdata->source);
- return -EPROBE_DEFER;
- }
- ddata->in = in;
-
- ddata->data_lines = pdata->data_lines;
-
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
- return 0;
-}
-
static int tpo_td043_probe_of(struct spi_device *spi)
{
struct device_node *node = spi->dev.of_node;
@@ -524,6 +497,9 @@ static int tpo_td043_probe(struct spi_device *spi)
dev_dbg(&spi->dev, "%s\n", __func__);
+ if (!spi->dev.of_node)
+ return -ENODEV;
+
spi->bits_per_word = 16;
spi->mode = SPI_MODE_0;
@@ -541,17 +517,9 @@ static int tpo_td043_probe(struct spi_device *spi)
ddata->spi = spi;
- if (dev_get_platdata(&spi->dev)) {
- r = tpo_td043_probe_pdata(spi);
- if (r)
- return r;
- } else if (spi->dev.of_node) {
- r = tpo_td043_probe_of(spi);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
+ r = tpo_td043_probe_of(spi);
+ if (r)
+ return r;
ddata->mode = TPO_R02_MODE_800x480;
memcpy(ddata->gamma, tpo_td043_def_gamma, sizeof(ddata->gamma));
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index a0c95cd1ed11..34ee7509752f 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -189,20 +189,4 @@ struct panel_sharp_ls037v7dw01_platform_data {
int ud_gpio;
};
-/**
- * panel-tpo-td043mtea1 platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- * @nreset_gpio: reset signal
- */
-struct panel_tpo_td043mtea1_platform_data {
- const char *name;
- const char *source;
-
- int data_lines;
-
- int nreset_gpio;
-};
-
#endif /* __OMAP_PANEL_DATA_H */
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 08/27] omapfb: panel-sharp-ls037v7dw01: Remove legacy boot support
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (6 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 07/27] omapfb: panel-tpo-td043mtea1: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 09/27] omapfb: panel-lgphilips-lb035q02: " Peter Ujfalusi
` (16 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
.../omapfb/displays/panel-sharp-ls037v7dw01.c | 81 ++--------------------
include/video/omap-panel-data.h | 24 -------
2 files changed, 6 insertions(+), 99 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
index 1954ec913ce5..a1e590155a26 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
@@ -18,7 +18,6 @@
#include <linux/slab.h>
#include <linux/regulator/consumer.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
struct panel_drv_data {
struct omap_dss_device dssdev;
@@ -197,69 +196,6 @@ static struct omap_dss_driver sharp_ls_ops = {
.get_resolution = omapdss_default_get_resolution,
};
-static int sharp_ls_get_gpio(struct device *dev, int gpio, unsigned long flags,
- char *desc, struct gpio_desc **gpiod)
-{
- int r;
-
- r = devm_gpio_request_one(dev, gpio, flags, desc);
- if (r) {
- *gpiod = NULL;
- return r == -ENOENT ? 0 : r;
- }
-
- *gpiod = gpio_to_desc(gpio);
-
- return 0;
-}
-
-static int sharp_ls_probe_pdata(struct platform_device *pdev)
-{
- const struct panel_sharp_ls037v7dw01_platform_data *pdata;
- struct panel_drv_data *ddata = platform_get_drvdata(pdev);
- struct omap_dss_device *dssdev, *in;
- int r;
-
- pdata = dev_get_platdata(&pdev->dev);
-
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
- dev_err(&pdev->dev, "failed to find video source '%s'\n",
- pdata->source);
- return -EPROBE_DEFER;
- }
-
- ddata->in = in;
-
- ddata->data_lines = pdata->data_lines;
-
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
- r = sharp_ls_get_gpio(&pdev->dev, pdata->mo_gpio, GPIOF_OUT_INIT_LOW,
- "lcd MO", &ddata->mo_gpio);
- if (r)
- return r;
- r = sharp_ls_get_gpio(&pdev->dev, pdata->lr_gpio, GPIOF_OUT_INIT_HIGH,
- "lcd LR", &ddata->lr_gpio);
- if (r)
- return r;
- r = sharp_ls_get_gpio(&pdev->dev, pdata->ud_gpio, GPIOF_OUT_INIT_HIGH,
- "lcd UD", &ddata->ud_gpio);
- if (r)
- return r;
- r = sharp_ls_get_gpio(&pdev->dev, pdata->resb_gpio, GPIOF_OUT_INIT_LOW,
- "lcd RESB", &ddata->resb_gpio);
- if (r)
- return r;
- r = sharp_ls_get_gpio(&pdev->dev, pdata->ini_gpio, GPIOF_OUT_INIT_LOW,
- "lcd INI", &ddata->ini_gpio);
- if (r)
- return r;
-
- return 0;
-}
-
static int sharp_ls_get_gpio_of(struct device *dev, int index, int val,
const char *desc, struct gpio_desc **gpiod)
{
@@ -330,23 +266,18 @@ static int sharp_ls_probe(struct platform_device *pdev)
struct omap_dss_device *dssdev;
int r;
+ if (!pdev->dev.of_node)
+ return -ENODEV;
+
ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
if (ddata == NULL)
return -ENOMEM;
platform_set_drvdata(pdev, ddata);
- if (dev_get_platdata(&pdev->dev)) {
- r = sharp_ls_probe_pdata(pdev);
- if (r)
- return r;
- } else if (pdev->dev.of_node) {
- r = sharp_ls_probe_of(pdev);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
+ r = sharp_ls_probe_of(pdev);
+ if (r)
+ return r;
ddata->videomode = sharp_ls_timings;
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index 34ee7509752f..085b4171eb25 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -165,28 +165,4 @@ struct panel_lb035q02_platform_data {
int enable_gpio;
};
-/**
- * panel_sharp_ls037v7dw01 platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- * @resb_gpio: reset signal GPIO
- * @ini_gpio: power on control GPIO
- * @mo_gpio: selection for resolution(VGA/QVGA) GPIO
- * @lr_gpio: selection for horizontal scanning direction GPIO
- * @ud_gpio: selection for vertical scanning direction GPIO
- */
-struct panel_sharp_ls037v7dw01_platform_data {
- const char *name;
- const char *source;
-
- int data_lines;
-
- int resb_gpio;
- int ini_gpio;
- int mo_gpio;
- int lr_gpio;
- int ud_gpio;
-};
-
#endif /* __OMAP_PANEL_DATA_H */
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 09/27] omapfb: panel-lgphilips-lb035q02: Remove legacy boot support
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (7 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 08/27] omapfb: panel-sharp-ls037v7dw01: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 10/27] omapfb: panel-dsi-cm: " Peter Ujfalusi
` (15 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
.../omapfb/displays/panel-lgphilips-lb035q02.c | 56 +++-------------------
include/video/omap-panel-data.h | 18 -------
2 files changed, 6 insertions(+), 68 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
index 18eb60e9c9ec..6d5207c7b22c 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
@@ -17,7 +17,6 @@
#include <linux/gpio.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
static struct omap_video_timings lb035q02_timings = {
.x_res = 320,
@@ -240,44 +239,6 @@ static struct omap_dss_driver lb035q02_ops = {
.get_resolution = omapdss_default_get_resolution,
};
-static int lb035q02_probe_pdata(struct spi_device *spi)
-{
- const struct panel_lb035q02_platform_data *pdata;
- struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
- struct omap_dss_device *dssdev, *in;
- int r;
-
- pdata = dev_get_platdata(&spi->dev);
-
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
- dev_err(&spi->dev, "failed to find video source '%s'\n",
- pdata->source);
- return -EPROBE_DEFER;
- }
-
- ddata->in = in;
-
- ddata->data_lines = pdata->data_lines;
-
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
- r = devm_gpio_request_one(&spi->dev, pdata->enable_gpio,
- GPIOF_OUT_INIT_LOW, "panel enable");
- if (r)
- goto err_gpio;
-
- ddata->enable_gpio = gpio_to_desc(pdata->enable_gpio);
-
- ddata->backlight_gpio = pdata->backlight_gpio;
-
- return 0;
-err_gpio:
- omap_dss_put_device(ddata->in);
- return r;
-}
-
static int lb035q02_probe_of(struct spi_device *spi)
{
struct device_node *node = spi->dev.of_node;
@@ -312,6 +273,9 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
struct omap_dss_device *dssdev;
int r;
+ if (!spi->dev.of_node)
+ return -ENODEV;
+
ddata = devm_kzalloc(&spi->dev, sizeof(*ddata), GFP_KERNEL);
if (ddata == NULL)
return -ENOMEM;
@@ -320,17 +284,9 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
ddata->spi = spi;
- if (dev_get_platdata(&spi->dev)) {
- r = lb035q02_probe_pdata(spi);
- if (r)
- return r;
- } else if (spi->dev.of_node) {
- r = lb035q02_probe_of(spi);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
+ r = lb035q02_probe_of(spi);
+ if (r)
+ return r;
if (gpio_is_valid(ddata->backlight_gpio)) {
r = devm_gpio_request_one(&spi->dev, ddata->backlight_gpio,
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index 085b4171eb25..74486bcc754e 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -147,22 +147,4 @@ struct panel_acx565akm_platform_data {
int datapairs;
};
-/**
- * panel_lb035q02 platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- * @backlight_gpio: gpio to enable/disable the backlight (or -1)
- * @enable_gpio: gpio to enable/disable the panel (or -1)
- */
-struct panel_lb035q02_platform_data {
- const char *name;
- const char *source;
-
- int data_lines;
-
- int backlight_gpio;
- int enable_gpio;
-};
-
#endif /* __OMAP_PANEL_DATA_H */
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 10/27] omapfb: panel-dsi-cm: Remove legacy boot support
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (8 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 09/27] omapfb: panel-lgphilips-lb035q02: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 11/27] omapfb: connector-hdmi: " Peter Ujfalusi
` (14 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
.../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 52 +++-------------------
include/video/omap-panel-data.h | 27 -----------
2 files changed, 6 insertions(+), 73 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
index 3414c2609320..a4eac6962b76 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
@@ -26,7 +26,6 @@
#include <linux/of_gpio.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
#include <video/mipi_display.h>
/* DSI Virtual channel. Hardcoded for now. */
@@ -1127,40 +1126,6 @@ static struct omap_dss_driver dsicm_ops = {
.memory_read = dsicm_memory_read,
};
-static int dsicm_probe_pdata(struct platform_device *pdev)
-{
- const struct panel_dsicm_platform_data *pdata;
- struct panel_drv_data *ddata = platform_get_drvdata(pdev);
- struct omap_dss_device *dssdev, *in;
-
- pdata = dev_get_platdata(&pdev->dev);
-
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
- dev_err(&pdev->dev, "failed to find video source\n");
- return -EPROBE_DEFER;
- }
- ddata->in = in;
-
- ddata->reset_gpio = pdata->reset_gpio;
-
- if (pdata->use_ext_te)
- ddata->ext_te_gpio = pdata->ext_te_gpio;
- else
- ddata->ext_te_gpio = -1;
-
- ddata->ulps_timeout = pdata->ulps_timeout;
-
- ddata->use_dsi_backlight = pdata->use_dsi_backlight;
-
- ddata->pin_config = pdata->pin_config;
-
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
- return 0;
-}
-
static int dsicm_probe_of(struct platform_device *pdev)
{
struct device_node *node = pdev->dev.of_node;
@@ -1207,6 +1172,9 @@ static int dsicm_probe(struct platform_device *pdev)
dev_dbg(dev, "probe\n");
+ if (!pdev->dev.of_node)
+ return -ENODEV;
+
ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);
if (!ddata)
return -ENOMEM;
@@ -1214,17 +1182,9 @@ static int dsicm_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ddata);
ddata->pdev = pdev;
- if (dev_get_platdata(dev)) {
- r = dsicm_probe_pdata(pdev);
- if (r)
- return r;
- } else if (pdev->dev.of_node) {
- r = dsicm_probe_of(pdev);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
+ r = dsicm_probe_of(pdev);
+ if (r)
+ return r;
ddata->timings.x_res = 864;
ddata->timings.y_res = 480;
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index 74486bcc754e..e7b0e889d6d0 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -105,33 +105,6 @@ struct panel_dpi_platform_data {
};
/**
- * panel_dsicm platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @reset_gpio: gpio to reset the panel (or -1)
- * @use_ext_te: use external TE GPIO
- * @ext_te_gpio: external TE GPIO
- * @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms)
- * @use_dsi_backlight: true if panel uses DSI command to control backlight
- * @pin_config: DSI pin configuration
- */
-struct panel_dsicm_platform_data {
- const char *name;
- const char *source;
-
- int reset_gpio;
-
- bool use_ext_te;
- int ext_te_gpio;
-
- unsigned ulps_timeout;
-
- bool use_dsi_backlight;
-
- struct omap_dsi_pin_config pin_config;
-};
-
-/**
* panel_acx565akm platform data
* @name: name for this display entity
* @source: name of the display entity used as a video source
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 11/27] omapfb: connector-hdmi: Remove legacy boot support
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (9 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 10/27] omapfb: panel-dsi-cm: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 12/27] omapfb: connector-dvi: " Peter Ujfalusi
` (13 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
.../fbdev/omap2/omapfb/displays/connector-hdmi.c | 42 ++++------------------
include/video/omap-panel-data.h | 10 ------
2 files changed, 6 insertions(+), 46 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
index 6ee4129bc0c0..231b8588a59f 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
@@ -18,7 +18,6 @@
#include <drm/drm_edid.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
static const struct omap_video_timings hdmic_default_timings = {
.x_res = 640,
@@ -206,30 +205,6 @@ static struct omap_dss_driver hdmic_driver = {
.set_hdmi_infoframe = hdmic_set_infoframe,
};
-static int hdmic_probe_pdata(struct platform_device *pdev)
-{
- struct panel_drv_data *ddata = platform_get_drvdata(pdev);
- struct connector_hdmi_platform_data *pdata;
- struct omap_dss_device *in, *dssdev;
-
- pdata = dev_get_platdata(&pdev->dev);
-
- ddata->hpd_gpio = -ENODEV;
-
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
- dev_err(&pdev->dev, "Failed to find video source\n");
- return -EPROBE_DEFER;
- }
-
- ddata->in = in;
-
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
- return 0;
-}
-
static int hdmic_probe_of(struct platform_device *pdev)
{
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -261,6 +236,9 @@ static int hdmic_probe(struct platform_device *pdev)
struct omap_dss_device *dssdev;
int r;
+ if (!pdev->dev.of_node)
+ return -ENODEV;
+
ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
if (!ddata)
return -ENOMEM;
@@ -268,17 +246,9 @@ static int hdmic_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ddata);
ddata->dev = &pdev->dev;
- if (dev_get_platdata(&pdev->dev)) {
- r = hdmic_probe_pdata(pdev);
- if (r)
- return r;
- } else if (pdev->dev.of_node) {
- r = hdmic_probe_of(pdev);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
+ r = hdmic_probe_of(pdev);
+ if (r)
+ return r;
if (gpio_is_valid(ddata->hpd_gpio)) {
r = devm_gpio_request_one(&pdev->dev, ddata->hpd_gpio,
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index e7b0e889d6d0..c0836b118f67 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -59,16 +59,6 @@ struct connector_dvi_platform_data {
};
/**
- * connector_hdmi platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- */
-struct connector_hdmi_platform_data {
- const char *name;
- const char *source;
-};
-
-/**
* connector_atv platform data
* @name: name for this display entity
* @source: name of the display entity used as a video source
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 12/27] omapfb: connector-dvi: Remove legacy boot support
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (10 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 11/27] omapfb: connector-hdmi: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 13/27] omapfb: encoder-tfp410: " Peter Ujfalusi
` (12 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
.../fbdev/omap2/omapfb/displays/connector-dvi.c | 58 +++-------------------
include/video/omap-panel-data.h | 12 -----
2 files changed, 6 insertions(+), 64 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
index d811e6dcaef7..f2abbec7602a 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
@@ -17,7 +17,6 @@
#include <drm/drm_edid.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
static const struct omap_video_timings dvic_default_timings = {
.x_res = 640,
@@ -236,46 +235,6 @@ static struct omap_dss_driver dvic_driver = {
.detect = dvic_detect,
};
-static int dvic_probe_pdata(struct platform_device *pdev)
-{
- struct panel_drv_data *ddata = platform_get_drvdata(pdev);
- struct connector_dvi_platform_data *pdata;
- struct omap_dss_device *in, *dssdev;
- int i2c_bus_num;
-
- pdata = dev_get_platdata(&pdev->dev);
- i2c_bus_num = pdata->i2c_bus_num;
-
- if (i2c_bus_num != -1) {
- struct i2c_adapter *adapter;
-
- adapter = i2c_get_adapter(i2c_bus_num);
- if (!adapter) {
- dev_err(&pdev->dev,
- "Failed to get I2C adapter, bus %d\n",
- i2c_bus_num);
- return -EPROBE_DEFER;
- }
-
- ddata->i2c_adapter = adapter;
- }
-
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
- i2c_put_adapter(ddata->i2c_adapter);
-
- dev_err(&pdev->dev, "Failed to find video source\n");
- return -EPROBE_DEFER;
- }
-
- ddata->in = in;
-
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
- return 0;
-}
-
static int dvic_probe_of(struct platform_device *pdev)
{
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -313,23 +272,18 @@ static int dvic_probe(struct platform_device *pdev)
struct omap_dss_device *dssdev;
int r;
+ if (!pdev->dev.of_node)
+ return -ENODEV;
+
ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
if (!ddata)
return -ENOMEM;
platform_set_drvdata(pdev, ddata);
- if (dev_get_platdata(&pdev->dev)) {
- r = dvic_probe_pdata(pdev);
- if (r)
- return r;
- } else if (pdev->dev.of_node) {
- r = dvic_probe_of(pdev);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
+ r = dvic_probe_of(pdev);
+ if (r)
+ return r;
ddata->timings = dvic_default_timings;
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index c0836b118f67..4d0b8832ae11 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -47,18 +47,6 @@ struct encoder_tfp410_platform_data {
/**
- * connector_dvi platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @i2c_bus_num: i2c bus number to be used for reading EDID
- */
-struct connector_dvi_platform_data {
- const char *name;
- const char *source;
- int i2c_bus_num;
-};
-
-/**
* connector_atv platform data
* @name: name for this display entity
* @source: name of the display entity used as a video source
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 13/27] omapfb: encoder-tfp410: Remove legacy boot support
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (11 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 12/27] omapfb: connector-dvi: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 14/27] omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h Peter Ujfalusi
` (11 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
.../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 44 +++-------------------
include/video/omap-panel-data.h | 14 -------
2 files changed, 6 insertions(+), 52 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
index d9048b3df495..778e3b384c2f 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
@@ -16,7 +16,6 @@
#include <linux/of_gpio.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
struct panel_drv_data {
struct omap_dss_device dssdev;
@@ -166,32 +165,6 @@ static const struct omapdss_dvi_ops tfp410_dvi_ops = {
.get_timings = tfp410_get_timings,
};
-static int tfp410_probe_pdata(struct platform_device *pdev)
-{
- struct panel_drv_data *ddata = platform_get_drvdata(pdev);
- struct encoder_tfp410_platform_data *pdata;
- struct omap_dss_device *dssdev, *in;
-
- pdata = dev_get_platdata(&pdev->dev);
-
- ddata->pd_gpio = pdata->power_down_gpio;
-
- ddata->data_lines = pdata->data_lines;
-
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
- dev_err(&pdev->dev, "Failed to find video source\n");
- return -ENODEV;
- }
-
- ddata->in = in;
-
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
- return 0;
-}
-
static int tfp410_probe_of(struct platform_device *pdev)
{
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -225,23 +198,18 @@ static int tfp410_probe(struct platform_device *pdev)
struct omap_dss_device *dssdev;
int r;
+ if (!pdev->dev.of_node)
+ return -ENODEV;
+
ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
if (!ddata)
return -ENOMEM;
platform_set_drvdata(pdev, ddata);
- if (dev_get_platdata(&pdev->dev)) {
- r = tfp410_probe_pdata(pdev);
- if (r)
- return r;
- } else if (pdev->dev.of_node) {
- r = tfp410_probe_of(pdev);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
+ r = tfp410_probe_of(pdev);
+ if (r)
+ return r;
if (gpio_is_valid(ddata->pd_gpio)) {
r = devm_gpio_request_one(&pdev->dev, ddata->pd_gpio,
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index 4d0b8832ae11..a64e9ba12b0d 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -33,20 +33,6 @@
struct omap_dss_device;
/**
- * encoder_tfp410 platform data
- * @name: name for this display entity
- * @power_down_gpio: gpio number for PD pin (or -1 if not available)
- * @data_lines: number of DPI datalines
- */
-struct encoder_tfp410_platform_data {
- const char *name;
- const char *source;
- int power_down_gpio;
- int data_lines;
-};
-
-
-/**
* connector_atv platform data
* @name: name for this display entity
* @source: name of the display entity used as a video source
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 14/27] omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (12 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 13/27] omapfb: encoder-tfp410: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 15/27] drm/omap: displays: Do not include video/omap-panel-data.h if not needed Peter Ujfalusi
` (10 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The driver does not support legacy (pdata) based probing.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
index 677e2545fcbe..7939157af957 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
@@ -17,7 +17,6 @@
#include <linux/gpio/consumer.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
struct panel_drv_data {
struct omap_dss_device dssdev;
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 15/27] drm/omap: displays: Do not include video/omap-panel-data.h if not needed
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (13 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 14/27] omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 16/27] omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration Peter Ujfalusi
` (9 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
Some panel/encoder/connector driver includes omap-panel-data.h but they
do not need it. Remove the inclusion of video/omap-panel-data.h from these
drivers.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 1 -
drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 1 -
drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1 -
drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 1 -
4 files changed, 4 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index 2fd5602880a7..6b7d4fc3ac12 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -16,7 +16,6 @@
#include <linux/of_gpio.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
struct panel_drv_data {
struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index 916a89978387..f4f23f5cfe3e 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -17,7 +17,6 @@
#include <linux/gpio/consumer.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
struct panel_drv_data {
struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 36485c2137ce..6dcb75f6f0c5 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -26,7 +26,6 @@
#include <linux/of_gpio.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
#include <video/mipi_display.h>
/* DSI Virtual channel. Hardcoded for now. */
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 458f77bc473d..1bd682864217 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -17,7 +17,6 @@
#include <linux/gpio.h>
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
static struct omap_video_timings lb035q02_timings = {
.x_res = 320,
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 16/27] omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (14 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 15/27] drm/omap: displays: Do not include video/omap-panel-data.h if not needed Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 17/27] drm/omap: connector-analog-tv: Support only Composite type in legacy boot Peter Ujfalusi
` (8 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The omap_dss_device is not needed by anything in the header file.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
include/video/omap-panel-data.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index a64e9ba12b0d..7b4fadf82cd5 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -30,8 +30,6 @@
#include <video/omapdss.h>
#include <video/display_timing.h>
-struct omap_dss_device;
-
/**
* connector_atv platform data
* @name: name for this display entity
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 17/27] drm/omap: connector-analog-tv: Support only Composite type in legacy boot
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (15 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 16/27] omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 18/27] omapfb: " Peter Ujfalusi
` (7 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
In legacy mode (non DT mode) support only composite connector type. The
only user for this is rx51, using composite type.
Dropping the connector_type selection via pdata will allow cleanups in
omapdss (drm vs fbdev).
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 8511c648a15c..d963b4a9cfc0 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -25,7 +25,6 @@ struct panel_drv_data {
struct omap_video_timings timings;
- enum omap_dss_venc_type connector_type;
bool invert_polarity;
};
@@ -45,10 +44,6 @@ static const struct omap_video_timings tvc_pal_timings = {
static const struct of_device_id tvc_of_match[];
-struct tvc_of_data {
- enum omap_dss_venc_type connector_type;
-};
-
#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
static int tvc_connect(struct omap_dss_device *dssdev)
@@ -99,7 +94,7 @@ static int tvc_enable(struct omap_dss_device *dssdev)
in->ops.atv->set_timings(in, &ddata->timings);
if (!ddata->dev->of_node) {
- in->ops.atv->set_type(in, ddata->connector_type);
+ in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);
in->ops.atv->invert_vid_out_polarity(in,
ddata->invert_polarity);
@@ -207,7 +202,6 @@ static int tvc_probe_pdata(struct platform_device *pdev)
ddata->in = in;
- ddata->connector_type = pdata->connector_type;
ddata->invert_polarity = pdata->invert_polarity;
dssdev = &ddata->dssdev;
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 18/27] omapfb: connector-analog-tv: Support only Composite type in legacy boot
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (16 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 17/27] drm/omap: connector-analog-tv: Support only Composite type in legacy boot Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 19/27] omapdss: omap-panel-data.h: Remove connector_type from atv pdata Peter Ujfalusi
` (6 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
In legacy mode (non DT mode) support only composite connector type. The
only user for this is rx51, using composite type.
Dropping the connector_type selection via pdata will allow cleanups in
omapdss (drm vs fbdev).
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
index 8511c648a15c..d963b4a9cfc0 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
@@ -25,7 +25,6 @@ struct panel_drv_data {
struct omap_video_timings timings;
- enum omap_dss_venc_type connector_type;
bool invert_polarity;
};
@@ -45,10 +44,6 @@ static const struct omap_video_timings tvc_pal_timings = {
static const struct of_device_id tvc_of_match[];
-struct tvc_of_data {
- enum omap_dss_venc_type connector_type;
-};
-
#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
static int tvc_connect(struct omap_dss_device *dssdev)
@@ -99,7 +94,7 @@ static int tvc_enable(struct omap_dss_device *dssdev)
in->ops.atv->set_timings(in, &ddata->timings);
if (!ddata->dev->of_node) {
- in->ops.atv->set_type(in, ddata->connector_type);
+ in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);
in->ops.atv->invert_vid_out_polarity(in,
ddata->invert_polarity);
@@ -207,7 +202,6 @@ static int tvc_probe_pdata(struct platform_device *pdev)
ddata->in = in;
- ddata->connector_type = pdata->connector_type;
ddata->invert_polarity = pdata->invert_polarity;
dssdev = &ddata->dssdev;
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 19/27] omapdss: omap-panel-data.h: Remove connector_type from atv pdata
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (17 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 18/27] omapfb: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 20/27] drm/omap: Remove reference to pdata->default_device Peter Ujfalusi
` (5 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The driver only supports composite connection when booted in legacy mode
so the omap_dss_venc_type can be dropped from the pdata.
At the same time the video/omapdss.h include can be removed as it is no
longer needed.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
include/video/omap-panel-data.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index 7b4fadf82cd5..e7003ee6e063 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -27,21 +27,18 @@
#ifndef __OMAP_PANEL_DATA_H
#define __OMAP_PANEL_DATA_H
-#include <video/omapdss.h>
#include <video/display_timing.h>
/**
* connector_atv platform data
* @name: name for this display entity
* @source: name of the display entity used as a video source
- * @connector_type: composite/svideo
* @invert_polarity: invert signal polarity
*/
struct connector_atv_platform_data {
const char *name;
const char *source;
- enum omap_dss_venc_type connector_type;
bool invert_polarity;
};
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 20/27] drm/omap: Remove reference to pdata->default_device
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (18 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 19/27] omapdss: omap-panel-data.h: Remove connector_type from atv pdata Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 21/27] omapfb: " Peter Ujfalusi
` (4 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The default_device is no longer used, it is a leftower from legacy. The
else if (pdata->default_device) is always going to be false.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/gpu/drm/omapdrm/dss/core.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c
index 7e4e5bebabbe..9cf22b30023f 100644
--- a/drivers/gpu/drm/omapdrm/dss/core.c
+++ b/drivers/gpu/drm/omapdrm/dss/core.c
@@ -196,8 +196,6 @@ static int __init omap_dss_probe(struct platform_device *pdev)
core.default_display_name = def_disp_name;
else if (pdata->default_display_name)
core.default_display_name = pdata->default_display_name;
- else if (pdata->default_device)
- core.default_display_name = pdata->default_device->name;
return 0;
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 21/27] omapfb: Remove reference to pdata->default_device
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (19 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 20/27] drm/omap: Remove reference to pdata->default_device Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 22/27] platform_data: omapdss: Remove unused members from omap_dss_board_info Peter Ujfalusi
` (3 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The default_device is no longer used, it is a leftower from legacy. The
else if (pdata->default_device) is always going to be false.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/video/fbdev/omap2/omapfb/dss/core.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/core.c b/drivers/video/fbdev/omap2/omapfb/dss/core.c
index 5a87179b7312..b9de21d3ff09 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c
@@ -208,8 +208,6 @@ static int __init omap_dss_probe(struct platform_device *pdev)
core.default_display_name = def_disp_name;
else if (pdata->default_display_name)
core.default_display_name = pdata->default_display_name;
- else if (pdata->default_device)
- core.default_display_name = pdata->default_device->name;
register_pm_notifier(&omap_dss_pm_notif_block);
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 22/27] platform_data: omapdss: Remove unused members from omap_dss_board_info
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (20 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 21/27] omapfb: " Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 23/27] omapdss: hdmi audio: Make header file independent of video/omapdss.h Peter Ujfalusi
` (2 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
The num_devices, **devices and *default_device is leftover from the past.
They can be removed as they are no used.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
include/linux/platform_data/omapdss.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/include/linux/platform_data/omapdss.h b/include/linux/platform_data/omapdss.h
index dbb875abc44a..679177929045 100644
--- a/include/linux/platform_data/omapdss.h
+++ b/include/linux/platform_data/omapdss.h
@@ -25,13 +25,8 @@ enum omapdss_version {
OMAPDSS_VER_DRA7xx,
};
-struct omap_dss_device;
-
/* Board specific data */
struct omap_dss_board_info {
- int num_devices;
- struct omap_dss_device **devices;
- struct omap_dss_device *default_device;
const char *default_display_name;
int (*dsi_enable_pads)(int dsi_id, unsigned int lane_mask);
void (*dsi_disable_pads)(int dsi_id, unsigned int lane_mask);
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 23/27] omapdss: hdmi audio: Make header file independent of video/omapdss.h
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (21 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 22/27] platform_data: omapdss: Remove unused members from omap_dss_board_info Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 24/27] drm/omap: Do not include video/omapdss.h directly in drivers Peter Ujfalusi
2016-06-03 11:02 ` [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
Clean up the header files regarding to hdmi audio so the omap-hdmi-audio.h
file will only need to include the platform_data/omapdss.h file.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: Mark Brown <broonie@kernel.org>
CC: Jyri Sarha <jsarha@ti.com>
CC: Liam Girdwood <liam.r.girdwood@linux.intel.com>
---
drivers/gpu/drm/omapdrm/dss/hdmi.h | 1 +
drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 1 +
include/sound/omap-hdmi-audio.h | 9 +++++++--
include/video/omapdss.h | 5 -----
sound/soc/omap/omap-hdmi-audio.c | 1 -
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi.h b/drivers/gpu/drm/omapdrm/dss/hdmi.h
index 53616b02b613..c32a21a26054 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi.h
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi.h
@@ -24,6 +24,7 @@
#include <linux/platform_device.h>
#include <linux/hdmi.h>
#include <video/omapdss.h>
+#include <sound/omap-hdmi-audio.h>
#include "dss.h"
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h b/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
index 53616b02b613..c32a21a26054 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
@@ -24,6 +24,7 @@
#include <linux/platform_device.h>
#include <linux/hdmi.h>
#include <video/omapdss.h>
+#include <sound/omap-hdmi-audio.h>
#include "dss.h"
diff --git a/include/sound/omap-hdmi-audio.h b/include/sound/omap-hdmi-audio.h
index afdb416898e0..1df2ff61a4dd 100644
--- a/include/sound/omap-hdmi-audio.h
+++ b/include/sound/omap-hdmi-audio.h
@@ -16,11 +16,16 @@
*
*/
-#include <video/omapdss.h>
-
#ifndef __OMAP_HDMI_AUDIO_H__
#define __OMAP_HDMI_AUDIO_H__
+#include <linux/platform_data/omapdss.h>
+
+struct omap_dss_audio {
+ struct snd_aes_iec958 *iec;
+ struct snd_cea_861_aud_if *cea;
+};
+
struct omap_hdmi_audio_ops {
int (*audio_startup)(struct device *dev,
void (*abort_cb)(struct device *dev));
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 53ada70cf23c..b25e2eab4b48 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -168,11 +168,6 @@ enum omap_dss_display_state {
OMAP_DSS_DISPLAY_ACTIVE,
};
-struct omap_dss_audio {
- struct snd_aes_iec958 *iec;
- struct snd_cea_861_aud_if *cea;
-};
-
enum omap_dss_rotation_type {
OMAP_DSS_ROT_DMA = 1 << 0,
OMAP_DSS_ROT_VRFB = 1 << 1,
diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c
index 64425d352962..888133f9e65d 100644
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@ -28,7 +28,6 @@
#include <sound/asoundef.h>
#include <sound/omap-pcm.h>
#include <sound/omap-hdmi-audio.h>
-#include <video/omapdss.h>
#define DRV_NAME "omap-hdmi-audio"
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v3 24/27] drm/omap: Do not include video/omapdss.h directly in drivers
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (22 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 23/27] omapdss: hdmi audio: Make header file independent of video/omapdss.h Peter Ujfalusi
@ 2016-06-03 10:53 ` Peter Ujfalusi
2016-06-03 11:02 ` [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 10:53 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
All drivers to include the omapdrm/dss/omapdss.h header file. This header
includes the <video/omapdss.h>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 3 ++-
drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 4 ++--
drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 4 ++--
drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 2 +-
drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 2 +-
drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 2 +-
drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 3 ++-
drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 3 ++-
drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 2 +-
drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 +-
drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 3 ++-
drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c | 3 ++-
drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c | 3 ++-
drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 +-
drivers/gpu/drm/omapdrm/dss/core.c | 3 +--
drivers/gpu/drm/omapdrm/dss/dispc.c | 3 +--
drivers/gpu/drm/omapdrm/dss/dispc_coefs.c | 2 +-
drivers/gpu/drm/omapdrm/dss/display.c | 2 +-
drivers/gpu/drm/omapdrm/dss/dpi.c | 3 +--
drivers/gpu/drm/omapdrm/dss/dsi.c | 2 +-
drivers/gpu/drm/omapdrm/dss/dss-of.c | 3 +--
drivers/gpu/drm/omapdrm/dss/dss.c | 3 +--
drivers/gpu/drm/omapdrm/dss/dss_features.c | 3 +--
drivers/gpu/drm/omapdrm/dss/hdmi.h | 2 +-
drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +-
drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +-
drivers/gpu/drm/omapdrm/dss/hdmi_common.c | 2 +-
drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +-
drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 3 +--
drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +-
drivers/gpu/drm/omapdrm/dss/output.c | 3 +--
drivers/gpu/drm/omapdrm/dss/pll.c | 3 +--
drivers/gpu/drm/omapdrm/dss/rfbi.c | 2 +-
drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +-
drivers/gpu/drm/omapdrm/dss/venc.c | 3 +--
drivers/gpu/drm/omapdrm/dss/video-pll.c | 3 +--
drivers/gpu/drm/omapdrm/omap_drv.h | 1 -
37 files changed, 44 insertions(+), 50 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index d963b4a9cfc0..3485d1ecd655 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -14,9 +14,10 @@
#include <linux/platform_device.h>
#include <linux/of.h>
-#include <video/omapdss.h>
#include <video/omap-panel-data.h>
+#include "../dss/omapdss.h"
+
struct panel_drv_data {
struct omap_dss_device dssdev;
struct omap_dss_device *in;
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 747f26a55e43..75f7827525cf 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -15,10 +15,10 @@
#include <linux/slab.h>
#include <drm/drm_edid.h>
-
-#include <video/omapdss.h>
#include <video/omap-panel-data.h>
+#include "../dss/omapdss.h"
+
static const struct omap_video_timings dvic_default_timings = {
.x_res = 640,
.y_res = 480,
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 225fd8d6ab31..6bac35494819 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -16,10 +16,10 @@
#include <linux/of_gpio.h>
#include <drm/drm_edid.h>
-
-#include <video/omapdss.h>
#include <video/omap-panel-data.h>
+#include "../dss/omapdss.h"
+
static const struct omap_video_timings hdmic_default_timings = {
.x_res = 640,
.y_res = 480,
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 8c246c213e06..a36c36d3328e 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -20,7 +20,7 @@
#include <linux/slab.h>
#include <linux/of_gpio.h>
-#include <video/omapdss.h>
+#include "../dss/omapdss.h"
struct panel_drv_data {
struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index 6b7d4fc3ac12..027e2365f9e0 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -15,7 +15,7 @@
#include <linux/slab.h>
#include <linux/of_gpio.h>
-#include <video/omapdss.h>
+#include "../dss/omapdss.h"
struct panel_drv_data {
struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index f4f23f5cfe3e..46855c8f5cbf 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -16,7 +16,7 @@
#include <linux/platform_device.h>
#include <linux/gpio/consumer.h>
-#include <video/omapdss.h>
+#include "../dss/omapdss.h"
struct panel_drv_data {
struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index e780fd4f8b46..3baccf732d96 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -16,10 +16,11 @@
#include <linux/of.h>
#include <linux/of_gpio.h>
-#include <video/omapdss.h>
#include <video/omap-panel-data.h>
#include <video/of_display_timing.h>
+#include "../dss/omapdss.h"
+
struct panel_drv_data {
struct omap_dss_device dssdev;
struct omap_dss_device *in;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 6dcb75f6f0c5..bb20881dd1af 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -25,9 +25,10 @@
#include <linux/of_device.h>
#include <linux/of_gpio.h>
-#include <video/omapdss.h>
#include <video/mipi_display.h>
+#include "../dss/omapdss.h"
+
/* DSI Virtual channel. Hardcoded for now. */
#define TCH 0
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 1bd682864217..3f4477fc1dbc 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -16,7 +16,7 @@
#include <linux/mutex.h>
#include <linux/gpio.h>
-#include <video/omapdss.h>
+#include "../dss/omapdss.h"
static struct omap_video_timings lb035q02_timings = {
.x_res = 320,
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index 780cb263a318..6872b6adf095 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
@@ -18,7 +18,7 @@
#include <linux/gpio.h>
#include <linux/of_gpio.h>
-#include <video/omapdss.h>
+#include "../dss/omapdss.h"
struct panel_drv_data {
struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
index 529a017602e4..22b1d140c30e 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
@@ -17,7 +17,8 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/regulator/consumer.h>
-#include <video/omapdss.h>
+
+#include "../dss/omapdss.h"
struct panel_drv_data {
struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
index 31efcca801bd..f85cbb3a1add 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
@@ -33,9 +33,10 @@
#include <linux/of.h>
#include <linux/of_gpio.h>
-#include <video/omapdss.h>
#include <video/omap-panel-data.h>
+#include "../dss/omapdss.h"
+
#define MIPID_CMD_READ_DISP_ID 0x04
#define MIPID_CMD_READ_RED 0x06
#define MIPID_CMD_READ_GREEN 0x07
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
index bd8d85041926..e859b3f893f7 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
@@ -28,7 +28,8 @@
#include <linux/delay.h>
#include <linux/spi/spi.h>
#include <linux/gpio.h>
-#include <video/omapdss.h>
+
+#include "../dss/omapdss.h"
struct panel_drv_data {
struct omap_dss_device dssdev;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
index 03e2beb7b4f0..bcbab4972bbc 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
@@ -19,7 +19,7 @@
#include <linux/slab.h>
#include <linux/of_gpio.h>
-#include <video/omapdss.h>
+#include "../dss/omapdss.h"
#define TPO_R02_MODE(x) ((x) & 7)
#define TPO_R02_MODE_800x480 7
diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c
index 9cf22b30023f..6a3ebfcd7223 100644
--- a/drivers/gpu/drm/omapdrm/dss/core.c
+++ b/drivers/gpu/drm/omapdrm/dss/core.c
@@ -35,8 +35,7 @@
#include <linux/suspend.h>
#include <linux/slab.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index f83608b69e68..1fc15b8c769c 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -41,8 +41,7 @@
#include <linux/of.h>
#include <linux/component.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"
#include "dispc.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc_coefs.c b/drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
index 038c15b04215..34fad2376f8d 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
@@ -18,8 +18,8 @@
*/
#include <linux/kernel.h>
-#include <video/omapdss.h>
+#include "omapdss.h"
#include "dispc.h"
static const struct dispc_coef coef3_M8[8] = {
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c
index 9f3dd09b0a6c..8dcdd7cf9937 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -28,7 +28,7 @@
#include <linux/platform_device.h>
#include <linux/of.h>
-#include <video/omapdss.h>
+#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 97ea60257884..56068d4fb121 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -34,8 +34,7 @@
#include <linux/clk.h>
#include <linux/component.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 8730646a0cbb..d56ad7cc6b88 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -42,9 +42,9 @@
#include <linux/of_platform.h>
#include <linux/component.h>
-#include <video/omapdss.h>
#include <video/mipi_display.h>
+#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
index bf407b6ba15c..dfd4e9621e3b 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
@@ -18,8 +18,7 @@
#include <linux/of.h>
#include <linux/seq_file.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
struct device_node *
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index f95ff319e68e..68942ba3ec44 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -41,8 +41,7 @@
#include <linux/suspend.h>
#include <linux/component.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.c b/drivers/gpu/drm/omapdrm/dss/dss_features.c
index c886a2927f73..602ce1af5288 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss_features.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss_features.c
@@ -23,8 +23,7 @@
#include <linux/err.h>
#include <linux/slab.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi.h b/drivers/gpu/drm/omapdrm/dss/hdmi.h
index c32a21a26054..2f926f39d197 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi.h
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi.h
@@ -23,9 +23,9 @@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/hdmi.h>
-#include <video/omapdss.h>
#include <sound/omap-hdmi-audio.h>
+#include "omapdss.h"
#include "dss.h"
/* HDMI Wrapper */
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index f892ae157ff3..8de111ea1dbc 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -33,9 +33,9 @@
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/component.h>
-#include <video/omapdss.h>
#include <sound/omap-hdmi-audio.h>
+#include "omapdss.h"
#include "hdmi4_core.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index a43f7b10e113..15145163be13 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -38,9 +38,9 @@
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/component.h>
-#include <video/omapdss.h>
#include <sound/omap-hdmi-audio.h>
+#include "omapdss.h"
#include "hdmi5_core.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_common.c b/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
index 1b8fcc6c4ba1..4dfb67fe5f6d 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
@@ -4,8 +4,8 @@
#include <linux/kernel.h>
#include <linux/err.h>
#include <linux/of.h>
-#include <video/omapdss.h>
+#include "omapdss.h"
#include "hdmi.h"
int hdmi_parse_lanes_of(struct platform_device *pdev, struct device_node *ep,
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
index 1f5d19c119ce..3991b8fb9140 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
@@ -13,8 +13,8 @@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
-#include <video/omapdss.h>
+#include "omapdss.h"
#include "dss.h"
#include "hdmi.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index 06e23a7c432c..ad624b3d09f3 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@ -17,8 +17,7 @@
#include <linux/platform_device.h>
#include <linux/clk.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
#include "hdmi.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
index 13442b9052d1..48779155e4d0 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
@@ -14,8 +14,8 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/platform_device.h>
-#include <video/omapdss.h>
+#include "omapdss.h"
#include "dss.h"
#include "hdmi.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 829232ad8c81..24f859488201 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -21,8 +21,7 @@
#include <linux/slab.h>
#include <linux/of.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
static LIST_HEAD(output_list);
diff --git a/drivers/gpu/drm/omapdrm/dss/pll.c b/drivers/gpu/drm/omapdrm/dss/pll.c
index f974ddcd3b6e..0ffee5c49d14 100644
--- a/drivers/gpu/drm/omapdrm/dss/pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/pll.c
@@ -22,8 +22,7 @@
#include <linux/regulator/consumer.h>
#include <linux/sched.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
#define PLL_CONTROL 0x0000
diff --git a/drivers/gpu/drm/omapdrm/dss/rfbi.c b/drivers/gpu/drm/omapdrm/dss/rfbi.c
index 3796576dfadf..cd53566d75eb 100644
--- a/drivers/gpu/drm/omapdrm/dss/rfbi.c
+++ b/drivers/gpu/drm/omapdrm/dss/rfbi.c
@@ -38,7 +38,7 @@
#include <linux/pm_runtime.h>
#include <linux/component.h>
-#include <video/omapdss.h>
+#include "omapdss.h"
#include "dss.h"
struct rfbi_reg { u16 idx; };
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index cd6d3bfb041d..0a96c321ce62 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -29,7 +29,7 @@
#include <linux/of.h>
#include <linux/component.h>
-#include <video/omapdss.h>
+#include "omapdss.h"
#include "dss.h"
static struct {
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 08a2cc778ba9..6eedf2118708 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -37,8 +37,7 @@
#include <linux/of.h>
#include <linux/component.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/video-pll.c b/drivers/gpu/drm/omapdrm/dss/video-pll.c
index b1ec59e42940..180b55bbab8a 100644
--- a/drivers/gpu/drm/omapdrm/dss/video-pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/video-pll.c
@@ -17,8 +17,7 @@
#include <linux/platform_device.h>
#include <linux/sched.h>
-#include <video/omapdss.h>
-
+#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 3f823c368912..38786886d30e 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -24,7 +24,6 @@
#include <linux/platform_data/omap_drm.h>
#include <linux/types.h>
#include <linux/wait.h>
-#include <video/omapdss.h>
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
--
2.8.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack
2016-06-03 10:52 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
` (23 preceding siblings ...)
2016-06-03 10:53 ` [PATCH v3 24/27] drm/omap: Do not include video/omapdss.h directly in drivers Peter Ujfalusi
@ 2016-06-03 11:02 ` Peter Ujfalusi
24 siblings, 0 replies; 27+ messages in thread
From: Peter Ujfalusi @ 2016-06-03 11:02 UTC (permalink / raw)
To: tomi.valkeinen, plagnioj, robdclark, airlied, tony
Cc: linux-fbdev, linux-omap, linux-kernel, laurent.pinchart, jsarha,
dri-devel
Hi,
I can not believe this... My internet got disconnected during git
send-email... This is the second time that this happened.
Will resend the series.
On 06/03/16 13:52, Peter Ujfalusi wrote:
> Hi,
>
> Changes since v2:
> - Collected the patches (4 of them) at the beginning which touches mach-omap2
> - Smaller changes in the moved patches to make sure they compile.
>
> Changes since v1:
> - patches (2) added to remove the inclusion of video/omap-panel-data.h when it
> is not needed
> - Transitional patch to create the video/omapfb_dss.h has been changed to copy
> the content of the omapdss.h in one step.
>
> I have prepared two branches on top of v4.7-rc1:
> [1] https://github.com/omap-audio/linux-audio.git peter/for-4.8_omapdss_part1
>
> containing:
> ARM: OMAP: rx51-video: Do not set TV connector_type
> ARM/video: omap2: Move omap_display_init declaration to
> mach-omap2/display.h
> video/platform_data: omapdss: Create new header file for platform data
> ARM: OMAP2: Use the platform_data header for omapdss
>
> [2] https://github.com/omap-audio/linux-audio.git peter/for-4.8_omapdss_part2
>
> containing the whole set, including part1.
>
> Only patches in part1 branch are touching arch/arm/mach-omap2/ files.
>
> omapfb is deprecated. It will not receive new features, only bug fixes. On the.
> other hand omapdrm is in active development and the fact that both
> implementation (omapfb and omapdrm) is using the same header file
> (video/omapdss.h) makes implementing new features or doing bigger clean ups in
> omapdrm harder and hared as the change should not break omapfb.
>
> To overcome this issue we need to separate the two implementation. This is the
> aim of this series:
> Create platform_data header for omapdss,
> clean up the header usage and dependencies,
> new header file for omapfb stack (video/omapfb_dss.h)
> local omapdss.h header file for omapdrm.
>
> Regards,
> Peter
> ---
> Peter Ujfalusi (27):
> ARM: OMAP: rx51-video: Do not set TV connector_type
> ARM/video: omap2: Move omap_display_init declaration to
> mach-omap2/display.h
> video/platform_data: omapdss: Create new header file for platform data
> ARM: OMAP2: Use the platform_data header for omapdss
> omapfb: panel-tpo-td028ttec1: Remove legacy boot support
> omapfb: panel-nec-nl8048hl11: Remove legacy boot support
> omapfb: panel-tpo-td043mtea1: Remove legacy boot support
> omapfb: panel-sharp-ls037v7dw01: Remove legacy boot support
> omapfb: panel-lgphilips-lb035q02: Remove legacy boot support
> omapfb: panel-dsi-cm: Remove legacy boot support
> omapfb: connector-hdmi: Remove legacy boot support
> omapfb: connector-dvi: Remove legacy boot support
> omapfb: encoder-tfp410: Remove legacy boot support
> omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h
> drm/omap: displays: Do not include video/omap-panel-data.h if not
> needed
> omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration
> drm/omap: connector-analog-tv: Support only Composite type in legacy
> boot
> omapfb: connector-analog-tv: Support only Composite type in legacy
> boot
> omapdss: omap-panel-data.h: Remove connector_type from atv pdata
> drm/omap: Remove reference to pdata->default_device
> omapfb: Remove reference to pdata->default_device
> platform_data: omapdss: Remove unused members from omap_dss_board_info
> omapdss: hdmi audio: Make header file independent of video/omapdss.h
> drm/omap: Do not include video/omapdss.h directly in drivers
> omapfb: Create new header file for omapfb DSS implementation
> [media] omap_vout: Switch to use the video/omapfb_dss.h header file
> drm/omap: Remove the video/omapdss.h and move it's content to local
> header file
>
> arch/arm/mach-omap2/board-ldp.c | 3 +-
> arch/arm/mach-omap2/board-rx51-video.c | 4 +-
> arch/arm/mach-omap2/display.c | 2 +-
> arch/arm/mach-omap2/display.h | 5 +
> arch/arm/mach-omap2/dss-common.c | 2 +-
> .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 11 +-
> drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 4 +-
> drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 4 +-
> drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 2 +-
> drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 3 +-
> .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 3 +-
> drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 3 +-
> drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 4 +-
> .../omapdrm/displays/panel-lgphilips-lb035q02.c | 3 +-
> .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 +-
> .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 3 +-
> .../drm/omapdrm/displays/panel-sony-acx565akm.c | 3 +-
> .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 3 +-
> .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/core.c | 5 +-
> drivers/gpu/drm/omapdrm/dss/dispc.c | 3 +-
> drivers/gpu/drm/omapdrm/dss/dispc_coefs.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/display.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/dpi.c | 3 +-
> drivers/gpu/drm/omapdrm/dss/dsi.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/dss-of.c | 3 +-
> drivers/gpu/drm/omapdrm/dss/dss.c | 3 +-
> drivers/gpu/drm/omapdrm/dss/dss_features.c | 3 +-
> drivers/gpu/drm/omapdrm/dss/hdmi.h | 3 +-
> drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/hdmi_common.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 3 +-
> drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/omapdss.h | 866 ++++++++++++++++++++-
> drivers/gpu/drm/omapdrm/dss/output.c | 3 +-
> drivers/gpu/drm/omapdrm/dss/pll.c | 3 +-
> drivers/gpu/drm/omapdrm/dss/rfbi.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/venc.c | 3 +-
> drivers/gpu/drm/omapdrm/dss/video-pll.c | 3 +-
> drivers/gpu/drm/omapdrm/omap_drv.h | 1 -
> drivers/media/platform/omap/omap_vout.c | 2 +-
> drivers/media/platform/omap/omap_voutdef.h | 2 +-
> drivers/media/platform/omap/omap_voutlib.c | 2 +-
> .../omap2/omapfb/displays/connector-analog-tv.c | 10 +-
> .../fbdev/omap2/omapfb/displays/connector-dvi.c | 60 +-
> .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 44 +-
> .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 2 +-
> .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 46 +-
> .../omap2/omapfb/displays/encoder-tpd12s015.c | 3 +-
> .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 2 +-
> .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 54 +-
> .../omapfb/displays/panel-lgphilips-lb035q02.c | 58 +-
> .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 47 +-
> .../omapfb/displays/panel-sharp-ls037v7dw01.c | 83 +-
> .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +-
> .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 45 +-
> .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 46 +-
> drivers/video/fbdev/omap2/omapfb/dss/apply.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/core.c | 4 +-
> .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c | 2 +-
> .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/display.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/dss.c | 2 +-
> .../video/fbdev/omap2/omapfb/dss/dss_features.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 3 +-
> drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c | 2 +-
> .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/manager.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/output.c | 2 +-
> .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/pll.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/rfbi.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/venc.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/omapfb.h | 2 +-
> include/linux/platform_data/omapdss.h | 37 +
> include/sound/omap-hdmi-audio.h | 9 +-
> include/video/omap-panel-data.h | 157 ----
> include/video/{omapdss.h => omapfb_dss.h} | 60 +-
> sound/soc/omap/omap-hdmi-audio.c | 1 -
> 98 files changed, 1081 insertions(+), 751 deletions(-)
> create mode 100644 include/linux/platform_data/omapdss.h
> rename include/video/{omapdss.h => omapfb_dss.h} (93%)
>
--
Péter
^ permalink raw reply [flat|nested] 27+ messages in thread