diff options
| author | Olof Johansson <olof@lixom.net> | 2020-10-03 13:16:48 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-10-03 13:16:50 -0700 |
| commit | accdab6d9e8f715068d91ee0ca0424a6999f0d19 (patch) | |
| tree | cfe46a8d0ab4846f095b5329255d7b72f36f1231 /arch/arm/mach-imx/cpu-imx31.c | |
| parent | a4f07008bf45c43e3e02a2e5116d0cbe65fe4b7c (diff) | |
| parent | fb956b3e20f0bbeac8c17a7a08e63528a23bd54c (diff) | |
Merge tag 'imx-soc-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc
i.MX SoC update for 5.10:
- A series from Fabio Estevam to remove legacy non-DT i.MX platforms
support and related board files. This is a natural move, as the
platforms had been converted to DT for years, and we have not seen
any users around these legacy non-DT support for a while.
- Enable cpufreq support for i.MX7ULP platform.
* tag 'imx-soc-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (26 commits)
clk: imx: imx35: Remove mx35_clocks_init()
clk: imx: imx31: Remove mx31_clocks_init()
clk: imx: imx27: Remove mx27_clocks_init()
ARM: imx: Remove unused definitions
ARM: imx35: Retrieve the IIM base address from devicetree
ARM: imx3: Retrieve the AVIC base address from devicetree
ARM: imx3: Retrieve the CCM base address from devicetree
ARM: imx31: Retrieve the IIM base address from devicetree
ARM: imx27: Retrieve the CCM base address from devicetree
ARM: imx27: Retrieve the SYSCTRL base address from devicetree
ARM: imx: Remove remnant board file support pieces
ARM: imx: Remove imx device directory
ARM: imx: Remove iomux-v3 board code
ARM: imx3: Remove imx3 soc_init()
ARM: imx31: Remove remaining i.MX31 board code
ARM: imx27: Retrieve AVIC base address from devicetree
ARM: imx27: Get rid of mm-imx27.c
ARM: imx27: Remove iomux-v1 board code
ARM: imx27: Remove imx27_soc_init()
ARM: imx7ulp: enable cpufreq
...
Link: https://lore.kernel.org/r/20200923073009.23678-2-shawnguo@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/cpu-imx31.c')
| -rw-r--r-- | arch/arm/mach-imx/cpu-imx31.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/cpu-imx31.c b/arch/arm/mach-imx/cpu-imx31.c index 3ee684b71006..b9c24b851d1a 100644 --- a/arch/arm/mach-imx/cpu-imx31.c +++ b/arch/arm/mach-imx/cpu-imx31.c @@ -6,6 +6,7 @@ */ #include <linux/module.h> +#include <linux/of_address.h> #include <linux/io.h> #include "common.h" @@ -32,10 +33,16 @@ static struct { static int mx31_read_cpu_rev(void) { + void __iomem *iim_base; + struct device_node *np; u32 i, srev; + np = of_find_compatible_node(NULL, NULL, "fsl,imx31-iim"); + iim_base = of_iomap(np, 0); + BUG_ON(!iim_base); + /* read SREV register from IIM module */ - srev = imx_readl(MX31_IO_ADDRESS(MX31_IIM_BASE_ADDR + MXC_IIMSREV)); + srev = imx_readl(iim_base + MXC_IIMSREV); srev &= 0xff; for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++) |