iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Berlin DT changes for v3.20 (round 1)

Browse Source 
- add PMU nodes for BG2Q and BG2CD
 - add PPI CPU masks for TWD timer interrupts
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUr6KJAAoJEN2kpao7fSL4PI8P/1j5EQoIEFl+C53M3sY9EF/6
 f+Qy38SCrv6d47YyqkFfSedAG7V78kK/VnPAmuVTrAXiejGW0aAl1Z4NIyuiHuAP
 uWwrOdqBQaooZzMeARG48VC3QgObz3yt6bb/q1D/AN/vkWfsZRqpRe9YGsT+3t7n
 BWRXTsOLXJ9ovwALcxrWGx4G5KS1DtR8iFm8tyzxkc3g4CMqfvPKe4n0MXcQyPW/
 +JsdQrkmCXHuPoRHqf76DtdcdfDltl52CFyHZPHJK2LsQCtIOEG9P2zfDRNDPmFR
 uI0Duha568uQGTSWlP6mnD6FueHVKFEwLTYYu33ELEurSmeCej+fLlEE5+d20jTV
 K+mfkhyBy5RAT4NQQ33TK4vXNUaAPCmXW4wh/xdTO7j37MvkBZSbude1hgFGdA+5
 rAj2Hsw7sdrT+i1DjHCLoDxdAeQEARywq/17E704OZ4aWjyL3AVBAs8pdQjjCF9d
 MA4d8TZ9lvWu2nD4iAfpxYLbH0yhymqLfbvZRBkURjM5tjMGeC79Wk0ZjK9OXOwi
 xm78UuMkW95sFJka3HzSUTTv0igx119tgctofCjM62Wc5kUaMCrtTuhoibm2tAt/
 UtFMv8v47wy6TfdOrjbgKLxnRel34ECHtwXZXR3SkvJ2SLZWNe7BB+zoQzhWLOpe
 pQVDDCH95BzIVCxs6jIU
 =YfUK
 -----END PGP SIGNATURE-----

Merge tag 'berlin-dt-for-3.20-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt

Merge "ARM: berlin: DT changes for v3.20 (round 1)" from Sebastian Hesselbarth:

Berlin DT changes for v3.20 (round 1)
- add PMU nodes for BG2Q and BG2CD
- add PPI CPU masks for TWD timer interrupts

* tag 'berlin-dt-for-3.20-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: dts: berlin: add PPI cpu mask to twd timer interrupts
  ARM: dts: berlin: add pmu node for BG2Q and BG2CD

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-01-12 17:58:19 -08:00
commit d708da24fb
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/berlin2.dtsi
View File

@ -104,7 +104,7 @@
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>;
};

7
arch/arm/boot/dts/berlin2cd.dtsi
View File

@ -45,6 +45,11 @@
ranges = <0 0xf7000000 0x1000000>;
pmu {
compatible = "arm,cortex-a9-pmu";
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
};
sdhci0: sdhci@ab0000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0000 0x200>;
@ -71,7 +76,7 @@
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>;
};

10
arch/arm/boot/dts/berlin2q.dtsi
View File

@ -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@ab0000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0000 0x200>;
@ -104,7 +112,7 @@
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 {