hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARMv7 VExpress DT fix for v4.12 

A single fix to remove device tree warnings introduced with recently
 added checks in DTC
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJY94/6AAoJEABBurwxfuKYGoMQAKyzboF8FXtOJ2nTQpHltuPS
 1Tg64BQAPX9Af9OGfeTFldIKloQWsp5WUEAIvqID3s8pcabG8E+dwAt4pyzHcGas
 Vb+2zB8ZiWFrQImyLqSLZkd1fUueLB4JAYxx6lnR8A/BPD3r3itvcZkW7T4Tc60H
 1V8fMEAav5GEPT99GPNCB26w4yJ990ZERF2zOIytqoKKbXn4ggQe7F/zjUpx6zVb
 8csj+kKYeejTFH6PZ58/gsmga0ZbycA/8/IOTaagG7lYEMaaz2/pCgclm+GDT7Ta
 WvaH9YNCTeupeHqCwzyNglPIbnUeGBNb6Qc7OMD9orrIyqPDU5E0z3WcfsWzOywd
 V3SPPzOowGTPJ5CdK323eEKk4+i946H/VWO8hD+WgNTAHYHUuyTWhDERtaVMfAX8
 c7+VHXd8v2FGPMguNTIFUQX/+KGCP4hIriF0UOz8Rg19eqwPw7sTudB3Jxjzzm//
 KWG6/no3yqYQVgWZnQ7kJnp/GCOeh39qUxfdpTlesUffweoOIMM00t1KzqsPw1jT
 XZA9gTR7MXoAcew1FF+D8BUnNRN5Gc6Ef/WO5mwYqk7GcAFGEANxM7LIMM7Sv+iy
 WXN+gmBUU0wLWmy1G+ZGRcSG9nhdpUPJfdwJKppZ8vr7xiDdjcXw6wg8Rg91idqj
 pUICwBctol04PqdbjHK+
 =kv8P
 -----END PGP SIGNATURE-----

Merge tag 'vexpress-dt-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt

Pull "ARMv7 VExpress DT fix for v4.12" from Sudeep Holla:

A single fix to remove device tree warnings introduced with recently
added checks in DTC

