Commit 2cb81261 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'gpio-updates-for-v5.6-part1' of... 

Merge tag 'gpio-updates-for-v5.6-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel

gpio updates for v5.6

- improvements in the gpio-pca953x driver
- use platform_irq_count() in gpio-mvebu and gpio-bcm-kona
- remove unneeded MODULE_VERSION() usage in the gpio directory
- irq-related improvements in gpio-tegra driver
- several improvements for the core subsystem code: fix confusing indentation,
  fix int type casting, unduplicate code in several places
parents 227caae5 2a2cabd8

drivers/gpio/gpio-bcm-kona.c

+9 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/io.h>

#include <linux/gpio/driver.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/init.h>

#include <linux/irqdomain.h>

#include <linux/irqchip/chained_irq.h>
@@ -586,11 +585,18 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) 


	kona_gpio->gpio_chip = template_chip;

	chip = &kona_gpio->gpio_chip;

	kona_gpio->num_bank = of_irq_count(dev->of_node);

	if (kona_gpio->num_bank == 0) {

	ret = platform_irq_count(pdev);

	if (!ret) {

		dev_err(dev, "Couldn't determine # GPIO banks\n");

		return -ENOENT;

	} else if (ret < 0) {

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Couldn't determine GPIO banks: (%pe)\n",

				ERR_PTR(ret));

		return ret;

	}

	kona_gpio->num_bank = ret;



	if (kona_gpio->num_bank > GPIO_MAX_BANK_NUM) {

		dev_err(dev, "Too many GPIO banks configured (max=%d)\n",

			GPIO_MAX_BANK_NUM);

drivers/gpio/gpio-mvebu.c

+5 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include <linux/irqdomain.h>

#include <linux/mfd/syscon.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_device.h>

#include <linux/pwm.h>
@@ -1102,7 +1101,11 @@ static int mvebu_gpio_probe(struct platform_device *pdev) 
		soc_variant = MVEBU_GPIO_SOC_VARIANT_ORION;



	/* Some gpio controllers do not provide irq support */

	have_irqs = of_irq_count(np) != 0;

	err = platform_irq_count(pdev);

	if (err < 0)

		return err;



	have_irqs = err != 0;



	mvchip = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_gpio_chip),

			      GFP_KERNEL);

drivers/gpio/gpio-pca953x.c

+1 −4
Original line number Diff line number Diff line
@@ -770,8 +770,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base) 


	ret = devm_request_threaded_irq(&client->dev, client->irq,

					NULL, pca953x_irq_handler,

					IRQF_TRIGGER_LOW | IRQF_ONESHOT |

					IRQF_SHARED,

					IRQF_ONESHOT | IRQF_SHARED,

					dev_name(&client->dev), chip);

	if (ret) {

		dev_err(&client->dev, "failed to request irq %d\n",
@@ -861,8 +860,6 @@ out: 
	return ret;

}



static const struct of_device_id pca953x_dt_ids[];



static int pca953x_probe(struct i2c_client *client,

			 const struct i2c_device_id *i2c_id)

{

drivers/gpio/gpio-sama5d2-piobu.c

+0 −1
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ static struct platform_driver sama5d2_piobu_driver = { 


module_platform_driver(sama5d2_piobu_driver);



MODULE_VERSION("1.0");

MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("SAMA5D2 PIOBU controller driver");

MODULE_AUTHOR("Andrei Stefanescu <andrei.stefanescu@microchip.com>");

drivers/gpio/gpio-tb10x.c

+0 −1
Original line number Diff line number Diff line
@@ -243,4 +243,3 @@ static struct platform_driver tb10x_gpio_driver = { 
module_platform_driver(tb10x_gpio_driver);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("tb10x gpio.");
 
MODULE_VERSION("0.0.1");

CRA Git | Maintained and supported by SUSTech CRA and CCSE