From 7797745f77993145bd5ac05faef504c299a12228 Mon Sep 17 00:00:00 2001 From: ashthespy Date: Fri, 31 Jan 2020 16:59:34 +0100 Subject: [PATCH 15/23] arm64: dts: rockchip: Move `wireless-wlan` node into sdio --- .../boot/dts/rockchip/rk3308-rock-pi-s.dts | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts index a812b9a1b949..5536460e65c2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts @@ -152,18 +152,18 @@ vcc5v0_otg: vcc5v0-otg { vin-supply = <&vcc5v0_sys>; }; - wireless-wlan { - compatible = "wlan-platdata"; - rockchip,grf = <&grf>; - clocks = <&cru SCLK_WIFI>; - clock-names = "clk_wifi"; - ref-clock-frequency = <24000000>; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_host_wake>; - wifi_chip_type = "rtl8723ds"; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; + // wireless-wlan { + // compatible = "wlan-platdata"; + // rockchip,grf = <&grf>; + // clocks = <&cru SCLK_WIFI>; + // clock-names = "clk_wifi"; + // ref-clock-frequency = <24000000>; + // pinctrl-names = "default"; + // pinctrl-0 = <&wifi_host_wake>; + // wifi_chip_type = "rtl8723ds"; + // WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + // status = "okay"; + // }; }; &cpu0 { @@ -250,7 +250,7 @@ wifi_enable_h: wifi-enable-h { }; }; - wireless-wlan { + wifi { wifi_host_wake: wifi-host-wake { rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; }; @@ -280,6 +280,14 @@ &sdio { non-removable; sd-uhs-sdr104; status = "okay"; + + rtl8723ds: wifi@1 { + interrupt-parent = <&gpio0>; + interrupts = ; + interrupt-names = "host-wake"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_host_wake>; + }; }; &tsadc { -- 2.25.1