* [PATCH 0/2] ARM: dts: berlin: enable PMU and add PPI cpu mask to twd interrupts
@ 2014-12-25 6:12 Jisheng Zhang
2014-12-25 6:12 ` [PATCH 1/2] ARM: dts: berlin: add pmu node for BG2Q and BG2CD Jisheng Zhang
2014-12-25 6:12 ` [PATCH 2/2] ARM: dts: berlin: add PPI cpu mask to twd timer interrupts Jisheng Zhang
0 siblings, 2 replies; 4+ messages in thread
From: Jisheng Zhang @ 2014-12-25 6:12 UTC (permalink / raw)
To: linux-arm-kernel
One of the patch enables PMU support to BG2Q and BG2CD SoCs. Another patch
adds the missing PPI cpu mask to twd timer interrupts.
Jisheng Zhang (2):
ARM: dts: berlin: add pmu node for BG2Q and BG2CD
ARM: dts: berlin: add PPI cpu mask to twd timer interrupts
arch/arm/boot/dts/berlin2.dtsi | 3 ++-
arch/arm/boot/dts/berlin2cd.dtsi | 8 +++++++-
arch/arm/boot/dts/berlin2q.dtsi | 11 ++++++++++-
3 files changed, 19 insertions(+), 3 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] ARM: dts: berlin: add pmu node for BG2Q and BG2CD
2014-12-25 6:12 [PATCH 0/2] ARM: dts: berlin: enable PMU and add PPI cpu mask to twd interrupts Jisheng Zhang
@ 2014-12-25 6:12 ` Jisheng Zhang
2014-12-25 6:12 ` [PATCH 2/2] ARM: dts: berlin: add PPI cpu mask to twd timer interrupts Jisheng Zhang
1 sibling, 0 replies; 4+ messages in thread
From: Jisheng Zhang @ 2014-12-25 6:12 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds the pmu node, enabling the PMU unit on Marvell BG2Q and
BG2CD SoCs.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
arch/arm/boot/dts/berlin2cd.dtsi | 5 +++++
arch/arm/boot/dts/berlin2q.dtsi | 8 ++++++++
2 files changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index 230df3b..a318bc3 100644
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -45,6 +45,11 @@
ranges = <0 0xf7000000 0x1000000>;
+ pmu {
+ compatible = "arm,cortex-a9-pmu";
+ interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
sdhci0: sdhci at ab0000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0000 0x200>;
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 35253c9..933dcbb 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -63,6 +63,14 @@
ranges = <0 0xf7000000 0x1000000>;
interrupt-parent = <&gic>;
+ pmu {
+ compatible = "arm,cortex-a9-pmu";
+ interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
sdhci0: sdhci at ab0000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0000 0x200>;
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: dts: berlin: add PPI cpu mask to twd timer interrupts
2014-12-25 6:12 [PATCH 0/2] ARM: dts: berlin: enable PMU and add PPI cpu mask to twd interrupts Jisheng Zhang
2014-12-25 6:12 ` [PATCH 1/2] ARM: dts: berlin: add pmu node for BG2Q and BG2CD Jisheng Zhang
@ 2014-12-25 6:12 ` Jisheng Zhang
2014-12-25 13:18 ` Sebastian Hesselbarth
1 sibling, 1 reply; 4+ messages in thread
From: Jisheng Zhang @ 2014-12-25 6:12 UTC (permalink / raw)
To: linux-arm-kernel
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(-)
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 at 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 at 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 at ad1000 {
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: dts: berlin: add PPI cpu mask to twd timer interrupts
2014-12-25 6:12 ` [PATCH 2/2] ARM: dts: berlin: add PPI cpu mask to twd timer interrupts Jisheng Zhang
@ 2014-12-25 13:18 ` Sebastian Hesselbarth
0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Hesselbarth @ 2014-12-25 13:18 UTC (permalink / raw)
To: linux-arm-kernel
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 at 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 at 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 at ad1000 {
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-25 13:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-25 6:12 [PATCH 0/2] ARM: dts: berlin: enable PMU and add PPI cpu mask to twd interrupts Jisheng Zhang
2014-12-25 6:12 ` [PATCH 1/2] ARM: dts: berlin: add pmu node for BG2Q and BG2CD Jisheng Zhang
2014-12-25 6:12 ` [PATCH 2/2] ARM: dts: berlin: add PPI cpu mask to twd timer interrupts Jisheng Zhang
2014-12-25 13:18 ` Sebastian Hesselbarth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).