Pull gpio fixes from Bartosz Golaszewski: - use -ENOTSUPP consistently in Intel GPIO drivers - don't include dt-bindings headers in gpio-swnode code - add missing of device table to gpio-lpc32xx and fix autoloading * tag 'gpio-fixes-for-v6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpiolib: swnode: Remove wrong header inclusion gpio: lpc32xx: fix module autoloading gpio: crystalcove: Use -ENOTSUPP consistently gpio: wcove: Use -ENOTSUPP consistently
Unified · Split
| @@ -92,7 +92,7 @@ static inline int to_reg(int gpio, enum ctrl_register reg_type) · 91 unmodified lines | |||
| 92 | case 0x5e: | 92 | case 0x5e: |
| 93 | return GPIOPANELCTL; | 93 | return GPIOPANELCTL; |
| 94 | default: | 94 | default: |
| 95 | return -EOPNOTSUPP; | 95 | return -ENOTSUPP; |
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| 98 | 98 | ||
| @@ -529,6 +529,7 @@ static const struct of_device_id lpc32xx_gpio_of_match[] = { · 528 unmodified lines | |||
| 529 | { .compatible = "nxp,lpc3220-gpio", }, | 529 | { .compatible = "nxp,lpc3220-gpio", }, |
| 530 | { }, | 530 | { }, |
| 531 | }; | 531 | }; |
| 532 | MODULE_DEVICE_TABLE(of, lpc32xx_gpio_of_match); | ||
| 532 | 533 | ||
| 533 | static struct platform_driver lpc32xx_gpio_driver = { | 534 | static struct platform_driver lpc32xx_gpio_driver = { |
| 534 | .driver = { | 535 | .driver = { |
| @@ -104,7 +104,7 @@ static inline int to_reg(int gpio, enum ctrl_register type) · 103 unmodified lines | |||
| 104 | unsigned int reg = type == CTRL_IN ? GPIO_IN_CTRL_BASE : GPIO_OUT_CTRL_BASE; | 104 | unsigned int reg = type == CTRL_IN ? GPIO_IN_CTRL_BASE : GPIO_OUT_CTRL_BASE; |
| 105 | 105 | ||
| 106 | if (gpio >= WCOVE_GPIO_NUM) | 106 | if (gpio >= WCOVE_GPIO_NUM) |
| 107 | return -EOPNOTSUPP; | 107 | return -ENOTSUPP; |
| 108 | 108 | ||
| 109 | return reg + gpio; | 109 | return reg + gpio; |
| 110 | } | 110 | } |
| @@ -2,7 +2,6 @@ · 1 unmodified line | |||
| 2 | #ifndef __LINUX_GPIO_PROPERTY_H | 2 | #ifndef __LINUX_GPIO_PROPERTY_H |
| 3 | #define __LINUX_GPIO_PROPERTY_H | 3 | #define __LINUX_GPIO_PROPERTY_H |
| 4 | 4 | ||
| 5 | #include <dt-bindings/gpio/gpio.h> /* for GPIO_* flags */ | ||
| 6 | #include <linux/property.h> | 5 | #include <linux/property.h> |
| 7 | 6 | ||
| 8 | #define PROPERTY_ENTRY_GPIO(_name_, _chip_node_, _idx_, _flags_) \ | 7 | #define PROPERTY_ENTRY_GPIO(_name_, _chip_node_, _idx_, _flags_) \ |