diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-08 22:04:32 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-08 22:04:32 -0500 |
| commit | 576a085c1d224b8a5a3ccf5c4114d07a1f695f20 (patch) | |
| tree | 4388e3756904bbf61634d5954e6b477e02264f0e /arch | |
| parent | 21342d4aed6c77a4aa7a5b2579b3c23e21aea31a (diff) | |
| parent | a45526aaa0ae241f3e1df996fed988a014eeffe8 (diff) | |
| download | u-boot-imx-576a085c1d224b8a5a3ccf5c4114d07a1f695f20.zip u-boot-imx-576a085c1d224b8a5a3ccf5c4114d07a1f695f20.tar.gz u-boot-imx-576a085c1d224b8a5a3ccf5c4114d07a1f695f20.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-socfpga/clock_manager.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/clock_manager.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/wrap_pll_config.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c index aa71636..29e18f8 100644 --- a/arch/arm/mach-socfpga/clock_manager.c +++ b/arch/arm/mach-socfpga/clock_manager.c @@ -167,6 +167,9 @@ void cm_basic_init(const struct cm_config * const cfg) /* main mpu */ writel(cfg->mpuclk, &clock_manager_base->main_pll.mpuclk); + /* altera group mpuclk */ + writel(cfg->altera_grp_mpuclk, &clock_manager_base->altera.mpuclk); + /* main main clock */ writel(cfg->mainclk, &clock_manager_base->main_pll.mainclk); diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager.h b/arch/arm/mach-socfpga/include/mach/clock_manager.h index 2675951..803c926 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager.h @@ -55,6 +55,9 @@ struct cm_config { uint32_t ddr2xdqsclk; uint32_t ddrdqclk; uint32_t s2fuser2clk; + + /* altera group */ + uint32_t altera_grp_mpuclk; }; void cm_basic_init(const struct cm_config * const cfg); diff --git a/arch/arm/mach-socfpga/wrap_pll_config.c b/arch/arm/mach-socfpga/wrap_pll_config.c index 8a0a0e6..72b5f92 100644 --- a/arch/arm/mach-socfpga/wrap_pll_config.c +++ b/arch/arm/mach-socfpga/wrap_pll_config.c @@ -116,6 +116,9 @@ static const struct cm_config cm_default_cfg = { CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) | (CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT << CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET), + + /* altera group */ + CONFIG_HPS_ALTERAGRP_MPUCLK, }; const struct cm_config * const cm_get_default_config(void) |