Merge tag 'at91-5.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt

AT91 DT for 5.4

 - style cleanup for at91sam9x5 based boards
 - avoid colliding node and property names

* tag 'at91-5.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: at91sam9x5dm.dtsi: Style cleanup
  ARM: dts: at91: at91sam9x5_lcd.dtsi: Style cleanup
  ARM: dts: at91: at91sam9xx5ek: Style cleanup
  ARM: dts: at91: at91sam9g15: Style cleanup
  ARM: dts: at91: kizboxmini: Style cleanup
  ARM: dts: at91: cosino: Style cleanup
  ARM: dts: at91: ariettag25: style cleanup
  ARM: dts: at91: ariag25: Style cleanup
  ARM: dts: at91: Add label for sam9x5's internal RTC
  dt-bindings: add vendor prefix "acme" for "Acme Systems srl"
  ARM: dts: at91: Avoid colliding 'display' node and property names

Link: https://lore.kernel.org/r/20190825202642.GA18853@piout.netSigned-off-by: Arnd Bergmann <arnd@arndb.de>

Documentation/devicetree/bindings/vendor-prefixes.yaml

@@ -27,6 +27,8 @@ patternProperties:
     description: Abilis Systems
   "^abracon,.*":
     description: Abracon Corporation
+  "^acme,.*":
+    description: Acme Systems srl
   "^actions,.*":
     description: Actions Semiconductor Co., Ltd.
   "^active-semi,.*":

arch/arm/boot/dts/at91-ariag25.dts

@@ -14,11 +14,6 @@ / {
 		     "atmel,at91sam9x5", "atmel,at91sam9";
 
 	aliases {
-		serial0 = &dbgu;
-		serial1 = &usart0;
-		serial2 = &usart1;
-		serial3 = &usart2;
-		serial4 = &usart3;
 		serial5 = &uart0;
 		serial6 = &uart1;
 	};
@@ -42,22 +37,83 @@ main_xtal {
 		};
 	};
 
