Skip to contentSkip to conversation

arm64: dts: meson: minor P212/VIM1 fixups

PATCH In review Christian Hewitt 2 participants 7 messages Jan 13, 2022 – Jan 17, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover arm64: dts: meson: minor P212/VIM1 fixups

The P212 (S905X reference board) dts is used with a number of no-name Android boxes that follow the reference design, and users had noticed that BT worked but WiFi did not. While investigating and adding the missing WiFi bits to the dtsi for testing I spotted that VIM1 inherits from the p212 dtsi and has the BT node duplicated, so we can clean that up too. And since we're tidying things, the pwm_ef node can be moved to maintain normal alpha sorting.

Christian Hewitt (3):
arm64: dts: meson: add Broadcom WiFi to P212 dtsi
arm64: dts: meson: move pwm_ef node in P212 dtsi
arm64: dts: meson: remove Broadcom WiFi/BT nodes from Khadas VIM1

 .../amlogic/meson-gxl-s905x-khadas-vim.dts    | 19 ---------------
 .../dts/amlogic/meson-gxl-s905x-p212.dtsi     | 23 +++++++++++--------
 2 files changed, 14 insertions(+), 28 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 arm64: dts: meson: add Broadcom WiFi to P212 dtsi

The P212 has a combined WiFi/BT module. The BT side is already enabled in the dtsi but the WiFi side is not. Let's tweak SDIO speed (in-line with other GXL/GXM devices) and enable the WiFi module.

---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +6 -1
index 05cb2f5e5c36..c635e5858929 100644
@@ -113,7 +113,7 @@
 
 	bus-width = <4>;
 	cap-sd-highspeed;
-	max-frequency = <50000000>;
+	max-frequency = <100000000>;
 
 	non-removable;
 	disable-wp;
@@ -125,6 +125,11 @@
 
 	vmmc-supply = <&vddao_3v3>;
 	vqmmc-supply = <&vddio_boot>;
+
+	brcmf: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+	};
 };
 
 /* SD card */
Signature · 1 line
2.17.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] arm64: dts: meson: add Broadcom WiFi to P212 dtsi

Quoted 25 lines · Christian Hewitt

The P212 has a combined WiFi/BT module. The BT side is already enabled in the dtsi but the WiFi side is not. Let's tweak SDIO speed (in-line with other GXL/GXM devices) and enable the WiFi module.

---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +1 -1
index 05cb2f5e5c36..c635e5858929 100644
@@ -113,7 +113,7 @@
 
 	bus-width = <4>;
 	cap-sd-highspeed;
-	max-frequency = <50000000>;
+	max-frequency = <100000000>;
 
 	non-removable;
 	disable-wp;
@@ -125,6 +125,11 @@
 

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi line 135

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +5 -0
 	vmmc-supply = <&vddao_3v3>;
 	vqmmc-supply = <&vddio_boot>;
+
+	brcmf: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+	};
 };
 
 /* SD card */

As I commented in patch 3, the 2 changes should be split.

When you resend, you can put my:

in both patches.

Neil

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

#3 lore raw

PATCH 2/3 arm64: dts: meson: move pwm_ef node in P212 dtsi

In reply to Christian Hewitt

Cosmetic-only change to move/alpha-sort the node.

---
 .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +8 -8
index c635e5858929..b3d7b8613d6d 100644
@@ -97,6 +97,14 @@
 	pinctrl-names = "default";
 };
 
+&pwm_ef {
+	status = "okay";
+	pinctrl-0 = <&pwm_e_pins>;
+	pinctrl-names = "default";
+	clocks = <&clkc CLKID_FCLK_DIV4>;
+	clock-names = "clkin0";
+};
+
 &saradc {
 	status = "okay";
 	vref-supply = <&vddio_ao18>;
@@ -170,14 +178,6 @@
 	vqmmc-supply = <&vddio_boot>;
 };
 
