diff options
author | Tom Rini <trini@konsulko.com> | 2019-04-30 23:21:27 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-05-01 07:25:51 -0400 |
commit | b4ee6daad7a2604ca9466b2ba48de86cc27d381f (patch) | |
tree | f28b8d6bfeface9e9f188ffc37322c89e9d1fe77 /arch/arm/mach-imx/imx8m/soc.c | |
parent | a69120a0d7c8d4044cdaceea9eb03913ba4e49c7 (diff) | |
parent | 0d3912fcd41dc2a85891f78e8fc255a379323619 (diff) |
Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx
Porting to DM and i.MX8
------------------------
- warp7 to DM
- kp_imx53 to DM
- Warnings in DT
- MX8QM support
- colibri-imx6ull to DM
- imx7d-pico to DM
- ocotp for MX8
Diffstat (limited to 'arch/arm/mach-imx/imx8m/soc.c')
-rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 11251c5f9a..7ec39b3e47 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -169,6 +169,7 @@ static void imx_set_wdog_powerdown(bool enable) int arch_cpu_init(void) { + struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; /* * Init timer at very early state, because sscg pll setting * will use it @@ -180,6 +181,12 @@ int arch_cpu_init(void) imx_set_wdog_powerdown(false); } + if (is_imx8mq()) { + clock_enable(CCGR_OCOTP, 1); + if (readl(&ocotp->ctrl) & 0x200) + writel(0x200, &ocotp->ctrl_clr); + } + return 0; } |