Revert to fix a regression that breaks Wifi support for a large part

of Pinebook Pro users (multiple Wifi chipsets).
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmnBtZMQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgZ2cB/oCymEh+ze15mRQRH9FatvMttkulEZcXzLb
 70VSEZNFHudYve0CWtontYU/BopgjOCdHYULhi/Zv+C+SJrHKb9eoTVZuGRCOt6o
 oqjokK5yZIMppGGgfeD5t9RDE8jjDBlrpAl8YIS9xpQ0LyfIx7tZDCe2K5vty9e9
 47D/TsKNPVWrNK1RzeEvVtuff/YzpO2C7E8h7d2nrg7eA9UU6wGcFoaWoAzjoZYu
 Qx+J867V1ZR2wYHrepnZVcihXcgM0CYZiS7fiYU6MmqCwhw8Sw97w92+1o3YVs0+
 zPqvUfOpW3QOaOIVAKHLDzl8g8W70/4dh+KxTPd01fcTna7g9nUc
 =5hJW
 -----END PGP SIGNATURE-----

Merge tag 'v7.0-rockchip-dtsfixes1-v2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes

Revert to fix a regression that breaks Wifi support for a large part
of Pinebook Pro users (multiple Wifi chipsets).

* tag 'v7.0-rockchip-dtsfixes1-v2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  Revert "arm64: dts: rockchip: Further describe the WiFi for the Pinebook Pro"

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2026-03-27 12:56:47 +01:00
commit 55372ab135

View File

@ -879,12 +879,6 @@ vcc5v0_host_en_pin: vcc5v0-host-en-pin {
};
};
wifi {
wifi_host_wake_l: wifi-host-wake-l {
rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
bt_wake_pin: bt-wake-pin {
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
@ -942,19 +936,7 @@ &sdio0 {
pinctrl-names = "default";
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
sd-uhs-sdr104;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
brcmf: wifi@1 {
compatible = "brcm,bcm4329-fmac";
reg = <1>;
interrupt-parent = <&gpio0>;
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "host-wake";
pinctrl-names = "default";
pinctrl-0 = <&wifi_host_wake_l>;
};
};
&sdhci {