Merge tag 'v6.9-rockchip-config64-1' of git://git.kernel.org/pub/scm/linux/kernel...

Enablement of the hdmi phy-driver used on rk3588.

* tag 'v6.9-rockchip-config64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: defconfig: Enable Rockchip HDMI/eDP Combo PHY

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

diff --combined arch/arm64/configs/defconfig
index 4ff823dc50c90d34a44cc0f6b982883be38ac9a0,134dce8606413042485afd2fada54d560b7ebcd5..3420ea980aa056835204b69996b966750147ab38
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -432,7 -432,6 +432,7 @@@ CONFIG_MOUSE_ELAN_I2C=
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=m
  CONFIG_TOUCHSCREEN_GOODIX=m
 +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI=m
  CONFIG_TOUCHSCREEN_ELAN=m
  CONFIG_TOUCHSCREEN_EDT_FT5X06=m
  CONFIG_INPUT_MISC=y
@@@ -621,7 -620,6 +621,7 @@@ CONFIG_PINCTRL_SM8350_LPASS_LPI=
  CONFIG_PINCTRL_SM8450_LPASS_LPI=m
  CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m
  CONFIG_PINCTRL_SM8550_LPASS_LPI=m
 +CONFIG_PINCTRL_SM8650_LPASS_LPI=m
  CONFIG_GPIO_ALTERA=m
  CONFIG_GPIO_DAVINCI=y
  CONFIG_GPIO_DWAPB=y
@@@ -634,7 -632,6 +634,7 @@@ CONFIG_GPIO_SYSCON=
  CONFIG_GPIO_UNIPHIER=y
  CONFIG_GPIO_VISCONTI=y
  CONFIG_GPIO_WCD934X=m
 +CONFIG_GPIO_VF610=y
  CONFIG_GPIO_XGENE=y
  CONFIG_GPIO_XGENE_SB=y
  CONFIG_GPIO_MAX732X=y
@@@ -755,7 -752,6 +755,7 @@@ CONFIG_REGULATOR_HI6421V530=
  CONFIG_REGULATOR_HI655X=y
  CONFIG_REGULATOR_MAX77620=y
  CONFIG_REGULATOR_MAX8973=y
 +CONFIG_REGULATOR_MAX20411=m
  CONFIG_REGULATOR_MP8859=y
  CONFIG_REGULATOR_MT6315=m
  CONFIG_REGULATOR_MT6357=y
@@@ -796,16 -792,13 +796,16 @@@ CONFIG_USB_VIDEO_CLASS=
  CONFIG_V4L_PLATFORM_DRIVERS=y
  CONFIG_SDR_PLATFORM_DRIVERS=y
  CONFIG_V4L_MEM2MEM_DRIVERS=y
 +CONFIG_VIDEO_AMPHION_VPU=m
  CONFIG_VIDEO_CADENCE_CSI2RX=m
  CONFIG_VIDEO_MEDIATEK_JPEG=m
  CONFIG_VIDEO_MEDIATEK_VCODEC=m
 +CONFIG_VIDEO_WAVE_VPU=m
  CONFIG_VIDEO_IMX7_CSI=m
  CONFIG_VIDEO_IMX_MIPI_CSIS=m
  CONFIG_VIDEO_IMX8_ISI=m
  CONFIG_VIDEO_IMX8_ISI_M2M=y
 +CONFIG_VIDEO_IMX8_JPEG=m
  CONFIG_VIDEO_QCOM_CAMSS=m
  CONFIG_VIDEO_QCOM_VENUS=m
  CONFIG_VIDEO_RCAR_ISP=m
@@@ -868,7 -861,6 +868,7 @@@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=
  CONFIG_DRM_PANEL_SITRONIX_ST7703=m
  CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
  CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
 +CONFIG_DRM_FSL_LDB=m
  CONFIG_DRM_LONTIUM_LT8912B=m
  CONFIG_DRM_LONTIUM_LT9611=m
  CONFIG_DRM_LONTIUM_LT9611UXC=m
