pinctrl: stmfx: Fix compile issue when CONFIG_OF_GPIO is not defined [Linux 5.2]

pinctrl: stmfx: Fix compile issue when CONFIG_OF_GPIO is not defined [Linux 5.2]

This Linux kernel change "pinctrl: stmfx: Fix compile issue when CONFIG_OF_GPIO is not defined" is included in the Linux 5.2 release. This change is authored by Amelie Delaunay <amelie.delaunay [at] st.com> on Fri May 24 09:32:05 2019 +0200. The commit for this change in Linux stable tree is ec2e0f4 (patch).

pinctrl: stmfx: Fix compile issue when CONFIG_OF_GPIO is not defined

When CONFIG_GPIO_OF is not defined, struct gpio_chip 'of_node' member does
not exist:
drivers/pinctrl/pinctrl-stmfx.c: In function 'stmfx_pinctrl_probe':
drivers/pinctrl/pinctrl-stmfx.c:652:17: error: 'struct gpio_chip' has no member named 'of_node'
     pctl->gpio_chip.of_node = np;

Fixes: 1490d9f841b1 ("pinctrl: Add STMFX GPIO expander Pinctrl/GPIO driver")
Reported-by: kbuild test robot <[email protected]>
Signed-off-by: Amelie Delaunay <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>

There are 2 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/pinctrl/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index ea79854..1a7974d 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -276,7 +276,7 @@ config PINCTRL_ST
 config PINCTRL_STMFX
    tristate "STMicroelectronics STMFX GPIO expander pinctrl driver"
    depends on I2C
-   depends on OF || COMPILE_TEST
+   depends on OF_GPIO
    select GENERIC_PINCONF
    select GPIOLIB_IRQCHIP
    select MFD_STMFX

Leave a Reply

Your email address will not be published. Required fields are marked *