ARM: dts: imx6sx: add missing cells and move nodes

This fix below compilation warnings by,
1) Moving the sub nodes to regulator node.
2) Added address-cells and size-cells in regulator node.

Warning (reg_format): /regulator@1:reg: property has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1)
Warning (reg_format): /regulator@2:reg: property has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1)
Warning (reg_format): /regulator@3:reg: property has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1)
Warning (reg_format): /regulator@7:reg: property has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1)
Warning (reg_format): /regulator@9:reg: property has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1)
Warning (reg_format): /regulator@10:reg: property has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1)

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index 15933c7..e163c7f 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -54,116 +54,122 @@
                status = "okay";
        };
 
-       reg_audio: cs42888_supply {
-               compatible = "regulator-fixed";
-               regulator-name = "cs42888_supply";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-always-on;
-       };
-
-       si4763_vio1: vio1_tnr {
-               compatible = "regulator-fixed";
-               regulator-name = "vio1";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-always-on;
-       };
-
-       si4763_vio2: vio2_tnr {
-               compatible = "regulator-fixed";
-               regulator-name = "vio2";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-always-on;
-       };
-
-       si4763_vd: f3v3_tnr {
-               compatible = "regulator-fixed";
-               regulator-name = "vd";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-always-on;
-       };
-
-       si4763_va: f5v_tnr {
-               compatible = "regulator-fixed";
-               regulator-name = "va";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-       };
-
-       vcc_sd3: regulator-vcc-sd3 {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_vcc_sd3>;
-               regulator-name = "VCC_SD3";
-               regulator-min-microvolt = <3000000>;
-               regulator-max-microvolt = <3000000>;
-               gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
-       reg_usb_otg1_vbus: usb_otg1_vbus {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_usb_otg1_vbus>;
-               regulator-name = "usb_otg1_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&gpio1 9 0>;
-               enable-active-high;
-       };
-
-       reg_usb_otg2_vbus: usb_otg2_vbus {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_usb_otg2_vbus>;
-               regulator-name = "usb_otg2_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&gpio1 12 0>;
-               enable-active-high;
-       };
-
-       reg_can_wake: regulator@1 {
-               compatible = "regulator-fixed";
-               reg = <1>;
-               regulator-name = "can-wake";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&max7310_b 7 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
-       reg_can_en: regulator@2 {
-               compatible = "regulator-fixed";
-               reg = <2>;
-               regulator-name = "can-en";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&max7310_b 5 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               vin-supply = <&reg_can_wake>;
-       };
-
-       reg_can_stby: regulator@3 {
-               compatible = "regulator-fixed";
-               reg = <3>;
-               regulator-name = "can-stby";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&max7310_b 4 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               vin-supply = <&reg_can_en>;
-       };
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       reg_vref_3v3: regulator@4 {
-               compatible = "regulator-fixed";
-               regulator-name = "vref-3v3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
+               reg_audio: cs42888_supply {
+                       compatible = "regulator-fixed";
+                       regulator-name = "cs42888_supply";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               si4763_vio1: vio1_tnr {
+                       compatible = "regulator-fixed";
+                       regulator-name = "vio1";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               si4763_vio2: vio2_tnr {
+                       compatible = "regulator-fixed";
+                       regulator-name = "vio2";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               si4763_vd: f3v3_tnr {
+                       compatible = "regulator-fixed";
+                       regulator-name = "vd";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               si4763_va: f5v_tnr {
+                       compatible = "regulator-fixed";
+                       regulator-name = "va";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       regulator-always-on;
+               };
+
+               vcc_sd3: regulator-vcc-sd3 {
+                       compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_vcc_sd3>;
+                       regulator-name = "VCC_SD3";
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+                       gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+
+               reg_usb_otg1_vbus: usb_otg1_vbus {
+                       compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb_otg1_vbus>;
+                       regulator-name = "usb_otg1_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio1 9 0>;
+                       enable-active-high;
+               };
+
+               reg_usb_otg2_vbus: usb_otg2_vbus {
+                       compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb_otg2_vbus>;
+                       regulator-name = "usb_otg2_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio1 12 0>;
+                       enable-active-high;
+               };
+
+               reg_can_wake: regulator@1 {
+                       compatible = "regulator-fixed";
+                       reg = <1>;
+                       regulator-name = "can-wake";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&max7310_b 7 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+
+               reg_can_en: regulator@2 {
+                       compatible = "regulator-fixed";
+                       reg = <2>;
+                       regulator-name = "can-en";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&max7310_b 5 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+                       vin-supply = <&reg_can_wake>;
+               };
+
+               reg_can_stby: regulator@3 {
+                       compatible = "regulator-fixed";
+                       reg = <3>;
+                       regulator-name = "can-stby";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&max7310_b 4 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+                       vin-supply = <&reg_can_en>;
+               };
+
+               reg_vref_3v3: regulator@4 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "vref-3v3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+               };
        };
 
        sound-cs42888 {

diff --git a/arch/arm/boot/dts/imx6sx-sdb-reva.dts b/arch/arm/boot/dts/imx6sx-sdb-reva.dts
index da8e8c8..4809672 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb-reva.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb-reva.dts
@@ -12,16 +12,18 @@
 / {
        model = "Freescale i.MX6 SoloX SDB RevA Board";
 
-       /* Transceiver EN/STBY is active high on RevA board */
-       reg_can_en: regulator@9 {
-               gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
+       regulators {
+               /* Transceiver EN/STBY is active high on RevA board */
+               reg_can_en: regulator@9 {
+                       gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
 
-       reg_can_stby: regulator@10 {
-               gpio = <&gpio4 27 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               vin-supply = <&reg_can_en>;
+               reg_can_stby: regulator@10 {
+                       gpio = <&gpio4 27 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+                       vin-supply = <&reg_can_en>;
+               };
        };
 };
 

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index 37682ff..ca02fdb 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -11,9 +11,11 @@
 / {
        model = "Freescale i.MX6 SoloX SDB RevB Board";
 
-       /* Transceiver EN/STBY is active low on RevB board */
-       reg_can_stby: regulator@10 {
-               gpio = <&gpio4 27 GPIO_ACTIVE_LOW>;
+       regulators {
+               /* Transceiver EN/STBY is active low on RevB board */
+               reg_can_stby: regulator@10 {
+                       gpio = <&gpio4 27 GPIO_ACTIVE_LOW>;
+               };
        };
 };
 

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index 37c5177..c6c2373 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -82,104 +82,116 @@
                status = "okay";
        };
 
-       reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_usb_otg1>;
-               regulator-name = "usb_otg1_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_usb_otg2>;
-               regulator-name = "usb_otg2_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
+               reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
+                       compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb_otg1>;
+                       regulator-name = "usb_otg1_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
 
-       reg_psu_5v: regulator-psu-5v {
-               compatible = "regulator-fixed";
-               regulator-name = "PSU-5V0";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-       };
+               reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
+                       compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb_otg2>;
+                       regulator-name = "usb_otg2_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
 
-       reg_lcd_3v3: regulator-lcd-3v3 {
-               compatible = "regulator-fixed";
-               regulator-name = "lcd-3v3";
-               gpio = <&gpio3 27 0>;
-               enable-active-high;
-       };
+               reg_psu_5v: regulator-psu-5v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "PSU-5V0";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+               };
 
-       reg_peri_3v3: regulator-peri-3v3 {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_peri_3v3>;
-               regulator-name = "peri_3v3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               regulator-always-on;
-       };
+               reg_lcd_3v3: regulator-lcd-3v3 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "lcd-3v3";
+                       gpio = <&gpio3 27 0>;
+                       enable-active-high;
+               };
 
-       reg_enet_3v3: regulator-enet-3v3 {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_enet_3v3>;
-               regulator-name = "enet_3v3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
-       };
+               reg_peri_3v3: regulator-peri-3v3 {
+                       compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_peri_3v3>;
+                       regulator-name = "peri_3v3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+                       regulator-always-on;
+               };
 
-       reg_vref_3v3: regulator@7 {
-               compatible = "regulator-fixed";
-               reg = <7>;
-               regulator-name = "vref-3v3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-       };
+               reg_enet_3v3: regulator-enet-3v3 {
+                       compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_enet_3v3>;
+                       regulator-name = "enet_3v3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
+               };
 
-       reg_pcie_gpio: regulator-pcie-gpio {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_pcie_reg>;
-               regulator-name = "MPCIE_3V3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio2 1 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
+               reg_vref_3v3: regulator@7 {
+                       compatible = "regulator-fixed";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <7>;
+                       regulator-name = "vref-3v3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+               };
 
-       reg_lcd_5v: regulator-lcd-5v {
-               compatible = "regulator-fixed";
-               regulator-name = "lcd-5v0";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-       };
+               reg_pcie_gpio: regulator-pcie-gpio {
+                       compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_pcie_reg>;
+                       regulator-name = "MPCIE_3V3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
 
-       reg_can_en: regulator@9 {
-               compatible = "regulator-fixed";
-               reg = <9>;
-               regulator-name = "can-en";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-       };
+               reg_lcd_5v: regulator-lcd-5v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "lcd-5v0";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+               };
 
-       reg_can_stby: regulator@10 {
-               compatible = "regulator-fixed";
-               reg = <10>;
-               regulator-name = "can-stby";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
+               reg_can_en: regulator@9 {
+                       compatible = "regulator-fixed";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <9>;
+                       regulator-name = "can-en";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+               };
+
+               reg_can_stby: regulator@10 {
+                       compatible = "regulator-fixed";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <10>;
+                       regulator-name = "can-stby";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+               };
        };
 
        sound {