Skip to content

Commit

Permalink
gpio: gpio-max710x: Support device tree probing
Browse files Browse the repository at this point in the history
For probing via device tree, we need to support the case without platform_data.
In this case, chip.base is set to -1 for automatic numbering.

Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Roland Stigge authored and Linus Walleij committed Nov 17, 2012
1 parent 9859eb9 commit 8754fcc
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/gpio/gpio-max730x.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,26 +167,26 @@ int __devinit __max730x_probe(struct max7301 *ts)
int i, ret;

pdata = dev->platform_data;
if (!pdata || !pdata->base) {
dev_err(dev, "incorrect or missing platform data\n");
return -EINVAL;
}

mutex_init(&ts->lock);
dev_set_drvdata(dev, ts);

/* Power up the chip and disable IRQ output */
ts->write(dev, 0x04, 0x01);

ts->input_pullup_active = pdata->input_pullup_active;
if (pdata) {
ts->input_pullup_active = pdata->input_pullup_active;
ts->chip.base = pdata->base;
} else {
ts->chip.base = -1;
}
ts->chip.label = dev->driver->name;

ts->chip.direction_input = max7301_direction_input;
ts->chip.get = max7301_get;
ts->chip.direction_output = max7301_direction_output;
ts->chip.set = max7301_set;

ts->chip.base = pdata->base;
ts->chip.ngpio = PIN_NUMBER;
ts->chip.can_sleep = 1;
ts->chip.dev = dev;
Expand Down

0 comments on commit 8754fcc

Please sign in to comment.