diff options
| author | Arnd Bergmann <[email protected]> | 2024-04-29 21:07:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2024-04-29 21:07:10 +0200 |
| commit | c356ab9b8f6ef7e2626d8897b70b65caa4ef30a1 (patch) | |
| tree | 646e750a4007f17518f4d2f5e717ff218ea078d5 | |
| parent | fec50db7033ea478773b159e0e2efb135270e3b7 (diff) | |
| parent | 7cdf7efefc02189cf9a228d4c5c4253d273e9b1a (diff) | |
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]>
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 2c30d617e180..c475028be467 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -907,6 +907,7 @@ CONFIG_DRM_MESON=m CONFIG_DRM_PL111=m CONFIG_DRM_LIMA=m CONFIG_DRM_PANFROST=m +CONFIG_DRM_PANTHOR=m CONFIG_DRM_TIDSS=m CONFIG_DRM_POWERVR=m CONFIG_FB=y @@ -991,6 +992,7 @@ CONFIG_SND_SOC_GTM601=m CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_RK3308=m CONFIG_SND_SOC_RK817=m CONFIG_SND_SOC_RT5640=m CONFIG_SND_SOC_RT5659=m @@ -1517,6 +1519,7 @@ CONFIG_PHY_ROCKCHIP_PCIE=m CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y CONFIG_PHY_ROCKCHIP_TYPEC=y +CONFIG_PHY_ROCKCHIP_USBDP=m CONFIG_PHY_SAMSUNG_UFS=y CONFIG_PHY_UNIPHIER_USB2=y CONFIG_PHY_UNIPHIER_USB3=y |