From cd593ed6999970cc705571332f0f3be7e40d1a96 Mon Sep 17 00:00:00 2001 From: Peter Griffin Date: Wed, 20 Apr 2016 17:13:59 +0100 Subject: ARM: hisilicon: hikey: Enable OF_CONTROL for hikey board. Currently only the serial pl01x driver is using DT, and the other drivers still use platform data but as more DT lands in the upstream kernel the aim is to migrate the other drivers over to DT as well to have a fully DT configured hikey u-boot. Signed-off-by: Peter Griffin Reviewed-by: Tom Rini --- board/hisilicon/hikey/hikey.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'board') diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 3b484a96e9..3f0a0cc0da 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -71,6 +71,8 @@ U_BOOT_DEVICES(hi6220_gpios) = { DECLARE_GLOBAL_DATA_PTR; +#if !CONFIG_IS_ENABLED(OF_CONTROL) + static const struct pl01x_serial_platdata serial_platdata = { #if CONFIG_CONS_INDEX == 1 .base = HI6220_UART0_BASE, @@ -87,6 +89,7 @@ U_BOOT_DEVICE(hikey_seriala) = { .name = "serial_pl01x", .platdata = &serial_platdata, }; +#endif static struct mm_region hikey_mem_map[] = { { -- cgit v1.2.1