@@@ -1000,8 -992,6 +1000,8 @@@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=
  CONFIG_SND_SOC_TLV320AIC3X_I2C=m
  CONFIG_SND_SOC_WCD9335=m
  CONFIG_SND_SOC_WCD934X=m
 +CONFIG_SND_SOC_WCD939X=m
 +CONFIG_SND_SOC_WCD939X_SDW=m
  CONFIG_SND_SOC_WM8524=m
  CONFIG_SND_SOC_WM8904=m
  CONFIG_SND_SOC_WM8960=m
@@@ -1042,7 -1032,6 +1042,7 @@@ CONFIG_USB_CDNS_SUPPORT=
  CONFIG_USB_CDNS3=m
  CONFIG_USB_CDNS3_GADGET=y
  CONFIG_USB_CDNS3_HOST=y
 +CONFIG_USB_CDNS3_IMX=m
  CONFIG_USB_MTU3=y
  CONFIG_USB_MUSB_HDRC=y
  CONFIG_USB_MUSB_SUNXI=y
@@@ -1060,7 -1049,6 +1060,7 @@@ CONFIG_USB_QCOM_EUD=
  CONFIG_USB_HSIC_USB3503=y
  CONFIG_USB_ONBOARD_HUB=m
  CONFIG_NOP_USB_XCEIV=y
 +CONFIG_USB_MXS_PHY=m
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_USB_RZV2M_USB3DRD=y
@@@ -1091,7 -1079,6 +1091,7 @@@ CONFIG_TYPEC_HD3SS3220=
  CONFIG_TYPEC_MUX_FSA4480=m
  CONFIG_TYPEC_MUX_GPIO_SBU=m
  CONFIG_TYPEC_MUX_NB7VPQ904M=m
 +CONFIG_TYPEC_MUX_WCD939X_USBSS=m
  CONFIG_TYPEC_DP_ALTMODE=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
@@@ -1255,11 -1242,7 +1255,11 @@@ CONFIG_COMMON_CLK_MT8192_SCP_ADSP=
  CONFIG_COMMON_CLK_MT8192_VDECSYS=y
  CONFIG_COMMON_CLK_MT8192_VENCSYS=y
  CONFIG_COMMON_CLK_QCOM=y
 +CONFIG_CLK_X1E80100_CAMCC=m
 +CONFIG_CLK_X1E80100_DISPCC=m
  CONFIG_CLK_X1E80100_GCC=y
 +CONFIG_CLK_X1E80100_GPUCC=m
 +CONFIG_CLK_X1E80100_TCSRCC=y
  CONFIG_QCOM_A53PLL=y
  CONFIG_QCOM_CLK_APCS_MSM8916=y
  CONFIG_QCOM_CLK_APCC_MSM8996=y
@@@ -1282,7 -1265,6 +1282,7 @@@ CONFIG_MSM_MMCC_8998=
  CONFIG_QCM_GCC_2290=y
  CONFIG_QCM_DISPCC_2290=m
  CONFIG_QCS_GCC_404=y
 +CONFIG_QDU_GCC_1000=y
  CONFIG_SC_CAMCC_8280XP=m
  CONFIG_SC_DISPCC_8280XP=m
  CONFIG_SA_GCC_8775P=y
@@@ -1384,7 -1366,6 +1384,7 @@@ CONFIG_QCOM_STATS=
  CONFIG_QCOM_WCNSS_CTRL=m
  CONFIG_QCOM_APR=m
  CONFIG_QCOM_ICC_BWMON=m
 +CONFIG_QCOM_PBS=m
  CONFIG_ARCH_R8A77995=y
  CONFIG_ARCH_R8A77990=y
  CONFIG_ARCH_R8A77951=y
