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

Commit 35b522cf authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP* 



We need to change the config symbols of omapfb's private copy of
omapdss so that we won't have config symbol conflicts.

This patch changes the symbols from omapdss using simple replacement of
CONFIG_OMAP* to CONFIG_FB_OMAP*.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Acked-by: default avatarRob Clark <robdclark@gmail.com>
parent fc6caa0b

drivers/video/fbdev/omap2/omapfb/dss/Kconfig

+20 −26
Original line number Diff line number Diff line 
config OMAP2_DSS_INIT

config FB_OMAP2_DSS_INIT

	bool



menuconfig OMAP2_DSS

        tristate "OMAP2+ Display Subsystem support"

config FB_OMAP2_DSS

        tristate

	select VIDEOMODE_HELPERS

	select OMAP2_DSS_INIT

	select FB_OMAP2_DSS_INIT

	select HDMI

        help

	  OMAP2+ Display Subsystem support.



if OMAP2_DSS



config OMAP2_DSS_DEBUG

config FB_OMAP2_DSS_DEBUG

	bool "Debug support"

	default n

	help
@@ -19,7 +15,7 @@ config OMAP2_DSS_DEBUG 
	  can also be enabled by setting CONFIG_DYNAMIC_DEBUG and then setting

	  appropriate flags in <debugfs>/dynamic_debug/control.



config OMAP2_DSS_DEBUGFS

config FB_OMAP2_DSS_DEBUGFS

	bool "Debugfs filesystem support"

	depends on DEBUG_FS

	default n
@@ -28,9 +24,9 @@ config OMAP2_DSS_DEBUGFS 
	  querying about clock configuration and register configuration of dss,

	  dispc, dsi, hdmi and rfbi.



config OMAP2_DSS_COLLECT_IRQ_STATS

config FB_OMAP2_DSS_COLLECT_IRQ_STATS

	bool "Collect DSS IRQ statistics"

	depends on OMAP2_DSS_DEBUGFS

	depends on FB_OMAP2_DSS_DEBUGFS

	default n

	help

	  Collect DSS IRQ statistics, printable via debugfs.
@@ -39,13 +35,13 @@ config OMAP2_DSS_COLLECT_IRQ_STATS 
	  <debugfs>/omapdss/dispc_irq for DISPC interrupts, and

	  <debugfs>/omapdss/dsi_irq for DSI interrupts.



config OMAP2_DSS_DPI

config FB_OMAP2_DSS_DPI

	bool "DPI support"

	default y

	help

	  DPI Interface. This is the Parallel Display Interface.



config OMAP2_DSS_RFBI

config FB_OMAP2_DSS_RFBI

	bool "RFBI support"

	depends on BROKEN

        default n
@@ -58,32 +54,32 @@ config OMAP2_DSS_RFBI 


	  See http://www.mipi.org/ for DBI specifications.



config OMAP2_DSS_VENC

config FB_OMAP2_DSS_VENC

	bool "VENC support"

        default y

	help

	  OMAP Video Encoder support for S-Video and composite TV-out.



config OMAP2_DSS_HDMI_COMMON

config FB_OMAP2_DSS_HDMI_COMMON

	bool



config OMAP4_DSS_HDMI

config FB_OMAP4_DSS_HDMI

	bool "HDMI support for OMAP4"

        default y

	select OMAP2_DSS_HDMI_COMMON

	select FB_OMAP2_DSS_HDMI_COMMON

	help

	  HDMI support for OMAP4 based SoCs.



config OMAP5_DSS_HDMI

config FB_OMAP5_DSS_HDMI

	bool "HDMI support for OMAP5"

	default n

	select OMAP2_DSS_HDMI_COMMON

	select FB_OMAP2_DSS_HDMI_COMMON

	help

	  HDMI Interface for OMAP5 and similar cores. This adds the High

	  Definition Multimedia Interface. See http://www.hdmi.org/ for HDMI

	  specification.



config OMAP2_DSS_SDI

config FB_OMAP2_DSS_SDI

	bool "SDI support"

        default n

	help
