From a2893baa47ce17ef97a8bff6b6af9223785db74d Mon Sep 17 00:00:00 2001 From: Philipp Tomsich Date: Fri, 29 Mar 2019 09:21:13 +0100 Subject: [PATCH] Revert "rockchip: Drop call to rockchip_dnl_mode_check() for now" Due to a final resolution not coming up in time for 2019.04 and following the consensus on the discussion, we'll keep this around for 2019.04 after all. This reverts commit 0d968ceb1ff63b0d220a571f438f0d5fe6350e88. --- arch/arm/mach-rockchip/boot_mode.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c index d7997d71e3..f32b3c4ce5 100644 --- a/arch/arm/mach-rockchip/boot_mode.c +++ b/arch/arm/mach-rockchip/boot_mode.c @@ -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); -- 2.39.5