From 0a6923f1c0e6d49d7fd16bb8cb75d23675c7fd7a Mon Sep 17 00:00:00 2001 From: James Hogan Date: Mon, 22 Apr 2013 15:43:50 +0100 Subject: 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 Acked-by: Grant Likely Cc: Thomas Gleixner --- arch/metag/Kconfig.soc | 1 + arch/metag/boot/dts/tz1090.dtsi | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) (limited to 'arch') 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 config SOC_TZ1090 bool "Toumaz Xenif TZ1090 SoC (Comet)" + select IMGPDC_IRQ select METAG_LNKGET_AROUND_CACHE select METAG_META21 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 @@ #include "skeleton.dtsi" +#include + / { compatible = "toumaz,tz1090", "img,meta"; @@ -26,6 +28,22 @@ #size-cells = <1>; ranges; + pdc: pdc@0x02006000 { + interrupt-controller; + #interrupt-cells = <2>; + + reg = <0x02006000 0x1000>; + compatible = "img,pdc-intc"; + + num-perips = <3>; + num-syswakes = <3>; + + interrupts = <18 IRQ_TYPE_LEVEL_HIGH>, /* Syswakes */ + <30 IRQ_TYPE_LEVEL_HIGH>, /* Perip 0 (RTC) */ + <29 IRQ_TYPE_LEVEL_HIGH>, /* Perip 1 (IR) */ + <31 IRQ_TYPE_LEVEL_HIGH>; /* Perip 2 (WDT) */ + }; + pinctrl: pinctrl@02005800 { #gpio-range-cells = <3>; compatible = "img,tz1090-pinctrl"; -- cgit v1.2.3 From d6cffa4f28695eab44a4268652788b96bb44c441 Mon Sep 17 00:00:00 2001 From: James Hogan Date: Mon, 22 Apr 2013 16:46:36 +0100 Subject: metag: tz1090: select and instantiate gpio-tz1090 Select ARCH_WANT_OPTIONAL_GPIOLIB from SOC_TZ1090 to allow GPIOLIB and GPIO_TZ1090 (the main gpio driver) to be enabled once it is merged, and instantiate it from tz1090.dtsi. Signed-off-by: James Hogan Acked-by: Linus Walleij Acked-by: Grant Likely --- arch/metag/Kconfig.soc | 1 + arch/metag/boot/dts/tz1090.dtsi | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) (limited to 'arch') diff --git a/arch/metag/Kconfig.soc b/arch/metag/Kconfig.soc index 50f979c2b02d..973640f46752 100644 --- a/arch/metag/Kconfig.soc +++ b/arch/metag/Kconfig.soc @@ -16,6 +16,7 @@ config META21_FPGA config SOC_TZ1090 bool "Toumaz Xenif TZ1090 SoC (Comet)" + select ARCH_WANT_OPTIONAL_GPIOLIB select IMGPDC_IRQ select METAG_LNKGET_AROUND_CACHE select METAG_META21 diff --git a/arch/metag/boot/dts/tz1090.dtsi b/arch/metag/boot/dts/tz1090.dtsi index d0869b19e08e..66cf55de1825 100644 --- a/arch/metag/boot/dts/tz1090.dtsi +++ b/arch/metag/boot/dts/tz1090.dtsi @@ -55,5 +55,40 @@ compatible = "img,tz1090-pdc-pinctrl"; reg = <0x02006500 0x100>; }; + + gpios: gpios@02005800 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "img,tz1090-gpio"; + reg = <0x02005800 0x90>; + + gpios0: bank@0 { + gpio-controller; + interrupt-controller; + #gpio-cells = <2>; + #interrupt-cells = <2>; + reg = <0>; + interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; + gpio-ranges = <&pinctrl 0 0 30>; + }; + gpios1: bank@1 { + gpio-controller; + interrupt-controller; + #gpio-cells = <2>; + #interrupt-cells = <2>; + reg = <1>; + interrupts = <14 IRQ_TYPE_LEVEL_HIGH>; + gpio-ranges = <&pinctrl 0 30 30>; + }; + gpios2: bank@2 { + gpio-controller; + interrupt-controller; + #gpio-cells = <2>; + #interrupt-cells = <2>; + reg = <2>; + interrupts = <15 IRQ_TYPE_LEVEL_HIGH>; + gpio-ranges = <&pinctrl 0 60 30>; + }; + }; }; }; -- cgit v1.2.3 From 8a697827540d54443f343b058b8dac695c847f9f Mon Sep 17 00:00:00 2001 From: James Hogan Date: Mon, 22 Apr 2013 16:07:31 +0100 Subject: metag: tz1090: instantiate gpio-tz1090-pdc Instantiate the PDC GPIO controller driver from tz1090.dtsi ready for when it is merged. Signed-off-by: James Hogan Acked-by: Linus Walleij Acked-by: Grant Likely --- arch/metag/boot/dts/tz1090.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'arch') diff --git a/arch/metag/boot/dts/tz1090.dtsi b/arch/metag/boot/dts/tz1090.dtsi index 66cf55de1825..24ea7d2e9138 100644 --- a/arch/metag/boot/dts/tz1090.dtsi +++ b/arch/metag/boot/dts/tz1090.dtsi @@ -90,5 +90,19 @@ gpio-ranges = <&pinctrl 0 60 30>; }; }; + + pdc_gpios: gpios@02006500 { + gpio-controller; + #gpio-cells = <2>; + + compatible = "img,tz1090-pdc-gpio"; + reg = <0x02006500 0x100>; + + interrupt-parent = <&pdc>; + interrupts = <8 IRQ_TYPE_NONE>, + <9 IRQ_TYPE_NONE>, + <10 IRQ_TYPE_NONE>; + gpio-ranges = <&pdc_pinctrl 0 0 7>; + }; }; }; -- cgit v1.2.3