Halvor: Modify GPIO and I2C bus configuration

Configure I2C pins and i2c_ports for Halvor

BUG=none
BRANCH=none
TEST=make buildall, make BOARD=halvor

Change-Id: Ie80723563e39af07907cca5d5a0fc50ec0851032
Signed-off-by: Josh Tsai <josh_tsai@compal.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2147765
Reviewed-by: Ruby Lee <ruby_lee@compal.corp-partner.google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>

3 files changed, 40 insertions, 28 deletions

diff --git a/board/halvor/board.c b/board/halvor/board.c
index 33dc5551b5..00b21038f7 100644
--- a/board/halvor/board.c
+++ b/board/halvor/board.c
@@ -66,43 +66,50 @@ const struct i2c_port_t i2c_ports[] = {
 		.name = "sensor",
 		.port = I2C_PORT_SENSOR,
 		.kbps = 400,
-		.scl = GPIO_EC_I2C0_SENSOR_SCL,
-		.sda = GPIO_EC_I2C0_SENSOR_SDA,
+		.scl = GPIO_EC_I2C_0_SCL,
+		.sda = GPIO_EC_I2C_0_SDA,
 	},
 	{
 		.name = "usb_c0",
 		.port = I2C_PORT_USB_C0,
 		.kbps = 1000,
-		.scl = GPIO_EC_I2C1_USB_C0_SCL,
-		.sda = GPIO_EC_I2C1_USB_C0_SDA,
+		.scl = GPIO_EC_I2C_1_SCL,
+		.sda = GPIO_EC_I2C_1_SDA,
 	},
 	{
 		.name = "usb_c1",
 		.port = I2C_PORT_USB_C1,
 		.kbps = 1000,
-		.scl = GPIO_EC_I2C2_USB_C1_SCL,
-		.sda = GPIO_EC_I2C2_USB_C1_SDA,
+		.scl = GPIO_EC_I2C_2_SCL,
+		.sda = GPIO_EC_I2C_2_SDA,
 	},
 	{
-		.name = "usb_1_mix",
-		.port = I2C_PORT_USB_1_MIX,
+		.name = "usb_bb_retimer",
+		.port = I2C_PORT_USB_BB_RETIMER,
 		.kbps = 100,
-		.scl = GPIO_EC_I2C3_USB_1_MIX_SCL,
-		.sda = GPIO_EC_I2C3_USB_1_MIX_SDA,
+		.scl = GPIO_EC_I2C_3_SCL,
+		.sda = GPIO_EC_I2C_3_SDA,
+	},
+	{
+		.name = "usb_c2",
+		.port = I2C_PORT_USB_C2,
+		.kbps = 1000,
+		.scl = GPIO_EC_I2C_4_SCL,
+		.sda = GPIO_EC_I2C_4_SDA,
 	},
 	{
 		.name = "power",
 		.port = I2C_PORT_POWER,
 		.kbps = 100,
-		.scl = GPIO_EC_I2C5_POWER_SCL,
-		.sda = GPIO_EC_I2C5_POWER_SDA,
+		.scl = GPIO_EC_I2C_5_SCL,
+		.sda = GPIO_EC_I2C_5_SDA,
 	},
 	{
 		.name = "eeprom",
 		.port = I2C_PORT_EEPROM,
 		.kbps = 400,
-		.scl = GPIO_EC_I2C7_EEPROM_SCL,
-		.sda = GPIO_EC_I2C7_EEPROM_SDA,
+		.scl = GPIO_EC_I2C_7_SCL,
+		.sda = GPIO_EC_I2C_7_SDA,
 	},
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
diff --git a/board/halvor/board.h b/board/halvor/board.h
index 713548714d..ef1b436a28 100644
--- a/board/halvor/board.h
+++ b/board/halvor/board.h
@@ -92,12 +92,14 @@
 #define I2C_PORT_SENSOR		NPCX_I2C_PORT0_0
 #define I2C_PORT_USB_C0		NPCX_I2C_PORT1_0
 #define I2C_PORT_USB_C1		NPCX_I2C_PORT2_0
-#define I2C_PORT_USB_1_MIX	NPCX_I2C_PORT3_0
+#define I2C_PORT_USB_BB_RETIMER	NPCX_I2C_PORT3_0
+#define I2C_PORT_USB_C2		NPCX_I2C_PORT4_1
 #define I2C_PORT_POWER		NPCX_I2C_PORT5_0
 #define I2C_PORT_EEPROM		NPCX_I2C_PORT7_0
 
 #define I2C_PORT_BATTERY	I2C_PORT_POWER
 #define I2C_PORT_CHARGER	I2C_PORT_EEPROM
+#define I2C_PORT_USB_1_MIX	I2C_PORT_USB_BB_RETIMER
 
 #define I2C_ADDR_EEPROM_FLAGS	0x50
 #define CONFIG_I2C_MASTER