@@@ -1396,7 -1377,6 +1396,7 @@@ CONFIG_ARCH_R8A77980=
  CONFIG_ARCH_R8A77970=y
  CONFIG_ARCH_R8A779A0=y
  CONFIG_ARCH_R8A779G0=y
 +CONFIG_ARCH_R8A779H0=y
  CONFIG_ARCH_R8A774C0=y
  CONFIG_ARCH_R8A774E1=y
  CONFIG_ARCH_R8A774A1=y
@@@ -1430,7 -1410,6 +1430,7 @@@ CONFIG_EXTCON_USBC_CROS_EC=
  CONFIG_RENESAS_RPCIF=m
  CONFIG_IIO=y
  CONFIG_EXYNOS_ADC=y
 +CONFIG_IMX8QXP_ADC=m
  CONFIG_IMX93_ADC=m
  CONFIG_MAX9611=m
  CONFIG_MEDIATEK_MT6577_AUXADC=m
@@@ -1482,7 -1461,6 +1482,7 @@@ CONFIG_PHY_SUN4I_USB=
  CONFIG_PHY_CADENCE_TORRENT=m
  CONFIG_PHY_CADENCE_DPHY_RX=m
  CONFIG_PHY_CADENCE_SIERRA=m
 +CONFIG_PHY_CADENCE_SALVO=m
  CONFIG_PHY_MIXEL_MIPI_DPHY=m
  CONFIG_PHY_FSL_IMX8M_PCIE=y
  CONFIG_PHY_HI6220_USB=y
@@@ -1512,6 -1490,7 +1512,7 @@@ CONFIG_PHY_ROCKCHIP_INNO_USB2=
  CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
  CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
  CONFIG_PHY_ROCKCHIP_PCIE=m
+ CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
  CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
  CONFIG_PHY_ROCKCHIP_TYPEC=y
  CONFIG_PHY_SAMSUNG_UFS=y
@@@ -1572,9 -1551,8 +1573,9 @@@ CONFIG_INTERCONNECT_QCOM=
  CONFIG_INTERCONNECT_QCOM_MSM8916=m
  CONFIG_INTERCONNECT_QCOM_MSM8996=m
  CONFIG_INTERCONNECT_QCOM_OSM_L3=m
 -CONFIG_INTERCONNECT_QCOM_QCM2290=m
 +CONFIG_INTERCONNECT_QCOM_QCM2290=y
  CONFIG_INTERCONNECT_QCOM_QCS404=m
 +CONFIG_INTERCONNECT_QCOM_QDU1000=y
  CONFIG_INTERCONNECT_QCOM_SA8775P=y
  CONFIG_INTERCONNECT_QCOM_SC7180=y
  CONFIG_INTERCONNECT_QCOM_SC7280=y
@@@ -1583,7 -1561,7 +1584,7 @@@ CONFIG_INTERCONNECT_QCOM_SC8280XP=
  CONFIG_INTERCONNECT_QCOM_SDM845=y
  CONFIG_INTERCONNECT_QCOM_SDX75=y
  CONFIG_INTERCONNECT_QCOM_SM8150=m
 -CONFIG_INTERCONNECT_QCOM_SM8250=m
 +CONFIG_INTERCONNECT_QCOM_SM8250=y
  CONFIG_INTERCONNECT_QCOM_SM8350=m
  CONFIG_INTERCONNECT_QCOM_SM8450=y
  CONFIG_INTERCONNECT_QCOM_SM8550=y
@@@ -1594,7 -1572,8 +1595,7 @@@ CONFIG_RZ_MTU3_CNT=
  CONFIG_HTE=y
  CONFIG_HTE_TEGRA194=y
  CONFIG_HTE_TEGRA194_TEST=m
 -CONFIG_EXT2_FS=y
 -CONFIG_EXT3_FS=y
 +CONFIG_EXT4_FS=y
  CONFIG_EXT4_FS_POSIX_ACL=y
  CONFIG_BTRFS_FS=m
  CONFIG_BTRFS_FS_POSIX_ACL=y