From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 13 Jul 2022 20:10:38 +0000 (+0200)
Subject: Merge tag 'imx-soc-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v6.1-rc5~786^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ea0878417332e7ea9012c15785d7a9e78ff27da;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'imx-soc-5.20' of git://git./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>
---

4ea0878417332e7ea9012c15785d7a9e78ff27da