diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-05-15 09:19:44 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-05-19 09:26:58 -0400 |
commit | c6e29d26df52224182560e10acefad4e4d6fd1ed (patch) | |
tree | 571472038320722eeb8e4d63005121cd84df11a1 /drivers/video | |
parent | d80e02ef343379cfcef211ab4f042fc4a5b26100 (diff) |
OMAPDSS: panel-dpi: enable-gpio
The enable gpio should be optional, but the driver returns an error if
it doesn't get the gpio.
So change the driver to accept -ENOENT error.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Joachim Eastwood <manabian@gmail.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c index dca6b10d1157..3636b61dc9b4 100644 --- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c +++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c | |||
@@ -210,14 +210,18 @@ static int panel_dpi_probe_of(struct platform_device *pdev) | |||
210 | struct gpio_desc *gpio; | 210 | struct gpio_desc *gpio; |
211 | 211 | ||
212 | gpio = devm_gpiod_get(&pdev->dev, "enable"); | 212 | gpio = devm_gpiod_get(&pdev->dev, "enable"); |
213 | |||
213 | if (IS_ERR(gpio)) { | 214 | if (IS_ERR(gpio)) { |
214 | dev_err(&pdev->dev, "failed to parse enable gpio\n"); | 215 | if (PTR_ERR(gpio) != -ENOENT) |
215 | return PTR_ERR(gpio); | 216 | return PTR_ERR(gpio); |
217 | else | ||
218 | gpio = NULL; | ||
216 | } else { | 219 | } else { |
217 | gpiod_direction_output(gpio, 0); | 220 | gpiod_direction_output(gpio, 0); |
218 | ddata->enable_gpio = gpio; | ||
219 | } | 221 | } |
220 | 222 | ||
223 | ddata->enable_gpio = gpio; | ||
224 | |||
221 | ddata->backlight_gpio = -ENOENT; | 225 | ddata->backlight_gpio = -ENOENT; |
222 | 226 | ||
223 | r = of_get_display_timing(node, "panel-timing", &timing); | 227 | r = of_get_display_timing(node, "panel-timing", &timing); |