From d869fe11c6acbc3466abcdae741376b2c71bca69 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 2 Jul 2008 22:44:59 +0100 Subject: [PATCH] From 5718bde77ed1a75e0fd2cdf5e099e66121d10c0a Mon Sep 17 00:00:00 2001 Subject: [PATCH] [battery] Make the bq27000 send an uevent when the charging state possible changed Remove the todo entries from the pcf50633, make the mach-gta02 call the bq27000 driver from the pmu callback. --- arch/arm/mach-s3c2440/mach-gta02.c | 36 +++++++++++++++++++----------------- drivers/i2c/chips/pcf50633.c | 4 ---- drivers/power/bq27000_battery.c | 11 +++++++++++ include/linux/bq27000_battery.h | 2 ++ 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index afe8039..e66498b 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -450,6 +450,24 @@ static struct s3c2410_uartcfg gta02_uartcfgs[] = { }; +/* BQ27000 Battery */ + +struct bq27000_platform_data bq27000_pdata = { + .name = "bat", + .rsense_mohms = 20, + .hdq_read = gta02hdq_read, + .hdq_write = gta02hdq_write, + .hdq_initialized = gta02hdq_initialized, +}; + +struct platform_device bq27000_battery_device = { + .name = "bq27000-battery", + .dev = { + .platform_data = &bq27000_pdata, + }, +}; + + /* PMU driver info */ static int pmu_callback(struct device *dev, unsigned int feature, @@ -482,6 +500,7 @@ static int pmu_callback(struct device *dev, unsigned int feature, break; } + bq27000_charging_state_change(&bq27000_battery_device); return 0; } @@ -740,23 +759,6 @@ struct platform_device gta02_hdq_device = { }; #endif -/* BQ27000 Battery */ - -struct bq27000_platform_data bq27000_pdata = { - .name = "bat", - .rsense_mohms = 20, - .hdq_read = gta02hdq_read, - .hdq_write = gta02hdq_write, - .hdq_initialized = gta02hdq_initialized, -}; - -struct platform_device bq27000_battery_device = { - .name = "bq27000-battery", - .dev = { - .platform_data = &bq27000_pdata, - }, -}; - /* NOR Flash */ diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c index 4d19dae..8a27925 100644 --- a/drivers/i2c/chips/pcf50633.c +++ b/drivers/i2c/chips/pcf50633.c @@ -888,8 +888,6 @@ static void pcf50633_work(struct work_struct *work) if (pcf->pdata->cb) pcf->pdata->cb(&pcf->client.dev, PCF50633_FEAT_MBC, PMU_EVT_INSERT); - /* FIXME: signal this to userspace */ - //kobject_uevent( ,KOBJ_ADD); } if (pcfirq[0] & PCF50633_INT1_ADPREM) { /* Charger removed */ @@ -900,8 +898,6 @@ static void pcf50633_work(struct work_struct *work) if (pcf->pdata->cb) pcf->pdata->cb(&pcf->client.dev, PCF50633_FEAT_MBC, PMU_EVT_REMOVE); - /* FIXME: signal this to userspace */ - //kobject_uevent( ,KOBJ_ADD); } if (pcfirq[0] & PCF50633_INT1_USBINS) { DEBUGPC("USBINS "); diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c index c87e26d..4855d5a 100644 --- a/drivers/power/bq27000_battery.c +++ b/drivers/power/bq27000_battery.c @@ -330,6 +330,17 @@ static int bq27000_battery_remove(struct platform_device *pdev) return 0; } +void bq27000_charging_state_change(struct platform_device *pdev) +{ + struct bq27000_device_info *di = platform_get_drvdata(pdev); + + if (!di) + return; + + power_supply_changed(&di->bat); +} +EXPORT_SYMBOL_GPL(bq27000_charging_state_change); + #ifdef CONFIG_PM static int bq27000_battery_suspend(struct platform_device *pdev, diff --git a/include/linux/bq27000_battery.h b/include/linux/bq27000_battery.h index 36b4f20..fed4287 100644 --- a/include/linux/bq27000_battery.h +++ b/include/linux/bq27000_battery.h @@ -1,6 +1,8 @@ #ifndef __BQ27000_BATTERY_H__ #define __BQ27000_BATTERY_H__ +void bq27000_charging_state_change(struct platform_device *pdev); + struct bq27000_platform_data { const char *name; int rsense_mohms; -- 1.5.6.5 v2/lede/master-31e0f0ae/tree/target/linux?h=do-work/Edimax-v2&id=e1799d38351029f2730ba31de6006f49cdfef75c'>linux/s3c24xx/patches-2.6.24/1233-introduce-BANKCON-meddling-sysfs.patch.patch
blob: e4c5dee9337f3d977a93a46bee380a0b3d09631d (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300