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 diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi index 5d87a3d..83d293ee 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 v0.10.2 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 diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index fe30f76..0f733da 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 v0.10.2 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 diff --git a/arch/arm64/boot/dts/apm/apm-mustang.dts b/arch/arm64/boot/dts/apm/apm-mustang.dts index 178aef2..44db32e 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 v0.10.2 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 diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi index 83d293ee..66b3942 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 v0.10.2 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 diff --git a/arch/arm64/boot/dts/apm/apm-merlin.dts b/arch/arm64/boot/dts/apm/apm-merlin.dts index e5ba8d5..387c6a8 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 v0.10.2