Skip to content

Commit

Permalink
gpio: em: Remove obsolete platform data support
Browse files Browse the repository at this point in the history
Since commit 5903270 ("ARM: shmobile: Remove legacy platform
devices from EMEV2 SoC code"), EMMA Mobile SoCs are only supported in
generic DT-only ARM multi-platform builds.  The driver doesn't need to
use platform data anymore, hence remove platform data configuration.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Tested-by: Niklas Söderlund <niso@kth.se>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Geert Uytterhoeven authored and Linus Walleij committed Jul 16, 2015
1 parent e7aa6d8 commit 527b397
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 37 deletions.
34 changes: 8 additions & 26 deletions drivers/gpio/gpio-em.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/pinctrl/consumer.h>
#include <linux/platform_data/gpio-em.h>

struct em_gio_priv {
void __iomem *base0;
Expand Down Expand Up @@ -273,13 +272,12 @@ static const struct irq_domain_ops em_gio_irq_domain_ops = {

static int em_gio_probe(struct platform_device *pdev)
{
struct gpio_em_config pdata_dt;
struct gpio_em_config *pdata = dev_get_platdata(&pdev->dev);
struct em_gio_priv *p;
struct resource *io[2], *irq[2];
struct gpio_chip *gpio_chip;
struct irq_chip *irq_chip;
const char *name = dev_name(&pdev->dev);
unsigned int ngpios;
int ret;

p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL);
Expand Down Expand Up @@ -319,18 +317,10 @@ static int em_gio_probe(struct platform_device *pdev)
goto err0;
}

if (!pdata) {
memset(&pdata_dt, 0, sizeof(pdata_dt));
pdata = &pdata_dt;

if (of_property_read_u32(pdev->dev.of_node, "ngpios",
&pdata->number_of_pins)) {
dev_err(&pdev->dev, "Missing ngpios OF property\n");
ret = -EINVAL;
goto err0;
}

pdata->gpio_base = -1;
if (of_property_read_u32(pdev->dev.of_node, "ngpios", &ngpios)) {
dev_err(&pdev->dev, "Missing ngpios OF property\n");
ret = -EINVAL;
goto err0;
}

gpio_chip = &p->gpio_chip;
Expand All @@ -345,8 +335,8 @@ static int em_gio_probe(struct platform_device *pdev)
gpio_chip->label = name;
gpio_chip->dev = &pdev->dev;
gpio_chip->owner = THIS_MODULE;
gpio_chip->base = pdata->gpio_base;
gpio_chip->ngpio = pdata->number_of_pins;
gpio_chip->base = -1;
gpio_chip->ngpio = ngpios;

irq_chip = &p->irq_chip;
irq_chip->name = name;
Expand All @@ -357,9 +347,7 @@ static int em_gio_probe(struct platform_device *pdev)
irq_chip->irq_release_resources = em_gio_irq_relres;
irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;

p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
pdata->number_of_pins,
pdata->irq_base,
p->irq_domain = irq_domain_add_simple(pdev->dev.of_node, ngpios, 0,
&em_gio_irq_domain_ops, p);
if (!p->irq_domain) {
ret = -ENXIO;
Expand Down Expand Up @@ -387,12 +375,6 @@ static int em_gio_probe(struct platform_device *pdev)
goto err1;
}

if (pdata->pctl_name) {
ret = gpiochip_add_pin_range(gpio_chip, pdata->pctl_name, 0,
gpio_chip->base, gpio_chip->ngpio);
if (ret < 0)
dev_warn(&pdev->dev, "failed to add pin range\n");
}
return 0;

err1:
Expand Down
11 changes: 0 additions & 11 deletions include/linux/platform_data/gpio-em.h

This file was deleted.

0 comments on commit 527b397

Please sign in to comment.