aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-05-08 20:06:39 -0400
committerTony Lindgren <tony@atomide.com>2013-05-08 20:06:39 -0400
commita8a07fffe4ecab7b77a4009ed317361385616aec (patch)
tree7629dd7a7a1de3ca4e2f0a0a6a9343b6688b57d0 /Documentation
parent348c34225d4395b769ec6d283b0c7ace0b430a38 (diff)
parentb327b3627bb428eb7d98f25224532425a673d89e (diff)
Merge branch 'omap-gpmc-fixes-for-v3.10' of git://github.com/jonhunter/linux into fixes
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/mtd/gpmc-nand.txt28
-rw-r--r--Documentation/devicetree/bindings/net/gpmc-eth.txt56
2 files changed, 42 insertions, 42 deletions
diff --git a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
index e7f8d7ed47eb..6a983c1d87cd 100644
--- a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
@@ -56,20 +56,20 @@ Example for an AM33xx board:
56 nand-bus-width = <16>; 56 nand-bus-width = <16>;
57 ti,nand-ecc-opt = "bch8"; 57 ti,nand-ecc-opt = "bch8";
58 58
59 gpmc,sync-clk = <0>; 59 gpmc,sync-clk-ps = <0>;
60 gpmc,cs-on = <0>; 60 gpmc,cs-on-ns = <0>;
61 gpmc,cs-rd-off = <44>; 61 gpmc,cs-rd-off-ns = <44>;
62 gpmc,cs-wr-off = <44>; 62 gpmc,cs-wr-off-ns = <44>;
63 gpmc,adv-on = <6>; 63 gpmc,adv-on-ns = <6>;
64 gpmc,adv-rd-off = <34>; 64 gpmc,adv-rd-off-ns = <34>;
65 gpmc,adv-wr-off = <44>; 65 gpmc,adv-wr-off-ns = <44>;
66 gpmc,we-off = <40>; 66 gpmc,we-off-ns = <40>;
67 gpmc,oe-off = <54>; 67 gpmc,oe-off-ns = <54>;
68 gpmc,access = <64>; 68 gpmc,access-ns = <64>;
69 gpmc,rd-cycle = <82>; 69 gpmc,rd-cycle-ns = <82>;
70 gpmc,wr-cycle = <82>; 70 gpmc,wr-cycle-ns = <82>;
71 gpmc,wr-access = <40>; 71 gpmc,wr-access-ns = <40>;
72 gpmc,wr-data-mux-bus = <0>; 72 gpmc,wr-data-mux-bus-ns = <0>;
73 73
74 #address-cells = <1>; 74 #address-cells = <1>;
75 #size-cells = <1>; 75 #size-cells = <1>;
diff --git a/Documentation/devicetree/bindings/net/gpmc-eth.txt b/Documentation/devicetree/bindings/net/gpmc-eth.txt
index 24cb4e46f675..ace4a64b3695 100644
--- a/Documentation/devicetree/bindings/net/gpmc-eth.txt
+++ b/Documentation/devicetree/bindings/net/gpmc-eth.txt
@@ -26,16 +26,16 @@ Required properties:
26- bank-width: Address width of the device in bytes. GPMC supports 8-bit 26- bank-width: Address width of the device in bytes. GPMC supports 8-bit
27 and 16-bit devices and so must be either 1 or 2 bytes. 27 and 16-bit devices and so must be either 1 or 2 bytes.
28- compatible: Compatible string property for the ethernet child device. 28- compatible: Compatible string property for the ethernet child device.
29- gpmc,cs-on: Chip-select assertion time 29- gpmc,cs-on-ns: Chip-select assertion time
30- gpmc,cs-rd-off: Chip-select de-assertion time for reads 30- gpmc,cs-rd-off-ns: Chip-select de-assertion time for reads
31- gpmc,cs-wr-off: Chip-select de-assertion time for writes 31- gpmc,cs-wr-off-ns: Chip-select de-assertion time for writes
32- gpmc,oe-on: Output-enable assertion time 32- gpmc,oe-on-ns: Output-enable assertion time
33- gpmc,oe-off Output-enable de-assertion time 33- gpmc,oe-off-ns: Output-enable de-assertion time
34- gpmc,we-on: Write-enable assertion time 34- gpmc,we-on-ns: Write-enable assertion time
35- gpmc,we-off: Write-enable de-assertion time 35- gpmc,we-off-ns: Write-enable de-assertion time
36- gpmc,access: Start cycle to first data capture (read access) 36- gpmc,access-ns: Start cycle to first data capture (read access)
37- gpmc,rd-cycle: Total read cycle time 37- gpmc,rd-cycle-ns: Total read cycle time
38- gpmc,wr-cycle: Total write cycle time 38- gpmc,wr-cycle-ns: Total write cycle time
39- reg: Chip-select, base address (relative to chip-select) 39- reg: Chip-select, base address (relative to chip-select)
40 and size of the memory mapped for the device. 40 and size of the memory mapped for the device.
41 Note that base address will be typically 0 as this 41 Note that base address will be typically 0 as this
@@ -65,24 +65,24 @@ gpmc: gpmc@6e000000 {
65 bank-width = <2>; 65 bank-width = <2>;
66 66
67 gpmc,mux-add-data; 67 gpmc,mux-add-data;
68 gpmc,cs-on = <0>; 68 gpmc,cs-on-ns = <0>;
69 gpmc,cs-rd-off = <186>; 69 gpmc,cs-rd-off-ns = <186>;
70 gpmc,cs-wr-off = <186>; 70 gpmc,cs-wr-off-ns = <186>;
71 gpmc,adv-on = <12>; 71 gpmc,adv-on-ns = <12>;
72 gpmc,adv-rd-off = <48>; 72 gpmc,adv-rd-off-ns = <48>;
73 gpmc,adv-wr-off = <48>; 73 gpmc,adv-wr-off-ns = <48>;
74 gpmc,oe-on = <54>; 74 gpmc,oe-on-ns = <54>;
75 gpmc,oe-off = <168>; 75 gpmc,oe-off-ns = <168>;
76 gpmc,we-on = <54>; 76 gpmc,we-on-ns = <54>;
77 gpmc,we-off = <168>; 77 gpmc,we-off-ns = <168>;
78 gpmc,rd-cycle = <186>; 78 gpmc,rd-cycle-ns = <186>;
79 gpmc,wr-cycle = <186>; 79 gpmc,wr-cycle-ns = <186>;
80 gpmc,access = <114>; 80 gpmc,access-ns = <114>;
81 gpmc,page-burst-access = <6>; 81 gpmc,page-burst-access-ns = <6>;
82 gpmc,bus-turnaround = <12>; 82 gpmc,bus-turnaround-ns = <12>;
83 gpmc,cycle2cycle-delay = <18>; 83 gpmc,cycle2cycle-delay-ns = <18>;
84 gpmc,wr-data-mux-bus = <90>; 84 gpmc,wr-data-mux-bus-ns = <90>;
85 gpmc,wr-access = <186>; 85 gpmc,wr-access-ns = <186>;
86 gpmc,cycle2cycle-samecsen; 86 gpmc,cycle2cycle-samecsen;
87 gpmc,cycle2cycle-diffcsen; 87 gpmc,cycle2cycle-diffcsen;
88 88