[GIT,PULL,2/6] i.MX SoC changes for 5.6
mbox series

Message ID 20200113034006.17430-2-shawnguo@kernel.org
State New
Headers show
Series
  • [GIT,PULL,1/6] i.MX driver changes for 5.6
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-soc-5.6

Message

Shawn Guo Jan. 13, 2020, 3:40 a.m. UTC
Hi,

To resolve a conflict on arch/arm/mach-imx/cpu.c, this pull request is
based on tag imx-fixes-5.5, which has been merged.  Please consider to
pull, thanks!

Shawn


The following changes since commit 7947e3238b64c00c396e6f5738f94c4d653bc6a2:

  ARM: imx: Fix boot crash if ocotp is not found (2019-12-12 10:44:28 +0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-soc-5.6

for you to fetch changes up to c74067a0f776c1d695a713a4388c3b6a094ee40a:

  ARM: imx: only select ARM_ERRATA_814220 for ARMv7-A (2020-01-09 18:48:35 +0800)

----------------------------------------------------------------
i.MX SoC changes for 5.6:

 - Add support for reading serial number from OCOTP on i.MX7ULP.
 - A patch from Anson to enable ARM_ERRATA_814220 for i.MX6UL & i.MX7D,
   and a fixup patch from Arnd to select the option only for ARMv7-A.

----------------------------------------------------------------
Anson Huang (2):
      ARM: imx: Add i.MX7ULP SoC serial number support
      ARM: imx: Enable ARM_ERRATA_814220 for i.MX6UL and i.MX7D

Arnd Bergmann (1):
      ARM: imx: only select ARM_ERRATA_814220 for ARMv7-A

 arch/arm/mach-imx/Kconfig |  2 ++
 arch/arm/mach-imx/cpu.c   | 30 +++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)