Device tree overlays cleanup

arch/arm/boot/dts/overlays/adau7118-simple-overlay.dts

@@ -6,55 +6,48 @@
 / {
 	compatible = "brcm,bcm2835";
 
-	fragment@0 {
-		target = <&i2s>;
-		__overlay__ {
-			status = "okay";
-		};
+	__overrides__ {
+		card-name = <&sound>, "simple-audio-card,name";
 	};
+};
+
+&i2s {
+	status = "okay";
+};
 
-	fragment@1 {
-		target = <&i2c1>;
-		__overlay__ {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "okay";
-
-			adau7118_codec: adau7118-codec@14 {
-				reg = <0x14>;
-				#sound-dai-cells = <0>;
-				compatible = "adi,adau7118";
-				status = "okay";
-			};
-		};
+&i2c1 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	adau7118_codec: adau7118-codec@14 {
+		reg = <0x14>;
+		#sound-dai-cells = <0>;
+		compatible = "adi,adau7118";
+		status = "okay";
 	};
+};
 
-	fragment@2 {
-		target = <&sound>;
-		sound_overlay: __overlay__ {
-			compatible = "simple-audio-card";
-			simple-audio-card,format = "i2s";
-			simple-audio-card,name = "adau7118";
-			simple-audio-card,bitclock-slave = <&dailink0_slave>;
-			simple-audio-card,frame-slave = <&dailink0_slave>;
-			simple-audio-card,widgets =
-				"Microphone", "Microphone Jack";
-			simple-audio-card,routing =
-				"PDM_DAT0", "Microphone Jack";
-			status = "okay";
-			simple-audio-card,cpu {
-				/* so that bclk is 64x FS */
-				dai-tdm-slot-num = <2>;
-				dai-tdm-slot-width = <32>;
-				sound-dai = <&i2s>;
-			};
-			dailink0_slave: simple-audio-card,codec {
-				sound-dai = <&adau7118_codec>;
-			};
-		};
+&sound {
+	compatible = "simple-audio-card";
+	simple-audio-card,format = "i2s";
+	simple-audio-card,name = "adau7118";
+	simple-audio-card,bitclock-slave = <&dailink0_slave>;
+	simple-audio-card,frame-slave = <&dailink0_slave>;
+	simple-audio-card,widgets =
+		"Microphone", "Microphone Jack";
+	simple-audio-card,routing =
+		"PDM_DAT0", "Microphone Jack";
+	status = "okay";
+
+	simple-audio-card,cpu {
+		/* so that bclk is 64x FS */
+		dai-tdm-slot-num = <2>;
+		dai-tdm-slot-width = <32>;
+		sound-dai = <&i2s>;
 	};
 
-	__overrides__ {
-		card-name = <&sound_overlay>,"simple-audio-card,name";
+	dailink0_slave: simple-audio-card,codec {
+		sound-dai = <&adau7118_codec>;
 	};
 };

arch/arm/boot/dts/overlays/adis16475-overlay.dts

@@ -8,70 +8,6 @@
 / {
 	compatible = "brcm,bcm2835";
 
-	fragment@0 {
-		target = <&spi0>;
-		__overlay__ {
-			status = "okay";
-		};
-	};
-
-	fragment@1 {
-		target = <&spidev0>;
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-
-	fragment@2 {
-		target = <&spidev1>;
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-
-	 fragment@3 {
-		target = <&gpio>;
-		__overlay__ {
-			adis16475_pins: adis16475_pins {
-				brcm,pins = <4 12>; // interrupt and reset
-				brcm,function = <0 1>; // in out
-			};
-		};
-	};
-
-	fragment@4 {
-		target-path = "/";
-		__overlay__ {
-			clocks {
-				adis16475_ref_clk: clock@0 {
-					     #clock-cells = <0>;
-					     compatible = "fixed-clock";
-				};
-			};
-		};
-	};
-
-	fragment@5 {
-		target = <&spi0>;
-		__overlay__ {
-			/* needed to avoid dtc warning */
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			adis16475: adis16475@0 {
-				reg = <0>;
-				pinctrl-names = "default";
-				pinctrl-0 = <&adis16475_pins>;
-				spi-cpha;
-				spi-cpol;
-				reset-gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-				spi-max-frequency = <2000000>;
-				interrupts = <4 IRQ_TYPE_EDGE_RISING>;
-				interrupt-parent = <&gpio>;
-			};
-		};
-	};
-
 	__overrides__ {
 		/*
 		 * This gives an option to use the gpio25 as the data ready pin. This
@@ -89,3 +25,49 @@
 				<&adis16475>,"clocks:0=",<&adis16475_ref_clk>;
 	};
 };
+
+&spi0 {
+	status = "okay";
+};
+
+&spidev0 {
+	status = "disabled";
+};
+
+&spidev1 {
+	status = "disabled";
+};
+
+&gpio {
+	adis16475_pins: adis16475_pins {
+		brcm,pins = <4 12>; // interrupt and reset
+		brcm,function = <0 1>; // in out
+	};
+};
+
+&{/} {
+	clocks {
+		adis16475_ref_clk: clock@0 {
+			     #clock-cells = <0>;
+			     compatible = "fixed-clock";
+		};
+	};
+};
+
+&spi0 {
+	/* needed to avoid dtc warning */
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	adis16475: adis16475@0 {
+		reg = <0>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&adis16475_pins>;
+		spi-cpha;
+		spi-cpol;
+		reset-gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+		spi-max-frequency = <2000000>;
+		interrupts = <4 IRQ_TYPE_EDGE_RISING>;
+		interrupt-parent = <&gpio>;
+	};
+};

arch/arm/boot/dts/overlays/adis16480-overlay.dts

@@ -8,58 +8,6 @@
 / {
 	compatible = "brcm,bcm2835";
 
-	fragment@0 {
-		target = <&spi0>;
-		__overlay__ {
-			status = "okay";
-		};
-	};
-
-	fragment@1 {
-		target = <&spidev0>;
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-
-	fragment@2 {
-		target = <&spidev1>;
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-
-	 fragment@3 {
-		target = <&gpio>;
-		__overlay__ {
-			adis16480_pins: adis16480_pins {
-				brcm,pins = <6 12>; // interrupt and reset
-				brcm,function = <0 1>; // in out
-			};
-		};
-	};
-	fragment@4 {
-		target = <&spi0>;
-		__overlay__ {
-			/* needed to avoid dtc warning */
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			adis16480: adis16480@0 {
-				reg = <0>;
-				pinctrl-names = "default";
-				pinctrl-0 = <&adis16480_pins>;
-				spi-cpha;
-				spi-cpol;
-				reset-gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-				spi-max-frequency = <15000000>;
-				/* use DIO1 as data ready by default */
-				interrupts = <6 IRQ_TYPE_EDGE_RISING>;
-				interrupt-parent = <&gpio>;
-			};
-		};
-	};
-
 	__overrides__ {
 		device = <&adis16480>,"compatible";
 		drdy_dio2 = <&adis16480_pins>,"brcm,pins:0=25",
@@ -73,3 +21,41 @@
 				<&adis16480>,"interrupt-names=DIO4";
 	};
 };
+
+&spi0 {
+	status = "okay";
+};
+
+&spidev0 {
+	status = "disabled";
+};
+
+&spidev1 {
+	status = "disabled";
+};
+
+&gpio {
+	adis16480_pins: adis16480_pins {
+		brcm,pins = <6 12>; // interrupt and reset
+		brcm,function = <0 1>; // in out
+	};
+};
+
+&spi0 {
+	/* needed to avoid dtc warning */
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	adis16480: adis16480@0 {
+		reg = <0>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&adis16480_pins>;
+		spi-cpha;
+		spi-cpol;
+		reset-gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+		spi-max-frequency = <15000000>;
+		/* use DIO1 as data ready by default */
+		interrupts = <6 IRQ_TYPE_EDGE_RISING>;
+		interrupt-parent = <&gpio>;
+	};
+};

arch/arm/boot/dts/overlays/mpu6050-overlay.dts

@@ -5,25 +5,22 @@
 / {
         compatible = "brcm,bcm2835";
 
-        fragment@0 {
-                target = <&i2c1>;
-                __overlay__ {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "okay";
-                        clock-frequency = <400000>;
-
-                        mpu6050: mpu6050@68 {
-                                compatible = "invensense,mpu6050";
-                                reg = <0x68>;
-                                interrupt-parent = <&gpio>;
-                                interrupts = <4 1>;
-                        };
-                };
-        };
-
         __overrides__ {
                 interrupt = <&mpu6050>,"interrupts:0";
                 addr = <&mpu6050>,"reg:0";
         };
 };
+
+&i2c1 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	clock-frequency = <400000>;
+
+	mpu6050: mpu6050@68 {
+		compatible = "invensense,mpu6050";
+		reg = <0x68>;
+		interrupt-parent = <&gpio>;
+		interrupts = <4 1>;
+	};
+};