From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 22 Aug 2023 01:20:25 +0000 (-0400)
Subject: Merge tag 'v6.6-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.6.7~2049^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da6212d0ae2797b17abfbc36e191439477d27fdc;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'v6.6-rockchip-defconfig64-1' of git://git./linux/kernel/git/mmind/linux-rockchip into soc/defconfig

Enable some options needed for Rockchip boards in the main defconfig.

* tag 'v6.6-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: defconfig: Enable drivers for the Odroid-M1 board
  arm64: defconfig: Enable GPIO_SYSCON
  arm64: defconfig: Enable Rockchip OTP memory driver
  arm64: defconfig: Enable PHY_ROCKCHIP_NANENG_COMBO_PHY

Link: https://lore.kernel.org/r/5353918.Isy0gbHreE@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

da6212d0ae2797b17abfbc36e191439477d27fdc
diff --cc arch/arm64/configs/defconfig
index bc5d418,847a8e7..5e49b42
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -539,9 -536,9 +542,10 @@@ CONFIG_SPI_OMAP24XX=
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
  CONFIG_SPI_ROCKCHIP=y
+ CONFIG_SPI_ROCKCHIP_SFC=m
  CONFIG_SPI_RPCIF=m
  CONFIG_SPI_RSPI=m
 +CONFIG_SPI_RZV2M_CSI=m
  CONFIG_SPI_QCOM_QSPI=m
  CONFIG_SPI_QUP=y
  CONFIG_SPI_QCOM_GENI=m
@@@ -937,8 -933,8 +946,9 @@@ CONFIG_SND_SOC_GTM601=
  CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
  CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
  CONFIG_SND_SOC_PCM3168A_I2C=m
+ CONFIG_SND_SOC_RK817=m
  CONFIG_SND_SOC_RT5640=m
 +CONFIG_SND_SOC_J721E_EVM=m
  CONFIG_SND_SOC_RT5659=m
  CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
  CONFIG_SND_SOC_SIMPLE_MUX=m