summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-03-01 00:40:58 +0100
committerArnd Bergmann <arnd@arndb.de>2016-03-01 00:40:58 +0100
commit44563cb452b59c271ab56e1ed76154e2d3fcc407 (patch)
treedeb73740a4b25e968e1a37fd05ce8d036f75daef /arch/arm64
parentMerge tag 'xgene-dts-for-v4.6-part1' of https://github.com/AppliedMicro/xgene... (diff)
parentarm64: dts: apm: Add DT node for X-Gene v2 SLIMpro Mailbox I2C Driver (diff)
downloadlinux-44563cb452b59c271ab56e1ed76154e2d3fcc407.tar.xz
linux-44563cb452b59c271ab56e1ed76154e2d3fcc407.zip
Merge tag 'xgene-dts-for-v4.6-part2' of https://github.com/AppliedMicro/xgene-next into next/dt64
Merge "Second part of X-Gene DT changes queued for v4.6" from Duc Dang: This patch set includes: + X-Gene v2 Mailbox DT node + X-Gene v1 and X-Gene v2 SLIMpro Mailbox I2C driver DT nodes * tag 'xgene-dts-for-v4.6-part2' of https://github.com/AppliedMicro/xgene-next: arm64: dts: apm: Add DT node for X-Gene v2 SLIMpro Mailbox I2C Driver arm64: dts: apm: Mailbox device tree node for APM X-Gene v2 platform. arm64: dts: apm: Add DT node for X-Gene v1 SLIMpro Mailbox I2C Driver arm64: dts: apm: mailbox device tree node for APM X-Gene platform.
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/apm/apm-shadowcat.dtsi19
-rw-r--r--arch/arm64/boot/dts/apm/apm-storm.dtsi19
2 files changed, 38 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
index 66b394220b69..04d83a163e85 100644
--- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
@@ -453,6 +453,25 @@
};
};
+ mailbox: mailbox@10540000 {
+ compatible = "apm,xgene-slimpro-mbox";
+ reg = <0x0 0x10540000 0x0 0x8000>;
+ #mbox-cells = <1>;
+ interrupts = <0x0 0x0 0x4
+ 0x0 0x1 0x4
+ 0x0 0x2 0x4
+ 0x0 0x3 0x4
+ 0x0 0x4 0x4
+ 0x0 0x5 0x4
+ 0x0 0x6 0x4
+ 0x0 0x7 0x4>;
+ };
+
+ i2cslimpro {
+ compatible = "apm,xgene-slimpro-i2c";
+ mboxes = <&mailbox 0>;
+ };
+
serial0: serial@10600000 {
device_type = "serial";
compatible = "ns16550";
diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi
index 0f733da41c03..5ceb3e4fc44f 100644
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@ -691,6 +691,25 @@
msi-parent = <&msi>;
};
+ mailbox: mailbox@10540000 {
+ compatible = "apm,xgene-slimpro-mbox";
+ reg = <0x0 0x10540000 0x0 0xa000>;
+ #mbox-cells = <1>;
+ interrupts = <0x0 0x0 0x4>,
+ <0x0 0x1 0x4>,
+ <0x0 0x2 0x4>,
+ <0x0 0x3 0x4>,
+ <0x0 0x4 0x4>,
+ <0x0 0x5 0x4>,
+ <0x0 0x6 0x4>,
+ <0x0 0x7 0x4>;
+ };
+
+ i2cslimpro {
+ compatible = "apm,xgene-slimpro-i2c";
+ mboxes = <&mailbox 0>;
+ };
+
serial0: serial@1c020000 {
status = "disabled";
device_type = "serial";