gpio: arizona: Use local copy of pdata

PATCH In review Charles Keepax 2 participants 8 messages Jul 22, 2019 – Aug 5, 2019

Subsystems (3)

GPIO Wolfson microelectronics drivers Cirrus logic madera codec drivers

lore

Share & tools

lore

Charles Keepax

author maintainer

2019-07-22 09:07 UTC #0 lore raw

PATCH 1/4 gpio: arizona: Use local copy of pdata

A local copy of the pdata exists and it should be used rather than pulling a fresh copy.

Signed-off-by Charles Keepax <[email protected]>

---
 drivers/gpio/gpio-arizona.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/gpio/gpio-arizona.c +2 -2

index c07fad975049d..5640efe5e7504 100644
@@ -142,7 +142,7 @@ static const struct gpio_chip template_chip = {
 static int arizona_gpio_probe(struct platform_device *pdev)
 {
 	struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
-	struct arizona_pdata *pdata = dev_get_platdata(arizona->dev);
+	struct arizona_pdata *pdata = &arizona->pdata;
 	struct arizona_gpio *arizona_gpio;
 	int ret;

@@ -177,7 +177,7 @@ static int arizona_gpio_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	if (pdata && pdata->gpio_base)
+	if (pdata->gpio_base)
 		arizona_gpio->gpio_chip.base = pdata->gpio_base;
 	else
 		arizona_gpio->gpio_chip.base = -1;

Signature · 1 line

2.11.0

Charles Keepax

author maintainer

2019-07-22 09:07 UTC #1 lore raw

PATCH 2/4 gpio: madera: Use local copy of pdata

A local copy of the pdata exists and it should be used rather than pulling a fresh copy.

Signed-off-by Charles Keepax <[email protected]>

---
 drivers/gpio/gpio-madera.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/gpio/gpio-madera.c +2 -2

index 4dbc837d12155..fa3441df0a5db 100644
@@ -120,7 +120,7 @@ static const struct gpio_chip madera_gpio_chip = {
 static int madera_gpio_probe(struct platform_device *pdev)
 {
 	struct madera *madera = dev_get_drvdata(pdev->dev.parent);
-	struct madera_pdata *pdata = dev_get_platdata(madera->dev);
+	struct madera_pdata *pdata = &madera->pdata;
 	struct madera_gpio *madera_gpio;
 	int ret;

@@ -153,7 +153,7 @@ static int madera_gpio_probe(struct platform_device *pdev)
 	}
 
 	/* We want to be usable on systems that don't use devicetree or acpi */
-	if (pdata && pdata->gpio_base)
+	if (pdata->gpio_base)
 		madera_gpio->gpio_chip.base = pdata->gpio_base;
 	else
 		madera_gpio->gpio_chip.base = -1;

Signature · 1 line

2.11.0

Linus Walleij

2019-08-05 09:43 UTC #2 lore raw

Re: [PATCH 2/4] gpio: madera: Use local copy of pdata

Quoted 4 lines · Charles Keepax

A local copy of the pdata exists and it should be used rather than pulling a fresh copy.
Signed-off-by Charles Keepax <[email protected]>

Patch applied.

Yours,
Linus Walleij

Charles Keepax

author maintainer

2019-07-22 09:08 UTC #3 lore raw

PATCH 3/4 gpio: madera: Add support for Cirrus Logic CS47L15

In reply to Charles Keepax

From: Richard Fitzgerald <[email protected]>

As the gpio is common to all madera codecs all that is needed is to setup the correct number of GPIO pins for the CS47L15.

Signed-off-by Richard Fitzgerald <[email protected]>

Signed-off-by Charles Keepax <[email protected]>

---
 drivers/gpio/gpio-madera.c | 3 +++
 1 file changed, 3 insertions(+)

drivers/gpio/gpio-madera.c +3 -0

index fa3441df0a5db..c403899ff4500 100644
@@ -136,6 +136,9 @@ static int madera_gpio_probe(struct platform_device *pdev)
 	madera_gpio->gpio_chip.parent = pdev->dev.parent;
 
 	switch (madera->type) {
+	case CS47L15:
+		madera_gpio->gpio_chip.ngpio = CS47L15_NUM_GPIOS;
+		break;
 	case CS47L35:
 		madera_gpio->gpio_chip.ngpio = CS47L35_NUM_GPIOS;
 		break;

Signature · 1 line

2.11.0

Linus Walleij

2019-08-05 09:45 UTC #4 lore raw

Re: [PATCH 3/4] gpio: madera: Add support for Cirrus Logic CS47L15

Quoted 7 lines · Charles Keepax

From: Richard Fitzgerald <[email protected]>
As the gpio is common to all madera codecs all that is needed is to setup the correct number of GPIO pins for the CS47L15.
Signed-off-by Richard Fitzgerald <[email protected]>
Signed-off-by Charles Keepax <[email protected]>

Patch applied.

Yours,
Linus Walleij

Charles Keepax

author maintainer

2019-07-22 09:07 UTC #5 lore raw

PATCH 4/4 gpio: madera: Add support for Cirrus Logic CS47L92

In reply to Charles Keepax

As the gpio is common to all madera codecs all that is needed is to setup the correct number of GPIO pins for the CS47L92.

Signed-off-by Charles Keepax <[email protected]>

---
 drivers/gpio/gpio-madera.c | 5 +++++
 1 file changed, 5 insertions(+)

drivers/gpio/gpio-madera.c +5 -0

index c403899ff4500..7086f8b5388fd 100644
@@ -150,6 +150,11 @@ static int madera_gpio_probe(struct platform_device *pdev)
 	case CS47L91:
 		madera_gpio->gpio_chip.ngpio = CS47L90_NUM_GPIOS;
 		break;
+	case CS42L92:
+	case CS47L92:
+	case CS47L93:
+		madera_gpio->gpio_chip.ngpio = CS47L92_NUM_GPIOS;
+		break;
 	default:
 		dev_err(&pdev->dev, "Unknown chip variant %d\n", madera->type);
 		return -EINVAL;

Signature · 1 line

2.11.0

Linus Walleij

2019-08-05 09:46 UTC #6 lore raw

Re: [PATCH 4/4] gpio: madera: Add support for Cirrus Logic CS47L92

Quoted 4 lines · Charles Keepax

As the gpio is common to all madera codecs all that is needed is to setup the correct number of GPIO pins for the CS47L92.
Signed-off-by Charles Keepax <[email protected]>

Patch applied.

Yours,
Linus Walleij

Linus Walleij

2019-08-05 09:43 UTC #7 lore raw

In reply to Charles Keepax

Quoted 4 lines · Charles Keepax

A local copy of the pdata exists and it should be used rather than pulling a fresh copy.
Signed-off-by Charles Keepax <[email protected]>

Patch applied.

Yours,
Linus Walleij