diff options
author | Renata Sayakhova <rsayakhova@gmail.com> | 2012-02-29 08:58:53 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 14:15:33 -0500 |
commit | fef37e9a47b9927ce2817fe1a0fa8cf40f6eefb6 (patch) | |
tree | 4cba1a0e4cf7b1e1f342bc86d8305c7ab037a4eb /drivers/w1/slaves | |
parent | f6e8a1d7b4c4087e13913da43deb45b3e3413f29 (diff) |
DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers
Signed-off-by: Renata Sayakhova <rsayakhova@gmail.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/slaves')
-rw-r--r-- | drivers/w1/slaves/Kconfig | 13 | ||||
-rw-r--r-- | drivers/w1/slaves/Makefile | 1 | ||||
-rw-r--r-- | drivers/w1/slaves/w1_ds2781.c | 201 | ||||
-rw-r--r-- | drivers/w1/slaves/w1_ds2781.h | 136 |
4 files changed, 351 insertions, 0 deletions
diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig index d0cb01b42012..eb9e376d6244 100644 --- a/drivers/w1/slaves/Kconfig +++ b/drivers/w1/slaves/Kconfig | |||
@@ -81,6 +81,19 @@ config W1_SLAVE_DS2780 | |||
81 | 81 | ||
82 | If you are unsure, say N. | 82 | If you are unsure, say N. |
83 | 83 | ||
84 | config W1_SLAVE_DS2781 | ||
85 | tristate "Dallas 2781 battery monitor chip" | ||
86 | depends on W1 | ||
87 | help | ||
88 | If you enable this you will have the DS2781 battery monitor | ||
89 | chip support. | ||
90 | |||
91 | The battery monitor chip is used in many batteries/devices | ||
92 | as the one who is responsible for charging/discharging/monitoring | ||
93 | Li+ batteries. | ||
94 | |||
95 | If you are unsure, say N. | ||
96 | |||
84 | config W1_SLAVE_BQ27000 | 97 | config W1_SLAVE_BQ27000 |
85 | tristate "BQ27000 slave support" | 98 | tristate "BQ27000 slave support" |
86 | depends on W1 | 99 | depends on W1 |
diff --git a/drivers/w1/slaves/Makefile b/drivers/w1/slaves/Makefile index 1f31e9fb0b25..c4f1859fb520 100644 --- a/drivers/w1/slaves/Makefile +++ b/drivers/w1/slaves/Makefile | |||
@@ -10,4 +10,5 @@ obj-$(CONFIG_W1_SLAVE_DS2431) += w1_ds2431.o | |||
10 | obj-$(CONFIG_W1_SLAVE_DS2433) += w1_ds2433.o | 10 | obj-$(CONFIG_W1_SLAVE_DS2433) += w1_ds2433.o |
11 | obj-$(CONFIG_W1_SLAVE_DS2760) += w1_ds2760.o | 11 | obj-$(CONFIG_W1_SLAVE_DS2760) += w1_ds2760.o |
12 | obj-$(CONFIG_W1_SLAVE_DS2780) += w1_ds2780.o | 12 | obj-$(CONFIG_W1_SLAVE_DS2780) += w1_ds2780.o |
13 | obj-$(CONFIG_W1_SLAVE_DS2781) += w1_ds2781.o | ||
13 | obj-$(CONFIG_W1_SLAVE_BQ27000) += w1_bq27000.o | 14 | obj-$(CONFIG_W1_SLAVE_BQ27000) += w1_bq27000.o |
diff --git a/drivers/w1/slaves/w1_ds2781.c b/drivers/w1/slaves/w1_ds2781.c new file mode 100644 index 000000000000..0d0c7985293f --- /dev/null +++ b/drivers/w1/slaves/w1_ds2781.c | |||
@@ -0,0 +1,201 @@ | |||
1 | /* | ||
2 | * 1-Wire implementation for the ds2781 chip | ||
3 | * | ||
4 | * Author: Renata Sayakhova <renata@oktetlabs.ru> | ||
5 | * | ||
6 | * Based on w1-ds2780 driver | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/device.h> | ||
17 | #include <linux/types.h> | ||
18 | #include <linux/platform_device.h> | ||
19 | #include <linux/mutex.h> | ||
20 | #include <linux/idr.h> | ||
21 | |||
22 | #include "../w1.h" | ||
23 | #include "../w1_int.h" | ||
24 | #include "../w1_family.h" | ||
25 | #include "w1_ds2781.h" | ||
26 | |||
27 | static int w1_ds2781_do_io(struct device *dev, char *buf, int addr, | ||
28 | size_t count, int io) | ||
29 | { | ||
30 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); | ||
31 | |||
32 | if (addr > DS2781_DATA_SIZE || addr < 0) | ||
33 | return 0; | ||
34 | |||
35 | count = min_t(int, count, DS2781_DATA_SIZE - addr); | ||
36 | |||
37 | if (w1_reset_select_slave(sl) == 0) { | ||
38 | if (io) { | ||
39 | w1_write_8(sl->master, W1_DS2781_WRITE_DATA); | ||
40 | w1_write_8(sl->master, addr); | ||
41 | w1_write_block(sl->master, buf, count); | ||
42 | } else { | ||
43 | w1_write_8(sl->master, W1_DS2781_READ_DATA); | ||
44 | w1_write_8(sl->master, addr); | ||
45 | count = w1_read_block(sl->master, buf, count); | ||
46 | } | ||
47 | } | ||
48 | |||
49 | return count; | ||
50 | } | ||
51 | |||
52 | int w1_ds2781_io(struct device *dev, char *buf, int addr, size_t count, | ||
53 | int io) | ||
54 | { | ||
55 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); | ||
56 | int ret; | ||
57 | |||
58 | if (!dev) | ||
59 | return -ENODEV; | ||
60 | |||
61 | mutex_lock(&sl->master->mutex); | ||
62 | |||
63 | ret = w1_ds2781_do_io(dev, buf, addr, count, io); | ||
64 | |||
65 | mutex_unlock(&sl->master->mutex); | ||
66 | |||
67 | return ret; | ||
68 | } | ||
69 | EXPORT_SYMBOL(w1_ds2781_io); | ||
70 | |||
71 | int w1_ds2781_io_nolock(struct device *dev, char *buf, int addr, size_t count, | ||
72 | int io) | ||
73 | { | ||
74 | int ret; | ||
75 | |||
76 | if (!dev) | ||
77 | return -ENODEV; | ||
78 | |||
79 | ret = w1_ds2781_do_io(dev, buf, addr, count, io); | ||
80 | |||
81 | return ret; | ||
82 | } | ||
83 | EXPORT_SYMBOL(w1_ds2781_io_nolock); | ||
84 | |||
85 | int w1_ds2781_eeprom_cmd(struct device *dev, int addr, int cmd) | ||
86 | { | ||
87 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); | ||
88 | |||
89 | if (!dev) | ||
90 | return -EINVAL; | ||
91 | |||
92 | mutex_lock(&sl->master->mutex); | ||
93 | |||
94 | if (w1_reset_select_slave(sl) == 0) { | ||
95 | w1_write_8(sl->master, cmd); | ||
96 | w1_write_8(sl->master, addr); | ||
97 | } | ||
98 | |||
99 | mutex_unlock(&sl->master->mutex); | ||
100 | return 0; | ||
101 | } | ||
102 | EXPORT_SYMBOL(w1_ds2781_eeprom_cmd); | ||
103 | |||
104 | static ssize_t w1_ds2781_read_bin(struct file *filp, | ||
105 | struct kobject *kobj, | ||
106 | struct bin_attribute *bin_attr, | ||
107 | char *buf, loff_t off, size_t count) | ||
108 | { | ||
109 | struct device *dev = container_of(kobj, struct device, kobj); | ||
110 | return w1_ds2781_io(dev, buf, off, count, 0); | ||
111 | } | ||
112 | |||
113 | static struct bin_attribute w1_ds2781_bin_attr = { | ||
114 | .attr = { | ||
115 | .name = "w1_slave", | ||
116 | .mode = S_IRUGO, | ||
117 | }, | ||
118 | .size = DS2781_DATA_SIZE, | ||
119 | .read = w1_ds2781_read_bin, | ||
120 | }; | ||
121 | |||
122 | static DEFINE_IDA(bat_ida); | ||
123 | |||
124 | static int w1_ds2781_add_slave(struct w1_slave *sl) | ||
125 | { | ||
126 | int ret; | ||
127 | int id; | ||
128 | struct platform_device *pdev; | ||
129 | |||
130 | id = ida_simple_get(&bat_ida, 0, 0, GFP_KERNEL); | ||
131 | if (id < 0) { | ||
132 | ret = id; | ||
133 | goto noid; | ||
134 | } | ||
135 | |||
136 | pdev = platform_device_alloc("ds2781-battery", id); | ||
137 | if (!pdev) { | ||
138 | ret = -ENOMEM; | ||
139 | goto pdev_alloc_failed; | ||
140 | } | ||
141 | pdev->dev.parent = &sl->dev; | ||
142 | |||
143 | ret = platform_device_add(pdev); | ||
144 | if (ret) | ||
145 | goto pdev_add_failed; | ||
146 | |||
147 | ret = sysfs_create_bin_file(&sl->dev.kobj, &w1_ds2781_bin_attr); | ||
148 | if (ret) | ||
149 | goto bin_attr_failed; | ||
150 | |||
151 | dev_set_drvdata(&sl->dev, pdev); | ||
152 | |||
153 | return 0; | ||
154 | |||
155 | bin_attr_failed: | ||
156 | pdev_add_failed: | ||
157 | platform_device_unregister(pdev); | ||
158 | pdev_alloc_failed: | ||
159 | ida_simple_remove(&bat_ida, id); | ||
160 | noid: | ||
161 | return ret; | ||
162 | } | ||
163 | |||
164 | static void w1_ds2781_remove_slave(struct w1_slave *sl) | ||
165 | { | ||
166 | struct platform_device *pdev = dev_get_drvdata(&sl->dev); | ||
167 | int id = pdev->id; | ||
168 | |||
169 | platform_device_unregister(pdev); | ||
170 | ida_simple_remove(&bat_ida, id); | ||
171 | sysfs_remove_bin_file(&sl->dev.kobj, &w1_ds2781_bin_attr); | ||
172 | } | ||
173 | |||
174 | static struct w1_family_ops w1_ds2781_fops = { | ||
175 | .add_slave = w1_ds2781_add_slave, | ||
176 | .remove_slave = w1_ds2781_remove_slave, | ||
177 | }; | ||
178 | |||
179 | static struct w1_family w1_ds2781_family = { | ||
180 | .fid = W1_FAMILY_DS2781, | ||
181 | .fops = &w1_ds2781_fops, | ||
182 | }; | ||
183 | |||
184 | static int __init w1_ds2781_init(void) | ||
185 | { | ||
186 | ida_init(&bat_ida); | ||
187 | return w1_register_family(&w1_ds2781_family); | ||
188 | } | ||
189 | |||
190 | static void __exit w1_ds2781_exit(void) | ||
191 | { | ||
192 | w1_unregister_family(&w1_ds2781_family); | ||
193 | ida_destroy(&bat_ida); | ||
194 | } | ||
195 | |||
196 | module_init(w1_ds2781_init); | ||
197 | module_exit(w1_ds2781_exit); | ||
198 | |||
199 | MODULE_LICENSE("GPL"); | ||
200 | MODULE_AUTHOR("Renata Sayakhova <renata@oktetlabs.ru>"); | ||
201 | MODULE_DESCRIPTION("1-wire Driver for Maxim/Dallas DS2781 Stand-Alone Fuel Gauge IC"); | ||
diff --git a/drivers/w1/slaves/w1_ds2781.h b/drivers/w1/slaves/w1_ds2781.h new file mode 100644 index 000000000000..82bc66497b43 --- /dev/null +++ b/drivers/w1/slaves/w1_ds2781.h | |||
@@ -0,0 +1,136 @@ | |||
1 | /* | ||
2 | * 1-Wire implementation for the ds2780 chip | ||
3 | * | ||
4 | * Author: Renata Sayakhova <renata@oktetlabs.ru> | ||
5 | * | ||
6 | * Based on w1-ds2760 driver | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #ifndef _W1_DS2781_H | ||
15 | #define _W1_DS2781_H | ||
16 | |||
17 | /* Function commands */ | ||
18 | #define W1_DS2781_READ_DATA 0x69 | ||
19 | #define W1_DS2781_WRITE_DATA 0x6C | ||
20 | #define W1_DS2781_COPY_DATA 0x48 | ||
21 | #define W1_DS2781_RECALL_DATA 0xB8 | ||
22 | #define W1_DS2781_LOCK 0x6A | ||
23 | |||
24 | /* Register map */ | ||
25 | /* Register 0x00 Reserved */ | ||
26 | #define DS2781_STATUS 0x01 | ||
27 | #define DS2781_RAAC_MSB 0x02 | ||
28 | #define DS2781_RAAC_LSB 0x03 | ||
29 | #define DS2781_RSAC_MSB 0x04 | ||
30 | #define DS2781_RSAC_LSB 0x05 | ||
31 | #define DS2781_RARC 0x06 | ||
32 | #define DS2781_RSRC 0x07 | ||
33 | #define DS2781_IAVG_MSB 0x08 | ||
34 | #define DS2781_IAVG_LSB 0x09 | ||
35 | #define DS2781_TEMP_MSB 0x0A | ||
36 | #define DS2781_TEMP_LSB 0x0B | ||
37 | #define DS2781_VOLT_MSB 0x0C | ||
38 | #define DS2781_VOLT_LSB 0x0D | ||
39 | #define DS2781_CURRENT_MSB 0x0E | ||
40 | #define DS2781_CURRENT_LSB 0x0F | ||
41 | #define DS2781_ACR_MSB 0x10 | ||
42 | #define DS2781_ACR_LSB 0x11 | ||
43 | #define DS2781_ACRL_MSB 0x12 | ||
44 | #define DS2781_ACRL_LSB 0x13 | ||
45 | #define DS2781_AS 0x14 | ||
46 | #define DS2781_SFR 0x15 | ||
47 | #define DS2781_FULL_MSB 0x16 | ||
48 | #define DS2781_FULL_LSB 0x17 | ||
49 | #define DS2781_AE_MSB 0x18 | ||
50 | #define DS2781_AE_LSB 0x19 | ||
51 | #define DS2781_SE_MSB 0x1A | ||
52 | #define DS2781_SE_LSB 0x1B | ||
53 | /* Register 0x1C - 0x1E Reserved */ | ||
54 | #define DS2781_EEPROM 0x1F | ||
55 | #define DS2781_EEPROM_BLOCK0_START 0x20 | ||
56 | /* Register 0x20 - 0x2F User EEPROM */ | ||
57 | #define DS2781_EEPROM_BLOCK0_END 0x2F | ||
58 | /* Register 0x30 - 0x5F Reserved */ | ||
59 | #define DS2781_EEPROM_BLOCK1_START 0x60 | ||
60 | #define DS2781_CONTROL 0x60 | ||
61 | #define DS2781_AB 0x61 | ||
62 | #define DS2781_AC_MSB 0x62 | ||
63 | #define DS2781_AC_LSB 0x63 | ||
64 | #define DS2781_VCHG 0x64 | ||
65 | #define DS2781_IMIN 0x65 | ||
66 | #define DS2781_VAE 0x66 | ||
67 | #define DS2781_IAE 0x67 | ||
68 | #define DS2781_AE_40 0x68 | ||
69 | #define DS2781_RSNSP 0x69 | ||
70 | #define DS2781_FULL_40_MSB 0x6A | ||
71 | #define DS2781_FULL_40_LSB 0x6B | ||
72 | #define DS2781_FULL_4_SLOPE 0x6C | ||
73 | #define DS2781_FULL_3_SLOPE 0x6D | ||
74 | #define DS2781_FULL_2_SLOPE 0x6E | ||
75 | #define DS2781_FULL_1_SLOPE 0x6F | ||
76 | #define DS2781_AE_4_SLOPE 0x70 | ||
77 | #define DS2781_AE_3_SLOPE 0x71 | ||
78 | #define DS2781_AE_2_SLOPE 0x72 | ||
79 | #define DS2781_AE_1_SLOPE 0x73 | ||
80 | #define DS2781_SE_4_SLOPE 0x74 | ||
81 | #define DS2781_SE_3_SLOPE 0x75 | ||
82 | #define DS2781_SE_2_SLOPE 0x76 | ||
83 | #define DS2781_SE_1_SLOPE 0x77 | ||
84 | #define DS2781_RSGAIN_MSB 0x78 | ||
85 | #define DS2781_RSGAIN_LSB 0x79 | ||
86 | #define DS2781_RSTC 0x7A | ||
87 | #define DS2781_COB 0x7B | ||
88 | #define DS2781_TBP34 0x7C | ||
89 | #define DS2781_TBP23 0x7D | ||
90 | #define DS2781_TBP12 0x7E | ||
91 | #define DS2781_EEPROM_BLOCK1_END 0x7F | ||
92 | /* Register 0x7D - 0xFF Reserved */ | ||
93 | |||
94 | #define DS2781_FSGAIN_MSB 0xB0 | ||
95 | #define DS2781_FSGAIN_LSB 0xB1 | ||
96 | |||
97 | /* Number of valid register addresses */ | ||
98 | #define DS2781_DATA_SIZE 0xB2 | ||
99 | |||
100 | /* Status register bits */ | ||
101 | #define DS2781_STATUS_CHGTF (1 << 7) | ||
102 | #define DS2781_STATUS_AEF (1 << 6) | ||
103 | #define DS2781_STATUS_SEF (1 << 5) | ||
104 | #define DS2781_STATUS_LEARNF (1 << 4) | ||
105 | /* Bit 3 Reserved */ | ||
106 | #define DS2781_STATUS_UVF (1 << 2) | ||
107 | #define DS2781_STATUS_PORF (1 << 1) | ||
108 | /* Bit 0 Reserved */ | ||
109 | |||
110 | /* Control register bits */ | ||
111 | /* Bit 7 Reserved */ | ||
112 | #define DS2781_CONTROL_NBEN (1 << 7) | ||
113 | #define DS2781_CONTROL_UVEN (1 << 6) | ||
114 | #define DS2781_CONTROL_PMOD (1 << 5) | ||
115 | #define DS2781_CONTROL_RNAOP (1 << 4) | ||
116 | #define DS1781_CONTROL_UVTH (1 << 3) | ||
117 | /* Bit 0 - 2 Reserved */ | ||
118 | |||
119 | /* Special feature register bits */ | ||
120 | /* Bit 1 - 7 Reserved */ | ||
121 | #define DS2781_SFR_PIOSC (1 << 0) | ||
122 | |||
123 | /* EEPROM register bits */ | ||
124 | #define DS2781_EEPROM_EEC (1 << 7) | ||
125 | #define DS2781_EEPROM_LOCK (1 << 6) | ||
126 | /* Bit 2 - 6 Reserved */ | ||
127 | #define DS2781_EEPROM_BL1 (1 << 1) | ||
128 | #define DS2781_EEPROM_BL0 (1 << 0) | ||
129 | |||
130 | extern int w1_ds2781_io(struct device *dev, char *buf, int addr, size_t count, | ||
131 | int io); | ||
132 | extern int w1_ds2781_io_nolock(struct device *dev, char *buf, int addr, | ||
133 | size_t count, int io); | ||
134 | extern int w1_ds2781_eeprom_cmd(struct device *dev, int addr, int cmd); | ||
135 | |||
136 | #endif /* !_W1_DS2781_H */ | ||