From 8943f5530dacf5074f3faced9f0976576830ada6 Mon Sep 17 00:00:00 2001 From: Loc Ho Date: Tue, 19 Jan 2016 19:27:43 -0700 Subject: arm64: dts: apm: Update Merlin DT PCP PLL clock node for v2 hardware Update Merlin DT PCP PLL clock node to reflect compatible string change to reflect v2 hardware. [dhdang: change patch subject] Signed-off-by: Loc Ho Signed-off-by: Duc Dang --- arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm64/boot/dts/apm') diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi index 5d87a3dc44b8..83d293eee37e 100644 --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi @@ -224,7 +224,7 @@ }; socpll: socpll@17000120 { - compatible = "apm,xgene-socpll-clock"; + compatible = "apm,xgene-socpll-v2-clock"; #clock-cells = <1>; clocks = <&refclk 0>; reg = <0x0 0x17000120 0x0 0x1000>; -- cgit v1.2.3 From 47f134a2d585b9bee251d5ae8d671e5e2cd93247 Mon Sep 17 00:00:00 2001 From: Quan Nguyen Date: Wed, 17 Feb 2016 20:15:09 +0700 Subject: arm64: dts: apm: Update X-Gene standby GPIO controller DTS entries Update APM X-Gene standby GPIO controller DTS entries to enable it as interrupt controller. [dhdang: update patch subject] Signed-off-by: Y Vo Signed-off-by: Quan Nguyen Reviewed-by: Linus Walleij Signed-off-by: Duc Dang --- arch/arm64/boot/dts/apm/apm-storm.dtsi | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm64/boot/dts/apm') diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index fe30f7671ea3..0f733da41c03 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -883,6 +883,9 @@ <0x0 0x2b 0x1>, <0x0 0x2c 0x1>, <0x0 0x2d 0x1>; + interrupt-parent = <&gic>; + #interrupt-cells = <2>; + interrupt-controller; }; rtc: rtc@10510000 { -- cgit v1.2.3 From 310b1406a526d859d84ed6187ba08b19f154cee8 Mon Sep 17 00:00:00 2001 From: Duc Dang Date: Thu, 25 Feb 2016 07:56:27 -0800 Subject: arm64: dts: apm: Update GPIO to control power-off on X-Gene v1 platforms This patch updates gpio-keys node that supports power-off for X-Gene v1 Mustang board to adapt with new changes in xgene-gpio-sb driver (to support configuring some GPIO pins as interrupt pins). Signed-off-by: Duc Dang --- arch/arm64/boot/dts/apm/apm-mustang.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm64/boot/dts/apm') diff --git a/arch/arm64/boot/dts/apm/apm-mustang.dts b/arch/arm64/boot/dts/apm/apm-mustang.dts index 178aef2cdd09..44db32ec5e9c 100644 --- a/arch/arm64/boot/dts/apm/apm-mustang.dts +++ b/arch/arm64/boot/dts/apm/apm-mustang.dts @@ -30,7 +30,8 @@ label = "POWER"; linux,code = <116>; linux,input-type = <0x1>; - interrupts = <0x0 0x2d 0x1>; + interrupt-parent = <&sbgpio>; + interrupts = <0x5 0x1>; }; }; -- cgit v1.2.3 From b8a4ee33d9f3115c60ad6d8f9d0c65532f46f9c7 Mon Sep 17 00:00:00 2001 From: Duc Dang Date: Thu, 25 Feb 2016 13:36:13 -0800 Subject: arm64: dts: apm: Update GPIO standby controller DT node for X-Gene v2 platforms xgene-gpio-sb driver now supports configuring some GPIO pins as interrupt pins. This patch adds the required fields for GPIO standby controller DT node of X-Gene v2 platform to work with this new driver change. Signed-off-by: Quan Nguyen Signed-off-by: Duc Dang --- arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/arm64/boot/dts/apm') diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi index 83d293eee37e..66b394220b69 100644 --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi @@ -598,6 +598,12 @@ <0x0 0x2d 0x1>, <0x0 0x2e 0x1>, <0x0 0x2f 0x1>; + interrupt-parent = <&gic>; + #interrupt-cells = <2>; + interrupt-controller; + apm,nr-gpios = <22>; + apm,nr-irqs = <8>; + apm,irq-start = <8>; }; sgenet0: ethernet@1f610000 { -- cgit v1.2.3 From edf21f271024ec6adb93c7b4e6c1dc928b6a7250 Mon Sep 17 00:00:00 2001 From: Duc Dang Date: Thu, 25 Feb 2016 13:52:52 -0800 Subject: arm64: dts: apm: Update GPIO to control power-off on X-Gene v2 platforms This patch updates gpio-keys node that supports power-off for X-Gene v2 Merlin board to adapt with new changes in xgene-gpio-sb driver (to support configuring some GPIO pins as interrupt pins). Signed-off-by: Quan Nguyen Signed-off-by: Duc Dang --- arch/arm64/boot/dts/apm/apm-merlin.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm64/boot/dts/apm') diff --git a/arch/arm64/boot/dts/apm/apm-merlin.dts b/arch/arm64/boot/dts/apm/apm-merlin.dts index e5ba8d5d0cae..387c6a8d0da9 100644 --- a/arch/arm64/boot/dts/apm/apm-merlin.dts +++ b/arch/arm64/boot/dts/apm/apm-merlin.dts @@ -30,7 +30,8 @@ label = "POWER"; linux,code = <116>; linux,input-type = <0x1>; - interrupts = <0x0 0x28 0x1>; + interrupt-parent = <&sbgpio>; + interrupts = <0x0 0x1>; }; }; -- cgit v1.2.3 From b0e4563c2f6d939a124f06e10b205151bbac487c Mon Sep 17 00:00:00 2001 From: Duc Dang Date: Fri, 12 Feb 2016 19:39:28 -0800 Subject: arm64: dts: apm: mailbox device tree node for APM X-Gene platform. Mailbox device tree node for APM X-Gene platform. Signed-off-by: Feng Kan Signed-off-by: Duc Dang Signed-off-by: Jassi Brar --- arch/arm64/boot/dts/apm/apm-storm.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'arch/arm64/boot/dts/apm') diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index 0f733da41c03..1bf2c772fb90 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -691,6 +691,20 @@ 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>; + }; + serial0: serial@1c020000 { status = "disabled"; device_type = "serial"; -- cgit v1.2.3 From 778b5cbc0dd68c60149eca9dad4e6b2417583ed2 Mon Sep 17 00:00:00 2001 From: Duc Dang Date: Thu, 25 Feb 2016 14:18:37 -0800 Subject: arm64: dts: apm: Add DT node for X-Gene v1 SLIMpro Mailbox I2C Driver Add DT node to enable SLIMpro Mailbox I2C Driver for X-Gene v1 platforms. Signed-off-by: Duc Dang --- arch/arm64/boot/dts/apm/apm-storm.dtsi | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arch/arm64/boot/dts/apm') diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index 1bf2c772fb90..5ceb3e4fc44f 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -705,6 +705,11 @@ <0x0 0x7 0x4>; }; + i2cslimpro { + compatible = "apm,xgene-slimpro-i2c"; + mboxes = <&mailbox 0>; + }; + serial0: serial@1c020000 { status = "disabled"; device_type = "serial"; -- cgit v1.2.3 From e99fe226615bc7943d79f5bfd3f2e0a20bc1832c Mon Sep 17 00:00:00 2001 From: Duc Dang Date: Thu, 25 Feb 2016 14:30:05 -0800 Subject: arm64: dts: apm: Mailbox device tree node for APM X-Gene v2 platform. Add mailbox device tree node for APM X-Gene v2 platform. Signed-off-by: Duc Dang --- arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'arch/arm64/boot/dts/apm') diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi index 66b394220b69..46fe1e673190 100644 --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi @@ -453,6 +453,20 @@ }; }; + 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>; + }; + serial0: serial@10600000 { device_type = "serial"; compatible = "ns16550"; -- cgit v1.2.3 From 406f5940549e78fd7d4d41413a7ed3e611bccc4f Mon Sep 17 00:00:00 2001 From: Duc Dang Date: Thu, 25 Feb 2016 14:33:37 -0800 Subject: arm64: dts: apm: Add DT node for X-Gene v2 SLIMpro Mailbox I2C Driver Add DT node to enable SLIMpro Mailbox I2C Driver for X-Gene v2 platforms. Signed-off-by: Duc Dang --- arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arch/arm64/boot/dts/apm') diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi index 46fe1e673190..04d83a163e85 100644 --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi @@ -467,6 +467,11 @@ 0x0 0x7 0x4>; }; + i2cslimpro { + compatible = "apm,xgene-slimpro-i2c"; + mboxes = <&mailbox 0>; + }; + serial0: serial@10600000 { device_type = "serial"; compatible = "ns16550"; -- cgit v1.2.3