From c1f776bf6a22891a8a27d5e41f112dd2d9c55cd6 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 7 Oct 2020 14:53:18 +0200 Subject: ARM: dts: imx8mm-verdin: v1.1: follow changed pmic The used PMIC has been changed from RHOM BD71837 to NXP PCA9450A. Adjust the device tree accordingly. Remove the old ADC node as the ADC has been changed and has no longer a separate power rail. Related-to: ELB-3130 Signed-off-by: Max Krummenacher --- arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 4 +- arch/arm/dts/imx8mm-verdin.dts | 118 ++++++++++++++------------------- 2 files changed, 53 insertions(+), 69 deletions(-) diff --git a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi index 53c3f640c9..c2705f5d81 100644 --- a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi @@ -111,11 +111,11 @@ u-boot,dm-spl; }; -&{/soc@0/bus@30800000/i2c@30a20000/bd71837@4b} { +&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25} { u-boot,dm-spl; }; -&{/soc@0/bus@30800000/i2c@30a20000/bd71837@4b/regulators} { +&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25/regulators} { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mm-verdin.dts b/arch/arm/dts/imx8mm-verdin.dts index 033ef998c6..e134a13fb9 100644 --- a/arch/arm/dts/imx8mm-verdin.dts +++ b/arch/arm/dts/imx8mm-verdin.dts @@ -136,131 +136,121 @@ pinctrl-0 = <&pinctrl_i2c1>; status = "okay"; - pmic: bd71837@4b { - reg = <0x4b>; - compatible = "rohm,bd71840", "rohm,bd71837"; - /* PMIC BD71837 PMIC_nINT GPIO1_IO3 */ + /* Assembled on V1.1 HW and later */ + pmic: pca9450@25 { + reg = <0x25>; + compatible = "nxp,pca9450a"; + /* PMIC PCA9450 PMIC_nINT GPIO1_IO3 */ pinctrl-0 = <&pinctrl_pmic>; gpio_intr = <&gpio1 3 GPIO_ACTIVE_LOW>; - gpo { - rohm,drv = <0x0C>; /* 0b0000_1100 all gpos with cmos output mode */ - }; - regulators { #address-cells = <1>; #size-cells = <0>; - bd71837,pmic-buck2-uses-i2c-dvs; - bd71837,pmic-buck2-dvs-voltage = <1000000>, <900000>, <0>; /* VDD_ARM: Run-Idle */ + pca9450,pmic-buck2-uses-i2c-dvs; + /* Run/Standby voltage */ + pca9450,pmic-buck2-dvs-voltage = <950000>, <850000>; buck1_reg: regulator@0 { reg = <0>; regulator-compatible = "buck1"; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1300000>; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <2187500>; regulator-boot-on; regulator-always-on; - regulator-ramp-delay = <1250>; + regulator-ramp-delay = <3125>; }; buck2_reg: regulator@1 { reg = <1>; regulator-compatible = "buck2"; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1300000>; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <2187500>; regulator-boot-on; regulator-always-on; - regulator-ramp-delay = <1250>; + regulator-ramp-delay = <3125>; }; - buck5_reg: regulator@4 { - reg = <4>; - regulator-compatible = "buck5"; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1350000>; + buck3_reg: regulator@2 { + reg = <2>; + regulator-compatible = "buck3"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <2187500>; regulator-boot-on; regulator-always-on; }; - buck6_reg: regulator@5 { - reg = <5>; - regulator-compatible = "buck6"; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3300000>; + buck4_reg: regulator@3 { + reg = <3>; + regulator-compatible = "buck4"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <3400000>; regulator-boot-on; regulator-always-on; }; - buck7_reg: regulator@6 { - reg = <6>; - regulator-compatible = "buck7"; - regulator-min-microvolt = <1605000>; - regulator-max-microvolt = <1995000>; + buck5_reg: regulator@4 { + reg = <4>; + regulator-compatible = "buck5"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <3400000>; regulator-boot-on; regulator-always-on; }; - buck8_reg: regulator@7 { - reg = <7>; - regulator-compatible = "buck8"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; + buck6_reg: regulator@5 { + reg = <5>; + regulator-compatible = "buck6"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <3400000>; regulator-boot-on; regulator-always-on; }; - ldo1_reg: regulator@8 { - reg = <8>; + ldo1_reg: regulator@6 { + reg = <6>; regulator-compatible = "ldo1"; - regulator-min-microvolt = <3000000>; + regulator-min-microvolt = <1600000>; regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; }; - ldo2_reg: regulator@9 { - reg = <9>; + ldo2_reg: regulator@7 { + reg = <7>; regulator-compatible = "ldo2"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <900000>; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1150000>; regulator-boot-on; regulator-always-on; }; - ldo3_reg: regulator@10 { - reg = <10>; + ldo3_reg: regulator@8 { + reg = <8>; regulator-compatible = "ldo3"; - regulator-min-microvolt = <1800000>; + regulator-min-microvolt = <800000>; regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; }; - ldo4_reg: regulator@11 { - reg = <11>; + ldo4_reg: regulator@9 { + reg = <9>; regulator-compatible = "ldo4"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; }; - ldo5_reg: regulator@12 { - reg = <12>; + ldo5_reg: regulator@10 { + reg = <10>; regulator-compatible = "ldo5"; - regulator-min-microvolt = <3300000>; + regulator-min-microvolt = <800000>; regulator-max-microvolt = <3300000>; }; - ldo6_reg: regulator@13 { - reg = <13>; - regulator-compatible = "ldo6"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1800000>; - regulator-boot-on; - regulator-always-on; - }; }; }; @@ -270,12 +260,6 @@ reg = <0x32>; }; - adc: max11607@34 { - compatible = "maxim,max11607"; - reg = <0x34>; - vcc-supply = <&ldo5_reg>; - }; - eeprom_module: eeprom@50 { compatible = "st,24c02", "atmel,24c02", "i2c-eeprom"; pagesize = <16>; -- cgit v1.2.3