A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-23 21:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.infradead.org/battery-2.6

Browse source 
* git://git.infradead.org/battery-2.6:
  intel_mid_battery: Fix battery scaling
  intel_mid_battery: Fix the argument order to intel_scu_ipc_command
  olpc_battery: Fix build failure caused by sysfs changes
  Add s3c-adc-battery driver
  Intel MID platform battery driver

Fix up trivial conflicts (battery drivers added from different branches)
in drivers/power/{Kconfig,Makefile}
This commit is contained in:
Linus Torvalds 2010-08-12 09:58:33 -07:00
commit 16bb85bc12
6 changed files with 1282 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
include/linux/s3c_adc_battery.h Normal file
View file

@ -0,0 +1,36 @@
#ifndef _S3C_ADC_BATTERY_H
#define _S3C_ADC_BATTERY_H
struct s3c_adc_bat_thresh {
int volt; /* mV */
int cur; /* mA */
int level; /* percent */
};
struct s3c_adc_bat_pdata {
int (*init)(void);
void (*exit)(void);
void (*enable_charger)(void);
void (*disable_charger)(void);
int gpio_charge_finished;
const struct s3c_adc_bat_thresh *lut_noac;
unsigned int lut_noac_cnt;
const struct s3c_adc_bat_thresh *lut_acin;
unsigned int lut_acin_cnt;
const unsigned int volt_channel;
const unsigned int current_channel;
const unsigned int backup_volt_channel;
const unsigned int volt_mult;
const unsigned int current_mult;
const unsigned int backup_volt_mult;
const unsigned int internal_impedance;
const unsigned int backup_volt_max;
const unsigned int backup_volt_min;
};
#endif