diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2012-09-07 14:18:12 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-09-07 23:04:02 +0200 |
| commit | 061505fd396c89b358a1b7a655565b2bb05b2fdc (patch) | |
| tree | 4ce397e69828750b490523e7fb059e3b363d4f5d /drivers/gpio | |
| parent | 72eac3020de35a2c3fd0d39a26399989a0a9392e (diff) | |
| download | linux-3.10-061505fd396c89b358a1b7a655565b2bb05b2fdc.tar.gz linux-3.10-061505fd396c89b358a1b7a655565b2bb05b2fdc.tar.bz2 linux-3.10-061505fd396c89b358a1b7a655565b2bb05b2fdc.zip | |
gpio: 74x164: Use dynamic gpio number assignment if no pdata is present
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-74x164.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c index 604b998b7b7..ef8baacb650 100644 --- a/drivers/gpio/gpio-74x164.c +++ b/drivers/gpio/gpio-74x164.c @@ -75,12 +75,6 @@ static int __devinit gen_74x164_probe(struct spi_device *spi) struct gen_74x164_chip_platform_data *pdata; int ret; - pdata = spi->dev.platform_data; - if (!pdata || !pdata->base) { - dev_dbg(&spi->dev, "incorrect or missing platform data\n"); - return -EINVAL; - } - /* * bits_per_word cannot be configured in platform data */ @@ -94,6 +88,12 @@ static int __devinit gen_74x164_probe(struct spi_device *spi) if (!chip) return -ENOMEM; + pdata = spi->dev.platform_data; + if (pdata && pdata->base) + chip->gpio_chip.base = pdata->base; + else + chip->gpio_chip.base = -1; + mutex_init(&chip->lock); dev_set_drvdata(&spi->dev, chip); @@ -104,7 +104,6 @@ static int __devinit gen_74x164_probe(struct spi_device *spi) chip->gpio_chip.direction_output = gen_74x164_direction_output; chip->gpio_chip.get = gen_74x164_get_value; chip->gpio_chip.set = gen_74x164_set_value; - chip->gpio_chip.base = pdata->base; chip->gpio_chip.ngpio = 8; chip->gpio_chip.can_sleep = 1; chip->gpio_chip.dev = &spi->dev; |