ARM: dts: at91: at91sam9x5dm.dtsi: Style cleanup

- 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-9-uwe@kleine-koenig.org
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/arch/arm/boot/dts/at91sam9x5dm.dtsi b/arch/arm/boot/dts/at91sam9x5dm.dtsi
index b04ebf1a31313bbe26ceb1b303f7b42179b1306f..7f00c1f57b901967ebcc6cbfb6508d73433c8039 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5dm.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5dm.dtsi
@@ -9,51 +9,6 @@
  */
 
 / {
-       ahb {
-               apb {
-                       i2c0: i2c@f8010000 {
-                               qt1070: keyboard@1b {
-                                       compatible = "qt1070";
-                                       reg = <0x1b>;
-                                       interrupt-parent = <&pioA>;
-                                       interrupts = <7 0x0>;
-                                       pinctrl-names = "default";
-                                       pinctrl-0 = <&pinctrl_qt1070_irq>;
-                                       wakeup-source;
-                               };
-                       };
-
-                       hlcdc: hlcdc@f8038000 {
-                               hlcdc-display-controller {
-                                       pinctrl-names = "default";
-                                       pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb888>;
-
-                                       port@0 {
-                                               hlcdc_panel_output: endpoint@0 {
-                                                       reg = <0>;
-                                                       remote-endpoint = <&panel_input>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       adc0: adc@f804c000 {
-                               atmel,adc-ts-wires = <4>;
-                               atmel,adc-ts-pressure-threshold = <10000>;
-                               status = "okay";
-                       };
-
-                       pinctrl@fffff400 {
-                               board {
-                                       pinctrl_qt1070_irq: qt1070_irq {
-                                               atmel,pins =
-                                                       <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
-                                       };
-                               };
-                       };
-               };
-       };
-
        backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&hlcdc_pwm 0 50000 0>;
@@ -98,3 +53,44 @@ panel_reg: panel_regulator {
                status = "disabled";
        };
 };
+
+&adc0 {
+       atmel,adc-ts-wires = <4>;
+       atmel,adc-ts-pressure-threshold = <10000>;
+       status = "okay";
+};
+
+&i2c0 {
+       keyboard@1b {
+               compatible = "qt1070";
+               reg = <0x1b>;
+               interrupt-parent = <&pioA>;
+               interrupts = <7 0x0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_qt1070_irq>;
+               wakeup-source;
+       };
+};
+
+&hlcdc {
+       hlcdc-display-controller {
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb888>;
+
+               port@0 {
+                       hlcdc_panel_output: endpoint@0 {
+                               reg = <0>;
+                               remote-endpoint = <&panel_input>;
+                       };
+               };
+       };
+};
+
+&pinctrl {
+       board {
+               pinctrl_qt1070_irq: qt1070_irq {
+                       atmel,pins =
+                               <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
+               };
+       };
+};