Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f81c7287 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Three small fixes for GPIO. Not much, I'm surprised by the silence in
  my subsystems. All driver fixes:

   - fix a crash in the 74x164 driver

   - fix IRQ banks in the DaVinci driver

   - fix the vendor prefix in the PCA953x driver"

* tag 'gpio-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: pca953x: fix vendor prefix for PCA9654
  gpio: davinci: Assign first bank regs for unbanked case
  gpio: 74x164: Fix crash during .remove()
parents b7ad7ef7 8a64e557

Documentation/devicetree/bindings/gpio/gpio-pca953x.txt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Required properties: 
	ti,tca6424

	ti,tca9539

	ti,tca9554

	onsemi,pca9654

	onnn,pca9654

	exar,xra1202



Optional properties:

drivers/gpio/gpio-74x164.c

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
struct gen_74x164_chip {

	struct gpio_chip	gpio_chip;

	struct mutex		lock;

	struct gpio_desc	*gpiod_oe;

	u32			registers;

	/*

	 * Since the registers are chained, every byte sent will make
@@ -31,8 +32,7 @@ struct gen_74x164_chip { 
	 * register at the end of the transfer. So, to have a logical

	 * numbering, store the bytes in reverse order.

	 */

	u8			buffer[0];

	struct gpio_desc	*gpiod_oe;

	u8			buffer[];

};



static int __gen_74x164_write_config(struct gen_74x164_chip *chip)

drivers/gpio/gpio-davinci.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static int gpio_irq_type_unbanked(struct irq_data *data, unsigned trigger) 
	u32 mask;



	d = (struct davinci_gpio_controller *)irq_data_get_irq_handler_data(data);

	g = (struct davinci_gpio_regs __iomem *)d->regs;

	g = (struct davinci_gpio_regs __iomem *)d->regs[0];

	mask = __gpio_mask(data->irq - d->base_irq);



	if (trigger & ~(IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))

drivers/gpio/gpio-pca953x.c

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static const struct of_device_id pca953x_dt_ids[] = { 
	{ .compatible = "ti,tca6416", .data = OF_953X(16, PCA_INT), },

	{ .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), },



	{ .compatible = "onsemi,pca9654", .data = OF_953X( 8, PCA_INT), },

	{ .compatible = "onnn,pca9654", .data = OF_953X( 8, PCA_INT), },



	{ .compatible = "exar,xra1202", .data = OF_953X( 8, 0), },

	{ }