Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82e83f67 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: move display, dss-of, output to omapdss-base 



This patch moves the common parts of omapdss to omapdss-base so that
both the current omapdss driver and the new omapdss6 driver can use
them.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 892fdcb0

drivers/gpu/drm/omapdrm/dss/Makefile

+3 −3
Original line number Diff line number Diff line 
obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o



obj-$(CONFIG_OMAP_DSS_BASE) += omapdss-base.o

omapdss-base-y := base.o

omapdss-base-y := base.o display.o dss-of.o output.o



obj-$(CONFIG_OMAP2_DSS) += omapdss.o

# Core DSS files

omapdss-y := core.o dss.o dss_features.o dispc.o dispc_coefs.o display.o \

	output.o dss-of.o pll.o video-pll.o

omapdss-y := core.o dss.o dss_features.o dispc.o dispc_coefs.o \

	pll.o video-pll.o

omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o

omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o

omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o

drivers/gpu/drm/omapdrm/dss/display.c

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include <linux/of.h>



#include "omapdss.h"

#include "dss.h"

#include "dss_features.h"



void omapdss_default_get_resolution(struct omap_dss_device *dssdev,

			u16 *xres, u16 *yres)

drivers/gpu/drm/omapdrm/dss/dss-of.c

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/seq_file.h>



#include "omapdss.h"

#include "dss.h"



struct device_node *

omapdss_of_get_next_port(const struct device_node *parent,
@@ -110,6 +109,7 @@ struct device_node *dss_of_port_get_parent_device(struct device_node *port) 


	return NULL;

}

EXPORT_SYMBOL_GPL(dss_of_port_get_parent_device);



u32 dss_of_port_get_port_number(struct device_node *port)

{
@@ -122,6 +122,7 @@ u32 dss_of_port_get_port_number(struct device_node *port) 


	return reg;

}

EXPORT_SYMBOL_GPL(dss_of_port_get_port_number);



static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)

{

drivers/gpu/drm/omapdrm/dss/dss.h

+0 −4
Original line number Diff line number Diff line
@@ -253,10 +253,6 @@ struct dss_pll *dss_video_pll_init(struct platform_device *pdev, int id, 
	struct regulator *regulator);

void dss_video_pll_uninit(struct dss_pll *pll);



/* dss-of */

struct device_node *dss_of_port_get_parent_device(struct device_node *port);

u32 dss_of_port_get_port_number(struct device_node *port);



#if defined(CONFIG_OMAP2_DSS_DEBUGFS)

void dss_debug_dump_clocks(struct seq_file *s);

#endif

drivers/gpu/drm/omapdrm/dss/omapdss.h

+3 −0
Original line number Diff line number Diff line
@@ -846,6 +846,9 @@ omapdss_of_find_source_for_first_ep(struct device_node *node); 


void omapdss_set_is_initialized(bool set);



struct device_node *dss_of_port_get_parent_device(struct device_node *port);

u32 dss_of_port_get_port_number(struct device_node *port);



u32 dispc_read_irqstatus(void);

void dispc_clear_irqstatus(u32 mask);

u32 dispc_read_irqenable(void);