[PATCH] gpio: gpio-max710x: Support device tree probing

[PATCH] gpio: gpio-max710x: Support device tree probing

[Roland Stigge]

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>
---
 drivers/gpio/gpio-max730x.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- linux-2.6.orig/drivers/gpio/gpio-max730x.c
+++ linux-2.6/drivers/gpio/gpio-max730x.c
@@ -167,10 +167,6 @@ int __devinit __max730x_probe(struct max
 	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);
@@ -178,7 +174,12 @@ int __devinit __max730x_probe(struct max
 	/* 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;
@@ -186,7 +187,6 @@ int __devinit __max730x_probe(struct max
 	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;

Re: [PATCH] gpio: gpio-max710x: Support device tree probing

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

On Thu, Nov 15, 2012 at 02:59:40PM +0100, Roland Stigge wrote:
> 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>

Aren't there bindings for pullup configuration, top? Besides that:

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] gpio: gpio-max710x: Support device tree probing

[Roland Stigge]

On 15/11/12 15:10, Wolfram Sang wrote:
> On Thu, Nov 15, 2012 at 02:59:40PM +0100, Roland Stigge wrote:
>> 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>
> 
> Aren't there bindings for pullup configuration, top? Besides that:
> 
> Acked-by: Wolfram Sang <w.sang@pengutronix.de>

Right. This is not supported yet by this binding. Should be added in a
subsequent patch.

Thanks,

Roland

Re: [PATCH] gpio: gpio-max710x: Support device tree probing

[Linus Walleij]

On Thu, Nov 15, 2012 at 2:59 PM, Roland Stigge <stigge@antcom.de> wrote:

> 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>

Patch applied with Wolfram's ACK.
Thanks!

Yours,
Linus Walleij