aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-12-18 03:34:32 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-04-04 02:55:18 -0400
commitb4f889208ffbd425ff1cb9ddcaf8483a3b91cd6a (patch)
tree48c22df19ffb7b8986ea410c72265bf0e0d764d9 /arch/arm
parent931d4bd664786f5a3b1ea83f84ba9d455e341c9b (diff)
ARM: OMAP2+: remove pdata quirks for displays
Remove pdata quirks for the displays on boards that are now supported properly with DT. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/dss-common.c240
-rw-r--r--arch/arm/mach-omap2/pdata-quirks.c3
2 files changed, 0 insertions, 243 deletions
diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c
index ab8cf26d5096..ea2be0f5953b 100644
--- a/arch/arm/mach-omap2/dss-common.c
+++ b/arch/arm/mach-omap2/dss-common.c
@@ -35,243 +35,3 @@
35#include "mux.h" 35#include "mux.h"
36#include "display.h" 36#include "display.h"
37 37
38#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
39#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
40#define HDMI_GPIO_HPD 63 /* Hotplug detect */
41
42#define PANDA_DVI_TFP410_POWER_DOWN_GPIO 0
43
44/* DVI Connector */
45static struct connector_dvi_platform_data omap4_panda_dvi_connector_pdata = {
46 .name = "dvi",
47 .source = "tfp410.0",
48 .i2c_bus_num = 2,
49};
50
51static struct platform_device omap4_panda_dvi_connector_device = {
52 .name = "connector-dvi",
53 .id = 0,
54 .dev.platform_data = &omap4_panda_dvi_connector_pdata,
55};
56
57/* TFP410 DPI-to-DVI chip */
58static struct encoder_tfp410_platform_data omap4_panda_tfp410_pdata = {
59 .name = "tfp410.0",
60 .source = "dpi.0",
61 .data_lines = 24,
62 .power_down_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO,
63};
64
65static struct platform_device omap4_panda_tfp410_device = {
66 .name = "tfp410",
67 .id = 0,
68 .dev.platform_data = &omap4_panda_tfp410_pdata,
69};
70
71/* HDMI Connector */
72static struct connector_hdmi_platform_data omap4_panda_hdmi_connector_pdata = {
73 .name = "hdmi",
74 .source = "tpd12s015.0",
75};
76
77static struct platform_device omap4_panda_hdmi_connector_device = {
78 .name = "connector-hdmi",
79 .id = 0,
80 .dev.platform_data = &omap4_panda_hdmi_connector_pdata,
81};
82
83/* TPD12S015 HDMI ESD protection & level shifter chip */
84static struct encoder_tpd12s015_platform_data omap4_panda_tpd_pdata = {
85 .name = "tpd12s015.0",
86 .source = "hdmi.0",
87
88 .ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,
89 .ls_oe_gpio = HDMI_GPIO_LS_OE,
90 .hpd_gpio = HDMI_GPIO_HPD,
91};
92
93static struct platform_device omap4_panda_tpd_device = {
94 .name = "tpd12s015",
95 .id = 0,
96 .dev.platform_data = &omap4_panda_tpd_pdata,
97};
98
99static struct omap_dss_board_info omap4_panda_dss_data = {
100 .default_display_name = "dvi",
101};
102
103void __init omap4_panda_display_init_of(void)
104{
105 struct device_node *node;
106
107 node = omapdss_find_dss_of_node();
108 if (node && of_device_is_available(node))
109 return;
110
111 omap_display_init(&omap4_panda_dss_data);
112
113 platform_device_register(&omap4_panda_tfp410_device);
114 platform_device_register(&omap4_panda_dvi_connector_device);
115
116 platform_device_register(&omap4_panda_tpd_device);
117 platform_device_register(&omap4_panda_hdmi_connector_device);
118}
119
120
121/* OMAP4 Blaze display data */
122
123#define DISPLAY_SEL_GPIO 59 /* LCD2/PicoDLP switch */
124#define DLP_POWER_ON_GPIO 40
125
126static struct panel_dsicm_platform_data dsi1_panel = {
127 .name = "lcd",
128 .source = "dsi.0",
129 .reset_gpio = 102,
130 .use_ext_te = false,
131 .ext_te_gpio = 101,
132 .pin_config = {
133 .num_pins = 6,
134 .pins = { 0, 1, 2, 3, 4, 5 },
135 },
136};
137
138static struct platform_device sdp4430_lcd_device = {
139 .name = "panel-dsi-cm",
140 .id = 0,
141 .dev.platform_data = &dsi1_panel,
142};
143
144static struct panel_dsicm_platform_data dsi2_panel = {
145 .name = "lcd2",
146 .source = "dsi.1",
147 .reset_gpio = 104,
148 .use_ext_te = false,
149 .ext_te_gpio = 103,
150 .pin_config = {
151 .num_pins = 6,
152 .pins = { 0, 1, 2, 3, 4, 5 },
153 },
154};
155
156static struct platform_device sdp4430_lcd2_device = {
157 .name = "panel-dsi-cm",
158 .id = 1,
159 .dev.platform_data = &dsi2_panel,
160};
161
162/* HDMI Connector */
163static struct connector_hdmi_platform_data sdp4430_hdmi_connector_pdata = {
164 .name = "hdmi",
165 .source = "tpd12s015.0",
166};
167
168static struct platform_device sdp4430_hdmi_connector_device = {
169 .name = "connector-hdmi",
170 .id = 0,
171 .dev.platform_data = &sdp4430_hdmi_connector_pdata,
172};
173
174/* TPD12S015 HDMI ESD protection & level shifter chip */
175static struct encoder_tpd12s015_platform_data sdp4430_tpd_pdata = {
176 .name = "tpd12s015.0",
177 .source = "hdmi.0",
178
179 .ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,
180 .ls_oe_gpio = HDMI_GPIO_LS_OE,
181 .hpd_gpio = HDMI_GPIO_HPD,
182};
183
184static struct platform_device sdp4430_tpd_device = {
185 .name = "tpd12s015",
186 .id = 0,
187 .dev.platform_data = &sdp4430_tpd_pdata,
188};
189
190
191static struct omap_dss_board_info sdp4430_dss_data = {
192 .default_display_name = "lcd",
193};
194
195/*
196 * we select LCD2 by default (instead of Pico DLP) by setting DISPLAY_SEL_GPIO.
197 * Setting DLP_POWER_ON gpio enables the VDLP_2V5 VDLP_1V8 and VDLP_1V0 rails
198 * used by picodlp on the 4430sdp platform. Keep this gpio disabled as LCD2 is
199 * selected by default
200 */
201void __init omap_4430sdp_display_init_of(void)
202{
203 int r;
204 struct device_node *node;
205
206 node = omapdss_find_dss_of_node();
207 if (node && of_device_is_available(node))
208 return;
209
210 r = gpio_request_one(DISPLAY_SEL_GPIO, GPIOF_OUT_INIT_HIGH,
211 "display_sel");
212 if (r)
213 pr_err("%s: Could not get display_sel GPIO\n", __func__);
214
215 r = gpio_request_one(DLP_POWER_ON_GPIO, GPIOF_OUT_INIT_LOW,
216 "DLP POWER ON");
217 if (r)
218 pr_err("%s: Could not get DLP POWER ON GPIO\n", __func__);
219
220 omap_display_init(&sdp4430_dss_data);
221
222 platform_device_register(&sdp4430_lcd_device);
223 platform_device_register(&sdp4430_lcd2_device);
224
225 platform_device_register(&sdp4430_tpd_device);
226 platform_device_register(&sdp4430_hdmi_connector_device);
227}
228
229
230/* OMAP3 IGEPv2 data */
231
232#define IGEP2_DVI_TFP410_POWER_DOWN_GPIO 170
233
234/* DVI Connector */
235static struct connector_dvi_platform_data omap3_igep2_dvi_connector_pdata = {
236 .name = "dvi",
237 .source = "tfp410.0",
238 .i2c_bus_num = 2,
239};
240
241static struct platform_device omap3_igep2_dvi_connector_device = {
242 .name = "connector-dvi",
243 .id = 0,
244 .dev.platform_data = &omap3_igep2_dvi_connector_pdata,
245};
246
247/* TFP410 DPI-to-DVI chip */
248static struct encoder_tfp410_platform_data omap3_igep2_tfp410_pdata = {
249 .name = "tfp410.0",
250 .source = "dpi.0",
251 .data_lines = 24,
252 .power_down_gpio = IGEP2_DVI_TFP410_POWER_DOWN_GPIO,
253};
254
255static struct platform_device omap3_igep2_tfp410_device = {
256 .name = "tfp410",
257 .id = 0,
258 .dev.platform_data = &omap3_igep2_tfp410_pdata,
259};
260
261static struct omap_dss_board_info igep2_dss_data = {
262 .default_display_name = "dvi",
263};
264
265void __init omap3_igep2_display_init_of(void)
266{
267 struct device_node *node;
268
269 node = omapdss_find_dss_of_node();
270 if (node && of_device_is_available(node))
271 return;
272
273 omap_display_init(&igep2_dss_data);
274
275 platform_device_register(&omap3_igep2_tfp410_device);
276 platform_device_register(&omap3_igep2_dvi_connector_device);
277}
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index db242c483dc0..b67f987bd094 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -139,7 +139,6 @@ static void __init omap3_sbc_t3530_legacy_init(void)
139 139
140static void __init omap3_igep0020_legacy_init(void) 140static void __init omap3_igep0020_legacy_init(void)
141{ 141{
142 omap3_igep2_display_init_of();
143} 142}
144 143
145static void __init omap3_evm_legacy_init(void) 144static void __init omap3_evm_legacy_init(void)
@@ -229,14 +228,12 @@ static void __init am3517_evm_legacy_init(void)
229#ifdef CONFIG_ARCH_OMAP4 228#ifdef CONFIG_ARCH_OMAP4
230static void __init omap4_sdp_legacy_init(void) 229static void __init omap4_sdp_legacy_init(void)
231{ 230{
232 omap_4430sdp_display_init_of();
233 legacy_init_wl12xx(WL12XX_REFCLOCK_26, 231 legacy_init_wl12xx(WL12XX_REFCLOCK_26,
234 WL12XX_TCXOCLOCK_26, 53); 232 WL12XX_TCXOCLOCK_26, 53);
235} 233}
236 234
237static void __init omap4_panda_legacy_init(void) 235static void __init omap4_panda_legacy_init(void)
238{ 236{
239 omap4_panda_display_init_of();
240 legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53); 237 legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53);
241} 238}
242#endif 239#endif
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-16 19:05:39 -0500