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

Commit deab2b05 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Linus Walleij
Browse files

gpio: pci-idio-16: Fix PCI BAR index 



The PCI BAR0 and BAR1 for the PCI-IDIO-16 hold information for the PLX
9052 bridge chip on the device. The PCI BAR2 holds the necessary base
address for I/O control of the PCI-IDIO-16. This patch corrects the PCI
BAR index mismatch for the PCI-IDIO-16 GPIO driver.

Fixes: 02e74fc0 ("gpio: Add GPIO support for the ACCES PCI-IDIO-16")
Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fd254a23

drivers/gpio/gpio-pci-idio-16.c

+3 −2
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ static int idio_16_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	struct device *const dev = &pdev->dev;

	struct idio_16_gpio *idio16gpio;

	int err;

	const size_t pci_bar_index = 2;

	const char *const name = pci_name(pdev);



	idio16gpio = devm_kzalloc(dev, sizeof(*idio16gpio), GFP_KERNEL);
@@ -277,13 +278,13 @@ static int idio_16_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		return err;

	}



	err = pcim_iomap_regions(pdev, 0x1, name);

	err = pcim_iomap_regions(pdev, BIT(pci_bar_index), name);

	if (err) {

		dev_err(dev, "Unable to map PCI I/O addresses (%d)\n", err);

		return err;

	}



	idio16gpio->reg = pcim_iomap_table(pdev)[0];

	idio16gpio->reg = pcim_iomap_table(pdev)[pci_bar_index];



	/* Deactivate input filters */

	iowrite8(0, &idio16gpio->reg->filter_ctl);