github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i.MX SoC update for 5.20:

Browse Source 
- Update the mx25_read_cpu_rev() function to support silicon revision 1.2
   for i.MX25 SoC.
 - A minor indentation fix in Kconfig file.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmLJJoMUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM6iCAgAgVxW0FQEpi1PJf9yc+mMD5nXdWcY
 2xgnaptWeZE0cPF5cFvAATALQl2BGQ36D74m4TcF3MJyOv5BFhKP1WQt2dQRCbiF
 ey+ZkD4Rquy9fFztzPjZglAWkAlPpzW1nTYZWwIiirYel+2iZ/LILb8crd0ntq3/
 6n8hf7sdAzgtarpluJ6fykTUR2U3OmC6XLFjBLXcksKggmLA96PKtgMI6iqlgW9F
 bpVWx8Do7C9vGN5tH/16upM53BrWlmbK/ZXehFz6TeiU6DkSUvgkgzub+GcMtWGs
 lJJCwSmFez6YMQUYVdpeXe3hTg4nNQAZNSORIBzWGEJQ2pbqv4wzTYQewg==
 =qBof
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmLPJr4ACgkQmmx57+YA
 GNk/6A//ckksWYID7jWm8JPUTtZWp1F23RWo0hdH1ppGnshzaj8Qsg8dkaUHsVLk
 YH04wvnsdcZCNlEAQ8ZEaqos8L5gUt1kH3iIfik430AphEi6/cM480nLftLfU7v+
 jtYLR3qrLdO4qUbXvBI7dGPtzg48n5Aq5H2J5jDr9pPNcRKr860ZqbCW1FcFrr8W
 Bh7/gYe+VDZud6pzO+b6xzouWURYyAT1r+tE6vT78nTXi93xx/kF3ASGrfv0sfxr
 YTE0zwAkOtjBYA0FU6w8/WgS9EMxtPwkLrPHsoDcx/6wMhWda0hBHKMIp9p5VpBW
 CBATEySiqspz3M5Iy09gW2Ncas+nkIw3WAmD0Yujx3SdxiCsyUq9zSIw1UDQkNVN
 4JavB0ZYh+0Nl6f5o8hoposHLTSYO2sQMWiEw0193ghv/csvXewVgdlXrSkaCm3M
 H8mVj3WxA4lKw7/0xWQfJLft0VoGmjQNGccxGR82j25TcrlZMftFoBVHZh0bwvpA
 fpd6SdAPhZtSTinAL4hqJTm+8rOgNTlIEjMZb/D6YquXscxIuNRKvKs1t8eJR07I
 7VoZIEUQzxW1PZQvg3RqSNKJXJcLTyKiS2Ykjrhrb0pqUp4by/9UGViluMytHZFM
 cDYlSQ/LWC0lb0D9LOn7eMi7YX36zBAbJh1JvF/P6Y5g4tCghNQ=
 =5az/
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc

i.MX SoC update for 5.20:

- Update the mx25_read_cpu_rev() function to support silicon revision 1.2
  for i.MX25 SoC.
- A minor indentation fix in Kconfig file.

* tag 'imx-soc-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx25: support silicon revision 1.2
  ARM: imx: Kconfig: Fix indentation

Link: https://lore.kernel.org/r/20220709082951.15123-2-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-07-13 22:10:38 +02:00
commit 4ea0878417
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-imx/Kconfig
View File

@ -96,7 +96,7 @@ config SOC_IMX5
select HAVE_IMX_SRC
select MXC_TZIC
config SOC_IMX50
config SOC_IMX50
bool "i.MX50 support"
select PINCTRL_IMX50
select SOC_IMX5
@ -111,7 +111,7 @@ config SOC_IMX51
help
This enables support for Freescale i.MX51 processor
config SOC_IMX53
config SOC_IMX53
bool "i.MX53 support"
select PINCTRL_IMX53
select SOC_IMX5
@ -216,7 +216,7 @@ config SOC_IMX7D
select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M
select ARM_ERRATA_814220 if ARCH_MULTI_V7
help
This enables support for Freescale i.MX7 Dual processor.
This enables support for Freescale i.MX7 Dual processor.
config SOC_IMX7ULP
bool "i.MX7ULP support"

2
arch/arm/mach-imx/cpu-imx25.c
View File

@ -32,6 +32,8 @@ static int mx25_read_cpu_rev(void)
return IMX_CHIP_REVISION_1_0;
case 0x01:
return IMX_CHIP_REVISION_1_1;
case 0x02:
return IMX_CHIP_REVISION_1_2;
default:
return IMX_CHIP_REVISION_UNKNOWN;
}