diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2012-07-30 14:32:48 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:51:45 +0200 |
commit | 10bfdcc1755b5a16b69754e41c4bbc2ea9a10609 (patch) | |
tree | 7e402f8dee9e9861414b7a6c4d7794a0c0672f43 /drivers | |
parent | eebc8e41a0875b9da70e26f72c574bb752d8d506 (diff) | |
download | barebox-10bfdcc1755b5a16b69754e41c4bbc2ea9a10609.tar.gz barebox-10bfdcc1755b5a16b69754e41c4bbc2ea9a10609.tar.xz |
serial Samsung: add the S3C64xx requirements
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/serial/Kconfig | 2 | ||||
-rw-r--r-- | drivers/serial/serial_s3c.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 2b9a9b941a..7eb96edf28 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -84,7 +84,7 @@ config DRIVER_SERIAL_S3C_IMPROVED config DRIVER_SERIAL_S3C bool "Samsung S3C serial driver" depends on ARCH_SAMSUNG - select DRIVER_SERIAL_S3C_IMPROVED if (CPU_S5PC110 || CPU_S5PV210) + select DRIVER_SERIAL_S3C_IMPROVED if (CPU_S5PC110 || CPU_S5PV210 || CPU_S3C6410) default y help Say Y here if you want to use the CONS on a Samsung S3C CPU diff --git a/drivers/serial/serial_s3c.c b/drivers/serial/serial_s3c.c index 0a7b137d19..f8192813dd 100644 --- a/drivers/serial/serial_s3c.c +++ b/drivers/serial/serial_s3c.c @@ -58,6 +58,9 @@ static unsigned s3c_select_arch_input_clock(void) /* S3C24xx: 0=2=PCLK, 1=UEXTCLK, 3=FCLK/n */ if (IS_ENABLED(CONFIG_ARCH_S3C24xx)) return 0; /* use the internal PCLK */ + /* S3C64xx: 0=2=PCLK, 1=UCLK0, 3=UCLK1 */ + if (IS_ENABLED(CONFIG_ARCH_S3C64xx)) + return 3; /* use the internal UCLK1 */ /* S5PCxx: 0=PCLK, 1=SCLK_UART */ if (IS_ENABLED(CONFIG_ARCH_S5PCxx)) return 0; /* use the internal PCLK */ |