1 files changed, 18 insertions, 54 deletions

diff --git a/board/snoball/board.c b/board/snoball/board.c
index 7efa5b314b..ee545d736a 100644
--- a/board/snoball/board.c
+++ b/board/snoball/board.c
@@ -9,91 +9,55 @@
 #include "adc_chip.h"
 #include "common.h"
 #include "console.h"
-#include "fusb302.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "host_command.h"
 #include "i2c.h"
 #include "registers.h"
-#include "pwm.h"
-#include "pwm_chip.h"
 #include "task.h"
-#include "usb_pd.h"
-#include "usb_pd_tcpm.h"
 #include "util.h"
 
 void tcpc_alert_event(enum gpio_signal signal)
 {
 	/* Exchange status with TCPCs */
-	host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
+	ccprintf("TCPC alert!\n");
 }
 
 #include "gpio_list.h"
 
 const struct i2c_port_t i2c_ports[] = {
-	{"tcpc-a", STM32_I2C1_PORT, 1000, GPIO_I2C1_SCL, GPIO_I2C1_SDA},
-	{"tcpc-b", STM32_I2C2_PORT, 1000, GPIO_I2C2_SCL, GPIO_I2C2_SDA},
+	{"tcpc-a", STM32_I2C1_PORT, 400, GPIO_I2C1_SCL, GPIO_I2C1_SDA},
+	{"tcpc-b", STM32_I2C2_PORT, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA},
 };
 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, &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, &fusb302_tcpm_drv},
-};
-
-uint16_t tcpc_get_alert_status(void)
-{
-	uint16_t status = 0;
-
-	if (!gpio_get_level(GPIO_TCPC1_INT))
-		status |= PD_STATUS_TCPC_ALERT_0;
-	if (!gpio_get_level(GPIO_TCPC2_INT))
-		status |= PD_STATUS_TCPC_ALERT_1;
-	if (!gpio_get_level(GPIO_TCPC3_INT))
-		status |= PD_STATUS_TCPC_ALERT_2;
-
-	return status;
-}
-
 /* ADC channels */
 const struct adc_t adc_channels[] = {
-	/* Current sensing. Converted to mA (6600mV/4096). */
-	[ADC_C0_CS] = {"C0_CS", 6600, 4096, 0, STM32_AIN(0)},
-	[ADC_C1_CS] = {"C1_CS", 6600, 4096, 0, STM32_AIN(1)},
-	[ADC_C2_CS] = {"C2_CS", 6600, 4096, 0, STM32_AIN(2)},
-	/* Voltage sensing. Converted to mV (40000mV/4096). */
-	[ADC_C0_VS] = {"C0_VS", 40000, 4096, 0, STM32_AIN(3)},
-	[ADC_C1_VS] = {"C1_VS", 40000, 4096, 0, STM32_AIN(4)},
-	[ADC_C2_VS] = {"C2_VS", 40000, 4096, 0, STM32_AIN(5)},
-	[ADC_VBUCK] = {"VBUCK",  40000, 4096, 0, STM32_AIN(8)},
-	/* TODO: Check characteristics of thermistor circuit */
-	[ADC_TEMP] = {"TEMP", 3300, 4096, 0, STM32_AIN(9)},
+	/* VBIAS input voltage, through /2 divider. */
+	[ADC_VBIAS] = {"VBIAS", 6600, 4096, 0, STM32_AIN(4)},
+	[ADC_VOUT_1] = {"VOUT_1", 39600, 4096, 0, STM32_AIN(5)},
+	[ADC_VOUT_2] = {"VOUT_2", 39600, 4096, 0, STM32_AIN(6)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
-#define VR_PWM_FLAGS (PWM_CONFIG_ACTIVE_LOW | PWM_CONFIG_COMPLEMENTARY_OUTPUT)
-
-const struct pwm_t pwm_channels[] = {
-	{STM32_TIM(15), STM32_TIM_CH(1), VR_PWM_FLAGS, 480000},
-	{STM32_TIM(16), STM32_TIM_CH(1), VR_PWM_FLAGS, 480000},
-	{STM32_TIM(17), STM32_TIM_CH(1), VR_PWM_FLAGS, 480000},
-};
-BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
 
 static void board_init(void)
 {
 	gpio_enable_interrupt(GPIO_TCPC1_INT);
 	gpio_enable_interrupt(GPIO_TCPC2_INT);
-	gpio_enable_interrupt(GPIO_TCPC3_INT);
-
-	pwm_enable(PWM_PD1, 1);
-	pwm_enable(PWM_PD2, 1);
-	pwm_enable(PWM_PD3, 1);
 }
 DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
 
-void board_reset_pd_mcu(void)
+void board_config_pre_init(void)
 {
+	/* enable SYSCFG clock */
+	STM32_RCC_APB2ENR |= 1 << 0;
+	/*
+	 * the DMA mapping is :
+	 *  Chan 4 : USART1_TX
+	 *  Chan 5 : USART1_RX
+	 */
+
+	/* Remap USART1 RX/TX DMA to match uart driver. */
+	STM32_SYSCFG_CFGR1 |= (1 << 9) | (1 << 10);
 }