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

[PATCH v2 0/4] 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
- update max freq for WiFi SDIO

Vyacheslav Bocharov (4):
  arm64: meson: add dts bluetooth node for JetHub H1
  arm64: meson: dts: update serial alias in dts for JetHub D1
  arm64: meson: update SDIO voltage in dts for JetHub D1
  arm64: meson: update WiFi SDIO in dts for JetHub D1

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

-- 
2.30.2

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

[Vyacheslav Bocharov]

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 | 6 ++++++
 1 file changed, 6 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..fcb304c5a40f 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,12 @@ &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 v2 2/4] 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 v2 3/4] arm64: meson: update SDIO voltage 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     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 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 66c1eeba8f48..e52abffdf8cf 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,6 +81,15 @@ 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>;
@@ -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

[PATCH v2 4/4] arm64: meson: update WiFi SDIO in dts for JetHub D1

[Vyacheslav Bocharov]

Fix the dts to match board's reference design:
- update the maximum SDIO frequency to match 3.3v regulator (Wi-Fi SDIO module)

Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
---
 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts | 3 +--
 1 file changed, 1 insertion(+), 2 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 e52abffdf8cf..9d6d6dcb562c 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
@@ -257,8 +257,7 @@ &sd_emmc_b {
 
 	bus-width = <4>;
 	cap-sd-highspeed;
-	sd-uhs-sdr104;
-	max-frequency = <200000000>;
+	max-frequency = <50000000>;
 	non-removable;
 	disable-wp;
 
-- 
2.30.2

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

[Neil Armstrong]

On 26/03/2022 08:51, 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
> - update max freq for WiFi SDIO
> 
> Vyacheslav Bocharov (4):
>    arm64: meson: add dts bluetooth node for JetHub H1
>    arm64: meson: dts: update serial alias in dts for JetHub D1
>    arm64: meson: update SDIO voltage in dts for JetHub D1
>    arm64: meson: update WiFi SDIO in dts for JetHub D1
> 
>   .../amlogic/meson-axg-jethome-jethub-j100.dts    | 16 ++++++++++++----
>   .../meson-gxl-s905w-jethome-jethub-j80.dts       |  6 ++++++
>   2 files changed, 18 insertions(+), 4 deletions(-)
> 

For whole set:
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>

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

[Neil Armstrong]

Hi,

On Sat, 26 Mar 2022 10:51:06 +0300, 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
> - update max freq for WiFi SDIO
> 
> [...]

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v5.19/dt64)

[1/4] arm64: meson: add dts bluetooth node for JetHub H1
      https://git.kernel.org/amlogic/c/2bda08dfc501967a7a7bd6f77f04afef14dc7271
[2/4] arm64: meson: dts: update serial alias in dts for JetHub D1
      https://git.kernel.org/amlogic/c/cf94e26508ad411c2a618b00dfaae515affd0ca7
[3/4] arm64: meson: update SDIO voltage in dts for JetHub D1
      https://git.kernel.org/amlogic/c/81bbd2bd24a9ebac3871b293060df50445458c79
[4/4] arm64: meson: update WiFi SDIO in dts for JetHub D1
      https://git.kernel.org/amlogic/c/87a87657249316616138c103c2bdb7525c34d987

-- 
Neil

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

[Vyacheslav]

04.04.2022 11:01, Neil Armstrong wrote:
> Hi,
> 
> On Sat, 26 Mar 2022 10:51:06 +0300, 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
>> - update max freq for WiFi SDIO
>>
>> [...]
> 
> Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v5.19/dt64)

Thanks.

> 
> [1/4] arm64: meson: add dts bluetooth node for JetHub H1
>        https://git.kernel.org/amlogic/c/2bda08dfc501967a7a7bd6f77f04afef14dc7271
> [2/4] arm64: meson: dts: update serial alias in dts for JetHub D1
>        https://git.kernel.org/amlogic/c/cf94e26508ad411c2a618b00dfaae515affd0ca7
> [3/4] arm64: meson: update SDIO voltage in dts for JetHub D1
>        https://git.kernel.org/amlogic/c/81bbd2bd24a9ebac3871b293060df50445458c79
> [4/4] arm64: meson: update WiFi SDIO in dts for JetHub D1
>        https://git.kernel.org/amlogic/c/87a87657249316616138c103c2bdb7525c34d987
>