[PATCH v2 4/9] ARM: socfpga: clkmgr: bypass debug root clock

[Steffen Trumtrar]

Signed-off-by: Steffen Trumtrar <s.trumtrar at pengutronix.de>
---
 arch/arm/mach-socfpga/clock-manager.c              | 4 ++++
 arch/arm/mach-socfpga/include/mach/clock-manager.h | 1 +
 2 files changed, 5 insertions(+)

diff --git a/arch/arm/mach-socfpga/clock-manager.c b/arch/arm/mach-socfpga/clock-manager.c
index 4cffb49f7cea..5196f08b09af 100644
--- a/arch/arm/mach-socfpga/clock-manager.c
+++ b/arch/arm/mach-socfpga/clock-manager.c
@@ -290,4 +290,8 @@ void socfpga_cm_basic_init(const struct socfpga_cm_config *cfg)
 	writel(~0, cm + CLKMGR_MAINPLLGRP_EN_ADDRESS);
 	writel(~0, cm + CLKMGR_PERPLLGRP_EN_ADDRESS);
 	writel(~0, cm + CLKMGR_SDRPLLGRP_EN_ADDRESS);
+
+	val = readl(cm + CLKMGR_DBCTRL_ADDRESS);
+	val |= CLKMGR_DBCTRL_STAYOSC1_MASK;
+	writel(val, cm + CLKMGR_DBCTRL_ADDRESS);
 }
diff --git a/arch/arm/mach-socfpga/include/mach/clock-manager.h b/arch/arm/mach-socfpga/include/mach/clock-manager.h
index 649cf96ae846..45800de79a7a 100644
--- a/arch/arm/mach-socfpga/include/mach/clock-manager.h
+++ b/arch/arm/mach-socfpga/include/mach/clock-manager.h
@@ -102,6 +102,7 @@ void socfpga_cm_basic_init(const struct socfpga_cm_config *cfg);
 #define CLKMGR_ALTERAGRP_MPUCLK 0xe0
 #define CLKMGR_ALTERAGRP_MAINCLK 0xe4
 
+#define CLKMGR_DBCTRL_STAYOSC1_MASK 0x00000001
 #define CLKMGR_MAINPLLGRP_EN_S2FUSER0CLK_MASK 0x00000200
 #define CLKMGR_MAINPLLGRP_EN_DBGTIMERCLK_MASK 0x00000080
 #define CLKMGR_MAINPLLGRP_EN_DBGTRACECLK_MASK 0x00000040
-- 
2.1.4