From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 14 Apr 2023 11:56:59 +0000 (+0200)
Subject: Merge tag 'ti-k3-config-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.4-rc1~169^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d04a06e984b69ca7875a5bf2cb65ee73f24c8886;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'ti-k3-config-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/defconfig

arm64: TI K3 defconfig updates for v6.4

* Enable drivers for BeaglePlay and Audio drivers for AM62-SK

For this tag, Bloat-o-meter reports (17.0.0 + v6.3-rc1 base):
add/remove: 61/2 grow/shrink: 3/1 up/down: 17852/-208 (17644)
[...]
Total: Before=27746954, After=27764598, chg +0.06%

* tag 'ti-k3-config-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  arm64: defconfig: Enable audio drivers for AM62-SK
  arm64: defconfig: Enable drivers for BeaglePlay

Link: https://lore.kernel.org/r/20230410140517.ovxnagc4xh3gqath@canary
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

d04a06e984b69ca7875a5bf2cb65ee73f24c8886
diff --cc arch/arm64/configs/defconfig
index 38e62c68f449d,f1fe5703cc4fe..d50281fd7bcd0
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -887,8 -877,8 +893,9 @@@ CONFIG_SND_SOC_TEGRA210_AMX=
  CONFIG_SND_SOC_TEGRA210_ADX=m
  CONFIG_SND_SOC_TEGRA210_MIXER=m
  CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD=m
+ CONFIG_SND_SOC_DAVINCI_MCASP=m
  CONFIG_SND_SOC_AK4613=m
 +CONFIG_SND_SOC_DA7213=m
  CONFIG_SND_SOC_ES7134=m
  CONFIG_SND_SOC_ES7241=m
  CONFIG_SND_SOC_GTM601=m