ARM: dts: at91: cosino: Style cleanup

- newline between properties and sub-nodes
- use tags from included dtsi instead of duplicating the hierarchy
- status should be the last property

There are no differences in the generated .dtb

Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Link: https://lore.kernel.org/r/20190812212757.23432-4-uwe@kleine-koenig.org
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/arch/arm/boot/dts/at91-cosino.dtsi b/arch/arm/boot/dts/at91-cosino.dtsi
index 47721c9..feebd54 100644 (file)
--- a/arch/arm/boot/dts/at91-cosino.dtsi
+++ b/arch/arm/boot/dts/at91-cosino.dtsi
@@ -33,122 +33,119 @@
                        clock-frequency = <12000000>;
                };
        };
+};
 
-       ahb {
-               apb {
-                       tcb0: timer@f8008000 {
-                               timer@0 {
-                                       compatible = "atmel,tcb-timer";
-                                       reg = <0>;
-                               };
+&adc0 {
+       atmel,adc-ts-wires = <4>;
+       atmel,adc-ts-pressure-threshold = <10000>;
+       status = "okay";
+};
+
+&dbgu {
+       status = "okay";
+};
 
-                               timer@1 {
-                                       compatible = "atmel,tcb-timer";
-                                       reg = <1>;
+&ebi {
+       pinctrl-0 = <&pinctrl_ebi_addr_nand
+                    &pinctrl_ebi_data_0_7>;
+       pinctrl-names = "default";
+       status = "okay";
+
+       nand-controller {
+               pinctrl-0 = <&pinctrl_nand_oe_we
+                            &pinctrl_nand_cs
+                            &pinctrl_nand_rb>;
+               pinctrl-names = "default";
+               status = "okay";
+
+               nand@3 {
+                       reg = <0x3 0x0 0x800000>;
+                       rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
+                       cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
+                       nand-bus-width = <8>;
+                       nand-ecc-mode = "hw";
+                       nand-ecc-strength = <4>;
+                       nand-ecc-step-size = <512>;
+                       nand-on-flash-bbt;
+                       label = "atmel_nand";
+
+                       partitions {
+                               compatible = "fixed-partitions";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               at91bootstrap@0 {
+                                       label = "at91bootstrap";
+                                       reg = <0x0 0x40000>;
                                };
-                       };
 
-                       mmc0: mmc@f0008000 {
-                               pinctrl-0 = <
-                                       &pinctrl_board_mmc0
-                                       &pinctrl_mmc0_slot0_clk_cmd_dat0
-                                       &pinctrl_mmc0_slot0_dat1_3>;
-                               status = "okay";
-                               slot@0 {
-                                       reg = <0>;
-                                       bus-width = <4>;
-                                       cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
+                               uboot@40000 {
+                                       label = "u-boot";
+                                       reg = <0x40000 0x80000>;
                                };
-                       };
 
-                       dbgu: serial@fffff200 {
-                               status = "okay";
-                       };
+                               ubootenv@c0000 {
+                                       label = "U-Boot Env";
+                                       reg = <0xc0000 0x140000>;
+                               };
 
-                       usart0: serial@f801c000 {
-                               status = "okay";
-                       };
+                               kernel@200000 {
+                                       label = "kernel";
+                                       reg = <0x200000 0x600000>;
+                               };
 
-                       i2c0: i2c@f8010000 {
-                               status = "okay";
+                               rootfs@800000 {
+                                       label = "rootfs";
+                                       reg = <0x800000 0x0f800000>;
+                               };
                        };
+               };
+       };
+};
 
-                       adc0: adc@f804c000 {
-                               atmel,adc-ts-wires = <4>;
-                               atmel,adc-ts-pressure-threshold = <10000>;
-                               status = "okay";
-                       };
+&i2c0 {
+       status = "okay";
+};
 
-                       pinctrl@fffff400 {
-                               mmc0 {
-                                       pinctrl_board_mmc0: mmc0-board {
-                                               atmel,pins =
-                                                       <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;  /* PD15 gpio CD pin pull up and deglitch */
-                                       };
-                               };
-                       };
+&mmc0 {
+       pinctrl-0 = <
+               &pinctrl_board_mmc0
+               &pinctrl_mmc0_slot0_clk_cmd_dat0
+               &pinctrl_mmc0_slot0_dat1_3>;
+       status = "okay";
+
+       slot@0 {
+               reg = <0>;
+               bus-width = <4>;
+               cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
+       };
+};
 
-                       watchdog@fffffe40 {
-                               status = "okay";
-                       };
+&pinctrl {
+       mmc0 {
+               pinctrl_board_mmc0: mmc0-board {
+                       atmel,pins =
+                               <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;  /* PD15 gpio CD pin pull up and deglitch */
                };
+       };
+};
 
-               ebi: ebi@10000000 {
-                       pinctrl-0 = <&pinctrl_ebi_addr_nand
-                                    &pinctrl_ebi_data_0_7>;
-                       pinctrl-names = "default";
-                       status = "okay";
-
-                       nand_controller: nand-controller {
-                               status = "okay";
-                               pinctrl-0 = <&pinctrl_nand_oe_we
-                                            &pinctrl_nand_cs
-                                            &pinctrl_nand_rb>;
-                               pinctrl-names = "default";
-
-                               nand@3 {
-                                       reg = <0x3 0x0 0x800000>;
-                                       rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
-                                       cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
-                                       nand-bus-width = <8>;
-                                       nand-ecc-mode = "hw";
-                                       nand-ecc-strength = <4>;
-                                       nand-ecc-step-size = <512>;
-                                       nand-on-flash-bbt;
-                                       label = "atmel_nand";
-
-                                       partitions {
-                                               compatible = "fixed-partitions";
-                                               #address-cells = <1>;
-                                               #size-cells = <1>;
-
-                                               at91bootstrap@0 {
-                                                       label = "at91bootstrap";
-                                                       reg = <0x0 0x40000>;
-                                               };
-
-                                               uboot@40000 {
-                                                       label = "u-boot";
-                                                       reg = <0x40000 0x80000>;
-                                               };
-
-                                               ubootenv@c0000 {
-                                                       label = "U-Boot Env";
-                                                       reg = <0xc0000 0x140000>;
-                                               };
-
-                                               kernel@200000 {
-                                                       label = "kernel";
-                                                       reg = <0x200000 0x600000>;
-                                               };
-
-                                               rootfs@800000 {
-                                                       label = "rootfs";
-                                                       reg = <0x800000 0x0f800000>;
-                                               };
-                                       };
-                               };
-                       };
-               };
+&tcb0 {
+       timer@0 {
+               compatible = "atmel,tcb-timer";
+               reg = <0>;
+       };
+
+       timer@1 {
+               compatible = "atmel,tcb-timer";
+               reg = <1>;
        };
 };
+
+&usart0 {
+       status = "okay";
+};
+
+&watchdog {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/at91-cosino_mega2560.dts b/arch/arm/boot/dts/at91-cosino_mega2560.dts
index 8fde06a..73e88d1 100644 (file)
--- a/arch/arm/boot/dts/at91-cosino_mega2560.dts
+++ b/arch/arm/boot/dts/at91-cosino_mega2560.dts
@@ -17,61 +17,58 @@
 / {
        model = "HCE Cosino Mega 2560";
        compatible = "hce,cosino_mega2560", "atmel,at91sam9x5", "atmel,at91sam9";
+};
+
+&adc0 {
+       atmel,adc-ts-wires = <4>;
+       atmel,adc-ts-pressure-threshold = <10000>;
+       status = "okay";
+};
 
-       ahb {
-               apb {
-                       macb0: ethernet@f802c000 {
-                               phy-mode = "rmii";
-                               status = "okay";
-                       };
+&macb0 {
+       phy-mode = "rmii";
+       status = "okay";
+};
 
-                       adc0: adc@f804c000 {
-                               atmel,adc-ts-wires = <4>;
-                               atmel,adc-ts-pressure-threshold = <10000>;
-                               status = "okay";
-                       };
+&mmc1 {
+       pinctrl-0 = <
+               &pinctrl_mmc1_slot0_clk_cmd_dat0
+               &pinctrl_mmc1_slot0_dat1_3>;
+       status = "okay";
 
-                       rtc@fffffeb0 {
-                               status = "okay";
-                       };
+       slot@0 {
+               reg = <0>;
+               bus-width = <4>;
+               non-removable;
+       };
+};
 
-                       usart1: serial@f8020000 {
-                               status = "okay";
-                       };
+&rtc {
+       status = "okay";
+};
 
-                       usart2: serial@f8024000 {
-                               status = "okay";
-                       };
+&usart1 {
+       status = "okay";
+};
 
-                       usb2: gadget@f803c000 {
-                               atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
-                               status = "okay";
-                       };
+&usart2 {
+       status = "okay";
+};
 
-                       mmc1: mmc@f000c000 {
-                               pinctrl-0 = <
-                                       &pinctrl_mmc1_slot0_clk_cmd_dat0
-                                       &pinctrl_mmc1_slot0_dat1_3>;
-                               status = "okay";
-                               slot@0 {
-                                       reg = <0>;
-                                       bus-width = <4>;
-                                       non-removable;
-                               };
-                       };
-               };
+&usb0 {
+       num-ports = <3>;
+       atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW */
+                          &pioD 19 GPIO_ACTIVE_LOW
+                          &pioD 20 GPIO_ACTIVE_LOW
+                         >;
+       status = "okay";
+};
 
-               usb0: ohci@600000 {
-                       status = "okay";
-                       num-ports = <3>;
-                       atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW */
-                                          &pioD 19 GPIO_ACTIVE_LOW
-                                          &pioD 20 GPIO_ACTIVE_LOW
-                                         >;
-               };
+&usb1 {
+       status = "okay";
+};
 
-               usb1: ehci@700000 {
-                       status = "okay";
-               };
-       };
+&usb2 {
+       atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
+       status = "okay";
 };