diff --git a/board/halvor/gpio.inc b/board/halvor/gpio.inc
index 5223681f3d..904289941c 100644
--- a/board/halvor/gpio.inc
+++ b/board/halvor/gpio.inc
@@ -117,18 +117,20 @@ GPIO(UART2_EC_RX,		PIN(7, 5), GPIO_OUT_LOW)
 GPIO(EC_EDP_BL_EN,             PIN(D, 3), GPIO_OUT_HIGH)
 
 /* I2C pins - Alternate function below configures I2C module on these pins */
-GPIO(EC_I2C0_SENSOR_SCL,       PIN(B, 5), GPIO_INPUT | GPIO_SEL_1P8V)
-GPIO(EC_I2C0_SENSOR_SDA,       PIN(B, 4), GPIO_INPUT | GPIO_SEL_1P8V)
-GPIO(EC_I2C1_USB_C0_SCL,       PIN(9, 0), GPIO_INPUT)
-GPIO(EC_I2C1_USB_C0_SDA,       PIN(8, 7), GPIO_INPUT)
-GPIO(EC_I2C2_USB_C1_SCL,       PIN(9, 2), GPIO_INPUT)
-GPIO(EC_I2C2_USB_C1_SDA,       PIN(9, 1), GPIO_INPUT)
-GPIO(EC_I2C3_USB_1_MIX_SCL,    PIN(D, 1), GPIO_INPUT)
-GPIO(EC_I2C3_USB_1_MIX_SDA,    PIN(D, 0), GPIO_INPUT)
-GPIO(EC_I2C5_POWER_SCL,        PIN(3, 3), GPIO_INPUT)
-GPIO(EC_I2C5_POWER_SDA,        PIN(3, 6), GPIO_INPUT)
-GPIO(EC_I2C7_EEPROM_SCL,       PIN(B, 3), GPIO_INPUT)
-GPIO(EC_I2C7_EEPROM_SDA,       PIN(B, 2), GPIO_INPUT)
+GPIO(EC_I2C_0_SCL,       PIN(B, 5), GPIO_INPUT)
+GPIO(EC_I2C_0_SDA,       PIN(B, 4), GPIO_INPUT)
+GPIO(EC_I2C_1_SCL,       PIN(9, 0), GPIO_INPUT)
+GPIO(EC_I2C_1_SDA,       PIN(8, 7), GPIO_INPUT)
+GPIO(EC_I2C_2_SCL,       PIN(9, 2), GPIO_INPUT)
+GPIO(EC_I2C_2_SDA,       PIN(9, 1), GPIO_INPUT)
+GPIO(EC_I2C_3_SCL,       PIN(D, 1), GPIO_INPUT)
+GPIO(EC_I2C_3_SDA,       PIN(D, 0), GPIO_INPUT)
+GPIO(EC_I2C_4_SCL,       PIN(F, 3), GPIO_INPUT)
+GPIO(EC_I2C_4_SDA,       PIN(F, 2), GPIO_INPUT)
+GPIO(EC_I2C_5_SCL,       PIN(3, 3), GPIO_INPUT)
+GPIO(EC_I2C_5_SDA,       PIN(3, 6), GPIO_INPUT)
+GPIO(EC_I2C_7_SCL,       PIN(B, 3), GPIO_INPUT)
+GPIO(EC_I2C_7_SDA,       PIN(B, 2), GPIO_INPUT)
 
 /* Battery signals */
 GPIO(EC_BATT_PRES_ODL, 		PIN(E, 1), GPIO_INPUT)
@@ -138,10 +140,11 @@ GPIO(USB_C0_DP_HPD,		PIN(C, 6), GPIO_INPUT)
 GPIO(USB_C1_DP_HPD,		PIN(7, 0), GPIO_INPUT)
 
 /* Alternate functions GPIO definitions */
-ALTERNATE(PIN_MASK(B, BIT(5) | BIT(4)), 0, MODULE_I2C, (GPIO_INPUT | GPIO_SEL_1P8V)) /* I2C0 */
+ALTERNATE(PIN_MASK(B, BIT(5) | BIT(4)), 0, MODULE_I2C, 0)                            /* I2C0 */
 ALTERNATE(PIN_MASK(9, BIT(0) | BIT(2) | BIT(1)), 0, MODULE_I2C, 0)                   /* I2C1 SCL / I2C2 */
 ALTERNATE(PIN_MASK(8, BIT(7)), 0, MODULE_I2C, 0)                                     /* I2C1 SDA */
 ALTERNATE(PIN_MASK(D, BIT(1) | BIT(0)), 0, MODULE_I2C, 0)                            /* I2C3 */
+ALTERNATE(PIN_MASK(F, BIT(3) | BIT(2)), 0, MODULE_I2C, 0)                            /* I2C4 */
 ALTERNATE(PIN_MASK(3, BIT(3) | BIT(6)), 0, MODULE_I2C, 0)                            /* I2C5 */
 ALTERNATE(PIN_MASK(B, BIT(3) | BIT(2)), 0, MODULE_I2C, 0)                            /* I2C7 */