From 1addd8e4bee2c1c573516060d5df7f5455adb712 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 3 Feb 2022 01:56:34 +0100 Subject: [PATCH] Update v5.16 patches Changes: - Rebase onto v5.16.5 Links: - kernel: https://github.com/linux-surface/kernel/commit/79c1f0e58b463796983080bb5b6087ff16891163 --- patches/5.16/0001-surface3-oemb.patch | 4 +- patches/5.16/0002-mwifiex.patch | 46 +-- patches/5.16/0003-ath10k.patch | 10 +- patches/5.16/0004-ipts.patch | 8 +- patches/5.16/0005-surface-sam.patch | 56 ++-- patches/5.16/0006-surface-sam-over-hid.patch | 8 +- patches/5.16/0007-surface-gpe.patch | 4 +- patches/5.16/0008-surface-button.patch | 8 +- patches/5.16/0009-surface-typecover.patch | 4 +- patches/5.16/0010-cameras.patch | 324 +++++++------------ patches/5.16/0011-amd-gpio.patch | 8 +- patches/5.16/0012-misc-fixes.patch | 12 +- pkg/arch/kernel/PKGBUILD | 24 +- 13 files changed, 217 insertions(+), 299 deletions(-) diff --git a/patches/5.16/0001-surface3-oemb.patch b/patches/5.16/0001-surface3-oemb.patch index a9c856150..b6f7d4eb7 100644 --- a/patches/5.16/0001-surface3-oemb.patch +++ b/patches/5.16/0001-surface3-oemb.patch @@ -1,4 +1,4 @@ -From 18f0bf6aa948f6a832accac643946849fb50dd61 Mon Sep 17 00:00:00 2001 +From f3f1eb73ab8c3350db71fee43340de986794cd1b Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 18 Oct 2020 16:42:44 +0900 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI @@ -97,5 +97,5 @@ index c60a5e8e7bc9..e947133a2c36 100644 }; -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0002-mwifiex.patch b/patches/5.16/0002-mwifiex.patch index 00cc508cf..241eddad3 100644 --- a/patches/5.16/0002-mwifiex.patch +++ b/patches/5.16/0002-mwifiex.patch @@ -1,4 +1,4 @@ -From 5737bb77fc194faa58ed104991baebe2f664635a Mon Sep 17 00:00:00 2001 +From de28c3f38ae3ac2f21d239a3fe3a63ce2f6c72df Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Tue, 29 Sep 2020 17:32:22 +0900 Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3 @@ -181,9 +181,9 @@ index 8ec4176d698f..25370c5a4f59 100644 int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); +int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev); -- -2.34.1 +2.35.1 -From 21894fcf806536a32a55f28bb6a92ccc17baf09e Mon Sep 17 00:00:00 2001 +From 4387db1a49a5d01fde30eac2e31093dea1907343 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Wed, 30 Sep 2020 18:08:24 +0900 Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI @@ -243,9 +243,9 @@ index 563dd0d5ac79..32e2f000e57b 100644 }; -- -2.34.1 +2.35.1 -From bc69d4ea4a67ff0daa3e28c5831b6457a13f8772 Mon Sep 17 00:00:00 2001 +From 34404bbe9fded98783f45e1242517f576f8f9592 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 4 Oct 2020 00:11:49 +0900 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+ @@ -398,9 +398,9 @@ index 25370c5a4f59..a1de111ad1db 100644 void mwifiex_initialize_quirks(struct pcie_service_card *card); int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); -- -2.34.1 +2.35.1 -From 7482f937fa88afb9582341d1f35d37ff126e1bcf Mon Sep 17 00:00:00 2001 +From d7422bd87474bae2fe3b42b11c8873cfe6ed09e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 3 Nov 2020 13:28:04 +0100 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface @@ -565,9 +565,9 @@ index a1de111ad1db..0e429779bb04 100644 void mwifiex_initialize_quirks(struct pcie_service_card *card); int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); -- -2.34.1 +2.35.1 -From af7fccf6c49213ae7ce343f7b2c574918fcb0f1a Mon Sep 17 00:00:00 2001 +From 076580c216b98bcc9cd7b02e0c86ee1076541e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Thu, 25 Mar 2021 11:33:02 +0100 Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell @@ -603,18 +603,18 @@ Patchset: mwifiex 1 file changed, 15 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 75c83768c257..bb863c3b51f6 100644 +index ea72afb7abea..dc0d1d8e0daa 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -60,6 +60,7 @@ static struct usb_driver btusb_driver; - #define BTUSB_VALID_LE_STATES 0x800000 +@@ -61,6 +61,7 @@ static struct usb_driver btusb_driver; #define BTUSB_QCA_WCN6855 0x1000000 + #define BTUSB_INTEL_BROKEN_SHUTDOWN_LED 0x2000000 #define BTUSB_INTEL_BROKEN_INITIAL_NCMD 0x4000000 +#define BTUSB_LOWER_LESCAN_INTERVAL 0x8000000 static const struct usb_device_id btusb_table[] = { /* Generic Bluetooth USB device */ -@@ -356,6 +357,7 @@ static const struct usb_device_id blacklist_table[] = { +@@ -375,6 +376,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL }, { USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL }, { USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL }, @@ -622,7 +622,7 @@ index 75c83768c257..bb863c3b51f6 100644 /* Intel Bluetooth devices */ { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED }, -@@ -3862,6 +3864,19 @@ static int btusb_probe(struct usb_interface *intf, +@@ -3908,6 +3910,19 @@ static int btusb_probe(struct usb_interface *intf, if (id->driver_info & BTUSB_MARVELL) hdev->set_bdaddr = btusb_set_bdaddr_marvell; @@ -643,9 +643,9 @@ index 75c83768c257..bb863c3b51f6 100644 (id->driver_info & BTUSB_MEDIATEK)) { hdev->setup = btusb_mtk_setup; -- -2.34.1 +2.35.1 -From bb6c2ece94a6eab366f7962bf2acad77f25db002 Mon Sep 17 00:00:00 2001 +From 95ad8001965918ed711cd63e9ed15859073c7634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 10 Nov 2020 12:49:56 +0100 Subject: [PATCH] mwifiex: Use non-posted PCI register writes @@ -700,9 +700,9 @@ index 586c79dc0a98..f87bc9bdfba7 100644 } -- -2.34.1 +2.35.1 -From b2ccceed632550f18c346b77bee5312aebdd54f0 Mon Sep 17 00:00:00 2001 +From 2747c0e1b2bbdca151fa76a35d69290eccefae80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 14:23:05 +0200 Subject: [PATCH] mwifiex: Add quirk to disable deep sleep with certain @@ -803,9 +803,9 @@ index 6b5d35d9e69f..8e49ebca1847 100644 version_ext->version_str_sel = ver_ext->version_str_sel; memcpy(version_ext->version_str, ver_ext->version_str, -- -2.34.1 +2.35.1 -From f33cf6817c7b0b130a47e664f560cd8ae8f5dcdb Mon Sep 17 00:00:00 2001 +From 24b206a7c9234d884ad40087e5abcbbc9591d5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 12:57:41 +0200 Subject: [PATCH] mwifiex: Ignore BTCOEX events from the firmware @@ -826,10 +826,10 @@ Patchset: mwifiex 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c -index 68c63268e2e6..933111a3511c 100644 +index 2b2e6e0166e1..e9e2d4b86acb 100644 --- a/drivers/net/wireless/marvell/mwifiex/sta_event.c +++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c -@@ -1057,9 +1057,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) +@@ -1061,9 +1061,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) adapter->event_skb); break; case EVENT_BT_COEX_WLAN_PARA_CHANGE: @@ -841,5 +841,5 @@ index 68c63268e2e6..933111a3511c 100644 case EVENT_RXBA_SYNC: dev_dbg(adapter->dev, "EVENT: RXBA_SYNC\n"); -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0003-ath10k.patch b/patches/5.16/0003-ath10k.patch index 0bf9bafeb..0809ddbc7 100644 --- a/patches/5.16/0003-ath10k.patch +++ b/patches/5.16/0003-ath10k.patch @@ -1,4 +1,4 @@ -From 40c0fa8c2d8dbfea2673293256789033516822e7 Mon Sep 17 00:00:00 2001 +From 05106ed51bdf1130adecf7f11ae75d6dd876d25b Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 27 Feb 2021 00:45:52 +0100 Subject: [PATCH] ath10k: Add module parameters to override board files @@ -20,7 +20,7 @@ Patchset: ath10k 1 file changed, 58 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c -index 5935e0973d14..9cbb7b245e85 100644 +index 5e3b4d10c1a9..2475eeab9c98 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -35,6 +35,9 @@ static bool skip_otp; @@ -53,7 +53,7 @@ index 5935e0973d14..9cbb7b245e85 100644 static const struct ath10k_hw_params ath10k_hw_params_list[] = { { .id = QCA988X_HW_2_0_VERSION, -@@ -826,6 +835,42 @@ static int ath10k_init_configure_target(struct ath10k *ar) +@@ -843,6 +852,42 @@ static int ath10k_init_configure_target(struct ath10k *ar) return 0; } @@ -96,7 +96,7 @@ index 5935e0973d14..9cbb7b245e85 100644 static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar, const char *dir, const char *file) -@@ -840,6 +885,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar, +@@ -857,6 +902,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar, if (dir == NULL) dir = "."; @@ -117,5 +117,5 @@ index 5935e0973d14..9cbb7b245e85 100644 ret = firmware_request_nowarn(&fw, filename, ar->dev); ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n", -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0004-ipts.patch b/patches/5.16/0004-ipts.patch index 92a807c36..2820b4501 100644 --- a/patches/5.16/0004-ipts.patch +++ b/patches/5.16/0004-ipts.patch @@ -1,4 +1,4 @@ -From 4cc56a3e2ebda9e7f2abb89b489c5b9497e4b371 Mon Sep 17 00:00:00 2001 +From e24bacd9fd3780a0abbf9c626420fae7fd07d246 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Thu, 30 Jul 2020 13:21:53 +0200 Subject: [PATCH] misc: mei: Add missing IPTS device IDs @@ -34,9 +34,9 @@ index 3a45aaf002ac..55b8ee30a03c 100644 {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)}, -- -2.34.1 +2.35.1 -From f4e86071db79899b854afd5cb2647c5343d270e8 Mon Sep 17 00:00:00 2001 +From 6115cb159fc6dd3a7780feee9bc280abac783860 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Thu, 6 Aug 2020 11:20:41 +0200 Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus @@ -1499,5 +1499,5 @@ index 000000000000..53fb86a88f97 + +#endif /* _IPTS_UAPI_H_ */ -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0005-surface-sam.patch b/patches/5.16/0005-surface-sam.patch index 4083813a9..258b53597 100644 --- a/patches/5.16/0005-surface-sam.patch +++ b/patches/5.16/0005-surface-sam.patch @@ -1,4 +1,4 @@ -From 77b2631555a42afe9faaad79e47342defd10a38e Mon Sep 17 00:00:00 2001 +From bc8dfedd855ece610209811bf66369784d130ce1 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 2 Jun 2021 03:34:06 +0200 Subject: [PATCH] platform/surface: aggregator: Make client device removal more @@ -121,9 +121,9 @@ index f636c5310321..cc257097eb05 100644 /** -- -2.34.1 +2.35.1 -From fa822231a4cd0f316dd00952d39d09f4ce1ed215 Mon Sep 17 00:00:00 2001 +From 3b278e68477dd47cc9ae6b3cf83603e2d8838512 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 27 Oct 2021 02:06:38 +0200 Subject: [PATCH] platform/surface: aggregator_registry: Use generic client @@ -209,9 +209,9 @@ index e70f4c63554e..f6c639342b9d 100644 software_node_unregister_node_group(nodes); return 0; -- -2.34.1 +2.35.1 -From 40bfe303124ccd4e6a99f4415605e19d8970581d Mon Sep 17 00:00:00 2001 +From 6d879ba7ad9bef1bcf97c459f8a09d8966044de0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 27 Oct 2021 02:07:33 +0200 Subject: [PATCH] platform/surface: aggregator_registry: Rename device @@ -260,9 +260,9 @@ index f6c639342b9d..ce2bd88feeaa 100644 set_secondary_fwnode(&pdev->dev, NULL); software_node_unregister_node_group(nodes); -- -2.34.1 +2.35.1 -From 1c12fdba2688e863a7285498e08954988799825f Mon Sep 17 00:00:00 2001 +From 1e2a7e85582cdbdc4ff00cc105b83b6231d71663 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 8 Jun 2021 00:24:47 +0200 Subject: [PATCH] platform/surface: aggregator: Allow devices to be marked as @@ -381,9 +381,9 @@ index cc257097eb05..491aa7e9f4bc 100644 * ssam_device_get() - Increment reference count of SSAM client device. * @sdev: The device to increment the reference count of. -- -2.34.1 +2.35.1 -From d2a0a4cb9d997b454344fe1c28bf7868e108fbbe Mon Sep 17 00:00:00 2001 +From 9fc334bec69241863e1b30b2f51a8b5c37956abb Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 8 Jun 2021 00:48:22 +0200 Subject: [PATCH] platform/surface: aggregator: Allow notifiers to avoid @@ -668,9 +668,9 @@ index 491aa7e9f4bc..16816c34da3e 100644 + #endif /* _LINUX_SURFACE_AGGREGATOR_DEVICE_H */ -- -2.34.1 +2.35.1 -From 1fd981556e0616a6c6303d7fc0ae0f75e7d52eba Mon Sep 17 00:00:00 2001 +From a795de81bfdeb719a0edad7f9f3bf7b3ae795071 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 8 Jun 2021 01:20:49 +0200 Subject: [PATCH] platform/surface: aggregator_registry: Use client device @@ -717,9 +717,9 @@ index ce2bd88feeaa..9f630e890ff7 100644 ssam_remove_clients(&sdev->dev); } -- -2.34.1 +2.35.1 -From 40c79025534b2ea43e7561cc9295be5c1125faa6 Mon Sep 17 00:00:00 2001 +From 7b9231d32e0f06a6ae13325caec2ad15c28ecb96 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 28 Oct 2021 03:37:06 +0200 Subject: [PATCH] power/supply: surface_charger: Use client device wrappers for @@ -757,9 +757,9 @@ index a060c36c7766..59182d55742d 100644 static const struct spwr_psy_properties spwr_psy_props_adp1 = { -- -2.34.1 +2.35.1 -From f96ed98c6614de71af7aa490bcf4b6f49034b103 Mon Sep 17 00:00:00 2001 +From f2c309842ea0fc22023baf0740bae488f6968859 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 28 Oct 2021 03:38:09 +0200 Subject: [PATCH] power/supply: surface_battery: Use client device wrappers for @@ -797,9 +797,9 @@ index 5ec2e6bb2465..540707882bb0 100644 } -- -2.34.1 +2.35.1 -From dd80d11c184e44fa0c8f8174fce4faaa38655262 Mon Sep 17 00:00:00 2001 +From bed8c8f2b05e072971f263630f33dd4ef34f5ad9 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 8 Jun 2021 01:33:02 +0200 Subject: [PATCH] HID: surface-hid: Add support for hot-removal @@ -908,9 +908,9 @@ index 5571e74abe91..d2e695e942b6 100644 return shid->ops.output_report(shid, reportnum, buf, len); -- -2.34.1 +2.35.1 -From f17f1c549466acbf3cff0a1f76b45185a57466e4 Mon Sep 17 00:00:00 2001 +From 364137ab6ff67ec68e96df6da299bed5d4df1dda Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 31 Oct 2021 12:34:08 +0100 Subject: [PATCH] platform/surface: aggregator: Add comment for KIP subsystem @@ -946,9 +946,9 @@ index c3de43edcffa..d1efac85caf1 100644 SSAM_SSH_TC_BLD = 0x10, SSAM_SSH_TC_BAS = 0x11, /* Detachment system (Surface Book 2/3). */ -- -2.34.1 +2.35.1 -From 57007b8e0291afd9c728d956e4a3bce047b38ced Mon Sep 17 00:00:00 2001 +From df292b73e68515f665debf71ca482008dccdcd14 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 10 Oct 2021 23:56:23 +0200 Subject: [PATCH] platform/surface: aggregator_registry: Add KIP device hub @@ -1260,9 +1260,9 @@ index 9f630e890ff7..4838ce6519a6 100644 platform_driver_unregister(&ssam_platform_hub_driver); } -- -2.34.1 +2.35.1 -From 0fb1086de9ea2da46253bc67cb32b11dc1b0506d Mon Sep 17 00:00:00 2001 +From 058f287422712ca84cc8be7b13ca9a794c856f02 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 27 Oct 2021 22:33:03 +0200 Subject: [PATCH] platform/surface: aggregator_registry: Add support for @@ -1358,9 +1358,9 @@ index 4838ce6519a6..c0e29c0514df 100644 }; -- -2.34.1 +2.35.1 -From c8375a25c47b2e066db67ef20e780df974f9322a Mon Sep 17 00:00:00 2001 +From e8e283f63cc35de81b10845cb31b346969df3951 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 8 Jun 2021 03:19:20 +0200 Subject: [PATCH] platform/surface: Add KIP tablet-mode switch @@ -1702,9 +1702,9 @@ index 000000000000..458470067579 +MODULE_DESCRIPTION("Tablet mode switch driver for Surface devices using KIP subsystem"); +MODULE_LICENSE("GPL"); -- -2.34.1 +2.35.1 -From eaea62f0a964f4dab5e3c85600ef29137e96585f Mon Sep 17 00:00:00 2001 +From 6ffafa933387524763eaea59ddb9b90340f77781 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 27 Oct 2021 22:33:03 +0200 Subject: [PATCH] platform/surface: aggregator_registry: Add support for tablet @@ -1752,5 +1752,5 @@ index c0e29c0514df..eaf0054627a5 100644 }; -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0006-surface-sam-over-hid.patch b/patches/5.16/0006-surface-sam-over-hid.patch index 7c8dfb5b8..a175d8667 100644 --- a/patches/5.16/0006-surface-sam-over-hid.patch +++ b/patches/5.16/0006-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From 8b4df0e64f2a1e7d16c4f83f4097cb32d03a9ef3 Mon Sep 17 00:00:00 2001 +From 7250c54103c6080991ca566db38bc661b8d24d8c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 25 Jul 2020 17:19:53 +0200 Subject: [PATCH] i2c: acpi: Implement RawBytes read access @@ -108,9 +108,9 @@ index 92c1cc07ed46..3b688cea8e00 100644 dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n", accessor_type, client->addr); -- -2.34.1 +2.35.1 -From 9ad838244ac247e1a9539826526006caf07ca317 Mon Sep 17 00:00:00 2001 +From 4652ff94bc9fc6d6978dfc737a8472a9b3a5a19d Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 13 Feb 2021 16:41:18 +0100 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch @@ -331,5 +331,5 @@ index 000000000000..8b816ed8f35c +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1"); +MODULE_LICENSE("GPL"); -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0007-surface-gpe.patch b/patches/5.16/0007-surface-gpe.patch index d14c8735f..02160aa50 100644 --- a/patches/5.16/0007-surface-gpe.patch +++ b/patches/5.16/0007-surface-gpe.patch @@ -1,4 +1,4 @@ -From dfb311f9c608f997ba613d19b0e2f6f4b248322d Mon Sep 17 00:00:00 2001 +From 552613d6ad3bbec3fd43836ffd71dd8bf61eb9b0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 27 Oct 2021 00:56:11 +0200 Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 8 @@ -33,5 +33,5 @@ index c1775db29efb..ec66fde28e75 100644 .ident = "Surface Book 1", .matches = { -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0008-surface-button.patch b/patches/5.16/0008-surface-button.patch index 9385d9a0d..5c9096b88 100644 --- a/patches/5.16/0008-surface-button.patch +++ b/patches/5.16/0008-surface-button.patch @@ -1,4 +1,4 @@ -From 42397d362da66a2d1475b0d3190364b8ff3b107f Mon Sep 17 00:00:00 2001 +From 3f5c96e3e58c76c815f867c02ec93c9e49204d59 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Tue, 5 Oct 2021 00:05:09 +1100 Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices @@ -73,9 +73,9 @@ index cb6ec59a045d..4e8944f59def 100644 /* -- -2.34.1 +2.35.1 -From 0496acc10a2b28d099cf4638479ce2c5cee11fb1 Mon Sep 17 00:00:00 2001 +From a68f2de6bdf886b876d61877d6ef7757c43ef7cf Mon Sep 17 00:00:00 2001 From: Sachi King Date: Tue, 5 Oct 2021 00:22:57 +1100 Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd @@ -145,5 +145,5 @@ index 242fb690dcaf..30eea54dbb47 100644 -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0009-surface-typecover.patch b/patches/5.16/0009-surface-typecover.patch index c88bfcee4..6f62446f9 100644 --- a/patches/5.16/0009-surface-typecover.patch +++ b/patches/5.16/0009-surface-typecover.patch @@ -1,4 +1,4 @@ -From f5a1ba596bd95924590c5cd9eb75bf8918fe6c1d Mon Sep 17 00:00:00 2001 +From 2c0f782c74c5973c6071bd9eb7b99110d8ece6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Thu, 5 Nov 2020 13:09:45 +0100 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when @@ -229,5 +229,5 @@ index 082376a6cb3d..cfc2e684a22c 100644 { .driver_data = MT_CLS_GOOGLE, HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE, -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0010-cameras.patch b/patches/5.16/0010-cameras.patch index 84236fc3d..bbf125990 100644 --- a/patches/5.16/0010-cameras.patch +++ b/patches/5.16/0010-cameras.patch @@ -1,4 +1,4 @@ -From 353f3287f282fb0deb8114b0a928f84185891eb8 Mon Sep 17 00:00:00 2001 +From 7502d4a526f9fb34b7929662195b75fe72a9a490 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 5 Apr 2021 23:56:53 +0100 Subject: [PATCH] media: ipu3-cio2: Toggle sensor streaming in pm runtime ops @@ -56,9 +56,9 @@ index 356ea966cf8d..76fd4e6e8e46 100644 return r; } -- -2.34.1 +2.35.1 -From 5d51820260e5d0a777fd5111fa5491fe0e4da450 Mon Sep 17 00:00:00 2001 +From 14cf9428700b3b8729000a56b645e1ca83b56f5d Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 5 Apr 2021 23:56:54 +0100 Subject: [PATCH] media: i2c: Add support for ov5693 sensor @@ -1699,9 +1699,9 @@ index 000000000000..9499ee10f56c +MODULE_DESCRIPTION("A low-level driver for OmniVision 5693 sensors"); +MODULE_LICENSE("GPL"); -- -2.34.1 +2.35.1 -From e5a5d1e45e7c029ac1fa3c37a0c2cb65137b7b11 Mon Sep 17 00:00:00 2001 +From f73708ccfbff6f60f2a5d978c7fbf047095898a1 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 20 May 2021 23:31:04 +0100 Subject: [PATCH] media: i2c: Fix vertical flip in ov5693 @@ -1734,9 +1734,9 @@ index 9499ee10f56c..c558f9b48c83 100644 #define OV5693_FORMAT1_VBIN_EN BIT(0) #define OV5693_FORMAT2_REG 0x3821 -- -2.34.1 +2.35.1 -From 0006fe98c53fd00ecd373057822f222c37eebca5 Mon Sep 17 00:00:00 2001 +From 147e53922dc463990055e97c7bf9c2806cb34848 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Fri, 9 Jul 2021 16:39:18 +0100 Subject: [PATCH] media: i2c: Add ACPI support to ov8865 @@ -1752,7 +1752,7 @@ Patchset: cameras 1 file changed, 8 insertions(+) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index ce50f3ea87b8..7626c8608f8f 100644 +index 92f6c3a940cf..15325df45c2b 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -9,6 +9,7 @@ @@ -1763,7 +1763,7 @@ index ce50f3ea87b8..7626c8608f8f 100644 #include #include #include -@@ -2946,6 +2947,12 @@ static const struct dev_pm_ops ov8865_pm_ops = { +@@ -2950,6 +2951,12 @@ static const struct dev_pm_ops ov8865_pm_ops = { SET_RUNTIME_PM_OPS(ov8865_suspend, ov8865_resume, NULL) }; @@ -1776,7 +1776,7 @@ index ce50f3ea87b8..7626c8608f8f 100644 static const struct of_device_id ov8865_of_match[] = { { .compatible = "ovti,ov8865" }, { } -@@ -2956,6 +2963,7 @@ static struct i2c_driver ov8865_driver = { +@@ -2960,6 +2967,7 @@ static struct i2c_driver ov8865_driver = { .driver = { .name = "ov8865", .of_match_table = ov8865_of_match, @@ -1785,9 +1785,9 @@ index ce50f3ea87b8..7626c8608f8f 100644 }, .probe_new = ov8865_probe, -- -2.34.1 +2.35.1 -From 402b2099a17351fc300d2a0453282df6b76fd3d8 Mon Sep 17 00:00:00 2001 +From 12c7673b3c2b88ca1e6bd7a33f2b37bdfc17c781 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 10 Jul 2021 21:20:17 +0100 Subject: [PATCH] media: i2c: Fix incorrect value in comment @@ -1803,7 +1803,7 @@ Patchset: cameras 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 7626c8608f8f..8e3f8a554452 100644 +index 15325df45c2b..8dcdf29be25e 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -713,7 +713,7 @@ static const struct ov8865_pll2_config ov8865_pll2_config_native = { @@ -1816,9 +1816,9 @@ index 7626c8608f8f..8e3f8a554452 100644 static const struct ov8865_pll2_config ov8865_pll2_config_binning = { -- -2.34.1 +2.35.1 -From 0e74b1496706ee4e06dd073bf5cbcf850e0db8b6 Mon Sep 17 00:00:00 2001 +From 07b6529b9616a667262f9de2fb54da4bc1ee8c68 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 10 Jul 2021 22:21:52 +0100 Subject: [PATCH] media: i2c: Defer probe if not endpoint found @@ -1836,10 +1836,10 @@ Patchset: cameras 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 8e3f8a554452..9bc8d5d8199b 100644 +index 8dcdf29be25e..ceb9a93b043a 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c -@@ -2796,10 +2796,8 @@ static int ov8865_probe(struct i2c_client *client) +@@ -2798,10 +2798,8 @@ static int ov8865_probe(struct i2c_client *client) /* Graph Endpoint */ handle = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL); @@ -1853,9 +1853,9 @@ index 8e3f8a554452..9bc8d5d8199b 100644 sensor->endpoint.bus_type = V4L2_MBUS_CSI2_DPHY; -- -2.34.1 +2.35.1 -From 3283a3bd720e70e376d1c1323240239969096883 Mon Sep 17 00:00:00 2001 +From 887d1d97591a76c38d78b567b6c803c60260ae71 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 10 Jul 2021 22:00:25 +0100 Subject: [PATCH] media: i2c: Support 19.2MHz input clock in ov8865 @@ -1873,7 +1873,7 @@ Patchset: cameras 1 file changed, 135 insertions(+), 51 deletions(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 9bc8d5d8199b..4ddc1b277cc0 100644 +index ceb9a93b043a..9bac32efa7fa 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -21,10 +21,6 @@ @@ -2159,7 +2159,7 @@ index 9bc8d5d8199b..4ddc1b277cc0 100644 pll1_rate = ov8865_mode_pll1_rate(sensor, mode); return pll1_rate / config->m_div / 2; -@@ -2783,7 +2841,8 @@ static int ov8865_probe(struct i2c_client *client) +@@ -2785,7 +2843,8 @@ static int ov8865_probe(struct i2c_client *client) struct ov8865_sensor *sensor; struct v4l2_subdev *subdev; struct media_pad *pad; @@ -2169,7 +2169,7 @@ index 9bc8d5d8199b..4ddc1b277cc0 100644 int ret; sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL); -@@ -2858,13 +2917,38 @@ static int ov8865_probe(struct i2c_client *client) +@@ -2860,13 +2919,38 @@ static int ov8865_probe(struct i2c_client *client) goto error_endpoint; } @@ -2212,9 +2212,9 @@ index 9bc8d5d8199b..4ddc1b277cc0 100644 subdev = &sensor->subdev; -- -2.34.1 +2.35.1 -From 2397116765c8feae2aa35ae67cb49f8279cc921a Mon Sep 17 00:00:00 2001 +From a47284b76433178b21fee2a91b59e09684ed4788 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 10 Jul 2021 22:19:10 +0100 Subject: [PATCH] media: i2c: Add .get_selection() support to ov8865 @@ -2229,7 +2229,7 @@ Patchset: cameras 1 file changed, 64 insertions(+) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 4ddc1b277cc0..0f2776390a8e 100644 +index 9bac32efa7fa..d41ce6b5af55 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -450,6 +450,15 @@ @@ -2248,7 +2248,7 @@ index 4ddc1b277cc0..0f2776390a8e 100644 /* Macros */ #define ov8865_subdev_sensor(s) \ -@@ -2756,12 +2765,67 @@ static int ov8865_enum_frame_interval(struct v4l2_subdev *subdev, +@@ -2758,12 +2767,67 @@ static int ov8865_enum_frame_interval(struct v4l2_subdev *subdev, return 0; } @@ -2317,9 +2317,9 @@ index 4ddc1b277cc0..0f2776390a8e 100644 static const struct v4l2_subdev_ops ov8865_subdev_ops = { -- -2.34.1 +2.35.1 -From 1ba730c1776aadbb35ef3cffcaa5471e7a9578c5 Mon Sep 17 00:00:00 2001 +From 3d720100f5243269521a0e2f31de501e500302db Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 10 Jul 2021 22:34:43 +0100 Subject: [PATCH] media: i2c: Switch control to V4L2_CID_ANALOGUE_GAIN @@ -2336,7 +2336,7 @@ Patchset: cameras 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 0f2776390a8e..a832938c33b6 100644 +index d41ce6b5af55..07f34f3ae5ec 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -2150,7 +2150,7 @@ static int ov8865_exposure_configure(struct ov8865_sensor *sensor, u32 exposure) @@ -2348,7 +2348,7 @@ index 0f2776390a8e..a832938c33b6 100644 { int ret; -@@ -2460,8 +2460,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) +@@ -2462,8 +2462,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) if (ret) return ret; break; @@ -2359,7 +2359,7 @@ index 0f2776390a8e..a832938c33b6 100644 if (ret) return ret; break; -@@ -2506,7 +2506,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2508,7 +2508,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) /* Gain */ @@ -2370,9 +2370,9 @@ index 0f2776390a8e..a832938c33b6 100644 /* White Balance */ -- -2.34.1 +2.35.1 -From 62289693d7fab63920cd67449f81d6270babb248 Mon Sep 17 00:00:00 2001 +From 284241a654ddebda25e0382159233c2dc72a376a Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 12 Jul 2021 22:54:56 +0100 Subject: [PATCH] media: i2c: Add vblank control to ov8865 @@ -2386,7 +2386,7 @@ Patchset: cameras 1 file changed, 34 insertions(+) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index a832938c33b6..f741c0713ca4 100644 +index 07f34f3ae5ec..95c1b97eb89a 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -183,6 +183,8 @@ @@ -2427,7 +2427,7 @@ index a832938c33b6..f741c0713ca4 100644 /* State */ static int ov8865_state_mipi_configure(struct ov8865_sensor *sensor, -@@ -2476,6 +2493,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) +@@ -2478,6 +2495,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_TEST_PATTERN: index = (unsigned int)ctrl->val; return ov8865_test_pattern_configure(sensor, index); @@ -2436,7 +2436,7 @@ index a832938c33b6..f741c0713ca4 100644 default: return -EINVAL; } -@@ -2492,6 +2511,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2494,6 +2513,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) struct ov8865_ctrls *ctrls = &sensor->ctrls; struct v4l2_ctrl_handler *handler = &ctrls->handler; const struct v4l2_ctrl_ops *ops = &ov8865_ctrl_ops; @@ -2445,7 +2445,7 @@ index a832938c33b6..f741c0713ca4 100644 int ret; v4l2_ctrl_handler_init(handler, 32); -@@ -2528,6 +2549,13 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2530,6 +2551,13 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) ARRAY_SIZE(ov8865_test_pattern_menu) - 1, 0, 0, ov8865_test_pattern_menu); @@ -2459,7 +2459,7 @@ index a832938c33b6..f741c0713ca4 100644 /* MIPI CSI-2 */ ctrls->link_freq = -@@ -2708,6 +2736,10 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, +@@ -2710,6 +2738,10 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, sensor->state.mbus_code != mbus_code) ret = ov8865_state_configure(sensor, mode, mbus_code); @@ -2470,7 +2470,7 @@ index a832938c33b6..f741c0713ca4 100644 complete: mutex_unlock(&sensor->mutex); -@@ -3035,6 +3067,8 @@ static int ov8865_probe(struct i2c_client *client) +@@ -3037,6 +3069,8 @@ static int ov8865_probe(struct i2c_client *client) /* Sensor */ @@ -2480,9 +2480,9 @@ index a832938c33b6..f741c0713ca4 100644 if (ret) goto error_mutex; -- -2.34.1 +2.35.1 -From 476dcf4df3b82737854f7e941deba7e485f67aca Mon Sep 17 00:00:00 2001 +From c511699932fecf2fe14c97ec12afdcea9034f117 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Tue, 13 Jul 2021 23:40:33 +0100 Subject: [PATCH] media: i2c: Add hblank control to ov8865 @@ -2497,7 +2497,7 @@ Patchset: cameras 1 file changed, 14 insertions(+) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index f741c0713ca4..4b18cc80f985 100644 +index 95c1b97eb89a..85a76aea67a5 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -677,6 +677,7 @@ struct ov8865_state { @@ -2508,7 +2508,7 @@ index f741c0713ca4..4b18cc80f985 100644 struct v4l2_ctrl *vblank; struct v4l2_ctrl_handler handler; -@@ -2513,6 +2514,7 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2515,6 +2516,7 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) const struct v4l2_ctrl_ops *ops = &ov8865_ctrl_ops; const struct ov8865_mode *mode = sensor->state.mode; unsigned int vblank_max, vblank_def; @@ -2516,7 +2516,7 @@ index f741c0713ca4..4b18cc80f985 100644 int ret; v4l2_ctrl_handler_init(handler, 32); -@@ -2550,6 +2552,13 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2552,6 +2554,13 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) 0, 0, ov8865_test_pattern_menu); /* Blanking */ @@ -2530,7 +2530,7 @@ index f741c0713ca4..4b18cc80f985 100644 vblank_max = OV8865_TIMING_MAX_VTS - mode->output_size_y; vblank_def = mode->vts - mode->output_size_y; ctrls->vblank = v4l2_ctrl_new_std(handler, ops, V4L2_CID_VBLANK, -@@ -2696,6 +2705,7 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, +@@ -2698,6 +2707,7 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, struct v4l2_mbus_framefmt *mbus_format = &format->format; const struct ov8865_mode *mode; u32 mbus_code = 0; @@ -2538,7 +2538,7 @@ index f741c0713ca4..4b18cc80f985 100644 unsigned int index; int ret = 0; -@@ -2740,6 +2750,10 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, +@@ -2742,6 +2752,10 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, OV8865_TIMING_MAX_VTS - mode->output_size_y, 1, mode->vts - mode->output_size_y); @@ -2550,9 +2550,9 @@ index f741c0713ca4..4b18cc80f985 100644 mutex_unlock(&sensor->mutex); -- -2.34.1 +2.35.1 -From bcb51e4d7e546e03ffa8b90abeb60d50815fa392 Mon Sep 17 00:00:00 2001 +From bf9ae18793f34033088f3de7466c210a7dc3f824 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 20 Oct 2021 22:43:54 +0100 Subject: [PATCH] media: i2c: Update HTS values in ov8865 @@ -2580,7 +2580,7 @@ Patchset: cameras 1 file changed, 11 insertions(+), 54 deletions(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 4b18cc80f985..1b8674152750 100644 +index 85a76aea67a5..7f5b0c48eac4 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -659,8 +659,6 @@ struct ov8865_mode { @@ -2655,7 +2655,7 @@ index 4b18cc80f985..1b8674152750 100644 /* PLL */ .pll2_binning = true, -@@ -2628,11 +2614,18 @@ static int ov8865_g_frame_interval(struct v4l2_subdev *subdev, +@@ -2630,11 +2616,18 @@ static int ov8865_g_frame_interval(struct v4l2_subdev *subdev, { struct ov8865_sensor *sensor = ov8865_subdev_sensor(subdev); const struct ov8865_mode *mode; @@ -2675,7 +2675,7 @@ index 4b18cc80f985..1b8674152750 100644 mutex_unlock(&sensor->mutex); -@@ -2777,41 +2770,6 @@ static int ov8865_enum_frame_size(struct v4l2_subdev *subdev, +@@ -2779,41 +2772,6 @@ static int ov8865_enum_frame_size(struct v4l2_subdev *subdev, return 0; } @@ -2717,7 +2717,7 @@ index 4b18cc80f985..1b8674152750 100644 static void __ov8865_get_pad_crop(struct ov8865_sensor *sensor, struct v4l2_subdev_state *state, unsigned int pad, -@@ -2870,7 +2828,6 @@ static const struct v4l2_subdev_pad_ops ov8865_subdev_pad_ops = { +@@ -2872,7 +2830,6 @@ static const struct v4l2_subdev_pad_ops ov8865_subdev_pad_ops = { .get_fmt = ov8865_get_fmt, .set_fmt = ov8865_set_fmt, .enum_frame_size = ov8865_enum_frame_size, @@ -2726,9 +2726,9 @@ index 4b18cc80f985..1b8674152750 100644 .set_selection = ov8865_get_selection, }; -- -2.34.1 +2.35.1 -From 2f7d7653db59ffd05403a164ac41638da582f3f3 Mon Sep 17 00:00:00 2001 +From 5836bba7b1910046a5d55cd892c40d00b234c993 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Tue, 13 Jul 2021 23:43:17 +0100 Subject: [PATCH] media: i2c: cap exposure at height + vblank in ov8865 @@ -2744,7 +2744,7 @@ Patchset: cameras 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 1b8674152750..99548ad15dcd 100644 +index 7f5b0c48eac4..d867676bf77e 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -677,6 +677,7 @@ struct ov8865_ctrls { @@ -2755,7 +2755,7 @@ index 1b8674152750..99548ad15dcd 100644 struct v4l2_ctrl_handler handler; }; -@@ -2454,6 +2455,19 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) +@@ -2456,6 +2457,19 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) unsigned int index; int ret; @@ -2775,7 +2775,7 @@ index 1b8674152750..99548ad15dcd 100644 /* Wait for the sensor to be on before setting controls. */ if (pm_runtime_suspended(sensor->dev)) return 0; -@@ -2510,8 +2524,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2512,8 +2526,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) /* Exposure */ @@ -2786,7 +2786,7 @@ index 1b8674152750..99548ad15dcd 100644 /* Gain */ -@@ -2700,6 +2714,7 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, +@@ -2702,6 +2716,7 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, u32 mbus_code = 0; unsigned int hblank; unsigned int index; @@ -2794,7 +2794,7 @@ index 1b8674152750..99548ad15dcd 100644 int ret = 0; mutex_lock(&sensor->mutex); -@@ -2747,6 +2762,13 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, +@@ -2749,6 +2764,13 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, __v4l2_ctrl_modify_range(sensor->ctrls.hblank, hblank, hblank, 1, hblank); @@ -2809,9 +2809,9 @@ index 1b8674152750..99548ad15dcd 100644 mutex_unlock(&sensor->mutex); -- -2.34.1 +2.35.1 -From 8bbf3a86534f5fa56196683084d68cb65e087571 Mon Sep 17 00:00:00 2001 +From e44e80f0a5946b299c58ffa8f85353a9a7089cdc Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Fri, 16 Jul 2021 22:56:15 +0100 Subject: [PATCH] media: i2c: Add controls from fwnode to ov8865 @@ -2826,10 +2826,10 @@ Patchset: cameras 1 file changed, 10 insertions(+) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 99548ad15dcd..dfb5095ef16b 100644 +index d867676bf77e..d0303016e7b4 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c -@@ -2513,6 +2513,7 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2515,6 +2515,7 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) struct v4l2_ctrl_handler *handler = &ctrls->handler; const struct v4l2_ctrl_ops *ops = &ov8865_ctrl_ops; const struct ov8865_mode *mode = sensor->state.mode; @@ -2837,7 +2837,7 @@ index 99548ad15dcd..dfb5095ef16b 100644 unsigned int vblank_max, vblank_def; unsigned int hblank; int ret; -@@ -2576,6 +2577,15 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2578,6 +2579,15 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) v4l2_ctrl_new_std(handler, NULL, V4L2_CID_PIXEL_RATE, 1, INT_MAX, 1, 1); @@ -2854,9 +2854,9 @@ index 99548ad15dcd..dfb5095ef16b 100644 ret = handler->error; goto error_ctrls; -- -2.34.1 +2.35.1 -From d5b0072bb2bf01b521bfcf0fd753afdbb9faf773 Mon Sep 17 00:00:00 2001 +From 0a0bb3e4386c458b36849ea287f87e4d2e5b34ef Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Fri, 16 Jul 2021 00:00:54 +0100 Subject: [PATCH] media: i2c: Switch exposure control unit to lines @@ -2876,7 +2876,7 @@ Patchset: cameras 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index dfb5095ef16b..5f19d82554df 100644 +index d0303016e7b4..a638e53bb069 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -2125,6 +2125,9 @@ static int ov8865_exposure_configure(struct ov8865_sensor *sensor, u32 exposure) @@ -2889,7 +2889,7 @@ index dfb5095ef16b..5f19d82554df 100644 ret = ov8865_write(sensor, OV8865_EXPOSURE_CTRL_HH_REG, OV8865_EXPOSURE_CTRL_HH(exposure)); if (ret) -@@ -2525,8 +2528,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2527,8 +2530,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) /* Exposure */ @@ -2901,45 +2901,9 @@ index dfb5095ef16b..5f19d82554df 100644 /* Gain */ -- -2.34.1 +2.35.1 -From 356aa1b9970681877ec41c3070864b458312fb76 Mon Sep 17 00:00:00 2001 -From: Daniel Scally -Date: Tue, 24 Aug 2021 22:39:02 +0100 -Subject: [PATCH] media: i2c: Re-order runtime pm initialisation - -The kerneldoc for pm_runtime_set_suspended() says: - -"It is not valid to call this function for devices with runtime PM -enabled" - -To satisfy that requirement, re-order the calls so that -pm_runtime_enable() is the last one. - -Signed-off-by: Daniel Scally -Patchset: cameras ---- - drivers/media/i2c/ov8865.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 5f19d82554df..18b5f1e8e9a7 100644 ---- a/drivers/media/i2c/ov8865.c -+++ b/drivers/media/i2c/ov8865.c -@@ -3085,8 +3085,8 @@ static int ov8865_probe(struct i2c_client *client) - - /* Runtime PM */ - -- pm_runtime_enable(sensor->dev); - pm_runtime_set_suspended(sensor->dev); -+ pm_runtime_enable(sensor->dev); - - /* V4L2 subdev register */ - --- -2.34.1 - -From 0cf665f87ff80019f95aabe51c74e8c52d88dfbf Mon Sep 17 00:00:00 2001 +From 9caf72b5dab0aa52bfc5fec3f375798ea0ebd945 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Tue, 24 Aug 2021 23:17:39 +0100 Subject: [PATCH] media: i2c: Use dev_err_probe() in ov8865 @@ -2956,10 +2920,10 @@ Patchset: cameras 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 18b5f1e8e9a7..19e6bebf340d 100644 +index a638e53bb069..5ef9c407362a 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c -@@ -2955,6 +2955,26 @@ static int ov8865_probe(struct i2c_client *client) +@@ -2957,6 +2957,26 @@ static int ov8865_probe(struct i2c_client *client) sensor->dev = dev; sensor->i2c_client = client; @@ -2986,7 +2950,7 @@ index 18b5f1e8e9a7..19e6bebf340d 100644 /* Graph Endpoint */ handle = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL); -@@ -2985,32 +3005,6 @@ static int ov8865_probe(struct i2c_client *client) +@@ -2987,32 +3007,6 @@ static int ov8865_probe(struct i2c_client *client) goto error_endpoint; } @@ -3020,9 +2984,9 @@ index 18b5f1e8e9a7..19e6bebf340d 100644 sensor->extclk = devm_clk_get(dev, NULL); -- -2.34.1 +2.35.1 -From 0fc879df264184696fad72f153d179c55cfa81fe Mon Sep 17 00:00:00 2001 +From 5a3dbe68b3bd4b7512d0d5b2d3fe75b6a6d7091a Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 14 Jul 2021 00:05:04 +0100 Subject: [PATCH] media: ipu3-cio2: Add INT347A to cio2-bridge @@ -3040,7 +3004,7 @@ Patchset: cameras 1 file changed, 2 insertions(+) diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.c b/drivers/media/pci/intel/ipu3/cio2-bridge.c -index 67c467d3c81f..0c1c5d8d8dfd 100644 +index 0b586b4e537e..4550be801311 100644 --- a/drivers/media/pci/intel/ipu3/cio2-bridge.c +++ b/drivers/media/pci/intel/ipu3/cio2-bridge.c @@ -22,6 +22,8 @@ @@ -3053,55 +3017,9 @@ index 67c467d3c81f..0c1c5d8d8dfd 100644 CIO2_SENSOR_CONFIG("OVTI2680", 0), }; -- -2.34.1 +2.35.1 -From 68ba64c731b9df3d9c0d76ab4c8d9c06e003cee3 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Thu, 7 Oct 2021 15:34:52 +0200 -Subject: [PATCH] media: i2c: ov8865: Fix lockdep error - -ov8865_state_init() calls ov8865_state_mipi_configure() which uses -__v4l2_ctrl_s_ctrl[_int64](). This means that sensor->mutex (which -is also sensor->ctrls.handler.lock) must be locked before calling -ov8865_state_init(). - -Note ov8865_state_mipi_configure() is also used in other places where -the lock is already held so it cannot be changed itself. - -This fixes the following lockdep kernel WARN: - -[ 13.233413] ------------[ cut here ]------------ -[ 13.233421] WARNING: CPU: 0 PID: 8 at drivers/media/v4l2-core/v4l2-ctrls-api.c:833 __v4l2_ctrl_s_ctrl+0x4d/0x60 [videodev] -... -[ 13.234063] Call Trace: -[ 13.234074] ov8865_state_configure+0x98b/0xc00 [ov8865] -[ 13.234095] ov8865_probe+0x4b1/0x54c [ov8865] -[ 13.234117] i2c_device_probe+0x13c/0x2d0 - -Signed-off-by: Hans de Goede -Patchset: cameras ---- - drivers/media/i2c/ov8865.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 19e6bebf340d..d5af8aedf5e8 100644 ---- a/drivers/media/i2c/ov8865.c -+++ b/drivers/media/i2c/ov8865.c -@@ -3073,7 +3073,9 @@ static int ov8865_probe(struct i2c_client *client) - if (ret) - goto error_mutex; - -+ mutex_lock(&sensor->mutex); - ret = ov8865_state_init(sensor); -+ mutex_unlock(&sensor->mutex); - if (ret) - goto error_ctrls; - --- -2.34.1 - -From ad795bc149f99e991391abcbe26a578f4b4b50dd Mon Sep 17 00:00:00 2001 +From 32ac5542aec7afb719d04f562d71a2bf2bc6e539 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:56:57 +0200 Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an @@ -3162,7 +3080,7 @@ Patchset: cameras 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 2c80765670bc..6385024170ac 100644 +index 25d9f04f1995..0ba60b3338fe 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -797,6 +797,12 @@ static const char * const acpi_ignore_dep_ids[] = { @@ -3178,7 +3096,7 @@ index 2c80765670bc..6385024170ac 100644 static struct acpi_device *acpi_bus_get_parent(acpi_handle handle) { struct acpi_device *device = NULL; -@@ -1762,8 +1768,12 @@ static void acpi_scan_dep_init(struct acpi_device *adev) +@@ -1769,8 +1775,12 @@ static void acpi_scan_dep_init(struct acpi_device *adev) struct acpi_dep_data *dep; list_for_each_entry(dep, &acpi_dep_list, node) { @@ -3192,7 +3110,7 @@ index 2c80765670bc..6385024170ac 100644 } } -@@ -1967,7 +1977,7 @@ static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) +@@ -1974,7 +1984,7 @@ static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) for (count = 0, i = 0; i < dep_devices.count; i++) { struct acpi_device_info *info; struct acpi_dep_data *dep; @@ -3201,7 +3119,7 @@ index 2c80765670bc..6385024170ac 100644 status = acpi_get_object_info(dep_devices.handles[i], &info); if (ACPI_FAILURE(status)) { -@@ -1976,6 +1986,7 @@ static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) +@@ -1983,6 +1993,7 @@ static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) } skip = acpi_info_matches_ids(info, acpi_ignore_dep_ids); @@ -3209,7 +3127,7 @@ index 2c80765670bc..6385024170ac 100644 kfree(info); if (skip) -@@ -1989,6 +2000,7 @@ static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) +@@ -1996,6 +2007,7 @@ static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) dep->supplier = dep_devices.handles[i]; dep->consumer = handle; @@ -3217,7 +3135,7 @@ index 2c80765670bc..6385024170ac 100644 mutex_lock(&acpi_dep_list_lock); list_add_tail(&dep->node , &acpi_dep_list); -@@ -2076,6 +2088,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used, +@@ -2083,6 +2095,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used, static void acpi_default_enumeration(struct acpi_device *device) { @@ -3227,7 +3145,7 @@ index 2c80765670bc..6385024170ac 100644 /* * Do not enumerate devices with enumeration_by_parent flag set as * they will be enumerated by their respective parents. -@@ -2318,6 +2333,23 @@ void acpi_dev_clear_dependencies(struct acpi_device *supplier) +@@ -2325,6 +2340,23 @@ void acpi_dev_clear_dependencies(struct acpi_device *supplier) } EXPORT_SYMBOL_GPL(acpi_dev_clear_dependencies); @@ -3252,7 +3170,7 @@ index 2c80765670bc..6385024170ac 100644 * acpi_dev_get_first_consumer_dev - Return ACPI device dependent on @supplier * @supplier: Pointer to the dependee device diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h -index 480f9207a4c6..2f93ecf05dac 100644 +index d6fe27b695c3..5895f6c7f6db 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -202,7 +202,8 @@ struct acpi_device_flags { @@ -3273,7 +3191,7 @@ index 480f9207a4c6..2f93ecf05dac 100644 }; /* Performance Management */ -@@ -693,6 +695,7 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) +@@ -694,6 +696,7 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2); void acpi_dev_clear_dependencies(struct acpi_device *supplier); @@ -3282,9 +3200,9 @@ index 480f9207a4c6..2f93ecf05dac 100644 struct acpi_device * acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv); -- -2.34.1 +2.35.1 -From 6dbc7e9bbbc1aff5f7e16f2bb5f8e22b72dfc00c Mon Sep 17 00:00:00 2001 +From 0c945874b424fde022f195bb58cac7a8c05f1554 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:56:58 +0200 Subject: [PATCH] i2c: acpi: Use acpi_dev_ready_for_enumeration() helper @@ -3334,9 +3252,9 @@ index 3b688cea8e00..0542d8aba902 100644 return -ENODEV; -- -2.34.1 +2.35.1 -From 9b4c9d5d362e1624b8d9f5ecf49486257c70453b Mon Sep 17 00:00:00 2001 +From 51a083ff34bb2c3829a38be5cd113ff53f4b99d8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:56:59 +0200 Subject: [PATCH] platform_data: Add linux/platform_data/tps68470.h file @@ -3407,9 +3325,9 @@ index 000000000000..126d082c3f2e + +#endif -- -2.34.1 +2.35.1 -From 190e1d22b43f4e5300ad28739c4aa0709f33860c Mon Sep 17 00:00:00 2001 +From 39d70d182de882593abf20a649ae31e375109357 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:57:00 +0200 Subject: [PATCH] regulator: Introduce tps68470-regulator driver @@ -3669,9 +3587,9 @@ index 000000000000..3129fa13a122 +MODULE_DESCRIPTION("TPS68470 voltage regulator driver"); +MODULE_LICENSE("GPL v2"); -- -2.34.1 +2.35.1 -From 5a056cdfd2509a10378053861dbaafc6288098de Mon Sep 17 00:00:00 2001 +From 406ba8c572d8df6940640f57416cb1a5830e6230 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:57:01 +0200 Subject: [PATCH] clk: Introduce clk-tps68470 driver @@ -4014,9 +3932,9 @@ index ffe81127d91c..7807fa329db0 100644 #define TPS68470_GPIO_CTL_REG_B(x) (TPS68470_REG_GPCTL0B + (x) * 2) #define TPS68470_GPIO_MODE_MASK GENMASK(1, 0) -- -2.34.1 +2.35.1 -From 5773134e6376a818cdea8c15447b6c9eb26da355 Mon Sep 17 00:00:00 2001 +From 2f68b3abe00b2efaeee9c3e42de08ef6bc5145d3 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 10 Oct 2021 20:57:02 +0200 Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain @@ -4051,9 +3969,9 @@ index c05b4cf502fe..42e688f4cad4 100644 return 0; -- -2.34.1 +2.35.1 -From 85062c3816e98da6370c4b95fd0cf499adda91cb Mon Sep 17 00:00:00 2001 +From 366023d8b8890f8f0db522fc6544953a9b75ffb9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:57:03 +0200 Subject: [PATCH] platform/x86: int3472: Split into 2 drivers @@ -4310,9 +4228,9 @@ index 42e688f4cad4..b94cf66ab61f 100644 +MODULE_AUTHOR("Daniel Scally "); +MODULE_LICENSE("GPL v2"); -- -2.34.1 +2.35.1 -From ca4571a3af3604abce4f95ae031c87ebf22161cc Mon Sep 17 00:00:00 2001 +From 2d30a7e0711e34512f1d4039c935ae4c07bb9ac8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:57:04 +0200 Subject: [PATCH] platform/x86: int3472: Add get_sensor_adev_and_name() helper @@ -4423,9 +4341,9 @@ index a19a1f5dbdd7..efd31a0c7a88 100644 static int skl_int3472_discrete_remove(struct platform_device *pdev) -- -2.34.1 +2.35.1 -From b81c726c0d7568ded109d37f1a4c2803466e7b64 Mon Sep 17 00:00:00 2001 +From 43c422eff77663cb34cc8a0aa7fbd820bb085b48 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:57:05 +0200 Subject: [PATCH] platform/x86: int3472: Pass tps68470_clk_platform_data to the @@ -4511,9 +4429,9 @@ index b94cf66ab61f..78e34e7b6969 100644 case DESIGNED_FOR_CHROMEOS: ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE, -- -2.34.1 +2.35.1 -From abdf52f78104bb61eb43ba5e764773d76914c8c2 Mon Sep 17 00:00:00 2001 +From f6dc78b227773f530fecd744f974e8f234d9be9c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:57:06 +0200 Subject: [PATCH] platform/x86: int3472: Pass tps68470_regulator_platform_data @@ -4805,9 +4723,9 @@ index 000000000000..96954a789bb8 + return NULL; +} -- -2.34.1 +2.35.1 -From d4d2b610f59c11809fbb157d9ca4b4441926cc4d Mon Sep 17 00:00:00 2001 +From e34f0cc46d6b6671dd57ddeafd58faa82562a3df Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:57:07 +0200 Subject: [PATCH] platform/x86: int3472: Deal with probe ordering issues @@ -4889,9 +4807,9 @@ index aae24d228770..21c6c1a6edfc 100644 MODULE_LICENSE("GPL v2"); +MODULE_SOFTDEP("pre: clk-tps68470 tps68470-regulator"); -- -2.34.1 +2.35.1 -From e0f6f33f5b58ad90fa1451d2e59c518e79ed8293 Mon Sep 17 00:00:00 2001 +From 7a52885c75fcdbbc3961a2015b7d69c0674bf77b Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 4 Nov 2021 21:46:27 +0000 Subject: [PATCH] media: i2c: Add integration time margin to ov8865 @@ -4909,7 +4827,7 @@ Patchset: cameras 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index d5af8aedf5e8..966487e32bfe 100644 +index 5ef9c407362a..ed038efbc084 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -143,6 +143,7 @@ @@ -4920,7 +4838,7 @@ index d5af8aedf5e8..966487e32bfe 100644 #define OV8865_GAIN_CTRL_H_REG 0x3508 #define OV8865_GAIN_CTRL_H(v) (((v) & GENMASK(12, 8)) >> 8) -@@ -2462,7 +2463,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) +@@ -2464,7 +2465,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) if (ctrl->id == V4L2_CID_VBLANK) { int exposure_max; @@ -4931,9 +4849,9 @@ index d5af8aedf5e8..966487e32bfe 100644 sensor->ctrls.exposure->minimum, exposure_max, -- -2.34.1 +2.35.1 -From 112e3114442fa5c8b509dd1b040ae2a114d6b294 Mon Sep 17 00:00:00 2001 +From a5851e4454261f8ff96de8e60f84fb152bd5e41e Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 4 Nov 2021 21:48:38 +0000 Subject: [PATCH] media: i2c: Fix max gain in ov8865 @@ -4950,10 +4868,10 @@ Patchset: cameras 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c -index 966487e32bfe..6c78edb65d1e 100644 +index ed038efbc084..5bedcddafe36 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c -@@ -2535,7 +2535,7 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) +@@ -2537,7 +2537,7 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) /* Gain */ @@ -4963,9 +4881,9 @@ index 966487e32bfe..6c78edb65d1e 100644 /* White Balance */ -- -2.34.1 +2.35.1 -From 4d22e6a654d4f9ab2033c563c49dc07c843922ac Mon Sep 17 00:00:00 2001 +From 2df77bba917602b0515ad39016808bd196891da6 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 3 Dec 2021 12:51:08 +0100 Subject: [PATCH] mfd: intel-lpss: Fix I2C4 not being available on the @@ -5014,7 +4932,7 @@ Patchset: cameras 3 files changed, 14 insertions(+) diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c -index a872b4485eac..81185d17d9c9 100644 +index f70464ce8e3d..22eefd71f8c4 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -17,6 +17,15 @@ @@ -5068,9 +4986,9 @@ index 22dbc4aed793..062ce95b68b9 100644 unsigned long clk_rate; const char *clk_con_id; -- -2.34.1 +2.35.1 -From bade949c01a5cabfa8d652bc2af00db127e42241 Mon Sep 17 00:00:00 2001 +From 12b8d0d130b8faa657016a916aa0ffd03c2086a6 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 6 Jan 2022 22:12:38 +0000 Subject: [PATCH] platform/x86: int3472: Add board data for Surface Go 3 @@ -5117,5 +5035,5 @@ index 96954a789bb8..2dcadfa62196 100644 }; -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0011-amd-gpio.patch b/patches/5.16/0011-amd-gpio.patch index 10f4801ed..66b1412c3 100644 --- a/patches/5.16/0011-amd-gpio.patch +++ b/patches/5.16/0011-amd-gpio.patch @@ -1,4 +1,4 @@ -From 78dd3fef224a7f8e06e8cf502a60ed901cce50ac Mon Sep 17 00:00:00 2001 +From a3161be32fe17e768defa378579c68a401c32ca0 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sat, 29 May 2021 17:47:38 +1000 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7 @@ -63,9 +63,9 @@ index 5b6d1a95776f..0a05e196419a 100644 mp_config_acpi_legacy_irqs(); -- -2.34.1 +2.35.1 -From 67b587ef8f6136f44c51c3d23233c29d64e05a6c Mon Sep 17 00:00:00 2001 +From 56e449a93f251149e8f4cc6e5e278a24138d9bfb Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 3 Jun 2021 14:04:26 +0200 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override @@ -105,5 +105,5 @@ index 0a05e196419a..35de5613980a 100644 }; -- -2.34.1 +2.35.1 diff --git a/patches/5.16/0012-misc-fixes.patch b/patches/5.16/0012-misc-fixes.patch index 95c49c0ba..643aafef7 100644 --- a/patches/5.16/0012-misc-fixes.patch +++ b/patches/5.16/0012-misc-fixes.patch @@ -1,4 +1,4 @@ -From 79c1f0e58b463796983080bb5b6087ff16891163 Mon Sep 17 00:00:00 2001 +From 542c79760afc782ac24b9783f2ad3bd32ddd3b4c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 8 Dec 2021 16:22:50 +0100 Subject: [PATCH] acpi/battery: Add device HID and quirk for Microsoft Surface @@ -19,10 +19,10 @@ Patchset: misc-fixes 1 file changed, 12 insertions(+) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c -index 8afa85d6eb6a..65882cb791a5 100644 +index ead0114f27c9..56db7b4da514 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c -@@ -59,6 +59,10 @@ MODULE_PARM_DESC(cache_time, "cache time in milliseconds"); +@@ -60,6 +60,10 @@ MODULE_PARM_DESC(cache_time, "cache time in milliseconds"); static const struct acpi_device_id battery_device_ids[] = { {"PNP0C0A", 0}, @@ -33,8 +33,8 @@ index 8afa85d6eb6a..65882cb791a5 100644 {"", 0}, }; -@@ -1155,6 +1159,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = { - DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo MIIX 320-10ICR"), +@@ -1177,6 +1181,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = { + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"), }, }, + { @@ -49,5 +49,5 @@ index 8afa85d6eb6a..65882cb791a5 100644 }; -- -2.34.1 +2.35.1 diff --git a/pkg/arch/kernel/PKGBUILD b/pkg/arch/kernel/PKGBUILD index 81bc9eff7..f0b966cda 100644 --- a/pkg/arch/kernel/PKGBUILD +++ b/pkg/arch/kernel/PKGBUILD @@ -49,18 +49,18 @@ sha256sums=('SKIP' '7cbba374356a189faac71001c5344ce8f02434684b1ce1accefc0cc4bd6718e5' '63e0aa01e590c789a2a312f48cdc467b29734465cdf87e206b7a7e0f82e22bc4' 'b30cd71018df7e98101ba0cf37054169006b096d2870a9f8467dd96378b02b98' - 'a9e1be6204757c9fbda5bd82a08741ba8ffb5daec799a25d48aa8125df91bd3f' - '378a140cd6a466ece99f3248efdf2235e44149a12867aa7e64270ac324ef0584' - '72375a58489612777272668cf766603431df57960c49326a8c12599be8339cb9' - '55bf2b1fdc9dcc7ee45f21886bac631c6341ad84808f550da438934ba3d2bf99' - 'f55e585981f08dce52b414473560afe6affa0aa750f33b070f750d47d96d36ff' - '32c4258904fbc06659d256776d8ab30123d27216f9010b79b933c7bd05a6e9e1' - 'e72789e7abb6f4e74e9ef19574e74316c9f928d49be057afa8b3fceaa379aabf' - '72b362340f3c171e28f91f707dbdea0a9106181c2f55eb4af3119db28d6df9e2' - '077229cac03a8f085de2be6ffcdaf7ff7568433c0f1f8562d5b32f2559228598' - 'f19f6c6143bced4f69754995d2a71108c9ba0ee98a49b99f3587f3c8e62a075f' - '77e67b8ac5bef13009b90e48d343a3be683575fc36e4df7cd62d553eb34c5db0' - '8ef47de31952e7f20b56986b751cbf02b3b94ce46c93684e24a9641c90846e65') + 'b170be558d9f62cec7afec5e2bb002524256d5fa1d82dc0412b3dd7cd0c7e6fb' + 'a3ed1962d636de3250229fcfac724c50e890ea51d9b88675a8218c7aafba9321' + 'd3550179c596ecdc4bc3d2f84bfca55d957c668b82e9f2b79b62d4ced3465a54' + '464d98be85b15a71c79d3d8cdad41a99acbb03eb8c8e4540b0ffb44e59c6a5cf' + '684e79d400b96ad547191128fe40b4b4a8602b8db0ebaef8d601b2e884f8eaf3' + '4d191cbcf4a4aaaad7c18077ad314ec0143c1862569828b0c4686f9099a57de9' + 'f2db169c351244f621add715c62cfd4305fcaddde250733032e9dff55a67d42d' + '349e12684dad74a95308781a918a08b6f248282af9217e0f6c870b2078133a4b' + '65a0f86569bd68aff2add4e056642bb8cd47bc094c41f74b4caddc5b4302cf4c' + 'c66407affe0d73e7e5642f0d62b3a7ce8c16860004cee834412820921819def7' + '74b2343d8577e446a1c2de9f72839c24b65fcdda6d600812bbcfe9bcc6eca881' + '54b81e4aba3f88f03da5e979d37d116f4b3e1b5d69c8da8f83ff154a3addfad0') export KBUILD_BUILD_HOST=archlinux