Skip to contentSkip to conversation

arm64: dts: meson: add WiFi to P212 and cleanup VIM1

PATCH Applied Christian Hewitt 2 participants 8 messages Jan 23, 2023 – Jan 26, 2023

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

cover arm64: dts: meson: add WiFi to P212 and cleanup VIM1

This small series adds WiFi support to the P212 dtsi then removes the corresponding node from the VIM1 dts (as it's now inherited). Also move the pwm_ef node in the dtsi to alpha-sort correctly.

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 WiFi/BT nodes from Khadas VIM1

 .../amlogic/meson-gxl-s905x-khadas-vim.dts    | 15 -------------
 .../dts/amlogic/meson-gxl-s905x-p212.dtsi     | 21 ++++++++++++-------
 2 files changed, 13 insertions(+), 23 deletions(-)
Signature · 1 line
2.34.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 enable the WiFi module.

---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +5 -0
index 05cb2f5e5c36..7055057d7942 100644
@@ -125,6 +125,11 @@ &sd_emmc_a {
 
 	vmmc-supply = <&vddao_3v3>;
 	vqmmc-supply = <&vddio_boot>;
+
+	brcmf: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+	};
 };
 
 /* SD card */
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 1/3
#2 lore raw

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

Quoted 14 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 enable the WiFi module.

---
  arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 5 +++++
  1 file changed, 5 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +0 -0
index 05cb2f5e5c36..7055057d7942 100644
@@ -125,6 +125,11 @@ &sd_emmc_a {
 

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi &sd_emmc_a { · 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 */
#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 alpha-sort the pwm_ef 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 7055057d7942..a150cc0e18ff 100644
@@ -97,6 +97,14 @@ &ir {
 	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 @@ &sd_emmc_c {
 	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.34.1
maintainer Reviewed-by on v1 2/3
#4 lore raw

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

Quoted 31 lines · Christian Hewitt

Cosmetic-only change to alpha-sort the pwm_ef 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 7055057d7942..a150cc0e18ff 100644
@@ -97,6 +97,14 @@ &ir {
  	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 @@ &sd_emmc_c {
  	vqmmc-supply = <&vddio_boot>;
  };
 
-&pwm_ef {

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi &sd_emmc_c { · 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";
#5 lore raw

PATCH 3/3 arm64: dts: meson: remove 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.

---
 .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts    | 15 ---------------
 1 file changed, 15 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +0 -15
index bee51e29015b..2f88f78de5b7 100644
@@ -220,21 +220,6 @@ &pwm_ef {
 
 &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: */
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 3/3
#6 lore raw

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

Quoted 24 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.

---
  .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts    | 15 ---------------
  1 file changed, 15 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +0 -8
index bee51e29015b..2f88f78de5b7 100644
@@ -220,21 +220,6 @@ &pwm_ef {
 
  &sd_emmc_a {
  	max-frequency = <100000000>;
-
-	brcmf: wifi@1 {
-		reg = <1>;
-		compatible = "brcm,bcm4329-fmac";
-	};
-};
-
-&uart_A {

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts &pwm_ef { · line 225

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +0 -7
-	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: */
maintainer Applied
#7 lore raw
In reply to Christian Hewitt

Hi,

Quoted 10 lines · Christian Hewitt

This small series adds WiFi support to the P212 dtsi then removes the corresponding node from the VIM1 dts (as it's now inherited). Also move the pwm_ef node in the dtsi to alpha-sort correctly.

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 WiFi/BT nodes from Khadas VIM1

[...]

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.3/arm64-dt)

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

      https://git.kernel.org/amlogic/c/ac714d0925b4fae6a2a8c03da743a91d559f2b5c
[2/3] arm64: dts: meson: move pwm_ef node in P212 dtsi
      https://git.kernel.org/amlogic/c/81351d2f0b006302a72310c95203a767cf68631e
[3/3] arm64: dts: meson: remove WiFi/BT nodes from Khadas VIM1
      https://git.kernel.org/amlogic/c/3384645fb6cf31542650b89ecabe1fb04d0662fd

These changes has been applied on the intermediate git tree [1].

The v6.3/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes.

In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2].

The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists.

If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

Signature · 1 line
Neil