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

ARM: dts: vexpress: Restructure motherboard includes 

It is a bit unorthodox to just include a file in the middle of a another
DTS file, it breaks the pattern from other device trees and also makes
it really hard to reference things across the files with phandles.

Restructure the include for the Versatile Express motherboards to happen
at the top of the file, reference the target nodes directly, and indent
the motherboard .dtsi files to reflect their actual depth in the
hierarchy.

This is a purely syntactic change that result in the same DTB files from
the DTS/DTSI files.

Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Mali DP Maintainers <malidp@foss.arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Linus Walleij 2018-04-27 20:54:04 +02:00 committed by Sudeep Holla
parent 60cc43fc88
commit bd7aff0340
7 changed files with 784 additions and 781 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
View File

@ -17,6 +17,8 @@
* CHANGES TO vexpress-v2m.dtsi!
*/
/ {
smb@8000000 {
motherboard {
model = "V2M-P1";
arm,hbi = <0x190>;
@ -440,3 +442,5 @@
};
};
};
};
};

4
arch/arm/boot/dts/vexpress-v2m.dtsi
View File

@ -18,6 +18,8 @@
* CHANGES TO vexpress-v2m-rs1.dtsi!
*/
/ {
smb@4000000 {
motherboard {
model = "V2M-P1";
arm,hbi = <0x190>;
@ -440,3 +442,5 @@
};
};
};
};
};

3
arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
View File

@ -9,6 +9,7 @@
*/
/dts-v1/;
#include "vexpress-v2m-rs1.dtsi"
/ {
model = "V2P-CA15";
@ -278,8 +279,6 @@
<0 0 40 &gic 0 40 4>,
<0 0 41 &gic 0 41 4>,
<0 0 42 &gic 0 42 4>;
/include/ "vexpress-v2m-rs1.dtsi"
};
site2: hsb@40000000 {

5
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
View File

@ -9,6 +9,7 @@
*/
/dts-v1/;
#include "vexpress-v2m-rs1.dtsi"
/ {
model = "V2P-CA15_CA7";
@ -584,7 +585,7 @@
};
};
smb@8000000 {
smb: smb@8000000 {
compatible = "simple-bus";
#address-cells = <2>;
@ -641,8 +642,6 @@
<0 0 40 &gic 0 40 4>,
<0 0 41 &gic 0 41 4>,
<0 0 42 &gic 0 42 4>;
/include/ "vexpress-v2m-rs1.dtsi"
};
site2: hsb@40000000 {

5
arch/arm/boot/dts/vexpress-v2p-ca5s.dts
View File

@ -9,6 +9,7 @@
*/
/dts-v1/;
#include "vexpress-v2m-rs1.dtsi"
/ {
model = "V2P-CA5s";
@ -191,7 +192,7 @@
};
};
smb@8000000 {
smb: smb@8000000 {
compatible = "simple-bus";
#address-cells = <2>;
@ -248,8 +249,6 @@
<0 0 40 &gic 0 40 4>,
<0 0 41 &gic 0 41 4>,
<0 0 42 &gic 0 42 4>;
/include/ "vexpress-v2m-rs1.dtsi"
};
site2: hsb@40000000 {

5
arch/arm/boot/dts/vexpress-v2p-ca9.dts
View File

@ -9,6 +9,7 @@
*/
/dts-v1/;
#include "vexpress-v2m.dtsi"
/ {
model = "V2P-CA9";
@ -301,7 +302,7 @@
};
};
smb@4000000 {
smb: smb@4000000 {
compatible = "simple-bus";
#address-cells = <2>;
@ -357,8 +358,6 @@
<0 0 40 &gic 0 40 4>,
<0 0 41 &gic 0 41 4>,
<0 0 42 &gic 0 42 4>;
/include/ "vexpress-v2m.dtsi"
};
site2: hsb@e0000000 {

5
arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
View File

@ -13,6 +13,7 @@
/dts-v1/;
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "vexpress-v2m-rs1.dtsi"
/ {
model = "V2F-1XV7 Cortex-A53x2 SMM";
@ -129,7 +130,7 @@
};
};
smb@8000000 {
smb: smb@8000000 {
compatible = "simple-bus";
#address-cells = <2>;
@ -186,7 +187,5 @@
<0 0 40 &gic GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
<0 0 41 &gic GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
<0 0 42 &gic GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
/include/ "vexpress-v2m-rs1.dtsi"
};
};