Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / freescale / imx8mm-beacon-som.dtsi

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi
index 94911b1707ef238b5f89253e9c52077bce6e7845..6de86a4f0ec4177ae39fd4b4c58cd690f0a66faf 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi
@@ -74,12 +74,12 @@
                reg = <0x4b>;
                pinctrl-0 = <&pinctrl_pmic>;
                interrupt-parent = <&gpio1>;
-               interrupts = <3 GPIO_ACTIVE_LOW>;
+               interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
                rohm,reset-snvs-powered;
 
                regulators {
                        buck1_reg: BUCK1 {
-                               regulator-name = "BUCK1";
+                               regulator-name = "buck1";
                                regulator-min-microvolt = <700000>;
                                regulator-max-microvolt = <1300000>;
                                regulator-boot-on;
@@ -88,7 +88,7 @@
                        };
 
                        buck2_reg: BUCK2 {
-                               regulator-name = "BUCK2";
+                               regulator-name = "buck2";
                                regulator-min-microvolt = <700000>;
                                regulator-max-microvolt = <1300000>;
                                regulator-boot-on;
@@ -100,7 +100,7 @@
 
                        buck3_reg: BUCK3 {
                                // BUCK5 in datasheet
-                               regulator-name = "BUCK3";
+                               regulator-name = "buck3";
                                regulator-min-microvolt = <700000>;
                                regulator-max-microvolt = <1350000>;
                                regulator-boot-on;
@@ -109,7 +109,7 @@
 
                        buck4_reg: BUCK4 {
                                // BUCK6 in datasheet
-                               regulator-name = "BUCK4";
+                               regulator-name = "buck4";
                                regulator-min-microvolt = <3000000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-boot-on;
@@ -118,7 +118,7 @@
 
                        buck5_reg: BUCK5 {
                                // BUCK7 in datasheet
-                               regulator-name = "BUCK5";
+                               regulator-name = "buck5";
                                regulator-min-microvolt = <1605000>;
                                regulator-max-microvolt = <1995000>;
                                regulator-boot-on;
@@ -127,7 +127,7 @@
 
                        buck6_reg: BUCK6 {
                                // BUCK8 in datasheet
-                               regulator-name = "BUCK6";
+                               regulator-name = "buck6";
                                regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <1400000>;
                                regulator-boot-on;
@@ -135,7 +135,7 @@
                        };
 
                        ldo1_reg: LDO1 {
-                               regulator-name = "LDO1";
+                               regulator-name = "ldo1";
                                regulator-min-microvolt = <1600000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-boot-on;
@@ -143,7 +143,7 @@
                        };
 
                        ldo2_reg: LDO2 {
-                               regulator-name = "LDO2";
+                               regulator-name = "ldo2";
                                regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <900000>;
                                regulator-boot-on;
@@ -151,7 +151,7 @@
                        };
 
                        ldo3_reg: LDO3 {
-                               regulator-name = "LDO3";
+                               regulator-name = "ldo3";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-boot-on;
@@ -159,7 +159,7 @@
                        };
 
                        ldo4_reg: LDO4 {
-                               regulator-name = "LDO4";
+                               regulator-name = "ldo4";
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1800000>;
                                regulator-boot-on;
@@ -167,7 +167,7 @@
                        };
 
                        ldo6_reg: LDO6 {
-                               regulator-name = "LDO6";
+                               regulator-name = "ldo6";
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1800000>;
                                regulator-boot-on;
@@ -184,7 +184,7 @@
        status = "okay";
 
        eeprom@50 {
-               compatible = "microchip, at24c64d", "atmel,24c64";
+               compatible = "microchip,24c64", "atmel,24c64";
                pagesize = <32>;
                read-only;      /* Manufacturing EEPROM programmed at factory */
                reg = <0x50>;
@@ -290,9 +290,9 @@
                        >;
                };
 
-               pinctrl_pmic: pmicirq {
+               pinctrl_pmic: pmicirqgrp {
                        fsl,pins = <
-                               MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3               0x41
+                               MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3       0x141
                        >;
                };
 
@@ -309,7 +309,7 @@
                        >;
                };
 
-               pinctrl_usdhc1_gpio: usdhc1grpgpio {
+               pinctrl_usdhc1_gpio: usdhc1gpiogrp {
                        fsl,pins = <
                                MX8MM_IOMUXC_SD1_RESET_B_GPIO2_IO10     0x41
                        >;
@@ -326,7 +326,7 @@
                        >;
                };
 
-               pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
+               pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp {
                        fsl,pins = <
                                MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x194
                                MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d4
@@ -337,7 +337,7 @@
                        >;
                };
 
-               pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
+               pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp {
                        fsl,pins = <
                                MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x196
                                MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d6
@@ -364,7 +364,7 @@
                        >;
                };
 
-               pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
+               pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
                        fsl,pins = <
                                MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x194
                                MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d4
@@ -380,7 +380,7 @@
                        >;
                };
 
-               pinctrl_usdhc3_200mhz: usdhc3grp200mhz {
+               pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
                        fsl,pins = <
                                MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x196
                                MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d6