Merge pull request #8422 from heitbaum/kernel66

linux: update to 6.6.y
2025-07-24 11:16:51 +00:00 · 2023-12-14 17:45:38 +01:00 · 2023-12-14 17:45:38 +01:00 · 1942b8900e
commit 1942b8900e
parent 3d282df0ce eb7fdc1693
12 changed files with 88 additions and 62 deletions
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@ -29,8 +29,8 @@ case "${LINUX}" in
    PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
    ;;
  *)
-    PKG_VERSION="6.6.6"
-    PKG_SHA256="ebf70a917934b13169e1be5b95c3b6c2fea5bc14e6dc144f1efb8a0016b224c8"
+    PKG_VERSION="6.6.7"
+    PKG_SHA256="0ce68ec6019019140043263520955ecd04839e55a1baab2fa9155b42bb6fd841"
    PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
    PKG_PATCH_DIRS="default"
    ;;
--- a/projects/Allwinner/linux/linux.aarch64.conf
+++ b/projects/Allwinner/linux/linux.aarch64.conf
@ -2178,6 +2178,8 @@ CONFIG_MT76_USB=m
 CONFIG_MT76x02_LIB=m
 CONFIG_MT76x02_USB=m
 CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT792x_LIB=m
+CONFIG_MT792x_USB=m
 CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2_COMMON=m
@ -2186,6 +2188,7 @@ CONFIG_MT7615_COMMON=m
 CONFIG_MT7663_USB_SDIO_COMMON=m
 CONFIG_MT7663U=m
 # CONFIG_MT7663S is not set
+CONFIG_MT7921_COMMON=m
 # CONFIG_MT7921S is not set
 CONFIG_MT7921U=m
 # CONFIG_WLAN_VENDOR_MICROCHIP is not set
@ -3445,6 +3448,7 @@ CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_H264=m
 CONFIG_V4L2_VP9=m
 CONFIG_V4L2_MEM2MEM_DEV=y
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=y
 CONFIG_V4L2_ASYNC=y
 # end of Video4Linux options
@ -5237,10 +5241,19 @@ CONFIG_LEDS_SYSCON=y
 #
 # Flash and Torch LED drivers
 #
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_RT4505 is not set
+# CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SGM3140 is not set

 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set

 #
 # LED Triggers
@ -6324,8 +6337,6 @@ CONFIG_PHY_SUN50I_USB3=y
 # CONFIG_PHY_OCELOT_SERDES is not set
 CONFIG_PHY_QCOM_USB_HS=y
 # CONFIG_PHY_QCOM_USB_HSIC is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 CONFIG_PHY_SAMSUNG_USB2=y
 # CONFIG_PHY_TUSB1210 is not set
 # end of PHY Subsystem
--- a/projects/Allwinner/linux/linux.arm.conf
+++ b/projects/Allwinner/linux/linux.arm.conf
@ -2028,6 +2028,8 @@ CONFIG_MT76_USB=m
 CONFIG_MT76x02_LIB=m
 CONFIG_MT76x02_USB=m
 CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT792x_LIB=m
+CONFIG_MT792x_USB=m
 CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2_COMMON=m
@ -2036,6 +2038,7 @@ CONFIG_MT7615_COMMON=m
 CONFIG_MT7663_USB_SDIO_COMMON=m
 CONFIG_MT7663U=m
 # CONFIG_MT7663S is not set
+CONFIG_MT7921_COMMON=m
 # CONFIG_MT7921S is not set
 CONFIG_MT7921U=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
@ -3166,6 +3169,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=y
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=y
 CONFIG_V4L2_ASYNC=y
 # end of Video4Linux options
@ -4875,10 +4879,19 @@ CONFIG_LEDS_GPIO=y
 #
 # Flash and Torch LED drivers
 #
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_RT4505 is not set
+# CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SGM3140 is not set

 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set

 #
 # LED Triggers
@ -5896,8 +5909,6 @@ CONFIG_PHY_SUN50I_USB3=y
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 # end of PHY Subsystem

 # CONFIG_POWERCAP is not set
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@ -2592,6 +2592,8 @@ CONFIG_MT76_USB=m
 CONFIG_MT76x02_LIB=m
 CONFIG_MT76x02_USB=m
 CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT792x_LIB=m
+CONFIG_MT792x_USB=m
 CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
 # CONFIG_MT76x0E is not set