@@ -92,7 +88,7 @@ config OMAP2_DSS_SDI 
	  SDI is a high speed one-way display serial bus between the host

	  processor and a display.



config OMAP2_DSS_DSI

config FB_OMAP2_DSS_DSI

	bool "DSI support"

        default n

	help
@@ -103,7 +99,7 @@ config OMAP2_DSS_DSI 


	  See http://www.mipi.org/ for DSI specifications.



config OMAP2_DSS_MIN_FCK_PER_PCK

config FB_OMAP2_DSS_MIN_FCK_PER_PCK

	int "Minimum FCK/PCK ratio (for scaling)"

	range 0 32

	default 0
@@ -121,7 +117,7 @@ config OMAP2_DSS_MIN_FCK_PER_PCK 
	  Max FCK is 173MHz, so this doesn't work if your PCK

	  is very high.



config OMAP2_DSS_SLEEP_AFTER_VENC_RESET

config FB_OMAP2_DSS_SLEEP_AFTER_VENC_RESET

	bool "Sleep 20ms after VENC reset"

	default y

	help
@@ -131,5 +127,3 @@ config OMAP2_DSS_SLEEP_AFTER_VENC_RESET 


	  This option enables the sleep, and is enabled by default. You can

	  disable the sleep if it doesn't cause problems on your platform.
 


endif

drivers/video/fbdev/omap2/omapfb/dss/Makefile

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

obj-$(CONFIG_OMAP2_DSS) += omapdss.o

obj-$(CONFIG_FB_OMAP2_DSS_INIT) += omapdss-boot-init.o

obj-$(CONFIG_FB_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

# DSS compat layer files

omapdss-y += manager.o manager-sysfs.o overlay.o overlay-sysfs.o apply.o \

	dispc-compat.o display-sysfs.o

omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o

omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o

omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o

omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o

omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o

omapdss-$(CONFIG_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o hdmi_pll.o \

omapdss-$(CONFIG_FB_OMAP2_DSS_DPI) += dpi.o

omapdss-$(CONFIG_FB_OMAP2_DSS_RFBI) += rfbi.o

omapdss-$(CONFIG_FB_OMAP2_DSS_VENC) += venc.o

omapdss-$(CONFIG_FB_OMAP2_DSS_SDI) += sdi.o

omapdss-$(CONFIG_FB_OMAP2_DSS_DSI) += dsi.o

omapdss-$(CONFIG_FB_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o hdmi_pll.o \

	hdmi_phy.o

omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi4.o hdmi4_core.o

omapdss-$(CONFIG_OMAP5_DSS_HDMI) += hdmi5.o hdmi5_core.o

ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG
 
omapdss-$(CONFIG_FB_OMAP4_DSS_HDMI) += hdmi4.o hdmi4_core.o

omapdss-$(CONFIG_FB_OMAP5_DSS_HDMI) += hdmi5.o hdmi5_core.o

ccflags-$(CONFIG_FB_OMAP2_DSS_DEBUG) += -DDEBUG

drivers/video/fbdev/omap2/omapfb/dss/core.c

+17 −17
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int dss_set_min_bus_tput(struct device *dev, unsigned long tput) 
		return 0;

}



#if defined(CONFIG_OMAP2_DSS_DEBUGFS)

#if defined(CONFIG_FB_OMAP2_DSS_DEBUGFS)

static int dss_debug_show(struct seq_file *s, void *unused)

{

	void (*func)(struct seq_file *) = s->private;
@@ -150,7 +150,7 @@ int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *)) 


	return PTR_ERR_OR_ZERO(d);

}

#else /* CONFIG_OMAP2_DSS_DEBUGFS */

#else /* CONFIG_FB_OMAP2_DSS_DEBUGFS */

static inline int dss_initialize_debugfs(void)

{

	return 0;
@@ -162,7 +162,7 @@ int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *)) 
{

	return 0;

}

#endif /* CONFIG_OMAP2_DSS_DEBUGFS */

