summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/am335x-cm-t335.dts
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2016-02-26 21:42:54 +0300
committerTony Lindgren <tony@atomide.com>2016-02-26 21:42:54 +0300
commit26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c (patch)
treef937c2fad897c6ea1edf51cb9453707533763967 /arch/arm/boot/dts/am335x-cm-t335.dts
parentb9d3ec1d98c658226606e66e55c940491447e617 (diff)
parent44e4716499b8988a20ba99ba5c871cdbf1c819fd (diff)
downloadlinux-26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c.tar.xz
Merge branch 'omap-for-v4.6/dt-gpmc' into omap-for-v4.6/dt
Diffstat (limited to 'arch/arm/boot/dts/am335x-cm-t335.dts')
-rw-r--r--arch/arm/boot/dts/am335x-cm-t335.dts9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/am335x-cm-t335.dts b/arch/arm/boot/dts/am335x-cm-t335.dts
index 5d5fb62d8fbe..e835644c5054 100644
--- a/arch/arm/boot/dts/am335x-cm-t335.dts
+++ b/arch/arm/boot/dts/am335x-cm-t335.dts
@@ -406,7 +406,11 @@ status = "okay";
pinctrl-0 = <&nandflash_pins>;
ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */
nand@0,0 {
- reg = <0 0 0>; /* CS0, offset 0 */
+ 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 */
ti,nand-ecc-opt = "bch8";
ti,elm-id = <&elm>;
nand-bus-width = <8>;
@@ -425,12 +429,9 @@ status = "okay";
gpmc,access-ns = <64>;
gpmc,rd-cycle-ns = <82>;
gpmc,wr-cycle-ns = <82>;
- gpmc,wait-on-read = "true";
- gpmc,wait-on-write = "true";
gpmc,bus-turnaround-ns = <0>;
gpmc,cycle2cycle-delay-ns = <0>;
gpmc,clk-activation-ns = <0>;
- gpmc,wait-monitoring-ns = <0>;
gpmc,wr-access-ns = <40>;
gpmc,wr-data-mux-bus-ns = <0>;
/* MTD partition table */