rk3399: disable the clock multiplier support when SoC init
authorKever Yang <kever.yang@rock-chips.com>
Fri, 7 Oct 2016 07:56:16 +0000 (15:56 +0800)
committerSimon Glass <sjg@chromium.org>
Sun, 30 Oct 2016 19:29:06 +0000 (13:29 -0600)
The Clock Multiplier in rk3399 EMMC programmable clock generator
is broken, we can remove its support from SoC GRF register.

Without this patch, rk3399 emmc driver is not work after below patch
applied:
6dffdbc mmc: sdhci: Add the programmable clock mode support

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
arch/arm/mach-rockchip/rk3399/rk3399.c

index b9d7629407809f75967841ba9522c8e353981fd6..8bb950ebd1145c8da3a63f3303b8db662c19e180 100644 (file)
@@ -6,6 +6,10 @@
 
 #include <common.h>
 #include <asm/armv8/mmu.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+
+#define GRF_EMMCCORE_CON11 0xff77f02c
 
 static struct mm_region rk3399_mem_map[] = {
        {
@@ -28,3 +32,13 @@ static struct mm_region rk3399_mem_map[] = {
 };
 
 struct mm_region *mem_map = rk3399_mem_map;
+
+int arch_cpu_init(void)
+{
+       /* We do some SoC one time setting here. */
+
+       /* Emmc clock generator: disable the clock multipilier */
+       rk_clrreg(GRF_EMMCCORE_CON11, 0x0ff);
+
+       return 0;
+}