Message ID | 1444981032-4401-7-git-send-email-jszhang@marvell.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Oct 16, 2015 at 9:37 AM, Jisheng Zhang <jszhang@marvell.com> wrote: > Add the avio, soc, sm pinctrl nodes for Marvell berlin4ct SoC. > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> > Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Funnel this through ARM SoC. Yours, Linus Walleij
On 16.10.2015 16:17, Linus Walleij wrote: > On Fri, Oct 16, 2015 at 9:37 AM, Jisheng Zhang <jszhang@marvell.com> wrote: > >> Add the avio, soc, sm pinctrl nodes for Marvell berlin4ct SoC. >> >> Signed-off-by: Jisheng Zhang <jszhang@marvell.com> >> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> >> Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > Funnel this through ARM SoC. Applied to berlin64/dt with Linus' Ack. Thanks, Sebastian
diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi index a3b5f1d..8e66355 100644 --- a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi +++ b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi @@ -225,6 +225,16 @@ }; }; + soc_pinctrl: pin-controller@ea8000 { + compatible = "marvell,berlin4ct-soc-pinctrl"; + reg = <0xea8000 0x14>; + }; + + avio_pinctrl: pin-controller@ea8400 { + compatible = "marvell,berlin4ct-avio-pinctrl"; + reg = <0xea8400 0x8>; + }; + apb@fc0000 { compatible = "simple-bus"; #address-cells = <1>; @@ -280,5 +290,10 @@ status = "disabled"; }; }; + + system_pinctrl: pin-controller@fe2200 { + compatible = "marvell,berlin4ct-system-pinctrl"; + reg = <0xfe2200 0xc>; + }; }; };