Update v5.12 patches

Changes:
 - SAM:
   - Add support for Surface Laptop 4
     - Fix legacy PIC initialization issue
     - Add missing device IDs for GPIO controller and UARTs
   - Small code fixes

 - Cameras:
   - Fix for subdevice properties

Links:
 - kernel: 0c2ae61563
 - SAM: 0b52307159
This commit is contained in:
Maximilian Luz 2021-05-11 19:53:44 +02:00
parent 45ccf805bd
commit de116c5fd5
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
9 changed files with 332 additions and 71 deletions

View file

@ -1,4 +1,4 @@
From 3c43528f8c4fa28ea93781f553014a2c5b709396 Mon Sep 17 00:00:00 2001
From d0eacfedf5f6d7c8fd922dff1cb65af9cff55bde Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Sun, 18 Oct 2020 16:42:44 +0900
Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI

View file

@ -1,4 +1,4 @@
From 839c1d7437de97b253482ab0526200330a87b49e Mon Sep 17 00:00:00 2001
From 3596a76849d8e7c32b55afdaefc7a14dec73535a Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Mon, 28 Sep 2020 17:46:49 +0900
Subject: [PATCH] mwifiex: pcie: add DMI-based quirk impl for Surface devices
@ -206,7 +206,7 @@ index 000000000000..5326ae7e5671
--
2.31.1
From acdc19b03d9c4f21fe4a2dfa0cf3c1f8cf85f083 Mon Sep 17 00:00:00 2001
From ccb67c2d419363144d81c90116241ecb02c8aa00 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Tue, 29 Sep 2020 17:25:22 +0900
Subject: [PATCH] mwifiex: pcie: add reset_d3cold quirk for Surface gen4+
@ -407,7 +407,7 @@ index 5326ae7e5671..8b9dcb5070d8 100644
--
2.31.1
From 609432b3d8ffc0875aa1662633324ae5d202e41f Mon Sep 17 00:00:00 2001
From 015c67d03094f80d7654590f52346ae0f057895f Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Tue, 29 Sep 2020 17:32:22 +0900
Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
@ -586,7 +586,7 @@ index 8b9dcb5070d8..3ef7440418e3 100644
--
2.31.1
From 24a1ae55645ca4d7d2bde47d1943b4535e656566 Mon Sep 17 00:00:00 2001
From 8678d63c360deb7b252e3d4e77501f324ef6c275 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Wed, 30 Sep 2020 18:08:24 +0900
Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
@ -648,7 +648,7 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
--
2.31.1
From 0bfa4441da97c18a79e9466e4f796b5ff5f084d9 Mon Sep 17 00:00:00 2001
From 560a67e4d3cafa4244a7dc6d1b05a13fbe711d10 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Sun, 4 Oct 2020 00:11:49 +0900
Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@ -803,7 +803,7 @@ index 3ef7440418e3..a95ebac06e13 100644
--
2.31.1
From b0c566722c6b7ce45b68f67c6b94554fbc3f12fb Mon Sep 17 00:00:00 2001
From bf387df3cb4f962f8ac1b1dccc32d79f57e1847f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 3 Nov 2020 13:28:04 +0100
Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
@ -970,7 +970,7 @@ index a95ebac06e13..4ec2ae72f632 100644
--
2.31.1
From 36605f7215e9625de1b5f23253fc60af3ae93c04 Mon Sep 17 00:00:00 2001
From f75c9270c62f4e6e63992f00d4efafe5b89f92d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Thu, 25 Mar 2021 11:33:02 +0100
Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell
@ -1048,7 +1048,7 @@ index 5cbfbd948f67..824512fafa23 100644
--
2.31.1
From 85492c085d47cdd5499f0f2123577c8fc23dad4e Mon Sep 17 00:00:00 2001
From b5afd603cf51c04375333eade03e8591afbbc9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Wed, 11 Nov 2020 12:31:26 +0100
Subject: [PATCH] mwifiex: Small cleanup for handling virtual interface type
@ -1149,7 +1149,7 @@ index a2ed268ce0da..789de1b0c5b1 100644
--
2.31.1
From f1fea75c641564a6c18d4d9a953879fd027c0e04 Mon Sep 17 00:00:00 2001
From 9fb79eb7550213b49113f6a5a3769beb036e84a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 10 Nov 2020 12:49:56 +0100
Subject: [PATCH] mwifiex: Use non-posted PCI register writes
@ -1206,7 +1206,7 @@ index 8a99e243aff2..84b1d30e07e4 100644
--
2.31.1
From 3933d77762a306930dfb0ba1ff6242c1395f7690 Mon Sep 17 00:00:00 2001
From ab74478cdd1d5420724fc08c86334c89723b30be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Wed, 11 Nov 2020 12:44:39 +0100
Subject: [PATCH] mwifiex: Use function to check whether interface type change
@ -1439,7 +1439,7 @@ index 789de1b0c5b1..13698818e58a 100644
--
2.31.1
From 29e7e389e5242dcfa8a622ea3ca01a44824990fc Mon Sep 17 00:00:00 2001
From dec53d6370752fb8d6e92d16320165b0b3287004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Wed, 11 Nov 2020 13:33:04 +0100
Subject: [PATCH] mwifiex: Run SET_BSS_MODE when changing from P2P to STATION
@ -1507,7 +1507,7 @@ index 13698818e58a..f5b9f1d26114 100644
--
2.31.1
From 278002e59e1bfad3f9f849fb2402547d0ff445db Mon Sep 17 00:00:00 2001
From e5bfda138b3eb1e9f0011f92e4d7dbd2d4816fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Wed, 11 Nov 2020 14:42:54 +0100
Subject: [PATCH] mwifiex: Use helper function for counting interface types
@ -1683,7 +1683,7 @@ index f5b9f1d26114..44cff715bf29 100644
--
2.31.1
From 86ce2f912a9ee6b579e33dee1a13279511bcf34a Mon Sep 17 00:00:00 2001
From 8519e68fec2ad73a8b493969029b9b7a8467c740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Fri, 26 Mar 2021 15:56:58 +0100
Subject: [PATCH] mwifiex: Update virtual interface counters right after
@ -1786,7 +1786,7 @@ index 44cff715bf29..e637129a411f 100644
--
2.31.1
From 851692b24cb46c2f5450d78583d6b148ad4f0f59 Mon Sep 17 00:00:00 2001
From ab492bd676fcb8c90caff134af78d560b3490cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Wed, 11 Nov 2020 13:42:40 +0100
Subject: [PATCH] mwifiex: Allow switching interface type from P2P_CLIENT to
@ -1875,7 +1875,7 @@ index e637129a411f..395573db6405 100644
--
2.31.1
From 42a9b01e72f6ced95f6b27101ad9db53bd4a0215 Mon Sep 17 00:00:00 2001
From e4791054528309e003aef43a0f0558d873a1c931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Fri, 26 Mar 2021 15:31:08 +0100
Subject: [PATCH] mwifiex: Handle interface type changes from AP to STATION
@ -1902,7 +1902,7 @@ index 395573db6405..90a757aa0b25 100644
--
2.31.1
From 0c02cc80b25f90ab410103a493d73fd023f05abb Mon Sep 17 00:00:00 2001
From ab39a7f08c0ce93a37678e312beb8c549ef93d3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Fri, 26 Mar 2021 15:32:16 +0100
Subject: [PATCH] mwifiex: Properly initialize private structure on interface
@ -1957,7 +1957,7 @@ index 90a757aa0b25..0c01d8f9048e 100644
--
2.31.1
From d2574c9f7fd3d0efc7bf8c07f8415c8bf18b9b74 Mon Sep 17 00:00:00 2001
From 8724b59dec1bfc4e121d56fc2af7896ad5828da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Sat, 27 Mar 2021 12:19:14 +0100
Subject: [PATCH] mwifiex: Fix copy-paste mistake when creating virtual
@ -1989,7 +1989,7 @@ index 0c01d8f9048e..8c472b2d982a 100644
--
2.31.1
From 8a39e3cce26f0df0242d7fc5b8f91c3116c406e8 Mon Sep 17 00:00:00 2001
From 357fcda1afc4358341fc0e08e07e7e8b5dd3b80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Sun, 28 Mar 2021 21:10:06 +0200
Subject: [PATCH] mwifiex: Try waking the firmware until we get an interrupt
@ -2078,7 +2078,7 @@ index 84b1d30e07e4..88d30ec6d57d 100644
--
2.31.1
From 2eb1eb70eceb55d17d4948ee8b95159bac444c2a Mon Sep 17 00:00:00 2001
From e1528a86d8fa7d6ccb2e3f66072570dfdbfe74d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 13 Apr 2021 14:30:28 +0200
Subject: [PATCH] mwifiex: Deactive host sleep using HSCFG after it was
@ -2234,7 +2234,7 @@ index d3a968ef21ef..76db9a7b8199 100644
--
2.31.1
From 2d7964c9df5107c53d241816afd826683052d4d2 Mon Sep 17 00:00:00 2001
From 0eeac2b292dd66fe0c5d98fcbd2b88f451182d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 13 Apr 2021 14:23:05 +0200
Subject: [PATCH] mwifiex: Add quirk to disable deep sleep with certain
@ -2337,7 +2337,7 @@ index 6b5d35d9e69f..8e49ebca1847 100644
--
2.31.1
From 3efbf69305a003ee7ad0b09157be0ed6307b63e5 Mon Sep 17 00:00:00 2001
From b9a6b46fd8f7fb2c184be6b626736c09d8614841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Wed, 11 Nov 2020 15:17:07 +0100
Subject: [PATCH] mwifiex: Don't log error on suspend if wake-on-wlan is
@ -2369,7 +2369,7 @@ index 8c472b2d982a..153025d1b2fa 100644
--
2.31.1
From 24eace3d82040069a68e13d6a80053ae1d597306 Mon Sep 17 00:00:00 2001
From bd81bc5914db84b7b31fe58c6d3e3176c4d6cd3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Sun, 28 Mar 2021 21:42:54 +0200
Subject: [PATCH] mwifiex: Log an error on command failure during key-material
@ -2409,7 +2409,7 @@ index 153025d1b2fa..ef6ce3f63aec 100644
--
2.31.1
From 0d3a1e277248feaf3da3cd21f0ce68bfeec46f65 Mon Sep 17 00:00:00 2001
From 75c94be522f0df35fd29c4dfc39a923dea06d108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 13 Apr 2021 12:44:03 +0200
Subject: [PATCH] mwifiex: Fix an incorrect comment
@ -2437,7 +2437,7 @@ index 6696bce56178..b0695432b26a 100644
--
2.31.1
From 06335e34442a195630c19a55abba6f7b4dc3b7ba Mon Sep 17 00:00:00 2001
From 157e47ebb98d87afadee85569c72dbb799d221b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 13 Apr 2021 12:45:59 +0200
Subject: [PATCH] mwifiex: Send DELBA requests according to spec
@ -2480,7 +2480,7 @@ index b0695432b26a..9ff2058bcd7e 100644
--
2.31.1
From c8196c059e85bacc463ebb7055359735bd20ad0a Mon Sep 17 00:00:00 2001
From c69a999af5099a54e3c751e748e3e1e955081bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 13 Apr 2021 12:57:41 +0200
Subject: [PATCH] mwifiex: Ignore BTCOEX events from the firmware

