Skip to contentSkip to conversation

arm64: dts: amlogic: meson-s4-s905y4-khadas-vim1s: enable SDIO interface

PATCH Applied Nick Xie 2 participants 3 messages Jan 21

Subsystems (2)
lore
Share & tools
lore

Nick Xie

author
#0 lore raw

PATCH v2 1/1 arm64: dts: amlogic: meson-s4-s905y4-khadas-vim1s: enable SDIO interface

Enable the SDIO controller interface connected to the on-board AP6256 WiFi/BT module.

---
Changes in v2:
- Dropped 'amlogic,dram-access-quirk' property as it is not required for S905Y4.
- Updated compatible string to specific "brcm,bcm43456-fmac".
- Link to v1: https://lore.kernel.org/all/[email protected]/

 .../amlogic/meson-s4-s905y4-khadas-vim1s.dts  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm64/boot/dts/amlogic/meson-s4-s905y4-khadas-vim1s.dts +27 -0
index 4a66c1bec965e..27d0f6134ea9d 100644
@@ -220,6 +220,33 @@ &sd {
 	vqmmc-supply = <&vddio_sd>;
 };
 
+&sdio {
+	status = "okay";
+	pinctrl-0 = <&sdio_pins>;
+	pinctrl-1 = <&sdio_clk_gate_pins>;
+	pinctrl-names = "default", "clk-gate";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	bus-width = <4>;
+	cap-sd-highspeed;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
+	max-frequency = <50000000>;
+	non-removable;
+	disable-wp;
+
+	no-sd;
+	no-mmc;
+	mmc-pwrseq = <&sdio_pwrseq>;
+	vmmc-supply = <&vddao_3v3>;
+	vqmmc-supply = <&vddio_ao1v8>;
+
+	brcmf: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm43456-fmac", "brcm,bcm4329-fmac";
+	};
+};
+
 &spicc0 {
 	status = "okay";
 	pinctrl-names = "default";
Signature · 1 line
2.34.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 41 lines · Nick Xie

Enable the SDIO controller interface connected to the on-board AP6256 WiFi/BT module.

---
Changes in v2:
- Dropped 'amlogic,dram-access-quirk' property as it is not required for S905Y4.
- Updated compatible string to specific "brcm,bcm43456-fmac".
- Link to v1: https://lore.kernel.org/all/[email protected]/

  .../amlogic/meson-s4-s905y4-khadas-vim1s.dts  | 27 +++++++++++++++++++
  1 file changed, 27 insertions(+)
arch/arm64/boot/dts/amlogic/meson-s4-s905y4-khadas-vim1s.dts +20 -0
index 4a66c1bec965e..27d0f6134ea9d 100644
@@ -220,6 +220,33 @@ &sd {
  	vqmmc-supply = <&vddio_sd>;
  };
 
+&sdio {
+	status = "okay";
+	pinctrl-0 = <&sdio_pins>;
+	pinctrl-1 = <&sdio_clk_gate_pins>;
+	pinctrl-names = "default", "clk-gate";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	bus-width = <4>;
+	cap-sd-highspeed;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
+	max-frequency = <50000000>;
+	non-removable;
+	disable-wp;
+
+	no-sd;
+	no-mmc;
+	mmc-pwrseq = <&sdio_pwrseq>;
+	vmmc-supply = <&vddao_3v3>;
+	vqmmc-supply = <&vddio_ao1v8>;

arch/arm64/boot/dts/amlogic/meson-s4-s905y4-khadas-vim1s.dts &sd { · line 252

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-s4-s905y4-khadas-vim1s.dts +7 -0
+
+	brcmf: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm43456-fmac", "brcm,bcm4329-fmac";
+	};
+};
+
  &spicc0 {
  	status = "okay";
  	pinctrl-names = "default";

Thanks,
Neil

maintainer Applied
#2 lore raw
In reply to Nick Xie

Hi,

Quoted 4 lines · Nick Xie

Enable the SDIO controller interface connected to the on-board AP6256 WiFi/BT module.

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

[1/1] arm64: dts: amlogic: meson-s4-s905y4-khadas-vim1s: enable SDIO interface

      https://git.kernel.org/amlogic/c/854583f9992671411bad28bd8a3867afba7cce77

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

The v6.20/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