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

Commit ef26958a authored Sep 12, 2013 by Archit Taneja Committed by Tomi Valkeinen Oct 09, 2013

omapdss: HDMI: Rename hdmi driver files to nicer names



Replace the ti_hdmi_4xxx* notation for OMAP4 HDMI driver with hdmi4. Rename
the hdmi.c encoder driver to hdmi4.c. Rename ti_hdmi.h to hdmi.h

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent 8696131f

drivers/video/omap2/dss/Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -10,6 +10,6 @@ omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
	omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o		omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
	omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o		omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
	omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o		omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o
	omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi.o hdmi_wp.o hdmi_pll.o hdmi_phy.o \		omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi4.o hdmi_wp.o hdmi_pll.o hdmi_phy.o \
	ti_hdmi_4xxx_ip.o		hdmi4_core.o
	ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG		ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG

drivers/video/omap2/dss/core.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -266,7 +266,7 @@ static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
	venc_init_platform_driver,		venc_init_platform_driver,
	#endif		#endif
	#ifdef CONFIG_OMAP4_DSS_HDMI		#ifdef CONFIG_OMAP4_DSS_HDMI
	hdmi_init_platform_driver,		hdmi4_init_platform_driver,
	#endif		#endif
	};		};

	@@ -287,7 +287,7 @@ static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = {
	venc_uninit_platform_driver,		venc_uninit_platform_driver,
	#endif		#endif
	#ifdef CONFIG_OMAP4_DSS_HDMI		#ifdef CONFIG_OMAP4_DSS_HDMI
	hdmi_uninit_platform_driver,		hdmi4_uninit_platform_driver,
	#endif		#endif
	};		};

drivers/video/omap2/dss/dss.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -427,8 +427,8 @@ int venc_init_platform_driver(void) __init;
	void venc_uninit_platform_driver(void) __exit;		void venc_uninit_platform_driver(void) __exit;

	/* HDMI */		/* HDMI */
	int hdmi_init_platform_driver(void) __init;		int hdmi4_init_platform_driver(void) __init;
	void hdmi_uninit_platform_driver(void) __exit;		void hdmi4_uninit_platform_driver(void) __exit;

	/* RFBI */		/* RFBI */
	int rfbi_init_platform_driver(void) __init;		int rfbi_init_platform_driver(void) __init;

drivers/video/omap2/dss/ti_hdmi.h→drivers/video/omap2/dss/hdmi.h

+3 −5

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* ti_hdmi.h		* HDMI driver definition for TI OMAP4 Processor.
	*
	* HDMI driver definition for TI OMAP4, DM81xx, DM38xx Processor.
	*		*
	* Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/		* 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/>.		* this program. If not, see <http://www.gnu.org/licenses/>.
	*/		*/

	#ifndef _TI_HDMI_H		#ifndef _HDMI_H
	#define _TI_HDMI_H		#define _HDMI_H

	#include <linux/delay.h>		#include <linux/delay.h>
	#include <linux/io.h>		#include <linux/io.h>

drivers/video/omap2/dss/hdmi.c→drivers/video/omap2/dss/hdmi4.c

+7 −11

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* hdmi.c		* HDMI interface DSS driver for TI's OMAP4 family of SoCs.
	*
	* HDMI interface DSS driver setting for TI's OMAP4 family of processor.
	* Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/		* Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/
	* Authors: Yong Zhi		* Authors: Yong Zhi
	* Mythri pk <mythripk@ti.com>		* Mythri pk <mythripk@ti.com>
	@@ -36,8 +34,7 @@
	#include <linux/regulator/consumer.h>		#include <linux/regulator/consumer.h>
	#include <video/omapdss.h>		#include <video/omapdss.h>

	#include "ti_hdmi.h"		#include "hdmi4_core.h"
	#include "ti_hdmi_4xxx_ip.h"
	#include "dss.h"		#include "dss.h"
	#include "dss_features.h"		#include "dss_features.h"

	@@ -543,9 +540,8 @@ static int hdmi_display_check_timing(struct omap_dss_device *dssdev,
	struct hdmi_cm cm;		struct hdmi_cm cm;

	cm = hdmi_get_code(timings);		cm = hdmi_get_code(timings);
	if (cm.code == -1) {		if (cm.code == -1)
	return -EINVAL;		return -EINVAL;
	}

	return 0;		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);		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);		platform_driver_unregister(&omapdss_hdmihw_driver);
	}		}