aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Jackson <mpfj-list@newflow.co.uk>2016-12-15 05:52:13 -0500
committerTony Lindgren <tony@atomide.com>2017-01-05 12:08:11 -0500
commite2ae7efefb32324bb95fb4485269bff99ca603ed (patch)
tree1871489b38e2e551b0318e14dd8e86dd157c99b6
parent1a8eca7fa8cad9e4da8a772b7da93584bbda910e (diff)
ARM: dts: Update Nanobone dts file to add external FRAM chip
From v4.2+ the GPMC code has been changed to reset all the bootloader GPMC settings when the kernel starts. As such, this DTS file now needs the external FRAM defined. Signed-off-by: Mark Jackson <mpfj@newflow.co.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/boot/dts/am335x-nano.dts31
1 files changed, 30 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index 483d585c8908..807494bc722b 100644
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -249,7 +249,8 @@
249 249
250 #address-cells = <2>; 250 #address-cells = <2>;
251 #size-cells = <1>; 251 #size-cells = <1>;
252 ranges = <0 0 0x08000000 0x08000000>; /* CS0: NOR 128M */ 252 ranges = <0 0 0x08000000 0x08000000>, /* CS0: NOR 128M */
253 <1 0 0x1c000000 0x01000000>; /* CS1: FRAM 16M */
253 254
254 nor@0,0 { 255 nor@0,0 {
255 reg = <0 0x00000000 0x08000000>; 256 reg = <0 0x00000000 0x08000000>;
@@ -342,6 +343,34 @@
342 reg = <0x04000000 0x04000000>; /* 64MB */ 343 reg = <0x04000000 0x04000000>; /* 64MB */
343 }; 344 };
344 }; 345 };
346
347 fram@1,0 {
348 reg = <1 0x00000000 0x01000000>;
349 bank-width = <2>;
350
351 gpmc,mux-add-data = <2>;
352
353 gpmc,sync-clk-ps = <0>;
354 gpmc,cs-on-ns = <0>;
355 gpmc,cs-rd-off-ns = <160>;
356 gpmc,cs-wr-off-ns = <160>;
357 gpmc,adv-on-ns = <10>;
358 gpmc,adv-rd-off-ns = <20>;
359 gpmc,adv-wr-off-ns = <20>;
360 gpmc,oe-on-ns = <30>;
361 gpmc,oe-off-ns = <150>;
362 gpmc,we-on-ns = <30>;
363 gpmc,we-off-ns = <150>;
364 gpmc,rd-cycle-ns = <160>;
365 gpmc,wr-cycle-ns = <160>;
366 gpmc,access-ns = <130>;
367 gpmc,page-burst-access-ns = <10>;
368 gpmc,cycle2cycle-samecsen;
369 gpmc,cycle2cycle-diffcsen;
370 gpmc,cycle2cycle-delay-ns = <10>;
371 gpmc,wr-data-mux-bus-ns = <30>;
372 gpmc,wr-access-ns = <0>;
373 };
345}; 374};
346 375
347&mac { 376&mac {