From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Feb 2023 18:09:40 +0000 (-0800)
Subject: Merge tag 'arm-fixes-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=982818426a0ffaf93b0621826ed39a84be3d7d62;p=linux.git

Merge tag 'arm-fixes-6.3-1' of git://git./linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "A few bugfixes already came up during the merge window. Samsung,
  ASpeed, Spear have minor DT changes, in case of Samsung this fixes a
  regression compared to earlier versions.

  Bartosz takes over as the primary maintainer for the TI DaVinci
  platform, and we get a few last minute defconfig changes"

* tag 'arm-fixes-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: dts: spear320-hmi: correct STMPE GPIO compatible
  ARM: dts: aspeed: p10bmc: Update battery node name
  arm64: defconfig: Add IOSCHED_BFQ to the default configs
  arm64: defconfig: Fix unintentional disablement of PCI on i.MX
  ARM: dts: exynos: correct TMU phandle in Odroid XU3 family
  ARM: dts: exynos: correct TMU phandle in Odroid HC1
  ARM: dts: exynos: correct TMU phandle in Odroid XU
  ARM: dts: exynos: correct TMU phandle in Exynos5250
  ARM: dts: exynos: correct TMU phandle in Exynos4210
  ARM: dts: exynos: correct TMU phandle in Exynos4
  MAINTAINERS: make me the maintainer of DaVinci platforms
---

982818426a0ffaf93b0621826ed39a84be3d7d62
diff --cc arch/arm64/configs/defconfig
index 7e0487bbdaa04,c3c04d89d2804..7790ee42c68a8
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -217,9 -232,8 +218,9 @@@ CONFIG_PCIE_ALTERA_MSI=
  CONFIG_PCI_HOST_THUNDER_PEM=y
  CONFIG_PCI_HOST_THUNDER_ECAM=y
  CONFIG_PCIE_ROCKCHIP_HOST=m
 +CONFIG_PCIE_MEDIATEK_GEN3=m
  CONFIG_PCIE_BRCMSTB=m
- CONFIG_PCI_IMX6=y
+ CONFIG_PCI_IMX6_HOST=y
  CONFIG_PCI_LAYERSCAPE=y
  CONFIG_PCI_HISI=y
  CONFIG_PCIE_QCOM=y