-&pwm_ef {
-	status = "okay";
-	pinctrl-0 = <&pwm_e_pins>;
-	pinctrl-names = "default";
-	clocks = <&clkc CLKID_FCLK_DIV4>;
-	clock-names = "clkin0";
-};
-
 /* This is connected to the Bluetooth module: */
 &uart_A {
 	status = "okay";
Signature · 1 line
2.17.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] arm64: dts: meson: move pwm_ef node in P212 dtsi

Quoted 32 lines · Christian Hewitt

Cosmetic-only change to move/alpha-sort the node.

---
 .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +8 -1
index c635e5858929..b3d7b8613d6d 100644
@@ -97,6 +97,14 @@
 	pinctrl-names = "default";
 };
 
+&pwm_ef {
+	status = "okay";
+	pinctrl-0 = <&pwm_e_pins>;
+	pinctrl-names = "default";
+	clocks = <&clkc CLKID_FCLK_DIV4>;
+	clock-names = "clkin0";
+};
+
 &saradc {
 	status = "okay";
 	vref-supply = <&vddio_ao18>;
@@ -170,14 +178,6 @@
 	vqmmc-supply = <&vddio_boot>;
 };
 
-&pwm_ef {

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi line 183

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +0 -7
-	status = "okay";
-	pinctrl-0 = <&pwm_e_pins>;
-	pinctrl-names = "default";
-	clocks = <&clkc CLKID_FCLK_DIV4>;
-	clock-names = "clkin0";
-};
-
 /* This is connected to the Bluetooth module: */
 &uart_A {
 	status = "okay";

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

#5 lore raw

PATCH 3/3 arm64: dts: meson: remove Broadcom WiFi/BT nodes from Khadas VIM1

In reply to Christian Hewitt

The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi so we can remove them from the VIM1 board dts.

---
 .../amlogic/meson-gxl-s905x-khadas-vim.dts    | 19 -------------------
 1 file changed, 19 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +0 -19
index 6ab1cc125b96..108232a5aa2e 100644
@@ -217,25 +217,6 @@
 	pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>;
 };
 
-&sd_emmc_a {
-	max-frequency = <100000000>;
-
-	brcmf: wifi@1 {
-		reg = <1>;
-		compatible = "brcm,bcm4329-fmac";
-	};
-};
-
-&uart_A {
-	bluetooth {
-		compatible = "brcm,bcm43438-bt";
-		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
-		max-speed = <2000000>;
-		clocks = <&wifi32k>;
-		clock-names = "lpo";
-	};
-};
-
 /* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */
 &uart_AO {
 	status = "okay";
Signature · 1 line
2.17.1
Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH 3/3] arm64: dts: meson: remove Broadcom WiFi/BT nodes from Khadas VIM1

Hi,

Quoted 13 lines · Christian Hewitt

The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi so we can remove them from the VIM1 board dts.

---
 .../amlogic/meson-gxl-s905x-khadas-vim.dts    | 19 -------------------
 1 file changed, 19 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +0 -0
index 6ab1cc125b96..108232a5aa2e 100644

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts line 221

Quoted 5 lines
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +0 -2
@@ -217,25 +217,6 @@
 	pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>;
 };
 
-&sd_emmc_a {
-	max-frequency = <100000000>;

The SDIO freq is marked as 50000000 in the p212 DTSI and was explicitly changes by Jerome in adc52bf7ef16 ("arm64: dts: meson: fix mmc v2 chips max frequencies")

The change is ok if you change the p212 DTSI to 100000000 aswell.

Quoted 11 lines
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +0 -10
-
-	brcmf: wifi@1 {
-		reg = <1>;
-		compatible = "brcm,bcm4329-fmac";
-	};
-};
-
-&uart_A {
-	bluetooth {
-		compatible = "brcm,bcm43438-bt";

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts line 222

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +0 -7
-		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
-		max-speed = <2000000>;
-		clocks = <&wifi32k>;
-		clock-names = "lpo";
-	};
-};
-
 /* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */
 &uart_AO {
 	status = "okay";

With the change in p212 dtsi:

Thanks,
Neil