View file

@ -1,4 +1,4 @@
From 19d746dc9980d9109b93c9424138d3966c8a67cf Mon Sep 17 00:00:00 2001
From 2bf136857468473347b126eff8226fac207807e5 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 27 Feb 2021 00:45:52 +0100
Subject: [PATCH] ath10k: Add module parameters to override board files

View file

@ -1,4 +1,4 @@
From 744ada53b8de5b3aab134a0593f09d2845b10a24 Mon Sep 17 00:00:00 2001
From 582a1ab0b359cbe8daa444aa19075a627e0c953b Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Thu, 30 Jul 2020 13:21:53 +0200
Subject: [PATCH] misc: mei: Add missing IPTS device IDs
@ -36,7 +36,7 @@ index c3393b383e59..0098f98426c1 100644
--
2.31.1
From 714d09089cdf91c6f2f54f04d08be663884777eb Mon Sep 17 00:00:00 2001
From 53fd6bc65d8ca2a4121cfe20712bd0fe1cf7a8a7 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Thu, 6 Aug 2020 11:20:41 +0200
Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus

View file

@ -1,4 +1,4 @@
From e72c7d0b6c7b5ee1f99a749ff56379bb67033ec3 Mon Sep 17 00:00:00 2001
From a94d814468ffc67b08b641c26379a58acfbbf1b6 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 25 Jul 2020 17:19:53 +0200
Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@ -110,7 +110,7 @@ index 8ceaa88dd78f..deceed0d76c6 100644
--
2.31.1
From 597647585a2c0f369f47a3f5c1e58a1251b8fa97 Mon Sep 17 00:00:00 2001
From 25792e2ac56e0cd621ff71c38b4881b6a44ea76c Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 13 Feb 2021 16:41:18 +0100
Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch

