From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Jun 2023 22:26:45 +0000 (-0700)
Subject: Merge tag 'soc-defconfig-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v6.5-rc1~139
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0873694a339821277d9f2cae7ef981a1283b44f5;p=thirdparty%2Flinux.git

Merge tag 'soc-defconfig-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "The arm64 defconfig file gets the usual updates to enable addition
  device drivers as well as the sparx5 and realtek SoC platforms.

  For arm32, there are only a couple of cleanup patches for imx, renesas
  and rockchips"

* tag 'soc-defconfig-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (23 commits)
  arm64: defconfig: Enable Rockchip I2S TDM and ES8316 drivers
  arm64: defconfig: update RK8XX MFD config
  ARM: multi_v7_defconfig: update MFD_RK808 name
  arm64: defconfig: Enable UBIFS
  arm64: defconfig: enable drivers for Verdin AM62
  arm64: defconfig: Build SM6115 display and GPU clock controller drivers
  arm64: defconfig: Build display clock controller driver for QCM2290
  arm64: defconfig: Build interconnect driver for QCM2290
  arm64: defconfig: Build Global Clock Controller driver for QCM2290
  arm64: defconfig: Build MSM power manager driver
  arm64: defconfig: Enable sc828x0xp lpasscc clock controller
  arm64: defconfig: Enable the TI SN65DSI83 driver
  arm64: defconfig: Enable Renesas MTU3a counter config
  arm64: defconfig: enable Mediatek PMIC key
  arm64: defconfig: enable MT6357 regulator
  ARM: imx_v6_v7_defconfig: Remove KERNEL_LZO config
  arm64: defconfig: Enable ipq6018 apss clock and PLL controller
  arm64: defconfig: Enable ARCH_SPARX5 and ARCH_REALTEK
  arm64: defconfig: enable FSA4480 driver as module
  ARM: shmobile: defconfig: Refresh for v6.4-rc1
  ...
---

0873694a339821277d9f2cae7ef981a1283b44f5
diff --cc arch/arm64/configs/defconfig
index 4968feb2812c2,32199b5795a7a..0777bcae9104b
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -52,9 -53,9 +53,10 @@@ CONFIG_ARCH_NXP=
  CONFIG_ARCH_LAYERSCAPE=y
  CONFIG_ARCH_MXC=y
  CONFIG_ARCH_S32=y
 +CONFIG_ARCH_MA35=y
  CONFIG_ARCH_NPCM=y
  CONFIG_ARCH_QCOM=y
+ CONFIG_ARCH_REALTEK=y
  CONFIG_ARCH_RENESAS=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_ARCH_SEATTLE=y