UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Färber 2016-04-26 09:58:30 +02:00 committed by Gregory CLEMENT
parent f55532a0c0
commit 037ad463ba
4 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
arch/arm64/boot/dts/marvell/armada-7040-db.dts
View File

@ -55,38 +55,34 @@
device_type = "memory"; device_type = "memory";
reg = <0x0 0x0 0x0 0x80000000>; reg = <0x0 0x0 0x0 0x80000000>;
}; };
};
ap806 { &i2c0 {
config-space { status = "okay";
spi@510600 { clock-frequency = <100000>;
status = "okay"; };
spi-flash@0 { &spi0 {
#address-cells = <1>; status = "okay";
#size-cells = <1>;
compatible = "n25q128a13";
reg = <0>; /* Chip select 0 */
spi-max-frequency = <10000000>;
partition@0 { spi-flash@0 {
label = "U-Boot"; #address-cells = <1>;
reg = <0 0x200000>; #size-cells = <1>;
}; compatible = "n25q128a13";
partition@400000 { reg = <0>; /* Chip select 0 */
label = "Filesystem"; spi-max-frequency = <10000000>;
reg = <0x200000 0xce0000>;
};
};
};
i2c@511000 { partition@0 {
status = "okay"; label = "U-Boot";
clock-frequency = <100000>; reg = <0 0x200000>;
}; };
partition@400000 {
serial@512000 { label = "Filesystem";
status = "okay"; reg = <0x200000 0xce0000>;
};
}; };
}; };
}; };
&uart0 {
status = "okay";
};

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

@ -68,4 +68,3 @@
}; };
}; };
}; };

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

@ -79,6 +79,4 @@
enable-method = "psci"; enable-method = "psci";
}; };
}; };
}; };

7
arch/arm64/boot/dts/marvell/armada-ap806.dtsi
View File

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