在 2022/6/21 1:33, Heiko Thiery 写道:
Sync dts for imx8mn-evk with Linux Kernel and change name for PMIC used in SPL.

commit 1cfa1e68af8d40ab233d5d27bc8446e4c5107571("arm64: dts: imx8mn-evk: fix the 
min/max voltages of the PMIC")
commit bc046b952a5494b0dc53be28779460cee1214a3f("arm64: dts: imx8mn-evk: use proper 
names for PMIC outputs")

I think the way to sync dts is to choose one linux release RC to sync. not just sync partial.

Thanks,
Peng.

Signed-off-by: Heiko Thiery <heiko.thi...@gmail.com>
---
  arch/arm/dts/imx8mn-evk.dts      | 56 ++++++++++++++++----------------
  board/freescale/imx8mn_evk/spl.c |  4 +--
  2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/arch/arm/dts/imx8mn-evk.dts b/arch/arm/dts/imx8mn-evk.dts
index cd11fb28f5..4eb467df5b 100644
--- a/arch/arm/dts/imx8mn-evk.dts
+++ b/arch/arm/dts/imx8mn-evk.dts
@@ -31,7 +31,7 @@
  };
&i2c1 {
-       pmic: pca9450@25 {
+       pmic: pmic@25 {
                compatible = "nxp,pca9450b";
                reg = <0x25>;
                pinctrl-names = "default";
@@ -41,18 +41,18 @@
regulators {
                        buck1: BUCK1{
-                               regulator-name = "BUCK1";
-                               regulator-min-microvolt = <600000>;
-                               regulator-max-microvolt = <2187500>;
+                               regulator-name = "VDD_SOC";
+                               regulator-min-microvolt = <850000>;
+                               regulator-max-microvolt = <950000>;
                                regulator-boot-on;
                                regulator-always-on;
                                regulator-ramp-delay = <3125>;
                        };
buck2: BUCK2 {
-                               regulator-name = "BUCK2";
-                               regulator-min-microvolt = <600000>;
-                               regulator-max-microvolt = <2187500>;
+                               regulator-name = "VDD_ARM_0V9";
+                               regulator-min-microvolt = <850000>;
+                               regulator-max-microvolt = <1000000>;
                                regulator-boot-on;
                                regulator-always-on;
                                regulator-ramp-delay = <3125>;
@@ -61,63 +61,63 @@
                        };
buck4: BUCK4{
-                               regulator-name = "BUCK4";
-                               regulator-min-microvolt = <600000>;
-                               regulator-max-microvolt = <3400000>;
+                               regulator-name = "VDD_3V3";
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
buck5: BUCK5{
-                               regulator-name = "BUCK5";
-                               regulator-min-microvolt = <600000>;
-                               regulator-max-microvolt = <3400000>;
+                               regulator-name = "VDD_1V8";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
buck6: BUCK6 {
-                               regulator-name = "BUCK6";
-                               regulator-min-microvolt = <600000>;
-                               regulator-max-microvolt = <3400000>;
+                               regulator-name = "NVCC_DRAM_1V1";
+                               regulator-min-microvolt = <1100000>;
+                               regulator-max-microvolt = <1100000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
ldo1: LDO1 {
-                               regulator-name = "LDO1";
-                               regulator-min-microvolt = <1600000>;
-                               regulator-max-microvolt = <3300000>;
+                               regulator-name = "NVCC_SNVS_1V8";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
ldo2: LDO2 {
-                               regulator-name = "LDO2";
+                               regulator-name = "VDD_SNVS_0V8";
                                regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1150000>;
+                               regulator-max-microvolt = <800000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
ldo3: LDO3 {
-                               regulator-name = "LDO3";
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <3300000>;
+                               regulator-name = "VDDA_1V8";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
ldo4: LDO4 {
-                               regulator-name = "LDO4";
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <3300000>;
+                               regulator-name = "VDD_PHY_1V2";
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <1200000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
ldo5: LDO5 {
-                               regulator-name = "LDO5";
+                               regulator-name = "NVCC_SD2";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-boot-on;
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 0d9909a662..a830407997 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -69,9 +69,9 @@ int power_init_board(void)
        struct udevice *dev;
        int ret;
- ret = pmic_get("pca9450@25", &dev);
+       ret = pmic_get("pmic@25", &dev);
        if (ret == -ENODEV) {
-               puts("No pca9450@25\n");
+               puts("No pmci@25\n");
                return 0;
        }
        if (ret != 0)

Reply via email to