hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

basic_mmio_gpio: allow overriding number of gpio 

Some platforms may have a number of GPIO that is less than the register
width of the peripheral.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Jamie Iles 2011-05-20 00:40:15 -06:00 committed by Grant Likely
parent 4ddb8ae217
commit 924e7a9fc6
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpio/basic_mmio_gpio.c
View File

@ -239,6 +239,7 @@ static int __devinit bgpio_probe(struct platform_device *pdev)
resource_size_t dat_sz; resource_size_t dat_sz;
int bits; int bits;
int ret; int ret;
int ngpio;
res_dat = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dat"); res_dat = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dat");
if (!res_dat) if (!res_dat)
@ -249,6 +250,7 @@ static int __devinit bgpio_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
bits = dat_sz * 8; bits = dat_sz * 8;
ngpio = bits;
if (bits > BITS_PER_LONG) if (bits > BITS_PER_LONG)
return -EINVAL; return -EINVAL;
@ -277,13 +279,22 @@ static int __devinit bgpio_probe(struct platform_device *pdev)
spin_lock_init(&bgc->lock); spin_lock_init(&bgc->lock);
if (pdata) {
bgc->gc.base = pdata->base;
if (pdata->ngpio > 0)
ngpio = pdata->ngpio;
} else {
bgc->gc.base = -1;
}
bgc->bits = bits; bgc->bits = bits;
ret = bgpio_setup_accessors(pdev, bgc); ret = bgpio_setup_accessors(pdev, bgc);
if (ret) if (ret)
return ret; return ret;
bgc->data = bgc->read_reg(bgc->reg_dat); bgc->data = bgc->read_reg(bgc->reg_dat);
bgc->gc.ngpio = bits;
bgc->gc.ngpio = ngpio;
bgc->gc.direction_input = bgpio_dir_in; bgc->gc.direction_input = bgpio_dir_in;
bgc->gc.direction_output = bgpio_dir_out; bgc->gc.direction_output = bgpio_dir_out;
bgc->gc.get = bgpio_get; bgc->gc.get = bgpio_get;
@ -291,11 +302,6 @@ static int __devinit bgpio_probe(struct platform_device *pdev)
bgc->gc.dev = dev; bgc->gc.dev = dev;
bgc->gc.label = dev_name(dev); bgc->gc.label = dev_name(dev);
if (pdata)
bgc->gc.base = pdata->base;
else
bgc->gc.base = -1;
platform_set_drvdata(pdev, bgc); platform_set_drvdata(pdev, bgc);
ret = gpiochip_add(&bgc->gc); ret = gpiochip_add(&bgc->gc);

1
include/linux/basic_mmio_gpio.h
View File

@ -15,6 +15,7 @@
struct bgpio_pdata { struct bgpio_pdata {
int base; int base;
int ngpio;
}; };
#endif /* __BASIC_MMIO_GPIO_H */ #endif /* __BASIC_MMIO_GPIO_H */