Commit 279b1fed authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'gpio-v5.5-rc2-fixes-for-linus' of... 

Merge tag 'gpio-v5.5-rc2-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into fixes

gpio fixes for v5.5-rc2

- fix gpio-xtensa build failure
- fix a regression in gpio-mockup
- fix a gcc warning in gpio-aspeed
- fix a section mismatch problem in xgs-iproc
- fix a problem with emulated open-drain outputs in gpiolib core
- switch to bitops in gpio-pca953x after converting the driver to
  using bitmap
- add a missed file to MAINTAINERS entry
parents d935bd50 2688302b

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7031,6 +7031,7 @@ L: linux-acpi@vger.kernel.org 
S:	Maintained

F:	Documentation/firmware-guide/acpi/gpio-properties.rst

F:	drivers/gpio/gpiolib-acpi.c

F:	drivers/gpio/gpiolib-acpi.h









GPIO IR Transmitter









M:	Sean Young <sean@mess.org>
































drivers/gpio/gpio-aspeed-sgpio.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -107,7 +107,7 @@ static void __iomem *bank_reg(struct aspeed_sgpio *gpio,







		return gpio->base + bank->irq_regs + GPIO_IRQ_STATUS;









	default:









		/* acturally if code runs to here, it's an error case */









		BUG_ON(1);









		BUG();









	}









}










































drivers/gpio/gpio-mockup.c



+5
−2






























Original line number
Diff line number
Diff line







@@ -226,7 +226,7 @@ static int gpio_mockup_get_direction(struct gpio_chip *gc, unsigned int offset)







	int direction;



















	mutex_lock(&chip->lock);









	direction = !chip->lines[offset].dir;









	direction = chip->lines[offset].dir;









	mutex_unlock(&chip->lock);



















	return direction;








@@ -395,7 +395,7 @@ static int gpio_mockup_probe(struct platform_device *pdev)







	struct gpio_chip *gc;









	struct device *dev;









	const char *name;









	int rv, base;









	int rv, base, i;









	u16 ngpio;



















	dev = &pdev->dev;








@@ -447,6 +447,9 @@ static int gpio_mockup_probe(struct platform_device *pdev)







	if (!chip->lines)









		return -ENOMEM;



















	for (i = 0; i < gc->ngpio; i++)









		chip->lines[i].dir = GPIO_LINE_DIRECTION_IN;



















	if (device_property_read_bool(dev, "named-gpio-lines")) {









		rv = gpio_mockup_name_lines(dev, chip);









		if (rv)
































drivers/gpio/gpio-pca953x.c



+10
−16






























Original line number
Diff line number
Diff line







@@ -568,16 +568,18 @@ static void pca953x_irq_mask(struct irq_data *d)







{









	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);









	struct pca953x_chip *chip = gpiochip_get_data(gc);









	irq_hw_number_t hwirq = irqd_to_hwirq(d);



















	chip->irq_mask[d->hwirq / BANK_SZ] &= ~BIT(d->hwirq % BANK_SZ);









	clear_bit(hwirq, chip->irq_mask);









}



















static void pca953x_irq_unmask(struct irq_data *d)









{









	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);









	struct pca953x_chip *chip = gpiochip_get_data(gc);









	irq_hw_number_t hwirq = irqd_to_hwirq(d);



















	chip->irq_mask[d->hwirq / BANK_SZ] |= BIT(d->hwirq % BANK_SZ);









	set_bit(hwirq, chip->irq_mask);









}



















static int pca953x_irq_set_wake(struct irq_data *d, unsigned int on)








@@ -635,8 +637,7 @@ static int pca953x_irq_set_type(struct irq_data *d, unsigned int type)







{









	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);









	struct pca953x_chip *chip = gpiochip_get_data(gc);









	int bank_nb = d->hwirq / BANK_SZ;









	u8 mask = BIT(d->hwirq % BANK_SZ);









	irq_hw_number_t hwirq = irqd_to_hwirq(d);



















	if (!(type & IRQ_TYPE_EDGE_BOTH)) {









		dev_err(&chip->client->dev, "irq %d: unsupported type %d\n",








@@ -644,15 +645,8 @@ static int pca953x_irq_set_type(struct irq_data *d, unsigned int type)







		return -EINVAL;









	}



















	if (type & IRQ_TYPE_EDGE_FALLING)









		chip->irq_trig_fall[bank_nb] |= mask;









	else









		chip->irq_trig_fall[bank_nb] &= ~mask;



















	if (type & IRQ_TYPE_EDGE_RISING)









		chip->irq_trig_raise[bank_nb] |= mask;









	else









		chip->irq_trig_raise[bank_nb] &= ~mask;









	assign_bit(hwirq, chip->irq_trig_fall, type & IRQ_TYPE_EDGE_FALLING);









	assign_bit(hwirq, chip->irq_trig_raise, type & IRQ_TYPE_EDGE_RISING);



















	return 0;









}








@@ -661,10 +655,10 @@ static void pca953x_irq_shutdown(struct irq_data *d)







{









	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);









	struct pca953x_chip *chip = gpiochip_get_data(gc);









	u8 mask = BIT(d->hwirq % BANK_SZ);









	irq_hw_number_t hwirq = irqd_to_hwirq(d);



















	chip->irq_trig_raise[d->hwirq / BANK_SZ] &= ~mask;









	chip->irq_trig_fall[d->hwirq / BANK_SZ] &= ~mask;









	clear_bit(hwirq, chip->irq_trig_raise);









	clear_bit(hwirq, chip->irq_trig_fall);









}



















static bool pca953x_irq_pending(struct pca953x_chip *chip, unsigned long *pending)
































drivers/gpio/gpio-xgs-iproc.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -280,7 +280,7 @@ static int iproc_gpio_probe(struct platform_device *pdev)







	return 0;









}



















static int __exit iproc_gpio_remove(struct platform_device *pdev)









static int iproc_gpio_remove(struct platform_device *pdev)









{









	struct iproc_gpio_chip *chip;