Merge tag 'xgene-dts-for-v4.6-part2' of https://github.com/AppliedMicro/xgene-next into next/dt64 (44563cb4) · Commits · 戴 / test

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.

arch/arm64/boot/dts/apm/apm-shadowcat.dtsi

+19 −0

Original line number	Diff line number	Diff line
		@@ -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";

arch/arm64/boot/dts/apm/apm-storm.dtsi

+19 −0

Original line number	Diff line number	Diff line
		@@ -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";

Admin message