summaryrefslogtreecommitdiffstats
path: root/include/configs/uniphier-common.h
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-10-23 22:26:10 +0900
committerSimon Glass <sjg@chromium.org>2014-10-23 21:43:09 -0600
commitd064cbffff37367b64b53f6e6942cbea67109237 (patch)
tree8a9099af4cd745003542a705bac3bd29196498fe /include/configs/uniphier-common.h
parentda333ae73cddf12e8f71a847e42a6571f9435d7c (diff)
downloadblackbird-obmc-uboot-d064cbffff37367b64b53f6e6942cbea67109237.tar.gz
blackbird-obmc-uboot-d064cbffff37367b64b53f6e6942cbea67109237.zip
dm: serial: use Driver Model for UniPhier serial driver
This commit converts UniPhier on-chip serial driver to driver model. Since UniPhier SoCs do not have Device Tree support, some board files should be added under arch/arm/cpu/armv7/uniphier/ph1-*/ directories. (Device Tree support for UniPhier platform is still under way.) Now the base address and master clock frequency are passed from platform data, so CONFIG_SYS_UNIPHIER_SERIAL_BASE* and CONFIG_SYS_UNIPHIER_UART_CLK should be removed. Tested on UniPhier PH1-LD4 ref board. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/configs/uniphier-common.h')
-rw-r--r--include/configs/uniphier-common.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/configs/uniphier-common.h b/include/configs/uniphier-common.h
index 18fe277cad..b18ae6dfae 100644
--- a/include/configs/uniphier-common.h
+++ b/include/configs/uniphier-common.h
@@ -33,18 +33,17 @@ are defined. Select only one of them."
# define CONFIG_SUPPORT_CARD_UART_BASE (CONFIG_SUPPORT_CARD_BASE + 0x00200000)
#endif
+#ifdef CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_COM1 CONFIG_SUPPORT_CARD_UART_BASE
#define CONFIG_SYS_NS16550_CLK 12288000
#define CONFIG_SYS_NS16550_REG_SIZE -2
+#endif
#define CONFIG_SMC911X_BASE CONFIG_SUPPORT_CARD_ETHER_BASE
#define CONFIG_SMC911X_32_BIT
-#define CONFIG_SYS_UNIPHIER_SERIAL_BASE0 0x54006800
-#define CONFIG_SYS_UNIPHIER_SERIAL_BASE1 0x54006900
-#define CONFIG_SYS_UNIPHIER_SERIAL_BASE2 0x54006a00
-#define CONFIG_SYS_UNIPHIER_SERIAL_BASE3 0x54006b00
+#define CONFIG_SYS_MALLOC_F_LEN 0x7000
/*-----------------------------------------------------------------------
* MMU and Cache Setting
OpenPOWER on IntegriCloud