Commit 360a348f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

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
parents e4add020 69ffed4b

drivers/gpio/gpio-crystalcove.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static inline int to_reg(int gpio, enum ctrl_register reg_type) 
		case 0x5e:

			return GPIOPANELCTL;

		default:

			return -EOPNOTSUPP;

			return -ENOTSUPP;

		}

	}

drivers/gpio/gpio-lpc32xx.c

+1 −0
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ static const struct of_device_id lpc32xx_gpio_of_match[] = { 
	{ .compatible = "nxp,lpc3220-gpio", },

	{ },

};

MODULE_DEVICE_TABLE(of, lpc32xx_gpio_of_match);



static struct platform_driver lpc32xx_gpio_driver = {

	.driver		= {

drivers/gpio/gpio-wcove.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static inline int to_reg(int gpio, enum ctrl_register type) 
	unsigned int reg = type == CTRL_IN ? GPIO_IN_CTRL_BASE : GPIO_OUT_CTRL_BASE;



	if (gpio >= WCOVE_GPIO_NUM)

		return -EOPNOTSUPP;

		return -ENOTSUPP;



	return reg + gpio;

}

include/linux/gpio/property.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef __LINUX_GPIO_PROPERTY_H

#define __LINUX_GPIO_PROPERTY_H



#include <dt-bindings/gpio/gpio.h> /* for GPIO_* flags */

#include <linux/property.h>



#define PROPERTY_ENTRY_GPIO(_name_, _chip_node_, _idx_, _flags_) \