| Message ID | 1419487942-2277-3-git-send-email-jszhang@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 25.12.2014 07:12, Jisheng Zhang wrote: > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Jisheng, thanks for the patches! Please always add some text to the commit log, no matter how simple the change is. > --- > arch/arm/boot/dts/berlin2.dtsi | 3 ++- > arch/arm/boot/dts/berlin2cd.dtsi | 3 ++- > arch/arm/boot/dts/berlin2q.dtsi | 3 ++- > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi > index 015a06c..f6d9002 100644 > --- a/arch/arm/boot/dts/berlin2.dtsi > +++ b/arch/arm/boot/dts/berlin2.dtsi > @@ -104,7 +104,8 @@ > local-timer@ad0600 { > compatible = "arm,cortex-a9-twd-timer"; > reg = <0xad0600 0x20>; > - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; > + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | > + IRQ_TYPE_LEVEL_HIGH)>; IMHO, feel free to ignore 80-column restriction on each of the lines changed. Sebastian > clocks = <&chip CLKID_TWD>; > }; > > diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi > index a318bc3..517a364 100644 > --- a/arch/arm/boot/dts/berlin2cd.dtsi > +++ b/arch/arm/boot/dts/berlin2cd.dtsi > @@ -76,7 +76,8 @@ > local-timer@ad0600 { > compatible = "arm,cortex-a9-twd-timer"; > reg = <0xad0600 0x20>; > - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; > + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | > + IRQ_TYPE_LEVEL_HIGH)>; > clocks = <&chip CLKID_TWD>; > }; > > diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi > index 933dcbb..33fbf8f 100644 > --- a/arch/arm/boot/dts/berlin2q.dtsi > +++ b/arch/arm/boot/dts/berlin2q.dtsi > @@ -112,7 +112,8 @@ > compatible = "arm,cortex-a9-twd-timer"; > reg = <0xad0600 0x20>; > clocks = <&chip CLKID_TWD>; > - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; > + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | > + IRQ_TYPE_LEVEL_HIGH)>; > }; > > gic: interrupt-controller@ad1000 { >
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index 015a06c..f6d9002 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi @@ -104,7 +104,8 @@ local-timer@ad0600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0xad0600 0x20>; - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | + IRQ_TYPE_LEVEL_HIGH)>; clocks = <&chip CLKID_TWD>; }; diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi index a318bc3..517a364 100644 --- a/arch/arm/boot/dts/berlin2cd.dtsi +++ b/arch/arm/boot/dts/berlin2cd.dtsi @@ -76,7 +76,8 @@ local-timer@ad0600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0xad0600 0x20>; - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | + IRQ_TYPE_LEVEL_HIGH)>; clocks = <&chip CLKID_TWD>; }; diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 933dcbb..33fbf8f 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi @@ -112,7 +112,8 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0xad0600 0x20>; clocks = <&chip CLKID_TWD>; - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | + IRQ_TYPE_LEVEL_HIGH)>; }; gic: interrupt-controller@ad1000 {
Signed-off-by: Jisheng Zhang <jszhang@marvell.com> --- arch/arm/boot/dts/berlin2.dtsi | 3 ++- arch/arm/boot/dts/berlin2cd.dtsi | 3 ++- arch/arm/boot/dts/berlin2q.dtsi | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)