diff mbox series

[3/3] arm64: dts: allwinner: a64: Add WiFi/BT on Pine64

Message ID 20240901122135.1389702-3-pbrobinson@gmail.com (mailing list archive)
State New, archived
Headers show
Series [1/3] arm64: dts: allwinner: a64: Add WiFi/BT header on Pine64 | expand

Commit Message

Peter Robinson Sept. 1, 2024, 12:21 p.m. UTC
Enable the rtl8723bs WiFi/BT modules on the Pine64.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 .../boot/dts/allwinner/sun50i-a64-pine64.dts    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

Comments

Icenowy Zheng Sept. 3, 2024, 5:50 a.m. UTC | #1
在 2024-09-01星期日的 13:21 +0100,Peter Robinson写道:
> Enable the rtl8723bs WiFi/BT modules on the Pine64.

I think the maintainer previously prefer to enable these modules with
DT overlays.

> 
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> ---
>  .../boot/dts/allwinner/sun50i-a64-pine64.dts    | 17
> ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
> b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
> index f04f0f1badc4..1d514859e664 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
> @@ -138,6 +138,14 @@ &mmc1 {
>         mmc-pwrseq = <&wifi_pwrseq>;
>         bus-width = <4>;
>         non-removable;
> +       status = "okay";
> +
> +       rtl8723bs: wifi@1 {
> +               reg = <1>;
> +               interrupt-parent = <&r_pio>;
> +               interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>; /* PL3 */
> +               interrupt-names = "host-wake";
> +       };
>  };
>  
>  &ohci0 {
> @@ -303,7 +311,14 @@ &uart1 {
>         pinctrl-names = "default";
>         pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
>         uart-has-rtscts;
> -       status = "disabled";
> +       status = "okay";
> +
> +       bluetooth {
> +               compatible = "realtek,rtl8723bs-bt";
> +               device-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /*
> PL6 */
> +               enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4
> */
> +               host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /*
> PL5 */
> +       };
>  };
>  
>  /* On Pi-2 connector */
Andre Przywara Sept. 3, 2024, 8:08 a.m. UTC | #2
Hi,

On 03/09/2024 06:50, Icenowy Zheng wrote:
> 在 2024-09-01星期日的 13:21 +0100,Peter Robinson写道:
>> Enable the rtl8723bs WiFi/BT modules on the Pine64.
> 
> I think the maintainer previously prefer to enable these modules with
> DT overlays.

Yes, we cannot have this enabled unconditionally, especially since this 
is explicitly given as the reason for the first two patches.
So either this would just stay on the list, for reference, (maybe marked 
as DON'T MERGE), or, better: we indeed rewrite this as an overlay.

I will give the series a test once I am back with my beloved boards.

Cheers,
Andre

> 
>>
>> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
>> ---
>>   .../boot/dts/allwinner/sun50i-a64-pine64.dts    | 17
>> ++++++++++++++++-
>>   1 file changed, 16 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
>> b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
>> index f04f0f1badc4..1d514859e664 100644
>> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
>> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
>> @@ -138,6 +138,14 @@ &mmc1 {
>>          mmc-pwrseq = <&wifi_pwrseq>;
>>          bus-width = <4>;
>>          non-removable;
>> +       status = "okay";
>> +
>> +       rtl8723bs: wifi@1 {
>> +               reg = <1>;
>> +               interrupt-parent = <&r_pio>;
>> +               interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>; /* PL3 */
>> +               interrupt-names = "host-wake";
>> +       };
>>   };
>>   
>>   &ohci0 {
>> @@ -303,7 +311,14 @@ &uart1 {
>>          pinctrl-names = "default";
>>          pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
>>          uart-has-rtscts;
>> -       status = "disabled";
>> +       status = "okay";
>> +
>> +       bluetooth {
>> +               compatible = "realtek,rtl8723bs-bt";
>> +               device-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /*
>> PL6 */
>> +               enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4
>> */
>> +               host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /*
>> PL5 */
>> +       };
>>   };
>>   
>>   /* On Pi-2 connector */
>
Peter Robinson Sept. 3, 2024, 8:18 a.m. UTC | #3
On Tue, 3 Sept 2024 at 09:08, Andre Przywara <andre.przywara@arm.com> wrote:
>
> Hi,
>
> On 03/09/2024 06:50, Icenowy Zheng wrote:
> > 在 2024-09-01星期日的 13:21 +0100,Peter Robinson写道:
> >> Enable the rtl8723bs WiFi/BT modules on the Pine64.
> >
> > I think the maintainer previously prefer to enable these modules with
> > DT overlays.
>
> Yes, we cannot have this enabled unconditionally, especially since this
> is explicitly given as the reason for the first two patches.
> So either this would just stay on the list, for reference, (maybe marked
> as DON'T MERGE), or, better: we indeed rewrite this as an overlay.

Yes, that's why it was separate, I wasn't sure how to label it TBH.

> I will give the series a test once I am back with my beloved boards.

Thanks.

> Cheers,
> Andre
>
> >
> >>
> >> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> >> ---
> >>   .../boot/dts/allwinner/sun50i-a64-pine64.dts    | 17
> >> ++++++++++++++++-
> >>   1 file changed, 16 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
> >> b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
> >> index f04f0f1badc4..1d514859e664 100644
> >> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
> >> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
> >> @@ -138,6 +138,14 @@ &mmc1 {
> >>          mmc-pwrseq = <&wifi_pwrseq>;
> >>          bus-width = <4>;
> >>          non-removable;
> >> +       status = "okay";
> >> +
> >> +       rtl8723bs: wifi@1 {
> >> +               reg = <1>;
> >> +               interrupt-parent = <&r_pio>;
> >> +               interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>; /* PL3 */
> >> +               interrupt-names = "host-wake";
> >> +       };
> >>   };
> >>
> >>   &ohci0 {
> >> @@ -303,7 +311,14 @@ &uart1 {
> >>          pinctrl-names = "default";
> >>          pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
> >>          uart-has-rtscts;
> >> -       status = "disabled";
> >> +       status = "okay";
> >> +
> >> +       bluetooth {
> >> +               compatible = "realtek,rtl8723bs-bt";
> >> +               device-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /*
> >> PL6 */
> >> +               enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4
> >> */
> >> +               host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /*
> >> PL5 */
> >> +       };
> >>   };
> >>
> >>   /* On Pi-2 connector */
> >
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index f04f0f1badc4..1d514859e664 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -138,6 +138,14 @@  &mmc1 {
 	mmc-pwrseq = <&wifi_pwrseq>;
 	bus-width = <4>;
 	non-removable;
+	status = "okay";
+
+	rtl8723bs: wifi@1 {
+		reg = <1>;
+		interrupt-parent = <&r_pio>;
+		interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>; /* PL3 */
+		interrupt-names = "host-wake";
+	};
 };
 
 &ohci0 {
@@ -303,7 +311,14 @@  &uart1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
 	uart-has-rtscts;
-	status = "disabled";
+	status = "okay";
+
+	bluetooth {
+		compatible = "realtek,rtl8723bs-bt";
+		device-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+		enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
+		host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
+	};
 };
 
 /* On Pi-2 connector */