diff options
author | Archit Taneja <archit@ti.com> | 2012-09-17 05:09:48 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-03 08:19:47 -0400 |
commit | be9a0067c5dca8b96b19abc41d28d4b089973c22 (patch) | |
tree | 6b372d3066ea8c5b083a75fa3cae7be2b00fce52 /drivers/video/omap2/displays | |
parent | 57bc6c517bd930ef5db527dd4efe4f7ce36b025e (diff) |
OMAPDSS: nec-nl8048 panel: remove platform_enable/disable callbacks
The nec-nl8048 panel driver now manages the gpios required to configure the
panel. This was previously done in omap_dss_device's platform_enable/disable
callbacks defined in board files using this panel.
All the board files using this panel now pass the gpio information as platform
data via the panel_nec_nl8048_data struct, which is needed by the panel driver
to configure the gpios connected to the panel. Hence, the
platform_enable/disable ops can be safely removed now.
Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/displays')
-rw-r--r-- | drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c index 3b85e2a70323..1e0097de3a23 100644 --- a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c +++ b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c | |||
@@ -133,18 +133,11 @@ static int nec_8048_panel_power_on(struct omap_dss_device *dssdev) | |||
133 | if (r) | 133 | if (r) |
134 | goto err0; | 134 | goto err0; |
135 | 135 | ||
136 | if (dssdev->platform_enable) { | ||
137 | r = dssdev->platform_enable(dssdev); | ||
138 | if (r) | ||
139 | goto err1; | ||
140 | } | ||
141 | |||
142 | if (gpio_is_valid(pd->res_gpio)) | 136 | if (gpio_is_valid(pd->res_gpio)) |
143 | gpio_set_value_cansleep(pd->res_gpio, 1); | 137 | gpio_set_value_cansleep(pd->res_gpio, 1); |
144 | 138 | ||
145 | return 0; | 139 | return 0; |
146 | err1: | 140 | |
147 | omapdss_dpi_display_disable(dssdev); | ||
148 | err0: | 141 | err0: |
149 | return r; | 142 | return r; |
150 | } | 143 | } |
@@ -159,9 +152,6 @@ static void nec_8048_panel_power_off(struct omap_dss_device *dssdev) | |||
159 | if (gpio_is_valid(pd->res_gpio)) | 152 | if (gpio_is_valid(pd->res_gpio)) |
160 | gpio_set_value_cansleep(pd->res_gpio, 0); | 153 | gpio_set_value_cansleep(pd->res_gpio, 0); |
161 | 154 | ||
162 | if (dssdev->platform_disable) | ||
163 | dssdev->platform_disable(dssdev); | ||
164 | |||
165 | omapdss_dpi_display_disable(dssdev); | 155 | omapdss_dpi_display_disable(dssdev); |
166 | } | 156 | } |
167 | 157 | ||