Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Archit Taneja and committed by
Tomi Valkeinen
ef26958a 8696131f

+25 -33
+2 -2
drivers/video/omap2/dss/Makefile
··· 10 10 omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o 11 11 omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o 12 12 omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o 13 - omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi.o hdmi_wp.o hdmi_pll.o hdmi_phy.o \ 14 - ti_hdmi_4xxx_ip.o 13 + omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi4.o hdmi_wp.o hdmi_pll.o hdmi_phy.o \ 14 + hdmi4_core.o 15 15 ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG
+2 -2
drivers/video/omap2/dss/core.c
··· 266 266 venc_init_platform_driver, 267 267 #endif 268 268 #ifdef CONFIG_OMAP4_DSS_HDMI 269 - hdmi_init_platform_driver, 269 + hdmi4_init_platform_driver, 270 270 #endif 271 271 }; 272 272 ··· 287 287 venc_uninit_platform_driver, 288 288 #endif 289 289 #ifdef CONFIG_OMAP4_DSS_HDMI 290 - hdmi_uninit_platform_driver, 290 + hdmi4_uninit_platform_driver, 291 291 #endif 292 292 }; 293 293
+2 -2
drivers/video/omap2/dss/dss.h
··· 427 427 void venc_uninit_platform_driver(void) __exit; 428 428 429 429 /* HDMI */ 430 - int hdmi_init_platform_driver(void) __init; 431 - void hdmi_uninit_platform_driver(void) __exit; 430 + int hdmi4_init_platform_driver(void) __init; 431 + void hdmi4_uninit_platform_driver(void) __exit; 432 432 433 433 /* RFBI */ 434 434 int rfbi_init_platform_driver(void) __init;
+7 -11
drivers/video/omap2/dss/hdmi.c drivers/video/omap2/dss/hdmi4.c
··· 1 1 /* 2 - * hdmi.c 3 - * 4 - * HDMI interface DSS driver setting for TI's OMAP4 family of processor. 2 + * HDMI interface DSS driver for TI's OMAP4 family of SoCs. 5 3 * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ 6 4 * Authors: Yong Zhi 7 5 * Mythri pk <mythripk@ti.com> ··· 34 36 #include <linux/regulator/consumer.h> 35 37 #include <video/omapdss.h> 36 38 37 - #include "ti_hdmi.h" 38 - #include "ti_hdmi_4xxx_ip.h" 39 + #include "hdmi4_core.h" 39 40 #include "dss.h" 40 41 #include "dss_features.h" 41 42 ··· 358 361 359 362 static const struct hdmi_config *hdmi_get_timings(void) 360 363 { 361 - const struct hdmi_config *arr; 362 - int len; 364 + const struct hdmi_config *arr; 365 + int len; 363 366 364 367 if (hdmi.cfg.cm.mode == HDMI_DVI) { 365 368 arr = vesa_timings; ··· 540 543 struct hdmi_cm cm; 541 544 542 545 cm = hdmi_get_code(timings); 543 - if (cm.code == -1) { 546 + if (cm.code == -1) 544 547 return -EINVAL; 545 - } 546 548 547 549 return 0; 548 550 ··· 1113 1117 }, 1114 1118 }; 1115 1119 1116 - int __init hdmi_init_platform_driver(void) 1120 + int __init hdmi4_init_platform_driver(void) 1117 1121 { 1118 1122 return platform_driver_register(&omapdss_hdmihw_driver); 1119 1123 } 1120 1124 1121 - void __exit hdmi_uninit_platform_driver(void) 1125 + void __exit hdmi4_uninit_platform_driver(void) 1122 1126 { 1123 1127 platform_driver_unregister(&omapdss_hdmihw_driver); 1124 1128 }
+1 -1
drivers/video/omap2/dss/hdmi_phy.c
··· 15 15 #include <video/omapdss.h> 16 16 17 17 #include "dss.h" 18 - #include "ti_hdmi.h" 18 + #include "hdmi.h" 19 19 20 20 void hdmi_phy_dump(struct hdmi_phy_data *phy, struct seq_file *s) 21 21 {
+1 -1
drivers/video/omap2/dss/hdmi_pll.c
··· 16 16 #include <video/omapdss.h> 17 17 18 18 #include "dss.h" 19 - #include "ti_hdmi.h" 19 + #include "hdmi.h" 20 20 21 21 #define HDMI_DEFAULT_REGN 16 22 22 #define HDMI_DEFAULT_REGM2 1
+1 -1
drivers/video/omap2/dss/hdmi_wp.c
··· 15 15 #include <video/omapdss.h> 16 16 17 17 #include "dss.h" 18 - #include "ti_hdmi.h" 18 + #include "hdmi.h" 19 19 20 20 void hdmi_wp_dump(struct hdmi_wp_data *wp, struct seq_file *s) 21 21 {
+3 -5
drivers/video/omap2/dss/ti_hdmi.h drivers/video/omap2/dss/hdmi.h
··· 1 1 /* 2 - * ti_hdmi.h 3 - * 4 - * HDMI driver definition for TI OMAP4, DM81xx, DM38xx Processor. 2 + * HDMI driver definition for TI OMAP4 Processor. 5 3 * 6 4 * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ 7 5 * ··· 16 18 * this program. If not, see <http://www.gnu.org/licenses/>. 17 19 */ 18 20 19 - #ifndef _TI_HDMI_H 20 - #define _TI_HDMI_H 21 + #ifndef _HDMI_H 22 + #define _HDMI_H 21 23 22 24 #include <linux/delay.h> 23 25 #include <linux/io.h>
+2 -2
drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c drivers/video/omap2/dss/hdmi4_core.c
··· 34 34 #include <sound/asoundef.h> 35 35 #endif 36 36 37 - #include "ti_hdmi_4xxx_ip.h" 37 + #include "hdmi4_core.h" 38 38 #include "dss_features.h" 39 39 40 40 #define HDMI_CORE_AV 0x500 ··· 223 223 avi_cfg->db3_nup_scaling = 0; 224 224 avi_cfg->db4_videocode = 0; 225 225 avi_cfg->db5_pixel_repeat = 0; 226 - avi_cfg->db6_7_line_eoftop = 0 ; 226 + avi_cfg->db6_7_line_eoftop = 0; 227 227 avi_cfg->db8_9_line_sofbottom = 0; 228 228 avi_cfg->db10_11_pixel_eofleft = 0; 229 229 avi_cfg->db12_13_pixel_sofright = 0;
+4 -6
drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h drivers/video/omap2/dss/hdmi4_core.h
··· 1 1 /* 2 - * ti_hdmi_4xxx_ip.h 3 - * 4 - * HDMI header definition for DM81xx, DM38xx, TI OMAP4 etc processors. 2 + * HDMI header definition for OMAP4 HDMI core IP 5 3 * 6 4 * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ 7 5 * ··· 16 18 * this program. If not, see <http://www.gnu.org/licenses/>. 17 19 */ 18 20 19 - #ifndef _HDMI_TI_4xxx_H_ 20 - #define _HDMI_TI_4xxx_H_ 21 + #ifndef _HDMI4_CORE_H_ 22 + #define _HDMI4_CORE_H_ 21 23 22 - #include "ti_hdmi.h" 24 + #include "hdmi.h" 23 25 24 26 /* OMAP4 HDMI IP Core System */ 25 27