Commit 6f476520 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

ARM: dts: imx6qdl-aristainetos: Move regulators out of simple-bus

It is not recommended to place regulator nodes inside simple-bus, so
move them out in order to fix the following build warnings with W=1:

arch/arm/boot/dts/imx6dl-aristainetos_4.dtb: Warning (unit_address_vs_reg): Node /regulators/regulator@0 has a unit name, but no reg property
arch/arm/boot/dts/imx6dl-aristainetos_4.dtb: Warning (unit_address_vs_reg): Node /regulators/regulator@1 has a unit name, but no reg property
arch/arm/boot/dts/imx6dl-aristainetos_4.dtb: Warning (unit_address_vs_reg): Node /regulators/regulator@2 has a unit name, but no reg property
arch/arm/boot/dts/imx6dl-aristainetos_4.dtb: Warning (unit_address_vs_reg): Node /regulators/regulator@3 has a unit name, but no reg property
Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: default avatarHeiko Schocher <hs@denx.de>
Tested-by: default avatarHeiko Schocher <hs@denx.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 5489814d
...@@ -12,12 +12,8 @@ ...@@ -12,12 +12,8 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
/ { / {
regulators {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_2p5v: regulator@0 { reg_2p5v: regulator-2p5v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "2P5V"; regulator-name = "2P5V";
regulator-min-microvolt = <2500000>; regulator-min-microvolt = <2500000>;
...@@ -25,7 +21,7 @@ reg_2p5v: regulator@0 { ...@@ -25,7 +21,7 @@ reg_2p5v: regulator@0 {
regulator-always-on; regulator-always-on;
}; };
reg_3p3v: regulator@1 { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -33,7 +29,7 @@ reg_3p3v: regulator@1 { ...@@ -33,7 +29,7 @@ reg_3p3v: regulator@1 {
regulator-always-on; regulator-always-on;
}; };
reg_usbh1_vbus: regulator@2 { reg_usbh1_vbus: regulator-usbh1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
...@@ -44,7 +40,7 @@ reg_usbh1_vbus: regulator@2 { ...@@ -44,7 +40,7 @@ reg_usbh1_vbus: regulator@2 {
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
}; };
reg_usbotg_vbus: regulator@3 { reg_usbotg_vbus: regulator-usbotg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>; gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
...@@ -54,7 +50,6 @@ reg_usbotg_vbus: regulator@3 { ...@@ -54,7 +50,6 @@ reg_usbotg_vbus: regulator@3 {
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
}; };
};
}; };
&audmux { &audmux {
......
...@@ -52,10 +52,7 @@ backlight: backlight { ...@@ -52,10 +52,7 @@ backlight: backlight {
enable-gpios = <&gpio6 31 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio6 31 GPIO_ACTIVE_HIGH>;
}; };
regulators { reg_2p5v: regulator-2p5v {
compatible = "simple-bus";
reg_2p5v: 2p5v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "2P5V"; regulator-name = "2P5V";
regulator-min-microvolt = <2500000>; regulator-min-microvolt = <2500000>;
...@@ -63,7 +60,7 @@ reg_2p5v: 2p5v { ...@@ -63,7 +60,7 @@ reg_2p5v: 2p5v {
regulator-always-on; regulator-always-on;
}; };
reg_3p3v: 3p3v { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "3P3V"; regulator-name = "3P3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -71,7 +68,7 @@ reg_3p3v: 3p3v { ...@@ -71,7 +68,7 @@ reg_3p3v: 3p3v {
regulator-always-on; regulator-always-on;
}; };
reg_usbh1_vbus: usb-h1-vbus { reg_usbh1_vbus: regulator-usbh1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
...@@ -82,7 +79,7 @@ reg_usbh1_vbus: usb-h1-vbus { ...@@ -82,7 +79,7 @@ reg_usbh1_vbus: usb-h1-vbus {
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
}; };
reg_usbotg_vbus: usb-otg-vbus { reg_usbotg_vbus: regulator-usbotg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>; gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
...@@ -92,7 +89,6 @@ reg_usbotg_vbus: usb-otg-vbus { ...@@ -92,7 +89,6 @@ reg_usbotg_vbus: usb-otg-vbus {
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
}; };
};
}; };
&audmux { &audmux {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment