diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-02-26 21:42:54 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-02-26 21:42:54 +0300 |
| commit | 26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c (patch) | |
| tree | f937c2fad897c6ea1edf51cb9453707533763967 /arch/arm/boot/dts/am33xx.dtsi | |
| parent | b9d3ec1d98c658226606e66e55c940491447e617 (diff) | |
| parent | 44e4716499b8988a20ba99ba5c871cdbf1c819fd (diff) | |
| download | linux-26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c.tar.xz | |
Merge branch 'omap-for-v4.6/dt-gpmc' into omap-for-v4.6/dt
Diffstat (limited to 'arch/arm/boot/dts/am33xx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am33xx.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 04885f9f959e..b8ca5b456a4b 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -865,6 +865,8 @@ gpmc,num-waitpins = <2>; #address-cells = <2>; #size-cells = <1>; + interrupt-controller; + #interrupt-cells = <2>; status = "disabled"; }; |