| Message ID | 20180730123137.923-8-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: allwinner: A64 boards DT updates | expand |
On Mon, Jul 30, 2018 at 8:31 PM, Andre Przywara <andre.przywara@arm.com> wrote: > From: Samuel Holland <samuel@sholland.org> > > The Orange Pi Win exposes several UARTs on header pins, and connects one > to the on-board WiFi/Bluetooth chip. > > Add the pinmux definitions to the UART nodes, but keep them disabled. > Enable the UART1, which is wired to the Bluetooth chip, and add a serdev > node. There is no binding for the BT8723 yet, so leave this mostly empty > for now. The latter part regarding Bluetooth no longer applies. Queued with this part removed. ChenYu > > Signed-off-by: Samuel Holland <samuel@sholland.org> > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 33 ++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts > index 0cadcd59edd9..e9a5640076ad 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts > @@ -54,6 +54,10 @@ > aliases { > ethernet0 = &emac; > serial0 = &uart0; > + serial1 = &uart1; > + serial2 = &uart2; > + serial3 = &uart3; > + serial4 = &uart4; > }; > > chosen { > @@ -237,12 +241,41 @@ > vcc-hdmi-supply = <®_dldo1>; > }; > > +/* On debug connector */ > &uart0 { > pinctrl-names = "default"; > pinctrl-0 = <&uart0_pins_a>; > status = "okay"; > }; > > +/* Bluetooth */ > +&uart1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; > + status = "okay"; > +}; > + > +/* On Pi-2 connector, RTS/CTS optional */ > +&uart2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart2_pins>; > + status = "disabled"; > +}; > + > +/* On Pi-2 connector, RTS/CTS optional */ > +&uart3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart3_pins>; > + status = "disabled"; > +}; > + > +/* On Pi-2 connector (labeled for SPI1), RTS/CTS optional */ > +&uart4 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart4_pins>; > + status = "disabled"; > +}; > + > &usb_otg { > dr_mode = "otg"; > status = "okay"; > -- > 2.14.4 >
On Tue, Aug 7, 2018 at 1:08 PM, Chen-Yu Tsai <wens@csie.org> wrote: > On Mon, Jul 30, 2018 at 8:31 PM, Andre Przywara <andre.przywara@arm.com> wrote: >> From: Samuel Holland <samuel@sholland.org> >> >> The Orange Pi Win exposes several UARTs on header pins, and connects one >> to the on-board WiFi/Bluetooth chip. >> >> Add the pinmux definitions to the UART nodes, but keep them disabled. >> Enable the UART1, which is wired to the Bluetooth chip, and add a serdev >> node. There is no binding for the BT8723 yet, so leave this mostly empty >> for now. > > The latter part regarding Bluetooth no longer applies. Queued with this > part removed. Misread the patch. It still applies, so applied as is. ChenYu
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index 0cadcd59edd9..e9a5640076ad 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -54,6 +54,10 @@ aliases { ethernet0 = &emac; serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + serial3 = &uart3; + serial4 = &uart4; }; chosen { @@ -237,12 +241,41 @@ vcc-hdmi-supply = <®_dldo1>; }; +/* On debug connector */ &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>; status = "okay"; }; +/* Bluetooth */ +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; + status = "okay"; +}; + +/* On Pi-2 connector, RTS/CTS optional */ +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pins>; + status = "disabled"; +}; + +/* On Pi-2 connector, RTS/CTS optional */ +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pins>; + status = "disabled"; +}; + +/* On Pi-2 connector (labeled for SPI1), RTS/CTS optional */ +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&uart4_pins>; + status = "disabled"; +}; + &usb_otg { dr_mode = "otg"; status = "okay";