ARM: dts: at91: sam9x60ek: remove simple-bus for regulators

Keep regulators as individual devices. There is no need to have them
under simple bus. This will throw compilation warnings like:
- unnecessary #address-cells/#size-cells without "ranges" or child "reg"
property.
- node has a unit name, but no reg or ranges property.

While at it move it down a bit in the file to keep entries sorted
alphabetically.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220826083927.3107272-10-claudiu.beznea@microchip.com

diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
index 81c38e101f586d6e7c12536a5b003d8f92904b4b..7ade9979e1c6a590778dd1f612ba159df110afbe 100644 (file)
--- a/arch/arm/boot/dts/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
@@ -34,48 +34,6 @@
                };
        };
 
-       regulators: regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               vdd_1v8: fixed-regulator-vdd_1v8@0 {
-                       compatible = "regulator-fixed";
-                       regulator-name = "VDD_1V8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-                       status = "okay";
-               };
-
-               vdd_1v15: fixed-regulator-vdd_1v15@1 {
-                       compatible = "regulator-fixed";
-                       regulator-name = "VDD_1V15";
-                       regulator-min-microvolt = <1150000>;
-                       regulator-max-microvolt = <1150000>;
-                       regulator-always-on;
-                       status = "okay";
-               };
-
-               vdd1_3v3: fixed-regulator-vdd1_3v3@2 {
-                       compatible = "regulator-fixed";
-                       regulator-name = "VDD1_3V3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       status = "okay";
-               };
-
-               vdd2_3v3: regulator-fixed-vdd2_3v3@3 {
-                       compatible = "regulator-fixed";
-                       regulator-name = "VDD2_3V3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       status = "okay";
-               };
-       };
-
        gpio-keys {
                compatible = "gpio-keys";
                pinctrl-names = "default";
@@ -111,6 +69,42 @@
                        linux,default-trigger = "heartbeat";
                };
        };
+
+       vdd_1v8: fixed-regulator-vdd_1v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_1V8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+               status = "okay";
+       };
+
+       vdd_1v15: fixed-regulator-vdd_1v15 {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_1V15";
+               regulator-min-microvolt = <1150000>;
+               regulator-max-microvolt = <1150000>;
+               regulator-always-on;
+               status = "okay";
+       };
+
+       vdd1_3v3: fixed-regulator-vdd1_3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD1_3V3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               status = "okay";
+       };
+
+       vdd2_3v3: regulator-fixed-vdd2_3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD2_3V3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               status = "okay";
+       };
 };
 
 &adc {