diff options
-rw-r--r-- | drivers/video/omap2/dss/Makefile | 4 | ||||
-rw-r--r-- | drivers/video/omap2/dss/core.c | 4 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dss.h | 4 | ||||
-rw-r--r-- | drivers/video/omap2/dss/hdmi.h (renamed from drivers/video/omap2/dss/ti_hdmi.h) | 8 | ||||
-rw-r--r-- | drivers/video/omap2/dss/hdmi4.c (renamed from drivers/video/omap2/dss/hdmi.c) | 18 | ||||
-rw-r--r-- | drivers/video/omap2/dss/hdmi4_core.c (renamed from drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c) | 4 | ||||
-rw-r--r-- | drivers/video/omap2/dss/hdmi4_core.h (renamed from drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h) | 10 | ||||
-rw-r--r-- | drivers/video/omap2/dss/hdmi_phy.c | 2 | ||||
-rw-r--r-- | drivers/video/omap2/dss/hdmi_pll.c | 2 | ||||
-rw-r--r-- | drivers/video/omap2/dss/hdmi_wp.c | 2 |
10 files changed, 25 insertions, 33 deletions
diff --git a/drivers/video/omap2/dss/Makefile b/drivers/video/omap2/dss/Makefile index d88e93870e15..f87ca3216a1f 100644 --- a/drivers/video/omap2/dss/Makefile +++ b/drivers/video/omap2/dss/Makefile @@ -10,6 +10,6 @@ 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_OMAP4_DSS_HDMI) += hdmi.o hdmi_wp.o hdmi_pll.o hdmi_phy.o \ - ti_hdmi_4xxx_ip.o +omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi4.o hdmi_wp.o hdmi_pll.o hdmi_phy.o \ + hdmi4_core.o ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 60d3958d04f7..ffa45c894cd4 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -266,7 +266,7 @@ static int (*dss_output_drv_reg_funcs[])(void) __initdata = { venc_init_platform_driver, #endif #ifdef CONFIG_OMAP4_DSS_HDMI - hdmi_init_platform_driver, + hdmi4_init_platform_driver, #endif }; @@ -287,7 +287,7 @@ static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = { venc_uninit_platform_driver, #endif #ifdef CONFIG_OMAP4_DSS_HDMI - hdmi_uninit_platform_driver, + hdmi4_uninit_platform_driver, #endif }; diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h index e172531d196b..f538e867c0f8 100644 --- a/drivers/video/omap2/dss/dss.h +++ b/drivers/video/omap2/dss/dss.h @@ -427,8 +427,8 @@ int venc_init_platform_driver(void) __init; void venc_uninit_platform_driver(void) __exit; /* HDMI */ -int hdmi_init_platform_driver(void) __init; -void hdmi_uninit_platform_driver(void) __exit; +int hdmi4_init_platform_driver(void) __init; +void hdmi4_uninit_platform_driver(void) __exit; /* RFBI */ int rfbi_init_platform_driver(void) __init; diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/hdmi.h index 5034080ccfa9..b92d981063dc 100644 --- a/drivers/video/omap2/dss/ti_hdmi.h +++ b/drivers/video/omap2/dss/hdmi.h @@ -1,7 +1,5 @@ /* - * ti_hdmi.h - * - * HDMI driver definition for TI OMAP4, DM81xx, DM38xx Processor. + * HDMI driver definition for TI OMAP4 Processor. * * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ * @@ -18,8 +16,8 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _TI_HDMI_H -#define _TI_HDMI_H +#ifndef _HDMI_H +#define _HDMI_H #include <linux/delay.h> #include <linux/io.h> diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi4.c index f03d6c7530e4..324ecd00e4da 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi4.c @@ -1,7 +1,5 @@ /* - * hdmi.c - * - * HDMI interface DSS driver setting for TI's OMAP4 family of processor. + * HDMI interface DSS driver for TI's OMAP4 family of SoCs. * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ * Authors: Yong Zhi * Mythri pk <mythripk@ti.com> @@ -36,8 +34,7 @@ #include <linux/regulator/consumer.h> #include <video/omapdss.h> -#include "ti_hdmi.h" -#include "ti_hdmi_4xxx_ip.h" +#include "hdmi4_core.h" #include "dss.h" #include "dss_features.h" @@ -361,8 +358,8 @@ static const struct hdmi_config *hdmi_find_timing( static const struct hdmi_config *hdmi_get_timings(void) { - const struct hdmi_config *arr; - int len; + const struct hdmi_config *arr; + int len; if (hdmi.cfg.cm.mode == HDMI_DVI) { arr = vesa_timings; @@ -543,9 +540,8 @@ static int hdmi_display_check_timing(struct omap_dss_device *dssdev, struct hdmi_cm cm; cm = hdmi_get_code(timings); - if (cm.code == -1) { + if (cm.code == -1) return -EINVAL; - } return 0; @@ -1117,12 +1113,12 @@ static struct platform_driver omapdss_hdmihw_driver = { }, }; -int __init hdmi_init_platform_driver(void) +int __init hdmi4_init_platform_driver(void) { return platform_driver_register(&omapdss_hdmihw_driver); } -void __exit hdmi_uninit_platform_driver(void) +void __exit hdmi4_uninit_platform_driver(void) { platform_driver_unregister(&omapdss_hdmihw_driver); } diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/hdmi4_core.c index 93a99fd080af..3f7fc572be10 100644 --- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c +++ b/drivers/video/omap2/dss/hdmi4_core.c @@ -34,7 +34,7 @@ #include <sound/asoundef.h> #endif -#include "ti_hdmi_4xxx_ip.h" +#include "hdmi4_core.h" #include "dss_features.h" #define HDMI_CORE_AV 0x500 @@ -223,7 +223,7 @@ static void hdmi_core_init(struct hdmi_core_video_config *video_cfg, avi_cfg->db3_nup_scaling = 0; avi_cfg->db4_videocode = 0; avi_cfg->db5_pixel_repeat = 0; - avi_cfg->db6_7_line_eoftop = 0 ; + avi_cfg->db6_7_line_eoftop = 0; avi_cfg->db8_9_line_sofbottom = 0; avi_cfg->db10_11_pixel_eofleft = 0; avi_cfg->db12_13_pixel_sofright = 0; diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h b/drivers/video/omap2/dss/hdmi4_core.h index 78319ff0b227..1181b4c1a068 100644 --- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h +++ b/drivers/video/omap2/dss/hdmi4_core.h @@ -1,7 +1,5 @@ /* - * ti_hdmi_4xxx_ip.h - * - * HDMI header definition for DM81xx, DM38xx, TI OMAP4 etc processors. + * HDMI header definition for OMAP4 HDMI core IP * * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ * @@ -18,10 +16,10 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _HDMI_TI_4xxx_H_ -#define _HDMI_TI_4xxx_H_ +#ifndef _HDMI4_CORE_H_ +#define _HDMI4_CORE_H_ -#include "ti_hdmi.h" +#include "hdmi.h" /* OMAP4 HDMI IP Core System */ diff --git a/drivers/video/omap2/dss/hdmi_phy.c b/drivers/video/omap2/dss/hdmi_phy.c index 16feaa80b3b4..45acb997ac00 100644 --- a/drivers/video/omap2/dss/hdmi_phy.c +++ b/drivers/video/omap2/dss/hdmi_phy.c @@ -15,7 +15,7 @@ #include <video/omapdss.h> #include "dss.h" -#include "ti_hdmi.h" +#include "hdmi.h" void hdmi_phy_dump(struct hdmi_phy_data *phy, struct seq_file *s) { diff --git a/drivers/video/omap2/dss/hdmi_pll.c b/drivers/video/omap2/dss/hdmi_pll.c index 6e187e63daae..d3e6e78c0082 100644 --- a/drivers/video/omap2/dss/hdmi_pll.c +++ b/drivers/video/omap2/dss/hdmi_pll.c @@ -16,7 +16,7 @@ #include <video/omapdss.h> #include "dss.h" -#include "ti_hdmi.h" +#include "hdmi.h" #define HDMI_DEFAULT_REGN 16 #define HDMI_DEFAULT_REGM2 1 diff --git a/drivers/video/omap2/dss/hdmi_wp.c b/drivers/video/omap2/dss/hdmi_wp.c index 93039ea970f0..8151d8969a6e 100644 --- a/drivers/video/omap2/dss/hdmi_wp.c +++ b/drivers/video/omap2/dss/hdmi_wp.c @@ -15,7 +15,7 @@ #include <video/omapdss.h> #include "dss.h" -#include "ti_hdmi.h" +#include "hdmi.h" void hdmi_wp_dump(struct hdmi_wp_data *wp, struct seq_file *s) { |