[PATCH v3] ARM: dts: sun8i: enable UART1 for iNet D978 Rev2 board

[PATCH v3] ARM: dts: sun8i: enable UART1 for iNet D978 Rev2 board

[Icenowy Zheng]

UART1 is connected to the bluetooth part of RTL8723BS WiFi/BT combo card
on iNet D978 Rev2 board.

Enable the UART1 to make it possible to use the modified hciattach by
Realtek to drive the BT part of RTL8723BS.

On the board no r_uart pins are found now (the onboard RX/TX pins are
wired to PF2/PF4, which is muxed with mmc0), so also disabled it.

Signed-off-by: Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org>
---
Changes since v1:
- Deleted r_uart.
- Added the pinmux of uart1 at PG.
Changes since v2:
- Rename uart0_cts_rts@0 to uart0-cts-rts@0.

 arch/arm/boot/dts/sun8i-a23-a33.dtsi           | 14 ++++++++++++++
 arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 7e05e09..d236104 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -361,6 +361,20 @@
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
+			uart1_pins_a: uart1@0 {
+				allwinner,pins = "PG6", "PG7";
+				allwinner,function = "uart1";
+				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+			};
+
+			uart1_pins_cts_rts_a: uart1-cts-rts@0 {
+				allwinner,pins = "PG8", "PG9";
+				allwinner,function = "uart1";
+				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+			};
+
 			mmc0_pins_a: mmc0@0 {
 				allwinner,pins = "PF0", "PF1", "PF2",
 						 "PF3", "PF4", "PF5";
diff --git a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
index 0f52cd9..a1f654a8 100644
--- a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
+++ b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
@@ -49,6 +49,15 @@
 	model = "INet-D978 Rev 02";
 	compatible = "primux,inet-d978-rev2", "allwinner,sun8i-a33";
 
+	aliases {
+		/delete-property/serial0;
+		serial1 = &uart1;
+	};
+
+	chosen {
+		/delete-property/stdout-path;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 		pinctrl-names = "default";
@@ -86,3 +95,14 @@
 		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
 };
+
+&r_uart {
+	status = "disabled";
+};
+
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_pins_a>,
+		    <&uart1_pins_cts_rts_a>;
+	status = "okay";
+};
-- 
2.9.3

Re: [PATCH v3] ARM: dts: sun8i: enable UART1 for iNet D978 Rev2 board

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 708 bytes --]

On Mon, Aug 29, 2016 at 10:18:32PM +0800, Icenowy Zheng wrote:
> UART1 is connected to the bluetooth part of RTL8723BS WiFi/BT combo card
> on iNet D978 Rev2 board.
> 
> Enable the UART1 to make it possible to use the modified hciattach by
> Realtek to drive the BT part of RTL8723BS.
> 
> On the board no r_uart pins are found now (the onboard RX/TX pins are
> wired to PF2/PF4, which is muxed with mmc0), so also disabled it.
> 
> Signed-off-by: Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org>

I'll make the same comments than in the v2.
https://www.spinics.net/lists/arm-kernel/msg527001.html

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Re: Re: [PATCH v3] ARM: dts: sun8i: enable UART1 for iNet D978 Rev2 board

[Hans de Goede]

Hi,

On 31-08-16 18:22, Maxime Ripard wrote:
> On Mon, Aug 29, 2016 at 10:18:32PM +0800, Icenowy Zheng wrote:
>> UART1 is connected to the bluetooth part of RTL8723BS WiFi/BT combo card
>> on iNet D978 Rev2 board.
>>
>> Enable the UART1 to make it possible to use the modified hciattach by
>> Realtek to drive the BT part of RTL8723BS.
>>
>> On the board no r_uart pins are found now (the onboard RX/TX pins are
>> wired to PF2/PF4, which is muxed with mmc0), so also disabled it.
>>
>> Signed-off-by: Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org>
>
> I'll make the same comments than in the v2.
> https://www.spinics.net/lists/arm-kernel/msg527001.html

I've a feeling there is a bit of miscommunication here,
let me try to clarify things:

Icenowy, Maxime wants you to split this into 2 patches:

1) Adding just the uart1_pins_a and uart1_pins_cts_rts_a nodes to
sun8i-a23-a33.dtsi; and
2) Another patch with the sun8i-a33-inet-d978-rev2.dts changes

And for 2. Maxime wants you to change:

	aliases {
		/delete-property/serial0;
		serial1 = &uart1;
	};

to:

	aliases {
		serial0 = &uart1;
	};

There is no serial0 and Maxime wants the serial-s
to be numbered starting at 0 (iow there is no reason
to make the bluetooth uart serial1).

Regards,

Hans

Re: Re: [PATCH v3] ARM: dts: sun8i: enable UART1 for iNet D978 Rev2 board

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

On Thu, Sep 01, 2016 at 10:40:32AM +0200, Hans de Goede wrote:
> Hi,
> 
> On 31-08-16 18:22, Maxime Ripard wrote:
> >On Mon, Aug 29, 2016 at 10:18:32PM +0800, Icenowy Zheng wrote:
> >>UART1 is connected to the bluetooth part of RTL8723BS WiFi/BT combo card
> >>on iNet D978 Rev2 board.
> >>
> >>Enable the UART1 to make it possible to use the modified hciattach by
> >>Realtek to drive the BT part of RTL8723BS.
> >>
> >>On the board no r_uart pins are found now (the onboard RX/TX pins are
> >>wired to PF2/PF4, which is muxed with mmc0), so also disabled it.
> >>
> >>Signed-off-by: Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org>
> >
> >I'll make the same comments than in the v2.
> >https://www.spinics.net/lists/arm-kernel/msg527001.html
> 
> I've a feeling there is a bit of miscommunication here,
> let me try to clarify things:
> 
> Icenowy, Maxime wants you to split this into 2 patches:

Hmm, yes, sorry if it was unclear.

Thanks Hans

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com