Merge tag 'docs-5.15' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / freescale / imx8mm-venice-gw700x.dtsi

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-venice-gw700x.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-venice-gw700x.dtsi
index c769fad..00f86ca 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mm-venice-gw700x.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm-venice-gw700x.dtsi
@@ -278,70 +278,86 @@
 
        pmic@69 {
                compatible = "mps,mp5416";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_pmic>;
                reg = <0x69>;
 
                regulators {
+                       /* vdd_0p95: DRAM/GPU/VPU */
                        buck1 {
-                               regulator-name = "vdd_0p95";
-                               regulator-min-microvolt = <805000>;
+                               regulator-name = "buck1";
+                               regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <1000000>;
-                               regulator-max-microamp = <2500000>;
+                               regulator-min-microamp  = <3800000>;
+                               regulator-max-microamp  = <6800000>;
                                regulator-boot-on;
+                               regulator-always-on;
                        };
 
+                       /* vdd_soc */
                        buck2 {
-                               regulator-name = "vdd_soc";
-                               regulator-min-microvolt = <805000>;
+                               regulator-name = "buck2";
+                               regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <900000>;
-                               regulator-max-microamp = <1000000>;
+                               regulator-min-microamp  = <2200000>;
+                               regulator-max-microamp  = <5200000>;
                                regulator-boot-on;
+                               regulator-always-on;
                        };
 
+                       /* vdd_arm */
                        buck3_reg: buck3 {
-                               regulator-name = "vdd_arm";
-                               regulator-min-microvolt = <805000>;
+                               regulator-name = "buck3";
+                               regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <1000000>;
-                               regulator-max-microamp = <2200000>;
-                               regulator-boot-on;
+                               regulator-min-microamp  = <3800000>;
+                               regulator-max-microamp  = <6800000>;
+                               regulator-always-on;
                        };
 
+                       /* vdd_1p8 */
                        buck4 {
-                               regulator-name = "vdd_1p8";
+                               regulator-name = "buck4";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
-                               regulator-max-microamp = <500000>;
+                               regulator-min-microamp  = <2200000>;
+                               regulator-max-microamp  = <5200000>;
                                regulator-boot-on;
+                               regulator-always-on;
                        };
 
+                       /* nvcc_snvs_1p8 */
                        ldo1 {
-                               regulator-name = "nvcc_snvs_1p8";
+                               regulator-name = "ldo1";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
-                               regulator-max-microamp = <300000>;
                                regulator-boot-on;
+                               regulator-always-on;
                        };
 
+                       /* vdd_snvs_0p8 */
                        ldo2 {
-                               regulator-name = "vdd_snvs_0p8";
+                               regulator-name = "ldo2";
                                regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <800000>;
                                regulator-boot-on;
+                               regulator-always-on;
                        };
 
+                       /* vdd_0p9 */
                        ldo3 {
-                               regulator-name = "vdd_0p95";
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <800000>;
+                               regulator-name = "ldo3";
+                               regulator-min-microvolt = <900000>;
+                               regulator-max-microvolt = <900000>;
                                regulator-boot-on;
+                               regulator-always-on;
                        };
 
+                       /* vdd_1p8 */
                        ldo4 {
-                               regulator-name = "vdd_1p8";
+                               regulator-name = "ldo4";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
                                regulator-boot-on;
+                               regulator-always-on;
                        };
                };
        };
@@ -426,12 +442,6 @@
                >;
        };
 
-       pinctrl_pmic: pmicgrp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3       0x41
-               >;
-       };
-
        pinctrl_uart2: uart2grp {
                fsl,pins = <
                        MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX     0x140