summaryrefslogtreecommitdiff
path: root/src/ec
diff options
context:
space:
mode:
Diffstat (limited to 'src/ec')
-rw-r--r--src/ec/google/chromeec/acpi/battery.asl4
-rw-r--r--src/ec/google/chromeec/acpi/ec.asl7
-rw-r--r--src/ec/google/chromeec/ec_commands.h15
3 files changed, 22 insertions, 4 deletions
diff --git a/src/ec/google/chromeec/acpi/battery.asl b/src/ec/google/chromeec/acpi/battery.asl
index 2ef1199b52..5591b334e0 100644
--- a/src/ec/google/chromeec/acpi/battery.asl
+++ b/src/ec/google/chromeec/acpi/battery.asl
@@ -126,9 +126,7 @@ Device (BAT0)
Return (PBIF)
}
- // Extended Battery info method is disabled for now due to
- // a bug in the Linux kernel: http://crosbug.com/28747
- Method (XBIX, 0, Serialized)
+ Method (_BIX, 0, Serialized)
{
// Last Full Charge Capacity
Store (BTDF, Index (PBIX, 3))
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 734d22394a..7cd8f75dbf 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -312,6 +312,13 @@ Device (EC0)
}
#endif
+ // Battery Status
+ Method (_Q17, 0, NotSerialized)
+ {
+ Store ("EC: BATTERY STATUS", Debug)
+ Notify (BAT0, 0x80)
+ }
+
/*
* Dynamic Platform Thermal Framework support
*/
diff --git a/src/ec/google/chromeec/ec_commands.h b/src/ec/google/chromeec/ec_commands.h
index 0687641416..bd94281169 100644
--- a/src/ec/google/chromeec/ec_commands.h
+++ b/src/ec/google/chromeec/ec_commands.h
@@ -275,6 +275,9 @@ enum host_event_code {
/* PD MCU triggering host event */
EC_HOST_EVENT_PD_MCU = 22,
+ /* Battery Status flags have changed */
+ EC_HOST_EVENT_BATTERY_STATUS = 23,
+
/*
* The high bit of the event mask is not used as a host event code. If
* it reads back as set, then the entire event mask should be
@@ -1032,6 +1035,13 @@ struct lightbar_params_v1 {
struct rgb_s color[8]; /* 0-3 are Google colors */
} __packed;
+/* Lightbyte program. */
+#define LB_PROG_LEN 192
+struct lb_program {
+ uint8_t size;
+ uint8_t data[LB_PROG_LEN];
+};
+
struct ec_params_lightbar {
uint8_t cmd; /* Command (see enum lightbar_command) */
union {
@@ -1058,6 +1068,7 @@ struct ec_params_lightbar {
struct lightbar_params_v0 set_params_v0;
struct lightbar_params_v1 set_params_v1;
+ struct lb_program set_program;
};
} __packed;
@@ -1090,7 +1101,8 @@ struct ec_response_lightbar {
struct {
/* no return params */
} off, on, init, set_brightness, seq, reg, set_rgb,
- demo, set_params_v0, set_params_v1;
+ demo, set_params_v0, set_params_v1,
+ set_program;
};
} __packed;
@@ -1114,6 +1126,7 @@ enum lightbar_command {
LIGHTBAR_CMD_GET_DEMO = 15,
LIGHTBAR_CMD_GET_PARAMS_V1 = 16,
LIGHTBAR_CMD_SET_PARAMS_V1 = 17,
+ LIGHTBAR_CMD_SET_PROGRAM = 18,
LIGHTBAR_NUM_CMDS
};