Skip to content

Commit 55372ab

Browse files
committed
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 <[email protected]>
2 parents 3d53a7a + 29d1f56 commit 55372ab

1 file changed

Lines changed: 0 additions & 18 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -879,12 +879,6 @@
879879
};
880880
};
881881

882-
wifi {
883-
wifi_host_wake_l: wifi-host-wake-l {
884-
rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
885-
};
886-
};
887-
888882
wireless-bluetooth {
889883
bt_wake_pin: bt-wake-pin {
890884
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -942,19 +936,7 @@
942936
pinctrl-names = "default";
943937
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
944938
sd-uhs-sdr104;
945-
#address-cells = <1>;
946-
#size-cells = <0>;
947939
status = "okay";
948-
949-
brcmf: wifi@1 {
950-
compatible = "brcm,bcm4329-fmac";
951-
reg = <1>;
952-
interrupt-parent = <&gpio0>;
953-
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
954-
interrupt-names = "host-wake";
955-
pinctrl-names = "default";
956-
pinctrl-0 = <&wifi_host_wake_l>;
957-
};
958940
};
959941

960942
&sdhci {

0 commit comments

Comments
 (0)