diff options
| author | William Breathitt Gray <vilhelm.gray@gmail.com> | 2017-02-08 14:32:46 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-02-13 16:19:10 +0100 |
| commit | deab2b0524aa1d7d081a1b17d283a76f11c45b1b (patch) | |
| tree | 4d1f92809cc8d82d3bf306d23414cde471d9975f /drivers/gpio | |
| parent | gpio: pci-idio-16: Fix PCI device ID code (diff) | |
| download | linux-deab2b0524aa1d7d081a1b17d283a76f11c45b1b.tar.xz linux-deab2b0524aa1d7d081a1b17d283a76f11c45b1b.zip | |
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: 02e74fc0401a ("gpio: Add GPIO support for the ACCES PCI-IDIO-16")
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-pci-idio-16.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-pci-idio-16.c b/drivers/gpio/gpio-pci-idio-16.c index b10f3cf7044a..269ab628634b 100644 --- a/drivers/gpio/gpio-pci-idio-16.c +++ b/drivers/gpio/gpio-pci-idio-16.c @@ -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); |