diff options
-rw-r--r-- | board/daisy/ec.tasklist | 2 | ||||
-rw-r--r-- | board/link/ec.tasklist | 2 | ||||
-rw-r--r-- | board/snow/ec.tasklist | 2 | ||||
-rw-r--r-- | board/spring/ec.tasklist | 2 | ||||
-rw-r--r-- | board/spring/usb_charging.c | 4 | ||||
-rw-r--r-- | common/build.mk | 3 | ||||
-rw-r--r-- | common/charge_state.c | 2 | ||||
-rw-r--r-- | common/pmu_tps65090_charger.c | 6 |
8 files changed, 11 insertions, 12 deletions
diff --git a/board/daisy/ec.tasklist b/board/daisy/ec.tasklist index 12e777fee8..c4f8fe1243 100644 --- a/board/daisy/ec.tasklist +++ b/board/daisy/ec.tasklist @@ -18,7 +18,7 @@ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \ TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \ TASK(POWERLED, power_led_task, NULL, TASK_STACK_SIZE) \ - TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \ + TASK(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \ TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \ diff --git a/board/link/ec.tasklist b/board/link/ec.tasklist index f058f08da8..63628b1741 100644 --- a/board/link/ec.tasklist +++ b/board/link/ec.tasklist @@ -18,7 +18,7 @@ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \ TASK(VBOOTHASH, vboot_hash_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \ - TASK(CHARGER, charge_state_machine_task, NULL, TASK_STACK_SIZE) \ + TASK(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK(THERMAL, thermal_task, NULL, TASK_STACK_SIZE) \ TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ TASK(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ diff --git a/board/snow/ec.tasklist b/board/snow/ec.tasklist index 375d534b64..d84f9818fa 100644 --- a/board/snow/ec.tasklist +++ b/board/snow/ec.tasklist @@ -18,7 +18,7 @@ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \ TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \ TASK(POWERLED, power_led_task, NULL, 256) \ - TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \ + TASK(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK(KEYSCAN, keyboard_scan_task, NULL, 360) \ TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \ diff --git a/board/spring/ec.tasklist b/board/spring/ec.tasklist index 0daf6727d7..a50d2ab798 100644 --- a/board/spring/ec.tasklist +++ b/board/spring/ec.tasklist @@ -17,7 +17,7 @@ #define CONFIG_TASK_LIST \ TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \ TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \ - TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \ + TASK(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK(KEYSCAN, keyboard_scan_task, NULL, 256) \ TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \ diff --git a/board/spring/usb_charging.c b/board/spring/usb_charging.c index 72fcf54335..d157cd895e 100644 --- a/board/spring/usb_charging.c +++ b/board/spring/usb_charging.c @@ -324,7 +324,7 @@ void board_pwm_nominal_duty_cycle(int percent) void usb_charge_interrupt(enum gpio_signal signal) { - task_wake(TASK_ID_PMU_TPS65090_CHARGER); + task_wake(TASK_ID_CHARGER); } static void board_adc_watch_toad(void) @@ -341,7 +341,7 @@ static void board_adc_watchdog_interrupt(void) if (current_watchdog == ADC_WATCH_TOAD) { pending_tsu6721_reset = 1; task_disable_irq(STM32_IRQ_ADC_1); - task_wake(TASK_ID_PMU_TPS65090_CHARGER); + task_wake(TASK_ID_CHARGER); } } DECLARE_IRQ(STM32_IRQ_ADC_1, board_adc_watchdog_interrupt, 2); diff --git a/common/build.mk b/common/build.mk index e377dbfca9..4fba8d081e 100644 --- a/common/build.mk +++ b/common/build.mk @@ -10,7 +10,7 @@ common-y=main.o util.o console_output.o uart_buffering.o common-y+=memory_commands.o shared_mem.o system_common.o hooks.o common-y+=gpio_commands.o version.o printf.o queue.o common-$(CONFIG_BATTERY_BQ20Z453)+=battery_bq20z453.o -common-$(CONFIG_BATTERY_LINK)+=battery_link.o +common-$(CONFIG_BATTERY_LINK)+=battery_link.o charge_state.o battery_precharge.o common-$(CONFIG_CHARGER_BQ24725)+=charger_bq24725.o common-$(CONFIG_CHIPSET_GAIA)+=gaia_power.o common-$(CONFIG_CHIPSET_X86)+=x86_power.o @@ -29,7 +29,6 @@ common-$(CONFIG_LPC)+=port80.o common-$(CONFIG_ONEWIRE_LED)+=onewire_led.o common-$(CONFIG_PSTORE)+=pstore_commands.o common-$(CONFIG_SMART_BATTERY)+=smart_battery.o smart_battery_stub.o -common-$(CONFIG_TASK_CHARGER)+=charge_state.o battery_precharge.o common-$(CONFIG_TASK_CONSOLE)+=console.o common-$(CONFIG_TASK_HOSTCMD)+=host_command.o host_event_commands.o common-$(CONFIG_TASK_KEYSCAN)+=keyboard_scan.o diff --git a/common/charge_state.c b/common/charge_state.c index f6ef5ce655..1536c2b1b7 100644 --- a/common/charge_state.c +++ b/common/charge_state.c @@ -614,7 +614,7 @@ static int exit_force_idle_mode(void) /** * Battery charging task */ -void charge_state_machine_task(void) +void charger_task(void) { struct power_state_context *ctx = &task_ctx; timestamp_t ts; diff --git a/common/pmu_tps65090_charger.c b/common/pmu_tps65090_charger.c index 4da619ea39..c1c7a03e53 100644 --- a/common/pmu_tps65090_charger.c +++ b/common/pmu_tps65090_charger.c @@ -390,7 +390,7 @@ int charge_keep_power_off(void) return charge <= BATTERY_AP_OFF_LEVEL; } -void pmu_charger_task(void) +void charger_task(void) { int next_state; int wait_time = T1_USEC; @@ -527,7 +527,7 @@ void pmu_task_throttled_wake(void) timestamp_t now = get_time(); if (now.val - last_waken.val >= HOOK_TICK_INTERVAL) { has_pending_event = 0; - task_wake(TASK_ID_PMU_TPS65090_CHARGER); + task_wake(TASK_ID_CHARGER); } else { has_pending_event = 1; } @@ -537,7 +537,7 @@ static void wake_pmu_task_if_necessary(void) { if (has_pending_event) { has_pending_event = 0; - task_wake(TASK_ID_PMU_TPS65090_CHARGER); + task_wake(TASK_ID_CHARGER); } } DECLARE_HOOK(HOOK_TICK, wake_pmu_task_if_necessary, HOOK_PRIO_DEFAULT); |