diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-08-05 14:01:26 +0800 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-08-07 08:55:22 +0200 |
| commit | 7e6086d9e54a159a6257c02bb7fc5805c614aad2 (patch) | |
| tree | b6a171ee5b2fc0611c968a9d905e07ba481c442e /drivers/gpio | |
| parent | f6b0ca25ee402f714487b31c35f8e11f2bf4310b (diff) | |
| download | linux-stable-7e6086d9e54a159a6257c02bb7fc5805c614aad2.tar.gz linux-stable-7e6086d9e54a159a6257c02bb7fc5805c614aad2.tar.bz2 linux-stable-7e6086d9e54a159a6257c02bb7fc5805c614aad2.zip | |
gpio/mxc: specify gpio base for device tree probe
Currently, unlike the non-DT probe where the gpio base is specified
with pdev->id, the DT probe uses the base dynamically allocated by
gpio core, which uses a completely different numbering scheme. This
causes two issues to user space applications which access sysfs entry
/sys/class/gpio/gpioN.
* It breaks the compatibility with user space applications between
non-DT and DT kernels.
* It's not intuitive and sometimes hard for users to map the Linux
gpio number to the actual hardware pin.
Use alias to identify the gpio port/bank, and then the gpio base
can be specified with port id to solve above issues. If alias is not
defined in device tree, the base number dynamically allocated by gpio
core will be used.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-mxc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 76e8cda9c06f..80f44bb64a87 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c @@ -465,7 +465,8 @@ static int __devinit mxc_gpio_probe(struct platform_device *pdev) goto out_iounmap; port->bgc.gc.to_irq = mxc_gpio_to_irq; - port->bgc.gc.base = pdev->id * 32; + port->bgc.gc.base = (pdev->id < 0) ? of_alias_get_id(np, "gpio") * 32 : + pdev->id * 32; err = gpiochip_add(&port->bgc.gc); if (err) |