diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-15 03:42:59 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-15 03:42:59 +0200 |
| commit | 37177faefc22209deb547579d4c2dfd5d6bf30ab (patch) | |
| tree | 6e2970f7d122ac93bc80000727fa6d0fa87d1e9c /arch/arm/boot/dts/sun4i-a10.dtsi | |
| parent | Merge tag 'tegra-for-3.11-dt' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: sunxi: dt: Register the pio node as interrupt controller (diff) | |
| download | linux-37177faefc22209deb547579d4c2dfd5d6bf30ab.tar.xz linux-37177faefc22209deb547579d4c2dfd5d6bf30ab.zip | |
Merge tag 'sunxi-dt-for-3.11' of git://github.com/mripard/linux into next/dt
From Maxime Ripard:
Allwinner SoCs DT additions for 3.11
- Switch to using the sun5i clocks for the A13
- Register the pio node as an interrupt controller
* tag 'sunxi-dt-for-3.11' of git://github.com/mripard/linux:
ARM: sunxi: dt: Register the pio node as interrupt controller
ARM: sun5i: Update the clock compatible strings
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/sun4i-a10.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 06ef8b625dba..9bf5ea51e70f 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -177,8 +177,10 @@ pio: pinctrl@01c20800 { compatible = "allwinner,sun4i-a10-pinctrl"; reg = <0x01c20800 0x400>; + interrupts = <28>; clocks = <&apb0_gates 5>; gpio-controller; + interrupt-controller; #address-cells = <1>; #size-cells = <0>; #gpio-cells = <3>; |