Revert "pinctrl: bcm: ns: support updated DT binding as syscon subnode"

commit 6dba4bdfd7a30e77b848a45404b224588bf989e5 upstream.

This reverts commit 69371a53e14e730217456697355a6ad34fcfd1dd.

The updated binding was wrong / invalid and has been reverted. There
isn't any upstream kernel DTS using it and Broadcom isn't known to use
it neither. There is close to zero chance this will cause regression for
anyone.

Actually in-kernel bcm5301x.dtsi still uses the old good binding and so
it's broken since the driver update. This revert fixes it.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Link: https://lore.kernel.org/r/20211008205938.29925-3-zajec5@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/pinctrl/bcm/pinctrl-ns.c b/drivers/pinctrl/bcm/pinctrl-ns.c
index e79690bd8b85f25a9e8a9665dd4a1cc08bbb8ca8..d7f8175d2c1c86b2d4799b3faafd0a27da402ca4 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-ns.c
+++ b/drivers/pinctrl/bcm/pinctrl-ns.c
@@ -5,7 +5,6 @@
 
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -13,7 +12,6 @@
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
 #include <linux/platform_device.h>
-#include <linux/regmap.h>
 #include <linux/slab.h>
 
 #define FLAG_BCM4708           BIT(1)
@@ -24,8 +22,7 @@ struct ns_pinctrl {
        struct device *dev;
        unsigned int chipset_flag;
        struct pinctrl_dev *pctldev;
-       struct regmap *regmap;
-       u32 offset;
+       void __iomem *base;
 
        struct pinctrl_desc pctldesc;
        struct ns_pinctrl_group *groups;
@@ -232,9 +229,9 @@ static int ns_pinctrl_set_mux(struct pinctrl_dev *pctrl_dev,
                unset |= BIT(pin_number);
        }
 
-       regmap_read(ns_pinctrl->regmap, ns_pinctrl->offset, &tmp);
+       tmp = readl(ns_pinctrl->base);
        tmp &= ~unset;
-       regmap_write(ns_pinctrl->regmap, ns_pinctrl->offset, tmp);
+       writel(tmp, ns_pinctrl->base);
 
        return 0;
 }
@@ -266,13 +263,13 @@ static const struct of_device_id ns_pinctrl_of_match_table[] = {
 static int ns_pinctrl_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct device_node *np = dev->of_node;
        const struct of_device_id *of_id;
        struct ns_pinctrl *ns_pinctrl;
        struct pinctrl_desc *pctldesc;
        struct pinctrl_pin_desc *pin;
        struct ns_pinctrl_group *group;
        struct ns_pinctrl_function *function;
+       struct resource *res;
        int i;
 
        ns_pinctrl = devm_kzalloc(dev, sizeof(*ns_pinctrl), GFP_KERNEL);
@@ -290,18 +287,12 @@ static int ns_pinctrl_probe(struct platform_device *pdev)
                return -EINVAL;
        ns_pinctrl->chipset_flag = (uintptr_t)of_id->data;
 
-       ns_pinctrl->regmap = syscon_node_to_regmap(of_get_parent(np));
-       if (IS_ERR(ns_pinctrl->regmap)) {
-               int err = PTR_ERR(ns_pinctrl->regmap);
-
-               dev_err(dev, "Failed to map pinctrl regs: %d\n", err);
-
-               return err;
-       }
-
-       if (of_property_read_u32(np, "offset", &ns_pinctrl->offset)) {
-               dev_err(dev, "Failed to get register offset\n");
-               return -ENOENT;
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                          "cru_gpio_control");
+       ns_pinctrl->base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(ns_pinctrl->base)) {
+               dev_err(dev, "Failed to map pinctrl regs\n");
+               return PTR_ERR(ns_pinctrl->base);
        }
 
        memcpy(pctldesc, &ns_pinctrl_desc, sizeof(*pctldesc));