summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-socfpga
diff options
context:
space:
mode:
authorSteffen Trumtrar <s.trumtrar@pengutronix.de>2015-01-12 10:48:40 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-13 08:42:16 +0100
commit98f87fffc9644124fd0300f68b73d9857af30fc7 (patch)
tree693ff07cb464d0da6003d273bf58bef47abdd9f2 /arch/arm/mach-socfpga
parent243ef1835b7e0305f73cbf20c7988f0040704885 (diff)
downloadbarebox-98f87fffc9644124fd0300f68b73d9857af30fc7.tar.gz
barebox-98f87fffc9644124fd0300f68b73d9857af30fc7.tar.xz
ARM: socfpga: clkmgr: bypass debug root clock
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-socfpga')
-rw-r--r--arch/arm/mach-socfpga/clock-manager.c4
-rw-r--r--arch/arm/mach-socfpga/include/mach/clock-manager.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/clock-manager.c b/arch/arm/mach-socfpga/clock-manager.c
index 4cffb49f7c..5196f08b09 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 649cf96ae8..45800de79a 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