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/logicpd-torpedo-som.dtsi | |
| parent | b9d3ec1d98c658226606e66e55c940491447e617 (diff) | |
| parent | 44e4716499b8988a20ba99ba5c871cdbf1c819fd (diff) | |
Merge branch 'omap-for-v4.6/dt-gpmc' into omap-for-v4.6/dt
Diffstat (limited to 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi index 2eca34c5239e..ed8a62a9116c 100644 --- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi +++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi @@ -35,11 +35,15 @@ }; &gpmc { - ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */ + ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */ nand@0,0 { - linux,mtd-name = "micron,mt29f4g16abbda3w"; + compatible = "ti,omap2-nand"; reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ + interrupt-parent = <&gpmc>; + interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */ + <1 IRQ_TYPE_NONE>; /* termcount */ + linux,mtd-name = "micron,mt29f4g16abbda3w"; nand-bus-width = <16>; ti,nand-ecc-opt = "bch8"; gpmc,sync-clk-ps = <0>; |