From a542076cfa5bc5958cd63cbc95ddc0dd3f772cea Mon Sep 17 00:00:00 2001 From: Jeevaka Prabu Badrappan Date: Tue, 30 Jul 2024 19:09:18 +0530 Subject: [PATCH] Update kernel diff patches for v6.1.92 update Tests done: - Android boot in GVT-d - Android boot in BM - Wi-Fi On/Off/Connect/Disconnect - Bluetooth On/Off/Connect/Disconnect - Camera preview, capture - Video playback and recording - adb remount Tracked-On: Signed-off-by: Jeevaka Prabu Badrappan --- ...-GET_DEF-probe-quirk-for-C922-camera.patch | 10 +++---- ...esnot-support-I-option.-So-replaced-.patch | 28 ------------------ ...der-config-to-allow-older-fw-version.patch | 29 ------------------- 3 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 bsp_diff/common/kernel/lts2022-chromium/0005-Prebuilts-tar-doesnot-support-I-option.-So-replaced-.patch delete mode 100644 bsp_diff/common/kernel/lts2022-chromium/0006-Update-header-config-to-allow-older-fw-version.patch diff --git a/bsp_diff/common/kernel/lts2022-chromium/0002-uvc-Add-UVC-GET_DEF-probe-quirk-for-C922-camera.patch b/bsp_diff/common/kernel/lts2022-chromium/0002-uvc-Add-UVC-GET_DEF-probe-quirk-for-C922-camera.patch index eec226743f..cca4469d0b 100644 --- a/bsp_diff/common/kernel/lts2022-chromium/0002-uvc-Add-UVC-GET_DEF-probe-quirk-for-C922-camera.patch +++ b/bsp_diff/common/kernel/lts2022-chromium/0002-uvc-Add-UVC-GET_DEF-probe-quirk-for-C922-camera.patch @@ -1,4 +1,4 @@ -From 590e5f5f7c137db4697680450fa10cabc3d35200 Mon Sep 17 00:00:00 2001 +From 9166c8e062e9987a740159ff5bdb2925b68c8ed4 Mon Sep 17 00:00:00 2001 From: saranya Date: Thu, 4 Jun 2020 14:17:06 +0530 Subject: [PATCH] uvc: Add UVC GET_DEF probe quirk for C922 camera @@ -16,13 +16,13 @@ Signed-off-by: saranya 1 file changed, 9 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index 881da7c17fb7..8e6fa8fa5741 100644 +index 37a9da4902fa7..7ed30855bc532 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c -@@ -2613,6 +2613,15 @@ static const struct usb_device_id uvc_ids[] = { +@@ -2630,6 +2630,15 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, - .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) }, + .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_FORCE_RESUME) }, + /* Logitech HD Pro Webcam C922 */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, @@ -36,5 +36,5 @@ index 881da7c17fb7..8e6fa8fa5741 100644 { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, -- -2.40.1 +2.45.2 diff --git a/bsp_diff/common/kernel/lts2022-chromium/0005-Prebuilts-tar-doesnot-support-I-option.-So-replaced-.patch b/bsp_diff/common/kernel/lts2022-chromium/0005-Prebuilts-tar-doesnot-support-I-option.-So-replaced-.patch deleted file mode 100644 index 884de10a7f..0000000000 --- a/bsp_diff/common/kernel/lts2022-chromium/0005-Prebuilts-tar-doesnot-support-I-option.-So-replaced-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 11647f8af63f16d8608b53d914fb6304e7e8f453 Mon Sep 17 00:00:00 2001 -From: yaravapa -Date: Wed, 17 Feb 2021 12:38:36 +0530 -Subject: [PATCH] Prebuilts tar doesnot support -I option. So replaced with -J - option - -Tracked-On: OAM-95316 -Signed-off-by: yaravapa ---- - kernel/gen_kheaders.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh -index 473036b43c83..69556f136a79 100755 ---- a/kernel/gen_kheaders.sh -+++ b/kernel/gen_kheaders.sh -@@ -86,7 +86,7 @@ find $cpio_dir -type f -print0 | - find $cpio_dir -printf "./%P\n" | LC_ALL=C sort | \ - tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \ - --owner=0 --group=0 --numeric-owner --no-recursion \ -- -I $XZ -cf $tarfile -C $cpio_dir/ -T - > /dev/null -+ -J -cf $tarfile -C $cpio_dir/ -T - > /dev/null - - echo $headers_md5 > kernel/kheaders.md5 - echo "$this_file_md5" >> kernel/kheaders.md5 --- -2.40.1 - diff --git a/bsp_diff/common/kernel/lts2022-chromium/0006-Update-header-config-to-allow-older-fw-version.patch b/bsp_diff/common/kernel/lts2022-chromium/0006-Update-header-config-to-allow-older-fw-version.patch deleted file mode 100644 index 0d62db14b1..0000000000 --- a/bsp_diff/common/kernel/lts2022-chromium/0006-Update-header-config-to-allow-older-fw-version.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 76a74bd2978d7058650c616e9726dbbb7d462dcf Mon Sep 17 00:00:00 2001 -From: Bharat B Panda -Date: Tue, 14 Sep 2021 15:29:58 +0530 -Subject: [PATCH] Update header config to allow older fw version - -Removed older fw disallow configuration to allow driver to -fallback on older version of fw when required version not found. - -Signed-off-by: Bharat B Panda ---- - drivers/net/wireless/iwl7000/hdrs/config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/iwl7000/hdrs/config.h b/drivers/net/wireless/iwl7000/hdrs/config.h -index 639f6f9875a4..e17b6ef6d60d 100644 ---- a/drivers/net/wireless/iwl7000/hdrs/config.h -+++ b/drivers/net/wireless/iwl7000/hdrs/config.h -@@ -30,7 +30,7 @@ - #define CPTCFG_IWLWIFI_NUM_CHANNELS 2 - #define CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES 1 - #define CPTCFG_IWLWIFI_FW_MISBEHAVE_NMI_DEFAULT 0 --#define CPTCFG_IWLWIFI_DISALLOW_OLDER_FW 1 -+#define CPTCFG_IWLWIFI_DISALLOW_OLDER_FW 0 - #define CPTCFG_IWLWIFI_NUM_STA_INTERFACES 1 - #define CPTCFG_REJECT_NONUPSTREAM_NL80211 1 - #define CPTCFG_IWLWIFI_ATLAS_PLATFORM_WORKAROUND 1 --- -2.40.1 -