Skip to content

Commit 5c42a7f

Browse files
committed
arm64: dts: Edge: fixup regulator
1 parent 049ab78 commit 5c42a7f

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

arch/arm64/boot/dts/rockchip/rk3399-kedge.dtsi

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@
515515
mali-supply = <&vdd_gpu>;
516516
};
517517

518-
&i2c0 {
518+
&i2c4 {
519519
status = "okay";
520520
i2c-scl-rising-time-ns = <168>;
521521
i2c-scl-falling-time-ns = <4>;
@@ -528,7 +528,7 @@
528528
regulator-compatible = "fan53555-reg";
529529
pinctrl-names = "default";
530530
pinctrl-0 = <&vsel1_gpio>;
531-
vsel-gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
531+
vsel-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; /* GPIO1_B5 */
532532
regulator-name = "vdd_cpu_b";
533533
regulator-min-microvolt = <712500>;
534534
regulator-max-microvolt = <1500000>;
@@ -549,7 +549,7 @@
549549
regulator-compatible = "fan53555-reg";
550550
pinctrl-names = "default";
551551
pinctrl-0 = <&vsel2_gpio>;
552-
vsel-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
552+
sel-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;/* GPIO0_B5 */
553553
regulator-name = "vdd_gpu";
554554
regulator-min-microvolt = <712500>;
555555
regulator-max-microvolt = <1500000>;
@@ -567,7 +567,7 @@
567567
compatible = "rockchip,rk808";
568568
reg = <0x1b>;
569569
interrupt-parent = <&gpio1>;
570-
interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
570+
interrupts = <22 IRQ_TYPE_LEVEL_LOW>;
571571
pinctrl-names = "default";
572572
pinctrl-0 = <&pmic_int_l &pmic_dvs2>;
573573
rockchip,system-power-controller;
@@ -634,23 +634,23 @@
634634
};
635635
};
636636

637-
vcc1v8_dvp: LDO_REG1 {
637+
vcc1v8_apio2: LDO_REG1 {
638638
regulator-always-on;
639639
regulator-boot-on;
640640
regulator-min-microvolt = <1800000>;
641641
regulator-max-microvolt = <1800000>;
642-
regulator-name = "vcc1v8_dvp";
642+
regulator-name = "vcc1v8_apio2";
643643
regulator-state-mem {
644644
regulator-off-in-suspend;
645645
};
646646
};
647647

648-
vcc3v0_tp: LDO_REG2 {
648+
vcc1v8_efuse: LDO_REG2 {
649649
regulator-always-on;
650650
regulator-boot-on;
651-
regulator-min-microvolt = <3000000>;
652-
regulator-max-microvolt = <3000000>;
653-
regulator-name = "vcc3v0_tp";
651+
regulator-min-microvolt = <1800000>;
652+
regulator-max-microvolt = <1800000>;
653+
regulator-name = "vcc1v8_efuse";
654654
regulator-state-mem {
655655
regulator-off-in-suspend;
656656
};
@@ -680,12 +680,12 @@
680680
};
681681
};
682682

683-
vcca3v0_codec: LDO_REG5 {
683+
vcc_vldo5: LDO_REG5 {
684684
regulator-always-on;
685685
regulator-boot-on;
686686
regulator-min-microvolt = <3000000>;
687687
regulator-max-microvolt = <3000000>;
688-
regulator-name = "vcca3v0_codec";
688+
regulator-name = "vcc_vldo5";
689689
regulator-state-mem {
690690
regulator-off-in-suspend;
691691
};
@@ -747,7 +747,7 @@
747747
};
748748
};
749749

750-
&i2c4 {
750+
&i2c8 {
751751
status = "okay";
752752
i2c-scl-rising-time-ns = <475>;
753753
i2c-scl-falling-time-ns = <26>;
@@ -1027,7 +1027,7 @@
10271027
pmic {
10281028
pmic_int_l: pmic-int-l {
10291029
rockchip,pins =
1030-
<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
1030+
<1 22 RK_FUNC_GPIO &pcfg_pull_up>;
10311031
};
10321032

10331033
pmic_dvs2: pmic-dvs2 {
@@ -1036,11 +1036,11 @@
10361036
};
10371037
vsel1_gpio: vsel1-gpio {
10381038
rockchip,pins =
1039-
<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
1039+
<1 13 RK_FUNC_GPIO &pcfg_pull_down>;
10401040
};
10411041
vsel2_gpio: vsel2-gpio {
10421042
rockchip,pins =
1043-
<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
1043+
<0 13 RK_FUNC_GPIO &pcfg_pull_down>;
10441044
};
10451045
};
10461046

0 commit comments

Comments
 (0)