diff options
| author | Shohei Sakamoto <sakamotos@casio.co.jp> | 2015-12-21 17:03:08 +0900 |
|---|---|---|
| committer | Shohei Sakamoto <sakamotos@casio.co.jp> | 2015-12-28 19:42:10 +0900 |
| commit | ecb1ee845b424ee91e26b49ca97a8543d66213db (patch) | |
| tree | 2231e2a14368a10029eb39630b93fd21768e518a | |
| parent | 0fdd975aee4340a59b5de2726b32719ce9bb0bf7 (diff) | |
| download | koi-uboot-ecb1ee845b424ee91e26b49ca97a8543d66213db.tar.gz | |
Fix confliction of i2c3 SCL/SDA
Change-Id: I89157f0ab1fcee2dbe8fd5fc058de749d0200224
Signed-off-by: Shohei Sakamoto <sakamotos@casio.co.jp>
| -rw-r--r-- | arch/arm/cpu/armv7/exynos/pinmux.c | 3 | ||||
| -rw-r--r-- | board/samsung/koi/koi.c | 22 |
2 files changed, 2 insertions, 23 deletions
diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c index bb4fcbcf2..d404cfb27 100644 --- a/arch/arm/cpu/armv7/exynos/pinmux.c +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -48,7 +48,8 @@ static void exynos4_uart_config(int peripheral) case PERIPH_ID_UART2: bank = &gpio1->a1; start = 0; - count = 4; + count = 2; + // Pin CTS/RTS is used for Touch panel I2C SDA/SCL, so don't configure here pull = GPIO_PULL_UP; break; case PERIPH_ID_UART3: diff --git a/board/samsung/koi/koi.c b/board/samsung/koi/koi.c index 316a8c42a..c1a1c0aab 100644 --- a/board/samsung/koi/koi.c +++ b/board/samsung/koi/koi.c @@ -255,34 +255,12 @@ static int board_uart_init(void) { int err; -#if 0 //PET yasui deleted - err = exynos_pinmux_config(PERIPH_ID_UART0, PINMUX_FLAG_NONE); -#else - err = 0; -#endif - if (err) { - debug("UART0 not configured\n"); - return err; - } - - err = exynos_pinmux_config(PERIPH_ID_UART1, PINMUX_FLAG_NONE); - if (err) { - debug("UART1 not configured\n"); - return err; - } - err = exynos_pinmux_config(PERIPH_ID_UART2, PINMUX_FLAG_NONE); if (err) { debug("UART2 not configured\n"); return err; } - err = exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE); - if (err) { - debug("UART3 not configured\n"); - return err; - } - return 0; } |