Setzer: Update gpio table

Modify GPIO setting

BUG=chrome-os-partner:49640
BRANCH=strago
TEST=Update EC firmware for Setzer and work normally

Change-Id: Ic3dcb10c2e9bd7013afb6beb1017dcf703b21ac7
Signed-off-by: Lennon Chen <Lennon_Chen@wistron.com>
Reviewed-on: https://chromium-review.googlesource.com/319922
Reviewed-by: Shawn N <shawnn@chromium.org>

3 files changed, 14 insertions, 26 deletions

diff --git a/board/setzer/board.c b/board/setzer/board.c
index 0e0e93c9e4..c8bdc7fe7b 100644
--- a/board/setzer/board.c
+++ b/board/setzer/board.c
@@ -111,14 +111,6 @@ struct ec_thermal_config thermal_params[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
 
-const struct button_config buttons[] = {
-	{"Volume Down", KEYBOARD_BUTTON_VOLUME_DOWN, GPIO_VOLUME_DOWN,
-		30 * MSEC, 0},
-	{"Volume Up", KEYBOARD_BUTTON_VOLUME_UP, GPIO_VOLUME_UP,
-		30 * MSEC, 0},
-};
-BUILD_ASSERT(ARRAY_SIZE(buttons) == CONFIG_BUTTON_COUNT);
-
 /* Four Motion sensors */
 /* kxcj9 mutex and local/private data*/
 static struct mutex g_kxcj9_mutex[2];
diff --git a/board/setzer/board.h b/board/setzer/board.h
index a17d2805d8..27d298c5bf 100644
--- a/board/setzer/board.h
+++ b/board/setzer/board.h
@@ -77,9 +77,6 @@
 /* Wireless signals */
 #define WIRELESS_GPIO_WLAN	GPIO_WLAN_OFF_L
 
-/* Number of buttons */
-#define CONFIG_BUTTON_COUNT		2
-
 /* Modules we want to exclude */
 #undef CONFIG_EEPROM
 #undef CONFIG_EOPTION
diff --git a/board/setzer/gpio.inc b/board/setzer/gpio.inc
index 4d420f6d56..d8592d7042 100644
--- a/board/setzer/gpio.inc
+++ b/board/setzer/gpio.inc
@@ -25,7 +25,7 @@ GPIO_INT(PCH_SLP_S3_L,      PIN(206), GPIO_INT_BOTH,                      power_
 GPIO(BOARD_VERSION2,    PIN(0),  GPIO_INPUT)                    /* BOARD_ID1 */
 GPIO(KBD_KSO2,          PIN(1),  GPIO_KB_OUTPUT_COL2)           /* Negative edge triggered irq. */
 
-GPIO(NC_USBPD_BOOT0,    PIN(12), GPIO_INPUT | GPIO_PULL_DOWN)   /* NC */
+GPIO(NC_GPIO12,         PIN(12), GPIO_INPUT | GPIO_PULL_UP)     /* 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)
@@ -51,16 +51,15 @@ GPIO(USB2_ENABLE,       PIN(36), GPIO_OUT_LOW)                  /* Enable power
 GPIO(ENTERING_RW,       PIN(41), GPIO_OUT_LOW)                  /* Indicate when EC is entering RW code */
 GPIO(PCH_SMI_L,         PIN(44), GPIO_ODR_HIGH)                 /* SMI output */
 GPIO(USB_OC1_L,         PIN(45), GPIO_INT_FALLING)              /* DB2 BC1.2 over current signal to EC */
-GPIO(DP_USB_C_HPD_Q,    PIN(46), GPIO_OUT_HIGH)                 /* DP hot plug detect from EC to SOC */
+GPIO(NC_GPIO46,         PIN(46), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 
-GPIO(OTG_SW_EN,         PIN(50), GPIO_OUT_LOW)                  /* */
+GPIO(NC_GPIO50,         PIN(50), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 GPIO(PCH_SUS_STAT_L,    PIN(51), GPIO_INT_FALLING)              /* Signal to inform EC that SOC is entering low power state */
-GPIO(EC_ACDET_CTRL,     PIN(52), GPIO_INPUT | GPIO_PULL_UP)
+GPIO(NC_GPIO52,         PIN(52), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 GPIO(TRACKPAD_PWREN,    PIN(53), GPIO_OUT_HIGH)                 /* Enable power for Track Pad */
 GPIO(USB_OC0_L,         PIN(55), GPIO_INT_FALLING)              /* Over current signal of the BC1.2 charger to EC */
 GPIO(EC_ADC1,           PIN(57), GPIO_INPUT)                    /* EC_ADC1, TEMP_SENSOR_2 no_stuff */
 
-GPIO(EC_ADC0,           PIN(61), GPIO_INPUT)                    /* EC_ADC0 */
 GPIO(EC_HIB_L,          PIN(64), GPIO_OUT_LOW)                  /* Set to high before Pseduo G3 */
 GPIO(PCH_SYS_PWROK,     PIN(65), GPIO_OUT_LOW)                  /* EC thinks everything is up and ready (DELAY_ALL_SYS_PWRGD) */
 GPIO(PCH_WAKE_L,        PIN(66), GPIO_ODR_HIGH)                 /* PCH wake pin */
@@ -76,33 +75,33 @@ GPIO(NC_115,            PIN(115), GPIO_INPUT | GPIO_PULL_UP)    /* NC */
 GPIO(EC_VNN_VCLK,       PIN(122), GPIO_INPUT | GPIO_PULL_UP)    /* Interrupt from USB PD Controller to EC */
 GPIO(STRAP_L,           PIN(123), GPIO_OUT_LOW)
 GPIO(EC_VNN_ALERT_L,    PIN(124), GPIO_INPUT | GPIO_PULL_UP)
-GPIO(GYRO_INT2,         PIN(127), GPIO_INPUT | GPIO_PULL_DOWN)   /* Gyro sensor interrupt 2 to EC */
+GPIO(NC_GPIO127,        PIN(127), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 
-GPIO(EC_PLUG_DETECT,    PIN(132), GPIO_INT_BOTH | GPIO_PULL_UP | GPIO_PULL_DOWN)
+GPIO(NC_GPIO132,        PIN(132), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 GPIO(PD_RST_L,          PIN(135), GPIO_ODR_HIGH)                 /* USB PD MCU reset */
 
-GPIO(THERMAL_PROBE_EN_L,PIN(140), GPIO_OUT_HIGH)
+GPIO(NC_GPIO140,        PIN(140), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 GPIO(PCH_RSMRST_L,      PIN(143), GPIO_OUT_LOW)                  /* RSMRST_N to PCH */
 GPIO(EC_KBD_ALERT,      PIN(145), GPIO_OUT_LOW)                   /* EC_KBD_ALERT */
 GPIO(PVT_CS0,           PIN(146), GPIO_ODR_HIGH)                 /* SPI PVT Chip select */
-GPIO(ALS_INT,           PIN(147), GPIO_INPUT | GPIO_PULL_UP)     /* ALS sensor interrupt to EC */
+GPIO(NC_GPIO147,        PIN(147), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 
 GPIO(WLAN_OFF_L,        PIN(150), GPIO_ODR_HIGH)                 /* Wireless LAN */
 GPIO(CPU_PROCHOT,       PIN(151), GPIO_OUT_LOW)
 GPIO(KBD_IRQ_L,         PIN(152), GPIO_ODR_HIGH)                 /* Negative edge triggered irq. */
 GPIO(BOARD_VERSION1,    PIN(154), GPIO_INPUT)                    /* BOARD_ID0 */
-GPIO(EC_PERICOM_INT,    PIN(155), GPIO_INT_BOTH)                 /* Pericom USB device interrupt */
+GPIO(NC_GPIO155,        PIN(155), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 GPIO(PWR_BTN_SELECT,    PIN(156), GPIO_ODR_HIGH)                 /* HIGH in clamshell mode and LOW in tablet mode */
 GPIO(PCH_SUSPWRDNACK,   PIN(157), GPIO_INT_FALLING)              /* PMC SUSPWRDNACK signal from SOC to EC */
 
 GPIO(PCH_PWRBTN_L,      PIN(160), GPIO_OUT_HIGH)                 /* Power button output to PCH */
-GPIO(GYRO_INT1,         PIN(161), GPIO_INPUT | GPIO_PULL_DOWN)   /* Gyro sensor interrupt 1 to EC */
-GPIO(VP9_CODEC_RESET_L, PIN(163), GPIO_OUT_LOW)                  /* VP9_CODEC_RESET_L, OUTPUT, ACTIVE LOW */
+GPIO(NC_GPIO161,        PIN(161), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
+GPIO(NC_GPIO163,        PIN(163), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 
-GPIO(STARTUP_LATCH_SET, PIN(201), GPIO_INPUT)			/* Not used in BCRD2. Programmed as Input to fix EC power leakage in S3*/
+GPIO(STARTUP_LATCH_SET, PIN(201), GPIO_INPUT)                    /* Not used in BCRD2. Programmed as Input to fix EC power leakage in S3*/
 GPIO(EC_BL_DISABLE_L,   PIN(202), GPIO_OUT_HIGH)                 /* EDP backligh disable signal from EC */
 GPIO(SMC_SHUTDOWN,      PIN(203), GPIO_OUT_LOW)                  /* Shutdown signal from EC to power sequencing PLD */
-GPIO(USBPD_BST_OFF,     PIN(204), GPIO_OUT_LOW)
+GPIO(NC_GPIO204,        PIN(204), GPIO_INPUT | GPIO_PULL_UP)     /* NC */
 
 GPIO(BAT_PRESENT_L,    PIN(210), GPIO_INPUT)                     /* HW detection signal from battery to EC */
 GPIO(GPIO_3_EC,         PIN(211), GPIO_OUT_LOW)                  /* Sleep SOIX signal from SOC to EC */
@@ -133,7 +132,7 @@ ALTERNATE(PIN_MASK(15, 0x08),   1,    MODULE_SPI,             0)
 ALTERNATE(PIN_MASK(13, 0x48),   1,    MODULE_PWM_LED,         GPIO_OUTPUT)           /* 133: PWM0, 136: PWM1 */
 ALTERNATE(PIN_MASK(14, 0x02),   1,    MODULE_PWM_LED,         GPIO_OUTPUT)           /* 141: PWM3 */
 ALTERNATE(PIN_MASK(5,  0x40),   1,    MODULE_ADC,             0)                     /* 56: temperature sensor 1 */
-ALTERNATE(PIN_MASK(6,  0x05),   1,    MODULE_ADC,             0)                     /* 60: PC_MON, 62: temperature sensor 3 */
+ALTERNATE(PIN_MASK(6,  0x07),   1,    MODULE_ADC,             0)                     /* 60: PC_MON, 61: ADT_TYPE_AD, 62: temperature sensor 3 */
 
 /* Re-Config LPC Pins to GPIO Open Drain for SOC G3 (EC - POWER_G3) state */
 ALTERNATE(PIN_MASK(1,  0x10),   0,      MODULE_GPIO,          GPIO_ODR_HIGH)         /* 14: LPC CLKRUN */