mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: power_supply_sysfs: Handle -ENODATA in a special way wm831x_backup: Remove unused variables gta02: Set pcf50633 charger_reference_current_ma pcf50633: Query charger status directly pcf50633: Properly reenable charging when the supply conditions change pcf50633: Get rid of charging restart software auto-triggering pcf50633: introduces battery charging current control pcf50633: Add ac power supply class to the charger wm831x: Factor out WM831x backup battery charger
This commit is contained in:
commit
48e902f0a3
10 changed files with 420 additions and 218 deletions
|
|
@ -808,6 +808,9 @@ static struct resource wm831x_wdt_resources[] = {
|
|||
};
|
||||
|
||||
static struct mfd_cell wm8310_devs[] = {
|
||||
{
|
||||
.name = "wm831x-backup",
|
||||
},
|
||||
{
|
||||
.name = "wm831x-buckv",
|
||||
.id = 1,
|
||||
|
|
@ -961,6 +964,9 @@ static struct mfd_cell wm8310_devs[] = {
|
|||
};
|
||||
|
||||
static struct mfd_cell wm8311_devs[] = {
|
||||
{
|
||||
.name = "wm831x-backup",
|
||||
},
|
||||
{
|
||||
.name = "wm831x-buckv",
|
||||
.id = 1,
|
||||
|
|
@ -1095,6 +1101,9 @@ static struct mfd_cell wm8311_devs[] = {
|
|||
};
|
||||
|
||||
static struct mfd_cell wm8312_devs[] = {
|
||||
{
|
||||
.name = "wm831x-backup",
|
||||
},
|
||||
{
|
||||
.name = "wm831x-buckv",
|
||||
.id = 1,
|
||||
|
|
|
|||
Loading…
Reference in a new issue