diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-17 06:30:27 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-09 03:51:04 -0400 |
commit | e813a55eb9c9bc6c8039fb16332cf43402125b30 (patch) | |
tree | 18b4450d21ba7755587d442865142f641fee3f14 /arch/arm/mach-omap2/board-devkit8000.c | |
parent | 2da35193dc81b574001a47347f41c4922b1266d3 (diff) |
OMAP: board-files: remove custom PD GPIO handling for DVI output
Now that the panel-dvi driver handles the PD (power-down) GPIO, we can
remove the custom PD handling from the board files.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
-rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index a2010f07de31..92f79debbe92 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
@@ -118,19 +118,6 @@ static void devkit8000_panel_disable_lcd(struct omap_dss_device *dssdev) | |||
118 | gpio_set_value_cansleep(dssdev->reset_gpio, 0); | 118 | gpio_set_value_cansleep(dssdev->reset_gpio, 0); |
119 | } | 119 | } |
120 | 120 | ||
121 | static int devkit8000_panel_enable_dvi(struct omap_dss_device *dssdev) | ||
122 | { | ||
123 | if (gpio_is_valid(dssdev->reset_gpio)) | ||
124 | gpio_set_value_cansleep(dssdev->reset_gpio, 1); | ||
125 | return 0; | ||
126 | } | ||
127 | |||
128 | static void devkit8000_panel_disable_dvi(struct omap_dss_device *dssdev) | ||
129 | { | ||
130 | if (gpio_is_valid(dssdev->reset_gpio)) | ||
131 | gpio_set_value_cansleep(dssdev->reset_gpio, 0); | ||
132 | } | ||
133 | |||
134 | static struct regulator_consumer_supply devkit8000_vmmc1_supply[] = { | 121 | static struct regulator_consumer_supply devkit8000_vmmc1_supply[] = { |
135 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), | 122 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), |
136 | }; | 123 | }; |
@@ -155,8 +142,7 @@ static struct omap_dss_device devkit8000_lcd_device = { | |||
155 | }; | 142 | }; |
156 | 143 | ||
157 | static struct panel_dvi_platform_data dvi_panel = { | 144 | static struct panel_dvi_platform_data dvi_panel = { |
158 | .platform_enable = devkit8000_panel_enable_dvi, | 145 | .power_down_gpio = -1, |
159 | .platform_disable = devkit8000_panel_disable_dvi, | ||
160 | }; | 146 | }; |
161 | 147 | ||
162 | static struct omap_dss_device devkit8000_dvi_device = { | 148 | static struct omap_dss_device devkit8000_dvi_device = { |
@@ -244,13 +230,7 @@ static int devkit8000_twl_gpio_setup(struct device *dev, | |||
244 | } | 230 | } |
245 | 231 | ||
246 | /* gpio + 7 is "DVI_PD" (out, active low) */ | 232 | /* gpio + 7 is "DVI_PD" (out, active low) */ |
247 | devkit8000_dvi_device.reset_gpio = gpio + 7; | 233 | dvi_panel.power_down_gpio = gpio + 7; |
248 | ret = gpio_request_one(devkit8000_dvi_device.reset_gpio, | ||
249 | GPIOF_OUT_INIT_LOW, "DVI PowerDown"); | ||
250 | if (ret < 0) { | ||
251 | devkit8000_dvi_device.reset_gpio = -EINVAL; | ||
252 | printk(KERN_ERR "Failed to request GPIO for DVI PowerDown\n"); | ||
253 | } | ||
254 | 234 | ||
255 | return 0; | 235 | return 0; |
256 | } | 236 | } |