gpio: mpc5200: Drop legacy-of-mm-gpiochip.h header

Remove legacy-of-mm-gpiochip.h header file. The above mentioned
file provides an OF API that's deprecated. There is no agnostic
alternatives to it and we have to open code the logic which was
hidden behind of_mm_gpiochip_add_data(). Note, most of the GPIO
drivers are using their own labeling schemas and resource retrieval
that only a few may gain of the code deduplication, so whenever
alternative is appear we can move drivers again to use that one.

[text copied from commit 34064c8267a6 ("powerpc/8xx:
Drop legacy-of-mm-gpiochip.h header")]

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/9652736ef05b94d9113ea5ce7899734ef82343d1.1755520794.git.christophe.leroy@csgroup.eu

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index e43abb322fa6e15f19f2f498aa5adea03e6cd3bf..07be52f6db7ad64f60025ddf0aa27f346c9f777c 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -485,7 +485,6 @@ config GPIO_MM_LANTIQ
 config GPIO_MPC5200
        def_bool y
        depends on PPC_MPC52xx
-       select OF_GPIO_MM_GPIOCHIP
 
 config GPIO_MPC8XXX
        bool "MPC512x/MPC8xxx/QorIQ GPIO support"

diff --git a/drivers/gpio/gpio-mpc5200.c b/drivers/gpio/gpio-mpc5200.c
index dad0eca1ca2ead2c39e9c619eb79f1d2043b1b5e..00f209157fd0f02f888a2c9e22a9bc30447c2d9c 100644 (file)
--- a/drivers/gpio/gpio-mpc5200.c
+++ b/drivers/gpio/gpio-mpc5200.c
@@ -8,7 +8,7 @@
 #include <linux/of.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/gpio/legacy-of-mm-gpiochip.h>
+#include <linux/gpio/driver.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
@@ -19,7 +19,8 @@
 static DEFINE_SPINLOCK(gpio_lock);
 
 struct mpc52xx_gpiochip {
-       struct of_mm_gpio_chip mmchip;
+       struct gpio_chip gc;
+       void __iomem *regs;
        unsigned int shadow_dvo;
        unsigned int shadow_gpioe;
        unsigned int shadow_ddr;
@@ -43,8 +44,8 @@ struct mpc52xx_gpiochip {
  */
 static int mpc52xx_wkup_gpio_get(struct gpio_chip *gc, unsigned int gpio)
 {
-       struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
-       struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs;
+       struct mpc52xx_gpiochip *chip = gpiochip_get_data(gc);
+       struct mpc52xx_gpio_wkup __iomem *regs = chip->regs;
        unsigned int ret;
 
        ret = (in_8(&regs->wkup_ival) >> (7 - gpio)) & 1;
@@ -57,9 +58,8 @@ static int mpc52xx_wkup_gpio_get(struct gpio_chip *gc, unsigned int gpio)
 static inline void
 __mpc52xx_wkup_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 {
-       struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
        struct mpc52xx_gpiochip *chip = gpiochip_get_data(gc);
-       struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs;
+       struct mpc52xx_gpio_wkup __iomem *regs = chip->regs;
 
        if (val)
                chip->shadow_dvo |= 1 << (7 - gpio);
@@ -87,9 +87,8 @@ mpc52xx_wkup_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 
 static int mpc52xx_wkup_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
 {
-       struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
        struct mpc52xx_gpiochip *chip = gpiochip_get_data(gc);
-       struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs;
+       struct mpc52xx_gpio_wkup __iomem *regs = chip->regs;
        unsigned long flags;
 
        spin_lock_irqsave(&gpio_lock, flags);
@@ -110,9 +109,8 @@ static int mpc52xx_wkup_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
 static int
 mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 {
-       struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
-       struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs;
        struct mpc52xx_gpiochip *chip = gpiochip_get_data(gc);
+       struct mpc52xx_gpio_wkup __iomem *regs = chip->regs;
        unsigned long flags;
 
        spin_lock_irqsave(&gpio_lock, flags);
@@ -136,30 +134,41 @@ mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 
 static int mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev)
 {
+       struct device *dev = &ofdev->dev;
+       struct device_node *np = dev->of_node;
        struct mpc52xx_gpiochip *chip;
        struct mpc52xx_gpio_wkup __iomem *regs;
        struct gpio_chip *gc;
        int ret;
 
-       chip = devm_kzalloc(&ofdev->dev, sizeof(*chip), GFP_KERNEL);
+       chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
        if (!chip)
                return -ENOMEM;
 
        platform_set_drvdata(ofdev, chip);
 
-       gc = &chip->mmchip.gc;
+       gc = &chip->gc;
 
+       gc->base             = -1;
        gc->ngpio            = 8;
        gc->direction_input  = mpc52xx_wkup_gpio_dir_in;
        gc->direction_output = mpc52xx_wkup_gpio_dir_out;
        gc->get              = mpc52xx_wkup_gpio_get;
        gc->set              = mpc52xx_wkup_gpio_set;
 
-       ret = of_mm_gpiochip_add_data(ofdev->dev.of_node, &chip->mmchip, chip);
+       gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", np);
+       if (!gc->label)
+               return -ENOMEM;
+
+       chip->regs = devm_of_iomap(dev, np, 0, NULL);
+       if (IS_ERR(chip->regs))
+               return PTR_ERR(chip->regs);
+
+       ret = devm_gpiochip_add_data(dev, gc, chip);
        if (ret)
                return ret;
 
-       regs = chip->mmchip.regs;
+       regs = chip->regs;
        chip->shadow_gpioe = in_8(&regs->wkup_gpioe);
        chip->shadow_ddr = in_8(&regs->wkup_ddr);
        chip->shadow_dvo = in_8(&regs->wkup_dvo);
@@ -167,13 +176,6 @@ static int mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev)
        return 0;
 }
 
-static void mpc52xx_gpiochip_remove(struct platform_device *ofdev)
-{
-       struct mpc52xx_gpiochip *chip = platform_get_drvdata(ofdev);
-
-       of_mm_gpiochip_remove(&chip->mmchip);
-}
-
 static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = {
        { .compatible = "fsl,mpc5200-gpio-wkup", },
        {}
@@ -185,7 +187,6 @@ static struct platform_driver mpc52xx_wkup_gpiochip_driver = {
                .of_match_table = mpc52xx_wkup_gpiochip_match,
        },
        .probe = mpc52xx_wkup_gpiochip_probe,
-       .remove = mpc52xx_gpiochip_remove,
 };
 
 /*
@@ -207,8 +208,8 @@ static struct platform_driver mpc52xx_wkup_gpiochip_driver = {
  */
 static int mpc52xx_simple_gpio_get(struct gpio_chip *gc, unsigned int gpio)
 {
-       struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
-       struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
+       struct mpc52xx_gpiochip *chip = gpiochip_get_data(gc);
+       struct mpc52xx_gpio __iomem *regs = chip->regs;
        unsigned int ret;
 
        ret = (in_be32(&regs->simple_ival) >> (31 - gpio)) & 1;
@@ -219,9 +220,8 @@ static int mpc52xx_simple_gpio_get(struct gpio_chip *gc, unsigned int gpio)
 static inline void
 __mpc52xx_simple_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 {
-       struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
        struct mpc52xx_gpiochip *chip = gpiochip_get_data(gc);
-       struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
+       struct mpc52xx_gpio __iomem *regs = chip->regs;
 
        if (val)
                chip->shadow_dvo |= 1 << (31 - gpio);
@@ -248,9 +248,8 @@ mpc52xx_simple_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 
 static int mpc52xx_simple_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
 {
-       struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
        struct mpc52xx_gpiochip *chip = gpiochip_get_data(gc);
-       struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
+       struct mpc52xx_gpio __iomem *regs = chip->regs;
        unsigned long flags;
 
        spin_lock_irqsave(&gpio_lock, flags);
@@ -271,9 +270,8 @@ static int mpc52xx_simple_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
 static int
 mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 {
-       struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
        struct mpc52xx_gpiochip *chip = gpiochip_get_data(gc);
-       struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
+       struct mpc52xx_gpio __iomem *regs = chip->regs;
        unsigned long flags;
 
        spin_lock_irqsave(&gpio_lock, flags);
@@ -298,30 +296,41 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 
 static int mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev)
 {
+       struct device *dev = &ofdev->dev;
+       struct device_node *np = dev->of_node;
        struct mpc52xx_gpiochip *chip;
        struct gpio_chip *gc;
        struct mpc52xx_gpio __iomem *regs;
        int ret;
 
-       chip = devm_kzalloc(&ofdev->dev, sizeof(*chip), GFP_KERNEL);
+       chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
        if (!chip)
                return -ENOMEM;
 
        platform_set_drvdata(ofdev, chip);
 
-       gc = &chip->mmchip.gc;
+       gc = &chip->gc;
 
+       gc->base             = -1;
        gc->ngpio            = 32;
        gc->direction_input  = mpc52xx_simple_gpio_dir_in;
        gc->direction_output = mpc52xx_simple_gpio_dir_out;
        gc->get              = mpc52xx_simple_gpio_get;
        gc->set              = mpc52xx_simple_gpio_set;
 
-       ret = of_mm_gpiochip_add_data(ofdev->dev.of_node, &chip->mmchip, chip);
+       gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", np);
+       if (!gc->label)
+               return -ENOMEM;
+
+       chip->regs = devm_of_iomap(dev, np, 0, NULL);
+       if (IS_ERR(chip->regs))
+               return PTR_ERR(chip->regs);
+
+       ret = devm_gpiochip_add_data(dev, gc, chip);
        if (ret)
                return ret;
 
-       regs = chip->mmchip.regs;
+       regs = chip->regs;
        chip->shadow_gpioe = in_be32(&regs->simple_gpioe);
        chip->shadow_ddr = in_be32(&regs->simple_ddr);
        chip->shadow_dvo = in_be32(&regs->simple_dvo);
@@ -340,7 +349,6 @@ static struct platform_driver mpc52xx_simple_gpiochip_driver = {
                .of_match_table = mpc52xx_simple_gpiochip_match,
        },
        .probe = mpc52xx_simple_gpiochip_probe,
-       .remove = mpc52xx_gpiochip_remove,
 };
 
 static struct platform_driver * const drivers[] = {