aboutsummaryrefslogtreecommitdiffstats
path: root/arch/metag
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2013-04-22 10:43:50 -0400
committerJames Hogan <james.hogan@imgtec.com>2013-07-22 05:55:30 -0400
commit0a6923f1c0e6d49d7fd16bb8cb75d23675c7fd7a (patch)
treed18da641a2407080c006b601bc8739deea55aa26 /arch/metag
parent3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b (diff)
metag: tz1090: select and instantiate irq-imgpdc
Select IMGPDC_IRQ from SOC_TZ1090 to enable the PDC interrupt controller driver once it is merged, and instantiate it from tz1090.dtsi. Signed-off-by: James Hogan <james.hogan@imgtec.com> Acked-by: Grant Likely <grant.likely@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/metag')
-rw-r--r--arch/metag/Kconfig.soc1
-rw-r--r--arch/metag/boot/dts/tz1090.dtsi18
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/metag/Kconfig.soc b/arch/metag/Kconfig.soc
index 2a3c860c7525..50f979c2b02d 100644
--- a/arch/metag/Kconfig.soc
+++ b/arch/metag/Kconfig.soc
@@ -16,6 +16,7 @@ config META21_FPGA
16 16
17config SOC_TZ1090 17config SOC_TZ1090
18 bool "Toumaz Xenif TZ1090 SoC (Comet)" 18 bool "Toumaz Xenif TZ1090 SoC (Comet)"
19 select IMGPDC_IRQ
19 select METAG_LNKGET_AROUND_CACHE 20 select METAG_LNKGET_AROUND_CACHE
20 select METAG_META21 21 select METAG_META21
21 select METAG_SMP_WRITE_REORDERING 22 select METAG_SMP_WRITE_REORDERING
diff --git a/arch/metag/boot/dts/tz1090.dtsi b/arch/metag/boot/dts/tz1090.dtsi
index 853744652b93..d0869b19e08e 100644
--- a/arch/metag/boot/dts/tz1090.dtsi
+++ b/arch/metag/boot/dts/tz1090.dtsi
@@ -8,6 +8,8 @@
8 8
9#include "skeleton.dtsi" 9#include "skeleton.dtsi"
10 10
11#include <dt-bindings/interrupt-controller/irq.h>
12
11/ { 13/ {
12 compatible = "toumaz,tz1090", "img,meta"; 14 compatible = "toumaz,tz1090", "img,meta";
13 15
@@ -26,6 +28,22 @@
26 #size-cells = <1>; 28 #size-cells = <1>;
27 ranges; 29 ranges;
28 30
31 pdc: pdc@0x02006000 {
32 interrupt-controller;
33 #interrupt-cells = <2>;
34
35 reg = <0x02006000 0x1000>;
36 compatible = "img,pdc-intc";
37
38 num-perips = <3>;
39 num-syswakes = <3>;
40
41 interrupts = <18 IRQ_TYPE_LEVEL_HIGH>, /* Syswakes */
42 <30 IRQ_TYPE_LEVEL_HIGH>, /* Perip 0 (RTC) */
43 <29 IRQ_TYPE_LEVEL_HIGH>, /* Perip 1 (IR) */
44 <31 IRQ_TYPE_LEVEL_HIGH>; /* Perip 2 (WDT) */
45 };
46
29 pinctrl: pinctrl@02005800 { 47 pinctrl: pinctrl@02005800 {
30 #gpio-range-cells = <3>; 48 #gpio-range-cells = <3>;
31 compatible = "img,tz1090-pinctrl"; 49 compatible = "img,tz1090-pinctrl";