celes: clean up unused I2C port

Celes are only using I2C0_0 for final. so let's clean up the others
And make it GPIO_OUTPUT and Pull-up to reduce EC's power
This CL need coreboot to define temp sensor 1,2,3

BUG=chrome-os-partner:44598
BRANCH=firmware-strago-7287.B
TEST=measure power number with/without this patch
    see i2c is healthy and no error when suspend/resume

Change-Id: Ic6d37086121734583d1d114051bb8944274fba44
Signed-off-by: Wonjoon Lee <woojoo.lee@samsung.com>
Reviewed-on: https://chromium-review.googlesource.com/307213
Reviewed-by: Shawn N <shawnn@chromium.org>

3 files changed, 8 insertions, 37 deletions

diff --git a/board/celes/board.c b/board/celes/board.c
index 307bb73417..a3eccc3596 100644
--- a/board/celes/board.c
+++ b/board/celes/board.c
@@ -70,14 +70,6 @@ BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 const struct i2c_port_t i2c_ports[]  = {
 	{"batt_chg", MEC1322_I2C0_0, 100,
 		GPIO_I2C_PORT0_0_SCL, GPIO_I2C_PORT0_0_SDA},
-	{"muxes", MEC1322_I2C0_1, 100,
-		GPIO_I2C_PORT0_1_SCL, GPIO_I2C_PORT0_1_SDA},
-	{"pd_mcu", MEC1322_I2C1, 1000,
-		GPIO_I2C_PORT1_SCL, GPIO_I2C_PORT1_SDA},
-	{"sensors", MEC1322_I2C2, 100,
-		GPIO_I2C_PORT2_SCL, GPIO_I2C_PORT2_SDA},
-	{"thermal",  MEC1322_I2C3,   100,
-		GPIO_I2C_PORT3_SCL, GPIO_I2C_PORT3_SDA}
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
@@ -93,12 +85,6 @@ const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins);
  *     src/mainboard/google/${board}/acpi/dptf.asl
  */
 const struct temp_sensor_t temp_sensors[] = {
-	{"TMP432_Internal", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val,
-		TMP432_IDX_LOCAL, 4},
-	{"TMP432_Sensor_1", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val,
-		TMP432_IDX_REMOTE1, 4},
-	{"TMP432_Sensor_2", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val,
-		TMP432_IDX_REMOTE2, 4},
 	{"NCP15WB_CPU", TEMP_SENSOR_TYPE_BOARD, ec_adc_get_val,
 		ADC_CH_CPU_TEMP, 4},
 	{"NCP15WB_DIMM", TEMP_SENSOR_TYPE_BOARD, ec_adc_get_val,
@@ -114,9 +100,6 @@ BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
  * same order as enum temp_sensor_id. To always ignore any temp, use 0.
  */
 struct ec_thermal_config thermal_params[] = {
-	{{0, 0, 0}, 0, 0}, /* TMP432_Internal */
-	{{0, 0, 0}, 0, 0}, /* TMP432_Sensor_1 */
-	{{0, 0, 0}, 0, 0}, /* TMP432_Sensor_2 */
 	{{0, 0, 0}, 0, 0}, /* NCP15WB_CPU */
 	{{0, 0, 0}, 0, 0}, /* NCP15WB_DIMM */
 	{{0, 0, 0}, 0, 0}, /* NCP15WB_PMIC */
diff --git a/board/celes/board.h b/board/celes/board.h
index 6e7a1edac5..bddac93d97 100644
--- a/board/celes/board.h
+++ b/board/celes/board.h
@@ -45,7 +45,6 @@
 #define CONFIG_ADC
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_EC_ADC
-#define CONFIG_TEMP_SENSOR_TMP432
 #define CONFIG_THERMISTOR_NCP15WB
 
 #define CONFIG_PMIC
@@ -86,7 +85,6 @@
 /* I2C ports */
 #define I2C_PORT_BATTERY	MEC1322_I2C0_0
 #define I2C_PORT_CHARGER	MEC1322_I2C0_0
-#define I2C_PORT_THERMAL	MEC1322_I2C3
 
 /* ADC signal */
 enum adc_channel {
@@ -118,11 +116,6 @@ enum pwm_channel {
 };
 
 enum temp_sensor_id {
-	/* TMP432 local and remote sensors */
-	TEMP_SENSOR_I2C_TMP432_LOCAL,
-	TEMP_SENSOR_I2C_TMP432_REMOTE1,
-	TEMP_SENSOR_I2C_TMP432_REMOTE2,
-
 	/* NCP15WB thermistors */
 	TEMP_SENSOR_ADC_NCP15_CPU,
 	TEMP_SENSOR_ADC_NCP15_DIMM,
diff --git a/board/celes/gpio.inc b/board/celes/gpio.inc
index b1820083c8..080a5aa0f8 100644
--- a/board/celes/gpio.inc
+++ b/board/celes/gpio.inc
@@ -32,14 +32,14 @@ GPIO(NC_USBPD_BOOT0,    PIN(12), GPIO_INPUT | GPIO_PULL_DOWN)   /* NC */
 GPIO(USB_ILIM_SEL,      PIN(13), GPIO_OUT_HIGH)                 /* USB current control */
 GPIO(I2C_PORT0_0_SCL,   PIN(15), GPIO_INPUT)
 GPIO(I2C_PORT0_0_SDA,   PIN(16), GPIO_INPUT)
-GPIO(I2C_PORT0_1_SCL,   PIN(134), GPIO_INPUT)
-GPIO(I2C_PORT0_1_SDA,   PIN(17), GPIO_INPUT)
-GPIO(I2C_PORT1_SCL,     PIN(22), GPIO_INPUT)
-GPIO(I2C_PORT1_SDA,     PIN(23), GPIO_INPUT)
-GPIO(I2C_PORT2_SCL,     PIN(20), GPIO_INPUT)
-GPIO(I2C_PORT2_SDA,     PIN(21), GPIO_INPUT)
-GPIO(I2C_PORT3_SCL,     PIN(24), GPIO_INPUT)
-GPIO(I2C_PORT3_SDA,     PIN(25), GPIO_INPUT)
+GPIO(I2C_PORT0_1_SCL,   PIN(134), GPIO_OUTPUT | GPIO_PULL_UP)
+GPIO(I2C_PORT0_1_SDA,   PIN(17), GPIO_OUTPUT | GPIO_PULL_UP)
+GPIO(I2C_PORT1_SCL,     PIN(22), GPIO_OUTPUT | GPIO_PULL_UP)
+GPIO(I2C_PORT1_SDA,     PIN(23), GPIO_OUTPUT | GPIO_PULL_UP)
+GPIO(I2C_PORT2_SCL,     PIN(20), GPIO_OUTPUT | GPIO_PULL_UP)
+GPIO(I2C_PORT2_SDA,     PIN(21), GPIO_OUTPUT | GPIO_PULL_UP)
+GPIO(I2C_PORT3_SCL,     PIN(24), GPIO_OUTPUT | GPIO_PULL_UP)
+GPIO(I2C_PORT3_SDA,     PIN(25), GPIO_OUTPUT | GPIO_PULL_UP)
 GPIO(PCH_SCI_L,         PIN(26), GPIO_ODR_HIGH)                 /* SCI output */
 
 GPIO(NC_GPIO31,         PIN(31), GPIO_OUTPUT | GPIO_PULL_UP)    /* NC */
@@ -109,7 +109,6 @@ GPIO(GPIO_3_EC,         PIN(211), GPIO_OUT_LOW)                  /* Sleep SOIX s
 ALTERNATE(PIN_MASK(16, 0x24),   1,    MODULE_UART,            0)                    /* UART0 */
 
 ALTERNATE(PIN_MASK(1,  0x60),   2,    MODULE_I2C,             GPIO_OPEN_DRAIN)      /* I2C0: Battery Charger */
-ALTERNATE(PIN_MASK(2,  0x3f),   2,    MODULE_I2C,             GPIO_OPEN_DRAIN)      /* I2C1: Temp Sensor / I2C2: SOC / I2C3: VNN */
 
 ALTERNATE(PIN_MASK(0,  0xfc),   3,    MODULE_KEYBOARD_SCAN,   GPIO_KB_OUTPUT)
 ALTERNATE(PIN_MASK(1,  0x03),   3,    MODULE_KEYBOARD_SCAN,   GPIO_KB_OUTPUT)
@@ -145,7 +144,3 @@ ALTERNATE(PIN_MASK(12, 0x01),   0,      MODULE_GPIO,          GPIO_ODR_HIGH)
 /* I2C pins */
 /* I2C0_0 CLK - GPIO015, I2C0_0 DAT - GPIO016, I2C0_1 DAT - GPIO017 */
 ALTERNATE(PIN_MASK(1,  0xe0), 2, MODULE_I2C, GPIO_ODR_HIGH)
-/* I2C0_1 CLK - GPIO134 */
-ALTERNATE(PIN_MASK(13, 0x10), 2, MODULE_I2C, GPIO_ODR_HIGH)
-/* I2C{1,2,3} CLK / DAT - GPIO022-GPIO025*/
-ALTERNATE(PIN_MASK(2,  0x3f), 2, MODULE_I2C, GPIO_ODR_HIGH)