@ -2605,6 +2607,7 @@ CONFIG_MT7663_USB_SDIO_COMMON=m
 CONFIG_MT7663U=m
 # CONFIG_MT7663S is not set
 CONFIG_MT7915E=m
+CONFIG_MT7921_COMMON=m
 # CONFIG_MT7921E is not set
 # CONFIG_MT7921S is not set
 CONFIG_MT7921U=m
@ -6256,8 +6259,6 @@ CONFIG_RESET_CONTROLLER=y

 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 # CONFIG_PHY_INTEL_LGM_EMMC is not set
 # end of PHY Subsystem

--- a/projects/NXP/devices/iMX6/linux/linux.arm.conf
+++ b/projects/NXP/devices/iMX6/linux/linux.arm.conf
@ -3698,6 +3698,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_V4L2_JPEG_HELPER=y
 CONFIG_V4L2_MEM2MEM_DEV=y
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=y
 CONFIG_V4L2_ASYNC=y
 # end of Video4Linux options
@ -5653,10 +5654,19 @@ CONFIG_LEDS_PWM=y
 #
 # Flash and Torch LED drivers
 #
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_RT4505 is not set
+# CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SGM3140 is not set

 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set

 #
 # LED Triggers
@ -6692,8 +6702,6 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 # CONFIG_PHY_TUSB1210 is not set
 # end of PHY Subsystem

--- a/projects/NXP/devices/iMX8/linux/linux.aarch64.conf
+++ b/projects/NXP/devices/iMX8/linux/linux.aarch64.conf
@ -2182,12 +2182,16 @@ CONFIG_MT76_LEDS=y
 CONFIG_MT76_USB=m
 CONFIG_MT76x02_LIB=m
 CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT792x_LIB=m
+CONFIG_MT792x_USB=m
 CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2U=m
 # CONFIG_MT7663U is not set
 # CONFIG_MT7663S is not set
+CONFIG_MT7921_COMMON=m
 # CONFIG_MT7921S is not set
 CONFIG_MT7921U=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
@ -3380,6 +3384,7 @@ CONFIG_V4L2_JPEG_HELPER=m
 CONFIG_V4L2_H264=m
 CONFIG_V4L2_VP9=m
 CONFIG_V4L2_MEM2MEM_DEV=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=m
 CONFIG_V4L2_ASYNC=m
 # end of Video4Linux options
@ -5127,10 +5132,19 @@ CONFIG_LEDS_SYSCON=y
 #
 # Flash and Torch LED drivers
 #
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_RT4505 is not set
+# CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SGM3140 is not set

 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set

 #
 # LED Triggers
@ -6214,8 +6228,6 @@ CONFIG_PHY_FSL_IMX8M_PCIE=y
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 # CONFIG_PHY_SAMSUNG_USB2 is not set
 # end of PHY Subsystem

--- a/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf
+++ b/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf
@ -3734,6 +3734,7 @@ CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=y
 CONFIG_V4L2_ASYNC=y
 # end of Video4Linux options
@ -4819,6 +4820,8 @@ CONFIG_HID_OUYA=y
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=y
+CONFIG_PLAYSTATION_FF=y
 # CONFIG_HID_PXRC is not set
 # CONFIG_HID_RAZER is not set
 # CONFIG_HID_PRIMAX is not set
@ -5306,10 +5309,21 @@ CONFIG_LEDS_SYSCON=y
 #
 # Flash and Torch LED drivers
 #
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_QCOM_FLASH is not set
+# CONFIG_LEDS_RT4505 is not set
+# CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SGM3140 is not set

 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set

 #
 # LED Triggers
@ -6520,8 +6534,6 @@ CONFIG_PHY_QCOM_USB_HSIC=y
 # CONFIG_PHY_QCOM_USB_SS is not set
 # CONFIG_PHY_QCOM_IPQ806X_USB is not set
 # CONFIG_PHY_QCOM_SGMII_ETH is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 CONFIG_PHY_SAMSUNG_USB2=y
 # CONFIG_PHY_TUSB1210 is not set
 # end of PHY Subsystem
--- a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf
+++ b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf
@ -5134,6 +5134,9 @@ CONFIG_LEDS_MAX8997=m
 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set

 #
 # LED Triggers
@ -6248,8 +6251,6 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 CONFIG_PHY_ROCKCHIP_DP=m
 # CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
 CONFIG_PHY_ROCKCHIP_EMMC=m
