207 lines
5.1 KiB
Diff
207 lines
5.1 KiB
Diff
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
|
|
index 415bf66ca..3b3f48395 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
|
|
@@ -318,7 +318,7 @@
|
|
vcc10-supply = <&vcc_sys>;
|
|
vcc11-supply = <&vcc_sys>;
|
|
vcc12-supply = <&vcc3v3_sys>;
|
|
- vddio-supply = <&vcc1v8_pmu>;
|
|
+ vddio-supply = <&vcc_1v8>;
|
|
|
|
regulators {
|
|
vdd_center: DCDC_REG1 {
|
|
@@ -367,29 +367,31 @@
|
|
};
|
|
|
|
vcc1v8_dvp: LDO_REG1 {
|
|
- regulator-name = "vcc1v8_dvp";
|
|
+ regulator-name = "vcc1v8_codec";
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <1800000>;
|
|
regulator-max-microvolt = <1800000>;
|
|
regulator-state-mem {
|
|
- regulator-off-in-suspend;
|
|
+ regulator-on-in-suspend;
|
|
+ regulator-suspend-microvolt = <1800000>;
|
|
};
|
|
};
|
|
|
|
- vcc2v8_dvp: LDO_REG2 {
|
|
- regulator-name = "vcc2v8_dvp";
|
|
+ vcc1v8_hdmi: LDO_REG2 {
|
|
+ regulator-name = "vcc1v8_hdmi";
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
- regulator-min-microvolt = <2800000>;
|
|
- regulator-max-microvolt = <2800000>;
|
|
+ regulator-min-microvolt = <1800000>;
|
|
+ regulator-max-microvolt = <1800000>;
|
|
regulator-state-mem {
|
|
- regulator-off-in-suspend;
|
|
+ regulator-on-in-suspend;
|
|
+ regulator-suspend-microvolt = <1800000>;
|
|
};
|
|
};
|
|
|
|
- vcc1v8_pmu: LDO_REG3 {
|
|
- regulator-name = "vcc1v8_pmu";
|
|
+ vcca_1v8: LDO_REG3 {
|
|
+ regulator-name = "vcca_1v8";
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <1800000>;
|
|
@@ -400,26 +402,27 @@
|
|
};
|
|
};
|
|
|
|
- vcc_sdio: LDO_REG4 {
|
|
- regulator-name = "vcc_sdio";
|
|
+ vcc_sd: LDO_REG4 {
|
|
+ regulator-name = "vcc_sd";
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <1800000>;
|
|
- regulator-max-microvolt = <3300000>;
|
|
+ regulator-max-microvolt = <3000000>;
|
|
regulator-state-mem {
|
|
regulator-on-in-suspend;
|
|
regulator-suspend-microvolt = <3000000>;
|
|
};
|
|
};
|
|
|
|
- vcca3v0_codec: LDO_REG5 {
|
|
- regulator-name = "vcca3v0_codec";
|
|
+ vcca3v0_sd: LDO_REG5 {
|
|
+ regulator-name = "vcca3v0_sd";
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <3000000>;
|
|
regulator-max-microvolt = <3000000>;
|
|
regulator-state-mem {
|
|
- regulator-off-in-suspend;
|
|
+ regulator-on-in-suspend;
|
|
+ regulator-suspend-microvolt = <3000000>;
|
|
};
|
|
};
|
|
|
|
@@ -435,14 +438,15 @@
|
|
};
|
|
};
|
|
|
|
- vcca1v8_codec: LDO_REG7 {
|
|
- regulator-name = "vcca1v8_codec";
|
|
+ vcca0v9_hdmi: LDO_REG7 {
|
|
+ regulator-name = "vcca0v9_hdmi";
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
- regulator-min-microvolt = <1800000>;
|
|
- regulator-max-microvolt = <1800000>;
|
|
+ regulator-min-microvolt = <900000>;
|
|
+ regulator-max-microvolt = <900000>;
|
|
regulator-state-mem {
|
|
- regulator-off-in-suspend;
|
|
+ regulator-on-in-suspend;
|
|
+ regulator-suspend-microvolt = <900000>;
|
|
};
|
|
};
|
|
|
|
@@ -458,25 +462,12 @@
|
|
};
|
|
};
|
|
|
|
- vcc3v0_sd: vcc3v0-sd {
|
|
- compatible = "regulator-fixed";
|
|
- enable-active-high;
|
|
- gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&sdmmc0_pwr_h>;
|
|
- regulator-always-on;
|
|
- regulator-max-microvolt = <3000000>;
|
|
- regulator-min-microvolt = <3000000>;
|
|
- regulator-name = "vcc3v0_sd";
|
|
- vin-supply = <&vcc3v3_sys>;
|
|
- };
|
|
-
|
|
vcc3v3_s3: vcc_lan: SWITCH_REG1 {
|
|
regulator-name = "vcc3v3_s3";
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
regulator-state-mem {
|
|
- regulator-off-in-suspend;
|
|
+ regulator-on-in-suspend;
|
|
};
|
|
};
|
|
|
|
@@ -485,7 +476,7 @@
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
regulator-state-mem {
|
|
- regulator-off-in-suspend;
|
|
+ regulator-on-in-suspend;
|
|
};
|
|
};
|
|
};
|
|
@@ -583,9 +574,9 @@
|
|
&io_domains {
|
|
status = "okay";
|
|
|
|
- bt656-supply = <&vcc1v8_dvp>;
|
|
- audio-supply = <&vcca1v8_codec>;
|
|
- sdmmc-supply = <&vcc_sdio>;
|
|
+ bt656-supply = <&vcc_3v0>;
|
|
+ audio-supply = <&vcc_3v0>;
|
|
+ sdmmc-supply = <&vcc_sd>;
|
|
gpio1830-supply = <&vcc_3v0>;
|
|
};
|
|
|
|
@@ -615,6 +606,31 @@
|
|
};
|
|
};
|
|
|
|
+ sdio0 {
|
|
+ sdio0_bus1: sdio0-bus1 {
|
|
+ rockchip,pins =
|
|
+ <2 20 RK_FUNC_1 &pcfg_pull_up_20ma>;
|
|
+ };
|
|
+
|
|
+ sdio0_bus4: sdio0-bus4 {
|
|
+ rockchip,pins =
|
|
+ <2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
|
|
+ <2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
|
|
+ <2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
|
|
+ <2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
|
|
+ };
|
|
+
|
|
+ sdio0_cmd: sdio0-cmd {
|
|
+ rockchip,pins =
|
|
+ <2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
|
|
+ };
|
|
+
|
|
+ sdio0_clk: sdio0-clk {
|
|
+ rockchip,pins =
|
|
+ <2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
|
|
+ };
|
|
+ };
|
|
+
|
|
fusb302x {
|
|
fusb0_int: fusb0-int {
|
|
rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
@@ -726,13 +726,12 @@
|
|
bus-width = <4>;
|
|
cap-mmc-highspeed;
|
|
cap-sd-highspeed;
|
|
- cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
|
|
disable-wp;
|
|
sd-uhs-sdr104;
|
|
max-frequency = <150000000>;
|
|
- vqmmc-supply = <&vcc_sdio>;
|
|
+ vqmmc-supply = <&vcc_sd>;
|
|
pinctrl-names = "default";
|
|
- pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
|
|
+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
|
|
status = "okay";
|
|
};
|
|
|