Skip to content

Commit

Permalink
omapfb: Create new header file for omapfb DSS implementation
Browse files Browse the repository at this point in the history
Copy the content of video/omapdss.h to a new (video/omapfb_dss.h) header
file and convert the omapfb drivers to use this new file.

The new header file is needed to complete the separation of omapdrm and
omapfb implementation of DSS.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  • Loading branch information
Peter Ujfalusi committed Jun 3, 2016
1 parent 32043da commit 62d9e44
Show file tree
Hide file tree
Showing 48 changed files with 927 additions and 47 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <linux/platform_device.h>
#include <linux/of.h>

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

struct panel_drv_data {
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <drm/drm_edid.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

static const struct omap_video_timings dvic_default_timings = {
.x_res = 640,
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <drm/drm_edid.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

static const struct omap_video_timings hdmic_default_timings = {
.x_res = 640,
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <linux/slab.h>
#include <linux/of_gpio.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <linux/slab.h>
#include <linux/of_gpio.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <linux/platform_device.h>
#include <linux/gpio/consumer.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <linux/of.h>
#include <linux/of_gpio.h>

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

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <linux/of_device.h>
#include <linux/of_gpio.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>
#include <video/mipi_display.h>

/* DSI Virtual channel. Hardcoded for now. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <linux/mutex.h>
#include <linux/gpio.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

static struct omap_video_timings lb035q02_timings = {
.x_res = 320,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <linux/gpio.h>
#include <linux/of_gpio.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/regulator/consumer.h>
#include <video/omapdss.h>
#include <video/omapfb_dss.h>

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <linux/of.h>
#include <linux/of_gpio.h>

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

#define MIPID_CMD_READ_DISP_ID 0x04
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <linux/delay.h>
#include <linux/spi/spi.h>
#include <linux/gpio.h>
#include <video/omapdss.h>
#include <video/omapfb_dss.h>

struct panel_drv_data {
struct omap_dss_device dssdev;
Expand Down
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 <video/omapfb_dss.h>

#define TPO_R02_MODE(x) ((x) & 7)
#define TPO_R02_MODE_800x480 7
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <linux/spinlock.h>
#include <linux/jiffies.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <linux/suspend.h>
#include <linux/slab.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <linux/interrupt.h>
#include <linux/seq_file.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/dispc.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <linux/of.h>
#include <linux/component.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

#include <linux/kernel.h>
#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dispc.h"

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <linux/platform_device.h>
#include <linux/sysfs.h>

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

static ssize_t display_name_show(struct omap_dss_device *dssdev, char *buf)
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/display.c
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 <video/omapfb_dss.h>
#include "dss.h"
#include "dss_features.h"

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/dpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <linux/clk.h>
#include <linux/component.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include <linux/of_platform.h>
#include <linux/component.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>
#include <video/mipi_display.h>

#include "dss.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <linux/of.h>
#include <linux/seq_file.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/dss.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <linux/suspend.h>
#include <linux/component.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/dss_features.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <linux/err.h>
#include <linux/slab.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/hdmi.h>
#include <video/omapdss.h>
#include <video/omapfb_dss.h>
#include <sound/omap-hdmi-audio.h>

#include "dss.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/component.h>
#include <video/omapdss.h>
#include <video/omapfb_dss.h>
#include <sound/omap-hdmi-audio.h>

#include "hdmi4_core.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/component.h>
#include <video/omapdss.h>
#include <video/omapfb_dss.h>
#include <sound/omap-hdmi-audio.h>

#include "hdmi5_core.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <linux/kernel.h>
#include <linux/err.h>
#include <linux/of.h>
#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "hdmi.h"

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "hdmi.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <linux/platform_device.h>
#include <linux/clk.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "hdmi.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "hdmi.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <linux/platform_device.h>
#include <linux/jiffies.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <linux/platform_device.h>
#include <linux/jiffies.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <linux/slab.h>
#include <linux/of.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <linux/kobject.h>
#include <linux/platform_device.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/overlay.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <linux/delay.h>
#include <linux/slab.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/pll.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <linux/regulator/consumer.h>
#include <linux/sched.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include <linux/pm_runtime.h>
#include <linux/component.h>

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

struct rfbi_reg { u16 idx; };
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/sdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <linux/of.h>
#include <linux/component.h>

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

static struct {
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <linux/of.h>
#include <linux/component.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <linux/platform_device.h>
#include <linux/sched.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>

#include "dss.h"
#include "dss_features.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <linux/export.h>
#include <linux/sizes.h>

#include <video/omapdss.h>
#include <video/omapfb_dss.h>
#include <video/omapvrfb.h>

#include "omapfb.h"
Expand Down
Loading

0 comments on commit 62d9e44

Please sign in to comment.