Commit 501398b7 authored by Grzegorz Jaszczyk's avatar Grzegorz Jaszczyk Committed by Linus Walleij

pinctrl: mvebu: add additional variant for standalone CP115

With CP115 standalone modules, all MPP configuration are
possible. Handle this new possibility thanks to the new
"marvell,cp115-standalone-pinctrl" compatible property.
Signed-off-by: default avatarGrzegorz Jaszczyk <jaz@semihalf.com>
[<miquel.raynal@bootlin.com>: mention the new compatible in the
commit log]
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20190805101607.29811-4-miquel.raynal@bootlin.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 26cb47b8
...@@ -32,6 +32,7 @@ enum { ...@@ -32,6 +32,7 @@ enum {
V_ARMADA_7K = BIT(0), V_ARMADA_7K = BIT(0),
V_ARMADA_8K_CPM = BIT(1), V_ARMADA_8K_CPM = BIT(1),
V_ARMADA_8K_CPS = BIT(2), V_ARMADA_8K_CPS = BIT(2),
V_CP115_STANDALONE = BIT(3),
V_ARMADA_7K_8K_CPM = (V_ARMADA_7K | V_ARMADA_8K_CPM), V_ARMADA_7K_8K_CPM = (V_ARMADA_7K | V_ARMADA_8K_CPM),
V_ARMADA_7K_8K_CPS = (V_ARMADA_7K | V_ARMADA_8K_CPS), V_ARMADA_7K_8K_CPS = (V_ARMADA_7K | V_ARMADA_8K_CPS),
}; };
...@@ -614,6 +615,10 @@ static const struct of_device_id armada_cp110_pinctrl_of_match[] = { ...@@ -614,6 +615,10 @@ static const struct of_device_id armada_cp110_pinctrl_of_match[] = {
.compatible = "marvell,armada-8k-cps-pinctrl", .compatible = "marvell,armada-8k-cps-pinctrl",
.data = (void *) V_ARMADA_8K_CPS, .data = (void *) V_ARMADA_8K_CPS,
}, },
{
.compatible = "marvell,cp115-standalone-pinctrl",
.data = (void *) V_CP115_STANDALONE,
},
{ }, { },
}; };
...@@ -655,16 +660,20 @@ static int armada_cp110_pinctrl_probe(struct platform_device *pdev) ...@@ -655,16 +660,20 @@ static int armada_cp110_pinctrl_probe(struct platform_device *pdev)
switch (i) { switch (i) {
case 0 ... 31: case 0 ... 31:
mvebu_pinctrl_assign_variant(m, V_ARMADA_7K_8K_CPS); mvebu_pinctrl_assign_variant(m, (V_ARMADA_7K_8K_CPS |
V_CP115_STANDALONE));
break; break;
case 32 ... 38: case 32 ... 38:
mvebu_pinctrl_assign_variant(m, V_ARMADA_7K_8K_CPM); mvebu_pinctrl_assign_variant(m, (V_ARMADA_7K_8K_CPM |
V_CP115_STANDALONE));
break; break;
case 39 ... 43: case 39 ... 43:
mvebu_pinctrl_assign_variant(m, V_ARMADA_8K_CPM); mvebu_pinctrl_assign_variant(m, (V_ARMADA_8K_CPM |
V_CP115_STANDALONE));
break; break;
case 44 ... 62: case 44 ... 62:
mvebu_pinctrl_assign_variant(m, V_ARMADA_7K_8K_CPM); mvebu_pinctrl_assign_variant(m, (V_ARMADA_7K_8K_CPM |
V_CP115_STANDALONE));
break; break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment