From 937cc8a64e5971def21303e7a19a4ad9553e0ace Mon Sep 17 00:00:00 2001 From: Steven Jian Date: Wed, 1 Apr 2015 01:25:42 +0800 Subject: mec1322: Simplify GPIO lists Our existing GPIO macros use port# / gpio#, but the concept of different GPIO ports does not exist on the mec1322. Therefore, add new GPIO macros for chips which do not have distinct GPIO ports. BUG=None BRANCH=None TEST=make buildall -j Change-Id: Ibda97c6563ad447d16dab39ecadab43ccb25174b Signed-off-by: Steven Jian Reviewed-on: https://chromium-review.googlesource.com/262841 Reviewed-by: Anton Staaf --- board/llama/gpio.inc | 86 ++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'board/llama') diff --git a/board/llama/gpio.inc b/board/llama/gpio.inc index a13246ecca..253780ab9a 100644 --- a/board/llama/gpio.inc +++ b/board/llama/gpio.inc @@ -6,59 +6,59 @@ */ /* Inputs with interrupt handlers are first for efficiency */ -GPIO_INT(AC_PRESENT, A, 0, GPIO_INT_BOTH, extpower_interrupt) /* AC power present: PA 0 */ -GPIO_INT(POWER_BUTTON_L, B, 5, GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) /* Keyboard power button: PB 5 */ -GPIO_INT(SOC_POWER_GOOD_L, A, 3, GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(LID_OPEN, C, 13, GPIO_INT_BOTH, lid_interrupt) /* LID switch detection */ -GPIO_INT(SUSPEND_L, C, 7, GPIO_INT_BOTH, power_signal_interrupt) /* AP suspend/resume state */ +GPIO_INT(AC_PRESENT, PIN(A, 0), GPIO_INT_BOTH, extpower_interrupt) /* AC power present: PA 0 */ +GPIO_INT(POWER_BUTTON_L, PIN(B, 5), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) /* Keyboard power button: PB 5 */ +GPIO_INT(SOC_POWER_GOOD_L, PIN(A, 3), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(LID_OPEN, PIN(C, 13), GPIO_INT_BOTH, lid_interrupt) /* LID switch detection */ +GPIO_INT(SUSPEND_L, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) /* AP suspend/resume state */ /* Keyboard inputs */ -GPIO_INT(KB_IN00, C, 8, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN01, C, 9, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN02, C, 10, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN03, C, 11, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN04, C, 12, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN05, C, 14, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN06, C, 15, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN07, D, 2, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN00, PIN(C, 8), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN01, PIN(C, 9), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN02, PIN(C, 10), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN03, PIN(C, 11), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN04, PIN(C, 12), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN05, PIN(C, 14), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN06, PIN(C, 15), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN07, PIN(D, 2), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) /* SPI Chip Select */ -GPIO_INT(SPI1_NSS, A, 4, GPIO_INT_BOTH | GPIO_PULL_UP, spi_event) +GPIO_INT(SPI1_NSS, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_UP, spi_event) -GPIO(5V_GOOD_L, A, 1, GPIO_INT_BOTH) -GPIO(AP_RESET_H, B, 3, GPIO_OUT_LOW) -GPIO(BOARD_VERSION1, C, 6, GPIO_INPUT|GPIO_PULL_UP) /* Board version stuffing resistor 1 */ +GPIO(5V_GOOD_L, PIN(A, 1), GPIO_INT_BOTH) +GPIO(AP_RESET_H, PIN(B, 3), GPIO_OUT_LOW) +GPIO(BOARD_VERSION1, PIN(C, 6), GPIO_INPUT|GPIO_PULL_UP) /* Board version stuffing resistor 1 */ /* Outputs */ -GPIO(BAT_LED0, B, 11, GPIO_OUT_LOW) /* LED_GREEN */ -GPIO(BAT_LED1, A, 11, GPIO_OUT_LOW) /* LED_ORANGE */ -GPIO(EC_BL_OVERRIDE, F, 1, GPIO_OUT_LOW) -GPIO(EC_INT, B, 9, GPIO_OUT_HIGH) -GPIO(ENTERING_RW, F, 0, GPIO_OUT_LOW) -GPIO(KB_OUT00, B, 0, GPIO_KB_OUTPUT) -GPIO(KB_OUT01, B, 8, GPIO_KB_OUTPUT) -GPIO(KB_OUT02, B, 12, GPIO_OUT_LOW) /* KSO2 is inverted */ -GPIO(KB_OUT03, B, 13, GPIO_KB_OUTPUT) -GPIO(KB_OUT04, B, 14, GPIO_KB_OUTPUT) -GPIO(KB_OUT05, B, 15, GPIO_KB_OUTPUT) -GPIO(KB_OUT06, C, 0, GPIO_KB_OUTPUT) -GPIO(KB_OUT07, C, 1, GPIO_KB_OUTPUT) -GPIO(KB_OUT08, C, 2, GPIO_KB_OUTPUT) -GPIO(KB_OUT09, B, 1, GPIO_KB_OUTPUT) -GPIO(KB_OUT10, C, 5, GPIO_KB_OUTPUT) -GPIO(KB_OUT11, C, 4, GPIO_KB_OUTPUT) -GPIO(KB_OUT12, A, 14, GPIO_KB_OUTPUT) -GPIO(SYSTEM_POWER_H, B, 10, GPIO_OUT_LOW) -GPIO(PMIC_PWRON_H, A, 12, GPIO_OUT_LOW) -GPIO(PMIC_WARM_RESET_H, C, 3, GPIO_ODR_LOW) +GPIO(BAT_LED0, PIN(B, 11), GPIO_OUT_LOW) /* LED_GREEN */ +GPIO(BAT_LED1, PIN(A, 11), GPIO_OUT_LOW) /* LED_ORANGE */ +GPIO(EC_BL_OVERRIDE, PIN(F, 1), GPIO_OUT_LOW) +GPIO(EC_INT, PIN(B, 9), GPIO_OUT_HIGH) +GPIO(ENTERING_RW, PIN(F, 0), GPIO_OUT_LOW) +GPIO(KB_OUT00, PIN(B, 0), GPIO_KB_OUTPUT) +GPIO(KB_OUT01, PIN(B, 8), GPIO_KB_OUTPUT) +GPIO(KB_OUT02, PIN(B, 12), GPIO_OUT_LOW) /* KSO2 is inverted */ +GPIO(KB_OUT03, PIN(B, 13), GPIO_KB_OUTPUT) +GPIO(KB_OUT04, PIN(B, 14), GPIO_KB_OUTPUT) +GPIO(KB_OUT05, PIN(B, 15), GPIO_KB_OUTPUT) +GPIO(KB_OUT06, PIN(C, 0), GPIO_KB_OUTPUT) +GPIO(KB_OUT07, PIN(C, 1), GPIO_KB_OUTPUT) +GPIO(KB_OUT08, PIN(C, 2), GPIO_KB_OUTPUT) +GPIO(KB_OUT09, PIN(B, 1), GPIO_KB_OUTPUT) +GPIO(KB_OUT10, PIN(C, 5), GPIO_KB_OUTPUT) +GPIO(KB_OUT11, PIN(C, 4), GPIO_KB_OUTPUT) +GPIO(KB_OUT12, PIN(A, 14), GPIO_KB_OUTPUT) +GPIO(SYSTEM_POWER_H, PIN(B, 10), GPIO_OUT_LOW) +GPIO(PMIC_PWRON_H, PIN(A, 12), GPIO_OUT_LOW) +GPIO(PMIC_WARM_RESET_H, PIN(C, 3), GPIO_ODR_LOW) /* * I2C pins should be configured as inputs until I2C module is * initialized. This will avoid driving the lines unintentionally. */ -GPIO(MASTER_I2C_SCL, B, 6, GPIO_INPUT) -GPIO(MASTER_I2C_SDA, B, 7, GPIO_INPUT) +GPIO(MASTER_I2C_SCL, PIN(B, 6), GPIO_INPUT) +GPIO(MASTER_I2C_SDA, PIN(B, 7), GPIO_INPUT) /* Unimplemented signals which we need to emulate for now */ /* UNIMPLEMENTED(ENTERING_RW) */ @@ -66,6 +66,6 @@ UNIMPLEMENTED(WP_L) UNIMPLEMENTED(BOARD_VERSION2) UNIMPLEMENTED(BOARD_VERSION3) -ALTERNATE(A, 0x0600, 1, MODULE_UART, 0) /* USART1: PA9/PA10 */ -ALTERNATE(B, 0x00c0, 1, MODULE_I2C, 0) /* I2C MASTER:PB6/7 */ -ALTERNATE(A, 0x00f0, 0, MODULE_SPI, 0) /* SPI SLAVE:PA4/5/6/7 */ +ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, 0) /* USART1: PA9/PA10 */ +ALTERNATE(PIN_MASK(B, 0x00c0), 1, MODULE_I2C, 0) /* I2C MASTER:PB6/7 */ +ALTERNATE(PIN_MASK(A, 0x00f0), 0, MODULE_SPI, 0) /* SPI SLAVE:PA4/5/6/7 */ -- cgit v1.2.1