On 07/03/2019 16:13, Neil Armstrong wrote: > From: Jerome Brunet <[email protected]> > > Add the always on UART pinctrl setting to the g12a soc DT and > use it for the u200 reference design > > Signed-off-by: Jerome Brunet <[email protected]> > Signed-off-by: Neil Armstrong <[email protected]> > --- > .../arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 ++ > arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 18 ++++++++++++++++++ > 2 files changed, 20 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts > b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts > index c44dbdddf2cf..f2afd0bf3e28 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts > @@ -25,5 +25,7 @@ > > &uart_AO { > status = "okay"; > + pinctrl-0 = <&uart_ao_a_pins>; > + pinctrl-names = "default"; > }; > > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi > b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi > index c141cc7f6b09..f8f055c49f9a 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi > @@ -177,6 +177,24 @@ > #gpio-cells = <2>; > gpio-ranges = <&ao_pinctrl 0 0 > 15>; > }; > + > + uart_ao_a_pins: uart_a_ao { > + mux { > + groups = "uart_ao_a_tx", > + "uart_ao_a_rx"; > + function = "uart_ao_a"; > + bias-disable; > + }; > + }; > + > + uart_ao_a_cts_rts_pins: > uart_ao_a_cts_rts { > + mux { > + groups = > "uart_ao_a_cts", > + > "uart_ao_a_rts"; > + function = "uart_ao_a"; > + bias-disable; > + }; > + }; > }; > }; > >
Will move this out of this patchset to the boards patchset