View file

@ -1,4 +1,4 @@
From d85a26f2eb7a2ed68e4c56030c030bd151f90eeb Mon Sep 17 00:00:00 2001
From 034c10f7c04684bba28833b3b8136368c9dc7527 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 12 Feb 2021 12:54:34 +0100
Subject: [PATCH] platform/surface: Set up Surface Aggregator device registry
@ -396,7 +396,7 @@ index 000000000000..a051d941ad96
--
2.31.1
From fc0cef48bcf0326c3cecd52fc22bdec318b7d95c Mon Sep 17 00:00:00 2001
From a09281921a27087db2d48580b5c09e56f62db2cd Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 12 Feb 2021 12:54:35 +0100
Subject: [PATCH] platform/surface: aggregator_registry: Add base device hub
@ -725,7 +725,7 @@ index a051d941ad96..6c23d75a044c 100644
--
2.31.1
From 9d99facf87190ec57305a908829037887d2a324d Mon Sep 17 00:00:00 2001
From 482f1bc858fde2c6a1fd330548500f08589240c6 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 12 Feb 2021 12:54:36 +0100
Subject: [PATCH] platform/surface: aggregator_registry: Add battery subsystem
@ -814,7 +814,7 @@ index 6c23d75a044c..cde279692842 100644
--
2.31.1
From 225f6f6b8848bb6c4752510251791ce7cd7e8ed6 Mon Sep 17 00:00:00 2001
From cdb9998251939f427f47b85846a5b1914f12b95c Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 12 Feb 2021 12:54:37 +0100
Subject: [PATCH] platform/surface: aggregator_registry: Add platform profile
@ -916,7 +916,7 @@ index cde279692842..33904613dd4b 100644
--
2.31.1
From 982bd482ea8323218ee40a4ff42b8d7f50f30859 Mon Sep 17 00:00:00 2001
From d30d9a3f6fe43f497aed8eae6a559a5f191bbab6 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 12 Feb 2021 12:54:38 +0100
Subject: [PATCH] platform/surface: aggregator_registry: Add DTX device
@ -960,7 +960,7 @@ index 33904613dd4b..dc044d06828b 100644
--
2.31.1
From 78b63edb2081fd123019b0f61a6d09db47ad4643 Mon Sep 17 00:00:00 2001
From f48e806ac0cb67eb06d61fc5adf4c7e5b7a89edd Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 12 Feb 2021 12:54:39 +0100
Subject: [PATCH] platform/surface: aggregator_registry: Add HID subsystem
@ -1056,7 +1056,7 @@ index dc044d06828b..caee90d135c5 100644
--
2.31.1
From 5b1f25eec0165e7a745cc87e4a45e3dbafb36016 Mon Sep 17 00:00:00 2001
From da7ab6cbc069aa979b548d4aafb571e0e4125318 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Thu, 11 Feb 2021 21:17:03 +0100
Subject: [PATCH] platform/surface: Add platform profile driver
@ -1342,7 +1342,7 @@ index 000000000000..0081b01a5b0f
--
2.31.1
From 3587540017845f99f6d311bb59c6c26824bf9237 Mon Sep 17 00:00:00 2001
From 33f423309db2f55769a45acfd59063a8aebed1fc Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Thu, 4 Mar 2021 20:05:24 +0100
Subject: [PATCH] platform/surface: aggregator: Make SSAM_DEFINE_SYNC_REQUEST_x
@ -1721,7 +1721,7 @@ index 02f3e06c0a60..4441ad667c3f 100644
--
2.31.1
From 3e6957d1939ac4fd7a32df8a3805dcd32243875d Mon Sep 17 00:00:00 2001
From 7a07b11680d1d98ca77a55f37c5a38711b487ca5 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 8 Mar 2021 19:48:17 +0100
Subject: [PATCH] platform/surface: Add DTX driver
@ -3216,7 +3216,7 @@ index 000000000000..0833aab0d819
--
2.31.1
From 5f90d1d6214b7f4a0372dadbfe614ec12ae13425 Mon Sep 17 00:00:00 2001
From 3ac523ccd43bdde0b52426d255fbc50e00659605 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 8 Mar 2021 19:48:18 +0100
Subject: [PATCH] platform/surface: dtx: Add support for native SSAM devices
@ -3360,7 +3360,7 @@ index 1301fab0ea14..85451eb94d98 100644
--
2.31.1
From 942c6392c91293171d960506a8d0a65896bc4805 Mon Sep 17 00:00:00 2001
From d84ff64a1fa8dce47f3d60fa9ec98db43dcaaee0 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 8 Mar 2021 19:48:19 +0100
Subject: [PATCH] docs: driver-api: Add Surface DTX driver documentation
@ -4131,7 +4131,7 @@ index 3917e7363520..da1487d672a8 100644
--
2.31.1
From d3739c04cbefe7605af24308c13d0a690203af6a Mon Sep 17 00:00:00 2001
From 1518f129b5389792afb8a311a11294668a5bf6e7 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Tue, 9 Mar 2021 13:15:00 +0000
Subject: [PATCH] platform/surface: aggregator_registry: Make symbol
@ -4172,7 +4172,7 @@ index cdb4a95af3e8..86cff5fce3cd 100644
--
2.31.1
From 3b80ee5034052a82df2fb0b1370a2f8511f3bc1f Mon Sep 17 00:00:00 2001
From cec31a9cad519c94fc89a33d9170629a2d310e52 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 9 Mar 2021 17:25:50 +0100
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@ -4215,7 +4215,7 @@ index 86cff5fce3cd..eccb9d1007cd 100644
--
2.31.1
From e7d4cc3e3f1abba7d83303c452e9c718ab0e2e4c Mon Sep 17 00:00:00 2001
From 891b8f70fb304ab1ff3482d5aa929ea156996ff4 Mon Sep 17 00:00:00 2001
From: kernel test robot <lkp@intel.com>
Date: Fri, 19 Mar 2021 13:19:19 +0800
Subject: [PATCH] platform/surface: fix semicolon.cocci warnings
@ -4254,7 +4254,7 @@ index 85451eb94d98..1fedacf74050 100644
--
2.31.1
From 2eeddec425f7ea847bd1dc9ff9baf1a112814cfe Mon Sep 17 00:00:00 2001
From 0cd4b642ccb520ba5b9cac246da1ca2bb76216d7 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 26 Mar 2021 15:28:48 +0300
Subject: [PATCH] platform/surface: clean up a variable in surface_dtx_read()
@ -4287,7 +4287,7 @@ index 1fedacf74050..63ce587e79e3 100644
--
2.31.1
From b37d3dc077939e99cf0950a6a3009764531bcc15 Mon Sep 17 00:00:00 2001
From 81d6d2613cf852a1129960879d0ce6b7dae67755 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 6 Apr 2021 01:12:22 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Give devices time to
@ -4530,7 +4530,7 @@ index eccb9d1007cd..685d37a7add1 100644
--
2.31.1
From 5c89063cd80d956a0060bba8f01cdb32e4b8647a Mon Sep 17 00:00:00 2001
From 5177fd376432e132488109743f095ec3c47eafae Mon Sep 17 00:00:00 2001
From: Barry Song <song.bao.hua@hisilicon.com>
Date: Wed, 3 Mar 2021 11:49:15 +1300
Subject: [PATCH] genirq: Add IRQF_NO_AUTOEN for request_irq/nmi()
@ -4632,7 +4632,7 @@ index 21ea370fccda..49288e941365 100644
--
2.31.1
From 4c27478492346cbc69ad1779f0ac0f2dd93c4ec2 Mon Sep 17 00:00:00 2001
From fdca7a09d5270022355cdde51b2f95317af1e6fa Mon Sep 17 00:00:00 2001
From: Tian Tao <tiantao6@hisilicon.com>
Date: Wed, 7 Apr 2021 15:00:52 +0800
Subject: [PATCH] platform/surface: aggregator: move to use request_irq by
@ -4679,7 +4679,7 @@ index aa6f37b4f46e..00e38284885a 100644
--
2.31.1
From 8dcb1d5d4c05dbea8d40e4e9f23e631f1e5cdd3c Mon Sep 17 00:00:00 2001
From 7a2a06bd6598d33335519271102ab2f5722e0913 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 5 May 2021 14:53:45 +0200
Subject: [PATCH] platform/surface: aggregator: Do not mark interrupt as shared
@ -4713,7 +4713,7 @@ index 00e38284885a..1f42fcd5d8c3 100644
--
2.31.1
From afcab874b65e164fd01bee6905b281642e4785c5 Mon Sep 17 00:00:00 2001
From 71a7d75c951e4001b35779cf39f138487454362d Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 20 Apr 2021 11:44:02 +0300
Subject: [PATCH] platform/surface: aggregator: fix a bit test
@ -4748,7 +4748,7 @@ index 1f42fcd5d8c3..8a70df60142c 100644
--
2.31.1
From 8636b17320f580819226a2108b9cb211d36f0fcb Mon Sep 17 00:00:00 2001
From 4bac02ecade55ad1c2dc1ebbca0510d8e05c8823 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 10 Mar 2021 23:53:28 +0100
Subject: [PATCH] HID: Add support for Surface Aggregator Module HID transport
@ -5495,7 +5495,7 @@ index 000000000000..4b1a7b57e035
--
2.31.1
From 0b9f3fca97a121daae91fd91364f41c844f229e8 Mon Sep 17 00:00:00 2001
From 61201d7c3512e3b7a74cb76f06db959e50a60d0f Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 10 Mar 2021 23:53:29 +0100
Subject: [PATCH] HID: surface-hid: Add support for legacy keyboard interface
@ -5866,7 +5866,7 @@ index 000000000000..0635341bc517
--
2.31.1
From b533b1fbc3f818c8bd2bb2967093deb3ce665ea5 Mon Sep 17 00:00:00 2001
From 5b5d66c4569050cf2d15073cef9ec0fee33dfa3c Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 23 Apr 2021 00:51:22 +0200
Subject: [PATCH] HID: surface-hid: Fix integer endian conversion
@ -5905,7 +5905,7 @@ index 7b27ec392232..5571e74abe91 100644
--
2.31.1
From da3b800dc4b1ca234c239cf30a0d5bfbf3540e53 Mon Sep 17 00:00:00 2001
From 3e16741959dfab7d9bbcab0c1c7f28f5cd5b598e Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 6 Apr 2021 01:41:25 +0200
Subject: [PATCH] power: supply: Add battery driver for Surface Aggregator
@ -6887,7 +6887,7 @@ index 000000000000..4116dd839ecd
--
2.31.1
From 51bdf381a1d059ecefb2e13f663752c4016e6156 Mon Sep 17 00:00:00 2001
From 4e25091e5ce472d91a7786010a1a00f4ed1a0374 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 6 Apr 2021 01:41:26 +0200
Subject: [PATCH] power: supply: Add AC driver for Surface Aggregator Module
@ -7255,7 +7255,7 @@ index 000000000000..c2dd7e604d14
--
2.31.1
From c10193b61e2b7cd895ad7447c61dad50609f9173 Mon Sep 17 00:00:00 2001
From 7feb809859bd62d4a0b10e7d0ce3bdfee5e51d16 Mon Sep 17 00:00:00 2001
From: Qiheng Lin <linqiheng@huawei.com>
Date: Sat, 10 Apr 2021 12:12:46 +0800
Subject: [PATCH] power: supply: surface-battery: Make some symbols static
@ -7304,7 +7304,7 @@ index 4116dd839ecd..7efa431a62b2 100644
--
2.31.1
From 37fd14bed9096ff15a7ea94e0dfd295f13a08ef0 Mon Sep 17 00:00:00 2001
From 1602265bbdfcc8368d48c3aa664e5b52fcea88da Mon Sep 17 00:00:00 2001
From: Qiheng Lin <linqiheng@huawei.com>
Date: Sat, 10 Apr 2021 12:12:49 +0800
Subject: [PATCH] power: supply: surface-charger: Make symbol
@ -7343,7 +7343,7 @@ index c2dd7e604d14..81a5b79822c9 100644
--
2.31.1
From ee96c5d16365a59aa098ed7a328c6e3f9366514c Mon Sep 17 00:00:00 2001
From 729ee99a1b2b0586c5699f96c0ad55926322c4a6 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 4 May 2021 20:00:46 +0200
Subject: [PATCH] power: supply: surface_battery: Fix battery event handling
@ -7400,3 +7400,238 @@ index 7efa431a62b2..5ec2e6bb2465 100644
--
2.31.1
From 36347fcfa36a6d6bfa89d75545c73d44704cf4db Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 11 May 2021 11:24:21 +0200
Subject: [PATCH] power: supply: surface-charger: Fix type of integer variable
The ac->state field is __le32, not u32. So change the variable we're
temporarily storing it in to __le32 as well.
Reported-by: kernel test robot <lkp@intel.com>
Fixes: e61ffb344591 ("power: supply: Add AC driver for Surface Aggregator Module")
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Patchset: surface-sam
---
drivers/power/supply/surface_charger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c
index 81a5b79822c9..a060c36c7766 100644
--- a/drivers/power/supply/surface_charger.c
+++ b/drivers/power/supply/surface_charger.c
@@ -66,7 +66,7 @@ struct spwr_ac_device {
static int spwr_ac_update_unlocked(struct spwr_ac_device *ac)
{
- u32 old = ac->state;
+ __le32 old = ac->state;
int status;
lockdep_assert_held(&ac->lock);
--
2.31.1
From 8a75f61f824d460381dde994c806f233ddccfd58 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 5 May 2021 18:17:04 +0200
Subject: [PATCH] serial: 8250_dw: Add device HID for new AMD UART controller
Add device HID AMDI0022 to the AMD UART controller driver match table
and create a platform device for it. This controller can be found on
Microsoft Surface Laptop 4 devices and seems similar enough that we can
just copy the existing AMDI0020 entries.
Cc: <stable@vger.kernel.org> # 5.10+
Tested-by: Sachi King <nakato@nakato.io>
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Patchset: surface-sam
---
drivers/acpi/acpi_apd.c | 1 +
drivers/tty/serial/8250/8250_dw.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index 39359ce0eb2c..645e82a66bb0 100644
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -226,6 +226,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
{ "AMDI0010", APD_ADDR(wt_i2c_desc) },
{ "AMD0020", APD_ADDR(cz_uart_desc) },
{ "AMDI0020", APD_ADDR(cz_uart_desc) },
+ { "AMDI0022", APD_ADDR(cz_uart_desc) },
{ "AMD0030", },
{ "AMD0040", APD_ADDR(fch_misc_desc)},
{ "HYGO0010", APD_ADDR(wt_i2c_desc) },
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 9e204f9b799a..a3a0154da567 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -714,6 +714,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = {
{ "APMC0D08", 0},
{ "AMD0020", 0 },
{ "AMDI0020", 0 },
+ { "AMDI0022", 0 },
{ "BRCM2032", 0 },
{ "HISI0031", 0 },
{ },
--
2.31.1
From eebad61f66d0119629269d1d3eb2339f9e371192 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 5 May 2021 18:22:04 +0200
Subject: [PATCH] pinctrl/amd: Add device HID for new AMD GPIO controller
Add device HID AMDI0031 to the AMD GPIO controller driver match table.
This controller can be found on Microsoft Surface Laptop 4 devices and
seems similar enough that we can just copy the existing AMDI0030 entry.
Cc: <stable@vger.kernel.org> # 5.10+
Tested-by: Sachi King <nakato@nakato.io>
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Patchset: surface-sam
---
drivers/pinctrl/pinctrl-amd.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 2d4acf21117c..c5950a3b4e4c 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -991,6 +991,7 @@ static int amd_gpio_remove(struct platform_device *pdev)
static const struct acpi_device_id amd_gpio_acpi_match[] = {
{ "AMD0030", 0 },
{ "AMDI0030", 0},
+ { "AMDI0031", 0},
{ },
};
MODULE_DEVICE_TABLE(acpi, amd_gpio_acpi_match);
--
2.31.1
From 1bfc4a7ec82c4c2e25f568cf1b14b071bd5737c3 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 10 May 2021 23:33:17 +0200
Subject: [PATCH] x86/i8259: Work around buggy legacy PIC
The legacy PIC on the AMD variant of the Microsoft Surface Laptop 4 has
some problems on boot. For some reason it consistently does not respond
on the first try, requiring a couple more tries before it finally
responds.
This currently leads to the PIC not being properly recognized, which
prevents interrupt handling down the line. Ultimately, this also leads
to the pinctrl-amd driver failing to probe due to platform_get_irq()
returning -EINVAL for its base IRQ. That, in turn, means that several
interrupts are not available and device drivers relying on those will
defer probing indefinitely, as querying those interrupts returns
-EPROBE_DEFER.
Add a quirk table and a retry-loop to work around that.
Also switch to pr_info() due to complaints by checkpatch and add a
pr_fmt() definition for completeness.
Cc: <stable@vger.kernel.org> # 5.10+
Co-developed-by: Sachi King <nakato@nakato.io>
Signed-off-by: Sachi King <nakato@nakato.io>
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Patchset: surface-sam
---
arch/x86/kernel/i8259.c | 51 +++++++++++++++++++++++++++++++++++++----
1 file changed, 46 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
index 282b4ee1339f..0da757c6b292 100644
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -1,4 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
+
+#define pr_fmt(fmt) "i8259: " fmt
+
#include <linux/linkage.h>
#include <linux/errno.h>
#include <linux/signal.h>
@@ -16,6 +19,7 @@
#include <linux/io.h>
#include <linux/delay.h>
#include <linux/pgtable.h>
+#include <linux/dmi.h>
#include <linux/atomic.h>
#include <asm/timer.h>
@@ -298,11 +302,39 @@ static void unmask_8259A(void)
raw_spin_unlock_irqrestore(&i8259A_lock, flags);
}
+/*
+ * DMI table to identify devices with quirky probe behavior. See comment in
+ * probe_8259A() for more details.
+ */
+static const struct dmi_system_id retry_probe_quirk_table[] = {
+ {
+ .ident = "Microsoft Surface Laptop 4 (AMD)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
+ },
+ },
+ {}
+};
+
static int probe_8259A(void)
{
unsigned long flags;
unsigned char probe_val = ~(1 << PIC_CASCADE_IR);
unsigned char new_val;
+ unsigned int i, imax = 1;
+
+ /*
+ * Some systems have a legacy PIC that doesn't immediately respond
+ * after boot. We know it's there, we know it should respond and is
+ * required for proper interrupt handling later on, so let's try a
+ * couple of times.
+ */
+ if (dmi_check_system(retry_probe_quirk_table)) {
+ pr_warn("system with broken legacy PIC detected, re-trying multiple times if necessary\n");
+ imax = 10;
+ }
+
/*
* Check to see if we have a PIC.
* Mask all except the cascade and read
@@ -312,15 +344,24 @@ static int probe_8259A(void)
*/
raw_spin_lock_irqsave(&i8259A_lock, flags);
- outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-2 */
- outb(probe_val, PIC_MASTER_IMR);
- new_val = inb(PIC_MASTER_IMR);
- if (new_val != probe_val) {
- printk(KERN_INFO "Using NULL legacy PIC\n");
+ for (i = 0; i < imax; i++) {
+ outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-2 */
+ outb(probe_val, PIC_MASTER_IMR);
+ new_val = inb(PIC_MASTER_IMR);
+ if (new_val == probe_val)
+ break;
+ }
+
+ if (i == imax) {
+ pr_info("using NULL legacy PIC\n");
legacy_pic = &null_legacy_pic;
}
raw_spin_unlock_irqrestore(&i8259A_lock, flags);
+
+ if (imax > 1 && i < imax)
+ pr_info("got legacy PIC after %d tries\n", i + 1);
+
return nr_legacy_irqs();
}
--
2.31.1

View file

@ -1,4 +1,4 @@
From eabd9f96cf8a3bda4c73397fbcc6b7a0a04e8041 Mon Sep 17 00:00:00 2001
From 448f0aaa69c07426f1df2ef96075d964545ef1c5 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Tue, 16 Mar 2021 16:51:40 +0100
Subject: [PATCH] PCI: PM: Do not read power state in pci_enable_device_flags()

View file

@ -1,4 +1,4 @@
From 449a4cc68d442a4551fa3aa435a0abcbe5f1fa52 Mon Sep 17 00:00:00 2001
From 0aaedb96792141016d48fc7fbd72034210c7d8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Thu, 5 Nov 2020 13:09:45 +0100
Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when

View file

@ -1,4 +1,4 @@
From c10c028151ea853e1529ad7d828a9600b4060825 Mon Sep 17 00:00:00 2001
From bf04fe3ba3be4b20c1e8369c8643684b203ca681 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Mon, 22 Feb 2021 13:07:30 +0000
Subject: [PATCH] ACPI: scan: Extend acpi_walk_dep_device_list()
@ -250,7 +250,7 @@ index 3bdcfc4401b7..b560e47b700c 100644
--
2.31.1
From 48ca31919b84fcc1456e0f86292b95bda1a74b81 Mon Sep 17 00:00:00 2001
From 409503747cb930cdfeb328880adc98236862bcd7 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Mon, 22 Feb 2021 13:07:31 +0000
Subject: [PATCH] ACPI: scan: Add function to fetch dependent of acpi device
@ -336,7 +336,7 @@ index 128eec2a26f6..d00dec1ad9fb 100644
--
2.31.1
From c861065d78420ea39fec121e4cd9081fde790aa8 Mon Sep 17 00:00:00 2001
From a29993fee73f417dd8b36b045101112dd31867a5 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Mon, 22 Feb 2021 13:07:32 +0000
Subject: [PATCH] i2c: core: Add a format macro for I2C device names
@ -397,7 +397,7 @@ index 56622658b215..4d40a4b46810 100644
--
2.31.1
From e39f06db39a488efd95244f07c02672e510edc25 Mon Sep 17 00:00:00 2001
From a91ba0ea34d24eb262ff75bae46fe51eb69413fe Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Mon, 22 Feb 2021 13:07:33 +0000
Subject: [PATCH] gpiolib: acpi: Export acpi_get_gpiod()
@ -515,7 +515,7 @@ index c73b25bc9213..e26fb586b6c8 100644
--
2.31.1
From 478ecf8703bdcda8aab6cffc6a25b853fe00556f Mon Sep 17 00:00:00 2001
From ac771f41046d43a093f905b1e0b858c225696e3e Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Mon, 22 Feb 2021 13:07:34 +0000
Subject: [PATCH] platform/x86: Add intel_skl_int3472 driver
@ -1596,7 +1596,7 @@ index 000000000000..d0d2391e263f
--
2.31.1
From 6c66649aaf0b322f3c0041bd3204d7d485a7d91f Mon Sep 17 00:00:00 2001
From 095721552efd3875f2dba762d8b74bcd176409a3 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Mon, 22 Feb 2021 13:07:35 +0000
Subject: [PATCH] mfd: tps68470: Remove tps68470 MFD driver
@ -1792,7 +1792,7 @@ index 4a4df4ffd18c..000000000000
--
2.31.1
From c71b895f160e1a133b5648ba0efe2aceb1c0a3a8 Mon Sep 17 00:00:00 2001
From e14adf7e961ab1503c73538b190ce9ee850f7a08 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Mon, 5 Apr 2021 23:56:53 +0100
Subject: [PATCH] media: ipu3-cio2: Toggle sensor streaming in pm runtime ops
@ -1852,7 +1852,7 @@ index 6e8c0c230e11..21e4d0358cdc 100644
--
2.31.1
From 8432e3e455f946d974d66de60b0b8a397c02ef3d Mon Sep 17 00:00:00 2001
From 443bebed93d0d9b3cf37a92e420bcebe94c3f168 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Mon, 5 Apr 2021 23:56:54 +0100
Subject: [PATCH] media: i2c: Add support for ov5693 sensor
@ -3495,7 +3495,7 @@ index 000000000000..da2ca99a7ad3
--
2.31.1
From 50a9c72845f5a7f0ce6411b59a49a724b04cb92d Mon Sep 17 00:00:00 2001
From e66adb0c5a1cb4e4e1b075001e880dbc2018ea49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
Date: Fri, 22 Jan 2021 20:58:13 +0100
Subject: [PATCH] cio2-bridge: Parse sensor orientation and rotation
@ -3658,7 +3658,7 @@ index dd0ffcafa489..924d99d20328 100644
--
2.31.1
From b8227ed525b8a609ae311c7c7d310498c29e94fd Mon Sep 17 00:00:00 2001
From 64bef4d8a0b27d957bdea394310bff6619b900e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
Date: Sun, 24 Jan 2021 11:07:42 +0100
Subject: [PATCH] cio2-bridge: Use macros and add warnings
@ -3762,3 +3762,29 @@ index 924d99d20328..e1e388cc9f45 100644
--
2.31.1
From 9c73954dc66cd31a19083f5861afe7c5af4fa1ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
Date: Thu, 6 May 2021 07:52:44 +0200
Subject: [PATCH] cio2-bridge: Use correct dev_properties size
Patchset: cameras
---
drivers/media/pci/intel/ipu3/cio2-bridge.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.h b/drivers/media/pci/intel/ipu3/cio2-bridge.h
index e1e388cc9f45..deaf5804f70d 100644
--- a/drivers/media/pci/intel/ipu3/cio2-bridge.h
+++ b/drivers/media/pci/intel/ipu3/cio2-bridge.h
@@ -124,7 +124,7 @@ struct cio2_sensor {
struct cio2_property_names prop_names;
struct property_entry ep_properties[5];
- struct property_entry dev_properties[3];
+ struct property_entry dev_properties[4];
struct property_entry cio2_properties[3];
struct software_node_ref_args local_ref[1];
struct software_node_ref_args remote_ref[1];
--
2.31.1