aboutsummaryrefslogtreecommitdiff
path: root/drivers/pinctrl/berlin/berlin-bg2.c
diff options
context:
space:
mode:
authorAntoine Tenart2015-05-16 01:16:09 +0200
committerSebastian Hesselbarth2015-05-18 17:52:46 +0200
commitf52bf55cba63811e1a9e16318557caa19670fbe0 (patch)
treec3d1d79ff64da2972b4a7b8f7f06e2a588e645c9 /drivers/pinctrl/berlin/berlin-bg2.c
parentbfff6296180c56ccaf4ac36808440f8849aad7c1 (diff)
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: Antoine Tenart <antoine.tenart@free-electrons.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Diffstat (limited to 'drivers/pinctrl/berlin/berlin-bg2.c')
-rw-r--r--drivers/pinctrl/berlin/berlin-bg2.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/pinctrl/berlin/berlin-bg2.c b/drivers/pinctrl/berlin/berlin-bg2.c
index b71a6fffef1b..6931ce4b1e12 100644
--- a/drivers/pinctrl/berlin/berlin-bg2.c
+++ b/drivers/pinctrl/berlin/berlin-bg2.c
@@ -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);