diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-18 15:17:33 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-18 15:17:33 +0200 |
| commit | 843b84fd822ffdd9b4b058b0f2bcd8faf5a850b9 (patch) | |
| tree | dd02d08a2833641aae6120c2883fa1a727e4fa69 /arch/arm/mach-imx/anatop.c | |
| parent | bea227e90a607d5df50f1c0aa929b855a54ed664 (diff) | |
| parent | dc4ba17dfdb745646ef7688aa1ef4782a475299d (diff) | |
Merge remote-tracking branch 'remotes/codeaurora/imx_4.14.98_2.3.0' into toradex_4.14-2.3.x-imx
Diffstat (limited to 'arch/arm/mach-imx/anatop.c')
| -rw-r--r-- | arch/arm/mach-imx/anatop.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c index 7716fd5fe58a..6ee51d79d83a 100644 --- a/arch/arm/mach-imx/anatop.c +++ b/arch/arm/mach-imx/anatop.c @@ -235,6 +235,20 @@ void __init imx_init_revision_from_anatop(void) digprog &= ~(0xff << 16); digprog |= (MXC_CPU_IMX6ULZ << 16); } + + /* dummy ID for i.MX6ULZ Lite */ + np = of_find_compatible_node(NULL, NULL, "fsl,imx6ull-ocotp"); + if (np) { + src_base = of_iomap(np, 0); + WARN_ON(!src_base); + sbmr2 = readl_relaxed(src_base + 0x460); + iounmap(src_base); + } + if (sbmr2 & BIT(2)) { + digprog &= ~(0xff << 16); + digprog |= (MXC_CPU_IMX6ULZL << 16); + } + } /* |