diff options
Diffstat (limited to 'board/mec1322_evb/gpio.inc')
| -rw-r--r-- | board/mec1322_evb/gpio.inc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/board/mec1322_evb/gpio.inc b/board/mec1322_evb/gpio.inc index 511fcd8c68..8bb7cf29aa 100644 --- a/board/mec1322_evb/gpio.inc +++ b/board/mec1322_evb/gpio.inc @@ -5,17 +5,17 @@ * found in the LICENSE file. */ -GPIO(LED1, PORT(15), 4, GPIO_ODR_LOW) -GPIO(LED2, PORT(15), 5, GPIO_ODR_HIGH) -GPIO(LED3, PORT(15), 6, GPIO_ODR_LOW) -GPIO(PCH_SMI_L, PORT(4), 4, GPIO_ODR_HIGH) /* SMI output */ -GPIO(PCH_WAKE_L, PORT(20), 0, GPIO_ODR_HIGH) /* PCH wake pin */ +GPIO(LED1, PIN(154), GPIO_ODR_LOW) +GPIO(LED2, PIN(155), GPIO_ODR_HIGH) +GPIO(LED3, PIN(156), GPIO_ODR_LOW) +GPIO(PCH_SMI_L, PIN(44), GPIO_ODR_HIGH) /* SMI output */ +GPIO(PCH_WAKE_L, PIN(200), GPIO_ODR_HIGH) /* PCH wake pin */ /* Switch S1 */ -GPIO(S1, PORT(6), 3, GPIO_INT_FALLING | GPIO_PULL_UP) +GPIO(S1, PIN(63), GPIO_INT_FALLING | GPIO_PULL_UP) /* Shared SPI CS */ -GPIO(SHD_CS0, PORT(15), 0, GPIO_ODR_HIGH) +GPIO(SHD_CS0, PIN(150), GPIO_ODR_HIGH) /* * Signals which aren't implemented on MEC1322 eval board but we'll @@ -25,21 +25,21 @@ UNIMPLEMENTED(RECOVERY_L) /* Recovery signal from DOWN button */ UNIMPLEMENTED(WP_L) /* Write protect input */ UNIMPLEMENTED(ENTERING_RW) /* EC entering RW code */ -ALTERNATE(PORT(16), 0x24, 1, MODULE_UART, 0) /* UART0 */ -ALTERNATE(PORT(3), (1 << 4), 3, MODULE_PWM_FAN, 0) -ALTERNATE(PORT(14), (1 << 0), 3, MODULE_PWM_FAN, 0) +ALTERNATE(PIN_MASK(16, 0x24), 1, MODULE_UART, 0) /* UART0 */ +ALTERNATE(PIN_MASK(3, (1 << 4)), 3, MODULE_PWM_FAN, 0) +ALTERNATE(PIN_MASK(14, (1 << 0)), 3, MODULE_PWM_FAN, 0) /* * I2C0: External pull-up resistors on EVB are too weak. Let's * also enable internal pull-up here. */ -ALTERNATE(PORT(1), 0x60, 2, MODULE_I2C, GPIO_PULL_UP) -ALTERNATE(PORT(0), 0xfe, 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -ALTERNATE(PORT(1), 0x03, 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -ALTERNATE(PORT(3), 0x04, 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PORT(4), 0x0d, 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PORT(10), 0xd8, 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -ALTERNATE(PORT(12), 0x60, 2, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PORT(14), 0x14, 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PORT(2), 0x20, 2, MODULE_LPC, 0) -ALTERNATE(PORT(12), 0x14, 1, MODULE_SPI, 0) -ALTERNATE(PORT(6), 0x10, 1, MODULE_SPI, 0) +ALTERNATE(PIN_MASK(1, 0x60), 2, MODULE_I2C, GPIO_PULL_UP) +ALTERNATE(PIN_MASK(0, 0xfe), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) +ALTERNATE(PIN_MASK(1, 0x03), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) +ALTERNATE(PIN_MASK(3, 0x04), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) +ALTERNATE(PIN_MASK(4, 0x0d), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) +ALTERNATE(PIN_MASK(10, 0xd8), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) +ALTERNATE(PIN_MASK(12, 0x60), 2, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) +ALTERNATE(PIN_MASK(14, 0x14), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) +ALTERNATE(PIN_MASK(2, 0x20), 2, MODULE_LPC, 0) +ALTERNATE(PIN_MASK(12, 0x14), 1, MODULE_SPI, 0) +ALTERNATE(PIN_MASK(6, 0x10), 1, MODULE_SPI, 0) |