-	ahb {
-		apb {
-			mmc0: mmc@f0008000 {
+	leds {
+		compatible = "gpio-leds";
+
+		/* little green LED in middle of Aria G25 module */
+		aria_led {
+			label = "aria_led";
+			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
+			linux,default-trigger = "heartbeat";
+		};
+
+	};
+
+	onewire {
+		compatible = "w1-gpio";
+		gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_w1_0>;
+	};
+};
+
+&adc0 {
+	status = "okay";
+	atmel,adc-channels-used = <0xf>;
+};
+
+&dbgu {
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+/* TWD2+TCLK2 hidden behind ethernet, so no i2c2 */
+
+&macb0 {
+	phy-mode = "rmii";
+	/*
+	 * following can be overwritten by bootloader:
+	 * for example u-boot 'ftd set' command
+	 */
+	local-mac-address = [00 00 00 00 00 00];
+	status = "okay";
+};
+
+
+&mmc0 {
 	/* N.B. Aria has no SD card detect (CD), assumed present */
 
 	pinctrl-0 = <
 		&pinctrl_mmc0_slot0_clk_cmd_dat0
 		&pinctrl_mmc0_slot0_dat1_3>;
 	status = "okay";
+
 	slot@0 {
 		reg = <0>;
 		bus-width = <4>;
 	};
+};
+
+&pinctrl {
+	w1_0 {
+		pinctrl_w1_0: w1_0-0 {
+			atmel,pins = <0 21 0x0 0x1>; /* PA21 PIO, pull-up */
+		};
 	};
+};
 
-			tcb0: timer@f8008000 {
+&rtc {
+	status = "okay";
+};
+
+&tcb0 {
 	timer@0 {
 		compatible = "atmel,tcb-timer";
 		reg = <0>;
@@ -67,41 +123,44 @@ timer@1 {
 		compatible = "atmel,tcb-timer";
 		reg = <1>;
 	};
-			};
-
-			i2c0: i2c@f8010000 {
-				status = "okay";
-			};
+};
 
-			i2c1: i2c@f8014000 {
-				status = "okay";
-			};
+/*
+ * UART0/1 pins are marked as GPIO on
+ * Aria documentation.
+ * Change to "okay" if you need additional serial ports
+ */
+&uart0 {
+	status = "disabled";
+};
 
-			/* TWD2+TCLK2 hidden behind ethernet, so no i2c2 */
+&uart1 {
+	status = "disabled";
+};
 
-			usart0: serial@f801c000 {
+&usart0 {
 	pinctrl-0 = <&pinctrl_usart0
 		     &pinctrl_usart0_rts
 		     &pinctrl_usart0_cts>;
 	status = "okay";
-			};
+};
 
-			usart1: serial@f8020000 {
+&usart1 {
 	pinctrl-0 = <&pinctrl_usart1
 		     /* &pinctrl_usart1_rts */
 		     /* &pinctrl_usart1_cts */
 		    >;
 	status = "okay";
-			};
+};
 
-			usart2: serial@f8024000 {
+&usart2 {
 	/* cannot activate RTS2+CTS2, clash with
 	 * ethernet on PB0 and PB1 */
 	pinctrl-0 = <&pinctrl_usart2>;
 	status = "okay";
-			};
+};
 
-			usart3: serial@f8028000 {
+&usart3 {
 	compatible = "atmel,at91sam9260-usart";
 	reg = <0xf8028000 0x200>;
 	interrupts = <8 4 5>;
@@ -111,79 +170,13 @@ usart3: serial@f8028000 {
 		     /* &pinctrl_usart3_cts */
 		    >;
 	status = "okay";
-			};
-
-			macb0: ethernet@f802c000 {
-				phy-mode = "rmii";
-				/*
-				 * following can be overwritten by bootloader:
-				 * for example u-boot 'ftd set' command
-				 */
-				local-mac-address = [00 00 00 00 00 00];
-				status = "okay";
-			};
-
-			/*
-			 * UART0/1 pins are marked as GPIO on
-			 * Aria documentation.
-			 * Change to "okay" if you need additional serial ports
-			 */
-			uart0: serial@f8040000 {
-				status = "disabled";
-			};
-
-			uart1: serial@f8044000 {
-				status = "disabled";
-			};
-
-			adc0: adc@f804c000 {
-				status = "okay";
-				atmel,adc-channels-used = <0xf>;
-			};
-
-			dbgu: serial@fffff200 {
-				status = "okay";
-			};
-
-			pinctrl@fffff400 {
-				w1_0 {
-					pinctrl_w1_0: w1_0-0 {
-						atmel,pins = <0 21 0x0 0x1>; /* PA21 PIO, pull-up */
-					};
-				};
-			};
-
-			rtc@fffffeb0 {
-				status = "okay";
-			};
-		};
+};
 
-		usb0: ohci@600000 {
+&usb0 {
 	status = "okay";
 	num-ports = <3>;
-		};
+};
 
-		usb1: ehci@700000 {
+&usb1 {
 	status = "okay";
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		/* little green LED in middle of Aria G25 module */
-		aria_led {
-			label = "aria_led";
-			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
-			linux,default-trigger = "heartbeat";
-		};
-
-	};
-
-	onewire {
-		compatible = "w1-gpio";
-		gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_w1_0>;
-	};
 };

arch/arm/boot/dts/at91-ariettag25.dts

@@ -6,14 +6,11 @@
  */
 /dts-v1/;
 #include "at91sam9g25.dtsi"
+
 / {
 	model = "Acme Systems Arietta G25";
 	compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9";
 
-	aliases {
-		serial0 = &dbgu;
-	};
-
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
@@ -32,9 +29,22 @@ main_xtal {
 		};
 	};
 
-	ahb {
-		apb {
-			mmc0: mmc@f0008000 {
+	leds {
+		compatible = "gpio-leds";
+
+		arietta_led {
+			label = "arietta_led";
+			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
+			linux,default-trigger = "heartbeat";
+		};
+	};
+};
+
+&dbgu {
+	status = "okay";
+};
+
+&mmc0 {
 	pinctrl-0 = <
 		&pinctrl_mmc0_slot0_clk_cmd_dat0
 		&pinctrl_mmc0_slot0_dat1_3>;
@@ -44,9 +54,13 @@ slot@0 {
 		reg = <0>;
 		bus-width = <4>;
 	};
-			};
+};
+
+&rtc {
+	status = "okay";
+};
 
-			tcb0: timer@f8008000 {
+&tcb0 {
 	timer@0 {
 		compatible = "atmel,tcb-timer";
 		reg = <0>;
@@ -56,37 +70,17 @@ timer@1 {
 		compatible = "atmel,tcb-timer";
 		reg = <1>;
 	};
-			};
-
-			usb2: gadget@f803c000 {
-				status = "okay";
-			};
-
-			dbgu: serial@fffff200 {
-				status = "okay";
-			};
+};
 
-			rtc@fffffeb0 {
+&usb0 {
+	num-ports = <3>;
 	status = "okay";
-			};
-		};
+};
 
-		usb0: ohci@600000 {
+&usb1 {
 	status = "okay";
-			num-ports = <3>;
-		};
+};
 
-		usb1: ehci@700000 {
+&usb2 {
 	status = "okay";
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		arietta_led {
-			label = "arietta_led";
-			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
-			linux,default-trigger = "heartbeat";
-		};
-	};
 };

arch/arm/boot/dts/at91-cosino.dtsi

@@ -33,78 +33,30 @@ main_xtal {
 			clock-frequency = <12000000>;
 		};
 	};
+};
 
-	ahb {
-		apb {
-			tcb0: timer@f8008000 {
-				timer@0 {
-					compatible = "atmel,tcb-timer";
-					reg = <0>;
-				};
-
-				timer@1 {
-					compatible = "atmel,tcb-timer";
-					reg = <1>;
-				};
-			};
-
-			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>;
-				};
-			};
-
-			dbgu: serial@fffff200 {
-				status = "okay";
-			};
-
-			usart0: serial@f801c000 {
-				status = "okay";
-			};
-
-			i2c0: i2c@f8010000 {
-				status = "okay";
-			};
-
-			adc0: adc@f804c000 {
+&adc0 {
 	atmel,adc-ts-wires = <4>;
 	atmel,adc-ts-pressure-threshold = <10000>;
 	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 */
-					};
-				};
-			};
+};
 
-			watchdog@fffffe40 {
+&dbgu {
 	status = "okay";
-			};
-		};
+};
 
