ARM: dts: at91: at91sam9xx5ek: Style cleanup

- newline between properties and sub-nodes
- use tags from included dtsi instead of duplicating the hierarchy

There are no differences in the generated .dtbs

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

diff --git a/arch/arm/boot/dts/at91sam9g15ek.dts b/arch/arm/boot/dts/at91sam9g15ek.dts
index 97100d2..889a509 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g15ek.dts
+++ b/arch/arm/boot/dts/at91sam9g15ek.dts
@@ -14,14 +14,6 @@
        model = "Atmel AT91SAM9G15-EK";
        compatible = "atmel,at91sam9g15ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
 
-       ahb {
-               apb {
-                       hlcdc: hlcdc@f8038000 {
-                               status = "okay";
-                       };
-               };
-       };
-
        backlight: backlight {
                status = "okay";
        };
@@ -38,3 +30,7 @@
                status = "okay";
        };
 };
+
+&hlcdc {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts
index a02c6c7..61b0bdb 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
@@ -12,57 +12,54 @@
 / {
        model = "Atmel AT91SAM9G25-EK";
        compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
+};
 
-       ahb {
-               apb {
-                       spi0: spi@f0000000 {
-                               status = "disabled";
-                       };
-
-                       mmc1: mmc@f000c000 {
-                               status = "disabled";
-                       };
-
-                       i2c0: i2c@f8010000 {
-                               ov2640: camera@30 {
-                                       compatible = "ovti,ov2640";
-                                       reg = <0x30>;
-                                       pinctrl-names = "default";
-                                       pinctrl-0 = <&pinctrl_pck0_as_isi_mck &pinctrl_sensor_power &pinctrl_sensor_reset>;
-                                       resetb-gpios = <&pioA 7 GPIO_ACTIVE_LOW>;
-                                       pwdn-gpios = <&pioA 13 GPIO_ACTIVE_HIGH>;
-                                       clocks = <&pmc PMC_TYPE_SYSTEM 8>;
-                                       clock-names = "xvclk";
-                                       assigned-clocks = <&pmc PMC_TYPE_SYSTEM 8>;
-                                       assigned-clock-rates = <25000000>;
-                                       status = "okay";
+&i2c0 {
+       camera@30 {
+               compatible = "ovti,ov2640";
+               reg = <0x30>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_pck0_as_isi_mck &pinctrl_sensor_power &pinctrl_sensor_reset>;
+               resetb-gpios = <&pioA 7 GPIO_ACTIVE_LOW>;
+               pwdn-gpios = <&pioA 13 GPIO_ACTIVE_HIGH>;
+               clocks = <&pmc PMC_TYPE_SYSTEM 8>;
+               clock-names = "xvclk";
+               assigned-clocks = <&pmc PMC_TYPE_SYSTEM 8>;
+               assigned-clock-rates = <25000000>;
+               status = "okay";
 
-                                       port {
-                                               ov2640_0: endpoint {
-                                                       remote-endpoint = <&isi_0>;
-                                                       bus-width = <8>;
-                                               };
-                                       };
-                               };
+               port {
+                       ov2640_0: endpoint {
+                               remote-endpoint = <&isi_0>;
+                               bus-width = <8>;
                        };
+               };
+       };
+};
 
-                       macb0: ethernet@f802c000 {
-                               phy-mode = "rmii";
-                               status = "okay";
-                       };
+&isi {
+       status = "okay";
 
-                       isi: isi@f8048000 {
-                               status = "okay";
-                               port {
-                                       isi_0: endpoint@0 {
-                                               reg = <0>;
-                                               remote-endpoint = <&ov2640_0>;
-                                               bus-width = <8>;
-                                               vsync-active = <1>;
-                                               hsync-active = <1>;
-                                       };
-                               };
-                       };
+       port {
+               isi_0: endpoint@0 {
+                       reg = <0>;
+                       remote-endpoint = <&ov2640_0>;
+                       bus-width = <8>;
+                       vsync-active = <1>;
+                       hsync-active = <1>;
                };
        };
 };
+
+&macb0 {
+       phy-mode = "rmii";
+       status = "okay";
+};
+
+&mmc1 {
+       status = "disabled";
+};
+
+&spi0 {
+       status = "disabled";
+};

diff --git a/arch/arm/boot/dts/at91sam9g35ek.dts b/arch/arm/boot/dts/at91sam9g35ek.dts
index 449ec71..f966b56 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g35ek.dts
+++ b/arch/arm/boot/dts/at91sam9g35ek.dts
@@ -14,19 +14,6 @@
        model = "Atmel AT91SAM9G35-EK";
        compatible = "atmel,at91sam9g35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
 
-       ahb {
-               apb {
-                       macb0: ethernet@f802c000 {
-                               phy-mode = "rmii";
-                               status = "okay";
-                       };
-
-                       hlcdc: hlcdc@f8038000 {
-                               status = "okay";
-                       };
-               };
-       };
-
        backlight: backlight {
                status = "okay";
        };
@@ -43,3 +30,12 @@
                status = "okay";
        };
 };
+
+&hlcdc {
+       status = "okay";
+};
+
+&macb0 {
+       phy-mode = "rmii";
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/at91sam9x25ek.dts b/arch/arm/boot/dts/at91sam9x25ek.dts
index 4e1c3df..ad7c6b3 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x25ek.dts
+++ b/arch/arm/boot/dts/at91sam9x25ek.dts
@@ -12,28 +12,24 @@
 / {
        model = "Atmel AT91SAM9X25-EK";
        compatible = "atmel,at91sam9x25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
+};
 
-       ahb {
-               apb {
-                       can1: can@f8004000 {
-                               status = "okay";
-                       };
+&can1 {
+       status = "okay";
+};
 
-                       macb0: ethernet@f802c000 {
-                               phy-mode = "rmii";
-                               status = "okay";
-                       };
+&macb0 {
+       phy-mode = "rmii";
+       status = "okay";
+};
 
-                       macb1: ethernet@f8030000 {
-                               phy-mode = "rmii";
-                               status = "okay";
-                       };
+&macb1 {
+       phy-mode = "rmii";
+       status = "okay";
+};
 
-                       pwm0: pwm@f8034000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_pwm0_pwm0_1>;
-                               status = "okay";
-                       };
-               };
-       };
+&pwm0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm0_pwm0_1>;
+       status = "okay";
 };

diff --git a/arch/arm/boot/dts/at91sam9x35ek.dts b/arch/arm/boot/dts/at91sam9x35ek.dts
index 7646c68..66675c7 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x35ek.dts
+++ b/arch/arm/boot/dts/at91sam9x35ek.dts
@@ -13,32 +13,29 @@
 / {
        model = "Atmel AT91SAM9X35-EK";
        compatible = "atmel,at91sam9x35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
+};
 
-       ahb {
-               apb {
-                       macb0: ethernet@f802c000 {
-                               phy-mode = "rmii";
-                               status = "okay";
-                       };
-                       hlcdc: hlcdc@f8038000 {
-                               status = "okay";
-                       };
-               };
-       };
+&backlight {
+       status = "okay";
+};
 
-       backlight: backlight {
-               status = "okay";
-       };
+&bl_reg {
+       status = "okay";
+};
 
-       bl_reg: backlight_regulator {
-               status = "okay";
-       };
+&hlcdc {
+       status = "okay";
+};
 
-       panel: panel {
-               status = "okay";
-       };
+&macb0 {
+       phy-mode = "rmii";
+       status = "okay";
+};
+
+&panel {
+       status = "okay";
+};
 
-       panel_reg: panel_regulator {
-               status = "okay";
-       };
+&panel_reg {
+       status = "okay";
 };

diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 2ad0a43..c934928 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -16,139 +16,6 @@
                stdout-path = "serial0:115200n8";
        };
 
