Commit 91a30434 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull gpio fixes from Bartosz Golaszewski:

 - fix incorrect output in in-tree gpio tools

 - fix a shell coding issue in gpio-sim selftests

 - correctly set the permissions for debugfs attributes exposed by
   gpio-mockup

 - fix chip name and pin count in gpio-f7188x for one of the supported
   models

 - fix numberspace pollution when using dynamically and statically
   allocated GPIOs together

* tag 'gpio-fixes-for-v6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio-f7188x: fix chip name and pin count on Nuvoton chip
  gpiolib: fix allocation of mixed dynamic/static GPIOs
  gpio: mockup: Fix mode of debugfs files
  selftests: gpio: gpio-sim: Fix BUG: test FAILED due to recent change
  tools: gpio: fix debounce_period_us output of lsgpio
parents b158dd94 3002b864

drivers/gpio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ config GPIO_F7188X 
	help

	  This option enables support for GPIOs found on Fintek Super-I/O

	  chips F71869, F71869A, F71882FG, F71889F and F81866.

	  As well as Nuvoton Super-I/O chip NCT6116D.

	  As well as Nuvoton Super-I/O chip NCT6126D.



	  To compile this driver as a module, choose M here: the module will

	  be called f7188x-gpio.

drivers/gpio/gpio-f7188x.c

+14 −14
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
/*

 * Nuvoton devices.

 */

#define SIO_NCT6116D_ID		0xD283  /* NCT6116D chipset ID */

#define SIO_NCT6126D_ID		0xD283  /* NCT6126D chipset ID */



#define SIO_LD_GPIO_NUVOTON	0x07	/* GPIO logical device */
@@ -62,7 +62,7 @@ enum chips { 
	f81866,

	f81804,

	f81865,

	nct6116d,

	nct6126d,

};



static const char * const f7188x_names[] = {
@@ -74,7 +74,7 @@ static const char * const f7188x_names[] = { 
	"f81866",

	"f81804",

	"f81865",

	"nct6116d",

	"nct6126d",

};



struct f7188x_sio {
@@ -187,8 +187,8 @@ static int f7188x_gpio_set_config(struct gpio_chip *chip, unsigned offset, 
/* Output mode register (0:open drain 1:push-pull). */

#define f7188x_gpio_out_mode(base) ((base) + 3)



#define f7188x_gpio_dir_invert(type)	((type) == nct6116d)

#define f7188x_gpio_data_single(type)	((type) == nct6116d)

#define f7188x_gpio_dir_invert(type)	((type) == nct6126d)

#define f7188x_gpio_data_single(type)	((type) == nct6126d)



static struct f7188x_gpio_bank f71869_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 6, 0xF0, DRVNAME "-0"),
@@ -274,7 +274,7 @@ static struct f7188x_gpio_bank f81865_gpio_bank[] = { 
	F7188X_GPIO_BANK(60, 5, 0x90, DRVNAME "-6"),

};



static struct f7188x_gpio_bank nct6116d_gpio_bank[] = {

static struct f7188x_gpio_bank nct6126d_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 8, 0xE0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 8, 0xE4, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xE8, DRVNAME "-2"),
@@ -282,7 +282,7 @@ static struct f7188x_gpio_bank nct6116d_gpio_bank[] = { 
	F7188X_GPIO_BANK(40, 8, 0xF0, DRVNAME "-4"),

	F7188X_GPIO_BANK(50, 8, 0xF4, DRVNAME "-5"),

	F7188X_GPIO_BANK(60, 8, 0xF8, DRVNAME "-6"),

	F7188X_GPIO_BANK(70, 1, 0xFC, DRVNAME "-7"),

	F7188X_GPIO_BANK(70, 8, 0xFC, DRVNAME "-7"),

};



static int f7188x_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
@@ -490,9 +490,9 @@ static int f7188x_gpio_probe(struct platform_device *pdev) 
		data->nr_bank = ARRAY_SIZE(f81865_gpio_bank);

		data->bank = f81865_gpio_bank;

		break;

	case nct6116d:

		data->nr_bank = ARRAY_SIZE(nct6116d_gpio_bank);

		data->bank = nct6116d_gpio_bank;

	case nct6126d:

		data->nr_bank = ARRAY_SIZE(nct6126d_gpio_bank);

		data->bank = nct6126d_gpio_bank;

		break;

	default:

		return -ENODEV;
@@ -559,9 +559,9 @@ static int __init f7188x_find(int addr, struct f7188x_sio *sio) 
	case SIO_F81865_ID:

		sio->type = f81865;

		break;

	case SIO_NCT6116D_ID:

	case SIO_NCT6126D_ID:

		sio->device = SIO_LD_GPIO_NUVOTON;

		sio->type = nct6116d;

		sio->type = nct6126d;

		break;

	default:

		pr_info("Unsupported Fintek device 0x%04x\n", devid);
@@ -569,7 +569,7 @@ static int __init f7188x_find(int addr, struct f7188x_sio *sio) 
	}



	/* double check manufacturer where possible */

	if (sio->type != nct6116d) {

	if (sio->type != nct6126d) {

		manid = superio_inw(addr, SIO_FINTEK_MANID);

		if (manid != SIO_FINTEK_ID) {

			pr_debug("Not a Fintek device at 0x%08x\n", addr);
@@ -581,7 +581,7 @@ static int __init f7188x_find(int addr, struct f7188x_sio *sio) 
	err = 0;



	pr_info("Found %s at %#x\n", f7188x_names[sio->type], (unsigned int)addr);

	if (sio->type != nct6116d)

	if (sio->type != nct6126d)

		pr_info("   revision %d\n", superio_inb(addr, SIO_FINTEK_DEVREV));



err:

drivers/gpio/gpio-mockup.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static void gpio_mockup_debugfs_setup(struct device *dev, 
		priv->offset = i;

		priv->desc = gpiochip_get_desc(gc, i);



		debugfs_create_file(name, 0200, chip->dbg_dir, priv,

		debugfs_create_file(name, 0600, chip->dbg_dir, priv,

				    &gpio_mockup_debugfs_ops);

	}

}

drivers/gpio/gpiolib.c

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,8 @@ static int gpiochip_find_base(int ngpio) 
			break;

		/* nope, check the space right after the chip */

		base = gdev->base + gdev->ngpio;

		if (base < GPIO_DYNAMIC_BASE)

			base = GPIO_DYNAMIC_BASE;

	}



	if (gpio_is_valid(base)) {

tools/gpio/lsgpio.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void print_attributes(struct gpio_v2_line_info *info) 
	for (i = 0; i < info->num_attrs; i++) {

		if (info->attrs[i].id == GPIO_V2_LINE_ATTR_ID_DEBOUNCE)

			fprintf(stdout, ", debounce_period=%dusec",

				info->attrs[0].debounce_period_us);

				info->attrs[i].debounce_period_us);

	}

}