-		ebi: ebi@10000000 {
+&ebi {
 	pinctrl-0 = <&pinctrl_ebi_addr_nand
 		     &pinctrl_ebi_data_0_7>;
 	pinctrl-names = "default";
 	status = "okay";
 
-			nand_controller: nand-controller {
-				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>;
@@ -149,6 +101,51 @@ rootfs@800000 {
 			};
 		};
 	};
+};
+
+&i2c0 {
+	status = "okay";
+};
+
+&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>;
 	};
+};
+
+&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 */
 		};
+	};
+};
+
+&tcb0 {
+	timer@0 {
+		compatible = "atmel,tcb-timer";
+		reg = <0>;
+	};
+
+	timer@1 {
+		compatible = "atmel,tcb-timer";
+		reg = <1>;
+	};
+};
+
+&usart0 {
+	status = "okay";
+};
+
+&watchdog {
+	status = "okay";
 };

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";
+};
 
-	ahb {
-		apb {
-			macb0: ethernet@f802c000 {
-				phy-mode = "rmii";
-				status = "okay";
-			};
-
-			adc0: adc@f804c000 {
+&adc0 {
 	atmel,adc-ts-wires = <4>;
 	atmel,adc-ts-pressure-threshold = <10000>;
 	status = "okay";
-			};
-
-			rtc@fffffeb0 {
-				status = "okay";
-			};
-
-			usart1: serial@f8020000 {
-				status = "okay";
-			};
-
-			usart2: serial@f8024000 {
-				status = "okay";
-			};
+};
 
-			usb2: gadget@f803c000 {
-				atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
+&macb0 {
+	phy-mode = "rmii";
 	status = "okay";
-			};
+};
 
-			mmc1: mmc@f000c000 {
+&mmc1 {
 	pinctrl-0 = <
 		&pinctrl_mmc1_slot0_clk_cmd_dat0
 		&pinctrl_mmc1_slot0_dat1_3>;
 	status = "okay";
+
 	slot@0 {
 		reg = <0>;
 		bus-width = <4>;
 		non-removable;
 	};
-			};
-		};
+};
+
+&rtc {
+	status = "okay";
+};
 
-		usb0: ohci@600000 {
+&usart1 {
 	status = "okay";
+};
+
+&usart2 {
+	status = "okay";
+};
+
+&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";
+};
 
-		usb1: ehci@700000 {
+&usb1 {
+	status = "okay";
+};
+
+&usb2 {
+	atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
 	status = "okay";
-		};
-	};
 };

