staging: mt7621-pinctrl: stop using the deprecated 'pinctrl_add_gpio_range'

If the gpio DT node has the 'gpio-ranges' property, the range will be
added by the gpio core and doesn't need to be added by the pinctrl
driver.

By having the gpio-ranges property, we can map every pin between
gpio node and pinctrl node and we can stop using the deprecated
pinctrl_add_gpio_range() function.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20201206105333.18428-1-sergio.paracuellos@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt7621-dts/mt7621.dtsi
index 82aa93634eda3d25a6bb9ee8e19b26fa365c1e5b..5b9d3bf82cb1e1f2e96c62bceebad0cd1bd908b4 100644 (file)
--- a/drivers/staging/mt7621-dts/mt7621.dtsi
+++ b/drivers/staging/mt7621-dts/mt7621.dtsi
@@ -90,6 +90,7 @@
                        #interrupt-cells = <2>;
                        compatible = "mediatek,mt7621-gpio";
                        gpio-controller;
+                       gpio-ranges = <&pinctrl 0 0 95>;
                        interrupt-controller;
                        reg = <0x600 0x100>;
                        interrupt-parent = <&gic>;

diff --git a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
index caaf9e34f1ee26ef8e2d638c9edfae065b37a830..e61dbe186bc95da11a6036e7ad82eeccb0c5a8db 100644 (file)
--- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
+++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
@@ -318,7 +318,6 @@ static int rt2880_pinmux_probe(struct platform_device *pdev)
 {
        struct rt2880_priv *p;
        struct pinctrl_dev *dev;
-       struct device_node *np;
 
        if (!rt2880_pinmux_data)
                return -ENOTSUPP;
@@ -346,34 +345,6 @@ static int rt2880_pinmux_probe(struct platform_device *pdev)
        if (IS_ERR(dev))
                return PTR_ERR(dev);
 
-       /* finalize by adding gpio ranges for enables gpio controllers */
-       for_each_compatible_node(np, NULL, "ralink,rt2880-gpio") {
-               const __be32 *ngpio, *gpiobase;
-               struct pinctrl_gpio_range *range;
-
-               if (!of_device_is_available(np))
-                       continue;
-
-               ngpio = of_get_property(np, "ralink,num-gpios", NULL);
-               gpiobase = of_get_property(np, "ralink,gpio-base", NULL);
-               if (!ngpio || !gpiobase) {
-                       dev_err(&pdev->dev, "failed to load chip info\n");
-                       of_node_put(np);
-                       return -EINVAL;
-               }
-
-               range = devm_kzalloc(p->dev, sizeof(*range), GFP_KERNEL);
-               if (!range) {
-                       of_node_put(np);
-                       return -ENOMEM;
-               }
-               range->name = "pio";
-               range->npins = __be32_to_cpu(*ngpio);
-               range->base = __be32_to_cpu(*gpiobase);
-               range->pin_base = range->base;
-               pinctrl_add_gpio_range(dev, range);
-       }
-
        return 0;
 }