V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

x86: gpio: Tidy up gpio_ich6_get_base() and callers 

This function can return an error. Correct the detection of this error so
that it works even with large 32-bit addresses.

The return value is set up for returning an I/O address but the function is
also used to return a memory-mapped address. Adjust the return code to make
this work.

Also add a bit more debugging.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-08-22 15:58:59 -06:00
parent e7cc0b6f00
commit df1c9eb505
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpio/intel_ich6_gpio.c
View File

@ -75,7 +75,7 @@ static int gpio_ich6_get_base(unsigned long base)
/* Is the device present? */ /* Is the device present? */
tmpword = x86_pci_read_config16(pci_dev, PCI_VENDOR_ID); tmpword = x86_pci_read_config16(pci_dev, PCI_VENDOR_ID);
if (tmpword != PCI_VENDOR_ID_INTEL) { if (tmpword != PCI_VENDOR_ID_INTEL) {
debug("%s: wrong VendorID\n", __func__); debug("%s: wrong VendorID %x\n", __func__, tmpword);
return -ENODEV; return -ENODEV;
} }
@ -144,7 +144,7 @@ static int gpio_ich6_get_base(unsigned long base)
* at the offset that we just read. Bit 0 indicates that it's * at the offset that we just read. Bit 0 indicates that it's
* an I/O address, not a memory address, so mask that off. * an I/O address, not a memory address, so mask that off.
*/ */
return tmplong & 0xfffc; return tmplong & 1 ? tmplong & ~3 : tmplong & ~15;
} }
static int _ich6_gpio_set_value(uint16_t base, unsigned offset, int value) static int _ich6_gpio_set_value(uint16_t base, unsigned offset, int value)
@ -324,7 +324,7 @@ int gpio_ich6_pinctrl_init(void)
debug("%s: io-base offset not present\n", __func__); debug("%s: io-base offset not present\n", __func__);
} else { } else {
iobase = gpio_ich6_get_base(iobase_offset); iobase = gpio_ich6_get_base(iobase_offset);
if (iobase < 0) { if (IS_ERR_VALUE(iobase)) {
debug("%s: invalid IOBASE address (%08x)\n", __func__, debug("%s: invalid IOBASE address (%08x)\n", __func__,
iobase); iobase);
return -EINVAL; return -EINVAL;