diff options
| -rw-r--r-- | baseboard/guybrush/base_gpio.inc | 3 | ||||
| -rw-r--r-- | baseboard/guybrush/baseboard.c | 3 | ||||
| -rw-r--r-- | baseboard/guybrush/baseboard.h | 2 | ||||
| -rw-r--r-- | board/guybrush/board.h | 2 | ||||
| -rw-r--r-- | board/guybrush/gpio.inc | 3 |
5 files changed, 5 insertions, 8 deletions
diff --git a/baseboard/guybrush/base_gpio.inc b/baseboard/guybrush/base_gpio.inc index 8f96a65600..dac4445770 100644 --- a/baseboard/guybrush/base_gpio.inc +++ b/baseboard/guybrush/base_gpio.inc @@ -58,11 +58,8 @@ GPIO(USB_C0_HPD, PIN(F, 5), GPIO_OUT_LOW) /* C0 DP Hotplug Detect */ GPIO(USB_C1_HPD, PIN(F, 4), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */ /* Sensor Signals */ -/* TODO: Make 6AXIS_INT_L an interrupt */ -GPIO_INT(6AXIS_INT_L, PIN(A, 0), GPIO_INT_FALLING | GPIO_PULL_UP, motion_interrupt) /* 6 Axis IMU */ GPIO(3AXIS_INT_L, PIN(A, 2), GPIO_INPUT | GPIO_PULL_DOWN) /* 3 Axis Accel */ GPIO_INT(LID_OPEN, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) /* Lid Open */ -GPIO_INT(TABLET_MODE, PIN(C, 1), GPIO_INT_BOTH, gmr_tablet_switch_isr) /* 360 Tablet Mode */ GPIO_INT(VOLDN_BTN_ODL, PIN(A, 7), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Volume Down */ GPIO_INT(VOLUP_BTN_ODL, PIN(9, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Volume Up */ GPIO(EC_BATT_PRES_ODL, PIN(9, 4), GPIO_INPUT) /* Battery Present */ diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c index 18da982b99..dcf56b1a78 100644 --- a/baseboard/guybrush/baseboard.c +++ b/baseboard/guybrush/baseboard.c @@ -347,9 +347,6 @@ static void baseboard_interrupt_init(void) /* Enable SBU fault interrupts */ ioex_enable_interrupt(IOEX_USB_C0_SBU_FAULT_ODL); ioex_enable_interrupt(IOEX_USB_C1_SBU_FAULT_ODL); - - /* Enable Accel/Gyro interrupt for convertibles. */ - gpio_enable_interrupt(GPIO_6AXIS_INT_L); } DECLARE_HOOK(HOOK_INIT, baseboard_interrupt_init, HOOK_PRIO_INIT_I2C + 1); diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h index abe5dddf0b..2fd66d4c95 100644 --- a/baseboard/guybrush/baseboard.h +++ b/baseboard/guybrush/baseboard.h @@ -201,12 +201,10 @@ #define CONFIG_USBC_SS_MUX_DFP_ONLY #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP -#define CONFIG_USB_MUX_ANX7451 #define CONFIG_USB_PD_PORT_MAX_COUNT 2 #define CONFIG_USBC_PPC_NX20P3483 #define CONFIG_USBC_RETIMER_PS8811 #define CONFIG_USBC_RETIMER_PS8818 -#define CONFIG_USBC_RETIMER_ANX7451 #define CONFIG_USB_MUX_RUNTIME_CONFIG #define CONFIG_USB_MUX_AMD_FP6 diff --git a/board/guybrush/board.h b/board/guybrush/board.h index c9743e9ae6..7dd66e020e 100644 --- a/board/guybrush/board.h +++ b/board/guybrush/board.h @@ -34,6 +34,8 @@ #define CONFIG_CMD_BUTTON /* USB Type C and USB PD defines */ +#define CONFIG_USB_MUX_ANX7451 +#define CONFIG_USBC_RETIMER_ANX7451 /* USB Type A Features */ diff --git a/board/guybrush/gpio.inc b/board/guybrush/gpio.inc index e07de1e0fe..7257c5d499 100644 --- a/board/guybrush/gpio.inc +++ b/board/guybrush/gpio.inc @@ -8,3 +8,6 @@ /* Declare symbolic names for all the board GPIOs that we care about. */ #include "base_gpio.inc" + +GPIO_INT(6AXIS_INT_L, PIN(A, 0), GPIO_INT_FALLING | GPIO_PULL_UP, motion_interrupt) /* 6 Axis IMU */ +GPIO_INT(TABLET_MODE, PIN(C, 1), GPIO_INT_BOTH, gmr_tablet_switch_isr) /* 360 Tablet Mode */ |