diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-15 08:09:51 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-15 08:09:52 -0700 |
| commit | 57d459e2192eae59adfb7eb84888020bc52318d7 (patch) | |
| tree | 469fb5d35dbe82b01e878b06c97e4e128b0f8c14 /include | |
| parent | 2f80e8b45cda3d3bbeb2563525f676f8b1bbf0f0 (diff) | |
| parent | e34645f45805d8308866de7b69f117f554605bb6 (diff) | |
| download | linux-stable-57d459e2192eae59adfb7eb84888020bc52318d7.tar.gz linux-stable-57d459e2192eae59adfb7eb84888020bc52318d7.tar.bz2 linux-stable-57d459e2192eae59adfb7eb84888020bc52318d7.zip | |
Merge tag 'imx-soc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc
i.MX SoC changes for 5.14:
- Add SMP support for i.MX7D, as there are i.MX7D devices running in
field with U-Boot that doesn't support PSCI.
- Fix imx5_cpu_suspend_info reference in i.MX5 PM code comments.
- Add SoC ID initialization for i.MX50.
- Drop unnecessary of_platform_default_populate() call from i.MX6Q
.init_machine hook.
- A series from Oleksij Rempel to remove most of the i.MX6/7 board
specific PHY fixups.
* tag 'imx-soc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: add smp support for imx7d
ARM: imx6q: drop of_platform_default_populate() from init_machine
ARM: imx7d: remove Atheros AR8031 PHY fixup
ARM: imx6sx: remove Atheros AR8031 PHY fixup
ARM: imx6q: remove Atheros AR8035 SmartEEE fixup
ARM: imx6q: remove clk-out fixup for the Atheros AR8031 and AR8035 PHYs
ARM: imx6q: remove BMCR_PDOWN handler in ar8035_phy_fixup()
ARM: imx6q: remove part of ar8031_phy_fixup()
ARM: imx6q: remove PHY fixup for KSZ9031
ARM: imx: Initialize SoC ID on i.MX50
ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info
Link: https://lore.kernel.org/r/20210613082544.16067-2-shawnguo@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/soc/imx/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/soc/imx/cpu.h b/include/soc/imx/cpu.h index 42d6aeb951fa..0bf610acafd0 100644 --- a/include/soc/imx/cpu.h +++ b/include/soc/imx/cpu.h @@ -9,6 +9,7 @@ #define MXC_CPU_MX27 27 #define MXC_CPU_MX31 31 #define MXC_CPU_MX35 35 +#define MXC_CPU_MX50 50 #define MXC_CPU_MX51 51 #define MXC_CPU_MX53 53 #define MXC_CPU_IMX6SL 0x60 |