Merge tag 'for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel: "Battery/charger related: - cros-peripheral-charger: new driver - mt6360-charger: new driver - simple-battery: support reading chemistry info - max17042-battery: add max77849 support - sbs-battery: add time_to_empty_now support - smb347-charger: prepare USB OTG support - rn5t618: add voltage_now support - axp288: cleanup & optimizations - max17042_battery: cleanups - ab8500: cleanups - misc minor cleanups and DT binding fixes reset related: - tps65086-restart: new driver - linkstation-poweroff: support NETGEAR ReadyNAS Duo v2" * tag 'for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (51 commits) power: supply: core: Fix parsing of battery chemistry/technology power: supply: max17042_battery: log SOC threshold using debug log level power: supply: max17042_battery: more robust chip type checks power: supply: max17042_battery: fix typo in MAx17042_TOFF power: supply: max17042_battery: clean up MAX17055_V_empty power: supply: smb347-charger: Implement USB VBUS regulator power: supply: smb347-charger: Add missing pin control activation power: supply: smb347-charger: Utilize generic regmap caching power: supply: smb347-charger: Make smb347_set_writable() IRQ-safe dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator power: reset: Add TPS65086 restart driver dt-bindings: power: supply: max17042: describe interrupt power: supply: max17042: remove duplicated STATUS bit defines power: supply: max17042: handle fails of reading status register power: supply: core: Parse battery chemistry/technology dt-bindings: power: Extend battery bindings with chemistry power: reset: linkstation-poweroff: add new device power: reset: linkstation-poweroff: prepare for new devices power: supply: bq24735: reorganize ChargeOption command macros power: supply: rn5t618: Add voltage_now property ...
This commit is contained in:
@@ -4228,6 +4228,7 @@ enum ec_device_event {
|
||||
EC_DEVICE_EVENT_TRACKPAD,
|
||||
EC_DEVICE_EVENT_DSP,
|
||||
EC_DEVICE_EVENT_WIFI,
|
||||
EC_DEVICE_EVENT_WLC,
|
||||
};
|
||||
|
||||
enum ec_device_event_param {
|
||||
@@ -5460,6 +5461,72 @@ struct ec_response_rollback_info {
|
||||
/* Issue AP reset */
|
||||
#define EC_CMD_AP_RESET 0x0125
|
||||
|
||||
/**
|
||||
* Get the number of peripheral charge ports
|
||||
*/
|
||||
#define EC_CMD_PCHG_COUNT 0x0134
|
||||
|
||||
#define EC_PCHG_MAX_PORTS 8
|
||||
|
||||
struct ec_response_pchg_count {
|
||||
uint8_t port_count;
|
||||
} __ec_align1;
|
||||
|
||||
/**
|
||||
* Get the status of a peripheral charge port
|
||||
*/
|
||||
#define EC_CMD_PCHG 0x0135
|
||||
|
||||
struct ec_params_pchg {
|
||||
uint8_t port;
|
||||
} __ec_align1;
|
||||
|
||||
struct ec_response_pchg {
|
||||
uint32_t error; /* enum pchg_error */
|
||||
uint8_t state; /* enum pchg_state state */
|
||||
uint8_t battery_percentage;
|
||||
uint8_t unused0;
|
||||
uint8_t unused1;
|
||||
/* Fields added in version 1 */
|
||||
uint32_t fw_version;
|
||||
uint32_t dropped_event_count;
|
||||
} __ec_align2;
|
||||
|
||||
enum pchg_state {
|
||||
/* Charger is reset and not initialized. */
|
||||
PCHG_STATE_RESET = 0,
|
||||
/* Charger is initialized or disabled. */
|
||||
PCHG_STATE_INITIALIZED,
|
||||
/* Charger is enabled and ready to detect a device. */
|
||||
PCHG_STATE_ENABLED,
|
||||
/* Device is in proximity. */
|
||||
PCHG_STATE_DETECTED,
|
||||
/* Device is being charged. */
|
||||
PCHG_STATE_CHARGING,
|
||||
/* Device is fully charged. It implies DETECTED (& not charging). */
|
||||
PCHG_STATE_FULL,
|
||||
/* In download (a.k.a. firmware update) mode */
|
||||
PCHG_STATE_DOWNLOAD,
|
||||
/* In download mode. Ready for receiving data. */
|
||||
PCHG_STATE_DOWNLOADING,
|
||||
/* Device is ready for data communication. */
|
||||
PCHG_STATE_CONNECTED,
|
||||
/* Put no more entry below */
|
||||
PCHG_STATE_COUNT,
|
||||
};
|
||||
|
||||
#define EC_PCHG_STATE_TEXT { \
|
||||
[PCHG_STATE_RESET] = "RESET", \
|
||||
[PCHG_STATE_INITIALIZED] = "INITIALIZED", \
|
||||
[PCHG_STATE_ENABLED] = "ENABLED", \
|
||||
[PCHG_STATE_DETECTED] = "DETECTED", \
|
||||
[PCHG_STATE_CHARGING] = "CHARGING", \
|
||||
[PCHG_STATE_FULL] = "FULL", \
|
||||
[PCHG_STATE_DOWNLOAD] = "DOWNLOAD", \
|
||||
[PCHG_STATE_DOWNLOADING] = "DOWNLOADING", \
|
||||
[PCHG_STATE_CONNECTED] = "CONNECTED", \
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Voltage regulator controls */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user