Lars: update GPIO setting

Expected PIN macros to expand in Decimal instead of Octal.

BUG=None
BRANCH=lars
TEST=`make BOARD=lars -j`

Signed-off-by: Ryan Zhang <Ryan.Zhang@quantatw.com>
Change-Id: I1c469a6031a6b2c64db75c362d1915b7a390f81e
Reviewed-on: https://chromium-review.googlesource.com/314411
Commit-Ready: 志偉 黃 <David.Huang@quantatw.com>
Reviewed-by: Shawn N <shawnn@chromium.org>
This commit is contained in:
Ryan Zhang
2015-11-26 09:47:33 +08:00
committed by chrome-bot
parent cefe19e08f
commit 1d0785da90

View File

@@ -5,22 +5,22 @@
* found in the LICENSE file.
*/
GPIO_INT(PCH_SLP_SUS_L, PIN(012), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt)
GPIO_INT(PCH_SLP_SUS_L, PIN(12), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt)
/* RSMRST from PMIC */
GPIO_INT(RSMRST_L_PGOOD, PIN(063), GPIO_INT_BOTH, power_signal_interrupt)
GPIO_INT(RSMRST_L_PGOOD, PIN(63), GPIO_INT_BOTH, power_signal_interrupt)
#ifdef CONFIG_LOW_POWER_IDLE
/* UART0 RX input */
GPIO_INT(UART0_RX, PIN(162), GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, uart_deepsleep_interrupt)
#endif
GPIO_INT(PMIC_INT_L, PIN(050), GPIO_INT_FALLING, power_signal_interrupt) /* Empty */
GPIO_INT(PMIC_INT_L, PIN(50), GPIO_INT_FALLING, power_signal_interrupt) /* Empty */
GPIO_INT(USB_C0_VBUS_WAKE_L, PIN(152), GPIO_INT_BOTH, vbus0_evt)
GPIO_INT(LID_OPEN, PIN(027), GPIO_INT_BOTH | GPIO_PULL_UP, lid_interrupt)
GPIO_INT(AC_PRESENT, PIN(030), GPIO_INT_BOTH, extpower_interrupt)
GPIO_INT(WP_L, PIN(033), GPIO_INT_BOTH, switch_interrupt)
GPIO_INT(LID_OPEN, PIN(27), GPIO_INT_BOTH | GPIO_PULL_UP, lid_interrupt)
GPIO_INT(AC_PRESENT, PIN(30), GPIO_INT_BOTH, 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 */
GPIO_INT(POWER_BUTTON_L, PIN(035), GPIO_INT_BOTH, power_button_interrupt)
GPIO_INT(POWER_BUTTON_L, PIN(35), GPIO_INT_BOTH, power_button_interrupt)
GPIO_INT(PCH_SLP_S0_L, PIN(141), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt)
GPIO_INT(PCH_SLP_S4_L, PIN(200), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt)
/* RSMRST from PMIC */
@@ -29,21 +29,21 @@ GPIO_INT(USB_C0_BC12_INT_L, PIN(124), GPIO_INT_FALLING, usb0_evt)
GPIO_INT(PD_MCU_INT, PIN(122), GPIO_INT_FALLING, pd_mcu_interrupt)
GPIO(KBD_KSO2, PIN(101), GPIO_KB_OUTPUT_COL2) /* KB pins */
GPIO(BOARD_VERSION1, PIN(006), GPIO_INPUT)
GPIO(BOARD_VERSION2, PIN(007), GPIO_INPUT)
GPIO(BOARD_VERSION3, PIN(010), GPIO_INPUT)
GPIO(NC_011, PIN(011), GPIO_INPUT | GPIO_PULL_UP)
GPIO(PCH_SMI_L, PIN(044), GPIO_ODR_HIGH)
GPIO(PCH_SCI_L, PIN(026), GPIO_ODR_HIGH)
GPIO(BOARD_VERSION1, PIN(6), GPIO_INPUT)
GPIO(BOARD_VERSION2, PIN(7), GPIO_INPUT)
GPIO(BOARD_VERSION3, PIN(10), GPIO_INPUT)
GPIO(NC_011, PIN(11), GPIO_INPUT | GPIO_PULL_UP)
GPIO(PCH_SMI_L, PIN(44), GPIO_ODR_HIGH)
GPIO(PCH_SCI_L, PIN(26), GPIO_ODR_HIGH)
GPIO(SYS_RESET_L, PIN(121), GPIO_ODR_HIGH)
GPIO(PCH_RSMRST_L, PIN(143), GPIO_OUT_LOW)
GPIO(USB_C0_DP_HPD, PIN(046), GPIO_OUT_LOW)
GPIO(NC_047, PIN(047), GPIO_INPUT | GPIO_PULL_UP)
GPIO(USB_C0_DP_HPD, PIN(46), GPIO_OUT_LOW)
GPIO(NC_047, PIN(47), GPIO_INPUT | GPIO_PULL_UP)
/* When asserted, ME does not lock security descriptor */
GPIO(FLASH_DSC_OVERRIDE, PIN(065), GPIO_OUT_HIGH) /* Empty */
GPIO(NC_051, PIN(051), GPIO_INPUT | GPIO_PULL_UP)
GPIO(CPU_PROCHOT, PIN(052), GPIO_OUT_LOW)
GPIO(ENABLE_TOUCHPAD, PIN(053), GPIO_OUT_LOW)
GPIO(FLASH_DSC_OVERRIDE, PIN(65), GPIO_OUT_HIGH) /* Empty */
GPIO(NC_051, PIN(51), GPIO_INPUT | GPIO_PULL_UP)
GPIO(CPU_PROCHOT, PIN(52), GPIO_OUT_LOW)
GPIO(ENABLE_TOUCHPAD, PIN(53), GPIO_OUT_LOW)
GPIO(SUSLED_L, PIN(127), GPIO_OUT_LOW)
GPIO(PD_RST_L, PIN(130), GPIO_ODR_HIGH)
GPIO(WLAN_OFF_L, PIN(132), GPIO_OUT_HIGH) /* Empty */
@@ -54,32 +54,32 @@ GPIO(NC_136, PIN(136), GPIO_INPUT | GPIO_PULL_UP)
GPIO(LDO_EN, PIN(211), GPIO_OUT_LOW)
GPIO(NC_145, PIN(145), GPIO_INPUT | GPIO_PULL_UP)
GPIO(NC_147, PIN(147), GPIO_INPUT | GPIO_PULL_UP)
GPIO(USB2_OTG_ID, PIN(013), GPIO_ODR_HIGH) /* Empty */
GPIO(NC_031, PIN(031), GPIO_INPUT | GPIO_PULL_UP)
GPIO(USB1_ENABLE, PIN(036), GPIO_OUT_HIGH)
GPIO(ENTERING_RW, PIN(041), GPIO_OUT_LOW)
GPIO(PCH_PWRBTN_L, PIN(045), GPIO_OUT_HIGH)
GPIO(BAT_PRESENT_L, PIN(056), GPIO_INPUT)
GPIO(USB_PD_WAKE, PIN(060), GPIO_OUT_LOW) /* Empty */
GPIO(PCH_WAKE_L, PIN(066), GPIO_ODR_HIGH)
GPIO(USB2_OTG_ID, PIN(13), GPIO_ODR_HIGH) /* Empty */
GPIO(NC_031, PIN(31), GPIO_INPUT | GPIO_PULL_UP)
GPIO(USB1_ENABLE, PIN(36), GPIO_OUT_HIGH)
GPIO(ENTERING_RW, PIN(41), GPIO_OUT_LOW)
GPIO(PCH_PWRBTN_L, PIN(45), GPIO_OUT_HIGH)
GPIO(BAT_PRESENT_L, PIN(56), GPIO_INPUT)
GPIO(USB_PD_WAKE, PIN(60), GPIO_OUT_LOW) /* Empty */
GPIO(PCH_WAKE_L, PIN(66), GPIO_ODR_HIGH)
GPIO(USB2_OTG_VBUSSENSE, PIN(105), GPIO_ODR_HIGH) /* Empty */
GPIO(PCH_ACOK, PIN(110), GPIO_OUT_LOW)
GPIO(USB2_ENABLE, PIN(067), GPIO_OUT_HIGH)
GPIO(USB2_ENABLE, PIN(67), GPIO_OUT_HIGH)
/* Puesdo G3 */
GPIO(G3_SLEEP_EN, PIN(055), GPIO_OUT_LOW)
GPIO(G3_SLEEP_EN, PIN(55), GPIO_OUT_LOW)
GPIO(NC_210, PIN(210), GPIO_INPUT | GPIO_PULL_UP)
/* I2C pins - these will be reconfigured for alternate function below */
GPIO(I2C0_0_SCL, PIN(015), GPIO_INPUT)
GPIO(I2C0_0_SDA, PIN(016), GPIO_INPUT)
GPIO(I2C0_0_SCL, PIN(15), GPIO_INPUT)
GPIO(I2C0_0_SDA, PIN(16), GPIO_INPUT)
GPIO(I2C0_1_SCL, PIN(134), GPIO_INPUT)
GPIO(I2C0_1_SDA, PIN(017), GPIO_INPUT)
GPIO(I2C1_SCL, PIN(022), GPIO_INPUT)
GPIO(I2C1_SDA, PIN(023), GPIO_INPUT)
GPIO(NC_20, PIN(020), GPIO_INPUT | GPIO_PULL_UP) /* I2C2_SCL */
GPIO(NC_21, PIN(021), GPIO_INPUT | GPIO_PULL_UP) /* I2C2_SDA */
GPIO(I2C3_SCL, PIN(024), GPIO_INPUT)
GPIO(I2C3_SDA, PIN(025), GPIO_INPUT)
GPIO(I2C0_1_SDA, PIN(17), GPIO_INPUT)
GPIO(I2C1_SCL, PIN(22), GPIO_INPUT)
GPIO(I2C1_SDA, PIN(23), GPIO_INPUT)
GPIO(NC_20, PIN(20), GPIO_INPUT | GPIO_PULL_UP) /* I2C2_SCL */
GPIO(NC_21, PIN(21), GPIO_INPUT | GPIO_PULL_UP) /* I2C2_SDA */
GPIO(I2C3_SCL, PIN(24), GPIO_INPUT)
GPIO(I2C3_SDA, PIN(25), GPIO_INPUT)
/* prochot input from devices */
GPIO(PLATFORM_EC_PROCHOT, PIN(151), GPIO_INPUT) /* Empty */
@@ -96,7 +96,7 @@ GPIO(PMIC_SLP_SUS_L, PIN(201), GPIO_OUT_LOW)
GPIO(EN_PWR_WIFI, PIN(203), GPIO_OUT_HIGH) /* Empty */
GPIO(NC_204, PIN(204), GPIO_INPUT | GPIO_PULL_UP)
GPIO(PVT_CS0, PIN(146), GPIO_ODR_HIGH) /* SPI */
GPIO(USB_C0_CHARGE_EN_L, PIN(064), GPIO_OUT_LOW)
GPIO(USB_C0_CHARGE_EN_L, PIN(64), GPIO_OUT_LOW)
GPIO(NC_150, PIN(150), GPIO_INPUT | GPIO_PULL_UP)
/* Alternate functions GPIO definitions */