Commit 55372ab1 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'v7.0-rockchip-dtsfixes1-v2' of... 

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: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents 3d53a7a2 29d1f56c

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

+0 −18
Original line number Diff line number Diff line
@@ -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 {