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/omap3-beagle.dts | |
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/omap3-beagle.dts')
-rw-r--r-- | arch/arm/boot/dts/omap3-beagle.dts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index 8ba465d57635..4602866792be 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts @@ -384,8 +384,11 @@ /* Chip select 0 */ nand@0,0 { + compatible = "ti,omap2-nand"; reg = <0 0 4>; /* NAND I/O window, 4 bytes */ - interrupts = <20>; + interrupt-parent = <&gpmc>; + interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */ + <1 IRQ_TYPE_NONE>; /* termcount */ ti,nand-ecc-opt = "ham1"; nand-bus-width = <16>; #address-cells = <1>; |