diff options
Diffstat (limited to 'board')
-rw-r--r-- | board/chell/board.c | 5 | ||||
-rw-r--r-- | board/elm/board.c | 5 | ||||
-rw-r--r-- | board/glados/board.c | 5 | ||||
-rw-r--r-- | board/kevin/board.c | 4 | ||||
-rw-r--r-- | board/kunimitsu/board.c | 5 | ||||
-rw-r--r-- | board/lars/board.c | 3 | ||||
-rw-r--r-- | board/oak/board.c | 5 | ||||
-rw-r--r-- | board/pdeval-stm32f072/board.c | 5 | ||||
-rw-r--r-- | board/snoball/board.c | 6 | ||||
-rw-r--r-- | board/strago/board.c | 3 | ||||
-rw-r--r-- | board/strago/board.h | 4 | ||||
-rw-r--r-- | board/wheatley/board.c | 5 |
12 files changed, 34 insertions, 21 deletions
diff --git a/board/chell/board.c b/board/chell/board.c index 3b47301806..cb80a448e7 100644 --- a/board/chell/board.c +++ b/board/chell/board.c @@ -29,6 +29,7 @@ #include "switch.h" #include "system.h" #include "task.h" +#include "tcpci.h" #include "temp_sensor.h" #include "timer.h" #include "uart.h" @@ -116,8 +117,8 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR}, - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR, &tcpci_tcpm_drv}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2, &tcpci_tcpm_drv}, }; /* SPI devices */ diff --git a/board/elm/board.c b/board/elm/board.c index 13366f7cb1..8d02e76dca 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -17,6 +17,7 @@ #include "console.h" #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" +#include "driver/tcpm/tcpci.h" #include "driver/temp_sensor/tmp432.h" #include "extpower.h" #include "gpio.h" @@ -111,7 +112,7 @@ const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); /* TCPC */ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR, &tcpci_tcpm_drv}, }; struct pi3usb9281_config pi3usb9281_chips[] = { @@ -156,7 +157,7 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { /* TODO: 7688 support MUX Control 00b and 10b? */ { .port_addr = 0, /* port idx */ - .driver = &tcpm_usb_mux_driver, + .driver = &tcpci_tcpm_usb_mux_driver, }, }; diff --git a/board/glados/board.c b/board/glados/board.c index 892d5ed425..08ed832fa6 100644 --- a/board/glados/board.c +++ b/board/glados/board.c @@ -18,6 +18,7 @@ #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" #include "driver/accelgyro_bmi160.h" +#include "driver/tcpm/tcpci.h" #include "extpower.h" #include "gpio.h" #include "hooks.h" @@ -127,8 +128,8 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR}, - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR, &tcpci_tcpm_drv}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2, &tcpci_tcpm_drv}, }; /* SPI devices */ diff --git a/board/kevin/board.c b/board/kevin/board.c index 8c61aff0f1..6ab36d5824 100644 --- a/board/kevin/board.c +++ b/board/kevin/board.c @@ -112,8 +112,8 @@ const struct button_config buttons[CONFIG_BUTTON_COUNT] = { }; const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC0, FUSB302_I2C_SLAVE_ADDR}, - {I2C_PORT_TCPC1, FUSB302_I2C_SLAVE_ADDR}, + {I2C_PORT_TCPC0, FUSB302_I2C_SLAVE_ADDR, &fusb302_tcpm_drv}, + {I2C_PORT_TCPC1, FUSB302_I2C_SLAVE_ADDR, &fusb302_tcpm_drv}, }; void board_reset_pd_mcu(void) diff --git a/board/kunimitsu/board.c b/board/kunimitsu/board.c index 1a1072c909..75e8ecab0f 100644 --- a/board/kunimitsu/board.c +++ b/board/kunimitsu/board.c @@ -17,6 +17,7 @@ #include "driver/als_opt3001.h" #include "driver/gyro_l3gd20h.h" #include "driver/pmic_tps650830.h" +#include "driver/tcpm/tcpci.h" #include "driver/temp_sensor/tmp432.h" #include "extpower.h" #include "fan.h" @@ -130,8 +131,8 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR}, - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR, &tcpci_tcpm_drv}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2, &tcpci_tcpm_drv}, }; /* Physical fans. These are logically separate from pwm_channels. */ diff --git a/board/lars/board.c b/board/lars/board.c index ec06604c56..55e00b24a6 100644 --- a/board/lars/board.c +++ b/board/lars/board.c @@ -10,6 +10,7 @@ #include "charger.h" #include "console.h" #include "driver/pmic_tps650830.h" +#include "driver/tcpm/tcpci.h" #include "driver/temp_sensor/tmp432.h" #include "extpower.h" #include "fan.h" @@ -116,7 +117,7 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR, &tcpci_tcpm_drv}, }; /* Physical fans. These are logically separate from pwm_channels. */ diff --git a/board/oak/board.c b/board/oak/board.c index 4ab2c5c217..9f770d8865 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -20,6 +20,7 @@ #include "driver/accel_kx022.h" #include "driver/accelgyro_bmi160.h" #include "driver/als_opt3001.h" +#include "driver/tcpm/tcpci.h" #include "driver/temp_sensor/tmp432.h" #include "extpower.h" #include "gpio.h" @@ -112,8 +113,8 @@ const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); #endif const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR}, - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR, &tcpci_tcpm_drv}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2, &tcpci_tcpm_drv}, }; struct mutex pericom_mux_lock; diff --git a/board/pdeval-stm32f072/board.c b/board/pdeval-stm32f072/board.c index ab476d006e..f5aa26d10b 100644 --- a/board/pdeval-stm32f072/board.c +++ b/board/pdeval-stm32f072/board.c @@ -12,6 +12,7 @@ #include "i2c.h" #include "registers.h" #include "task.h" +#include "tcpci.h" #include "usb_descriptor.h" #include "usb_pd.h" #include "usb_pd_tcpm.h" @@ -56,9 +57,9 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC, TCPC1_I2C_ADDR}, + {I2C_PORT_TCPC, TCPC1_I2C_ADDR, &tcpci_tcpm_drv}, #if CONFIG_USB_PD_PORT_COUNT >= 2 - {I2C_PORT_TCPC, TCPC2_I2C_ADDR}, + {I2C_PORT_TCPC, TCPC2_I2C_ADDR, &tcpci_tcpm_drv}, #endif }; diff --git a/board/snoball/board.c b/board/snoball/board.c index 5eaf722946..7efa5b314b 100644 --- a/board/snoball/board.c +++ b/board/snoball/board.c @@ -37,10 +37,10 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {STM32_I2C1_PORT, FUSB302_I2C_SLAVE_ADDR}, - {STM32_I2C2_PORT, FUSB302_I2C_SLAVE_ADDR}, + {STM32_I2C1_PORT, FUSB302_I2C_SLAVE_ADDR, &fusb302_tcpm_drv}, + {STM32_I2C2_PORT, FUSB302_I2C_SLAVE_ADDR, &fusb302_tcpm_drv}, /* TODO: Verify secondary slave addr, or use i2c mux */ - {STM32_I2C2_PORT, FUSB302_I2C_SLAVE_ADDR + 2}, + {STM32_I2C2_PORT, FUSB302_I2C_SLAVE_ADDR + 2, &fusb302_tcpm_drv}, }; uint16_t tcpc_get_alert_status(void) diff --git a/board/strago/board.c b/board/strago/board.c index fb40fb9a18..32ca7aa4a8 100644 --- a/board/strago/board.c +++ b/board/strago/board.c @@ -15,6 +15,7 @@ #include "driver/accel_kionix.h" #include "driver/accel_kxcj9.h" #include "driver/als_isl29035.h" +#include "driver/tcpm/tcpci.h" #include "driver/temp_sensor/tmp432.h" #include "extpower.h" #include "gpio.h" @@ -105,7 +106,7 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR, &tcpci_tcpm_drv}, }; /* SPI master ports */ diff --git a/board/strago/board.h b/board/strago/board.h index f16126d979..2fd14e0ad6 100644 --- a/board/strago/board.h +++ b/board/strago/board.h @@ -29,6 +29,10 @@ #define CONFIG_POWER_SHUTDOWN_PAUSE_IN_S5 #define CONFIG_EXTPOWER_GPIO +/* All data won't fit in data RAM. So, moving boundary slightly. */ +#undef CONFIG_RO_SIZE +#define CONFIG_RO_SIZE (104 * 1024) + #define CONFIG_USB_CHARGER #define CONFIG_USB_MUX_PI3USB30532 #define CONFIG_USB_POWER_DELIVERY diff --git a/board/wheatley/board.c b/board/wheatley/board.c index a276d4344d..ba6fce0f7f 100644 --- a/board/wheatley/board.c +++ b/board/wheatley/board.c @@ -18,6 +18,7 @@ #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" #include "driver/accelgyro_bmi160.h" +#include "driver/tcpm/tcpci.h" #include "extpower.h" #include "gpio.h" #include "hooks.h" @@ -127,8 +128,8 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR}, - {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR, &tcpci_tcpm_drv}, + {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2, &tcpci_tcpm_drv}, }; const enum gpio_signal hibernate_wake_pins[] = { |