Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 037ad463 authored Apr 26, 2016 by Andreas Färber Committed by Gregory CLEMENT Apr 26, 2016

arm64: dts: marvell: clean up armada-7040-db



Instead of duplicating the node hierarchy, reference the nodes by label,
adding labels where necessary.

Drop some trailing or inconsistent white lines while at it.

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
[Thomas: drop Fixes tag as it is not a bug fix.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

parent f55532a0

arch/arm64/boot/dts/marvell/armada-7040-db.dts

+24 −28

Original line number	Original line	Diff line number	Diff line
	@@ -55,10 +55,14 @@
	device_type = "memory";		device_type = "memory";
	reg = <0x0 0x0 0x0 0x80000000>;		reg = <0x0 0x0 0x0 0x80000000>;
	};		};
			};

			&i2c0 {
			status = "okay";
			clock-frequency = <100000>;
			};

	ap806 {		&spi0 {
	config-space {
	spi@510600 {
	status = "okay";		status = "okay";

	spi-flash@0 {		spi-flash@0 {
	@@ -79,14 +83,6 @@
	};		};
	};		};

	i2c@511000 {		&uart0 {
	status = "okay";
	clock-frequency = <100000>;
	};

	serial@512000 {
	status = "okay";		status = "okay";
	};		};
	};
	};
	};

arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -68,4 +68,3 @@
	};		};
	};		};
	};		};

arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -79,6 +79,4 @@
	enable-method = "psci";		enable-method = "psci";
	};		};
	};		};

	};		};

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,6 @@
	method = "smc";		method = "smc";
	};		};


	ap806 {		ap806 {
	#address-cells = <2>;		#address-cells = <2>;
	#size-cells = <2>;		#size-cells = <2>;
	@@ -190,7 +189,7 @@
	status = "disabled";		status = "disabled";
	};		};

	serial@512000 {		uart0: serial@512000 {
	compatible = "snps,dw-apb-uart";		compatible = "snps,dw-apb-uart";
	reg = <0x512000 0x100>;		reg = <0x512000 0x100>;
	reg-shift = <2>;		reg-shift = <2>;
	@@ -200,7 +199,7 @@
	status = "disabled";		status = "disabled";
	};		};

	serial@512100 {		uart1: serial@512100 {
	compatible = "snps,dw-apb-uart";		compatible = "snps,dw-apb-uart";
	reg = <0x512100 0x100>;		reg = <0x512100 0x100>;
	reg-shift = <2>;		reg-shift = <2>;
	@@ -232,6 +231,4 @@
	};		};
	};		};
	};		};

	};		};