arch/arm/boot/dts/at91-kizboxmini.dts

@@ -32,65 +32,72 @@ main_xtal {
 	};
 
 	ahb {
-		apb {
-			tcb0: timer@f8008000 {
-				timer@0 {
-					compatible = "atmel,tcb-timer";
-					reg = <0>;
-				};
-
-				timer@1 {
-					compatible = "atmel,tcb-timer";
-					reg = <1>;
+		nand0: nand@40000000 {
+			nand-bus-width = <8>;
+			nand-ecc-mode = "hw";
+			atmel,has-pmecc;
+			atmel,pmecc-cap = <4>;
+			atmel,pmecc-sector-size = <512>;
+			nand-on-flash-bbt;
+			status = "okay";
 		};
 	};
 
-			usart0: serial@f801c000 {
-				status = "okay";
-			};
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
 
-			macb0: ethernet@f802c000 {
-				phy-mode = "rmii";
-				status = "okay";
+		prog {
+			label = "PB_PROG";
+			gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
+			linux,code = <0x102>;
+			wakeup-source;
 		};
 
-			pwm0: pwm@f8034000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_pwm0_pwm0_1
-					     &pinctrl_pwm0_pwm1_1>;
-				status = "okay";
+		reset {
+			label = "PB_RST";
+			gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
+			linux,code = <0x100>;
+			wakeup-source;
 		};
-
-			dbgu: serial@fffff200 {
-				status = "okay";
 	};
 
-			watchdog@fffffe40 {
-				status = "okay";
-			};
+	pwm_leds {
+		compatible = "pwm-leds";
+
+		green {
+			label = "pwm:green:user";
+			pwms = <&pwm0 0 10000000 0>;
+			max-brightness = <255>;
+			linux,default-trigger = "default-on";
 		};
 
-		usb0: ohci@600000 {
-			num-ports = <1>;
-			status = "okay";
+		red {
+			label = "pwm:red:user";
+			pwms = <&pwm0 1 10000000 0>;
+			max-brightness = <255>;
+			linux,default-trigger = "default-on";
+		};
 	};
+};
 
-		usb1: ehci@700000 {
+&dbgu {
 	status = "okay";
-		};
+};
 
-		ebi: ebi@10000000 {
+&ebi {
 	pinctrl-0 = <&pinctrl_ebi_addr_nand
 		     &pinctrl_ebi_data_0_7>;
 	pinctrl-names = "default";
 	status = "okay";
 
-			nand_controller: nand-controller {
-				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>;
@@ -120,55 +127,45 @@ ubi@20000 {
 			};
 		};
 	};
-		};
+};
 
-		nand0: nand@40000000 {
-			nand-bus-width = <8>;
-			nand-ecc-mode = "hw";
-			atmel,has-pmecc;
-			atmel,pmecc-cap = <4>;
-			atmel,pmecc-sector-size = <512>;
-			nand-on-flash-bbt;
+&macb0 {
+	phy-mode = "rmii";
 	status = "okay";
+};
 
-		};
-	};
-
-	gpio_keys {
-		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
+&pwm0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pwm0_pwm0_1
+		     &pinctrl_pwm0_pwm1_1>;
+	status = "okay";
+};
 
-		prog {
-			label = "PB_PROG";
-			gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
-			linux,code = <0x102>;
-			wakeup-source;
+&tcb0 {
+	timer@0 {
+		compatible = "atmel,tcb-timer";
+		reg = <0>;
 	};
 
-		reset {
-			label = "PB_RST";
-			gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
-			linux,code = <0x100>;
-			wakeup-source;
-		};
+	timer@1 {
+		compatible = "atmel,tcb-timer";
+		reg = <1>;
 	};
+};
 
-	pwm_leds {
-		compatible = "pwm-leds";
+&usart0 {
+	status = "okay";
+};
 
-		green {
-			label = "pwm:green:user";
-			pwms = <&pwm0 0 10000000 0>;
-			max-brightness = <255>;
-			linux,default-trigger = "default-on";
-		};
+&usb0 {
+	num-ports = <1>;
+	status = "okay";
+};
 
-		red {
-			label = "pwm:red:user";
-			pwms = <&pwm0 1 10000000 0>;
-			max-brightness = <255>;
-			linux,default-trigger = "default-on";
-		};
-	};
+&usb1 {
+	status = "okay";
+};
+
+&watchdog {
+	status = "okay";
 };

arch/arm/boot/dts/at91sam9261ek.dts

@@ -40,7 +40,7 @@ fb0: fb@600000 {
 			atmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>;
 			status = "okay";
 
-			display0: display {
+			display0: panel {
 				bits-per-pixel = <16>;
 				atmel,lcdcon-backlight;
 				atmel,dmacon = <0x1>;

arch/arm/boot/dts/at91sam9263ek.dts

@@ -110,7 +110,7 @@ fb0: fb@700000 {
 			display = <&display0>;
 			status = "okay";
 
-			display0: display {
+			display0: panel {
 				bits-per-pixel = <16>;
 				atmel,lcdcon-backlight;
 				atmel,dmacon = <0x1>;

arch/arm/boot/dts/at91sam9g15.dtsi

@@ -11,10 +11,9 @@
 / {
 	model = "Atmel AT91SAM9G15 SoC";
 	compatible = "atmel,at91sam9g15", "atmel,at91sam9x5";
+};
 
-	ahb {
-		apb {
-			pinctrl@fffff400 {
+&pinctrl {
 	atmel,mux-mask = <
 	      /*    A         B          C     */
 	       0xffffffff 0xffe0399f 0x00000000  /* pioA */
@@ -22,11 +21,8 @@ pinctrl@fffff400 {
 	       0xfdffffff 0x00000000 0xb83fffff  /* pioC */
 	       0x003fffff 0x003f8000 0x00000000  /* pioD */
 	      >;
-			};
+};
 
-			pmc: pmc@fffffc00 {
+&pmc {
 	compatible = "atmel,at91sam9g15-pmc", "atmel,at91sam9x5-pmc", "syscon";
-			};
-		};
-	};
 };

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 @@ panel_reg: panel_regulator {
 		status = "okay";
 	};
 };
+
+&hlcdc {
+	status = "okay";
+};

arch/arm/boot/dts/at91sam9g25ek.dts

@@ -12,19 +12,10 @@
 / {
 	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 {
+&i2c0 {
+	camera@30 {
 		compatible = "ovti,ov2640";
 		reg = <0x30>;
 		pinctrl-names = "default";
@@ -44,15 +35,11 @@ ov2640_0: endpoint {
 			};
 		};
 	};
-			};
+};
 
-			macb0: ethernet@f802c000 {
-				phy-mode = "rmii";
+&isi {
 	status = "okay";
-			};
 
-			isi: isi@f8048000 {
-				status = "okay";
 	port {
 		isi_0: endpoint@0 {
 			reg = <0>;
@@ -62,7 +49,17 @@ isi_0: endpoint@0 {
 			hsync-active = <1>;
 		};
 	};
-			};
-		};
-	};
+};
+
+&macb0 {
+	phy-mode = "rmii";
+	status = "okay";
+};
+
+&mmc1 {
+	status = "disabled";
+};
+
+&spi0 {
+	status = "disabled";
 };

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 @@ panel_reg: panel_regulator {
 		status = "okay";
 	};
 };
+
+&hlcdc {
+	status = "okay";
+};
+
+&macb0 {
+	phy-mode = "rmii";
+	status = "okay";
+};

arch/arm/boot/dts/at91sam9m10g45ek.dts

@@ -235,7 +235,7 @@ fb0: fb@500000 {
 			display = <&display0>;
 			status = "okay";
 
-			display0: display {
+			display0: panel {
 				bits-per-pixel = <32>;
 				atmel,lcdcon-backlight;
 				atmel,dmacon = <0x1>;

arch/arm/boot/dts/at91sam9rlek.dts

@@ -36,7 +36,7 @@ fb0: fb@500000 {
 			display = <&display0>;
 			status = "okay";
 
-			display0: display {
+			display0: panel {
 				bits-per-pixel = <16>;
 				atmel,lcdcon-backlight;
 				atmel,dmacon = <0x1>;

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 {
+&can1 {
 	status = "okay";
-			};
+};
 
-			macb0: ethernet@f802c000 {
+&macb0 {
 	phy-mode = "rmii";
 	status = "okay";
-			};
+};
 
-			macb1: ethernet@f8030000 {
+&macb1 {
 	phy-mode = "rmii";
 	status = "okay";
-			};
+};
 
-			pwm0: pwm@f8034000 {
+&pwm0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm0_pwm0_1>;
 	status = "okay";
-			};
-		};
-	};
 };

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";
+&backlight {
 	status = "okay";
-			};
-			hlcdc: hlcdc@f8038000 {
+};
+
+&bl_reg {
 	status = "okay";
-			};
-		};
-	};
+};
 
-	backlight: backlight {
+&hlcdc {
 	status = "okay";
-	};
+};
 
-	bl_reg: backlight_regulator {
+&macb0 {
+	phy-mode = "rmii";
 	status = "okay";
-	};
+};
 
-	panel: panel {
+&panel {
 	status = "okay";
-	};
+};
 
-	panel_reg: panel_regulator {
+&panel_reg {
 	status = "okay";
-	};
 };

arch/arm/boot/dts/at91sam9x5.dtsi

@@ -941,7 +941,7 @@ watchdog: watchdog@fffffe40 {
 				status = "disabled";
 			};
 
-			rtc@fffffeb0 {
+			rtc: rtc@fffffeb0 {
 				compatible = "atmel,at91sam9x5-rtc";
 				reg = <0xfffffeb0 0x40>;
 				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

arch/arm/boot/dts/at91sam9x5_lcd.dtsi

@@ -39,8 +39,11 @@ hlcdc_pwm: hlcdc-pwm {
 					#pwm-cells = <3>;
 				};
 			};
+		};
+	};
+};
 
-			pinctrl@fffff400 {
+&pinctrl {
 	lcd {
 		pinctrl_lcd_base: lcd-base-0 {
 			atmel,pins =
@@ -141,7 +144,4 @@ AT91_PIOC 22 AT91_PERIPH_A AT91_PINCTRL_NONE	/* LCDD22 pin */
 				 AT91_PIOC 23 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* LCDD23 pin */
 		};
 	};
-			};
-		};
-	};
 };

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>;
+		};
+	};
+};

