From 014eb55b5b891c86e4bb7865c4a6aaafe41b52c6 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Mon, 27 Nov 2023 16:05:12 +0100
Subject: [PATCH] Switch media legacy kernel to last known working commit id

---
 config/kernel/linux-media-legacy.config | 18 ++++++++----------
 config/sources/families/media.conf      |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/config/kernel/linux-media-legacy.config b/config/kernel/linux-media-legacy.config
index e0be6a1f91..39e85583eb 100644
--- a/config/kernel/linux-media-legacy.config
+++ b/config/kernel/linux-media-legacy.config
@@ -3201,8 +3201,8 @@ CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/brcm/nvram.txt"
 CONFIG_RTL8852BE=m
 CONFIG_RTL8852BU=m
 CONFIG_RTL8821CU_RK=m
-CONFIG_RTL8723DS_RK=m
-CONFIG_RTL8723DU_RK=m
+# CONFIG_RTL8723DS_RK is not set
+# CONFIG_RTL8723DU_RK is not set
 # CONFIG_MAC80211_HWSIM is not set
 CONFIG_USB_NET_RNDIS_WLAN=y
 # CONFIG_VIRT_WIFI is not set
@@ -3454,7 +3454,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
-CONFIG_TOUCHSCREEN_FE_PANELS=y
+# CONFIG_TOUCHSCREEN_FE_PANELS is not set
 CONFIG_ROCKCHIP_REMOTECTL=y
 CONFIG_ROCKCHIP_REMOTECTL_PWM=y
 
@@ -3904,7 +3904,6 @@ CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_STMFX=m
 CONFIG_PINCTRL_MAX96745=m
-CONFIG_PINCTRL_MAX96752F=m
 CONFIG_PINCTRL_RK805=y
 CONFIG_PINCTRL_RK806=y
 # CONFIG_PINCTRL_OCELOT is not set
@@ -3970,7 +3969,6 @@ CONFIG_GPIO_PCA953X=y
 #
 # MFD GPIO expanders
 #
-CONFIG_GPIO_MAX96752F=m
 # CONFIG_GPIO_TPS6586X is not set
 # end of MFD GPIO expanders
 
@@ -4355,9 +4353,9 @@ CONFIG_MFD_IQS62X=m
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 CONFIG_MFD_MAX96745=m
-CONFIG_MFD_MAX96752F=m
+# CONFIG_MFD_MAX96752F is not set
 # CONFIG_MFD_MAX96755F is not set
-CONFIG_MFD_MAX96776=m
+# CONFIG_MFD_MAX96776 is not set
 # CONFIG_MFD_MT6360 is not set
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
@@ -5446,9 +5444,9 @@ CONFIG_DRM_ITE_IT6161=m
 CONFIG_DRM_LONTIUM_LT9611=m
 CONFIG_DRM_LVDS_CODEC=m
 CONFIG_DRM_MAXIM_MAX96745=m
-CONFIG_DRM_MAXIM_MAX96752F=m
+# CONFIG_DRM_MAXIM_MAX96752F is not set
 # CONFIG_DRM_MAXIM_MAX96755F is not set
-CONFIG_DRM_MAXIM_MAX96776=m
+# CONFIG_DRM_MAXIM_MAX96776 is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_NWL_MIPI_DSI=m
 # CONFIG_DRM_NXP_PTN3460 is not set
@@ -6739,7 +6737,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_CQHCI=y
-# CONFIG_MMC_HSQ is not set
+CONFIG_MMC_HSQ=y
 # CONFIG_MMC_TOSHIBA_PCI is not set
 # CONFIG_MMC_MTK is not set
 # CONFIG_MMC_SDHCI_XENON is not set
diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf
index 0663e2a01d..349bf4e052 100644
--- a/config/sources/families/media.conf
+++ b/config/sources/families/media.conf
@@ -34,7 +34,7 @@ case $BRANCH in
 
 		KERNELSOURCE='https://github.com/150balbes/rockchip-kernel'
 		declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel.
-		KERNELBRANCH='branch:kernel-5.10'
+		KERNELBRANCH='commit:9db2691ddfbdc7013d507df665f3e038eea7bf93'
 		LINUXFAMILY=media
 		LINUXCONFIG='linux-media-'$BRANCH
 		KERNELPATCHDIR='media-'$BRANCH