diff options
Diffstat (limited to 'board/osiris/board.h')
| -rw-r--r-- | board/osiris/board.h | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/board/osiris/board.h b/board/osiris/board.h index 17649117d9..5567ba7cd6 100644 --- a/board/osiris/board.h +++ b/board/osiris/board.h @@ -73,18 +73,16 @@ #define USB_PORT_COUNT 1 #define CONFIG_USB_PORT_POWER_DUMB -/* USB Type C and USB PD defines */ -#define CONFIG_USB_PD_REQUIRE_AP_MODE_ENTRY - -#define CONFIG_IO_EXPANDER -#define CONFIG_IO_EXPANDER_NCT38XX -#define CONFIG_IO_EXPANDER_PORT_COUNT 4 +#undef CONFIG_USB_PD_TCPM_NCT38XX +#define CONFIG_USB_PD_TCPM_PS8815 /* C0 and C1 */ #define CONFIG_USB_PD_FRS_PPC #define CONFIG_USB_PD_TCPM_PS8815 #define CONFIG_USB_PD_TCPM_PS8815_FORCE_DID -#define CONFIG_USBC_RETIMER_INTEL_BB + +/* Retimer */ +#undef CONFIG_USBC_RETIMER_INTEL_BB /* I2C speed console command */ #define CONFIG_CMD_I2C_SPEED @@ -93,7 +91,6 @@ #define CONFIG_HOSTCMD_I2C_CONTROL #define CONFIG_USBC_PPC_SYV682X -#define CONFIG_USBC_PPC_NX20P3483 /* TODO: b/177608416 - measure and check these values on osiris */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ @@ -172,21 +169,6 @@ #define I2C_ADDR_MP2964_FLAGS 0x20 -/* - * see b/174768555#comment22 - */ -#define USBC_PORT_C0_BB_RETIMER_I2C_ADDR 0x56 -#define USBC_PORT_C2_BB_RETIMER_I2C_ADDR 0x57 - -/* Enabling Thunderbolt-compatible mode */ -#define CONFIG_USB_PD_TBT_COMPAT_MODE - -/* Enabling USB4 mode */ -#define CONFIG_USB_PD_USB4 - -/* Retimer */ -#define CONFIG_USBC_RETIMER_FW_UPDATE - /* Thermal features */ #define CONFIG_THERMISTOR #define CONFIG_TEMP_SENSOR @@ -228,14 +210,6 @@ enum sensor_id { SENSOR_COUNT }; -enum ioex_port { - IOEX_C0_NCT38XX = 0, - IOEX_C2_NCT38XX, - IOEX_ID_1_C0_NCT38XX, - IOEX_ID_1_C2_NCT38XX, - IOEX_PORT_COUNT -}; - enum battery_type { BATTERY_AP19B8M, BATTERY_TYPE_COUNT |