Skip to content

Commit

Permalink
Merge tag 'vexpress-dt-4.12' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history 
…rnel/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
  • Loading branch information
Arnd Bergmann committed Apr 27, 2017
2 parents 28a59b6 + e6a7efa commit 6d14b5a
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
24 changes: 12 additions & 12 deletions arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
#size-cells = <1>;
ranges = <0 3 0 0x200000>;

v2m_sysreg: sysreg@010000 {
v2m_sysreg: sysreg@10000 {
compatible = "arm,vexpress-sysreg";
reg = <0x010000 0x1000>;

Expand All @@ -94,7 +94,7 @@
};
};

v2m_sysctl: sysctl@020000 {
v2m_sysctl: sysctl@20000 {
compatible = "arm,sp810", "arm,primecell";
reg = <0x020000 0x1000>;
clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&smbclk>;
Expand All @@ -106,7 +106,7 @@
};

/* PCI-E I2C bus */
v2m_i2c_pcie: i2c@030000 {
v2m_i2c_pcie: i2c@30000 {
compatible = "arm,versatile-i2c";
reg = <0x030000 0x1000>;

Expand All @@ -119,15 +119,15 @@
};
};

aaci@040000 {
aaci@40000 {
compatible = "arm,pl041", "arm,primecell";
reg = <0x040000 0x1000>;
interrupts = <11>;
clocks = <&smbclk>;
clock-names = "apb_pclk";
};

mmci@050000 {
mmci@50000 {
compatible = "arm,pl180", "arm,primecell";
reg = <0x050000 0x1000>;
interrupts = <9 10>;
Expand All @@ -139,55 +139,55 @@
clock-names = "mclk", "apb_pclk";
};

kmi@060000 {
kmi@60000 {
compatible = "arm,pl050", "arm,primecell";
reg = <0x060000 0x1000>;
interrupts = <12>;
clocks = <&v2m_clk24mhz>, <&smbclk>;
clock-names = "KMIREFCLK", "apb_pclk";
};

kmi@070000 {
kmi@70000 {
compatible = "arm,pl050", "arm,primecell";
reg = <0x070000 0x1000>;
interrupts = <13>;
clocks = <&v2m_clk24mhz>, <&smbclk>;
clock-names = "KMIREFCLK", "apb_pclk";
};

v2m_serial0: uart@090000 {
v2m_serial0: uart@90000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x090000 0x1000>;
interrupts = <5>;
clocks = <&v2m_oscclk2>, <&smbclk>;
clock-names = "uartclk", "apb_pclk";
};

v2m_serial1: uart@0a0000 {
v2m_serial1: uart@a0000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0a0000 0x1000>;
interrupts = <6>;
clocks = <&v2m_oscclk2>, <&smbclk>;
clock-names = "uartclk", "apb_pclk";
};

v2m_serial2: uart@0b0000 {
v2m_serial2: uart@b0000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0b0000 0x1000>;
interrupts = <7>;
clocks = <&v2m_oscclk2>, <&smbclk>;
clock-names = "uartclk", "apb_pclk";
};

v2m_serial3: uart@0c0000 {
v2m_serial3: uart@c0000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0c0000 0x1000>;
interrupts = <8>;
clocks = <&v2m_oscclk2>, <&smbclk>;
clock-names = "uartclk", "apb_pclk";
};

wdt@0f0000 {
wdt@f0000 {
compatible = "arm,sp805", "arm,primecell";
reg = <0x0f0000 0x1000>;
interrupts = <0>;
Expand Down
24 changes: 12 additions & 12 deletions arch/arm/boot/dts/vexpress-v2m.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
#size-cells = <1>;
ranges = <0 7 0 0x20000>;

v2m_sysreg: sysreg@00000 {
v2m_sysreg: sysreg@0 {
compatible = "arm,vexpress-sysreg";
reg = <0x00000 0x1000>;

Expand All @@ -93,7 +93,7 @@
};
};

v2m_sysctl: sysctl@01000 {
v2m_sysctl: sysctl@1000 {
compatible = "arm,sp810", "arm,primecell";
reg = <0x01000 0x1000>;
clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&smbclk>;
Expand All @@ -105,7 +105,7 @@
};

/* PCI-E I2C bus */
v2m_i2c_pcie: i2c@02000 {
v2m_i2c_pcie: i2c@2000 {
compatible = "arm,versatile-i2c";
reg = <0x02000 0x1000>;

Expand All @@ -118,15 +118,15 @@
};
};

aaci@04000 {
aaci@4000 {
compatible = "arm,pl041", "arm,primecell";
reg = <0x04000 0x1000>;
interrupts = <11>;
clocks = <&smbclk>;
clock-names = "apb_pclk";
};

mmci@05000 {
mmci@5000 {
compatible = "arm,pl180", "arm,primecell";
reg = <0x05000 0x1000>;
interrupts = <9 10>;
Expand All @@ -138,55 +138,55 @@
clock-names = "mclk", "apb_pclk";
};

kmi@06000 {
kmi@6000 {
compatible = "arm,pl050", "arm,primecell";
reg = <0x06000 0x1000>;
interrupts = <12>;
clocks = <&v2m_clk24mhz>, <&smbclk>;
clock-names = "KMIREFCLK", "apb_pclk";
};

kmi@07000 {
kmi@7000 {
compatible = "arm,pl050", "arm,primecell";
reg = <0x07000 0x1000>;
interrupts = <13>;
clocks = <&v2m_clk24mhz>, <&smbclk>;
clock-names = "KMIREFCLK", "apb_pclk";
};

v2m_serial0: uart@09000 {
v2m_serial0: uart@9000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x09000 0x1000>;
interrupts = <5>;
clocks = <&v2m_oscclk2>, <&smbclk>;
clock-names = "uartclk", "apb_pclk";
};

v2m_serial1: uart@0a000 {
v2m_serial1: uart@a000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0a000 0x1000>;
interrupts = <6>;
clocks = <&v2m_oscclk2>, <&smbclk>;
clock-names = "uartclk", "apb_pclk";
};

v2m_serial2: uart@0b000 {
v2m_serial2: uart@b000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0b000 0x1000>;
interrupts = <7>;
clocks = <&v2m_oscclk2>, <&smbclk>;
clock-names = "uartclk", "apb_pclk";
};

v2m_serial3: uart@0c000 {
v2m_serial3: uart@c000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0c000 0x1000>;
interrupts = <8>;
clocks = <&v2m_oscclk2>, <&smbclk>;
clock-names = "uartclk", "apb_pclk";
};

wdt@0f000 {
wdt@f000 {
compatible = "arm,sp805", "arm,primecell";
reg = <0x0f000 0x1000>;
interrupts = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
};
};

smb@08000000 {
smb@8000000 {
compatible = "simple-bus";

#address-cells = <2>;
Expand Down
18 changes: 9 additions & 9 deletions arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@
};
};

etb@0,20010000 {
etb@20010000 {
compatible = "arm,coresight-etb10", "arm,primecell";
reg = <0 0x20010000 0 0x1000>;

Expand All @@ -399,7 +399,7 @@
};
};

tpiu@0,20030000 {
tpiu@20030000 {
compatible = "arm,coresight-tpiu", "arm,primecell";
reg = <0 0x20030000 0 0x1000>;

Expand Down Expand Up @@ -449,7 +449,7 @@
};
};

funnel@0,20040000 {
funnel@20040000 {
compatible = "arm,coresight-funnel", "arm,primecell";
reg = <0 0x20040000 0 0x1000>;

Expand Down Expand Up @@ -513,7 +513,7 @@
};
};

ptm@0,2201c000 {
ptm@2201c000 {
compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2201c000 0 0x1000>;

Expand All @@ -527,7 +527,7 @@
};
};

ptm@0,2201d000 {
ptm@2201d000 {
compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2201d000 0 0x1000>;

Expand All @@ -541,7 +541,7 @@
};
};

etm@0,2203c000 {
etm@2203c000 {
compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2203c000 0 0x1000>;

Expand All @@ -555,7 +555,7 @@
};
};

etm@0,2203d000 {
etm@2203d000 {
compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2203d000 0 0x1000>;

Expand All @@ -569,7 +569,7 @@
};
};

etm@0,2203e000 {
etm@2203e000 {
compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0 0x2203e000 0 0x1000>;

Expand All @@ -583,7 +583,7 @@
};
};

smb@08000000 {
smb@8000000 {
compatible = "simple-bus";

#address-cells = <2>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/vexpress-v2p-ca5s.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
};
};

smb@08000000 {
smb@8000000 {
compatible = "simple-bus";

#address-cells = <2>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/vexpress-v2p-ca9.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
};
};

smb@04000000 {
smb@4000000 {
compatible = "simple-bus";

#address-cells = <2>;
Expand Down

0 comments on commit 6d14b5a

Please sign in to comment.