diff options
| author |   Tony Lindgren <tony@atomide.com> | 2016-02-26 10:42:54 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-02-26 10:42:54 -0800 |
| commit | 26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c (patch) | |
| tree | f937c2fad897c6ea1edf51cb9453707533763967 /arch/arm/boot/dts/dra7.dtsi | |
| parent | ARM: dts: am57xx-beagle-x15: Add eeprom information (diff) | |
| parent | ARM: dts: omap3: Fix NAND device nodes (diff) | |
| download | linux-dev-26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c.tar.xz linux-dev-26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c.zip | |
Merge branch 'omap-for-v4.6/dt-gpmc' into omap-for-v4.6/dt
Diffstat (limited to 'arch/arm/boot/dts/dra7.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 8ea153aa46f6..54f9cd805ff1 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -1402,6 +1402,8 @@ gpmc,num-waitpins = <2>; #address-cells = <2>; #size-cells = <1>; + interrupt-controller; + #interrupt-cells = <2>; status = "disabled"; }; |