diff options
Diffstat (limited to 'Documentation/w1')
-rw-r--r-- | Documentation/w1/masters/00-INDEX | 4 | ||||
-rw-r--r-- | Documentation/w1/masters/ds2490 | 2 | ||||
-rw-r--r-- | Documentation/w1/slaves/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/w1/w1.netlink | 8 |
4 files changed, 9 insertions, 7 deletions
diff --git a/Documentation/w1/masters/00-INDEX b/Documentation/w1/masters/00-INDEX index d63fa024ac05..8330cf9325f0 100644 --- a/Documentation/w1/masters/00-INDEX +++ b/Documentation/w1/masters/00-INDEX | |||
@@ -4,7 +4,9 @@ ds2482 | |||
4 | - The Maxim/Dallas Semiconductor DS2482 provides 1-wire busses. | 4 | - The Maxim/Dallas Semiconductor DS2482 provides 1-wire busses. |
5 | ds2490 | 5 | ds2490 |
6 | - The Maxim/Dallas Semiconductor DS2490 builds USB <-> W1 bridges. | 6 | - The Maxim/Dallas Semiconductor DS2490 builds USB <-> W1 bridges. |
7 | mxc_w1 | 7 | mxc-w1 |
8 | - W1 master controller driver found on Freescale MX2/MX3 SoCs | 8 | - W1 master controller driver found on Freescale MX2/MX3 SoCs |
9 | omap-hdq | ||
10 | - HDQ/1-wire module of TI OMAP 2430/3430. | ||
9 | w1-gpio | 11 | w1-gpio |
10 | - GPIO 1-wire bus master driver. | 12 | - GPIO 1-wire bus master driver. |
diff --git a/Documentation/w1/masters/ds2490 b/Documentation/w1/masters/ds2490 index 28176def3d6f..3e091151dd80 100644 --- a/Documentation/w1/masters/ds2490 +++ b/Documentation/w1/masters/ds2490 | |||
@@ -21,8 +21,6 @@ Notes and limitations. | |||
21 | - The weak pullup current is a minimum of 0.9mA and maximum of 6.0mA. | 21 | - The weak pullup current is a minimum of 0.9mA and maximum of 6.0mA. |
22 | - The 5V strong pullup is supported with a minimum of 5.9mA and a | 22 | - The 5V strong pullup is supported with a minimum of 5.9mA and a |
23 | maximum of 30.4 mA. (From DS2490.pdf) | 23 | maximum of 30.4 mA. (From DS2490.pdf) |
24 | - While the ds2490 supports a hardware search the code doesn't take | ||
25 | advantage of it (in tested case it only returned first device). | ||
26 | - The hardware will detect when devices are attached to the bus on the | 24 | - The hardware will detect when devices are attached to the bus on the |
27 | next bus (reset?) operation, however only a message is printed as | 25 | next bus (reset?) operation, however only a message is printed as |
28 | the core w1 code doesn't make use of the information. Connecting | 26 | the core w1 code doesn't make use of the information. Connecting |
diff --git a/Documentation/w1/slaves/00-INDEX b/Documentation/w1/slaves/00-INDEX index 75613c9ac4db..6e18c70c3474 100644 --- a/Documentation/w1/slaves/00-INDEX +++ b/Documentation/w1/slaves/00-INDEX | |||
@@ -4,3 +4,5 @@ w1_therm | |||
4 | - The Maxim/Dallas Semiconductor ds18*20 temperature sensor. | 4 | - The Maxim/Dallas Semiconductor ds18*20 temperature sensor. |
5 | w1_ds2423 | 5 | w1_ds2423 |
6 | - The Maxim/Dallas Semiconductor ds2423 counter device. | 6 | - The Maxim/Dallas Semiconductor ds2423 counter device. |
7 | w1_ds28e04 | ||
8 | - The Maxim/Dallas Semiconductor ds28e04 eeprom. | ||
diff --git a/Documentation/w1/w1.netlink b/Documentation/w1/w1.netlink index f59a31965d50..927a52cc0519 100644 --- a/Documentation/w1/w1.netlink +++ b/Documentation/w1/w1.netlink | |||
@@ -5,8 +5,8 @@ Message types. | |||
5 | ============= | 5 | ============= |
6 | 6 | ||
7 | There are three types of messages between w1 core and userspace: | 7 | There are three types of messages between w1 core and userspace: |
8 | 1. Events. They are generated each time new master or slave device | 8 | 1. Events. They are generated each time a new master or slave device |
9 | found either due to automatic or requested search. | 9 | is found either due to automatic or requested search. |
10 | 2. Userspace commands. | 10 | 2. Userspace commands. |
11 | 3. Replies to userspace commands. | 11 | 3. Replies to userspace commands. |
12 | 12 | ||
@@ -131,7 +131,7 @@ of the w1_netlink_cmd structure and cn_msg.len will be equal to the sum | |||
131 | of the sizeof(struct w1_netlink_msg) and sizeof(struct w1_netlink_cmd). | 131 | of the sizeof(struct w1_netlink_msg) and sizeof(struct w1_netlink_cmd). |
132 | If reply is generated for master or root command (which do not have | 132 | If reply is generated for master or root command (which do not have |
133 | w1_netlink_cmd attached), reply will contain only cn_msg and w1_netlink_msg | 133 | w1_netlink_cmd attached), reply will contain only cn_msg and w1_netlink_msg |
134 | structires. | 134 | structures. |
135 | 135 | ||
136 | w1_netlink_msg.status field will carry positive error value | 136 | w1_netlink_msg.status field will carry positive error value |
137 | (EINVAL for example) or zero in case of success. | 137 | (EINVAL for example) or zero in case of success. |
@@ -160,7 +160,7 @@ procedure is started to select given device. | |||
160 | Then all requested in w1_netlink_msg operations are performed one by one. | 160 | Then all requested in w1_netlink_msg operations are performed one by one. |
161 | If command requires reply (like read command) it is sent on command completion. | 161 | If command requires reply (like read command) it is sent on command completion. |
162 | 162 | ||
163 | When all commands (w1_netlink_cmd) are processed muster device is unlocked | 163 | When all commands (w1_netlink_cmd) are processed master device is unlocked |
164 | and next w1_netlink_msg header processing started. | 164 | and next w1_netlink_msg header processing started. |
165 | 165 | ||
166 | 166 | ||