diff options
| -rw-r--r-- | baseboard/hatch/baseboard.c | 32 | ||||
| -rw-r--r-- | baseboard/hatch/baseboard.h | 10 | ||||
| -rw-r--r-- | board/palkia/board.c | 168 | ||||
| -rw-r--r-- | board/palkia/board.h | 40 | ||||
| -rw-r--r-- | board/palkia/ec.tasklist | 4 | ||||
| -rw-r--r-- | board/palkia/gpio.inc | 24 |
6 files changed, 53 insertions, 225 deletions
diff --git a/baseboard/hatch/baseboard.c b/baseboard/hatch/baseboard.c index e91a37ea98..79533ea79e 100644 --- a/baseboard/hatch/baseboard.c +++ b/baseboard/hatch/baseboard.c @@ -72,9 +72,13 @@ struct keyboard_scan_config keyscan_config = { /******************************************************************************/ /* I2C port map configuration */ const struct i2c_port_t i2c_ports[] = { +#ifdef CONFIG_ACCEL_FIFO {"sensor", I2C_PORT_SENSOR, 100, GPIO_I2C0_SCL, GPIO_I2C0_SDA}, +#endif {"ppc0", I2C_PORT_PPC0, 100, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 {"tcpc1", I2C_PORT_TCPC1, 100, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, +#endif {"tcpc0", I2C_PORT_TCPC0, 100, GPIO_I2C3_SCL, GPIO_I2C3_SDA}, #ifdef BOARD_AKEMI {"thermal", I2C_PORT_THERMAL, 400, GPIO_I2C4_SCL, GPIO_I2C4_SDA}, @@ -177,12 +181,13 @@ struct ppc_config_t ppc_chips[CONFIG_USB_PD_PORT_MAX_COUNT] = { .i2c_addr_flags = SN5S330_ADDR0_FLAGS, .drv = &sn5s330_drv }, - +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 [USB_PD_PORT_TCPC_1] = { .i2c_port = I2C_PORT_TCPC1, .i2c_addr_flags = SN5S330_ADDR0_FLAGS, .drv = &sn5s330_drv }, +#endif }; unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); @@ -195,15 +200,19 @@ void baseboard_tcpc_init(void) /* Enable PPC interrupts. */ gpio_enable_interrupt(GPIO_USB_C0_PPC_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_PPC_INT_ODL); - /* Enable TCPC interrupts. */ gpio_enable_interrupt(GPIO_USB_C0_TCPC_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_TCPC_INT_ODL); - /* Enable BC 1.2 interrupts */ gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_ODL); + +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 + /* Enable PPC interrupts. */ + gpio_enable_interrupt(GPIO_USB_C1_PPC_INT_ODL); + /* Enable TCPC interrupts. */ + gpio_enable_interrupt(GPIO_USB_C1_TCPC_INT_ODL); + /* Enable BC 1.2 interrupts */ gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_ODL); +#endif } DECLARE_HOOK(HOOK_INIT, baseboard_tcpc_init, HOOK_PRIO_INIT_I2C + 1); @@ -223,12 +232,14 @@ uint16_t tcpc_get_alert_status(void) status |= PD_STATUS_TCPC_ALERT_0; } +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 if (!gpio_get_level(GPIO_USB_C1_TCPC_INT_ODL)) { level = !!(tcpc_config[USB_PD_PORT_TCPC_1].flags & TCPC_FLAGS_RESET_ACTIVE_HIGH); if (gpio_get_level(GPIO_USB_C1_TCPC_RST) != level) status |= PD_STATUS_TCPC_ALERT_1; } +#endif return status; } @@ -261,10 +272,12 @@ void board_reset_pd_mcu(void) BOARD_TCPC_C0_RESET_HOLD_DELAY, BOARD_TCPC_C0_RESET_POST_DELAY); +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 /* Reset TCPC1 */ reset_pd_port(USB_PD_PORT_TCPC_1, GPIO_USB_C1_TCPC_RST, BOARD_TCPC_C1_RESET_HOLD_DELAY, BOARD_TCPC_C1_RESET_POST_DELAY); +#endif } int board_set_active_charge_port(int port) @@ -325,8 +338,13 @@ int ppc_get_alert_status(int port) { if (port == USB_PD_PORT_TCPC_0) return gpio_get_level(GPIO_USB_C0_PPC_INT_ODL) == 0; - else - return gpio_get_level(GPIO_USB_C1_PPC_INT_ODL) == 0; + return port == USB_PD_PORT_TCPC_0 ? + gpio_get_level(GPIO_USB_C0_PPC_INT_ODL) == 0 : +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 + gpio_get_level(GPIO_USB_C1_PPC_INT_ODL) == 0; +#else + EC_SUCCESS; +#endif } void board_set_charge_limit(int port, int supplier, int charge_ma, diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h index be5b678c59..f077de20e4 100644 --- a/baseboard/hatch/baseboard.h +++ b/baseboard/hatch/baseboard.h @@ -78,6 +78,7 @@ #define I2C_PORT_ACCEL I2C_PORT_SENSOR /* Enable sensor fifo, must also define the _SIZE and _THRES */ +#if !defined(BOARD_PALKIA) #define CONFIG_ACCEL_FIFO /* FIFO size is in power of 2. */ #define CONFIG_ACCEL_FIFO_SIZE 256 @@ -87,6 +88,7 @@ /* Sensor console commands */ #define CONFIG_CMD_ACCELS #define CONFIG_CMD_ACCEL_INFO +#endif /* !BOARD_PALKIA */ /* Common charger defines */ #define CONFIG_CHARGE_MANAGER @@ -122,7 +124,11 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_POWER_DELIVERY #define CONFIG_USB_PD_TCPMV1 +#if defined(BOARD_PALKIA) +#define CONFIG_USB_PD_PORT_MAX_COUNT 1 +#else #define CONFIG_USB_PD_PORT_MAX_COUNT 2 +#endif #define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE @@ -149,13 +155,17 @@ #define CONFIG_CMD_CHARGEN #define USB_PD_PORT_TCPC_0 0 +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 #define USB_PD_PORT_TCPC_1 1 +#endif /* BC 1.2 */ #define CONFIG_USB_CHARGER +#if !defined(BOARD_PALKIA) /* Common Sensor Defines */ #define CONFIG_TABLET_MODE +#endif /* TODO(b/122273953): Use correct PD delay values */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ diff --git a/board/palkia/board.c b/board/palkia/board.c index eadb244244..a9604daeff 100644 --- a/board/palkia/board.c +++ b/board/palkia/board.c @@ -10,9 +10,6 @@ #include "button.h" #include "common.h" #include "cros_board_info.h" -#include "driver/accel_bma2x2.h" -#include "driver/accelgyro_bmi160.h" -#include "driver/als_opt3001.h" #include "driver/bc12/pi3usb9201.h" #include "driver/ppc/sn5s330.h" #include "driver/tcpm/ps8xxx.h" @@ -32,7 +29,6 @@ #include "spi.h" #include "switch.h" #include "system.h" -#include "tablet_mode.h" #include "task.h" #include "temp_sensor.h" #include "thermal.h" @@ -46,6 +42,11 @@ #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args) +/* GPIO to enable/disable the USB Type-A port. */ +const int usb_port_enable[CONFIG_USB_PORT_POWER_SMART_PORT_COUNT] = { + GPIO_EN_USB_A_5V, +}; + static void ppc_interrupt(enum gpio_signal signal) { switch (signal) { @@ -53,10 +54,6 @@ static void ppc_interrupt(enum gpio_signal signal) sn5s330_interrupt(0); break; - case GPIO_USB_C1_PPC_INT_ODL: - sn5s330_interrupt(1); - break; - default: break; } @@ -70,9 +67,6 @@ static void tcpc_alert_event(enum gpio_signal signal) case GPIO_USB_C0_TCPC_INT_ODL: port = 0; break; - case GPIO_USB_C1_TCPC_INT_ODL: - port = 1; - break; default: return; } @@ -87,10 +81,6 @@ static void bc12_interrupt(enum gpio_signal signal) task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12, 0); break; - case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12, 0); - break; - default: break; } @@ -107,28 +97,9 @@ static void board_lid_interrupt(enum gpio_signal signal) board_id = val; } - /* - * This is a workaround with board version #1 where lid open can be - * incorrectly triggered in 360-degree mode. - */ - if ((board_id == 1) && tablet_get_mode()) - return; - lid_interrupt(signal); } -static void board_gmr_tablet_switch_isr(enum gpio_signal signal) -{ - /* - * For board version more than 2, the DUT support GMR sensor. - * Else, blocked tablet_mode interrupt. - */ - if (get_board_id() < 2) - return; - - gmr_tablet_switch_isr(signal); -} - #include "gpio_list.h" /* Must come after other header files. */ /******************************************************************************/ @@ -140,7 +111,7 @@ const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); /******************************************************************************/ /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ const struct pwm_t pwm_channels[] = { - [PWM_CH_KBLIGHT] = { .channel = 3, .flags = 0, .freq = 10000 }, + [PWM_CH_KBLIGHT] = { .channel = 3, .flags = 0, .freq = 10000 }, [PWM_CH_FAN] = {.channel = 5, .flags = PWM_CONFIG_OPEN_DRAIN, .freq = 25000}, }; @@ -156,15 +127,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { .addr_flags = PS8751_I2C_ADDR1_FLAGS, }, .drv = &ps8xxx_tcpm_drv, - }, - [USB_PD_PORT_TCPC_1] = { - .bus_type = EC_BUS_TYPE_I2C, - .i2c_info = { - .port = I2C_PORT_TCPC1, - .addr_flags = PS8751_I2C_ADDR1_FLAGS, - }, - .drv = &ps8xxx_tcpm_drv, - }, + } }; const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { @@ -173,11 +136,6 @@ const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { .driver = &tcpci_tcpm_usb_mux_driver, .hpd_update = &ps8xxx_tcpc_update_hpd_status, }, - [USB_PD_PORT_TCPC_1] = { - .usb_port = USB_PD_PORT_TCPC_1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - } }; const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { @@ -185,112 +143,9 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { .i2c_port = I2C_PORT_PPC0, .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, }, - - [USB_PD_PORT_TCPC_1] = { - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, - }, }; /******************************************************************************/ -/* Sensors */ -/* Base Sensor mutex */ -static struct mutex g_base_mutex; -static struct mutex g_lid_mutex; - -/* Base accel private data */ -static struct bmi160_drv_data_t g_bmi160_data; - -/* BMA255 private data */ -static struct accelgyro_saved_data_t g_bma255_data; - -/* Matrix to rotate accelrator into standard reference frame */ -static const mat33_fp_t base_standard_ref = { - { 0, FLOAT_TO_FP(1), 0}, - { FLOAT_TO_FP(1), 0, 0}, - { 0, 0, FLOAT_TO_FP(-1)} -}; - -static const mat33_fp_t lid_standard_ref = { - { 0, FLOAT_TO_FP(1), 0}, - { FLOAT_TO_FP(1), 0, 0}, - { 0, 0, FLOAT_TO_FP(-1)} -}; - -struct motion_sensor_t motion_sensors[] = { - [LID_ACCEL] = { - .name = "Lid Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMA255, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_LID, - .drv = &bma2x2_accel_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_bma255_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = BMA2x2_I2C_ADDR1_FLAGS, - .rot_standard_ref = &lid_standard_ref, - .min_frequency = BMA255_ACCEL_MIN_FREQ, - .max_frequency = BMA255_ACCEL_MAX_FREQ, - .default_range = 2, /* g, to support lid angle calculation. */ - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - /* Sensor on in S3 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - }, - }, - - [BASE_ACCEL] = { - .name = "Base Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMI160, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_BASE, - .drv = &bmi160_drv, - .mutex = &g_base_mutex, - .drv_data = &g_bmi160_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, - .rot_standard_ref = &base_standard_ref, - .min_frequency = BMI160_ACCEL_MIN_FREQ, - .max_frequency = BMI160_ACCEL_MAX_FREQ, - .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ - .config = { - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - /* Sensor on in S3 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - }, - }, - - [BASE_GYRO] = { - .name = "Base Gyro", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMI160, - .type = MOTIONSENSE_TYPE_GYRO, - .location = MOTIONSENSE_LOC_BASE, - .drv = &bmi160_drv, - .mutex = &g_base_mutex, - .drv_data = &g_bmi160_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, - .default_range = 1000, /* dps */ - .rot_standard_ref = &base_standard_ref, - .min_frequency = BMI160_GYRO_MIN_FREQ, - .max_frequency = BMI160_GYRO_MAX_FREQ, - }, -}; -unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); - -/******************************************************************************/ /* Physical fans. These are logically separate from pwm_channels. */ const struct fan_conf fan_conf_0 = { @@ -379,8 +234,6 @@ static void board_init(void) { /* Initialize Fans */ setup_fans(); - /* Enable gpio interrupt for base accelgyro sensor */ - gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); @@ -401,16 +254,11 @@ int board_tcpc_post_init(int port) if (port == USB_PD_PORT_TCPC_0) /* Set MUX_DP_EQ to 3.6dB (0x98) */ rv = tcpc_write(port, PS8XXX_REG_MUX_DP_EQ_CONFIGURATION, 0x98); - else if (port == USB_PD_PORT_TCPC_1) - rv = tcpc_write(port, - PS8XXX_REG_MUX_USB_C2SS_HS_THRESHOLD, 0x80); return rv; } bool board_is_convertible(void) { - const uint8_t sku = get_board_sku(); - - return (sku == 255) || (sku == 1); + return false; } diff --git a/board/palkia/board.h b/board/palkia/board.h index 9e22619888..ce1cadb83a 100644 --- a/board/palkia/board.h +++ b/board/palkia/board.h @@ -26,32 +26,19 @@ /* Keyboard features */ #define CONFIG_PWM_KBLIGHT -/* Sensors */ -/* BMI160 Base accel/gyro */ -#define CONFIG_ACCEL_INTERRUPTS -#define CONFIG_ACCELGYRO_BMI160 -#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) -#define CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT -/* BMA253 Lid accel */ -#define CONFIG_ACCEL_BMA255 -#define CONFIG_ACCEL_FORCE_MODE_MASK (BIT(LID_ACCEL) | BIT(LID_ALS)) -#define CONFIG_LID_ANGLE -#define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL -#define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL -#define CONFIG_LID_ANGLE_UPDATE -#define CONFIG_GMR_TABLET_MODE -#define GMR_TABLET_MODE_GPIO_L GPIO_TABLET_MODE_L - /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_COMM_LOCKED #define CONFIG_USB_PD_TCPM_PS8751 #define BOARD_TCPC_C0_RESET_HOLD_DELAY PS8XXX_RESET_DELAY_MS #define BOARD_TCPC_C0_RESET_POST_DELAY 0 -#define BOARD_TCPC_C1_RESET_HOLD_DELAY PS8XXX_RESET_DELAY_MS -#define BOARD_TCPC_C1_RESET_POST_DELAY 0 #define GPIO_USB_C0_TCPC_RST GPIO_USB_C0_TCPC_RST_ODL -#define GPIO_USB_C1_TCPC_RST GPIO_USB_C1_TCPC_RST_ODL + +/* USB Type A Features */ +#define CONFIG_USB_PORT_POWER_SMART +#undef CONFIG_USB_PORT_POWER_SMART_PORT_COUNT +#define CONFIG_USB_PORT_POWER_SMART_PORT_COUNT 1 +#define CONFIG_USB_PORT_POWER_SMART_CDP_SDP_ONLY +#define GPIO_USB1_ILIM_SEL GPIO_USB_A_LOW_PWR_ODL /* * Palkia' battery takes several seconds to come back out of its disconnect @@ -63,11 +50,6 @@ /* BC 1.2 */ #define CONFIG_BC12_DETECT_PI3USB9201 -/* Volume Button feature */ -#define CONFIG_VOLUME_BUTTONS -#define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL -#define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL - /* Fan features */ #define CONFIG_FANS 1 #undef CONFIG_FAN_INIT_SPEED @@ -109,14 +91,6 @@ enum adc_channel { ADC_CH_COUNT }; -enum sensor_id { - LID_ACCEL = 0, - BASE_ACCEL, - BASE_GYRO, - LID_ALS, - SENSOR_COUNT, -}; - enum pwm_channel { PWM_CH_KBLIGHT, PWM_CH_FAN, diff --git a/board/palkia/ec.tasklist b/board/palkia/ec.tasklist index d4ea871074..865d0fd73f 100644 --- a/board/palkia/ec.tasklist +++ b/board/palkia/ec.tasklist @@ -10,9 +10,7 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(PDCMD, pd_command_task, NULL, TASK_STACK_SIZE) \ @@ -21,7 +19,5 @@ TASK_ALWAYS(POWERBTN, power_button_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(PD_C0, pd_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_C1, pd_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(PD_INT_C0, pd_interrupt_handler_task, 0, TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_INT_C1, pd_interrupt_handler_task, 1, TASK_STACK_SIZE) diff --git a/board/palkia/gpio.inc b/board/palkia/gpio.inc index 624337ce80..3dc181eca0 100644 --- a/board/palkia/gpio.inc +++ b/board/palkia/gpio.inc @@ -10,7 +10,6 @@ /* Wake Source interrupts */ GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, board_lid_interrupt) -GPIO_INT(TABLET_MODE_L, PIN(C, 7), GPIO_INT_BOTH, board_gmr_tablet_switch_isr) GPIO_INT(WP_L, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* EC_WP_ODL */ GPIO_INT(POWER_BUTTON_L, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) /* MECH_PWR_BTN_ODL */ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) @@ -27,20 +26,10 @@ GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal GPIO_INT(PG_EC_ALL_SYS_PWRGD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PP5000_A_PG_OD, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) -/* Sensor Interrupts */ -GPIO_INT(BASE_SIXAXIS_INT_L, PIN(5, 6), GPIO_INT_FALLING, bmi160_interrupt) - /* USB-C interrupts */ GPIO_INT(USB_C0_PPC_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, ppc_interrupt) -GPIO_INT(USB_C1_PPC_INT_ODL, PIN(A, 2), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(USB_C0_TCPC_INT_ODL, PIN(6, 2), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) GPIO_INT(USB_C0_BC12_INT_ODL, PIN(9, 5), GPIO_INT_FALLING, bc12_interrupt) -GPIO_INT(USB_C1_BC12_INT_ODL, PIN(E, 4), GPIO_INT_FALLING, bc12_interrupt) - -/* Volume button interrupts */ -GPIO_INT(EC_VOLDN_BTN_ODL, PIN(9, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) -GPIO_INT(EC_VOLUP_BTN_ODL, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO(SYS_RESET_L, PIN(C, 5), GPIO_ODR_HIGH) /* SYS_RST_ODL */ GPIO(ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW) /* EC_ENTERING_RW */ @@ -73,8 +62,8 @@ GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | /* USB and USBC Signals */ GPIO(USB_C_OC_ODL, PIN(B, 1), GPIO_ODR_HIGH) GPIO(USB_C0_TCPC_RST_ODL, PIN(9, 7), GPIO_ODR_HIGH) -GPIO(USB_C1_TCPC_RST_ODL, PIN(3, 2), GPIO_ODR_HIGH) -GPIO(NC_94, PIN(9, 4), GPIO_INPUT | GPIO_PULL_UP) +GPIO(EN_USB_A_5V, PIN(3, 5), GPIO_OUT_HIGH) +GPIO(USB_A_LOW_PWR_ODL, PIN(9, 4), GPIO_OUT_LOW) /* Misc Signals */ GPIO(EC_BATT_PRES_ODL, PIN(E, 1), GPIO_INPUT) @@ -86,14 +75,8 @@ GPIO(EDP_BKLTEN_OD, PIN(D, 3), GPIO_ODR_HIGH) /* Display backl GPIO(EN_PP5000_FAN, PIN(6, 1), GPIO_OUT_LOW) /* I2C pins - Alternate function below configures I2C module on these pins */ -GPIO(I2C0_SCL, PIN(B, 5), GPIO_INPUT | - GPIO_SEL_1P8V) /* EC_I2C_SENSOR_1V8_SCL */ -GPIO(I2C0_SDA, PIN(B, 4), GPIO_INPUT | - GPIO_SEL_1P8V) /* EC_I2C_SENSOR_1V8_SDA */ GPIO(I2C1_SCL, PIN(9, 0), GPIO_INPUT) /* EC_I2C_USB_C0_PD_SCL */ GPIO(I2C1_SDA, PIN(8, 7), GPIO_INPUT) /* EC_I2C_USB_C0_PD_SDA */ -GPIO(I2C2_SCL, PIN(9, 2), GPIO_INPUT) /* EC_I2C_USB_C1_PD_SCL */ -GPIO(I2C2_SDA, PIN(9, 1), GPIO_INPUT) /* EC_I2C_USB_C1_PD_SDA */ GPIO(I2C3_SCL, PIN(D, 1), GPIO_INPUT) /* EC_I2C_USB_C0_TCPC_SDA */ GPIO(I2C3_SDA, PIN(D, 0), GPIO_INPUT) /* EC_I2C_USB_C0_TCPC_SCL */ GPIO(I2C5_SCL, PIN(3, 3), GPIO_INPUT) /* EC_I2C_POWER_SCL */ @@ -111,8 +94,7 @@ ALTERNATE(PIN_MASK(1, 0x7F), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KS ALTERNATE(PIN_MASK(0, 0xE0), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_10-12 */ /* Alternate functions GPIO definitions */ -ALTERNATE(PIN_MASK(B, 0x30), 0, MODULE_I2C, (GPIO_INPUT | GPIO_SEL_1P8V)) /* I2C0 1.8V */ -ALTERNATE(PIN_MASK(9, 0x07), 0, MODULE_I2C, 0) /* I2C1 SCL / I2C2 */ +ALTERNATE(PIN_MASK(9, 0x01), 0, MODULE_I2C, 0) /* I2C1 SCL */ ALTERNATE(PIN_MASK(8, 0x80), 0, MODULE_I2C, 0) /* I2C1 SDA */ ALTERNATE(PIN_MASK(D, 0x03), 0, MODULE_I2C, 0) /* I2C3 */ ALTERNATE(PIN_MASK(3, 0x48), 0, MODULE_I2C, 0) /* I2C5 */ |