Skip to content

Commit c356ab9

Browse files
committed
Merge tag 'v6.10-rockchip-defconfig64' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/defconfig
Enablement of rk3308 audio codec, panthor driver for Valhall GPUs and USBDP phy driver for rk3588. * tag 'v6.10-rockchip-defconfig64' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: defconfig: enable Rockchip Samsung USBDP PHY arm64: defconfig: support Mali CSF-based GPUs arm64: defconfig: enable Rockchip RK3308 internal audio codec driver Link: https://lore.kernel.org/r/8976550.lOV4Wx5bFT@phil Signed-off-by: Arnd Bergmann <[email protected]>
2 parents fec50db + 7cdf7ef commit c356ab9

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,7 @@ CONFIG_DRM_MESON=m
907907
CONFIG_DRM_PL111=m
908908
CONFIG_DRM_LIMA=m
909909
CONFIG_DRM_PANFROST=m
910+
CONFIG_DRM_PANTHOR=m
910911
CONFIG_DRM_TIDSS=m
911912
CONFIG_DRM_POWERVR=m
912913
CONFIG_FB=y
@@ -991,6 +992,7 @@ CONFIG_SND_SOC_GTM601=m
991992
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
992993
CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
993994
CONFIG_SND_SOC_PCM3168A_I2C=m
995+
CONFIG_SND_SOC_RK3308=m
994996
CONFIG_SND_SOC_RK817=m
995997
CONFIG_SND_SOC_RT5640=m
996998
CONFIG_SND_SOC_RT5659=m
@@ -1517,6 +1519,7 @@ CONFIG_PHY_ROCKCHIP_PCIE=m
15171519
CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
15181520
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
15191521
CONFIG_PHY_ROCKCHIP_TYPEC=y
1522+
CONFIG_PHY_ROCKCHIP_USBDP=m
15201523
CONFIG_PHY_SAMSUNG_UFS=y
15211524
CONFIG_PHY_UNIPHIER_USB2=y
15221525
CONFIG_PHY_UNIPHIER_USB3=y

0 commit comments

Comments
 (0)