aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-12-07 04:38:13 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-04 04:51:16 -0400
commitfe5c5fbad0790f14907679bae29889d47b75456e (patch)
tree01c4e0444d7f20d2a82f15eb36e5aeaaaf894a49 /arch/arm/mach-omap2
parente5e533227ad8b6412cdec371a143ac2944272e2d (diff)
arm: omap boards: Remove unnecessary platform_enable/disable callbacks for VENC devices
The omap_dss_device's platform_enable/disable callbacks don't do anything for any of the boards. The platform calls from the VENC driver will also be removed in the future. Remove these calls from the board which have a VENC device. Signed-off-by: Archit Taneja <archit@ti.com> Cc: Tony Lindgren <tony@atomide.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/board-3430sdp.c11
-rw-r--r--arch/arm/mach-omap2/board-am3517evm.c11
-rw-r--r--arch/arm/mach-omap2/board-cm-t35.c11
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c11
-rw-r--r--arch/arm/mach-omap2/board-omap3stalker.c11
5 files changed, 0 insertions, 55 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 66cfcca0a707..594c6335496e 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -126,15 +126,6 @@ static void __init sdp3430_display_init(void)
126 126
127} 127}
128 128
129static int sdp3430_panel_enable_tv(struct omap_dss_device *dssdev)
130{
131 return 0;
132}
133
134static void sdp3430_panel_disable_tv(struct omap_dss_device *dssdev)
135{
136}
137
138static struct panel_sharp_ls037v7dw01_data sdp3430_lcd_data = { 129static struct panel_sharp_ls037v7dw01_data sdp3430_lcd_data = {
139 .resb_gpio = SDP3430_LCD_PANEL_ENABLE_GPIO, 130 .resb_gpio = SDP3430_LCD_PANEL_ENABLE_GPIO,
140 .ini_gpio = -1, 131 .ini_gpio = -1,
@@ -169,8 +160,6 @@ static struct omap_dss_device sdp3430_tv_device = {
169 .driver_name = "venc", 160 .driver_name = "venc",
170 .type = OMAP_DISPLAY_TYPE_VENC, 161 .type = OMAP_DISPLAY_TYPE_VENC,
171 .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO, 162 .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
172 .platform_enable = sdp3430_panel_enable_tv,
173 .platform_disable = sdp3430_panel_disable_tv,
174}; 163};
175 164
176 165
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index 4ba395f7e88e..2b9eb3de7aa6 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -138,22 +138,11 @@ static struct omap_dss_device am3517_evm_lcd_device = {
138 .phy.dpi.data_lines = 16, 138 .phy.dpi.data_lines = 16,
139}; 139};
140 140
141static int am3517_evm_panel_enable_tv(struct omap_dss_device *dssdev)
142{
143 return 0;
144}
145
146static void am3517_evm_panel_disable_tv(struct omap_dss_device *dssdev)
147{
148}
149
150static struct omap_dss_device am3517_evm_tv_device = { 141static struct omap_dss_device am3517_evm_tv_device = {
151 .type = OMAP_DISPLAY_TYPE_VENC, 142 .type = OMAP_DISPLAY_TYPE_VENC,
152 .name = "tv", 143 .name = "tv",
153 .driver_name = "venc", 144 .driver_name = "venc",
154 .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO, 145 .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
155 .platform_enable = am3517_evm_panel_enable_tv,
156 .platform_disable = am3517_evm_panel_disable_tv,
157}; 146};
158 147
159static struct tfp410_platform_data dvi_panel = { 148static struct tfp410_platform_data dvi_panel = {
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index cccbfea2fab3..710e99da266c 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -190,15 +190,6 @@ static inline void cm_t35_init_nand(void) {}
190#define CM_T35_LCD_BL_GPIO 58 190#define CM_T35_LCD_BL_GPIO 58
191#define CM_T35_DVI_EN_GPIO 54 191#define CM_T35_DVI_EN_GPIO 54
192 192
193static int cm_t35_panel_enable_tv(struct omap_dss_device *dssdev)
194{
195 return 0;
196}
197
198static void cm_t35_panel_disable_tv(struct omap_dss_device *dssdev)
199{
200}
201
202static struct panel_generic_dpi_data lcd_panel = { 193static struct panel_generic_dpi_data lcd_panel = {
203 .name = "toppoly_tdo35s", 194 .name = "toppoly_tdo35s",
204 .num_gpios = 1, 195 .num_gpios = 1,
@@ -233,8 +224,6 @@ static struct omap_dss_device cm_t35_tv_device = {
233 .driver_name = "venc", 224 .driver_name = "venc",
234 .type = OMAP_DISPLAY_TYPE_VENC, 225 .type = OMAP_DISPLAY_TYPE_VENC,
235 .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO, 226 .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
236 .platform_enable = cm_t35_panel_enable_tv,
237 .platform_disable = cm_t35_panel_disable_tv,
238}; 227};
239 228
240static struct omap_dss_device *cm_t35_dss_devices[] = { 229static struct omap_dss_device *cm_t35_dss_devices[] = {
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 80ed967cc056..5eecc178f8bf 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -202,22 +202,11 @@ static struct omap_dss_device omap3_evm_lcd_device = {
202 .data = &omap3_evm_lcd_data, 202 .data = &omap3_evm_lcd_data,
203}; 203};
204 204
205static int omap3_evm_enable_tv(struct omap_dss_device *dssdev)
206{
207 return 0;
208}
209
210static void omap3_evm_disable_tv(struct omap_dss_device *dssdev)
211{
212}
213
214static struct omap_dss_device omap3_evm_tv_device = { 205static struct omap_dss_device omap3_evm_tv_device = {
215 .name = "tv", 206 .name = "tv",
216 .driver_name = "venc", 207 .driver_name = "venc",
217 .type = OMAP_DISPLAY_TYPE_VENC, 208 .type = OMAP_DISPLAY_TYPE_VENC,
218 .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO, 209 .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
219 .platform_enable = omap3_evm_enable_tv,
220 .platform_disable = omap3_evm_disable_tv,
221}; 210};
222 211
223static struct tfp410_platform_data dvi_panel = { 212static struct tfp410_platform_data dvi_panel = {
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index 495b989f9040..5e63f0758cef 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -94,15 +94,6 @@ static void __init omap3_stalker_display_init(void)
94 return; 94 return;
95} 95}
96 96
97static int omap3_stalker_enable_tv(struct omap_dss_device *dssdev)
98{
99 return 0;
100}
101
102static void omap3_stalker_disable_tv(struct omap_dss_device *dssdev)
103{
104}
105
106static struct omap_dss_device omap3_stalker_tv_device = { 97static struct omap_dss_device omap3_stalker_tv_device = {
107 .name = "tv", 98 .name = "tv",
108 .driver_name = "venc", 99 .driver_name = "venc",
@@ -112,8 +103,6 @@ static struct omap_dss_device omap3_stalker_tv_device = {
112#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE) 103#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
113 .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE, 104 .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
114#endif 105#endif
115 .platform_enable = omap3_stalker_enable_tv,
116 .platform_disable = omap3_stalker_disable_tv,
117}; 106};
118 107
119static struct tfp410_platform_data dvi_panel = { 108static struct tfp410_platform_data dvi_panel = {