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

Merge tag 'gpio-fixes-for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - add missing MODULE_DEVICE_TABLE in gpio-cadence

 - fix a kernel doc validator error in gpio-xilinx

 - don't set parent IRQ affinity in gpio-tegra186

* tag 'gpio-fixes-for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: tegra186: Don't set parent IRQ affinity
  gpio: xilinx: Correct kernel doc for xgpio_probe()
  gpio: cadence: Add missing MODULE_DEVICE_TABLE
parents 011ff616 bdbe871e

drivers/gpio/gpio-cadence.c

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ static const struct of_device_id cdns_of_ids[] = { 
	{ .compatible = "cdns,gpio-r1p02" },

	{ /* sentinel */ },

};

MODULE_DEVICE_TABLE(of, cdns_of_ids);



static struct platform_driver cdns_gpio_driver = {

	.driver = {

drivers/gpio/gpio-tegra186.c

+0 −11
Original line number Diff line number Diff line
@@ -444,16 +444,6 @@ static int tegra186_irq_set_wake(struct irq_data *data, unsigned int on) 
	return 0;

}



static int tegra186_irq_set_affinity(struct irq_data *data,

				     const struct cpumask *dest,

				     bool force)

{

	if (data->parent_data)

		return irq_chip_set_affinity_parent(data, dest, force);



	return -EINVAL;

}



static void tegra186_gpio_irq(struct irq_desc *desc)

{

	struct tegra_gpio *gpio = irq_desc_get_handler_data(desc);
@@ -700,7 +690,6 @@ static int tegra186_gpio_probe(struct platform_device *pdev) 
	gpio->intc.irq_unmask = tegra186_irq_unmask;

	gpio->intc.irq_set_type = tegra186_irq_set_type;

	gpio->intc.irq_set_wake = tegra186_irq_set_wake;

	gpio->intc.irq_set_affinity = tegra186_irq_set_affinity;



	irq = &gpio->gpio.irq;

	irq->chip = &gpio->intc;

drivers/gpio/gpio-xilinx.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static void xgpio_irqhandler(struct irq_desc *desc) 
}



/**

 * xgpio_of_probe - Probe method for the GPIO device.

 * xgpio_probe - Probe method for the GPIO device.

 * @pdev: pointer to the platform device

 *

 * Return: