131 lines
3.8 KiB
Diff
131 lines
3.8 KiB
Diff
From 836f197f1e95136e57766bf30e12419012d184db Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megi@xff.cz>
|
|
Date: Sun, 6 Aug 2023 22:27:56 +0200
|
|
Subject: [PATCH 423/464] arm64: dts: rk3566-pinetab2: Update wifi node for
|
|
cw1200
|
|
|
|
...
|
|
|
|
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
|
---
|
|
.../dts/rockchip/rk3566-pinetab2-v0.1.dts | 6 +--
|
|
.../dts/rockchip/rk3566-pinetab2-v2.0.dts | 6 +--
|
|
.../boot/dts/rockchip/rk3566-pinetab2.dtsi | 47 ++++++-------------
|
|
3 files changed, 20 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v0.1.dts b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v0.1.dts
|
|
index 7dc17a241b2e..c8c7ae7e23f9 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v0.1.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v0.1.dts
|
|
@@ -21,6 +21,6 @@ lcd0_rst_l: lcd0-rst-l {
|
|
};
|
|
};
|
|
|
|
-&w_vbat {
|
|
- gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
|
|
-};
|
|
+//&w_vbat {
|
|
+// gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
|
|
+//};
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v2.0.dts b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v2.0.dts
|
|
index 44f5f2812a7f..6e3102572b9b 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v2.0.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v2.0.dts
|
|
@@ -41,6 +41,6 @@ hall_int_l: hall-int-l {
|
|
};
|
|
};
|
|
|
|
-&w_vbat {
|
|
- gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
|
|
-};
|
|
+//&w_vbat {
|
|
+// gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
|
|
+//};
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
|
|
index f516670d0125..0b5c6febd760 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
|
|
@@ -237,37 +237,18 @@ vcc_sys: vcc_sys {
|
|
vin-supply = <&vcc_bat>;
|
|
};
|
|
|
|
- w_vbat: w-vbat-regulator {
|
|
- compatible = "regulator-fixed";
|
|
- enable-active-high;
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&wifi_pwren>;
|
|
- regulator-name = "w_vbat";
|
|
- regulator-min-microvolt = <3300000>;
|
|
- regulator-max-microvolt = <3300000>;
|
|
- vin-supply = <&vcc_sys>;
|
|
- };
|
|
-
|
|
wl_reg: wl-regulator {
|
|
compatible = "regulator-fixed";
|
|
enable-active-high;
|
|
- gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
|
|
+ gpio = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>;
|
|
pinctrl-names = "default";
|
|
- pinctrl-0 = <&wifi_reg_on_h>;
|
|
+ pinctrl-0 = <&wifi_pwrkey>;
|
|
regulator-name = "wl_reg";
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
- vin-supply = <&w_vbat>;
|
|
- };
|
|
-
|
|
- wl_reg2: wl2-regulator {
|
|
- compatible = "regulator-fixed";
|
|
- enable-active-high;
|
|
- gpio = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>;
|
|
- regulator-name = "wl_reg2";
|
|
- regulator-min-microvolt = <3300000>;
|
|
- regulator-max-microvolt = <3300000>;
|
|
- vin-supply = <&wl_reg>;
|
|
+ vin-supply = <&vcc_sys>;
|
|
+ startup-delay-us = <100000>;
|
|
+ off-on-delay-us = <100000>;
|
|
};
|
|
|
|
vdd1v2_dvp: vdd1v2_dvp {
|
|
@@ -839,10 +820,6 @@ host_wake_wl: host-wake-wl {
|
|
rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
};
|
|
|
|
- wifi_pwren: wifi-pwren {
|
|
- rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
- };
|
|
-
|
|
wifi_reg_on_h: wifi-reg-on-h {
|
|
rockchip,pins = <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
};
|
|
@@ -928,16 +905,20 @@ &sdmmc1 {
|
|
pinctrl-0 = <&sdmmc1_bus4
|
|
&sdmmc1_cmd
|
|
&sdmmc1_clk>;
|
|
- sd-uhs-sdr104;
|
|
- vmmc-supply = <&wl_reg2>;
|
|
+ vmmc-supply = <&wl_reg>;
|
|
vqmmc-supply = <&vcca1v8_pmu>;
|
|
status = "okay";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
|
|
- bes2600: wifi {
|
|
+ bes2600: wifi@1 {
|
|
compatible = "bestechnic,bes2600";
|
|
-
|
|
+ reg = <1>;
|
|
+ // don't enable gpio interrupt just yet
|
|
+ //interrupt-parent = <&gpio0>;
|
|
+ //interrupts = <RK_PC4 IRQ_TYPE_EDGE_RISING>;
|
|
device-wakeup-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; // wifi chip wakeup
|
|
- host-wakeup-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; // host wakeup
|
|
+ //host-wakeup-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; // host wakeup
|
|
};
|
|
};
|
|
|
|
--
|
|
2.34.1
|
|
|