summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorKevin K Wong <kevin.k.wong@intel.com>2015-06-25 16:08:21 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-06-30 08:58:35 +0000
commit75b95672ac169a1ee61a3d97c9223dc91384bff7 (patch)
tree9256311c706634ad09c8d8c7559ddacd81434a3d /board
parentdaea221d5619a7278e8cd31ba9438028f306906c (diff)
downloadchrome-ec-75b95672ac169a1ee61a3d97c9223dc91384bff7.tar.gz
kunimitsu: Update gpio according to fab3 hardware changes
BUG=none TEST=Verified system can boot to OS and able to do PD negotiation. BRANCH=none Change-Id: Ie232954931984256887f953d387e56baccba2178 Signed-off-by: Kevin K Wong <kevin.k.wong@intel.com> Reviewed-on: https://chromium-review.googlesource.com/282390 Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/kunimitsu/gpio.inc27
1 files changed, 13 insertions, 14 deletions
diff --git a/board/kunimitsu/gpio.inc b/board/kunimitsu/gpio.inc
index f52af42f46..dac192a8cb 100644
--- a/board/kunimitsu/gpio.inc
+++ b/board/kunimitsu/gpio.inc
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-GPIO_INT(LID_OPEN, PIN(27), GPIO_INT_BOTH_DSLEEP, lid_interrupt)
+GPIO_INT(LID_OPEN, PIN(27), GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, lid_interrupt)
GPIO_INT(AC_PRESENT, PIN(30), GPIO_INT_BOTH_DSLEEP, extpower_interrupt)
GPIO_INT(WP_L, PIN(33), GPIO_INT_BOTH, switch_interrupt)
/* Buffered power button input from PMIC / ROP_EC_PWR_BTN_L_R */
@@ -24,8 +24,8 @@ GPIO_INT(USB_C0_VBUS_WAKE_L,PIN(152), GPIO_INT_BOTH, vbus0_evt)
GPIO_INT(USB_C1_VBUS_WAKE_L,PIN(123), GPIO_INT_BOTH, vbus1_evt)
GPIO_INT(USB_C0_BC12_INT_L, PIN(124), GPIO_INT_FALLING, usb0_evt)
GPIO_INT(USB_C1_BC12_INT_L, PIN(145), GPIO_INT_FALLING, usb1_evt)
-
-GPIO(ROP_DSW_PWROK, PIN(55), GPIO_INPUT)
+/* Puesdo G3 */
+GPIO(G3_SLEEP_EN, PIN(55), GPIO_ODR_LOW)
GPIO(PD_RST_L, PIN(130), GPIO_ODR_HIGH)
GPIO(USB2_OTG_ID, PIN(13), GPIO_ODR_HIGH)
@@ -62,11 +62,11 @@ GPIO(EC_FAN1_TTACH, PIN(105), GPIO_INPUT)
GPIO(EC_FAN1_PWM, PIN(136), GPIO_OUT_LOW)
GPIO(PCH_ACOK, PIN(110), GPIO_ODR_HIGH)
/* Interrupts from accelerometer / gyro -- not yet implemented */
-GPIO(GYRO_INT1, PIN(161), GPIO_INPUT | GPIO_PULL_DOWN)
-GPIO(GYRO_INT2, PIN(127), GPIO_INPUT | GPIO_PULL_DOWN)
-GPIO(ALS_INT, PIN(147), GPIO_INPUT | GPIO_PULL_UP)
-GPIO(WWAN_PWR_EN, PIN(133), GPIO_OUT_HIGH)
-GPIO(WLAN_OFF_L, PIN(132), GPIO_ODR_HIGH)
+GPIO(LID_ACCEL_INT, PIN(161), GPIO_INPUT | GPIO_PULL_DOWN) /* Lid ACCEL sensor interrupt to EC */
+GPIO(GYRO_INT, PIN(127), GPIO_INPUT | GPIO_PULL_DOWN) /* Lid Gyro sensor interrupt to EC */
+GPIO(BASE_ACCEL_INT, PIN(147), GPIO_INPUT | GPIO_PULL_DOWN) /* Base ACCEL sensor interrupt to EC */
+GPIO(GYRO_DRDY, PIN(133), GPIO_INPUT | GPIO_PULL_DOWN) /* Lid Gyro sensor DRDY interrupt to EC */
+GPIO(WLAN_OFF_L, PIN(132), GPIO_OUT_HIGH)
/* RCIN# line to PCH for 8042 emulation */
GPIO(PCH_RCIN_L, PIN(135), GPIO_ODR_HIGH)
GPIO(USB2_OTG_VBUSSENSE, PIN(140), GPIO_ODR_HIGH)
@@ -79,8 +79,8 @@ GPIO(USB_C0_5V_EN, PIN(154), GPIO_OUT_LOW)
GPIO(USB_C1_5V_EN, PIN(204), GPIO_OUT_LOW)
GPIO(USB_C0_CHARGE_EN_L, PIN(64), GPIO_OUT_LOW)
GPIO(USB_C1_CHARGE_EN_L, PIN(157), GPIO_OUT_LOW)
-GPIO(PP1800_DX_SENSOR_EN, PIN(11), GPIO_OUT_LOW)
-GPIO(PP1800_DX_AUDIO_EN, PIN(160), GPIO_OUT_LOW)
+GPIO(NC_011, PIN(11), GPIO_INPUT | GPIO_PULL_UP)
+GPIO(LID_OPEN2, PIN(160), GPIO_INPUT | GPIO_PULL_UP)
GPIO(PCH_RTCRST_L, PIN(163), GPIO_ODR_HIGH)
GPIO(NC_201, PIN(201), GPIO_INPUT | GPIO_PULL_UP)
@@ -94,7 +94,6 @@ GPIO(KBD_KSO2, PIN(101), GPIO_KB_OUTPUT_COL2)
GPIO(PVT_CS0, PIN(146), GPIO_ODR_HIGH)
GPIO(SYS_RESET_L, PIN(121), GPIO_ODR_HIGH)
-GPIO(NC_11, PIN(11), GPIO_INPUT | GPIO_PULL_UP)
GPIO(NC_150, PIN(150), GPIO_INPUT | GPIO_PULL_UP)
GPIO(CHARGE_LED1, PIN(155), GPIO_OUT_HIGH)
GPIO(CHARGE_LED2, PIN(156), GPIO_OUT_HIGH)
@@ -139,11 +138,11 @@ ALTERNATE(PIN_MASK(15, 0x08), 1, MODULE_SPI, 0)
/* I2C pins */
/* I2C0_0 CLK - GPIO015, I2C0_0 DAT - GPIO016, I2C0_1 DAT - GPIO017 */
-ALTERNATE(PIN_MASK(1, 0xe0), 2, MODULE_I2C, GPIO_PULL_UP)
+ALTERNATE(PIN_MASK(1, 0xe0), 2, MODULE_I2C, GPIO_ODR_HIGH)
/* I2C{1,2,3} CLK / DAT - GPIO020-GPIO025*/
-ALTERNATE(PIN_MASK(2, 0x3f), 2, MODULE_I2C, GPIO_PULL_UP)
+ALTERNATE(PIN_MASK(2, 0x3f), 2, MODULE_I2C, GPIO_ODR_HIGH)
/* I2C0_1 CLK - GPIO134 */
-ALTERNATE(PIN_MASK(13, 0x10), 2, MODULE_I2C, GPIO_PULL_UP)
+ALTERNATE(PIN_MASK(13, 0x10), 2, MODULE_I2C, GPIO_ODR_HIGH)
/* ADC pins */
/* ADC1 - GPIO057 / PPVAR_BOOSTIN_SENSE */