#endif /* CONFIG_FB_OMAP2_DSS_DEBUGFS */



/* PLATFORM DEVICE */

static int omap_dss_pm_notif(struct notifier_block *b, unsigned long v, void *d)
@@ -247,49 +247,49 @@ static struct platform_driver omap_dss_driver = { 
static int (*dss_output_drv_reg_funcs[])(void) __initdata = {

	dss_init_platform_driver,

	dispc_init_platform_driver,

#ifdef CONFIG_OMAP2_DSS_DSI

#ifdef CONFIG_FB_OMAP2_DSS_DSI

	dsi_init_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_DPI

#ifdef CONFIG_FB_OMAP2_DSS_DPI

	dpi_init_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_SDI

#ifdef CONFIG_FB_OMAP2_DSS_SDI

	sdi_init_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_RFBI

#ifdef CONFIG_FB_OMAP2_DSS_RFBI

	rfbi_init_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_VENC

#ifdef CONFIG_FB_OMAP2_DSS_VENC

	venc_init_platform_driver,

#endif

#ifdef CONFIG_OMAP4_DSS_HDMI

#ifdef CONFIG_FB_OMAP4_DSS_HDMI

	hdmi4_init_platform_driver,

#endif

#ifdef CONFIG_OMAP5_DSS_HDMI

#ifdef CONFIG_FB_OMAP5_DSS_HDMI

	hdmi5_init_platform_driver,

#endif

};



static void (*dss_output_drv_unreg_funcs[])(void) = {

#ifdef CONFIG_OMAP5_DSS_HDMI

#ifdef CONFIG_FB_OMAP5_DSS_HDMI

	hdmi5_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP4_DSS_HDMI

#ifdef CONFIG_FB_OMAP4_DSS_HDMI

	hdmi4_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_VENC

#ifdef CONFIG_FB_OMAP2_DSS_VENC

	venc_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_RFBI

#ifdef CONFIG_FB_OMAP2_DSS_RFBI

	rfbi_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_SDI

#ifdef CONFIG_FB_OMAP2_DSS_SDI

	sdi_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_DPI

#ifdef CONFIG_FB_OMAP2_DSS_DPI

	dpi_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_DSI

#ifdef CONFIG_FB_OMAP2_DSS_DSI

	dsi_uninit_platform_driver,

#endif

	dispc_uninit_platform_driver,

drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c

+4 −4
Original line number Diff line number Diff line
@@ -60,14 +60,14 @@ static struct { 
	u32 error_irqs;

	struct work_struct error_work;



#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS

#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS

	spinlock_t irq_stats_lock;

	struct dispc_irq_stats irq_stats;

#endif

} dispc_compat;





#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS

#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS

static void dispc_dump_irqs(struct seq_file *s)

{

	unsigned long flags;
@@ -279,7 +279,7 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *arg) 
		return IRQ_NONE;

	}



#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS

#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS

	spin_lock(&dispc_compat.irq_stats_lock);

	dispc_compat.irq_stats.irq_count++;

	dss_collect_irq_stats(irqstatus, dispc_compat.irq_stats.irqs);
@@ -416,7 +416,7 @@ int dss_dispc_initialize_irq(void) 
{

	int r;



#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS

#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS

	spin_lock_init(&dispc_compat.irq_stats_lock);

	dispc_compat.irq_stats.last_reset = jiffies;

	dss_debugfs_create_file("dispc_irq", dispc_dump_irqs);

drivers/video/fbdev/omap2/omapfb/dss/dispc.c

+2 −2
Original line number Diff line number Diff line
@@ -3721,8 +3721,8 @@ bool dispc_div_calc(unsigned long dispc, 
	unsigned min_fck_per_pck;

	unsigned long fck;



#ifdef CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK

	min_fck_per_pck = CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK;

#ifdef CONFIG_FB_OMAP2_DSS_MIN_FCK_PER_PCK

	min_fck_per_pck = CONFIG_FB_OMAP2_DSS_MIN_FCK_PER_PCK;

#else

	min_fck_per_pck = 0;

#endif