Commit 86c976e4 authored May 08, 2013 by Lee Jones Committed by Linus Walleij May 14, 2013

pinctrl: abx500: Rejiggle platform data and DT initialisation



Platform Data is invariably populated for this driver, even when
booting with Device Tree. Thus the Device Tree probing code encased
within the first check for Platform Data will never executed, causing
the driver to fail when DT is enabled.

This patch fixes the aforementioned regression by rejigging the
probe() semantics to attempt to extract a platform ID from Device Tree
if one can not be sourced from platform data.

A pointer to GPIO platform data is always passed to the driver now, so
there's little point in checking for 'pdata' and executing the DT case if
it's not there. The difference between booting with DT and !DT is when
booting with DT, plat_id is not populated. Thus, in the DT case we have
to use a DT match table in order to find out which platform we're
executing on. So, we're changing the semantics here to only use the
match table if no plat_id is supplied though platform data.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
[edited commit message]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent 2fcad12e

drivers/pinctrl/pinctrl-abx500.c

+13 −14

Original line number	Diff line number	Diff line
		@@ -851,22 +851,11 @@ static int abx500_gpio_probe(struct platform_device *pdev)

		if (abx500_pdata)
		pdata = abx500_pdata->gpio;
		if (!pdata) {
		if (np) {
		const struct of_device_id *match;

		match = of_match_device(abx500_gpio_match, &pdev->dev);
		if (!match)
		return -ENODEV;
		id = (unsigned long)match->data;
		} else {
		if (!(pdata \|\| np)) {
		dev_err(&pdev->dev, "gpio dt and platform data missing\n");
		return -ENODEV;
		}
		}

		if (platid)
		id = platid->driver_data;

		pct = devm_kzalloc(&pdev->dev, sizeof(struct abx500_pinctrl),
		GFP_KERNEL);
		@@ -882,6 +871,16 @@ static int abx500_gpio_probe(struct platform_device *pdev)
		pct->chip.dev = &pdev->dev;
		pct->chip.base = (np) ? -1 : pdata->gpio_base;

		if (platid)
		id = platid->driver_data;
		else if (np) {
		const struct of_device_id *match;

		match = of_match_device(abx500_gpio_match, &pdev->dev);
		if (match)
		id = (unsigned long)match->data;
		}

		/* initialize the lock */
		mutex_init(&pct->lock);

Admin message