| Message ID | 1444378629-3057-7-git-send-email-jszhang@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Oct 09, 2015 at 04:17:09PM +0800, Jisheng Zhang wrote: > Add urt0 txd and rxd muxing setup in the dtsi because uart0 always uses > them to work, no other possibilities. > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com> > --- > arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi > index 8e66355..a4a1876 100644 > --- a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi > +++ b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi > @@ -288,12 +288,19 @@ > clocks = <&osc>; > reg-shift = <2>; > status = "disabled"; > + pinctrl-0 = <&uart0_pmux>; > + pinctrl-names = "default"; > }; > }; > > system_pinctrl: pin-controller@fe2200 { > compatible = "marvell,berlin4ct-system-pinctrl"; > reg = <0xfe2200 0xc>; > + > + uart0_pmux: uart0-pmux { > + groups = "SM_URT0_TXD", "SM_URT0_RXD"; > + function = "uart0"; > + }; > }; > }; > }; > -- > 2.6.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi index 8e66355..a4a1876 100644 --- a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi +++ b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi @@ -288,12 +288,19 @@ clocks = <&osc>; reg-shift = <2>; status = "disabled"; + pinctrl-0 = <&uart0_pmux>; + pinctrl-names = "default"; }; }; system_pinctrl: pin-controller@fe2200 { compatible = "marvell,berlin4ct-system-pinctrl"; reg = <0xfe2200 0xc>; + + uart0_pmux: uart0-pmux { + groups = "SM_URT0_TXD", "SM_URT0_RXD"; + function = "uart0"; + }; }; }; };
Add urt0 txd and rxd muxing setup in the dtsi because uart0 always uses them to work, no other possibilities. Signed-off-by: Jisheng Zhang <jszhang@marvell.com> --- arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)