Skip to content

Commit 0c5220a

Browse files
spinal84tmlind
authored andcommitted
ARM: dts: N900: fix onenand timings
Commit a758f50 ("mtd: onenand: omap2: Configure driver from DT") started using DT specified timings for GPMC, and as a result the OneNAND stopped working on N900 as we had wrong values in the DT. Fix by updating the values to bootloader timings that have been tested to be working on Nokia N900 with OneNAND manufacturers: Samsung, Numonyx. Fixes: a758f50 ("mtd: onenand: omap2: Configure driver from DT") Signed-off-by: Arthur Demchenkov <spinal.by@gmail.com> Tested-by: Merlijn Wajer <merlijn@wizzup.org> Reviewed-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
1 parent b46b2b7 commit 0c5220a

1 file changed

Lines changed: 28 additions & 16 deletions

File tree

arch/arm/boot/dts/omap3-n900.dts

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -854,34 +854,46 @@
854854
compatible = "ti,omap2-onenand";
855855
reg = <0 0 0x20000>; /* CS0, offset 0, IO size 128K */
856856

857+
/*
858+
* These timings are based on CONFIG_OMAP_GPMC_DEBUG=y reported
859+
* bootloader set values when booted with v5.1
860+
* (OneNAND Manufacturer: Samsung):
861+
*
862+
* cs0 GPMC_CS_CONFIG1: 0xfb001202
863+
* cs0 GPMC_CS_CONFIG2: 0x00111100
864+
* cs0 GPMC_CS_CONFIG3: 0x00020200
865+
* cs0 GPMC_CS_CONFIG4: 0x11001102
866+
* cs0 GPMC_CS_CONFIG5: 0x03101616
867+
* cs0 GPMC_CS_CONFIG6: 0x90060000
868+
*/
857869
gpmc,sync-read;
858870
gpmc,sync-write;
859871
gpmc,burst-length = <16>;
860872
gpmc,burst-read;
861873
gpmc,burst-wrap;
862874
gpmc,burst-write;
863-
gpmc,device-width = <2>; /* GPMC_DEVWIDTH_16BIT */
864-
gpmc,mux-add-data = <2>; /* GPMC_MUX_AD */
875+
gpmc,device-width = <2>;
876+
gpmc,mux-add-data = <2>;
865877
gpmc,cs-on-ns = <0>;
866-
gpmc,cs-rd-off-ns = <87>;
867-
gpmc,cs-wr-off-ns = <87>;
878+
gpmc,cs-rd-off-ns = <102>;
879+
gpmc,cs-wr-off-ns = <102>;
868880
gpmc,adv-on-ns = <0>;
869-
gpmc,adv-rd-off-ns = <10>;
870-
gpmc,adv-wr-off-ns = <10>;
871-
gpmc,oe-on-ns = <15>;
872-
gpmc,oe-off-ns = <87>;
881+
gpmc,adv-rd-off-ns = <12>;
882+
gpmc,adv-wr-off-ns = <12>;
883+
gpmc,oe-on-ns = <12>;
884+
gpmc,oe-off-ns = <102>;
873885
gpmc,we-on-ns = <0>;
874-
gpmc,we-off-ns = <87>;
875-
gpmc,rd-cycle-ns = <112>;
876-
gpmc,wr-cycle-ns = <112>;
877-
gpmc,access-ns = <81>;
878-
gpmc,page-burst-access-ns = <15>;
886+
gpmc,we-off-ns = <102>;
887+
gpmc,rd-cycle-ns = <132>;
888+
gpmc,wr-cycle-ns = <132>;
889+
gpmc,access-ns = <96>;
890+
gpmc,page-burst-access-ns = <18>;
879891
gpmc,bus-turnaround-ns = <0>;
880892
gpmc,cycle2cycle-delay-ns = <0>;
881893
gpmc,wait-monitoring-ns = <0>;
882-
gpmc,clk-activation-ns = <5>;
883-
gpmc,wr-data-mux-bus-ns = <30>;
884-
gpmc,wr-access-ns = <81>;
894+
gpmc,clk-activation-ns = <6>;
895+
gpmc,wr-data-mux-bus-ns = <36>;
896+
gpmc,wr-access-ns = <96>;
885897
gpmc,sync-clk-ps = <15000>;
886898

887899
/*

0 commit comments

Comments
 (0)