github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-13 09:17:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "arm64: dts: rockchip: change the wifi power-on method for rk356x evb"

Browse Source 
This reverts commit e37604f00f.

Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I90a96482445710b6089acd5b6ad19264462b35f7
This commit is contained in:
Alex Zhao 2021-01-04 11:54:32 +08:00 committed by Tao Huang
parent 67be194d10
commit a6107c8add
7 changed files with 98 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi
View File

@ -315,10 +315,11 @@ &sdmmc2 {
cap-sd-highspeed;
cap-sdio-irq;
keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
sd-uhs-sdr104;
logic-remove-card;
status = "okay";
};
@ -351,8 +352,7 @@ &wireless_bluetooth {
&wireless_wlan {
pinctrl-names = "default";
pinctrl-0 = <&wifi_poweren &wifi_host_wake_irq>;
WIFI,poweren_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&wifi_host_wake_irq>;
WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>;
};
@ -376,10 +376,6 @@ lcd1_rst_gpio: lcd1-rst-gpio {
};
wireless-wlan {
wifi_poweren: wifi-poweren {
rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
};

16
arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi
View File

@ -298,11 +298,13 @@ hp_det: hp-det {
};
};
wireless-wlan {
wifi_poweren: wifi-poweren {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-wlan {
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
};
@ -387,13 +389,18 @@ &sdmmc1 {
cap-sd-highspeed;
cap-sdio-irq;
keep-power-in-suspend;
logic-remove-card;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
sd-uhs-sdr104;
status = "okay";
};
&sdio_pwrseq {
reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
};
&spdif_8ch {
status = "okay";
pinctrl-names = "default";
@ -417,8 +424,7 @@ &vcc3v3_lcd1_n {
};
&wireless_wlan {
pinctrl-names = "default";
pinctrl-0 = <&wifi_poweren &wifi_host_wake_irq>;
WIFI,poweren_gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&wifi_host_wake_irq>;
WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
};

16
arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi
View File

@ -173,11 +173,13 @@ lcd1_rst_gpio: lcd1-rst-gpio {
};
};
wireless-wlan {
wifi_poweren: wifi-poweren {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-wlan {
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
};
@ -223,6 +225,10 @@ &route_dsi0 {
status = "okay";
};
&sdio_pwrseq {
reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
};
&sdmmc1 {
max-frequency = <150000000>;
supports-sdio;
@ -231,10 +237,11 @@ &sdmmc1 {
cap-sd-highspeed;
cap-sdio-irq;
keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
sd-uhs-sdr104;
logic-remove-card;
status = "okay";
};
@ -272,7 +279,6 @@ &wireless_bluetooth {
&wireless_wlan {
pinctrl-names = "default";
pinctrl-0 = <&wifi_poweren &wifi_host_wake_irq>;
WIFI,poweren_gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&wifi_host_wake_irq>;
WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
};

22
arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
View File

@ -295,6 +295,22 @@ regulator-state-mem {
};
};
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&rk809 1>;
clock-names = "ext_clock";
pinctrl-names = "default";
pinctrl-0 = <&wifi_enable_h>;
/*
* On the module itself this is one of these (depending
* on the actual card populated):
* - SDIO_RESET_L_WL_REG_ON
* - PDN (power down when low)
*/
reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
};
wireless_wlan: wireless-wlan {
compatible = "wlan-platdata";
rockchip,grf = <&grf>;
@ -1410,6 +1426,12 @@ touch_gpio: touch-gpio {
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
vcc5v0_host_en: vcc5v0-host-en {
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;

10
arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi
View File

@ -382,10 +382,6 @@ hp_det: hp-det {
};
wireless-wlan {
wifi_poweren: wifi-poweren {
rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
};
@ -436,10 +432,11 @@ &sdmmc2 {
cap-sd-highspeed;
cap-sdio-irq;
keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
sd-uhs-sdr104;
logic-remove-card;
status = "okay";
};
@ -467,8 +464,7 @@ &vcc3v3_lcd1_n {
&wireless_wlan {
pinctrl-names = "default";
pinctrl-0 = <&wifi_poweren &wifi_host_wake_irq>;
WIFI,poweren_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&wifi_host_wake_irq>;
WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>;
};

33
arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi
View File

@ -278,20 +278,22 @@ sii902x_hdmi_int: sii902x-hdmi-int {
};
};
wireless-wlan {
wifi_poweren: wifi-poweren {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
};
wifi_32k: wifi-32k {
rockchip,pins = <2 RK_PC6 1 &pcfg_pull_none>;
};
};
wireless-wlan {
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
wireless-bluetooth {
uart1_gpios: uart1-gpios {
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
@ -417,6 +419,19 @@ &route_dsi0 {
status = "okay";
};
&sdio_pwrseq {
clocks = <&pmucru CLK_RTC_32K>;
pinctrl-0 = <&wifi_enable_h &wifi_32k>;
/*
* On the module itself this is one of these (depending
* on the actual card populated):
* - SDIO_RESET_L_WL_REG_ON
* - PDN (power down when low)
*/
reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
};
&sdmmc1 {
max-frequency = <150000000>;
supports-sdio;
@ -425,10 +440,11 @@ &sdmmc1 {
cap-sd-highspeed;
cap-sdio-irq;
keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
sd-uhs-sdr104;
logic-remove-card;
status = "okay";
};
@ -454,8 +470,7 @@ &vcc3v3_lcd1_n {
&wireless_wlan {
pinctrl-names = "default";
pinctrl-0 = <&wifi_poweren &wifi_host_wake_irq &wifi_32k>;
WIFI,poweren_gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&wifi_host_wake_irq>;
WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
};

33
arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi
View File

@ -210,12 +210,8 @@ hp_det: hp-det {
};
};
wireless-wlan {
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
};
wifi_poweren: wifi-poweren {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
@ -224,6 +220,12 @@ wifi_32k: wifi-32k {
};
};
wireless-wlan {
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
wireless-bluetooth {
uart1_gpios: uart1-gpios {
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
@ -243,10 +245,11 @@ &sdmmc1 {
cap-sd-highspeed;
cap-sdio-irq;
keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
sd-uhs-sdr104;
logic-remove-card;
status = "okay";
};
@ -254,6 +257,19 @@ &sdmmc2 {
status = "disabled";
};
&sdio_pwrseq {
clocks = <&pmucru CLK_RTC_32K>;
pinctrl-0 = <&wifi_enable_h &wifi_32k>;
/*
* On the module itself this is one of these (depending
* on the actual card populated):
* - SDIO_RESET_L_WL_REG_ON
* - PDN (power down when low)
*/
reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
};
&spdif_8ch {
status = "disabled";
};
@ -283,8 +299,7 @@ &vcc3v3_lcd1_n {
&wireless_wlan {
pinctrl-names = "default";
pinctrl-0 = <&wifi_32k &wifi_poweren &wifi_host_wake_irq>;
WIFI,poweren_gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&wifi_host_wake_irq>;
WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
};