pinctrl: bcm: ns: support updated DT binding as syscon subnode (a49d784d) · Commits · 戴 / test

drivers/pinctrl/bcm/pinctrl-ns.c

+19 −10

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@

		#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>
		@@ -12,6 +13,7 @@
		#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)
		@@ -22,7 +24,8 @@ struct ns_pinctrl {
		struct device *dev;
		unsigned int chipset_flag;
		struct pinctrl_dev *pctldev;
		void __iomem *base;
		struct regmap *regmap;
		u32 offset;

		struct pinctrl_desc pctldesc;
		struct ns_pinctrl_group *groups;
		@@ -229,9 +232,9 @@ static int ns_pinctrl_set_mux(struct pinctrl_dev *pctrl_dev,
		unset \|= BIT(pin_number);
		}

		tmp = readl(ns_pinctrl->base);
		regmap_read(ns_pinctrl->regmap, ns_pinctrl->offset, &tmp);
		tmp &= ~unset;
		writel(tmp, ns_pinctrl->base);
		regmap_write(ns_pinctrl->regmap, ns_pinctrl->offset, tmp);

		return 0;
		}
		@@ -263,13 +266,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);
		@@ -287,12 +290,18 @@ static int ns_pinctrl_probe(struct platform_device *pdev)
		return -EINVAL;
		ns_pinctrl->chipset_flag = (uintptr_t)of_id->data;

		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);
		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;
		}

		memcpy(pctldesc, &ns_pinctrl_desc, sizeof(*pctldesc));

Admin message