diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.com> | 2021-01-14 00:39:31 +0300 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2021-01-14 00:39:31 +0300 |
| commit | b059b48500dab78cb6c7be006280dbc001c0a46b (patch) | |
| tree | b2006a68a9c7f8f70ed1e02dd5a9e481b90bbbcf /include/linux | |
| parent | 3235d1305066a58ef0198d95d8a662c574f3df85 (diff) | |
| parent | cb6d6918c56ffd98e88164d5471f692d33dabf2b (diff) | |
| download | linux-b059b48500dab78cb6c7be006280dbc001c0a46b.tar.xz | |
Merge tag 'ib-psy-pxa-for-5.12-signed' into psy-next
Immutable branch between mach-pxa and power-supply for for 5.12
This immutable branch replaces legacy gpio API in wm97xx_battery and
z2_battery with new gpiod API, which involves the drivers in
power-supply and some mach-pxa board files.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/wm97xx.h | 1 | ||||
| -rw-r--r-- | include/linux/z2_battery.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/wm97xx.h b/include/linux/wm97xx.h index 58e082dadc68..462854f4f286 100644 --- a/include/linux/wm97xx.h +++ b/include/linux/wm97xx.h @@ -294,7 +294,6 @@ struct wm97xx { struct wm97xx_batt_pdata { int batt_aux; int temp_aux; - int charge_gpio; int min_voltage; int max_voltage; int batt_div; diff --git a/include/linux/z2_battery.h b/include/linux/z2_battery.h index eaba53ff387c..9e8be7a7cd25 100644 --- a/include/linux/z2_battery.h +++ b/include/linux/z2_battery.h @@ -6,7 +6,6 @@ struct z2_battery_info { int batt_I2C_bus; int batt_I2C_addr; int batt_I2C_reg; - int charge_gpio; int min_voltage; int max_voltage; int batt_div; |