summaryrefslogtreecommitdiff
path: root/drivers/serial
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-07-28 10:54:54 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-07-28 10:54:54 +0200
commit48b3ed217f58487c583d59575d7dfe2aafbb738d (patch)
treeec14ed8d9eba5b09a27508aa1deda08c47c7cdda /drivers/serial
parent740f41d3cbefe2068247852220226c2c3b287249 (diff)
parentcff2f5f09ee8ab45b86eed7228bacbce6eca9f01 (diff)
downloadu-boot-imx-48b3ed217f58487c583d59575d7dfe2aafbb738d.zip
u-boot-imx-48b3ed217f58487c583d59575d7dfe2aafbb738d.tar.gz
u-boot-imx-48b3ed217f58487c583d59575d7dfe2aafbb738d.tar.bz2
Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/serial_sh.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h
index f5e9854..341997c 100644
--- a/drivers/serial/serial_sh.h
+++ b/drivers/serial/serial_sh.h
@@ -226,7 +226,8 @@ struct uart_port {
# define SCSPTR3 0xffc60020 /* 16 bit SCIF */
# define SCIF_ORER 0x0001 /* Overrun error bit */
# define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791)
+#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \
+ defined(CONFIG_R8A7794)
# define SCIF_ORER 0x0001
# define SCSCR_INIT(port) 0x32 /* TIE=0,RIE=0,TE=1,RE=1,REIE=0, */
#else