Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f52bf55c authored by Antoine Tenart's avatar Antoine Tenart Committed by Sebastian Hesselbarth
Browse files

pinctrl: berlin: prepare to use regmap provided by syscon 



The Berlin pin controller nodes will be simple-mfd probed sub-nodes of
soc-controller and system-controller nodes. The register bank is managed
by syscon, which provides a regmap.

Prepare to get the regmap from syscon parent node instead of SoC stub
provided regmap.

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
parent bfff6296

drivers/pinctrl/berlin/berlin-bg2.c

+8 −0
Original line number Diff line number Diff line
@@ -225,6 +225,14 @@ static const struct of_device_id berlin2_pinctrl_match[] = { 
		.compatible = "marvell,berlin2-system-ctrl",

		.data = &berlin2_sysmgr_pinctrl_data

	},

	{

		.compatible = "marvell,berlin2-soc-pinctrl",

		.data = &berlin2_soc_pinctrl_data

	},

	{

		.compatible = "marvell,berlin2-system-pinctrl",

		.data = &berlin2_sysmgr_pinctrl_data

	},

	{}

};

MODULE_DEVICE_TABLE(of, berlin2_pinctrl_match);

drivers/pinctrl/berlin/berlin-bg2cd.c

+8 −0
Original line number Diff line number Diff line
@@ -168,6 +168,14 @@ static const struct of_device_id berlin2cd_pinctrl_match[] = { 
		.compatible = "marvell,berlin2cd-system-ctrl",

		.data = &berlin2cd_sysmgr_pinctrl_data

	},

	{

		.compatible = "marvell,berlin2cd-soc-pinctrl",

		.data = &berlin2cd_soc_pinctrl_data

	},

	{

		.compatible = "marvell,berlin2cd-system-pinctrl",

		.data = &berlin2cd_sysmgr_pinctrl_data

	},

	{}

};

MODULE_DEVICE_TABLE(of, berlin2cd_pinctrl_match);

drivers/pinctrl/berlin/berlin-bg2q.c

+8 −0
Original line number Diff line number Diff line
@@ -387,6 +387,14 @@ static const struct of_device_id berlin2q_pinctrl_match[] = { 
		.compatible = "marvell,berlin2q-system-ctrl",

		.data = &berlin2q_sysmgr_pinctrl_data,

	},

	{

		.compatible = "marvell,berlin2q-soc-pinctrl",

		.data = &berlin2q_soc_pinctrl_data,

	},

	{

		.compatible = "marvell,berlin2q-system-pinctrl",

		.data = &berlin2q_sysmgr_pinctrl_data,

	},

	{}

};

MODULE_DEVICE_TABLE(of, berlin2q_pinctrl_match);

drivers/pinctrl/berlin/berlin.c

+6 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include <linux/io.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>
@@ -295,13 +296,17 @@ int berlin_pinctrl_probe(struct platform_device *pdev, 
			 const struct berlin_pinctrl_desc *desc)

{

	struct device *dev = &pdev->dev;

	struct device_node *parent_np = of_get_parent(dev->of_node);

	struct berlin_pinctrl *pctrl;

	struct regmap *regmap;

	int ret;



	regmap = dev_get_regmap(&pdev->dev, NULL);

	if (!regmap)

		return -ENODEV;

		regmap = syscon_node_to_regmap(parent_np);

	of_node_put(parent_np);

	if (IS_ERR(regmap))

		return PTR_ERR(regmap);



	pctrl = devm_kzalloc(dev, sizeof(*pctrl), GFP_KERNEL);

	if (!pctrl)