Merge tag 'rockchip-for-v2019.07-rc5-2' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-rockchip / boot_mode.c

diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index d7997d71e3001d10ae45188d567e895d260e404a..08f80bd91aae0bb39d6588acea312bc9f3349f6a 100644 (file)
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -6,7 +6,7 @@
 #include <common.h>
 #include <adc.h>
 #include <asm/io.h>
-#include <asm/arch/boot_mode.h>
+#include <asm/arch-rockchip/boot_mode.h>
 
 #if (CONFIG_ROCKCHIP_BOOT_MODE_REG == 0)
 
@@ -61,13 +61,7 @@ int setup_boot_mode(void)
        void *reg = (void *)CONFIG_ROCKCHIP_BOOT_MODE_REG;
        int boot_mode = readl(reg);
 
-       /*
-        * This should be handled using a driver-tree property and a suitable
-        * driver which can read the appropriate settings. As it is, this
-        * breaks chromebook_minnie.\
-        *
-        * rockchip_dnl_mode_check();
-        */
+       rockchip_dnl_mode_check();
 
        boot_mode = readl(reg);
        debug("%s: boot mode 0x%08x\n", __func__, boot_mode);