[PATCH 0/3] arm64: meson: update dts for JetHub devices

[PATCH 0/3] arm64: meson: update dts for JetHub devices

[Vyacheslav Bocharov]

Update dts for JetHub H1:
- add bluetooth node for RTL8822CS uart port

Update dts for JetHub D1:
- add ZigBee serial alias (ttyAML2) for backward compatibility
- update voltage regulators and SDIO config to match board's reference design

Vyacheslav Bocharov (3):
  arm64: meson: add to dts for JetHub H1 bluetooth node
  arm64: meson: dts: update dts for JetHub D1
  arm64: meson: fix sdio in dts for JetHub D1

 .../amlogic/meson-axg-jethome-jethub-j100.dts   | 17 +++++++++++++----
 .../meson-gxl-s905w-jethome-jethub-j80.dts      |  5 +++++
 2 files changed, 18 insertions(+), 4 deletions(-)

-- 
2.30.2

[PATCH 1/3] arm64: meson: add dts bluetooth node for JetHub H1

[Vyacheslav Bocharov]

From: Vyacheslav Bocharov <devel@lexina.in>

Add bluetooth node for RTL8822CS uart to JetHub H1 dts file.

Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
---
 .../boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
index 6eafb908695f..a5ee7ed17efa 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
@@ -213,6 +213,11 @@ &uart_A {
 	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
 	pinctrl-names = "default";
 	uart-has-rtscts;
+	bluetooth {
+		compatible = "realtek,rtl8822cs-bt";
+		enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+		host-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
+       };
 };
 
 &uart_C {
-- 
2.30.2

[PATCH 2/3] arm64: meson: dts: update serial alias in dts for JetHub D1

[Vyacheslav Bocharov]

Change zigbee serial port alias to ttyAML2 for backward compatibility.

Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
---
 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
index 52ebe371df26..66c1eeba8f48 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
@@ -18,7 +18,7 @@ / {
 	model = "JetHome JetHub J100";
 	aliases {
 		serial0 = &uart_AO;   /* Console */
-		serial1 = &uart_AO_B; /* External UART (Wireless Module) */
+		serial2 = &uart_AO_B; /* External UART (Wireless Module) */
 		ethernet0 = &ethmac;
 	};
 
-- 
2.30.2

[PATCH 3/3] arm64: meson: update SDIO in dts for JetHub D1

[Vyacheslav Bocharov]

Fix the dts to match board's reference design:
- update vddio_boot regulator to 3.3v (Wi-Fi SDIO module)
- add vccq_1v8 regulator with 1.8v for eMMC SDIO

In the first revision of JetHub D1 the vccq_1v8 regulator was 3.3v.
All installed eMMC modules were tested to work in HS200 mode at 3.3v
supply voltage. In the next revisions of the board eMMC will be
powered with 1.8v according to the standard.

Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
---
 .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
index 66c1eeba8f48..bc00d672a357 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
@@ -81,12 +81,22 @@ vddio_ao18: regulator-vddio_ao18 {
 	vddio_boot: regulator-vddio_boot {
 		compatible = "regulator-fixed";
 		regulator-name = "VDDIO_BOOT";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vddao_3v3>;
+		regulator-always-on;
+	};
+
+	vccq_1v8: regulator-vccq_1v8 {
+		compatible = "regulator-fixed";
+		regulator-name = "VCCQ_1V8";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
 		vin-supply = <&vddao_3v3>;
 		regulator-always-on;
 	};
 
+
 	usb_pwr: regulator-usb_pwr {
 		compatible = "regulator-fixed";
 		regulator-name = "USB_PWR";
@@ -248,8 +258,7 @@ &sd_emmc_b {
 
 	bus-width = <4>;
 	cap-sd-highspeed;
-	sd-uhs-sdr104;
-	max-frequency = <200000000>;
+	max-frequency = <50000000>;
 	non-removable;
 	disable-wp;
 
@@ -282,7 +291,7 @@ &sd_emmc_c {
 	mmc-pwrseq = <&emmc_pwrseq>;
 
 	vmmc-supply = <&vcc_3v3>;
-	vqmmc-supply = <&vddio_boot>;
+	vqmmc-supply = <&vccq_1v8>;
 };
 
 /* UART Bluetooth */
-- 
2.30.2

Re: [PATCH 1/3] arm64: meson: add dts bluetooth node for JetHub H1

[Neil Armstrong]

Hi,

On 25/03/2022 17:54, Vyacheslav Bocharov wrote:
> From: Vyacheslav Bocharov <devel@lexina.in>
> 
> Add bluetooth node for RTL8822CS uart to JetHub H1 dts file.
> 
> Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
> ---
>   .../boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts  | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
> index 6eafb908695f..a5ee7ed17efa 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
> @@ -213,6 +213,11 @@ &uart_A {
>   	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
>   	pinctrl-names = "default";
>   	uart-has-rtscts;

Please add a blank here to match other DT files.

> +	bluetooth {
> +		compatible = "realtek,rtl8822cs-bt";
> +		enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
> +		host-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
> +       };
>   };
>   
>   &uart_C {

Re: [PATCH 3/3] arm64: meson: update SDIO in dts for JetHub D1

[Neil Armstrong]

Hi,

On 25/03/2022 17:55, Vyacheslav Bocharov wrote:
> Fix the dts to match board's reference design:
> - update vddio_boot regulator to 3.3v (Wi-Fi SDIO module)
> - add vccq_1v8 regulator with 1.8v for eMMC SDIO
> 
> In the first revision of JetHub D1 the vccq_1v8 regulator was 3.3v.
> All installed eMMC modules were tested to work in HS200 mode at 3.3v
> supply voltage. In the next revisions of the board eMMC will be
> powered with 1.8v according to the standard.
> 
> Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
> ---
>   .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 15 ++++++++++++---
>   1 file changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
> index 66c1eeba8f48..bc00d672a357 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
> @@ -81,12 +81,22 @@ vddio_ao18: regulator-vddio_ao18 {
>   	vddio_boot: regulator-vddio_boot {
>   		compatible = "regulator-fixed";
>   		regulator-name = "VDDIO_BOOT";
> +		regulator-min-microvolt = <3300000>;
> +		regulator-max-microvolt = <3300000>;
> +		vin-supply = <&vddao_3v3>;
> +		regulator-always-on;
> +	};
> +
> +	vccq_1v8: regulator-vccq_1v8 {
> +		compatible = "regulator-fixed";
> +		regulator-name = "VCCQ_1V8";
>   		regulator-min-microvolt = <1800000>;
>   		regulator-max-microvolt = <1800000>;
>   		vin-supply = <&vddao_3v3>;
>   		regulator-always-on;
>   	};
>   
> +
>   	usb_pwr: regulator-usb_pwr {
>   		compatible = "regulator-fixed";
>   		regulator-name = "USB_PWR";
> @@ -248,8 +258,7 @@ &sd_emmc_b {
>   
>   	bus-width = <4>;
>   	cap-sd-highspeed;
> -	sd-uhs-sdr104;
> -	max-frequency = <200000000>;
> +	max-frequency = <50000000>;

This changes should be in a separate commit

>   	non-removable;
>   	disable-wp;
>   
> @@ -282,7 +291,7 @@ &sd_emmc_c {
>   	mmc-pwrseq = <&emmc_pwrseq>;
>   
>   	vmmc-supply = <&vcc_3v3>;
> -	vqmmc-supply = <&vddio_boot>;
> +	vqmmc-supply = <&vccq_1v8>;
>   };
>   
>   /* UART Bluetooth */

Re: [PATCH 0/3] arm64: meson: update dts for JetHub devices

[Neil Armstrong]

Hi,

On 25/03/2022 17:54, Vyacheslav Bocharov wrote:
> Update dts for JetHub H1:
> - add bluetooth node for RTL8822CS uart port
> 
> Update dts for JetHub D1:
> - add ZigBee serial alias (ttyAML2) for backward compatibility
> - update voltage regulators and SDIO config to match board's reference design
> 
> Vyacheslav Bocharov (3):
>    arm64: meson: add to dts for JetHub H1 bluetooth node
>    arm64: meson: dts: update dts for JetHub D1
>    arm64: meson: fix sdio in dts for JetHub D1
> 
>   .../amlogic/meson-axg-jethome-jethub-j100.dts   | 17 +++++++++++++----
>   .../meson-gxl-s905w-jethome-jethub-j80.dts      |  5 +++++
>   2 files changed, 18 insertions(+), 4 deletions(-)
> 

Can you add Fixes: tag in all patches so they get backported ?

Thanks,
Neil

Re: [PATCH 0/3] arm64: meson: update dts for JetHub devices

[Vyacheslav]

25.03.2022 20:34, Neil Armstrong wrote:
> Hi,
> 
> On 25/03/2022 17:54, Vyacheslav Bocharov wrote:
>> Update dts for JetHub H1:
>> - add bluetooth node for RTL8822CS uart port
>>
>> Update dts for JetHub D1:
>> - add ZigBee serial alias (ttyAML2) for backward compatibility
>> - update voltage regulators and SDIO config to match board's reference 
>> design
>>
>> Vyacheslav Bocharov (3):
>>    arm64: meson: add to dts for JetHub H1 bluetooth node
>>    arm64: meson: dts: update dts for JetHub D1
>>    arm64: meson: fix sdio in dts for JetHub D1
>>
>>   .../amlogic/meson-axg-jethome-jethub-j100.dts   | 17 +++++++++++++----
>>   .../meson-gxl-s905w-jethome-jethub-j80.dts      |  5 +++++
>>   2 files changed, 18 insertions(+), 4 deletions(-)
>>
> 
> Can you add Fixes: tag in all patches so they get backported ?
Bluetooth node update depends on commit 
b050c5bbbbccfb9e6cbf29c8ee7a41c1bba972bdf (Bluetooth: btrtl: Add support 
for RTL8822C hci_ver 0x08), which seems to appear only in 5.18
The rest are cosmetic changes, not affecting the functionality.
Thanks.