* tag 'vexpress-dt-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  ARM: dts: vexpress: fix few unit address format warnings
This commit is contained in:
Arnd Bergmann 2017-04-27 21:40:15 +02:00
parent 28a59b6166 e6a7efad79
commit 6d14b5a0ba
6 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@
#size-cells = <1>; #size-cells = <1>;
ranges = <0 3 0 0x200000>; ranges = <0 3 0 0x200000>;
v2m_sysreg: sysreg@010000 { v2m_sysreg: sysreg@10000 {
compatible = "arm,vexpress-sysreg"; compatible = "arm,vexpress-sysreg";
reg = <0x010000 0x1000>; reg = <0x010000 0x1000>;
@ -94,7 +94,7 @@
}; };
}; };
v2m_sysctl: sysctl@020000 { v2m_sysctl: sysctl@20000 {
compatible = "arm,sp810", "arm,primecell"; compatible = "arm,sp810", "arm,primecell";
reg = <0x020000 0x1000>; reg = <0x020000 0x1000>;
clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&smbclk>; clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&smbclk>;
@ -106,7 +106,7 @@
}; };
/* PCI-E I2C bus */ /* PCI-E I2C bus */
v2m_i2c_pcie: i2c@030000 { v2m_i2c_pcie: i2c@30000 {
compatible = "arm,versatile-i2c"; compatible = "arm,versatile-i2c";
reg = <0x030000 0x1000>; reg = <0x030000 0x1000>;
@ -119,7 +119,7 @@
}; };
}; };
aaci@040000 { aaci@40000 {
compatible = "arm,pl041", "arm,primecell"; compatible = "arm,pl041", "arm,primecell";
reg = <0x040000 0x1000>; reg = <0x040000 0x1000>;
interrupts = <11>; interrupts = <11>;
@ -127,7 +127,7 @@
clock-names = "apb_pclk"; clock-names = "apb_pclk";
}; };
mmci@050000 { mmci@50000 {
compatible = "arm,pl180", "arm,primecell"; compatible = "arm,pl180", "arm,primecell";
reg = <0x050000 0x1000>; reg = <0x050000 0x1000>;
interrupts = <9 10>; interrupts = <9 10>;
@ -139,7 +139,7 @@
clock-names = "mclk", "apb_pclk"; clock-names = "mclk", "apb_pclk";
}; };
kmi@060000 { kmi@60000 {
compatible = "arm,pl050", "arm,primecell"; compatible = "arm,pl050", "arm,primecell";
reg = <0x060000 0x1000>; reg = <0x060000 0x1000>;
interrupts = <12>; interrupts = <12>;
@ -147,7 +147,7 @@
clock-names = "KMIREFCLK", "apb_pclk"; clock-names = "KMIREFCLK", "apb_pclk";
}; };
kmi@070000 { kmi@70000 {
compatible = "arm,pl050", "arm,primecell"; compatible = "arm,pl050", "arm,primecell";
reg = <0x070000 0x1000>; reg = <0x070000 0x1000>;
interrupts = <13>; interrupts = <13>;
@ -155,7 +155,7 @@
clock-names = "KMIREFCLK", "apb_pclk"; clock-names = "KMIREFCLK", "apb_pclk";
}; };
v2m_serial0: uart@090000 { v2m_serial0: uart@90000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x090000 0x1000>; reg = <0x090000 0x1000>;
interrupts = <5>; interrupts = <5>;
@ -163,7 +163,7 @@
clock-names = "uartclk", "apb_pclk"; clock-names = "uartclk", "apb_pclk";
}; };
v2m_serial1: uart@0a0000 { v2m_serial1: uart@a0000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x0a0000 0x1000>; reg = <0x0a0000 0x1000>;
interrupts = <6>; interrupts = <6>;
@ -171,7 +171,7 @@
clock-names = "uartclk", "apb_pclk"; clock-names = "uartclk", "apb_pclk";
}; };
v2m_serial2: uart@0b0000 { v2m_serial2: uart@b0000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x0b0000 0x1000>; reg = <0x0b0000 0x1000>;
interrupts = <7>; interrupts = <7>;
@ -179,7 +179,7 @@
clock-names = "uartclk", "apb_pclk"; clock-names = "uartclk", "apb_pclk";
}; };
v2m_serial3: uart@0c0000 { v2m_serial3: uart@c0000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x0c0000 0x1000>; reg = <0x0c0000 0x1000>;
interrupts = <8>; interrupts = <8>;
@ -187,7 +187,7 @@
clock-names = "uartclk", "apb_pclk"; clock-names = "uartclk", "apb_pclk";
}; };
wdt@0f0000 { wdt@f0000 {
compatible = "arm,sp805", "arm,primecell"; compatible = "arm,sp805", "arm,primecell";
reg = <0x0f0000 0x1000>; reg = <0x0f0000 0x1000>;
interrupts = <0>; interrupts = <0>;

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

@ -70,7 +70,7 @@
#size-cells = <1>; #size-cells = <1>;
ranges = <0 7 0 0x20000>; ranges = <0 7 0 0x20000>;
v2m_sysreg: sysreg@00000 { v2m_sysreg: sysreg@0 {
compatible = "arm,vexpress-sysreg"; compatible = "arm,vexpress-sysreg";
reg = <0x00000 0x1000>; reg = <0x00000 0x1000>;
@ -93,7 +93,7 @@
}; };
}; };
v2m_sysctl: sysctl@01000 { v2m_sysctl: sysctl@1000 {
compatible = "arm,sp810", "arm,primecell"; compatible = "arm,sp810", "arm,primecell";
reg = <0x01000 0x1000>; reg = <0x01000 0x1000>;
clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&smbclk>; clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&smbclk>;
@ -105,7 +105,7 @@
}; };
/* PCI-E I2C bus */ /* PCI-E I2C bus */
v2m_i2c_pcie: i2c@02000 { v2m_i2c_pcie: i2c@2000 {
compatible = "arm,versatile-i2c"; compatible = "arm,versatile-i2c";
reg = <0x02000 0x1000>; reg = <0x02000 0x1000>;
@ -118,7 +118,7 @@
}; };
}; };
aaci@04000 { aaci@4000 {
compatible = "arm,pl041", "arm,primecell"; compatible = "arm,pl041", "arm,primecell";
reg = <0x04000 0x1000>; reg = <0x04000 0x1000>;
interrupts = <11>; interrupts = <11>;
@ -126,7 +126,7 @@
clock-names = "apb_pclk"; clock-names = "apb_pclk";
}; };
mmci@05000 { mmci@5000 {
compatible = "arm,pl180", "arm,primecell"; compatible = "arm,pl180", "arm,primecell";
reg = <0x05000 0x1000>; reg = <0x05000 0x1000>;
interrupts = <9 10>; interrupts = <9 10>;
@ -138,7 +138,7 @@
clock-names = "mclk", "apb_pclk"; clock-names = "mclk", "apb_pclk";
}; };
kmi@06000 { kmi@6000 {
compatible = "arm,pl050", "arm,primecell"; compatible = "arm,pl050", "arm,primecell";
reg = <0x06000 0x1000>; reg = <0x06000 0x1000>;
interrupts = <12>; interrupts = <12>;
@ -146,7 +146,7 @@
clock-names = "KMIREFCLK", "apb_pclk"; clock-names = "KMIREFCLK", "apb_pclk";
}; };
kmi@07000 { kmi@7000 {
compatible = "arm,pl050", "arm,primecell"; compatible = "arm,pl050", "arm,primecell";
reg = <0x07000 0x1000>; reg = <0x07000 0x1000>;
interrupts = <13>; interrupts = <13>;
@ -154,7 +154,7 @@
clock-names = "KMIREFCLK", "apb_pclk"; clock-names = "KMIREFCLK", "apb_pclk";
}; };
v2m_serial0: uart@09000 { v2m_serial0: uart@9000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x09000 0x1000>; reg = <0x09000 0x1000>;
interrupts = <5>; interrupts = <5>;
@ -162,7 +162,7 @@
clock-names = "uartclk", "apb_pclk"; clock-names = "uartclk", "apb_pclk";
}; };
v2m_serial1: uart@0a000 { v2m_serial1: uart@a000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x0a000 0x1000>; reg = <0x0a000 0x1000>;
interrupts = <6>; interrupts = <6>;
@ -170,7 +170,7 @@
clock-names = "uartclk", "apb_pclk"; clock-names = "uartclk", "apb_pclk";
}; };
v2m_serial2: uart@0b000 { v2m_serial2: uart@b000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x0b000 0x1000>; reg = <0x0b000 0x1000>;
interrupts = <7>; interrupts = <7>;
@ -178,7 +178,7 @@
clock-names = "uartclk", "apb_pclk"; clock-names = "uartclk", "apb_pclk";
}; };
v2m_serial3: uart@0c000 { v2m_serial3: uart@c000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x0c000 0x1000>; reg = <0x0c000 0x1000>;
interrupts = <8>; interrupts = <8>;
@ -186,7 +186,7 @@
clock-names = "uartclk", "apb_pclk"; clock-names = "uartclk", "apb_pclk";
}; };
wdt@0f000 { wdt@f000 {
compatible = "arm,sp805", "arm,primecell"; compatible = "arm,sp805", "arm,primecell";
reg = <0x0f000 0x1000>; reg = <0x0f000 0x1000>;
interrupts = <0>; interrupts = <0>;

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

@ -220,7 +220,7 @@
}; };
}; };
smb@08000000 { smb@8000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;

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

@ -385,7 +385,7 @@
}; };
}; };
etb@0,20010000 { etb@20010000 {
compatible = "arm,coresight-etb10", "arm,primecell"; compatible = "arm,coresight-etb10", "arm,primecell";
reg = <0 0x20010000 0 0x1000>; reg = <0 0x20010000 0 0x1000>;
@ -399,7 +399,7 @@
}; };
}; };
tpiu@0,20030000 { tpiu@20030000 {
compatible = "arm,coresight-tpiu", "arm,primecell"; compatible = "arm,coresight-tpiu", "arm,primecell";
reg = <0 0x20030000 0 0x1000>; reg = <0 0x20030000 0 0x1000>;
@ -449,7 +449,7 @@
}; };
}; };
funnel@0,20040000 { funnel@20040000 {
compatible = "arm,coresight-funnel", "arm,primecell"; compatible = "arm,coresight-funnel", "arm,primecell";
reg = <0 0x20040000 0 0x1000>; reg = <0 0x20040000 0 0x1000>;
@ -513,7 +513,7 @@
}; };
}; };
ptm@0,2201c000 { ptm@2201c000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2201c000 0 0x1000>; reg = <0 0x2201c000 0 0x1000>;
@ -527,7 +527,7 @@
}; };
}; };
ptm@0,2201d000 { ptm@2201d000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2201d000 0 0x1000>; reg = <0 0x2201d000 0 0x1000>;
@ -541,7 +541,7 @@
}; };
}; };
etm@0,2203c000 { etm@2203c000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2203c000 0 0x1000>; reg = <0 0x2203c000 0 0x1000>;
@ -555,7 +555,7 @@
}; };
}; };
etm@0,2203d000 { etm@2203d000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2203d000 0 0x1000>; reg = <0 0x2203d000 0 0x1000>;
@ -569,7 +569,7 @@
}; };
}; };
etm@0,2203e000 { etm@2203e000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2203e000 0 0x1000>; reg = <0 0x2203e000 0 0x1000>;
@ -583,7 +583,7 @@
}; };
}; };
smb@08000000 { smb@8000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;

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

@ -190,7 +190,7 @@
}; };
}; };
smb@08000000 { smb@8000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;

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

@ -300,7 +300,7 @@
}; };
}; };
smb@04000000 { smb@4000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;