arch/arm/boot/dts/at91sam9x5ek.dtsi

@@ -16,67 +16,70 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	ahb {
-		apb {
-			mmc0: mmc@f0008000 {
+	sound {
+		compatible = "atmel,sam9x5-wm8731-audio";
+
+		atmel,model = "wm8731 @ AT91SAM9X5EK";
+
+		atmel,audio-routing =
+			"Headphone Jack", "RHPOUT",
+			"Headphone Jack", "LHPOUT",
+			"LLINEIN", "Line In Jack",
+			"RLINEIN", "Line In Jack";
+
+		atmel,ssc-controller = <&ssc0>;
+		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: mmc@f000c000 {
+&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>;
 	};
-			};
-
-			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 {
+&pinctrl {
 	camera_sensor {
 		pinctrl_pck0_as_isi_mck: pck0_as_isi_mck-0 {
 			atmel,pins =
@@ -114,53 +117,49 @@ pinctrl_board_usb2: usb2-board {
 				<AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;		/* PB16 gpio vbus sense, deglitch */
 		};
 	};
-			};
+};
 
-			spi0: spi@f0000000 {
-				status = "disabled"; /* conflicts with mmc1 */
+&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>;
 	};
-			};
+};
 
-			watchdog@fffffe40 {
+&ssc0 {
 	status = "okay";
-			};
+};
 
-			ssc0: ssc@f0010000 {
+&usart0 {
+	atmel,use-dma-rx;
+	atmel,use-dma-tx;
 	status = "okay";
-			};
-		};
+};
 
-		usb0: ohci@600000 {
-			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
 			  >;
-		};
-
-		usb1: ehci@700000 {
 	status = "okay";
-		};
-	};
-
-	sound {
-		compatible = "atmel,sam9x5-wm8731-audio";
+};
 
-		atmel,model = "wm8731 @ AT91SAM9X5EK";
+&usb1 {
+	status = "okay";
+};
 
-		atmel,audio-routing =
-			"Headphone Jack", "RHPOUT",
-			"Headphone Jack", "LHPOUT",
-			"LLINEIN", "Line In Jack",
-			"RLINEIN", "Line In Jack";
+&usb2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_board_usb2>;
+	atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
 
-		atmel,ssc-controller = <&ssc0>;
-		atmel,audio-codec = <&wm8731>;
-	};
+&watchdog {
+	status = "okay";
 };