Skip to content

Commit

Permalink
Merge omapdss header refactoring
Browse files Browse the repository at this point in the history 
Merge omapdss public header refactoring, which separates the public
header into omapdrm and omapfb parts.
  • Loading branch information
Tomi Valkeinen committed Jun 7, 2016
2 parents ecf140d + 26038aa commit a1dec22
Show file tree
Hide file tree
Showing 98 changed files with 1,081 additions and 751 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/board-ldp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,15 @@
#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"
#include "mux.h"
#include "hsmmc.h"
#include "control.h"
#include "common-board-devices.h"
#include "display.h"

#define LDP_SMSC911X_CS 1
#define LDP_SMSC911X_GPIO 152
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/board-rx51-video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
#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>

#include "soc.h"
#include "board-rx51.h"
#include "display.h"

#include "mux.h"

Expand All @@ -32,7 +33,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,
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/mach-omap2/display.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/dss-common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 3 additions & 8 deletions drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -25,7 +26,6 @@ struct panel_drv_data {

struct omap_video_timings timings;

enum omap_dss_venc_type connector_type;
bool invert_polarity;
};

Expand All @@ -45,10 +45,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)
Expand Down Expand Up @@ -99,7 +95,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);
Expand Down Expand Up @@ -207,7 +203,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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/omapdrm/displays/connector-dvi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>

#include <video/omapdss.h>
#include "../dss/omapdss.h"

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
#include <linux/slab.h>
#include <linux/of_gpio.h>

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

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
#include <linux/platform_device.h>
#include <linux/gpio/consumer.h>

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

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/omapdrm/displays/panel-dpi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
#include <linux/of_gpio.h>
#include <linux/regulator/consumer.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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#include <linux/of_device.h>
#include <linux/of_gpio.h>

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

#include "../dss/omapdss.h"

/* DSI Virtual channel. Hardcoded for now. */
#define TCH 0

Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
#include <linux/gpio.h>
#include <linux/gpio/consumer.h>

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

static struct omap_video_timings lb035q02_timings = {
.x_res = 320,
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <linux/gpio/consumer.h>
#include <linux/of_gpio.h>

#include <video/omapdss.h>
#include "../dss/omapdss.h"

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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;
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions drivers/gpu/drm/omapdrm/dss/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -196,8 +195,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;

Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/omapdrm/dss/dispc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/omapdrm/dss/display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/omapdrm/dss/dpi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/omapdrm/dss/dsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/omapdrm/dss/dss-of.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/omapdrm/dss/dss.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
#include <linux/suspend.h>
#include <linux/component.h>

#include <video/omapdss.h>

#include "omapdss.h"
#include "dss.h"
#include "dss_features.h"

Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/omapdrm/dss/dss_features.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/omapdrm/dss/hdmi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +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 */
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/omapdrm/dss/hdmi4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
#include <linux/regulator/consumer.h>
#include <linux/component.h>
#include <linux/of.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"
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/omapdrm/dss/hdmi5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
#include <linux/regulator/consumer.h>
#include <linux/component.h>
#include <linux/of.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"
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/omapdrm/dss/hdmi_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading

0 comments on commit a1dec22

Please sign in to comment.