Skip to content

Commit d0196c8

Browse files
arndbtomba
authored andcommitted
drm/omap: include gpio/consumer.h where needed
A lot of the display drivers for OMAP use the gpio descriptor functions that are only available in linux/gpio.h if GPIOLIB is enabled and otherwise produce a build error: drivers/gpu/drm/omapdrm/displays/encoder-opa362.c: In function 'opa362_enable': drivers/gpu/drm/omapdrm/displays/encoder-opa362.c:101:3: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration] drivers/gpu/drm/omapdrm/displays/panel-dpi.c: In function 'panel_dpi_probe_pdata': drivers/gpu/drm/omapdrm/displays/panel-dpi.c:189:23: error: implicit declaration of function 'gpio_to_desc' [-Werror=implicit-function-declaration] drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c: In function 'sharp_ls_enable': drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c:120:3: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration] This replaces the existing linux/gpio.h with linux/gpio/consumer.h where needed. In case of panel-lgphilips-lb035q02.c however, we also have to include linux/gpio.h to get the definition of gpio_is_valid and gpio_set_value_cansleep that are used for the non-DT case. Signed-off-by: Arnd Bergmann <[email protected]> [[email protected]: resolved conflicts] Signed-off-by: Tomi Valkeinen <[email protected]>
1 parent 2d80245 commit d0196c8

File tree

9 files changed

+6
-8
lines changed

9 files changed

+6
-8
lines changed

drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* the Free Software Foundation.
1010
*/
1111

12+
#include <linux/gpio/consumer.h>
1213
#include <linux/slab.h>
1314
#include <linux/module.h>
1415
#include <linux/platform_device.h>

drivers/gpu/drm/omapdrm/displays/encoder-opa362.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* the Free Software Foundation.
1515
*/
1616

17-
#include <linux/gpio.h>
1817
#include <linux/gpio/consumer.h>
1918
#include <linux/module.h>
2019
#include <linux/platform_device.h>

drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* the Free Software Foundation.
1010
*/
1111

12-
#include <linux/gpio.h>
12+
#include <linux/gpio/consumer.h>
1313
#include <linux/module.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/slab.h>

drivers/gpu/drm/omapdrm/displays/panel-dpi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* the Free Software Foundation.
1010
*/
1111

12-
#include <linux/gpio.h>
1312
#include <linux/gpio/consumer.h>
1413
#include <linux/module.h>
1514
#include <linux/platform_device.h>

drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/backlight.h>
1515
#include <linux/delay.h>
1616
#include <linux/fb.h>
17-
#include <linux/gpio.h>
17+
#include <linux/gpio/consumer.h>
1818
#include <linux/interrupt.h>
1919
#include <linux/jiffies.h>
2020
#include <linux/module.h>

drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/delay.h>
1616
#include <linux/spi/spi.h>
1717
#include <linux/fb.h>
18-
#include <linux/gpio.h>
18+
#include <linux/gpio/consumer.h>
1919
#include <linux/of_gpio.h>
2020

2121
#include <video/omapdss.h>

drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*/
1111

1212
#include <linux/delay.h>
13-
#include <linux/gpio.h>
1413
#include <linux/gpio/consumer.h>
1514
#include <linux/module.h>
1615
#include <linux/of.h>

drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <linux/sched.h>
3030
#include <linux/backlight.h>
3131
#include <linux/fb.h>
32-
#include <linux/gpio.h>
32+
#include <linux/gpio/consumer.h>
3333
#include <linux/of.h>
3434
#include <linux/of_gpio.h>
3535

drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/delay.h>
1515
#include <linux/spi/spi.h>
1616
#include <linux/regulator/consumer.h>
17-
#include <linux/gpio.h>
17+
#include <linux/gpio/consumer.h>
1818
#include <linux/err.h>
1919
#include <linux/slab.h>
2020
#include <linux/of_gpio.h>

0 commit comments

Comments
 (0)