-       ahb {
-               apb {
-                       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>;
-                               };
-                       };
-
-                       mmc1: mmc@f000c000 {
-                               pinctrl-0 = <
-                                       &pinctrl_board_mmc1
-                                       &pinctrl_mmc1_slot0_clk_cmd_dat0
-                                       &pinctrl_mmc1_slot0_dat1_3>;
-                               status = "okay";
-                               slot@0 {
-                                       reg = <0>;
-                                       bus-width = <4>;
-                                       cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
-                               };
-                       };
-
-                       dbgu: serial@fffff200 {
-                               status = "okay";
-                       };
-
-                       usart0: serial@f801c000 {
-                               atmel,use-dma-rx;
-                               atmel,use-dma-tx;
-                               status = "okay";
-                       };
-
-                       usb2: gadget@f803c000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_board_usb2>;
-                               atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
-                               status = "okay";
-                       };
-
-                       i2c0: i2c@f8010000 {
-                               status = "okay";
-
-                               wm8731: wm8731@1a {
-                                       compatible = "wm8731";
-                                       reg = <0x1a>;
-                               };
-                       };
-
-                       adc0: adc@f804c000 {
-                               atmel,adc-ts-wires = <4>;
-                               atmel,adc-ts-pressure-threshold = <10000>;
-                               status = "okay";
-                       };
-
-                       pinctrl@fffff400 {
-                               camera_sensor {
-                                       pinctrl_pck0_as_isi_mck: pck0_as_isi_mck-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOC 15 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* ISI_MCK */
-                                       };
-
-                                       pinctrl_sensor_power: sensor_power-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOA 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
-                                       };
-
-                                       pinctrl_sensor_reset: sensor_reset-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
-                                       };
-                               };
-
-                               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 */
-                                       };
-                               };
-
-                               mmc1 {
-                                       pinctrl_board_mmc1: mmc1-board {
-                                               atmel,pins =
-                                                       <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;  /* PD14 gpio CD pin pull up and deglitch */
-                                       };
-                               };
-
-                               usb2 {
-                                       pinctrl_board_usb2: usb2-board {
-                                               atmel,pins =
-                                                       <AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;          /* PB16 gpio vbus sense, deglitch */
-                                       };
-                               };
-                       };
-
-                       spi0: spi@f0000000 {
-                               status = "disabled"; /* conflicts with mmc1 */
-                               cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
-                               m25p80@0 {
-                                       compatible = "atmel,at25df321a";
-                                       spi-max-frequency = <50000000>;
-                                       reg = <0>;
-                               };
-                       };
-
-                       watchdog@fffffe40 {
-                               status = "okay";
-                       };
-
-                       ssc0: ssc@f0010000 {
-                               status = "okay";
-                       };
-               };
-
-               usb0: ohci@600000 {
-                       status = "okay";
-                       num-ports = <3>;
-                       atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */
-                                          &pioD 19 GPIO_ACTIVE_LOW
-                                          &pioD 20 GPIO_ACTIVE_LOW
-                                         >;
-               };
-
-               usb1: ehci@700000 {
-                       status = "okay";
-               };
-       };
-
        sound {
                compatible = "atmel,sam9x5-wm8731-audio";
 
@@ -164,3 +31,135 @@
                atmel,audio-codec = <&wm8731>;
        };
 };
