diff options
author | Mulin Chao <mlchao@nuvoton.com> | 2016-03-03 10:03:01 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2016-03-05 04:03:23 -0800 |
commit | f02a5e90453515e6215e27f565dfd78603a05567 (patch) | |
tree | 585adae01095c1066888b9bc7c861953bd7b3f35 /chip/npcx/gpio.c | |
parent | dc73b3ed742a25dd11480a7ec6e3ab1393fc7def (diff) | |
download | chrome-ec-f02a5e90453515e6215e27f565dfd78603a05567.tar.gz |
npcx: Add 1.8V IO support for some GPIOs and I2C pins.
Add 1.8V IO support for some GPIOs and I2C pins. We use a array
(gpio_lvol_table) to confine which IO pins can switch to 1.8V. Before
setting it to support low voltage level, FW should set IO pin's type to
open-drain and disable internal pulling up or down.
We also add examples in gpio.inc of npcx_evb and npcx_evb_arm to indicate
how to set GPIO & I2C pins to 1.8V if user adds CONFIG_TEST_1P8V definition
in board.h.
In i2c.c driver, this version removes the internal pull-up feature of
i2c ports since the driving force is too weak. (about 30K ohm)
Modified sources:
1. gpio.c: Add 1.8V IO support for some GPIOs and I2C pins.
2. i2c.c: Remove internal pull-ups feature for i2c pins and move 1.8V
support to gpio.c.
3. register.h: Modified NPCX_LV_GPIO_CTL register & bits definitions.
4. npcx_evb\gpio.inc: Add examples of 1.8V IO.
5. npcx_evb_arm\gpio.inc: Add examples of 1.8V IO.
BUG=chrome-os-partner:34346
TEST=make buildall -j; test nuvoton IC specific drivers
BRANCH=none
Change-Id: I73a840ae321820212e50d609dab17576117a7d64
Signed-off-by: Mulin Chao <mlchao@nuvoton.com>
Reviewed-on: https://chromium-review.googlesource.com/330037
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'chip/npcx/gpio.c')
-rw-r--r-- | chip/npcx/gpio.c | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/chip/npcx/gpio.c b/chip/npcx/gpio.c index 1ebf11e26c..bd310b214f 100644 --- a/chip/npcx/gpio.c +++ b/chip/npcx/gpio.c @@ -308,6 +308,49 @@ const struct gpio_alt_map gpio_alt_table[] = { { NPCX_GPIO(B, 1), NPCX_ALT_INV(A, NO_KSO17_SL)},/* KSO17 */ }; +struct gpio_lvol_item { + struct npcx_gpio lvol_gpio[8]; +}; + +const struct gpio_lvol_item gpio_lvol_table[] = { + /* Low-Voltage GPIO Control 0 */ + { { NPCX_GPIO(B, 5), + NPCX_GPIO(B, 4), + NPCX_GPIO(B, 3), + NPCX_GPIO(B, 2), + NPCX_GPIO(9, 0), + NPCX_GPIO(8, 7), + NPCX_GPIO(0, 0), + NPCX_GPIO(3, 3), }, }, + /* Low-Voltage GPIO Control 1 */ + { { NPCX_GPIO(9, 2), + NPCX_GPIO(9, 1), + NPCX_GPIO(D, 1), + NPCX_GPIO(D, 0), + NPCX_GPIO(3, 6), + NPCX_GPIO(6, 4), + NPCX_GPIO(6, 5), + NPCX_GPIO_NONE , }, }, + /* Low-Voltage GPIO Control 2 */ + { { NPCX_GPIO(7, 4), + NPCX_GPIO(8, 4), + NPCX_GPIO(8, 5), + NPCX_GPIO(7, 3), + NPCX_GPIO(C, 1), + NPCX_GPIO(C, 7), + NPCX_GPIO(E, 7), + NPCX_GPIO(3, 4), }, }, + /* Low-Voltage GPIO Control 3 */ + { { NPCX_GPIO(C, 6), + NPCX_GPIO(3, 7), + NPCX_GPIO(4, 0), + NPCX_GPIO(7, 1), + NPCX_GPIO(8, 2), + NPCX_GPIO(7, 5), + NPCX_GPIO(8, 0), + NPCX_GPIO(C, 5), }, }, +}; + /*****************************************************************************/ /* Internal functions */ @@ -484,6 +527,32 @@ static void gpio_interrupt_type_sel(uint8_t port, uint8_t mask, uint32_t flags) /* No support analog mode */ } +/* Select low voltage detection level */ +void gpio_low_voltage_level_sel(uint8_t port, uint8_t mask, uint8_t low_voltage) +{ + int i, j; + + for (i = 0; i < ARRAY_SIZE(gpio_lvol_table); i++) { + const struct npcx_gpio *gpio = gpio_lvol_table[i].lvol_gpio; + + for (j = 0; j < ARRAY_SIZE(gpio_lvol_table[0].lvol_gpio); j++) + if (gpio_match(port, mask, gpio[j])) { + if (low_voltage) + /* Select vol-detect level for 1.8V */ + SET_BIT(NPCX_LV_GPIO_CTL(i), j); + else + /* Select vol-detect level for 3.3V */ + CLEAR_BIT(NPCX_LV_GPIO_CTL(i), j); + return; + } + + } +} +/* + * Make sure the bit depth of low voltage register. + */ +BUILD_ASSERT(ARRAY_SIZE(gpio_lvol_table[0].lvol_gpio) == 8); + /*****************************************************************************/ /* IC specific low-level driver */ @@ -540,6 +609,18 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags) NPCX_PPULL(port) &= ~mask; /* disable pull down/up */ } + /* 1.8V low voltage select */ + if (flags & GPIO_SEL_1P8V) { + /* + * Set IO type to open-drain & disable internal pulling + * before selecting low-voltage level + */ + NPCX_PTYPE(port) |= mask; + NPCX_PPULL(port) &= ~mask; + gpio_low_voltage_level_sel(port, mask, 1); + } else + gpio_low_voltage_level_sel(port, mask, 0); + /* Set up interrupt type */ if (flags & GPIO_INPUT) gpio_interrupt_type_sel(port, mask, flags); |