diff options
Diffstat (limited to 'zephyr')
| -rw-r--r-- | zephyr/projects/corsola/src/board_chipset.c | 3 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/kingler/button.c | 9 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/kingler/usbc_config.c | 11 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/krabby/charger_workaround.c | 10 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/krabby/hooks.c | 3 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/krabby/led.c | 9 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/krabby/usbc_config.c | 14 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/usbc_config.c | 15 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/variant_db_detection.c | 7 |
9 files changed, 59 insertions, 22 deletions
diff --git a/zephyr/projects/corsola/src/board_chipset.c b/zephyr/projects/corsola/src/board_chipset.c index b09d21ef3b..cdda69490c 100644 --- a/zephyr/projects/corsola/src/board_chipset.c +++ b/zephyr/projects/corsola/src/board_chipset.c @@ -8,6 +8,7 @@ #include <init.h> #include <ap_power/ap_power.h> #include <drivers/gpio.h> +#include <toolchain.h> #include "gpio.h" static void board_backlight_handler(struct ap_power_ev_callback *cb, @@ -34,6 +35,7 @@ static void board_backlight_handler(struct ap_power_ev_callback *cb, static int install_backlight_handler(const struct device *unused) { + ARG_UNUSED(unused); static struct ap_power_ev_callback cb; /* @@ -45,5 +47,4 @@ static int install_backlight_handler(const struct device *unused) ap_power_ev_add_callback(&cb); return 0; } - SYS_INIT(install_backlight_handler, APPLICATION, 1); diff --git a/zephyr/projects/corsola/src/kingler/button.c b/zephyr/projects/corsola/src/kingler/button.c index 0df87c7750..b08f27f5a5 100644 --- a/zephyr/projects/corsola/src/kingler/button.c +++ b/zephyr/projects/corsola/src/kingler/button.c @@ -4,18 +4,20 @@ */ /* kingler button */ +#include <toolchain.h> #include "button.h" #include "cros_board_info.h" #include "gpio.h" #include "hooks.h" -static void buttons_hook(void) +static int buttons_hook(const struct device *unused) { + ARG_UNUSED(unused); int version; if (cbi_get_board_version(&version)) - return; + return 0; /* b:219891339: drop this workaround when we deprecate rev0 */ if (version == 0) { @@ -30,5 +32,6 @@ static void buttons_hook(void) */ gpio_enable_interrupt(GPIO_VOLUME_UP_L); } + return 0; } -DECLARE_HOOK(HOOK_INIT, buttons_hook, HOOK_PRIO_DEFAULT); +SYS_INIT(buttons_hook, APPLICATION, HOOK_PRIO_DEFAULT); diff --git a/zephyr/projects/corsola/src/kingler/usbc_config.c b/zephyr/projects/corsola/src/kingler/usbc_config.c index 8e3718b781..ae7c0793d0 100644 --- a/zephyr/projects/corsola/src/kingler/usbc_config.c +++ b/zephyr/projects/corsola/src/kingler/usbc_config.c @@ -4,6 +4,7 @@ */ /* Kingler board-specific USB-C configuration */ +#include <toolchain.h> #include "charger.h" #include "console.h" @@ -165,7 +166,15 @@ void board_tcpc_init(void) usb_mux_hpd_update(port, USB_PD_MUX_HPD_LVL_DEASSERTED | USB_PD_MUX_HPD_IRQ_DEASSERTED); } -DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_POST_I2C); + +static int kingler_tcpc_init(const struct device *unused) +{ + ARG_UNUSED(unused); + + board_tcpc_init(); + return 0; +} +SYS_INIT(kingler_tcpc_init, APPLICATION, HOOK_PRIO_POST_I2C); __override int board_rt1718s_init(int port) { diff --git a/zephyr/projects/corsola/src/krabby/charger_workaround.c b/zephyr/projects/corsola/src/krabby/charger_workaround.c index 440bf609e2..62bedb4c1f 100644 --- a/zephyr/projects/corsola/src/krabby/charger_workaround.c +++ b/zephyr/projects/corsola/src/krabby/charger_workaround.c @@ -3,6 +3,8 @@ * found in the LICENSE file. */ +#include <toolchain.h> + #include "charger.h" #include "driver/charger/rt9490.h" #include "hooks.h" @@ -10,10 +12,11 @@ #include "system.h" /* work around for IBUS ADC unstable issue */ -void board_rt9490_workaround(void) +static int board_rt9490_workaround(const struct device *unused) { + ARG_UNUSED(unused); if (system_get_board_version() != 0) - return; + return 0; i2c_update8(chg_chips[CHARGER_SOLO].i2c_port, chg_chips[CHARGER_SOLO].i2c_addr_flags, @@ -37,5 +40,6 @@ void board_rt9490_workaround(void) RT9490_REG_ADC_CHANNEL0, RT9490_VSYS_ADC_DIS, MASK_CLR); + return 0; } -DECLARE_HOOK(HOOK_INIT, board_rt9490_workaround, HOOK_PRIO_DEFAULT); +SYS_INIT(board_rt9490_workaround, APPLICATION, HOOK_PRIO_DEFAULT); diff --git a/zephyr/projects/corsola/src/krabby/hooks.c b/zephyr/projects/corsola/src/krabby/hooks.c index 70f3efe8e1..9ce46e90f7 100644 --- a/zephyr/projects/corsola/src/krabby/hooks.c +++ b/zephyr/projects/corsola/src/krabby/hooks.c @@ -5,6 +5,7 @@ #include <init.h> #include <drivers/gpio.h> +#include <toolchain.h> #include <ap_power/ap_power.h> #include "gpio.h" @@ -63,6 +64,7 @@ static void board_suspend_handler(struct ap_power_ev_callback *cb, static int install_suspend_handler(const struct device *unused) { + ARG_UNUSED(unused); static struct ap_power_ev_callback cb; /* @@ -73,5 +75,4 @@ static int install_suspend_handler(const struct device *unused) ap_power_ev_add_callback(&cb); return 0; } - SYS_INIT(install_suspend_handler, APPLICATION, 1); diff --git a/zephyr/projects/corsola/src/krabby/led.c b/zephyr/projects/corsola/src/krabby/led.c index 43832d7485..38f0ddf0b6 100644 --- a/zephyr/projects/corsola/src/krabby/led.c +++ b/zephyr/projects/corsola/src/krabby/led.c @@ -3,6 +3,8 @@ * found in the LICENSE file. */ +#include <toolchain.h> + #include "chipset.h" #include "ec_commands.h" #include "hooks.h" @@ -91,10 +93,13 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) return EC_SUCCESS; } -void board_led_init(void) +static int board_led_init(const struct device *unused) { + ARG_UNUSED(unused); pwm_set_duty(LED_POWER_WHITE, 100); pwm_set_duty(LED_BATTERY_AMBER, 100); pwm_set_duty(LED_BATTERY_WHITE, 100); + + return 0; } -DECLARE_HOOK(HOOK_INIT, board_led_init, HOOK_PRIO_DEFAULT); +SYS_INIT(board_led_init, APPLICATION, HOOK_PRIO_DEFAULT); diff --git a/zephyr/projects/corsola/src/krabby/usbc_config.c b/zephyr/projects/corsola/src/krabby/usbc_config.c index b46a9edf8f..36a721a7ee 100644 --- a/zephyr/projects/corsola/src/krabby/usbc_config.c +++ b/zephyr/projects/corsola/src/krabby/usbc_config.c @@ -4,6 +4,7 @@ */ /* Krabby board-specific USB-C configuration */ +#include <toolchain.h> #include "adc.h" #include "baseboard_usbc_config.h" @@ -47,23 +48,28 @@ void c1_bc12_interrupt(enum gpio_signal signal) } -static void board_sub_bc12_init(void) +static int board_sub_bc12_init(const struct device *unused) { + ARG_UNUSED(unused); if (corsola_get_db_type() == CORSOLA_DB_TYPEC) gpio_enable_dt_interrupt( GPIO_INT_FROM_NODELABEL(int_usb_c1_bc12_charger)); else /* If this is not a Type-C subboard, disable the task. */ task_disable_task(TASK_ID_USB_CHG_P1); + + return 0; } /* Must be done after I2C and subboard */ -DECLARE_HOOK(HOOK_INIT, board_sub_bc12_init, HOOK_PRIO_POST_I2C); +SYS_INIT(board_sub_bc12_init, APPLICATION, HOOK_PRIO_POST_I2C); -static void board_usbc_init(void) +static int board_usbc_init(const struct device *unused) { + ARG_UNUSED(unused); gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usb_c0_ppc_bc12)); + return 0; } -DECLARE_HOOK(HOOK_INIT, board_usbc_init, HOOK_PRIO_POST_DEFAULT); +SYS_INIT(board_usbc_init, APPLICATION, HOOK_PRIO_POST_DEFAULT); void ppc_interrupt(enum gpio_signal signal) { diff --git a/zephyr/projects/corsola/src/usbc_config.c b/zephyr/projects/corsola/src/usbc_config.c index 54e5f48b25..a377d84d3a 100644 --- a/zephyr/projects/corsola/src/usbc_config.c +++ b/zephyr/projects/corsola/src/usbc_config.c @@ -7,6 +7,7 @@ #include <drivers/gpio.h> #include <ap_power/ap_power.h> +#include <toolchain.h> #include "adc.h" #include "baseboard_usbc_config.h" @@ -43,13 +44,15 @@ static bool tasks_inited; /* Baseboard */ -static void baseboard_init(void) +static int baseboard_init(const struct device *unused) { + ARG_UNUSED(unused); #ifdef CONFIG_VARIANT_CORSOLA_USBA gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usba)); #endif + return 0; } -DECLARE_HOOK(HOOK_INIT, baseboard_init, HOOK_PRIO_PRE_DEFAULT); +SYS_INIT(baseboard_init, APPLICATION, HOOK_PRIO_PRE_DEFAULT); __override uint8_t board_get_usb_pd_port_count(void) { @@ -227,8 +230,9 @@ static void tasks_init_deferred(void) } DECLARE_DEFERRED(tasks_init_deferred); -static void baseboard_x_ec_gpio2_init(void) +static int baseboard_x_ec_gpio2_init(const struct device *unused) { + ARG_UNUSED(unused); static struct ppc_drv virtual_ppc_drv = { 0 }; static struct tcpm_drv virtual_tcpc_drv = { 0 }; static struct bc12_drv virtual_bc12_drv = { 0 }; @@ -240,7 +244,7 @@ static void baseboard_x_ec_gpio2_init(void) gpio_pin_interrupt_configure_dt( GPIO_DT_FROM_ALIAS(gpio_usb_c1_ppc_int_odl), GPIO_INT_EDGE_FALLING); - return; + return 0; } if (corsola_get_db_type() == CORSOLA_DB_HDMI) { static struct ap_power_ev_callback cb; @@ -272,8 +276,9 @@ static void baseboard_x_ec_gpio2_init(void) * mainlink direction. */ hook_call_deferred(&tasks_init_deferred_data, 2 * SECOND); + return 0; } -DECLARE_HOOK(HOOK_INIT, baseboard_x_ec_gpio2_init, HOOK_PRIO_DEFAULT); +SYS_INIT(baseboard_x_ec_gpio2_init, APPLICATION, HOOK_PRIO_DEFAULT); __override uint8_t get_dp_pin_mode(int port) { diff --git a/zephyr/projects/corsola/src/variant_db_detection.c b/zephyr/projects/corsola/src/variant_db_detection.c index 89741cce18..59a8238361 100644 --- a/zephyr/projects/corsola/src/variant_db_detection.c +++ b/zephyr/projects/corsola/src/variant_db_detection.c @@ -5,6 +5,7 @@ /* Corsola daughter board detection */ #include <drivers/gpio.h> +#include <toolchain.h> #include "console.h" #include "gpio/gpio_int.h" @@ -69,8 +70,10 @@ enum corsola_db_type corsola_get_db_type(void) return db; } -static void corsola_db_init(void) +static int corsola_db_init(const struct device *unused) { + ARG_UNUSED(unused); corsola_get_db_type(); + return 0; } -DECLARE_HOOK(HOOK_INIT, corsola_db_init, HOOK_PRIO_PRE_I2C); +SYS_INIT(corsola_db_init, APPLICATION, HOOK_PRIO_PRE_I2C); |