+
+&adc0 {
+       atmel,adc-ts-wires = <4>;
+       atmel,adc-ts-pressure-threshold = <10000>;
+       status = "okay";
+};
+
+&dbgu {
+       status = "okay";
+};
+
+&i2c0 {
+       status = "okay";
+
+       wm8731: wm8731@1a {
+               compatible = "wm8731";
+               reg = <0x1a>;
+       };
+};
+
+&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>;
+       };
+};
+
+&mmc1 {
+       pinctrl-0 = <
+               &pinctrl_board_mmc1
+               &pinctrl_mmc1_slot0_clk_cmd_dat0
+               &pinctrl_mmc1_slot0_dat1_3>;
+       status = "okay";
+
+       slot@0 {
+               reg = <0>;
+               bus-width = <4>;
+               cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
+       };
+};
+
+&pinctrl {
+       camera_sensor {
+               pinctrl_pck0_as_isi_mck: pck0_as_isi_mck-0 {
+                       atmel,pins =
+                               <AT91_PIOC 15 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* ISI_MCK */
+               };
+
+               pinctrl_sensor_power: sensor_power-0 {
+                       atmel,pins =
+                               <AT91_PIOA 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+
+               pinctrl_sensor_reset: sensor_reset-0 {
+                       atmel,pins =
+                               <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+       };
+
+       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 */
+               };
+       };
+
+       mmc1 {
+               pinctrl_board_mmc1: mmc1-board {
+                       atmel,pins =
+                               <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;  /* PD14 gpio CD pin pull up and deglitch */
+               };
+       };
+
+       usb2 {
+               pinctrl_board_usb2: usb2-board {
+                       atmel,pins =
+                               <AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;          /* PB16 gpio vbus sense, deglitch */
+               };
+       };
+};
+
+&spi0 {
+       cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
+       status = "disabled"; /* conflicts with mmc1 */
+
+       m25p80@0 {
+               compatible = "atmel,at25df321a";
+               spi-max-frequency = <50000000>;
+               reg = <0>;
+       };
+};
+
+&ssc0 {
+       status = "okay";
+};
+
+&usart0 {
+       atmel,use-dma-rx;
+       atmel,use-dma-tx;
+       status = "okay";
+};
+
+&usb0 {
+       num-ports = <3>;
+       atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */
+                          &pioD 19 GPIO_ACTIVE_LOW
+                          &pioD 20 GPIO_ACTIVE_LOW
+                         >;
+       status = "okay";
+};
+
+&usb1 {
+       status = "okay";
+};
+
+&usb2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_board_usb2>;
+       atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
+       status = "okay";
+};
+
+&watchdog {
+       status = "okay";
+};