redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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: 02e74fc040 ("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>
This commit is contained in:
William Breathitt Gray 2017-02-08 08:32:46 -05:00 committed by Linus Walleij
parent fd254a23ca
commit deab2b0524
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpio/gpio-pci-idio-16.c
View file

@ -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 device *const dev = &pdev->dev;
struct idio_16_gpio *idio16gpio; struct idio_16_gpio *idio16gpio;
int err; int err;
const size_t pci_bar_index = 2;
const char *const name = pci_name(pdev); const char *const name = pci_name(pdev);
idio16gpio = devm_kzalloc(dev, sizeof(*idio16gpio), GFP_KERNEL); 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; return err;
} }
err = pcim_iomap_regions(pdev, 0x1, name); err = pcim_iomap_regions(pdev, BIT(pci_bar_index), name);
if (err) { if (err) {
dev_err(dev, "Unable to map PCI I/O addresses (%d)\n", err); dev_err(dev, "Unable to map PCI I/O addresses (%d)\n", err);
return err; return err;
} }
idio16gpio->reg = pcim_iomap_table(pdev)[0]; idio16gpio->reg = pcim_iomap_table(pdev)[pci_bar_index];
/* Deactivate input filters */ /* Deactivate input filters */
iowrite8(0, &idio16gpio->reg->filter_ctl); iowrite8(0, &idio16gpio->reg->filter_ctl);