--- a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf
@ -3313,7 +3313,7 @@ CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_H264=m
 CONFIG_V4L2_VP9=m
 CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=y
 CONFIG_V4L2_ASYNC=y
 # end of Video4Linux options
@ -4984,6 +4984,9 @@ CONFIG_LEDS_SYSCON=y
 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set

 #
 # LED Triggers
@ -6075,8 +6078,6 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 CONFIG_PHY_ROCKCHIP_DP=y
 # CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
 CONFIG_PHY_ROCKCHIP_EMMC=y
--- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf
@ -3790,7 +3790,7 @@ CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_H264=m
 CONFIG_V4L2_VP9=m
 CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=y
 CONFIG_V4L2_ASYNC=y
 # end of Video4Linux options
@ -5743,6 +5743,9 @@ CONFIG_LEDS_SYSCON=y
 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set

 #
 # LED Triggers
@ -6859,8 +6862,6 @@ CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 CONFIG_PHY_ROCKCHIP_DP=y
 # CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
 CONFIG_PHY_ROCKCHIP_EMMC=y
--- a/projects/Rockchip/patches/linux/default/linux-1001-v4l2-rockchip.patch
+++ b/projects/Rockchip/patches/linux/default/linux-1001-v4l2-rockchip.patch
@ -349,25 +349,13 @@ Date: Tue, 18 Aug 2020 11:38:04 +0200
 Subject: [PATCH] WIP: arm64: dts: add resets to vdec for RK3399

 ---
- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 5 +++++
+ 1 file changed, 5 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 index 980b12cb0a49..6e3149e587c5 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-@@ -1062,7 +1062,10 @@ power-domain@RK3399_PD_VCODEC {
- 			power-domain@RK3399_PD_VDU {
- 				reg = <RK3399_PD_VDU>;
- 				clocks = <&cru ACLK_VDU>,
-					 <&cru HCLK_VDU>;
-+					 <&cru HCLK_VDU>,
-+					 <&cru SCLK_VDU_CA>,
-+					 <&cru SCLK_VDU_CORE>;
-+
- 				pm_qos = <&qos_video_m1_r>,
- 					 <&qos_video_m1_w>;
- 				#power-domain-cells = <0>;
@@ -1345,6 +1348,11 @@ vdec: video-codec@ff660000 {
 		clock-names = "axi", "ahb", "cabac", "core";
 		iommus = <&vdec_mmu>;
@ -381,30 +369,6 @@ index 980b12cb0a49..6e3149e587c5 100644
 
 	vdec_mmu: iommu@ff660480 {

-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Fri, 1 Jan 2021 12:11:12 +0200
-Subject: [PATCH] arm64: dts: rockchip: fix RK3399 vdec register witdh
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-index 6e3149e587c5..093ebe070775 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-@@ -1341,7 +1341,7 @@ vpu_mmu: iommu@ff650800 {
- 
- 	vdec: video-codec@ff660000 {
- 		compatible = "rockchip,rk3399-vdec";
-		reg = <0x0 0xff660000 0x0 0x400>;
-+		reg = <0x0 0xff660000 0x0 0x480>;
- 		interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>;
- 		clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>,
- 			 <&cru SCLK_VDU_CA>, <&cru SCLK_VDU_CORE>;
-
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Sat, 21 Aug 2021 16:12:36 +0200
--- a/projects/Samsung/linux/linux.arm.conf
+++ b/projects/Samsung/linux/linux.arm.conf
@ -1935,12 +1935,16 @@ CONFIG_MT76_LEDS=y
 CONFIG_MT76_USB=m
 CONFIG_MT76x02_LIB=m
 CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT792x_LIB=m
+CONFIG_MT792x_USB=m
 CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2U=m
 # CONFIG_MT7663U is not set
 # CONFIG_MT7663S is not set
+CONFIG_MT7921_COMMON=m
 # CONFIG_MT7921S is not set
 CONFIG_MT7921U=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
@ -4593,6 +4597,8 @@ CONFIG_LEDS_MAX77693=y
 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_GROUP_MULTICOLOR is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set

 #
 # LED Triggers
@ -5620,8 +5626,6 @@ CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
-# CONFIG_PHY_RTK_RTD_USB2PHY is not set
-# CONFIG_PHY_RTK_RTD_USB3PHY is not set
 CONFIG_PHY_EXYNOS_DP_VIDEO=y
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
 # CONFIG_PHY_EXYNOS_PCIE is not set