From 4d4fdd8b2d2e7720a450328f5d6604b772386189 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Aug 21 2021 16:30:29 +0000 Subject: Update to 5.10.60 --- diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index e358c7a..3a4045f 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,3 +1,3 @@ be0b909f1fbb760cc2d5cf146e1da3b2af0cf899 SOURCES/linux-5.10.tar.xz -f77d224408464ad1c0236700a8c5a4ce0b2a1935 SOURCES/23507c0fc836b038dd0eaa9242f52f874eabacd7.tar.gz -d0387184bec34cab29f0235f26a50d1363a6a5ba SOURCES/patch-5.10.52.xz +2d313607b18877bee80b3f218f736f37e9a80273 SOURCES/25e2b597ebfb2495eab4816a276758dcc6ea21f1.tar.gz +02e8d19fafa7e6ea39d27fdb8c51f99153ab9d87 SOURCES/patch-5.10.60.xz diff --git a/SOURCES/rpi-5.10.x.patch b/SOURCES/rpi-5.10.x.patch index 354cb1c..cf65cb0 100644 --- a/SOURCES/rpi-5.10.x.patch +++ b/SOURCES/rpi-5.10.x.patch @@ -1,7 +1,7 @@ -From 8c642d0271a1de51fec6391b3bf57628666fd0ec Mon Sep 17 00:00:00 2001 +From 729fdd8dc8e265f7ef993ead0232704a343efe56 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Thu, 21 Sep 2017 09:55:42 -0500 -Subject: [PATCH 001/803] arm: partially revert +Subject: [PATCH 001/834] arm: partially revert 702b94bff3c50542a6e4ab9a4f4cef093262fe65 * Re-expose some dmi APIs for use in VCSM @@ -109,10 +109,10 @@ index e21249548e9f..33e4a9b8f1ba 100644 2.18.4 -From 62b28c22358e6038a47cb5354141c84a13ba647c Mon Sep 17 00:00:00 2001 +From 8cb80f2eea1662f8378bc3bedcb86e93485ebdbd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 29 Oct 2018 14:45:45 +0000 -Subject: [PATCH 002/803] Revert "rtc: pcf8523: properly handle oscillator stop +Subject: [PATCH 002/834] Revert "rtc: pcf8523: properly handle oscillator stop bit" This reverts commit ede44c908d44b166a5b6bd7caacd105c2ff5a70f. @@ -171,10 +171,10 @@ index 57d351dfe272..0aa1e8f9ee75 100644 2.18.4 -From e8dfe59a383953baee0d05148b2b2c68514e64f1 Mon Sep 17 00:00:00 2001 +From 5da3efe6952cc580d335429f3c624ffb6f8f8546 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 15 Mar 2019 21:11:10 +0000 -Subject: [PATCH 003/803] Revert "staging: bcm2835-audio: Drop DT dependency" +Subject: [PATCH 003/834] Revert "staging: bcm2835-audio: Drop DT dependency" This reverts commit b7491a9fca2dc2535b9dc922550a37c5baae9d3d. --- @@ -273,10 +273,10 @@ index c250fbef2fa3..b42917c25050 100644 2.18.4 -From aa094daaaae7afba4a256bd43e29b704353f22fb Mon Sep 17 00:00:00 2001 +From 94844b8b421c739c0474faed86ba41c9efb41d80 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 13:41:10 +0100 -Subject: [PATCH 004/803] Revert "spi: spidev: Fix CS polarity if GPIO +Subject: [PATCH 004/834] Revert "spi: spidev: Fix CS polarity if GPIO descriptors are used" This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28. @@ -311,10 +311,10 @@ index 859910ec8d9f..225577709c03 100644 2.18.4 -From e616dd5dfe7e18042627b681f802fbb07f239c0a Mon Sep 17 00:00:00 2001 +From 18dc9af2208a75568f48f5ba5a8ab35e365921af Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Nov 2020 11:49:53 +0000 -Subject: [PATCH 005/803] Revert "mailbox: avoid timer start from callback" +Subject: [PATCH 005/834] Revert "mailbox: avoid timer start from callback" This reverts commit c7dacf5b0f32957b24ef29df1207dc2cd8307743. @@ -375,10 +375,10 @@ index 3e7d4b20ab34..0b821a5b2db8 100644 2.18.4 -From 13d6ed93f693819b6a59784c0480934d20010b3c Mon Sep 17 00:00:00 2001 +From 44dbc5552af8d87f58a0ccf662d50d6b8f1f8135 Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Thu, 19 Feb 2015 18:47:12 +0000 -Subject: [PATCH 006/803] smsx95xx: fix crimes against truesize +Subject: [PATCH 006/834] smsx95xx: fix crimes against truesize smsc95xx is adjusting truesize when it shouldn't, and following a recent patch from Eric this is now triggering warnings. @@ -428,10 +428,10 @@ index ea0d5f04dc3a..a7591ceca30f 100644 2.18.4 -From 28ee1c839cd17af975934917495ffaa61809a8d1 Mon Sep 17 00:00:00 2001 +From e304b7d2b5064e331dfdfa5e59aa8c5c96b86834 Mon Sep 17 00:00:00 2001 From: Sam Nazarko Date: Fri, 1 Apr 2016 17:27:21 +0100 -Subject: [PATCH 007/803] smsc95xx: Experimental: Enable turbo_mode and +Subject: [PATCH 007/834] smsc95xx: Experimental: Enable turbo_mode and packetsize=2560 by default See: http://forum.kodi.tv/showthread.php?tid=285288 @@ -477,10 +477,10 @@ index a7591ceca30f..d16620941d76 100644 2.18.4 -From 303ea4bb67f0008b73598d536d17eb39cbc55dbd Mon Sep 17 00:00:00 2001 +From 8482a3a641eafdfcc80ba057060d833a86dc2fcb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 26 Mar 2013 17:26:38 +0000 -Subject: [PATCH 008/803] Allow mac address to be set in smsc95xx +Subject: [PATCH 008/834] Allow mac address to be set in smsc95xx Signed-off-by: popcornmix --- @@ -579,10 +579,10 @@ index d16620941d76..09d4c1963b2c 100644 2.18.4 -From c77996ee15c20276bbc55d4965d845ffc2e563df Mon Sep 17 00:00:00 2001 +From ba67a498468a8ea0e5bb472094675ded6097fa61 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 13 Mar 2015 12:43:36 +0000 -Subject: [PATCH 009/803] Protect __release_resource against resources without +Subject: [PATCH 009/834] Protect __release_resource against resources without parents Without this patch, removing a device tree overlay can crash here. @@ -613,10 +613,10 @@ index 817545ff80b9..375a43d99b28 100644 2.18.4 -From f6030cb0d69b76af5d361d38d6c53134229820db Mon Sep 17 00:00:00 2001 +From 17a7c057cb38867d1cf72eb8fda42c6af82c9734 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:33:30 +0000 -Subject: [PATCH 010/803] irq-bcm2836: Avoid "Invalid trigger warning" +Subject: [PATCH 010/834] irq-bcm2836: Avoid "Invalid trigger warning" Initialise the level for each IRQ to avoid a warning from the arm arch timer code. @@ -643,10 +643,10 @@ index cbc7c740e4dc..f4247c257581 100644 2.18.4 -From 5bc2fb633e7b22aa5d82448336bb13d0a8f673ed Mon Sep 17 00:00:00 2001 +From e2e78e6cd275580bb7b5a8bf76fffa730b2da2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 12 Jun 2015 19:01:05 +0200 -Subject: [PATCH 011/803] irqchip: bcm2835: Add FIQ support +Subject: [PATCH 011/834] irqchip: bcm2835: Add FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -778,10 +778,10 @@ index a1e004af23e7..50a03f8c9c57 100644 2.18.4 -From 179ee9877bf3b936d5c301f5da973fe7669bb16f Mon Sep 17 00:00:00 2001 +From 8ba263651eeef7634f44f8f16a0cc0a6f75e1855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 23 Oct 2015 16:26:55 +0200 -Subject: [PATCH 012/803] irqchip: irq-bcm2835: Add 2836 FIQ support +Subject: [PATCH 012/834] irqchip: irq-bcm2835: Add 2836 FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -883,10 +883,10 @@ index 50a03f8c9c57..b3219aa763a6 100644 2.18.4 -From 903f0d75b7c63e3f9ddb574b2e13b58db87fc645 Mon Sep 17 00:00:00 2001 +From d019ffd130023fd479fa906a315d94b7868fbedd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 10:26:09 +0100 -Subject: [PATCH 013/803] spi: spidev: Completely disable the spidev warning +Subject: [PATCH 013/834] spi: spidev: Completely disable the spidev warning An alternative strategy would be to use "rpi,spidev" instead, but that would require many Raspberry Pi Device Tree changes. @@ -913,10 +913,10 @@ index 225577709c03..a262479f0a92 100644 2.18.4 -From 4d4b7d866b69fa5df36b4bd71985a03d600910a9 Mon Sep 17 00:00:00 2001 +From 82542f3c4e83755ae13600889277b99222787634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Sat, 3 Oct 2015 22:22:55 +0200 -Subject: [PATCH 014/803] dmaengine: bcm2835: Load driver early and support +Subject: [PATCH 014/834] dmaengine: bcm2835: Load driver early and support legacy API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -1022,10 +1022,10 @@ index 630dfbb01a40..bf7ba96a39f9 100644 2.18.4 -From 33280f5cdc561e827a01bc900457c91ddaa00719 Mon Sep 17 00:00:00 2001 +From b447ddd1c5cb61310f55a01222f63897f9a286cf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 25 Jan 2016 17:25:12 +0000 -Subject: [PATCH 015/803] firmware: Updated mailbox header +Subject: [PATCH 015/834] firmware: Updated mailbox header --- include/soc/bcm2835/raspberrypi-firmware.h | 3 +++ @@ -1055,10 +1055,10 @@ index cc9cdbc66403..212cceffcc5c 100644 2.18.4 -From d64fbb905a477ad7f13a60463e3ede7f915bafb7 Mon Sep 17 00:00:00 2001 +From 46fb86d451d581737aeb2802fbea4a0013742189 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 15 Jun 2016 16:48:41 +0100 -Subject: [PATCH 016/803] rtc: Add SPI alias for pcf2123 driver +Subject: [PATCH 016/834] rtc: Add SPI alias for pcf2123 driver Without this alias, Device Tree won't cause the driver to be loaded. @@ -1081,10 +1081,10 @@ index c3691fa4210e..ead1fd376d2d 100644 2.18.4 -From b975dcfe546f93a605963cb12bd3c8544310c75b Mon Sep 17 00:00:00 2001 +From ad0eb2f6b707e7208f52ae0eb3307227b28b9d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 7 Oct 2016 16:50:59 +0200 -Subject: [PATCH 017/803] watchdog: bcm2835: Support setting reboot partition +Subject: [PATCH 017/834] watchdog: bcm2835: Support setting reboot partition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -1189,10 +1189,10 @@ index dec6ca019bea..62937e6f83ca 100644 2.18.4 -From e88fb25fc6e1c1ad38cce2d194b924e2b4f3fbc4 Mon Sep 17 00:00:00 2001 +From c242878e023aa73cf1976c8c989cb0ed8aa4d29d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 Apr 2016 19:40:12 +0100 -Subject: [PATCH 018/803] reboot: Use power off rather than busy spinning when +Subject: [PATCH 018/834] reboot: Use power off rather than busy spinning when halt is requested --- @@ -1218,10 +1218,10 @@ index 0ce388f15422..63373adab475 100644 2.18.4 -From cec59255deb84e725706ecb4cf016b46fe1e19a5 Mon Sep 17 00:00:00 2001 +From afd0aa587fe1b4421de114418b0c5b409100753f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Nov 2016 13:02:52 +0000 -Subject: [PATCH 019/803] bcm: Make RASPBERRYPI_POWER depend on PM +Subject: [PATCH 019/834] bcm: Make RASPBERRYPI_POWER depend on PM --- drivers/soc/bcm/Kconfig | 1 + @@ -1243,10 +1243,10 @@ index 24f92a6e882a..a6a705ec30c7 100644 2.18.4 -From 068b1ca5ce4c1d3777cc544f2baff76d336624ae Mon Sep 17 00:00:00 2001 +From 9709f912ee533c8c0a3751f3030e7663bac908b4 Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Fri, 2 Sep 2016 16:45:27 +0100 -Subject: [PATCH 020/803] Register the clocks early during the boot process, so +Subject: [PATCH 020/834] Register the clocks early during the boot process, so that special/critical clocks can get enabled early on in the boot process avoiding the risk of disabling a clock, pll_divider or pll when a claiming driver fails to install propperly - maybe it needs to defer. @@ -1294,10 +1294,10 @@ index 1ac803e14fa3..2482458795c2 100644 2.18.4 -From 2f99d3c725a4df330a5c25c979b9fe1d8054698f Mon Sep 17 00:00:00 2001 +From 86a59d15be7ef5c5fa5994eeea98c3e3dad12780 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 6 Dec 2016 17:05:39 +0000 -Subject: [PATCH 021/803] bcm2835-rng: Avoid initialising if already enabled +Subject: [PATCH 021/834] bcm2835-rng: Avoid initialising if already enabled Avoids the 0x40000 cycles of warmup again if firmware has already used it --- @@ -1325,10 +1325,10 @@ index 1a7c43b43c6b..ee47667d0710 100644 2.18.4 -From d06b5aced6edf40a2705ba87f6568a69cbe82456 Mon Sep 17 00:00:00 2001 +From 29db436565db54bdebaaa92d754c6e7ff844bbff Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 022/803] clk-bcm2835: Mark used PLLs and dividers CRITICAL +Subject: [PATCH 022/834] clk-bcm2835: Mark used PLLs and dividers CRITICAL The VPU configures and relies on several PLLs and dividers. Mark all enabled dividers and their PLLs as CRITICAL to prevent the kernel from @@ -1359,10 +1359,10 @@ index 2482458795c2..0f716cb070a7 100644 2.18.4 -From 8bb4bd5dafd9f3f77bf31bd223e99da6878391ff Mon Sep 17 00:00:00 2001 +From 91255a4a05316c8a2f974aa38b56aea2f46a6523 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 023/803] clk-bcm2835: Add claim-clocks property +Subject: [PATCH 023/834] clk-bcm2835: Add claim-clocks property The claim-clocks property can be used to prevent PLLs and dividers from being marked as critical. It contains a vector of clock IDs, @@ -1485,10 +1485,10 @@ index 0f716cb070a7..50f018fbb562 100644 2.18.4 -From 60ce5149a7514649368b6b116056dc7b61d88205 Mon Sep 17 00:00:00 2001 +From 450af3a54db52e5addbc9047637d62cc05a8ad62 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Mar 2017 09:06:18 +0000 -Subject: [PATCH 024/803] clk-bcm2835: Read max core clock from firmware +Subject: [PATCH 024/834] clk-bcm2835: Read max core clock from firmware The VPU is responsible for managing the core clock, usually under direction from the bcm2835-cpufreq driver but not via the clk-bcm2835 @@ -1606,10 +1606,10 @@ index 50f018fbb562..f1ef788c1194 100644 2.18.4 -From f226911ff4e5c1eefce931cf3621aa429d79392e Mon Sep 17 00:00:00 2001 +From c5ed6379429066599fdfe341e0209eb6deb47d36 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:36:44 +0000 -Subject: [PATCH 025/803] sound: Demote deferral errors to INFO level +Subject: [PATCH 025/834] sound: Demote deferral errors to INFO level At present there is no mechanism to specify driver load order, which can lead to deferrals and repeated retries until successful. @@ -1647,10 +1647,10 @@ index e677422c1058..880ae162eaa5 100644 2.18.4 -From 51143bc6dbdcdfbb2a9decef9e4a8dfe3c9e6220 Mon Sep 17 00:00:00 2001 +From 80d37772ba4d1f39e737456e063769fc0c63223a Mon Sep 17 00:00:00 2001 From: Claggy3 Date: Sat, 11 Feb 2017 14:00:30 +0000 -Subject: [PATCH 026/803] Update vfpmodule.c +Subject: [PATCH 026/834] Update vfpmodule.c Christopher Alexander Tobias Schulze - May 2, 2015, 11:57 a.m. This patch fixes a problem with VFP state save and restore related @@ -1790,10 +1790,10 @@ index 2cb355c1b5b7..1e2dcf81aefa 100644 2.18.4 -From a5d8b89b772b414a782a53e4ff49db0877ee8956 Mon Sep 17 00:00:00 2001 +From b741e17b1dce6ec748c0e41a4f6dab193ebf006c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Tue, 1 Nov 2016 15:15:41 +0100 -Subject: [PATCH 027/803] i2c: bcm2835: Add debug support +Subject: [PATCH 027/834] i2c: bcm2835: Add debug support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -1985,10 +1985,10 @@ index 37443edbf754..18b2e9e3d752 100644 2.18.4 -From 0a0d5b4ee6891af38a341d4597891b8c30eddb78 Mon Sep 17 00:00:00 2001 +From 35ec5f8404f86b79ee401191b0aba6ea21df753b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 18 Dec 2014 16:07:15 -0800 -Subject: [PATCH 028/803] mm: Remove the PFN busy warning +Subject: [PATCH 028/834] mm: Remove the PFN busy warning See commit dae803e165a11bc88ca8dbc07a11077caf97bbcb -- the warning is expected sometimes when using CMA. However, that commit still spams @@ -2000,10 +2000,10 @@ Signed-off-by: Eric Anholt 1 file changed, 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index e30d88efd7fb..128591c9910f 100644 +index 0166558d3d64..e312b5aeba2c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -8566,8 +8566,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, +@@ -8594,8 +8594,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, /* Make sure the range is really isolated. */ if (test_pages_isolated(outer_start, end, 0)) { @@ -2016,10 +2016,10 @@ index e30d88efd7fb..128591c9910f 100644 2.18.4 -From 900cf17657c4cfa64ae970c032cd4870c24f382b Mon Sep 17 00:00:00 2001 +From 712520915068e349a9870264926073c366756ec0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Jan 2018 16:52:45 +0000 -Subject: [PATCH 029/803] irqchip: irq-bcm2836: Remove regmap and syscon use +Subject: [PATCH 029/834] irqchip: irq-bcm2836: Remove regmap and syscon use The syscon node defines a register range that duplicates that used by the local_intc node on bcm2836/7. Since irq-bcm2835 and irq-bcm2836 are @@ -2136,10 +2136,10 @@ index f4247c257581..2187672e5be3 100644 2.18.4 -From 8df1c663aa463faf22c90c60744ff29c1ab66ee1 Mon Sep 17 00:00:00 2001 +From c10c9fd87ed5f3c6bf2edfd9f547a42935538e95 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 17 Oct 2017 15:04:29 +0100 -Subject: [PATCH 030/803] lan78xx: Enable LEDs and auto-negotiation +Subject: [PATCH 030/834] lan78xx: Enable LEDs and auto-negotiation For applications of the LAN78xx that don't have valid programmed EEPROMs or OTPs, enabling both LEDs and auto-negotiation by default @@ -2190,10 +2190,10 @@ index 65b315bc60ab..306bf917d4ed 100644 2.18.4 -From 855bb8f7d321b2f29d16fd1fde8ec81940691cf7 Mon Sep 17 00:00:00 2001 +From 505fd7bf92681735064a429f1a79efb8b73eea08 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Feb 2016 17:26:48 +0000 -Subject: [PATCH 031/803] amba_pl011: Don't use DT aliases for numbering +Subject: [PATCH 031/834] amba_pl011: Don't use DT aliases for numbering The pl011 driver looks for DT aliases of the form "serial", and if found uses as the device ID. This can cause @@ -2225,10 +2225,10 @@ index 87dc3fc15694..fe48193de094 100644 2.18.4 -From 7c71ea61c8225e0f9adef6b05ceb71ddb74587cc Mon Sep 17 00:00:00 2001 +From a5501c9b99321414e9dac605e2d059069627f301 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Mar 2017 16:07:39 +0000 -Subject: [PATCH 032/803] amba_pl011: Round input clock up +Subject: [PATCH 032/834] amba_pl011: Round input clock up The UART clock is initialised to be as close to the requested frequency as possible without exceeding it. Now that there is a @@ -2317,10 +2317,10 @@ index fe48193de094..339ecce1ad0d 100644 2.18.4 -From 34037136dc76935f021dcfd12a74ff106ae6d9f3 Mon Sep 17 00:00:00 2001 +From fa0d64291fb5fa39739dc90ac81d5acd101ec04b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 033/803] amba_pl011: Insert mb() for correct FIFO handling +Subject: [PATCH 033/834] amba_pl011: Insert mb() for correct FIFO handling The pl011 register accessor functions use the _relaxed versions of the standard readl() and writel() functions, meaning that there are no @@ -2350,10 +2350,10 @@ index 339ecce1ad0d..afb0175bf592 100644 2.18.4 -From 33a527d5018e0c5cf272ba03e21b2911c6f55321 Mon Sep 17 00:00:00 2001 +From 67efb831896c2f1c6a0e7b23efda74f68efcdcaa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 034/803] amba_pl011: Add cts-event-workaround DT property +Subject: [PATCH 034/834] amba_pl011: Add cts-event-workaround DT property The BCM2835 PL011 implementation seems to have a bug that can lead to a transmission lockup if CTS changes frequently. A workaround was added to @@ -2408,10 +2408,10 @@ index afb0175bf592..17ef9c2a4d72 100644 2.18.4 -From 0403bbbf1b0ecd9c12a4e90e849f311754b02b75 Mon Sep 17 00:00:00 2001 +From 3a565abae5596c5e1ef67eba24b361dda24596bb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jul 2019 13:13:39 +0100 -Subject: [PATCH 035/803] tty: amba-pl011: Make TX optimisation conditional +Subject: [PATCH 035/834] tty: amba-pl011: Make TX optimisation conditional pl011_tx_chars takes a "from_irq" parameter to reduce the number of register accesses. When from_irq is true the function assumes that the @@ -2499,10 +2499,10 @@ index 17ef9c2a4d72..8b1f8167c85d 100644 2.18.4 -From ad15d7e66f0da2dd5f9202f2d1195bf8d3a78dfd Mon Sep 17 00:00:00 2001 +From e2bcc02b49a1ae60151de022d50bd638bfeff795 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Jan 2020 11:38:28 +0000 -Subject: [PATCH 036/803] tty: amba-pl011: Add un/throttle support +Subject: [PATCH 036/834] tty: amba-pl011: Add un/throttle support The PL011 driver lacks throttle and unthrottle methods. As a result, sending more data to the Pi than it can immediately sink while CRTSCTS @@ -2566,10 +2566,10 @@ index 8b1f8167c85d..9df9bc8f9dfd 100644 2.18.4 -From 2bb8860270dd4b8ca9a672bbec9d2b4f0c7d0b9f Mon Sep 17 00:00:00 2001 +From 50bc81bac4b079f9d2361340a156bf35e157b867 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 09:35:19 +0000 -Subject: [PATCH 037/803] tty: amba-pl011: Avoid rare write-when-full error +Subject: [PATCH 037/834] tty: amba-pl011: Avoid rare write-when-full error Under some circumstances on BCM283x processors data loss can be observed - a single byte missing from the TX output stream. These bytes @@ -2614,10 +2614,10 @@ index 9df9bc8f9dfd..760301512509 100644 2.18.4 -From deaebca5759916f13ecf81cb6a9c959d7202d572 Mon Sep 17 00:00:00 2001 +From 0642e7243e00aebeea55e14447a23b40b4a2ce09 Mon Sep 17 00:00:00 2001 From: notro Date: Thu, 10 Jul 2014 13:59:47 +0200 -Subject: [PATCH 038/803] pinctrl-bcm2835: Set base to 0 give expected gpio +Subject: [PATCH 038/834] pinctrl-bcm2835: Set base to 0 give expected gpio numbering Signed-off-by: Noralf Tronnes @@ -2642,10 +2642,10 @@ index 1d21129f7751..bbf761c41dc5 100644 2.18.4 -From 0b6380b452c574ee98346d5c8e9cb68a69ecaab8 Mon Sep 17 00:00:00 2001 +From 979066baf5b765d1b34b405fe32359a9c3044edb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 12 May 2013 12:24:19 +0100 -Subject: [PATCH 039/803] Main bcm2708/bcm2709 linux port +Subject: [PATCH 039/834] Main bcm2708/bcm2709 linux port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -2804,10 +2804,10 @@ index 39761d190545..9766d8b50778 100644 2.18.4 -From b9da7f869a99ae8cecd1bd1dcc3e8fedcf6e8bdd Mon Sep 17 00:00:00 2001 +From 5c2668c24ce7e08d4eff43280f02ecd5540b3a64 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 1 May 2013 19:46:17 +0100 -Subject: [PATCH 040/803] Add dwc_otg driver +Subject: [PATCH 040/834] Add dwc_otg driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -3936,10 +3936,10 @@ index 26f9fb9f67ca..fe8c7a85e141 100644 return i; } diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 357730e8f52f..d35a5c6a48b5 100644 +index 95a9bae72f13..54a53e225625 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5446,7 +5446,7 @@ static void port_event(struct usb_hub *hub, int port1) +@@ -5494,7 +5494,7 @@ static void port_event(struct usb_hub *hub, int port1) port_dev->over_current_count++; port_over_current_notify(port_dev); @@ -64627,10 +64627,10 @@ index 000000000000..cdc9963176e5 2.18.4 -From 523c3390cda5044cd417b640cfefeeabd8e77bb2 Mon Sep 17 00:00:00 2001 +From b7a47ae86ae63ca60509f99d91c15130cdd4fd26 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 17:06:34 +0100 -Subject: [PATCH 041/803] bcm2708 framebuffer driver +Subject: [PATCH 041/834] bcm2708 framebuffer driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -68201,10 +68201,10 @@ index 212cceffcc5c..2f5509d53fc3 100644 2.18.4 -From 08888e8e8a0012ab01573a8585b8aece70d5044c Mon Sep 17 00:00:00 2001 +From a908ef574e0c6e98c8ed997cf0a327806fd8eaed Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 14 Mar 2019 13:27:54 +0000 -Subject: [PATCH 042/803] Pulled in the multi frame buffer support from the Pi3 +Subject: [PATCH 042/834] Pulled in the multi frame buffer support from the Pi3 repo --- @@ -69036,10 +69036,10 @@ index 2f5509d53fc3..16253b6875c9 100644 2.18.4 -From fb19981b98a28d6113a5072dc3b178f03cf75c99 Mon Sep 17 00:00:00 2001 +From b2a8ec195e51c8bbcb708ae81c8616ad96c112a5 Mon Sep 17 00:00:00 2001 From: Siarhei Siamashka Date: Mon, 17 Jun 2013 13:32:11 +0300 -Subject: [PATCH 043/803] fbdev: add FBIOCOPYAREA ioctl +Subject: [PATCH 043/834] fbdev: add FBIOCOPYAREA ioctl Based on the patch authored by Ali Gholami Rudi at https://lkml.org/lkml/2009/7/13/153 @@ -69383,10 +69383,10 @@ index 4c14e8be7267..3c6f12b76214 100644 2.18.4 -From ec86e98b97e657af88b1af0d5dd7c30b14d029ba Mon Sep 17 00:00:00 2001 +From 3f89b569f9f2389ad2097dbffce6da1a1e033783 Mon Sep 17 00:00:00 2001 From: Harm Hanemaaijer Date: Thu, 20 Jun 2013 20:21:39 +0200 -Subject: [PATCH 044/803] Speed up console framebuffer imageblit function +Subject: [PATCH 044/834] Speed up console framebuffer imageblit function Especially on platforms with a slower CPU but a relatively high framebuffer fill bandwidth, like current ARM devices, the existing @@ -69598,10 +69598,10 @@ index a2bb276a8b24..436494fba15a 100644 2.18.4 -From 4d2f9a892817907b2d68beb3f8f58bc9e24f04fb Mon Sep 17 00:00:00 2001 +From 81b4029d1e1cad87a71314391dfa165b4b3fd6dc Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Fri, 22 Nov 2013 14:22:53 +0100 -Subject: [PATCH 045/803] dmaengine: Add support for BCM2708 +Subject: [PATCH 045/834] dmaengine: Add support for BCM2708 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -70252,10 +70252,10 @@ index 000000000000..6ca874d332a8 2.18.4 -From da4f68c4ea17e2642b3767fa070aeb406c4fee02 Mon Sep 17 00:00:00 2001 +From 509c04ac190c82ab4a52eea55cbd419803055559 Mon Sep 17 00:00:00 2001 From: gellert Date: Fri, 15 Aug 2014 16:35:06 +0100 -Subject: [PATCH 046/803] MMC: added alternative MMC driver +Subject: [PATCH 046/834] MMC: added alternative MMC driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -72204,10 +72204,10 @@ index 42df06c6b19c..e7f45a2b0c72 100644 2.18.4 -From 55f54ef5fdf22812c2d432b87da5d7138692fd9b Mon Sep 17 00:00:00 2001 +From 3d9c57f6dd8e8be8ea3ace726ee3d160072c40d5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 25 Mar 2015 17:49:47 +0000 -Subject: [PATCH 047/803] Adding bcm2835-sdhost driver, and an overlay to +Subject: [PATCH 047/834] Adding bcm2835-sdhost driver, and an overlay to enable it BCM2835 has two SD card interfaces. This driver uses the other one. @@ -74696,10 +74696,10 @@ index 000000000000..7caba5e12f79 2.18.4 -From 6f677dc26f2e2b9c8b935a786b0b3f48847673be Mon Sep 17 00:00:00 2001 +From 0994c84b1108c507aa57ce8045b494b161503392 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 28 Oct 2016 15:36:43 +0100 -Subject: [PATCH 048/803] vc_mem: Add vc_mem driver for querying firmware +Subject: [PATCH 048/834] vc_mem: Add vc_mem driver for querying firmware memory addresses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -75200,10 +75200,10 @@ index 000000000000..3c7079237496 2.18.4 -From ddb05c675b5f4d9b89150140fc3c74489d5b9827 Mon Sep 17 00:00:00 2001 +From 8b6e342978da9b119424dd66ab122e0d571b52a7 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Fri, 21 Aug 2015 23:14:48 +0100 -Subject: [PATCH 049/803] Add /dev/gpiomem device for rootless user GPIO access +Subject: [PATCH 049/834] Add /dev/gpiomem device for rootless user GPIO access Signed-off-by: Luke Wren @@ -75510,10 +75510,10 @@ index 000000000000..f5e7f1ba8fb6 2.18.4 -From 4efeaa663ccd8f5489753bd4771fa6d7797a3873 Mon Sep 17 00:00:00 2001 +From a74b079227427c2a5c2eb0afd0b08e13eacbf127 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Sat, 5 Sep 2015 01:14:45 +0100 -Subject: [PATCH 050/803] Add SMI driver +Subject: [PATCH 050/834] Add SMI driver Signed-off-by: Luke Wren @@ -77447,10 +77447,10 @@ index 000000000000..ee3a75edfc03 2.18.4 -From 25e876b3d8e5bfcb6e52ad6dcd526fdaef7e176e Mon Sep 17 00:00:00 2001 +From 8ea713dd879aa2910ed00c8bea96a308f6e19a7f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 15:44:08 +0100 -Subject: [PATCH 051/803] Add Chris Boot's i2c driver +Subject: [PATCH 051/834] Add Chris Boot's i2c driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -78118,10 +78118,10 @@ index 000000000000..962f2e5c7455 2.18.4 -From 3eeab1f521d9f7125973561ebcf52c556aa4c4b2 Mon Sep 17 00:00:00 2001 +From 293e461d632d2e871be4abbf3e015104ed5fce53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 26 Jun 2015 14:27:06 +0200 -Subject: [PATCH 052/803] char: broadcom: Add vcio module +Subject: [PATCH 052/834] char: broadcom: Add vcio module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -78383,10 +78383,10 @@ index 000000000000..d2598663a2b5 2.18.4 -From ca9a6c3c72e198e312363d879acdc12f39fc99d7 Mon Sep 17 00:00:00 2001 +From b1d39c59909f362c5776b982b1f7c1a35dc68cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 26 Jun 2015 14:25:01 +0200 -Subject: [PATCH 053/803] firmware: bcm2835: Support ARCH_BCM270x +Subject: [PATCH 053/834] firmware: bcm2835: Support ARCH_BCM270x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -78472,10 +78472,10 @@ index 2371d08bdd17..5fec4accb24f 100644 2.18.4 -From 6add890a386142bb7260ed8e1ca5b9913a709d66 Mon Sep 17 00:00:00 2001 +From 90c72c76bd9bca19429535dedf93fb574e1b4b07 Mon Sep 17 00:00:00 2001 From: notro Date: Wed, 9 Jul 2014 14:46:08 +0200 -Subject: [PATCH 054/803] BCM2708: Add core Device Tree support +Subject: [PATCH 054/834] BCM2708: Add core Device Tree support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -81394,7 +81394,7 @@ index 000000000000..4e47480dd933 + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 09a1182c2936..74dce109a81b 100644 +index 5395e8c2484e..3e67c2b634be 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -2,7 +2,6 @@ @@ -82544,7 +82544,7 @@ index 000000000000..4f903a787d65 + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 4847dd305317..b4a18b627359 100644 +index 3d040f6e2a20..6e0339266027 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -318,7 +318,8 @@ @@ -82697,7 +82697,7 @@ index 4119271c979d..bd77ba3a3562 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts -index 6c8ce39833bf..e82e75ec342a 100644 +index 40b9405f1a8e..d2384d8e8555 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -126,3 +126,8 @@ @@ -82710,7 +82710,7 @@ index 6c8ce39833bf..e82e75ec342a 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts -index 17fdd48346ff..d400f88127db 100644 +index 11edb581dbaf..4ceca674b752 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -121,3 +121,10 @@ @@ -82725,7 +82725,7 @@ index 17fdd48346ff..d400f88127db 100644 + pinctrl-1 = <&i2c0_gpio0>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts -index b0355c229cdc..57ab4d443493 100644 +index 1b435c64bd9c..8f2d10d82fa1 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -128,3 +128,8 @@ @@ -82738,7 +82738,7 @@ index b0355c229cdc..57ab4d443493 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts -index 33b3b5c02521..cb08d5ac0412 100644 +index a23c25c00eea..547c88a3ae9f 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -121,3 +121,10 @@ @@ -82753,7 +82753,7 @@ index 33b3b5c02521..cb08d5ac0412 100644 + pinctrl-1 = <&i2c0_gpio0>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts -index 2b69957e0113..d5b4d9d20424 100644 +index 1b63d6b19750..073fc99ef8a2 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -116,3 +116,10 @@ @@ -82781,7 +82781,7 @@ index a75c882e6575..95564c93a645 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts -index f65448c01e31..7de8af65c142 100644 +index 33b2b77aa47d..3ea5c7e6be54 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -149,3 +149,8 @@ @@ -82794,7 +82794,7 @@ index f65448c01e31..7de8af65c142 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts -index 6dd93c6f4966..cad16a2df245 100644 +index 6f9b3a908f28..a0eabab12c99 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -117,3 +117,8 @@ @@ -82807,7 +82807,7 @@ index 6dd93c6f4966..cad16a2df245 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index d94357b21f7e..3b775a8e9aee 100644 +index 87ddcad76083..1b16cb9ccb88 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -19,6 +19,11 @@ @@ -82857,7 +82857,7 @@ index 0549686134ea..2ea891228ea0 100644 arm-pmu { diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts -index 0455a680394a..f62eff03dae1 100644 +index d8af8eeac7b6..bf22b74359d8 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -128,3 +128,8 @@ @@ -82870,7 +82870,7 @@ index 0455a680394a..f62eff03dae1 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts -index 28be0332c1c8..495117f2324a 100644 +index 77099a7871b0..9529c0475673 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts @@ -178,3 +178,8 @@ @@ -82883,7 +82883,7 @@ index 28be0332c1c8..495117f2324a 100644 + pinctrl-1 = <&i2c0_gpio44>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts -index 37343148643d..8482b40e4117 100644 +index 61010266ca9a..40cb269aed0f 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -181,3 +181,8 @@ @@ -82896,7 +82896,7 @@ index 37343148643d..8482b40e4117 100644 + pinctrl-1 = <&i2c0_gpio44>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index 054ecaa355c9..5474f8ab894f 100644 +index dd4a48604097..8f16b6b3fe08 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -174,3 +174,8 @@ @@ -82985,7 +82985,7 @@ index 0ff0e9e25327..000000000000 - g-tx-fifo-size = <256 256 512 512 512 768 768>; -}; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index b83a864e2e8b..346838ee9d21 100644 +index 0f3be55201a5..6d305b8b5ebe 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -334,7 +334,7 @@ @@ -104958,10 +104958,10 @@ index 94133708889d..9c0df5bde46c 100644 2.18.4 -From b13716834c68ba8593fe3424a0887638a0c5694d Mon Sep 17 00:00:00 2001 +From bb3f92fe27be05b89fdc7ad47b41ce98bd517f2b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Feb 2015 13:50:57 +0000 -Subject: [PATCH 055/803] BCM270x_DT: Add pwr_led, and the required "input" +Subject: [PATCH 055/834] BCM270x_DT: Add pwr_led, and the required "input" trigger The "input" trigger makes the associated GPIO an input. This is to support @@ -105142,20 +105142,20 @@ index 6a8d6409c993..aefab0783075 100644 2.18.4 -From c5d1e649048d56fe07d3c77d8c9d891756329e24 Mon Sep 17 00:00:00 2001 +From 9198b33813a38062ce057519f5ab5ee099245b60 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 3 Jul 2013 00:54:08 +0100 -Subject: [PATCH 056/803] Added Device IDs for August DVB-T 205 +Subject: [PATCH 056/834] Added Device IDs for August DVB-T 205 --- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -index 91460e4d0c30..637cf99d81ed 100644 +index c278b9b0f102..05f2297cf583 100644 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -@@ -1944,6 +1944,10 @@ static const struct usb_device_id rtl28xxu_id_table[] = { +@@ -1953,6 +1953,10 @@ static const struct usb_device_id rtl28xxu_id_table[] = { &rtl28xxu_props, "Compro VideoMate U650F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, &rtl28xxu_props, "MaxMedia HU394-T", NULL) }, @@ -105170,10 +105170,10 @@ index 91460e4d0c30..637cf99d81ed 100644 2.18.4 -From d06c96f1b791f3f1c21ab08c5825e0410ecc024b Mon Sep 17 00:00:00 2001 +From 2954a983c4291cf1c5d942c5a162d8fdfb1a3be5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 28 Nov 2016 16:50:04 +0000 -Subject: [PATCH 057/803] Improve __copy_to_user and __copy_from_user +Subject: [PATCH 057/834] Improve __copy_to_user and __copy_from_user performance Provide a __copy_from_user that uses memcpy. On BCM2708, use @@ -106793,10 +106793,10 @@ index 084734d3da5c..6af65533dbea 100644 2.18.4 -From 6d58817ed1cdbcdc5c6641b390ec1dac315e845e Mon Sep 17 00:00:00 2001 +From 0dfd33ea6100eaf40c7ee50e4e60e6cc529e4b7f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 25 Jun 2015 12:16:11 +0100 -Subject: [PATCH 058/803] gpio-poweroff: Allow it to work on Raspberry Pi +Subject: [PATCH 058/834] gpio-poweroff: Allow it to work on Raspberry Pi The Raspberry Pi firmware manages the power-down and reboot process. To do this it installs a pm_power_off handler, causing @@ -106834,10 +106834,10 @@ index 1c5af2fef142..3e670131f2a8 100644 2.18.4 -From 8e2eb50f46db183e0aeccefd8bf8d4e3203ed755 Mon Sep 17 00:00:00 2001 +From c71865a5484d49a00a12f66fb10f1fe5151f7d6e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 14:32:47 +0100 -Subject: [PATCH 059/803] mfd: Add Raspberry Pi Sense HAT core driver +Subject: [PATCH 059/834] mfd: Add Raspberry Pi Sense HAT core driver mfd: Add rpi_sense_core of compatible string --- @@ -107720,10 +107720,10 @@ index 000000000000..56196dc2af10 2.18.4 -From ca61343bb8d67c4de8b5de1cc407c6357c95bfc8 Mon Sep 17 00:00:00 2001 +From 3e0bbb8e1402d79652fb108f9366ec0d3f41592c Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Mon, 25 Jan 2016 15:48:59 +0000 -Subject: [PATCH 060/803] Add support for all the downstream rpi sound card +Subject: [PATCH 060/834] Add support for all the downstream rpi sound card drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -122966,10 +122966,10 @@ index 880ae162eaa5..54cbdb75f109 100644 2.18.4 -From 231913234fb6e44553f4d7dadef640d8c4d4c7e8 Mon Sep 17 00:00:00 2001 +From 2085fe8530134f58851bd4992160aacdbc73b632 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Fri, 16 Oct 2020 15:17:07 +0200 -Subject: [PATCH 061/803] Fixes a problem when module probes before i2c module +Subject: [PATCH 061/834] Fixes a problem when module probes before i2c module is available The driver crashed while a NULL pointer returned by i2c_get_adapter() @@ -123018,10 +123018,10 @@ index a6d078bc4a9a..157ab4c2cc85 100644 2.18.4 -From 033185c552c973262a1404c0394529a1ebf38b20 Mon Sep 17 00:00:00 2001 +From ea435c07584017ca2a01d8bfc3deba3b9ba22d39 Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 21 Oct 2015 14:55:21 +0100 -Subject: [PATCH 062/803] rpi_display: add backlight driver and overlay +Subject: [PATCH 062/834] rpi_display: add backlight driver and overlay Add a mailbox-driven backlight controller for the Raspberry Pi DSI touchscreen display. Requires updated GPU firmware to recognise the @@ -123201,10 +123201,10 @@ index 000000000000..14a0d9b03739 2.18.4 -From 28391fd72a95e11ed1671896a810c190ca7b102b Mon Sep 17 00:00:00 2001 +From bf4aa5233d69015c3839e59c4bfa6c222683219a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 23 Feb 2016 19:56:04 +0000 -Subject: [PATCH 063/803] bcm2835-virtgpio: Virtual GPIO driver +Subject: [PATCH 063/834] bcm2835-virtgpio: Virtual GPIO driver Add a virtual GPIO driver that uses the firmware mailbox interface to request that the VPU toggles LEDs. @@ -123468,10 +123468,10 @@ index 000000000000..49e28ad9760e 2.18.4 -From 7e99747dd26652b1383df300de5c8a72158522bc Mon Sep 17 00:00:00 2001 +From d1ecd9dab31029a3b0d8c06be0f524d5a94ae411 Mon Sep 17 00:00:00 2001 From: Pantelis Antoniou Date: Wed, 3 Dec 2014 13:23:28 +0200 -Subject: [PATCH 064/803] OF: DT-Overlay configfs interface +Subject: [PATCH 064/834] OF: DT-Overlay configfs interface This is a port of Pantelis Antoniou's v3 port that makes use of the new upstreamed configfs support for binary attributes. @@ -123909,10 +123909,10 @@ index 000000000000..178f0629b0f0 2.18.4 -From c93ac8bc79902df31710de57c823ae1d1b87462d Mon Sep 17 00:00:00 2001 +From f32e073aa75fa74ce5b7e28f4ef467728fd03d4e Mon Sep 17 00:00:00 2001 From: Cheong2K Date: Fri, 26 Feb 2016 18:20:10 +0800 -Subject: [PATCH 065/803] brcm: adds support for BCM43341 wifi +Subject: [PATCH 065/834] brcm: adds support for BCM43341 wifi brcmfmac: Disable power management @@ -124060,10 +124060,10 @@ index 6d5d5c39c635..bfe4b8e5a716 100644 2.18.4 -From 8d97172330a6af626a69746695984da61d9258e3 Mon Sep 17 00:00:00 2001 +From 730a462f41ef4cc94057438b32d2160ae17f8066 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 17 Dec 2015 13:37:07 +0000 -Subject: [PATCH 066/803] hci_h5: Don't send conf_req when ACTIVE +Subject: [PATCH 066/834] hci_h5: Don't send conf_req when ACTIVE Without this patch, a modem and kernel can continuously bombard each other with conf_req and conf_rsp messages, in a demented game of tag. @@ -124089,10 +124089,10 @@ index 996729e78105..6d179e455721 100644 2.18.4 -From fb02e1c85b1d6df0ad18f7b6e2b959c3bfda0704 Mon Sep 17 00:00:00 2001 +From cbbeae84a0779e5e1f735e1aef1474bf12b0c2cf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 13 Apr 2015 17:16:29 +0100 -Subject: [PATCH 067/803] config: Add default configs +Subject: [PATCH 067/834] config: Add default configs --- arch/arm/configs/bcm2709_defconfig | 1473 +++++++++++++++++++++++++ @@ -131467,10 +131467,10 @@ index 000000000000..d542d2522076 2.18.4 -From 186f920aa1c4205d3f0b30c24f48b2344987c694 Mon Sep 17 00:00:00 2001 +From 4505a1afcd4b1a4a8a009f8e4c7e18e4cacb7bd7 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 14 Jan 2017 21:43:57 -0800 -Subject: [PATCH 068/803] ARM64: Round-Robin dispatch IRQs between CPUs. +Subject: [PATCH 068/834] ARM64: Round-Robin dispatch IRQs between CPUs. IRQ-CPU mapping is round robined on ARM64 to increase concurrency and allow multiple interrupts to be serviced @@ -131547,10 +131547,10 @@ index 2187672e5be3..0b2af88b69a0 100644 2.18.4 -From 806509bbe844adbfd9d7d7ee6eb1def4b85faec9 Mon Sep 17 00:00:00 2001 +From d95bf5c9e55b48675d35c4458114342f62953a00 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 11 Feb 2017 01:18:31 -0800 -Subject: [PATCH 069/803] ARM64: Force hardware emulation of deprecated +Subject: [PATCH 069/834] ARM64: Force hardware emulation of deprecated instructions. --- @@ -131581,10 +131581,10 @@ index 7364de008bab..a11467132346 100644 2.18.4 -From 03482bbf0b6b02c56f2694d414ca6aa8e23d5191 Mon Sep 17 00:00:00 2001 +From 8417061f1a171aef74c6b825be35a27bfcc5ad90 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 25 Aug 2017 19:18:13 +0100 -Subject: [PATCH 070/803] cache: export clean and invalidate +Subject: [PATCH 070/834] cache: export clean and invalidate hack: cache: Fix linker error --- @@ -131642,10 +131642,10 @@ index dc8f152f3556..536df5db66e4 100644 2.18.4 -From 9048342d4b0fa6c24f59e045c7c1ff1fd1159740 Mon Sep 17 00:00:00 2001 +From cb47ec323105852c77efdfb648ac1ed1f46df274 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 14 Nov 2017 15:13:15 +0000 -Subject: [PATCH 071/803] AXI performance monitor driver (#2222) +Subject: [PATCH 071/834] AXI performance monitor driver (#2222) Uses the debugfs I/F to provide access to the AXI bus performance monitors. @@ -132344,10 +132344,10 @@ index 000000000000..5ae2bdaa88b4 2.18.4 -From a53cd40c16d4c133758c7ef112781ba63cb24208 Mon Sep 17 00:00:00 2001 +From 2a0017890ca223eda82d3f8006bf9adc1730e1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Wed, 3 Jun 2015 12:26:13 +0200 -Subject: [PATCH 072/803] ARM: bcm2835: Set Serial number and Revision +Subject: [PATCH 072/834] ARM: bcm2835: Set Serial number and Revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -132413,10 +132413,10 @@ index bfc556f76720..73ec2427fbcf 100644 2.18.4 -From 3e4013e514665dc6f4d5e576bb8288b1212e174b Mon Sep 17 00:00:00 2001 +From 7263b1ecafa485c5890f408e3c27336b8fbbcbea Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 16 Jul 2018 14:40:13 +0100 -Subject: [PATCH 073/803] dwc-otg: FIQ: Fix "bad mode in data abort handler" +Subject: [PATCH 073/834] dwc-otg: FIQ: Fix "bad mode in data abort handler" Create a semi-static mapping for the USB registers early in the boot process, before additional kernel threads are started, so all threads @@ -132535,10 +132535,10 @@ index 73ec2427fbcf..9b6c921106b5 100644 2.18.4 -From b6ae543807a7ac2a61bac4af89059227898514b3 Mon Sep 17 00:00:00 2001 +From c69433fae5998dee3f870cddc99e3e97661e668f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Dec 2017 09:18:32 +0000 -Subject: [PATCH 074/803] ARM: Activate FIQs to avoid __irq_startup warnings +Subject: [PATCH 074/834] ARM: Activate FIQs to avoid __irq_startup warnings There is a new test in __irq_startup that the IRQ is activated, which hasn't been the case for FIQs since they bypass some of the usual setup. @@ -132577,10 +132577,10 @@ index 98ca3e3fa847..c3fe7d3cf482 100644 2.18.4 -From 5104dd863a601b78dc7c897a88be3ae9ae1f7b23 Mon Sep 17 00:00:00 2001 +From 409b87a71f3a2250627d6e2849f07607a906de39 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 14 Sep 2016 09:16:19 +0100 -Subject: [PATCH 075/803] raspberrypi-firmware: Export the general transaction +Subject: [PATCH 075/834] raspberrypi-firmware: Export the general transaction function. The vc4-firmware-kms module is going to be doing the MBOX FB call. @@ -132615,10 +132615,10 @@ index 5fec4accb24f..abb16e80a36c 100644 2.18.4 -From 86f6f8755eeb1685d411daa6d073089c701ad49c Mon Sep 17 00:00:00 2001 +From ca44d28bc8a821761ae7aa2ae04b7efd21a600bb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 20 Feb 2018 10:07:27 +0000 -Subject: [PATCH 076/803] i2c-gpio: Also set bus numbers from reg property +Subject: [PATCH 076/834] i2c-gpio: Also set bus numbers from reg property I2C busses can be assigned specific bus numbers using aliases in Device Tree - string properties where the name is the alias and the @@ -132656,10 +132656,10 @@ index a4a6825c8758..cfbcf3952ddc 100644 2.18.4 -From eba8c8e4fba42dae80f658aad3404ead2c8b9d61 Mon Sep 17 00:00:00 2001 +From 8cca09f210747840a94bd9b0665f4e52ca4bf6b5 Mon Sep 17 00:00:00 2001 From: hdoverobinson Date: Tue, 13 Mar 2018 06:58:39 -0400 -Subject: [PATCH 077/803] added capture_clear option to pps-gpio via dtoverlay +Subject: [PATCH 077/834] added capture_clear option to pps-gpio via dtoverlay (#2433) --- @@ -132683,10 +132683,10 @@ index e0de1df2ede0..ee7d8f4e7f2e 100644 2.18.4 -From c071fa5ab9c4a5e4eee43e5c41e45cd0e1f9ff46 Mon Sep 17 00:00:00 2001 +From d627f455be8afbace0937eae66f7d2760c055c4a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Mar 2018 12:01:00 +0000 -Subject: [PATCH 078/803] lan78xx: Read initial EEE status from DT +Subject: [PATCH 078/834] lan78xx: Read initial EEE status from DT Add two new DT properties: * microchip,eee-enabled - a boolean to enable EEE @@ -132729,10 +132729,10 @@ index 306bf917d4ed..8e234a7c84ef 100644 2.18.4 -From 6169fe55d1ca8767f959af021ee9159d5e428ec6 Mon Sep 17 00:00:00 2001 +From fbf4d229ab5ab02ed7c4a537ab317d9d1a01c10f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 14 Jul 2014 22:02:09 +0100 -Subject: [PATCH 079/803] hid: Reduce default mouse polling interval to 60Hz +Subject: [PATCH 079/834] hid: Reduce default mouse polling interval to 60Hz Reduces overhead when using X --- @@ -132767,10 +132767,10 @@ index 8d4ac4b9fb9d..996604acc730 100644 2.18.4 -From 23a4b074057f87ec5b6096727786de8ca4958eda Mon Sep 17 00:00:00 2001 +From bc777620c432affa764483a620b903b1453cd91c Mon Sep 17 00:00:00 2001 From: Nick Bulleid Date: Thu, 10 May 2018 21:57:02 +0100 -Subject: [PATCH 080/803] Add ability to export gpio used by gpio-poweroff +Subject: [PATCH 080/834] Add ability to export gpio used by gpio-poweroff Signed-off-by: Nick Bulleid @@ -132832,10 +132832,10 @@ index 3e670131f2a8..e5dca66360a7 100644 2.18.4 -From 6f6864f06bc42c7408b593d74197a6fdb4b7a1f9 Mon Sep 17 00:00:00 2001 +From cf8d9fa9e0c69c9f71c921bb944725baaedb3d33 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 12 May 2018 21:35:43 +0100 -Subject: [PATCH 081/803] firmware/raspberrypi: Notify firmware of a reboot +Subject: [PATCH 081/834] firmware/raspberrypi: Notify firmware of a reboot Register for reboot notifications, sending RPI_FIRMWARE_NOTIFY_REBOOT over the mailbox interface on reception. @@ -132922,10 +132922,10 @@ index abb16e80a36c..05a0ae2a8eb7 100644 2.18.4 -From 0f73e58ddc2803cffc60d93389dd4db35aff2419 Mon Sep 17 00:00:00 2001 +From fac491fa4736ec0051abb90eb9228e47b92e61c4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 11:21:04 +0100 -Subject: [PATCH 082/803] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time +Subject: [PATCH 082/834] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time ad83c7cb2f37 ("irqchip/irq-bcm2836: Add support for DT interrupt polarity") changed the way that the BCM2836/7 local interrupts are mapped; instead @@ -132994,10 +132994,10 @@ index 18b7483588c2..0e6c0811dc1e 100644 2.18.4 -From 257643551135b07eddd0b7092f3f3ab9be8e5290 Mon Sep 17 00:00:00 2001 +From f4103825830b7e2f120c61ee2975283b70bf4b0f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 15:07:26 +0100 -Subject: [PATCH 083/803] of: configfs: Use of_overlay_fdt_apply API call +Subject: [PATCH 083/834] of: configfs: Use of_overlay_fdt_apply API call The published API to the dynamic overlay application mechanism now takes a Flattened Device Tree blob as input so that it can manage the @@ -133114,10 +133114,10 @@ index 178f0629b0f0..ac04301dabe1 100644 2.18.4 -From 73d47200e44c476a273f067d51782a6390068917 Mon Sep 17 00:00:00 2001 +From 9b4e74a7424c446b74a4d9b1cb31ffc02dc32583 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Jun 2018 15:21:10 +0100 -Subject: [PATCH 084/803] net: lan78xx: Disable TCP Segmentation Offload (TSO) +Subject: [PATCH 084/834] net: lan78xx: Disable TCP Segmentation Offload (TSO) TSO seems to be having issues when packets are dropped and the remote end uses Selective Acknowledge (SACK) to denote that @@ -133176,10 +133176,10 @@ index 8e234a7c84ef..681a6b949140 100644 2.18.4 -From c463a9d3a42475c1d3a17a04377230945c554fef Mon Sep 17 00:00:00 2001 +From 96fa89f299af1d1d31fdf4eab79c9c840071248d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 Jun 2018 12:20:01 +0100 -Subject: [PATCH 085/803] brcmfmac: Re-enable firmware roaming support +Subject: [PATCH 085/834] brcmfmac: Re-enable firmware roaming support As of 4.18, a firmware that implements the update_connect_params method but doesn't claim to support roaming causes an error. We @@ -133211,10 +133211,10 @@ index 591dcd04b4b4..e3758bd86acf 100644 2.18.4 -From d71fb4173fbe1497877844845051554ba9476ad8 Mon Sep 17 00:00:00 2001 +From f44330de330184462fd2617de9af04bc17b5e928 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Apr 2018 14:46:11 +0100 -Subject: [PATCH 086/803] lan78xx: Move enabling of EEE into PHY init code +Subject: [PATCH 086/834] lan78xx: Move enabling of EEE into PHY init code Enable EEE mode as soon as possible after connecting to the PHY, and before phy_start. This avoids a second link negotiation, which speeds @@ -133281,10 +133281,10 @@ index 681a6b949140..68d0aec53f3a 100644 2.18.4 -From 01e6e01318d502a900550ad72d94eb0866f43d17 Mon Sep 17 00:00:00 2001 +From 4b2cb340fadf0eca9ed1c2cc0a2b3aa9347daa0f Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 9 Jul 2018 12:54:25 +0100 -Subject: [PATCH 087/803] Add rpi-poe-fan driver +Subject: [PATCH 087/834] Add rpi-poe-fan driver Signed-off-by: Serge Schneider @@ -133879,10 +133879,10 @@ index 000000000000..c9654e9e9f2d 2.18.4 -From ebff311426a5c0ef6d5bc5a8143d200756873595 Mon Sep 17 00:00:00 2001 +From 516d2e5b4176e9a2729a745e206f2fa9fc9a83b3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 17 Sep 2018 17:31:18 +0100 -Subject: [PATCH 088/803] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 +Subject: [PATCH 088/834] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT --- @@ -133905,10 +133905,10 @@ index 857ef4ace6e9..deae75ea3c44 100644 2.18.4 -From 142788ece59f963a2f4001345d3021cd02a5d955 Mon Sep 17 00:00:00 2001 +From cf40d8706102b186a203286226e4c78335aca1ab Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 6 Oct 2018 16:46:18 +0200 -Subject: [PATCH 089/803] hwmon: raspberrypi: Prevent voltage low warnings from +Subject: [PATCH 089/834] hwmon: raspberrypi: Prevent voltage low warnings from filling log Although the correct fix for low voltage warnings is to @@ -133986,10 +133986,10 @@ index d3a64a35f7a9..db3b03438dd0 100644 2.18.4 -From bc80d4ba057a13b5570beb0a79da7c37fed87ee5 Mon Sep 17 00:00:00 2001 +From 5b67d13c34a445d83029b225583e13b1c69423c5 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 13:31:21 +0200 -Subject: [PATCH 090/803] firmware: raspberrypi: Add backward compatible +Subject: [PATCH 090/834] firmware: raspberrypi: Add backward compatible get_throttled Avoid a hard userspace ABI change by adding a compatible get_throttled @@ -134071,10 +134071,10 @@ index 05a0ae2a8eb7..f7d605a62801 100644 2.18.4 -From 186dc84fdead9e123b29f3fa16415c3fa2f16428 Mon Sep 17 00:00:00 2001 +From e7cacc8fec1ed27bb7f52a2d00f9b14705c3a64a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 6 Nov 2018 12:57:48 +0000 -Subject: [PATCH 091/803] sc16is7xx: Don't spin if no data received +Subject: [PATCH 091/834] sc16is7xx: Don't spin if no data received See: https://github.com/raspberrypi/linux/issues/2676 @@ -134100,10 +134100,10 @@ index 9adb8362578c..f64e051c0030 100644 2.18.4 -From ae709c35fcb953837ed4c50df4659b049f6b61b3 Mon Sep 17 00:00:00 2001 +From 82ed5c2ffb8a00e4c145b46e938bc98b15826dfc Mon Sep 17 00:00:00 2001 From: Ram Chandrasekar Date: Mon, 7 May 2018 11:54:08 -0600 -Subject: [PATCH 092/803] drivers: thermal: step_wise: add support for +Subject: [PATCH 092/834] drivers: thermal: step_wise: add support for hysteresis Step wise governor increases the mitigation level when the temperature @@ -134200,10 +134200,10 @@ index 2ae7198d3067..abe34cfe21fe 100644 2.18.4 -From 79e9839b6a9a7dd33f9580f3cc60a4955e2dfcc9 Mon Sep 17 00:00:00 2001 +From 1554f0ab8d5d04242d452f7bcc909bee8a9932d6 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 2 Oct 2018 11:14:15 +0100 -Subject: [PATCH 093/803] drivers: thermal: step_wise: avoid throttling at +Subject: [PATCH 093/834] drivers: thermal: step_wise: avoid throttling at hysteresis temperature after dropping below it Signed-off-by: Serge Schneider @@ -134228,10 +134228,10 @@ index abe34cfe21fe..5c8602933201 100644 2.18.4 -From ce2969c5a58f6dd794dd9c285694846b0baad37f Mon Sep 17 00:00:00 2001 +From b8cc6c23480fb577103e3ce1623e097068d68f3e Mon Sep 17 00:00:00 2001 From: James Hughes Date: Fri, 2 Nov 2018 11:55:49 +0000 -Subject: [PATCH 094/803] Update issue templates (#2736) +Subject: [PATCH 094/834] Update issue templates (#2736) --- .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++++++++++ @@ -134282,10 +134282,10 @@ index 000000000000..09bdc4a96838 2.18.4 -From a067d207ff44cf7d14f78e4998793852935f532b Mon Sep 17 00:00:00 2001 +From 3b2c876ec0b87b7ab7ea8adbdbdbf656f886108e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Nov 2018 19:46:58 +0000 -Subject: [PATCH 095/803] net: lan78xx: Support auto-downshift to 100Mb/s +Subject: [PATCH 095/834] net: lan78xx: Support auto-downshift to 100Mb/s Ethernet cables with faulty or missing pairs (specifically pairs C and D) allow auto-negotiation to 1000Mbs, but do not support the successful @@ -134383,10 +134383,10 @@ index 517288da19fd..626c450d71f4 100644 2.18.4 -From 8dc78f75a7fb9f1ece7b61c068f1b0685c6dfeb5 Mon Sep 17 00:00:00 2001 +From 83e53701aa49285c68d6fa160359afe547252e8a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 10 Jan 2019 17:58:06 +0000 -Subject: [PATCH 096/803] firmware: raspberrypi: Report the fw variant during +Subject: [PATCH 096/834] firmware: raspberrypi: Report the fw variant during probe The driver already reported the firmware build date during probe. @@ -134492,10 +134492,10 @@ index 16253b6875c9..d0c827064999 100644 2.18.4 -From a9789cc905141ec9ca07621671de420a5f1d00b6 Mon Sep 17 00:00:00 2001 +From d3c18577da03f89e876f40d9305c21791453a647 Mon Sep 17 00:00:00 2001 From: Joshua Emele Date: Wed, 7 Nov 2018 16:07:40 -0800 -Subject: [PATCH 097/803] lan78xx: Debounce link events to minimize poll storm +Subject: [PATCH 097/834] lan78xx: Debounce link events to minimize poll storm The bInterval is set to 4 (i.e. 8 microframes => 1ms) and the only bit that the driver pays attention to is "link was reset". If there's a @@ -134543,10 +134543,10 @@ index 68d0aec53f3a..e5bd18aa1cfa 100644 2.18.4 -From ff0efa53d127821ea846faef951a1b7779d4c528 Mon Sep 17 00:00:00 2001 +From 681fa7ca634d439db5c5fe55ac60b0af0298d435 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 Mar 2019 09:51:22 +0000 -Subject: [PATCH 098/803] lan78xx: EEE support is now a PHY property +Subject: [PATCH 098/834] lan78xx: EEE support is now a PHY property Now that EEE support is a property of the PHY, use the PHY's DT node when querying the EEE-related properties. @@ -134575,10 +134575,10 @@ index e5bd18aa1cfa..a03bcbdd04f3 100644 2.18.4 -From 8332e6d0d8ed563290e67ef5ad7eb4f412423569 Mon Sep 17 00:00:00 2001 +From 65f780249490a566c180eeadb77ead7c4cf5926e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 20 Jul 2018 22:03:41 +0100 -Subject: [PATCH 099/803] bcm2835-dma: Add support for per-channel flags +Subject: [PATCH 099/834] bcm2835-dma: Add support for per-channel flags Add the ability to interpret the high bits of the dreq specifier as flags to be included in the DMA_CS register. The motivation for this @@ -134629,10 +134629,10 @@ index bf7ba96a39f9..87b5d0bef355 100644 2.18.4 -From d4dfac8c17933658c82cd2a51139d7220e4d952a Mon Sep 17 00:00:00 2001 +From a5d71f005f3abf7e9e19151efe161395b558b7a1 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 29 Mar 2019 10:53:14 +0000 -Subject: [PATCH 100/803] rtc: rv3028: Add backup switchover mode support +Subject: [PATCH 100/834] rtc: rv3028: Add backup switchover mode support Signed-off-by: Phil Howard --- @@ -134685,10 +134685,10 @@ index fa226f0fe67d..20baf2257631 100644 2.18.4 -From 6c7ad3d73836019ea30f4c351bbf363f5b06cafb Mon Sep 17 00:00:00 2001 +From 6472b839636dd0158ee08a80d8b161aadc61f7a9 Mon Sep 17 00:00:00 2001 From: P33M Date: Thu, 2 May 2019 11:53:45 +0100 -Subject: [PATCH 101/803] lan78xx: use default alignment for rx buffers +Subject: [PATCH 101/834] lan78xx: use default alignment for rx buffers The lan78xx uses a 12-byte hardware rx header, so there is no need to allocate SKBs with NET_IP_ALIGN set. Removes alignment faults @@ -134714,10 +134714,10 @@ index a03bcbdd04f3..58f5b90f11d4 100644 2.18.4 -From a0d2a778f0bf07fab435b32d5e271a623edfdbeb Mon Sep 17 00:00:00 2001 +From abe90b0bf9f38526f45104bc4e0bf68a6c13316c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:55:37 +0000 -Subject: [PATCH 102/803] media: ov5647: Add set_fmt and get_fmt calls. +Subject: [PATCH 102/834] media: ov5647: Add set_fmt and get_fmt calls. There's no way to query the subdevice for the supported resolutions. @@ -134767,10 +134767,10 @@ index e7d2e5b4ad4b..3e587eb0a30e 100644 2.18.4 -From f1ead0d50b23bf50be8661399fe31e172eb891ab Mon Sep 17 00:00:00 2001 +From 032be155d7fe41ba96efb8a4423a55a4f23dbc01 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:33 +0000 -Subject: [PATCH 103/803] media: ov5647: Add support for PWDN GPIO. +Subject: [PATCH 103/834] media: ov5647: Add support for PWDN GPIO. Add support for an optional GPIO connected to PWDN on the sensor. @@ -134865,10 +134865,10 @@ index 3e587eb0a30e..c39e3d20e3ef 100644 2.18.4 -From 22098cf7fb868048ac2f4e2512719db363bd46d8 Mon Sep 17 00:00:00 2001 +From 3277ab906fa9063d7d27693e5ff9221433c36e6c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:47 +0000 -Subject: [PATCH 104/803] media: ov5647: Add support for non-continuous clock +Subject: [PATCH 104/834] media: ov5647: Add support for non-continuous clock mode The driver was only supporting continuous clock mode @@ -134950,10 +134950,10 @@ index c39e3d20e3ef..8a1a515388e0 100644 2.18.4 -From 1000ddb25ca1e551a69de38fe1d7370a219d6835 Mon Sep 17 00:00:00 2001 +From b710af86aa9ff41fdb5be761fbe53f321a3dd82e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:59 +0000 -Subject: [PATCH 105/803] media: tc358743: Increase FIFO level to 374. +Subject: [PATCH 105/834] media: tc358743: Increase FIFO level to 374. The existing fixed value of 16 worked for UYVY 720P60 over 2 lanes at 594MHz, or UYVY 1080P60 over 4 lanes. (RGB888 @@ -134987,10 +134987,10 @@ index f21da11caf22..471a56cf96b8 100644 2.18.4 -From a515a05d6dff3ea81a2cdbd2621657911b7bcbdb Mon Sep 17 00:00:00 2001 +From 6e7f9129535502475f31b5904816c47f9e5d82bc Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 21 Sep 2017 17:30:24 +0200 -Subject: [PATCH 106/803] media: tc358743: fix connected/active CSI-2 lane +Subject: [PATCH 106/834] media: tc358743: fix connected/active CSI-2 lane reporting g_mbus_config was supposed to indicate all supported lane numbers, not @@ -135069,10 +135069,10 @@ index c20e2dc6d432..396fb88266be 100644 2.18.4 -From a4b64c7bb2d035aa6b2f67200a9c2b441f6fa4df Mon Sep 17 00:00:00 2001 +From 00e98eb0c13e9745785b95f9857c3e17019c647d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:21 +0000 -Subject: [PATCH 107/803] media: tc358743: Add support for 972Mbit/s link freq. +Subject: [PATCH 107/834] media: tc358743: Add support for 972Mbit/s link freq. Adds register setups for running the CSI lanes at 972Mbit/s, which allows 1080P50 UYVY down 2 lanes. @@ -135154,10 +135154,10 @@ index 44ae2f33334a..24f176ee8a7b 100644 2.18.4 -From 5bfb0126f477a71d44e405c9aebe96d3e06788c4 Mon Sep 17 00:00:00 2001 +From 354cace5313c8b8afaa0718162160a857b00e9f6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:34 +0000 -Subject: [PATCH 108/803] media: tc358743: Check I2C succeeded during probe. +Subject: [PATCH 108/834] media: tc358743: Check I2C succeeded during probe. The probe for the TC358743 reads the CHIPID register from the device and compares it to the expected value of 0. @@ -135258,10 +135258,10 @@ index 24f176ee8a7b..ba8f63dbbd37 100644 2.18.4 -From bf1390344c3481c6aa05872833112d40a7f9a93a Mon Sep 17 00:00:00 2001 +From 09535140f979a1f6f76cf51ce73da92e489d740f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:46 +0000 -Subject: [PATCH 109/803] media: adv7180: Default to the first valid input +Subject: [PATCH 109/834] media: adv7180: Default to the first valid input The hardware default is differential CVBS on AIN1 & 2, which isn't very useful. @@ -135309,10 +135309,10 @@ index 4498d14d3429..e98dd2bee1e5 100644 2.18.4 -From 158bfa868fc344665e9c56f688b7632abd6fa77a Mon Sep 17 00:00:00 2001 +From 26418e7d6f31b0456281b24484cc9d3e7d3fc06c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:56 +0000 -Subject: [PATCH 110/803] media: adv7180: Add YPrPb support for ADV7282M +Subject: [PATCH 110/834] media: adv7180: Add YPrPb support for ADV7282M The ADV7282M can support YPbPr on AIN1-3, but this was not selectable from the driver. Add it to the list of @@ -135339,10 +135339,10 @@ index e98dd2bee1e5..4103690a71df 100644 2.18.4 -From 02f01daad17585608e4befb8851fb4552c2fdc93 Mon Sep 17 00:00:00 2001 +From cde6f0f7728ebeecd0f70facb4fd2469328616b0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:58:08 +0000 -Subject: [PATCH 111/803] media: videodev2: Add helper defines for printing +Subject: [PATCH 111/834] media: videodev2: Add helper defines for printing FOURCCs New helper defines that allow printing of a FOURCC using @@ -135373,10 +135373,10 @@ index 534eaa4d39bc..56c443cc2c3d 100644 2.18.4 -From 28a1dae6dec88481670b6b49f9ba4a02758c51ad Mon Sep 17 00:00:00 2001 +From b5cd369dac60ad3d2bc6829ba3ec7fb8e844ebc7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:06 +0000 -Subject: [PATCH 112/803] dt-bindings: Document BCM283x CSI2/CCP2 receiver +Subject: [PATCH 112/834] dt-bindings: Document BCM283x CSI2/CCP2 receiver Document the DT bindings for the CSI2/CCP2 receiver peripheral (known as Unicam) on BCM283x SoCs. @@ -135483,10 +135483,10 @@ index 000000000000..7714fb374b34 2.18.4 -From ec87f36a647845b464ef222edf64f109f1567482 Mon Sep 17 00:00:00 2001 +From fc2b042681990f8e2b51eaf5411167db1c1f34db Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:40 +0000 -Subject: [PATCH 113/803] MAINTAINERS: Add entry for BCM2835 Unicam driver +Subject: [PATCH 113/834] MAINTAINERS: Add entry for BCM2835 Unicam driver Adds entry for the new BCM2835 Unicam (CSI-2 receiver) driver @@ -135517,10 +135517,10 @@ index 4fef10dd2975..cbfee297e9f9 100644 2.18.4 -From 47025db2929a48045fdfd484458d225e2a527096 Mon Sep 17 00:00:00 2001 +From 36b83ad70884817788208575d1d351225b60c343 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 22 Nov 2018 17:31:06 +0000 -Subject: [PATCH 114/803] media: tc358743: Return an appropriate colorspace +Subject: [PATCH 114/834] media: tc358743: Return an appropriate colorspace from tc358743_set_fmt When calling tc358743_set_fmt, the code was calling tc358743_get_fmt @@ -135621,10 +135621,10 @@ index ba8f63dbbd37..b77b900bf6ad 100644 2.18.4 -From 88adb83b4ea3c439bc27d21d36ef35624e47e1c8 Mon Sep 17 00:00:00 2001 +From 493c57e065a5e1972bc957f1eabbea2e60d46553 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 16:20:46 +0000 -Subject: [PATCH 115/803] staging: mmal-vchiq: Avoid use of bool in structures +Subject: [PATCH 115/834] staging: mmal-vchiq: Avoid use of bool in structures Fixes up a checkpatch error "Avoid using bool structure members because of possible alignment issues". @@ -135651,10 +135651,10 @@ index d697ea55a0da..4a2fc257fb9f 100644 2.18.4 -From 8509483b235da3aab1e470b7c39f1f85b565d6ca Mon Sep 17 00:00:00 2001 +From 65b5167f63d312e243da7b8b9881760ab59c695f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:15:38 +0100 -Subject: [PATCH 116/803] staging: mmal-vchiq: Add support for event callbacks. +Subject: [PATCH 116/834] staging: mmal-vchiq: Add support for event callbacks. (Preparation for the codec driver). The codec uses the event mechanism to report things such as @@ -136019,10 +136019,10 @@ index 1dc81ecf9268..e87f88f99338 100644 2.18.4 -From b9540dce74f46e2baf89fffd21e8716b7313ac52 Mon Sep 17 00:00:00 2001 +From 1f87bb1e0110abea87b45f5bf232fd846867eb18 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:26:02 +0100 -Subject: [PATCH 117/803] staging: vc04_services: Support sending data to MMAL +Subject: [PATCH 117/834] staging: vc04_services: Support sending data to MMAL ports Add the ability to send data to ports. This only supports @@ -136067,10 +136067,10 @@ index 4d2ba6851d87..2f25b96673e5 100644 2.18.4 -From 894ab10725d52e312371285d8a53c366a1c2fed4 Mon Sep 17 00:00:00 2001 +From d3a9f5c3e91b6bcc3b5d9a0db0d39b17990d7f93 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 17:57:45 +0000 -Subject: [PATCH 118/803] media: videobuf2: Allow exporting of a struct dmabuf +Subject: [PATCH 118/834] media: videobuf2: Allow exporting of a struct dmabuf videobuf2 only allowed exporting a dmabuf as a file descriptor, but there are instances where having the struct dma_buf is @@ -136087,10 +136087,10 @@ Signed-off-by: Dave Stevenson 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c -index 89e38392509c..1bd2d5b07ea6 100644 +index 72350343a56a..3c6a74b29683 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c -@@ -2129,12 +2129,12 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off, +@@ -2140,12 +2140,12 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off, return -EINVAL; } @@ -136106,7 +136106,7 @@ index 89e38392509c..1bd2d5b07ea6 100644 struct dma_buf *dbuf; if (q->memory != VB2_MEMORY_MMAP) { -@@ -2184,6 +2184,21 @@ int vb2_core_expbuf(struct vb2_queue *q, int *fd, unsigned int type, +@@ -2195,6 +2195,21 @@ int vb2_core_expbuf(struct vb2_queue *q, int *fd, unsigned int type, return -EINVAL; } @@ -136158,10 +136158,10 @@ index bbb3f26fbde9..7a4aa9cb28c9 100644 2.18.4 -From dc4f502a96d46f1a91df2d379b9c7e98fcf778e2 Mon Sep 17 00:00:00 2001 +From 7174eeed3cd1db7e88443dda8a065b999408ad8b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 22 Jan 2019 12:04:09 +0000 -Subject: [PATCH 119/803] staging: mmal-vchiq: Fix client_component for 64 bit +Subject: [PATCH 119/834] staging: mmal-vchiq: Fix client_component for 64 bit kernel The MMAL client_component field is used with the event @@ -136199,10 +136199,10 @@ index 2f25b96673e5..43b80a32c922 100644 2.18.4 -From d3b603d740cef4660507f4f6c492db2f93aef642 Mon Sep 17 00:00:00 2001 +From fa60bdfa387f71cb53b380116abffa389ecc5785 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 15:09:28 +0000 -Subject: [PATCH 120/803] clk: clk-bcm2835: Use %zd when printing size_t +Subject: [PATCH 120/834] clk: clk-bcm2835: Use %zd when printing size_t The debug text for how many clocks have been registered uses "%d" with a size_t. Correct it to "%zd". @@ -136229,10 +136229,10 @@ index f1ef788c1194..2674b979a072 100644 2.18.4 -From c076400f68270cb4f0ad9f94f82931650ca01170 Mon Sep 17 00:00:00 2001 +From 121f56217f028639cdcf71421d6f6f97f914039e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Sep 2018 11:08:51 +0100 -Subject: [PATCH 121/803] media: ov5647: Use gpiod_set_value_cansleep +Subject: [PATCH 121/834] media: ov5647: Use gpiod_set_value_cansleep All calls to the gpio library are in contexts that can sleep, therefore there is no issue with having those GPIOs controlled @@ -136289,10 +136289,10 @@ index 8a1a515388e0..07550377be2e 100644 2.18.4 -From 38681c565ba47eae920251bd3a0e315bf26e90b8 Mon Sep 17 00:00:00 2001 +From 068119943a67df5866571904bb4d261154a8eb35 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:33:29 +0000 -Subject: [PATCH 122/803] staging: mmal_vchiq: Add in the Bayer encoding +Subject: [PATCH 122/834] staging: mmal_vchiq: Add in the Bayer encoding formats The list of formats was copied before Bayer support was added. @@ -136346,10 +136346,10 @@ index 2be9941a1f30..44ba91aa6d47 100644 2.18.4 -From c29fa00ac5098486307ddc54d16c6032993e7b34 Mon Sep 17 00:00:00 2001 +From 4db949e0d1c2a7b8fed30bfad28ab27b5f089ece Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 18 Feb 2019 15:52:29 +0000 -Subject: [PATCH 123/803] staging: mmal-vchiq: Update mmal_parameters.h with +Subject: [PATCH 123/834] staging: mmal-vchiq: Update mmal_parameters.h with recently defined params mmal_parameters.h hasn't been updated to reflect additions made @@ -136408,10 +136408,10 @@ index a1e39b1b1701..1793103b18fd 100644 2.18.4 -From 00d4ba2f59a16830e286927f94eb62d4bd521976 Mon Sep 17 00:00:00 2001 +From a3636832cb71d9eaf5ed58f2afa67e2b7a507056 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 May 2019 13:27:23 +0100 -Subject: [PATCH 124/803] staging: mmal-vchiq: Free the event context for +Subject: [PATCH 124/834] staging: mmal-vchiq: Free the event context for control ports vchiq_mmal_component_init calls init_event_context for the @@ -136442,10 +136442,10 @@ index 43b80a32c922..312cd6b74c30 100644 2.18.4 -From 3ac6fa5b9b7454c373863df845de71e1903e9d78 Mon Sep 17 00:00:00 2001 +From 604bb14c13806d406b943247c157e119080a40b4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 15:50:01 +0100 -Subject: [PATCH 125/803] staging: mmal-vchiq: Fix memory leak in error path +Subject: [PATCH 125/834] staging: mmal-vchiq: Fix memory leak in error path On error, vchiq_mmal_component_init could leave the event context allocated for ports. @@ -136524,10 +136524,10 @@ index 312cd6b74c30..f5222a4b26b3 100644 2.18.4 -From fb27694473cdf845f38ab5d8ebe89b898c16c024 Mon Sep 17 00:00:00 2001 +From 7fddcd57f0695d3f17cfb865cf9cb172afe24d52 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Jun 2019 17:15:05 +0100 -Subject: [PATCH 126/803] w1: w1-gpio: Make GPIO an output for strong pullup +Subject: [PATCH 126/834] w1: w1-gpio: Make GPIO an output for strong pullup The logic to drive the data line high to implement a strong pullup assumed that the pin was already an output - setting a value does @@ -136557,10 +136557,10 @@ index d4632aace402..4832cd8c2596 100644 2.18.4 -From aeba55c888387ebc8bf51e291859b7db3b6d2bae Mon Sep 17 00:00:00 2001 +From be32b5148e38e92f8c8dabe8b53c3b3b6af57289 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 Feb 2019 08:49:39 +0000 -Subject: [PATCH 127/803] arm: bcm2835: Fix FIQ early ioremap +Subject: [PATCH 127/834] arm: bcm2835: Fix FIQ early ioremap The ioremapping creates mappings within the vmalloc area. The equivalent early function, create_mapping, now checks that the @@ -136636,10 +136636,10 @@ index 9b6c921106b5..9bd9842da59f 100644 2.18.4 -From ec1703d66f9a39895a164683927c822a8e505d70 Mon Sep 17 00:00:00 2001 +From 8a059ec9afea871098ff1b5d6180e25e846120c0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 May 2019 15:47:42 +0100 -Subject: [PATCH 128/803] arm: bcm2835: DMA can only address 1GB +Subject: [PATCH 128/834] arm: bcm2835: DMA can only address 1GB The legacy peripherals can only address the first gigabyte of RAM, so ensure that DMA allocations are restricted to that region. @@ -136667,10 +136667,10 @@ index 9bd9842da59f..7d59a9364175 100644 2.18.4 -From f845e7d396b7b1d189c9e928218e3ebce310da7a Mon Sep 17 00:00:00 2001 +From 376df630900604a5ad43a0eb10fe5a0879e5e946 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 4 May 2019 17:06:15 +0200 -Subject: [PATCH 129/803] hwrng: iproc-rng200: Add BCM2838 support +Subject: [PATCH 129/834] hwrng: iproc-rng200: Add BCM2838 support The HWRNG on the BCM2838 is compatible to iproc-rng200, so add the support to this driver instead of bcm2835-rng. @@ -136828,10 +136828,10 @@ index 01583faf9893..2a92ea658096 100644 2.18.4 -From 3488895dccb061a06174b7a24a12dc3e5bb8a2c0 Mon Sep 17 00:00:00 2001 +From 6fc10d2ea13f0330395e5e27f666ddfe22fedb73 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 2 Aug 2019 15:20:11 +0100 -Subject: [PATCH 130/803] mmc: sdhci-iproc: Fix vmmc regulators on iProc +Subject: [PATCH 130/834] mmc: sdhci-iproc: Fix vmmc regulators on iProc The Linux support for controlling card power via regulators appears to be contentious. I would argue that the default behaviour is contrary to @@ -136880,10 +136880,10 @@ index ddeaf8e1f72f..57257a014022 100644 2.18.4 -From 07147e63f45fd503742e161a45f0bac0cffa0274 Mon Sep 17 00:00:00 2001 +From b24d294540bbc2f43dc9de1498f7dd7f6d026d87 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 1 Nov 2018 17:31:37 +0000 -Subject: [PATCH 131/803] vchiq: Add 36-bit address support +Subject: [PATCH 131/834] vchiq: Add 36-bit address support Conditional on a new compatible string, change the pagelist encoding such that the top 24 bits are the pfn, leaving 8 bits for run length @@ -137092,10 +137092,10 @@ index 0784c5002417..f8b1c005af62 100644 2.18.4 -From 59fbb4aab64ca7a6a1dc5263a74fb785dc8215ba Mon Sep 17 00:00:00 2001 +From 9bb1ca45b4b956f47a652adfd525060970415193 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 30 Apr 2019 19:15:30 +0100 -Subject: [PATCH 132/803] bcm2835-pcm.c: Support multichannel audio +Subject: [PATCH 132/834] bcm2835-pcm.c: Support multichannel audio --- .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 17 +++++++++-------- @@ -137144,10 +137144,10 @@ index 096f2c54258a..3c0033101e6e 100644 2.18.4 -From 75ccf476d7cf2d1f8217224d4b06b23f2f53797b Mon Sep 17 00:00:00 2001 +From 9b4df259062e7cfb6a58cfbc6b4d26b0081b0665 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 12 Sep 2018 14:44:53 +0100 -Subject: [PATCH 133/803] bcmgenet: constrain max DMA burst length +Subject: [PATCH 133/834] bcmgenet: constrain max DMA burst length --- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +- @@ -137170,10 +137170,10 @@ index f6ca01da141d..45ea07829b8c 100644 2.18.4 -From ee3b48c30c85816570bcb8abaadde8ec3c3eb950 Mon Sep 17 00:00:00 2001 +From 71ed17478e0e204c7532d5621dc60cb392cdbf4a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 27 Mar 2019 13:45:46 +0000 -Subject: [PATCH 134/803] bcmgenet: Better coalescing parameter defaults +Subject: [PATCH 134/834] bcmgenet: Better coalescing parameter defaults Set defaults for TX and RX packet coalescing to be equivalent to: @@ -137189,10 +137189,10 @@ Signed-off-by: Phil Elwell 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 41f7f078cd27..1bcf3ac62d35 100644 +index db74241935ab..05d138849867 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -2594,7 +2594,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv, +@@ -2595,7 +2595,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv, bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX); bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX); @@ -137219,10 +137219,10 @@ index 41f7f078cd27..1bcf3ac62d35 100644 2.18.4 -From ea2fb05fe1381b2574ab6d8ab2acb8e0e97cf2c9 Mon Sep 17 00:00:00 2001 +From fc9ce7fbab61bf55d8c950648e9a34aaf18033fc Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:17:59 +0100 -Subject: [PATCH 135/803] net: genet: enable link energy detect powerdown for +Subject: [PATCH 135/834] net: genet: enable link energy detect powerdown for external PHYs There are several warts surrounding bcmgenet_mii_probe() as this @@ -137256,10 +137256,10 @@ index f9e91304d232..7abd5ddebd8e 100644 2.18.4 -From a00c5e2bcf5db2517b1e1d92e60c916cc343cd75 Mon Sep 17 00:00:00 2001 +From 8a673e631ede8ebe22aa28231d2f303cc6c1b7ea Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 22 Mar 2019 09:47:14 +0000 -Subject: [PATCH 136/803] usb: xhci: Disable the XHCI 5 second timeout +Subject: [PATCH 136/834] usb: xhci: Disable the XHCI 5 second timeout If the VL805 EEPROM has not been programmed then boot will hang for five seconds. The timeout seems to be arbitrary and is an unecessary @@ -137291,10 +137291,10 @@ index a8d97e23f601..d61b0ef94a2f 100644 2.18.4 -From 3bd7ca7d9f06e0f34e96ded51147fccddd987b58 Mon Sep 17 00:00:00 2001 +From 0d99e40d1e21a6793da51856c59128602d4aa43a Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Mon, 13 May 2019 11:05:27 +0000 -Subject: [PATCH 137/803] spi: bcm2835: enable shared interrupt support +Subject: [PATCH 137/834] spi: bcm2835: enable shared interrupt support Add shared interrupt support for this driver. @@ -137304,10 +137304,10 @@ Signed-off-by: Martin Sperl 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c -index 29ee555a42f9..59cff9ea8bea 100644 +index 33c32e931767..1240422970df 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c -@@ -377,6 +377,10 @@ static irqreturn_t bcm2835_spi_interrupt(int irq, void *dev_id) +@@ -379,6 +379,10 @@ static irqreturn_t bcm2835_spi_interrupt(int irq, void *dev_id) if (bs->tx_len && cs & BCM2835_SPI_CS_DONE) bcm2835_wr_fifo_blind(bs, BCM2835_SPI_FIFO_SIZE); @@ -137318,7 +137318,7 @@ index 29ee555a42f9..59cff9ea8bea 100644 /* Read as many bytes as possible from FIFO */ bcm2835_rd_fifo(bs); /* Write as many bytes as possible to FIFO */ -@@ -1327,7 +1331,8 @@ static int bcm2835_spi_probe(struct platform_device *pdev) +@@ -1329,7 +1333,8 @@ static int bcm2835_spi_probe(struct platform_device *pdev) bcm2835_wr(bs, BCM2835_SPI_CS, BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX); @@ -137332,10 +137332,10 @@ index 29ee555a42f9..59cff9ea8bea 100644 2.18.4 -From f0f488b190ef68f4359759adc29164eb3188237c Mon Sep 17 00:00:00 2001 +From b6989f906dcbb47465dce9255128ba183d20cbd2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 23 Jan 2019 16:11:50 +0000 -Subject: [PATCH 138/803] clk-bcm2835: Don't wait for pllh lock +Subject: [PATCH 138/834] clk-bcm2835: Don't wait for pllh lock Signed-off-by: Phil Elwell --- @@ -137376,10 +137376,10 @@ index 2674b979a072..38f97f1707d2 100644 2.18.4 -From 11d78cc4f7604fc4ec1185e93ac2d0e0930cf4a1 Mon Sep 17 00:00:00 2001 +From 2c85fcbdb9b1744ac5985a193e35a361fa7c9eb7 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 11 Jan 2019 17:31:07 -0800 -Subject: [PATCH 139/803] soc: bcm: bcm2835-pm: Add support for 2711. +Subject: [PATCH 139/834] soc: bcm: bcm2835-pm: Add support for 2711. Without the actual power management part any more, there's a lot less to set up for V3D. We just need to clear the RSTN field for the power @@ -137488,10 +137488,10 @@ index ed37dc40e82a..b2d157091e12 100644 2.18.4 -From abff8adcf7285e8d895fdb9d89317a6c057dc9f9 Mon Sep 17 00:00:00 2001 +From 73d7cd38064d31dd59f9480a7c1c248be0159a41 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:11:05 -0700 -Subject: [PATCH 140/803] clk: bcm2835: Add support for setting leaf clock +Subject: [PATCH 140/834] clk: bcm2835: Add support for setting leaf clock rates while running. As long as you wait for !BUSY, you can do glitch-free updates of clock @@ -137547,10 +137547,10 @@ index 38f97f1707d2..4cf4f5e12fe2 100644 2.18.4 -From 24d084388c1ab4b2218b276ec7f6f5e79bda778e Mon Sep 17 00:00:00 2001 +From 0ed245ada74df10dc80b1ac83467d0f302c0d4a4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:24:04 -0700 -Subject: [PATCH 141/803] clk: bcm2835: Allow reparenting leaf clocks while +Subject: [PATCH 141/834] clk: bcm2835: Allow reparenting leaf clocks while they're running. This falls under the same "we can reprogram glitch-free as long as we @@ -137624,10 +137624,10 @@ index 4cf4f5e12fe2..3c55594684cd 100644 2.18.4 -From 76e04e5163a4c6e0c825f084ddb48f46267018d4 Mon Sep 17 00:00:00 2001 +From d88326c1fb41440548a131d58f6aa96d03522cf9 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 10:55:00 +0100 -Subject: [PATCH 142/803] usb: add plumbing for updating interrupt endpoint +Subject: [PATCH 142/834] usb: add plumbing for updating interrupt endpoint interval state xHCI caches device and endpoint data after the interface is configured, @@ -137740,10 +137740,10 @@ index 3dbb42c637c1..a60b7fc02fce 100644 2.18.4 -From f6631110905493a570f20e5141a7d66a5d4f2603 Mon Sep 17 00:00:00 2001 +From de333aab40c1a39a0afb7322ef8c910d97ac579a Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:33:39 +0100 -Subject: [PATCH 143/803] xhci: implement xhci_fixup_endpoint for interval +Subject: [PATCH 143/834] xhci: implement xhci_fixup_endpoint for interval adjustments Must be called in a non-atomic context, after the endpoint @@ -137875,10 +137875,10 @@ index d61b0ef94a2f..494a059f2f5b 100644 2.18.4 -From a46732ca9bd36a16ff7fbd493af08c58b5f5a057 Mon Sep 17 00:00:00 2001 +From fe6711832cd5bb2e6c756860808e25f584a1e9dd Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:42:03 +0100 -Subject: [PATCH 144/803] usbhid: call usb_fixup_endpoint after mangling +Subject: [PATCH 144/834] usbhid: call usb_fixup_endpoint after mangling intervals Lets the mousepoll override mechanism work with xhci. @@ -137904,10 +137904,10 @@ index 996604acc730..5ab69fc58d1b 100644 2.18.4 -From f7db4eef71e78077b32a973469847bff5070256c Mon Sep 17 00:00:00 2001 +From 7a6a299940d45c911963040b9d41834527d706d9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 11 Jun 2019 17:38:28 +0100 -Subject: [PATCH 145/803] arm: bcm2835: Add bcm2838 compatible string. +Subject: [PATCH 145/834] arm: bcm2835: Add bcm2838 compatible string. Signed-off-by: Phil Elwell --- @@ -137930,10 +137930,10 @@ index 7d59a9364175..282a023027fc 100644 2.18.4 -From 44126b05305cca25df4f33b54bc07d3927682398 Mon Sep 17 00:00:00 2001 +From 991bbf4fa53f40d24013212c4254d1fd95fc8b62 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 4 Oct 2018 17:22:43 -0700 -Subject: [PATCH 146/803] drm/v3d: Add support for 2711. +Subject: [PATCH 146/834] drm/v3d: Add support for 2711. Signed-off-by: Eric Anholt --- @@ -137956,10 +137956,10 @@ index 9f7c26193831..a463f8c0ad4c 100644 2.18.4 -From a9c1e7455d5336d3102cd7f0fc424bb9ac29ccb9 Mon Sep 17 00:00:00 2001 +From 215c887ecef91b002357893efb823a452efbef8e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 12:35:43 -0800 -Subject: [PATCH 147/803] drm/v3d: Skip MMU flush if the device is currently +Subject: [PATCH 147/834] drm/v3d: Skip MMU flush if the device is currently off. If it's off, we know it will be reset on poweron, so the MMU won't @@ -138014,10 +138014,10 @@ index 5a453532901f..8986e7b96461 100644 2.18.4 -From 6be6cf362b10f189e52281513a0d9f9fa41d7fe0 Mon Sep 17 00:00:00 2001 +From a83b0d2fca6334bc8bc65334d67140c6fe6522bc Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 14:47:57 -0800 -Subject: [PATCH 148/803] drm/v3d: Hook up the runtime PM ops. +Subject: [PATCH 148/834] drm/v3d: Hook up the runtime PM ops. In translating the runtime PM code from vc4, I missed the ".pm" assignment to actually connect them up. Fixes missing MMU setup if @@ -138054,10 +138054,10 @@ index a463f8c0ad4c..5f581fe8c918 100644 2.18.4 -From 3b6527126cd9a1608d5666089ed1d3ed0dcc34d6 Mon Sep 17 00:00:00 2001 +From a170c2dde748739f98d93822e9679815826b3b20 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 11 Jul 2019 17:55:43 +0100 -Subject: [PATCH 149/803] xhci: add quirk for host controllers that don't +Subject: [PATCH 149/834] xhci: add quirk for host controllers that don't update endpoint DCS Seen on a VLI VL805 PCIe to USB controller. For non-stream endpoints @@ -138078,7 +138078,7 @@ Signed-off-by: Jonathan Bell 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index 7bc18cf8042c..d7c948f569be 100644 +index 119d1a8fbb19..618a131bdd53 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -274,8 +274,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) @@ -138094,10 +138094,10 @@ index 7bc18cf8042c..d7c948f569be 100644 if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index 054840a69eb4..a9bd2e340ead 100644 +index 53059ee957ad..9106f0a1909a 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -533,7 +533,10 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, +@@ -556,7 +556,10 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, struct xhci_virt_ep *ep = &dev->eps[ep_index]; struct xhci_ring *ep_ring; struct xhci_segment *new_seg; @@ -138108,7 +138108,7 @@ index 054840a69eb4..a9bd2e340ead 100644 dma_addr_t addr; u64 hw_dequeue; bool cycle_found = false; -@@ -571,7 +574,28 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, +@@ -594,7 +597,28 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, hw_dequeue = xhci_get_hw_deq(xhci, dev, ep_index, stream_id); new_seg = ep_ring->deq_seg; new_deq = ep_ring->dequeue; @@ -138139,10 +138139,10 @@ index 054840a69eb4..a9bd2e340ead 100644 /* diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index d01241f1daf3..03e4280dbb5a 100644 +index c1865a121100..8f11760e1f7b 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1880,6 +1880,7 @@ struct xhci_hcd { +@@ -1881,6 +1881,7 @@ struct xhci_hcd { #define XHCI_DISABLE_SPARSE BIT_ULL(38) #define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39) #define XHCI_NO_SOFT_RETRY BIT_ULL(40) @@ -138154,10 +138154,10 @@ index d01241f1daf3..03e4280dbb5a 100644 2.18.4 -From abd1ed04c5b261553ad804647288b047ccf1bde3 Mon Sep 17 00:00:00 2001 +From d605d6ab28a3e296d19b8030251518aa12488cd4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 15:38:35 +0100 -Subject: [PATCH 150/803] i2c: bcm2835: Set clock-stretch timeout to 35ms +Subject: [PATCH 150/834] i2c: bcm2835: Set clock-stretch timeout to 35ms The BCM2835 I2C blocks have a register to set the clock-stretch timeout - how long the device is allowed to hold SCL low - in bus @@ -138207,10 +138207,10 @@ index 18b2e9e3d752..5b2589b6b9cc 100644 2.18.4 -From 84b4438c29b30abab61313bb54df322aae01ba48 Mon Sep 17 00:00:00 2001 +From 5dce849d0e802097877bf6d6a194e5cb7f86b598 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 6 Aug 2019 15:23:14 +0100 -Subject: [PATCH 151/803] clk-bcm2835: Avoid null pointer exception +Subject: [PATCH 151/834] clk-bcm2835: Avoid null pointer exception clk_desc_array[BCM2835_PLLB] doesn't exist so we dereference null when iterating @@ -138242,10 +138242,10 @@ index 3c55594684cd..d686c51a68a9 100644 2.18.4 -From e578943861d2bbda0aaa1411046d35317d1d69dd Mon Sep 17 00:00:00 2001 +From bef4ecedc3feaa8a66f6e2d917313f0d2b5eca6b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 15:13:17 -0800 -Subject: [PATCH 152/803] drm/v3d: HACK: gut runtime pm for now. +Subject: [PATCH 152/834] drm/v3d: HACK: gut runtime pm for now. Something is still unstable -- on starting a new glxgears from an idle X11, I get an MMU violation in high addresses. The CTS also failed @@ -138359,10 +138359,10 @@ index 5f581fe8c918..e6dffb116eb3 100644 2.18.4 -From 844f66c42e6a26d94fc488de0e6804cd3591fc5a Mon Sep 17 00:00:00 2001 +From 09288d2eaa605db0bf611c7fa67f2039740a0aee Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 13:22:53 -0700 -Subject: [PATCH 153/803] drm/v3d: Clock V3D down when not in use. +Subject: [PATCH 153/834] drm/v3d: Clock V3D down when not in use. My various attempts at re-enabling runtime PM have failed, so just crank the clock down when V3D is idle to reduce power consumption. @@ -138530,10 +138530,10 @@ index 182c586525eb..b7b439de8660 100644 2.18.4 -From c4b5920e54f9c5de5bae8cff96d130fc7e75372f Mon Sep 17 00:00:00 2001 +From 6c952568a0d6ef79a481eb7c8349951e12e2c31a Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 9 May 2019 14:30:37 +0100 -Subject: [PATCH 154/803] drivers: char: add chardev for mmap'ing the RPiVid +Subject: [PATCH 154/834] drivers: char: add chardev for mmap'ing the RPiVid control registers Based on the gpiomem driver, allow mapping of the decoder register @@ -138988,10 +138988,10 @@ index b2d157091e12..f70a810c55f7 100644 2.18.4 -From 36d4c75abc31ecf0f98b5cfadf2aad8ae18724fc Mon Sep 17 00:00:00 2001 +From 848a05d0ff4ad9884fb3402232ffe8effbc0f4c4 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 1 Aug 2019 16:41:20 +0100 -Subject: [PATCH 155/803] hid: usb: Add device quirks for Freeway Airmouse T3 +Subject: [PATCH 155/834] hid: usb: Add device quirks for Freeway Airmouse T3 and MX3 These wireless mouse/keyboard combo remote control devices specify @@ -139059,10 +139059,10 @@ index be53c723c729..9f9d5778114e 100644 2.18.4 -From 55152f04e1bcf91abecab68fb603a5e86ea9af10 Mon Sep 17 00:00:00 2001 +From 3fcace7ce7d950358c3a1550abb8730e20adaff1 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 16 Jul 2019 12:18:21 +0100 -Subject: [PATCH 156/803] Add HDMI1 facility to the driver. +Subject: [PATCH 156/834] Add HDMI1 facility to the driver. For generic ALSA, all you need is the bcm2835.h change, but have also added structures for IEC958 HDMI. Not sure how to @@ -139152,10 +139152,10 @@ index 1b36475872d6..02f50768af96 100644 2.18.4 -From 212ee977f97742ebe27a03f004a7fafa2e8d8e64 Mon Sep 17 00:00:00 2001 +From b44e4e9e35b78c23c6d89bc7249f00f0be8ec54b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Aug 2019 08:51:43 +0100 -Subject: [PATCH 157/803] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail +Subject: [PATCH 157/834] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail Some combinations of Pi 4Bs and Ethernet switches don't reliably get a DCHP-assigned IP address, leaving the unit with a self=assigned 169.254 @@ -139180,7 +139180,7 @@ Signed-off-by: Phil Elwell 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 1bcf3ac62d35..e1af1dfcf643 100644 +index 05d138849867..82cd64876d66 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -67,6 +67,9 @@ @@ -139193,7 +139193,7 @@ index 1bcf3ac62d35..e1af1dfcf643 100644 static inline void bcmgenet_writel(u32 value, void __iomem *offset) { -@@ -2425,6 +2428,11 @@ static void reset_umac(struct bcmgenet_priv *priv) +@@ -2426,6 +2429,11 @@ static void reset_umac(struct bcmgenet_priv *priv) bcmgenet_rbuf_ctrl_set(priv, 0); udelay(10); @@ -139209,10 +139209,10 @@ index 1bcf3ac62d35..e1af1dfcf643 100644 2.18.4 -From 2464fa67329bd7a5a76b01a3e9f6cc91cc9e5d2f Mon Sep 17 00:00:00 2001 +From 2c9b6208501ad6993fa7c2b3b6badddb5e43a491 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 13 Aug 2019 15:53:29 +0100 -Subject: [PATCH 158/803] xhci: Use more event ring segment table entries +Subject: [PATCH 158/834] xhci: Use more event ring segment table entries Users have reported log spam created by "Event Ring Full" xHC event TRBs. These are caused by interrupt latency in conjunction with a very @@ -139259,10 +139259,10 @@ index ed380ee58ab5..0d336f7451c7 100644 "// Write ERST size = %i to ir_set 0 (some bits preserved)", val); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 03e4280dbb5a..4f24ad7eccd9 100644 +index 8f11760e1f7b..3bf1cf0aabb1 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1649,8 +1649,8 @@ struct urb_priv { +@@ -1650,8 +1650,8 @@ struct urb_priv { * Each segment table entry is 4*32bits long. 1K seems like an ok size: * (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table, * meaning 64 ring segments. @@ -139277,10 +139277,10 @@ index 03e4280dbb5a..4f24ad7eccd9 100644 2.18.4 -From fbd91045d4ec9fb0520dc2e8f9edf5d77a21eaee Mon Sep 17 00:00:00 2001 +From 8787fe867ccc5042e9184dcad849fd2226f68406 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 15 Aug 2019 12:02:34 +0100 -Subject: [PATCH 159/803] configs: arm64/bcm2711: Enable V3D +Subject: [PATCH 159/834] configs: arm64/bcm2711: Enable V3D Enable the V3D driver, which depends on BCM2835_POWER. @@ -139311,10 +139311,10 @@ index 9a5c44606337..b0e048697964 100644 2.18.4 -From 1b7d71738994d31ca93cf79950b1f36f28f19d94 Mon Sep 17 00:00:00 2001 +From bd98f32c67ad9ca1d8b945e7658cc85ffb0b103b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:16:56 +0100 -Subject: [PATCH 160/803] arch/arm: Add model string to cpuinfo +Subject: [PATCH 160/834] arch/arm: Add model string to cpuinfo Signed-off-by: Phil Elwell --- @@ -139353,10 +139353,10 @@ index b06602cea99c..647caa3f6c7f 100644 2.18.4 -From 5ee14c46db289970a9eca69a34f1dacbaac21110 Mon Sep 17 00:00:00 2001 +From 9b8170754dd81bd8cb0e95df8fe327d407d88704 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:17:25 +0100 -Subject: [PATCH 161/803] arch/arm64: Add Revision, Serial, Model to cpuinfo +Subject: [PATCH 161/834] arch/arm64: Add Revision, Serial, Model to cpuinfo Signed-off-by: Phil Elwell --- @@ -139417,10 +139417,10 @@ index 77605aec25fe..721350d21074 100644 2.18.4 -From 7e841b7da5551a2a4fa821b9eabfb01eeb11f3ad Mon Sep 17 00:00:00 2001 +From 56f69657804ab9bf53fbc5193c99331e058fc27c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:34:30 +0100 -Subject: [PATCH 162/803] media: dt-bindings: Add binding for the Sony IMX219 +Subject: [PATCH 162/834] media: dt-bindings: Add binding for the Sony IMX219 sensor The IMX219 is an 8MPix CSI2 sensor, supporting 2 or 4 data lanes. @@ -139501,10 +139501,10 @@ index 000000000000..a02f1ce1e120 2.18.4 -From 256cc7ab268def2ed6321fb255c6576827d61941 Mon Sep 17 00:00:00 2001 +From 253542be507727481e530cc0e6a36b166fb37cc4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:04:51 +0100 -Subject: [PATCH 163/803] v4l2: Add a Greyworld AWB mode. +Subject: [PATCH 163/834] v4l2: Add a Greyworld AWB mode. Adds a simple greyworld white balance preset, mainly for use with cameras without an IR filter (eg Raspberry Pi NoIR) @@ -139543,10 +139543,10 @@ index a184c4939438..fbe96b80a748 100644 2.18.4 -From ffa5326a117d5de45186b36abd75fcbd8fc7597f Mon Sep 17 00:00:00 2001 +From 71a7c3440e1fe2a23f6443eecfbf57e803f98c0a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:13:06 +0100 -Subject: [PATCH 164/803] staging: bcm2835-camera: Add greyworld AWB mode +Subject: [PATCH 164/834] staging: bcm2835-camera: Add greyworld AWB mode This is mainly used for the NoIR camera which has no IR filter and can completely confuse normal AWB presets. @@ -139588,10 +139588,10 @@ index 1793103b18fd..27bafc5f01d2 100644 2.18.4 -From b8a58d886f2a1086b1a12dded0962b145be667fe Mon Sep 17 00:00:00 2001 +From 7f08785f21cd1496b8703f56714bd05e5b575ee9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Sep 2019 17:22:36 +0100 -Subject: [PATCH 165/803] drm/v3d: Delete pm_runtime support +Subject: [PATCH 165/834] drm/v3d: Delete pm_runtime support The pm_runtime was blocking changelist submission, so delete it as a temporary workaround. @@ -139658,10 +139658,10 @@ index 8986e7b96461..618503f2f2f1 100644 2.18.4 -From bdeb21adfff4a938dee12ea958fd2fac245afe8a Mon Sep 17 00:00:00 2001 +From c78d37278d6cfc48ad5d57729434a02d96980422 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 23 Sep 2019 09:26:41 +0100 -Subject: [PATCH 166/803] kbuild: Allow .dtbo overlays to be built piecemeal +Subject: [PATCH 166/834] kbuild: Allow .dtbo overlays to be built piecemeal Before 4.20, it was possible to build an arbitrary overlay by copying it to arm/boot/dts/overlays/mytest-overlay.dts and running: @@ -139683,10 +139683,10 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile -index 23d656936d40..a13d61505415 100644 +index 7f25cfee84ec..bd8e14bcb2ff 100644 --- a/Makefile +++ b/Makefile -@@ -1353,6 +1353,9 @@ ifneq ($(dtstree),) +@@ -1354,6 +1354,9 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ @@ -139700,10 +139700,10 @@ index 23d656936d40..a13d61505415 100644 2.18.4 -From 38436b377771d3602dfc23aeb5e9e8046b204e0b Mon Sep 17 00:00:00 2001 +From a1b5df243b001a1732144d5c10ed7d66e5c95470 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 19 Sep 2019 20:45:30 +0200 -Subject: [PATCH 167/803] ARM: bcm: Switch board, clk and pinctrl to bcm2711 +Subject: [PATCH 167/834] ARM: bcm: Switch board, clk and pinctrl to bcm2711 compatible After the decision to use bcm2711 compatible for upstream, we should @@ -139732,10 +139732,10 @@ index 282a023027fc..e538e0f899a5 100644 2.18.4 -From b702b56b7b81c975f0524e26dc0c96e1abe95e1d Mon Sep 17 00:00:00 2001 +From 828625b99c1076dea64c8e8b85ad6d204fef76c0 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 24 Sep 2019 18:26:55 +0100 -Subject: [PATCH 168/803] Rename HDMI ALSA device names, check for enable state +Subject: [PATCH 168/834] Rename HDMI ALSA device names, check for enable state HDMI Alsa devices renamed to match names used by DRM, to HDMI 1 and HDMI 2 @@ -139877,10 +139877,10 @@ index eb8a8a5b7ec8..f926784c622d 100644 2.18.4 -From 4714a2367691feba293e10d8f65bb3b262d2789f Mon Sep 17 00:00:00 2001 +From 58c0595448fb30f9c5c457fcc14ba625e384b4b4 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Thu, 10 Oct 2019 19:12:08 +0200 -Subject: [PATCH 169/803] dt-bindings: Add binding for the Infineon IRS1125 +Subject: [PATCH 169/834] dt-bindings: Add binding for the Infineon IRS1125 sensor Adds a binding for the Infineon IRS1125 time-of-flight depth @@ -139950,10 +139950,10 @@ index 000000000000..25a48028c957 2.18.4 -From a455bef81fb68d673ae408b2ce91b6290777aac1 Mon Sep 17 00:00:00 2001 +From b2fddb55c0fd95293677b69f5ef6c11f4d46141a Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Thu, 10 Oct 2019 19:12:36 +0200 -Subject: [PATCH 170/803] media: i2c: Add a driver for the Infineon IRS1125 +Subject: [PATCH 170/834] media: i2c: Add a driver for the Infineon IRS1125 depth sensor The Infineon IRS1125 is a time of flight depth sensor that @@ -141195,10 +141195,10 @@ index 000000000000..dccaca23aa76 2.18.4 -From 1fdac2575f4c01bd6df12cc087015f2a7c7404f2 Mon Sep 17 00:00:00 2001 +From 32c00dbbaed5ce9af10c6a3cb34dba0377b014b7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Nov 2019 14:01:41 +0000 -Subject: [PATCH 171/803] drm/v3d: Don't clear MMU control bits on exception +Subject: [PATCH 171/834] drm/v3d: Don't clear MMU control bits on exception MMU exception conditions are reported in the V3D_MMU_CTRL register as write-1-to-clear (W1C) bits. The MMU interrupt handling code clears any @@ -141235,10 +141235,10 @@ index c88686489b88..b804783e2795 100644 2.18.4 -From f2f74d407472c28472ad8ebc94ccc4a5f4496702 Mon Sep 17 00:00:00 2001 +From 7b3e0f51b20c7f8f75412e481ee8f6c9ba355151 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Nov 2019 20:18:08 +0000 -Subject: [PATCH 172/803] drm/v3d: Suppress all but the first MMU error +Subject: [PATCH 172/834] drm/v3d: Suppress all but the first MMU error The v3d driver currently encounters a lot of MMU PTE exceptions, so only log the first to avoid swamping the kernel log. @@ -141280,10 +141280,10 @@ index b804783e2795..063418907a19 100644 2.18.4 -From d3b48b0c4b17389f81891215139497a86f85c08e Mon Sep 17 00:00:00 2001 +From 7f5a587a7ac2a3008dead2ac7540c0884d82220d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 Nov 2019 16:41:21 +0000 -Subject: [PATCH 173/803] drm/v3d: Plug dma_fence leak +Subject: [PATCH 173/834] drm/v3d: Plug dma_fence leak The irq_fence and done_fence are given a reference that is never released. The necessary dma_fence_put()s seem to have been @@ -141314,10 +141314,10 @@ index 49c7920608e2..bfbe33a9492d 100644 2.18.4 -From 6fc3f3de643afc7ccb41cc83f0bda0fc04342ba5 Mon Sep 17 00:00:00 2001 +From 32b0c26f1c5e81d82aed3c9fff4a95021b3f26f2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:57:48 +0000 -Subject: [PATCH 174/803] staging: vchiq_arm: Register vcsm-cma as a platform +Subject: [PATCH 174/834] staging: vchiq_arm: Register vcsm-cma as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, @@ -141360,10 +141360,10 @@ index b8579af3948c..5d4b976820fa 100644 2.18.4 -From 727990e218fe6de88235c118d27b14f9fcb5a576 Mon Sep 17 00:00:00 2001 +From a0c7eecc696ffc63816dcfa1dca9376e40054f80 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:57:58 +0000 -Subject: [PATCH 175/803] staging: vchiq_arm: Register bcm2835-codec as a +Subject: [PATCH 175/834] staging: vchiq_arm: Register bcm2835-codec as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, @@ -141406,10 +141406,10 @@ index 5d4b976820fa..3bbe533007e5 100644 2.18.4 -From 403a6cda181a6bb8dc6f0952aefe85dfb00bbc7f Mon Sep 17 00:00:00 2001 +From a91dcfb50dd74296ee734a629517bf69b973127f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Nov 2019 11:59:01 +0000 -Subject: [PATCH 176/803] net: bcmgenet: The second IRQ is optional +Subject: [PATCH 176/834] net: bcmgenet: The second IRQ is optional As of 5.4, the kernel logs errors for absent IRQs unless requested with platform_get_irq_optional. @@ -141436,10 +141436,10 @@ index 063418907a19..0f7a23f051df 100644 2.18.4 -From d502989fbe3550c7c7b50721ac7dad684e352b5f Mon Sep 17 00:00:00 2001 +From bc18bdd9a61cd4dcd1409f704b19f231a40d2474 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 31 Oct 2019 14:39:44 +0000 -Subject: [PATCH 177/803] net:phy:2711 Allow ethernet LED mode to be set via +Subject: [PATCH 177/834] net:phy:2711 Allow ethernet LED mode to be set via device tree Add device tree entries and code to allow the specification of @@ -141488,10 +141488,10 @@ index dbed15dc0fe7..10d70bde381c 100644 2.18.4 -From a2b2f15d8cf02c796086178abdc89425a248301d Mon Sep 17 00:00:00 2001 +From 548a29cb25c1989c491d9992a3b27c769ac90e58 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 7 Nov 2019 14:59:59 +0000 -Subject: [PATCH 178/803] net:phy:2711 Change the default ethernet LED actions +Subject: [PATCH 178/834] net:phy:2711 Change the default ethernet LED actions This should return default behaviour back to that of previous releases. @@ -141527,10 +141527,10 @@ index 10d70bde381c..6de9b072b6b9 100644 2.18.4 -From 90d1b777204ebbe80d60dbbfd6316e5ad5d855b5 Mon Sep 17 00:00:00 2001 +From f45058a9ac88926e501c263bbb8c788f71f7f18f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 23 Aug 2019 16:34:38 +0100 -Subject: [PATCH 179/803] v3d_drv: Handle missing clock more gracefully +Subject: [PATCH 179/834] v3d_drv: Handle missing clock more gracefully Signed-off-by: popcornmix --- @@ -141560,10 +141560,10 @@ index 065fb20cc4a8..bfbea29c6c1f 100644 2.18.4 -From c2bacbec0b1075fff309fb51800c6a8275a73f8e Mon Sep 17 00:00:00 2001 +From 9ba4f966baf2a48fe52739134865d2177df9fe25 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 5 Sep 2019 17:59:14 +0100 -Subject: [PATCH 180/803] v3d_gem: Kick the clock so firmware knows we are +Subject: [PATCH 180/834] v3d_gem: Kick the clock so firmware knows we are using firmware clock interface Setting the v3d clock to low value allows firmware to handle dvfs in case @@ -141593,10 +141593,10 @@ index bfbe33a9492d..b4fb899a9409 100644 2.18.4 -From de06a229d49f9dc2b01d810c60b21a1a36e7b8fb Mon Sep 17 00:00:00 2001 +From 85ba776f9233f962d1c48a1a08cd71d332e41121 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 15:49:56 +0100 -Subject: [PATCH 181/803] clk-raspberrypi: Allow cpufreq driver to also adjust +Subject: [PATCH 181/834] clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks For performance/power it is beneficial to adjust gpu clocks with arm clock. @@ -141624,10 +141624,10 @@ index f89b9cfc4309..f4884a5b598a 100644 2.18.4 -From d55e9c7d58ac9a9a4b5f39d14262849d6611fd3f Mon Sep 17 00:00:00 2001 +From 421b6d8286ef833e531ddc2e547fdda325f34a66 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 3 Sep 2019 20:28:00 +0100 -Subject: [PATCH 182/803] clk-bcm2835: Disable v3d clock +Subject: [PATCH 182/834] clk-bcm2835: Disable v3d clock This is controlled by firmware, see clk-raspberrypi.c @@ -141688,10 +141688,10 @@ index d686c51a68a9..84f24244d1b5 100644 2.18.4 -From 5a724503724bbe6791874212260f96e046075157 Mon Sep 17 00:00:00 2001 +From 30e914bfef0e148180ec6e20f0ca0103345d0f75 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 16:23:32 +0000 -Subject: [PATCH 183/803] drm/v3d: Set dma_mask as well as coherent_dma_mask +Subject: [PATCH 183/834] drm/v3d: Set dma_mask as well as coherent_dma_mask Both coherent_dma_mask and dma_mask act as constraints on allocations and bounce buffer usage, so be sure to set dma_mask to the appropriate @@ -141721,10 +141721,10 @@ index bfbea29c6c1f..3237f47a4792 100644 2.18.4 -From 4b4efd47ce85af00e198f85483fd30dc52007b79 Mon Sep 17 00:00:00 2001 +From 85efd3386ea55025fc81fea457b71eccd6ff90a8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Jan 2019 16:13:25 +0000 -Subject: [PATCH 184/803] staging: vchiq_arm: Set up dma ranges on child +Subject: [PATCH 184/834] staging: vchiq_arm: Set up dma ranges on child devices The VCHIQ driver now loads the audio, camera, codec, and vc-sm @@ -141760,10 +141760,10 @@ index 3bbe533007e5..ed6c1747be64 100644 2.18.4 -From d0a3f9fe96c9f96c519ac2d45af3906473bae4f8 Mon Sep 17 00:00:00 2001 +From 3954d3ac6ce0ec31c7112ad33292eb5889a6d88e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Jun 2019 12:15:50 +0100 -Subject: [PATCH 185/803] staging: vchiq: Use the old dma controller for OF +Subject: [PATCH 185/834] staging: vchiq: Use the old dma controller for OF config on platform devices vchiq on Pi4 is no longer under the soc node, therefore it @@ -141817,10 +141817,10 @@ index ed6c1747be64..5e704b366676 100644 2.18.4 -From 144a9fc03fde5b8103912b3f41668bbb400c71ab Mon Sep 17 00:00:00 2001 +From 62cb65c45f9fd24035b4c27d57a8ca20b231ac41 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:40:56 +0100 -Subject: [PATCH 186/803] ARM: bcm: Backport BCM2711 support from upstream +Subject: [PATCH 186/834] ARM: bcm: Backport BCM2711 support from upstream Make the BCM2711 a different machine, but keep it in board_bcm2835. @@ -141870,10 +141870,10 @@ index e538e0f899a5..91a758c61f48 100644 2.18.4 -From 5311b5f4a66869c906244bef41d51971a9f8b49a Mon Sep 17 00:00:00 2001 +From 1cdef7e74b3b493b5863f8b45b82bad531fc9326 Mon Sep 17 00:00:00 2001 From: Luke Hinds <7058938+lukehinds@users.noreply.github.com> Date: Wed, 22 Jan 2020 16:03:00 +0000 -Subject: [PATCH 187/803] Initialise rpi-firmware before clk-bcm2835 +Subject: [PATCH 187/834] Initialise rpi-firmware before clk-bcm2835 The IMA (Integrity Measurement Architecture) looks for a TPM (Trusted Platform Module) having been registered when it initialises; otherwise @@ -141925,10 +141925,10 @@ index e7df000f8b2c..8da5be17b906 100644 2.18.4 -From 7b6a542f4210563775ea4254fddc4ffb85e0c148 Mon Sep 17 00:00:00 2001 +From 876195b3de18252f5a799af7e65067ae1f95573f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 17:30:46 +0000 -Subject: [PATCH 188/803] staging: vchiq_arm: Give vchiq children DT nodes +Subject: [PATCH 188/834] staging: vchiq_arm: Give vchiq children DT nodes vchiq kernel clients are now instantiated as platform drivers rather than using DT, but the children of the vchiq interface may still @@ -141970,10 +141970,10 @@ index 5e704b366676..8d518bd9a6cd 100644 2.18.4 -From 482a2a762234097fdfeb1a4f639b9c3c4cd37679 Mon Sep 17 00:00:00 2001 +From d5d4ccc07c6236fbdf8493e644f2b17e49dc221a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jan 2020 16:04:30 +0000 -Subject: [PATCH 189/803] pinctrl: bcm2835: Remove gpiochip on error +Subject: [PATCH 189/834] pinctrl: bcm2835: Remove gpiochip on error A failure in gpiochip_irqchip_add leads to a leak of a gpiochip. Fix the leak with the use of devm_gpiochip_add_data. @@ -142001,10 +142001,10 @@ index bbf761c41dc5..2696029e1689 100644 2.18.4 -From 7532ac73c02061af72381e93643cb21be1debf11 Mon Sep 17 00:00:00 2001 +From 8c4698e70c80d46109e4d5e132616c0b53903fff Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jan 2020 14:05:42 +0000 -Subject: [PATCH 190/803] pinctrl: bcm2835: Change init order for gpio hogs +Subject: [PATCH 190/834] pinctrl: bcm2835: Change init order for gpio hogs pinctrl-bcm2835 is a combined pinctrl/gpio driver. Currently the gpio side is registered first, but this breaks gpio hogs (which are @@ -142085,10 +142085,10 @@ index 2696029e1689..edb3a863871d 100644 2.18.4 -From 30b7e8f4e87802ec836cad817f858e186caea644 Mon Sep 17 00:00:00 2001 +From 1f9f126a5f61248cda99ecb7aaafa906fa065d65 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Feb 2020 17:38:20 +0000 -Subject: [PATCH 191/803] pinctrl: bcm2835: Accept fewer than expected IRQs +Subject: [PATCH 191/834] pinctrl: bcm2835: Accept fewer than expected IRQs The downstream .dts files only request two GPIO IRQs. Truncate the array of parent IRQs when irq_of_parse_and_map returns 0. @@ -142122,10 +142122,10 @@ index edb3a863871d..bda29f421e78 100644 2.18.4 -From bf263ddda4522efc45795919bb2b51263099d039 Mon Sep 17 00:00:00 2001 +From 631a1a404fc7ec1f35ef944e5b7c1aa9c21632ee Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 2 Mar 2020 14:40:19 +0000 -Subject: [PATCH 192/803] drivers: char: vcio: Use common compat header +Subject: [PATCH 192/834] drivers: char: vcio: Use common compat header The definition of compat_ptr is now common for most platforms, but requires the inclusion of . @@ -142151,10 +142151,10 @@ index d2598663a2b5..a39155a94fb7 100644 2.18.4 -From 8482a71eed06ee7e8b6b73dabb531cf00a966ce2 Mon Sep 17 00:00:00 2001 +From 936ad5b17203a8150f69245f5dfd2bcb1661c804 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 2 Mar 2020 14:42:23 +0000 -Subject: [PATCH 193/803] video: fbdev: bcm2708_fb: Use common compat header +Subject: [PATCH 193/834] video: fbdev: bcm2708_fb: Use common compat header The definition of compat_ptr is now common for most platforms, but requires the inclusion of . @@ -142180,10 +142180,10 @@ index 0e9ec3f593b8..17e9260655e4 100644 2.18.4 -From 23e4386d856a59e3559b5fe33161c9cb381e7f35 Mon Sep 17 00:00:00 2001 +From e6e32ebd6ecb4bde7121b792dc2a7d95588ed157 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 6 Feb 2020 12:23:15 +0000 -Subject: [PATCH 194/803] of: overlay: Correct symbol path fixups +Subject: [PATCH 194/834] of: overlay: Correct symbol path fixups When symbols from overlays are added to the live tree their paths must be rebased. The translated symbol is normally the result of joining @@ -142223,10 +142223,10 @@ index 43a77d720008..bccef312f4c3 100644 2.18.4 -From ee3dc2910a877aafb8ebe78e845ad03820369a3b Mon Sep 17 00:00:00 2001 +From 2596cce2563f5c90a339b557db51c2badf91ac3d Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 15 Jan 2018 18:28:39 -0500 -Subject: [PATCH 195/803] dt-bindings: pci: Add DT docs for Brcmstb PCIe device +Subject: [PATCH 195/834] dt-bindings: pci: Add DT docs for Brcmstb PCIe device The DT bindings description of the Brcmstb PCIe device is described. This node can be used by almost all Broadcom settop box chips, using @@ -142307,10 +142307,10 @@ index 000000000000..a1a9ad5e70ca 2.18.4 -From 1a1b6ec891a1410f1cffcbc6a39c04f6f8e2777e Mon Sep 17 00:00:00 2001 +From f75e83cf8e9a4b863de2392deaffe741469edb0a Mon Sep 17 00:00:00 2001 From: Nataliya Korovkina Date: Thu, 12 Mar 2020 17:22:53 -0400 -Subject: [PATCH 196/803] Kbuild: Allow .dtbo overlays to be built, adjust. +Subject: [PATCH 196/834] Kbuild: Allow .dtbo overlays to be built, adjust. This is adjustment to commit d368ceaacdccd7732dc97d1d7987bdf7149d62e3 "kbuild: Allow .dtbo overlays to be built piecemeal" @@ -142323,10 +142323,10 @@ Signed-off-by: Nataliya Korovkina 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index a13d61505415..b8f34f642fa8 100644 +index bd8e14bcb2ff..31cbbd02c5f5 100644 --- a/Makefile +++ b/Makefile -@@ -1353,7 +1353,7 @@ ifneq ($(dtstree),) +@@ -1354,7 +1354,7 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ @@ -142339,10 +142339,10 @@ index a13d61505415..b8f34f642fa8 100644 2.18.4 -From 5e045c32db64b172b40d76ab67f02fbc0ab1f3c2 Mon Sep 17 00:00:00 2001 +From b7e1a4b41920225adef0e7dbe816c6f360bc2f04 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 1 Apr 2020 11:22:44 +0100 -Subject: [PATCH 197/803] bcmgenet: Disable skip_umac_reset by default +Subject: [PATCH 197/834] bcmgenet: Disable skip_umac_reset by default Possible fixed upstream by 'net: bcmgenet: keep MAC in reset until PHY is up' @@ -142352,7 +142352,7 @@ Signed-off-by: popcornmix 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index e1af1dfcf643..ef75c4585a04 100644 +index 82cd64876d66..06e0e3d0f2b5 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -67,7 +67,7 @@ @@ -142368,10 +142368,10 @@ index e1af1dfcf643..ef75c4585a04 100644 2.18.4 -From 5f2c7edcb6a8eb26ad5d5a25f370a6917049cffe Mon Sep 17 00:00:00 2001 +From 9c9c926aa27edb2e621454c4030071b462698e22 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:22:06 +0000 -Subject: [PATCH 198/803] drm/fourcc: Add packed 10bit YUV 4:2:0 format +Subject: [PATCH 198/834] drm/fourcc: Add packed 10bit YUV 4:2:0 format Adds a format that is 3 10bit YUV 4:2:0 samples packed into a 32bit work (with 2 spare bits). @@ -142431,10 +142431,10 @@ index 5498d7a6556a..3aeab2680295 100644 2.18.4 -From 5092590ae886b3f6e8dec1df7b35b7f637b58705 Mon Sep 17 00:00:00 2001 +From e76e20e7170db4c987a2aceb6e087999895cbd8d Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 13 Dec 2019 17:04:25 +0100 -Subject: [PATCH 199/803] media: uapi: hevc: Add scaling matrix control +Subject: [PATCH 199/834] media: uapi: hevc: Add scaling matrix control Taken from https://patchwork.linuxtv.org/patch/60728/ Changes (mainly documentation) have been requested. @@ -142593,10 +142593,10 @@ index a3b650ab00f6..3cf7da003cd9 100644 2.18.4 -From bb762ce161b1c3024cbf5b5de7b3628087c97dff Mon Sep 17 00:00:00 2001 +From e3f4c7c3cec86c95cc0fd987f05fbd665b8e4421 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 13 Dec 2019 17:04:27 +0100 -Subject: [PATCH 200/803] media: uapi: hevc: Add segment address field +Subject: [PATCH 200/834] media: uapi: hevc: Add segment address field From https://patchwork.linuxtv.org/patch/60725/ Changes requested, but mainly docs. @@ -142662,10 +142662,10 @@ index 3cf7da003cd9..ffc701e268eb 100644 2.18.4 -From ea821c99d722f76551e6715ae16ac46f2a8f59dd Mon Sep 17 00:00:00 2001 +From 5c73dd2a18b3e7ee4a6c2732b09ba0b8f35a90f1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 23 Mar 2020 19:00:17 +0000 -Subject: [PATCH 201/803] media: uapi: Add hevc ctrls for WPP decoding +Subject: [PATCH 201/834] media: uapi: Add hevc ctrls for WPP decoding WPP can allow greater parallelism within the decode, but needs offset information to be passed in. @@ -142708,10 +142708,10 @@ index ffc701e268eb..6a4901d7caf3 100644 2.18.4 -From f09a5f0eb1b1348ffa9aca5dcc43abb807ef719b Mon Sep 17 00:00:00 2001 +From f562dd7da81518a57ec921e43715001bf8ed1a0a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:28:21 +0000 -Subject: [PATCH 202/803] media: videodev2.h: Add a format for column YUV4:2:0 +Subject: [PATCH 202/834] media: videodev2.h: Add a format for column YUV4:2:0 modes Some of the Broadcom codec blocks use a column based YUV4:2:0 image @@ -143025,10 +143025,10 @@ index 56c443cc2c3d..568801746d2d 100644 2.18.4 -From 0a28f3ce3a5dc982922941bd2eb2be26e4ddf378 Mon Sep 17 00:00:00 2001 +From efff4f25b4b8eb0c98f1653c3de8d8800eb43aec Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 5 Mar 2020 14:46:54 +0000 -Subject: [PATCH 203/803] media: v4l2-mem2mem: allow request job buffer +Subject: [PATCH 203/834] media: v4l2-mem2mem: allow request job buffer processing after job finish Allow the capture buffer to be detached from a v4l2 request job such @@ -143307,10 +143307,10 @@ index c203047eb834..260593fffbc8 100644 2.18.4 -From 140a902a13dea4ee3178fec39a5c55052e524397 Mon Sep 17 00:00:00 2001 +From 0bd74f6d2651e4b2075890a2243d7f84526e8770 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Mar 2020 10:53:16 +0000 -Subject: [PATCH 204/803] media: dt-bindings: media: Add binding for the +Subject: [PATCH 204/834] media: dt-bindings: media: Add binding for the Raspberry PI HEVC decoder Adds a binding for the HEVC decoder found on the BCM2711 / Raspberry Pi 4. @@ -143422,10 +143422,10 @@ index cbfee297e9f9..b5113e381d78 100644 2.18.4 -From 713f604496d50efcabbfdfaff7fe464ac177d5eb Mon Sep 17 00:00:00 2001 +From 026eb6b73c8ffb3083a595c1472394c548f5beb5 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 5 Mar 2020 18:30:41 +0000 -Subject: [PATCH 205/803] staging: media: Add Raspberry Pi V4L2 H265 decoder +Subject: [PATCH 205/834] staging: media: Add Raspberry Pi V4L2 H265 decoder This driver is for the HEVC/H265 decoder block on the Raspberry Pi 4, and conforms to the V4L2 stateless decoder API. @@ -147804,10 +147804,10 @@ index 000000000000..9c4f3fb2f9f6 2.18.4 -From f8977bcd8e16d345c4d0c4080895e091a8215161 Mon Sep 17 00:00:00 2001 +From 0aeb69d867f84dcd2fc84de84f7f1d138bc77059 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 6 Dec 2019 13:05:27 +0100 -Subject: [PATCH 206/803] mmc: sdhci: Silence MMC warnings +Subject: [PATCH 206/834] mmc: sdhci: Silence MMC warnings When the MMC isn't plugged in, the driver will spam the console which is pretty annoying when using NFS. @@ -147852,10 +147852,10 @@ index 6cdadbb3accd..79fe26a04bfe 100644 2.18.4 -From 4f99bddc06dc9a9dbc18c8f98f77756651d35009 Mon Sep 17 00:00:00 2001 +From cc310779f9a9fa1e69373f49b55364f5088640b9 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:51:09 +0100 -Subject: [PATCH 207/803] dt-bindings: clock: Add a binding for the RPi +Subject: [PATCH 207/834] dt-bindings: clock: Add a binding for the RPi Firmware clocks The firmare running on the RPi VideoCore can be used to discover and @@ -147922,10 +147922,10 @@ index 000000000000..d37bc311321d 2.18.4 -From b61c47932a935059d2b3f08f69e3ee139e2473dd Mon Sep 17 00:00:00 2001 +From a93fef13dd83aacb4c905674d9cdebd8e70f6b8a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 16:45:24 +0100 -Subject: [PATCH 208/803] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI +Subject: [PATCH 208/834] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI controllers bindings The HDMI controllers found in the BCM2711 SoC need some adjustments to the @@ -148102,10 +148102,10 @@ index f54b4e4808f0..899d8cfa1731 100644 2.18.4 -From 61461e25442d77b45a86eeacdb06ff55354f3955 Mon Sep 17 00:00:00 2001 +From 3b4bc04a8330f3fe241463a9976fed356b5afe13 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 27 Jan 2020 10:22:44 +0000 -Subject: [PATCH 209/803] drm: Checking of the pitch is only valid for linear +Subject: [PATCH 209/834] drm: Checking of the pitch is only valid for linear formats framebuffer_check was computing a minimum pitch value and ensuring @@ -148148,10 +148148,10 @@ index 2f5b0c2bb0fe..89ced6af9c5c 100644 2.18.4 -From 490d235297aa7296049263d4d6e336d943b557a5 Mon Sep 17 00:00:00 2001 +From 6c4c3e9a3e7be19a43a03cc8f13ab7a460c8ebfa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 11:59:39 +0100 -Subject: [PATCH 210/803] overlays: Fix dtc warnings in i2c-gpio +Subject: [PATCH 210/834] overlays: Fix dtc warnings in i2c-gpio Better late than never. @@ -148178,10 +148178,10 @@ index 63231b5d7c0c..2323a61edf07 100644 2.18.4 -From 7ba479e9b875869c88ec0a5a25068766f82f5193 Mon Sep 17 00:00:00 2001 +From f34c1568de323c1f4a9ce685c1dc1b49c456f876 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 22:18:52 +0100 -Subject: [PATCH 211/803] driver: char: rpivid: Remove legacy name support +Subject: [PATCH 211/834] driver: char: rpivid: Remove legacy name support Signed-off-by: Phil Elwell --- @@ -148237,10 +148237,10 @@ index fbf3d4f3fe0c..5f4c91924ec1 100644 2.18.4 -From 061d1eb1935ddf9111239500c8cca2236ae4a41f Mon Sep 17 00:00:00 2001 +From 51ad8fc29e6f3fc03e4dff71649c4c940f63d6ec Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Apr 2020 10:46:19 +0100 -Subject: [PATCH 212/803] spi: Force CS_HIGH if GPIO descriptors are used +Subject: [PATCH 212/834] spi: Force CS_HIGH if GPIO descriptors are used Commit f3186dd87669 ("spi: Optionally use GPIO descriptors for CS GPIOs") amended of_spi_parse_dt() to always set SPI_CS_HIGH for SPI slaves whose @@ -148300,10 +148300,10 @@ index 8c261eac2cee..4436fd319df3 100644 2.18.4 -From 0e2745e15c9f8f703c5500df360be3e20d18e31b Mon Sep 17 00:00:00 2001 +From 24992e956cd09a7b712ad42453d237859823d189 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Apr 2020 11:30:23 +0100 -Subject: [PATCH 213/803] driver: char: rpivid: Don't map more than wanted +Subject: [PATCH 213/834] driver: char: rpivid: Don't map more than wanted Limit mappings to the permitted range, but don't map more than asked for otherwise we walk off the end of the allocated VMA. @@ -148357,10 +148357,10 @@ index 5f4c91924ec1..9f38083f4cb6 100644 2.18.4 -From c2e744706f822ff4a3ece4c1ffa3b06ab9718d19 Mon Sep 17 00:00:00 2001 +From ea4f95d1df45911572355840a765a7026ef97165 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:39:49 +0100 -Subject: [PATCH 214/803] media: bcm2835-unicam: Driver for CCP2/CSI2 camera +Subject: [PATCH 214/834] media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface Add driver for the Unicam camera receiver block on @@ -151088,10 +151088,10 @@ index 000000000000..ae059a171d0f 2.18.4 -From 14dbed1731ff8ff89e7e7bc5d14786090a32df34 Mon Sep 17 00:00:00 2001 +From f3e412214d36783d50db6f393ca02bb5f7bfe818 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:46:29 +0100 -Subject: [PATCH 215/803] media: uapi: v4l2-core: Add sensor ancillary data +Subject: [PATCH 215/834] media: uapi: v4l2-core: Add sensor ancillary data V4L2 foucc type. Add V4L2_META_FMT_SENSOR_DATA format 4CC. @@ -151186,10 +151186,10 @@ index 568801746d2d..d93d5bb7059b 100644 2.18.4 -From 056f5fa0c4bf2f1b75fd773b2268828a761639aa Mon Sep 17 00:00:00 2001 +From b6782dfed39f72ab2b7e3e0c19cc2b9345ab6c0f Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Jan 2020 14:06:47 +0000 -Subject: [PATCH 216/803] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media bus +Subject: [PATCH 216/834] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media bus format This patch adds MEDIA_BUS_FMT_SENSOR_DATA used by the bcm2835-unicam @@ -151258,10 +151258,10 @@ index 84fa53ffb13f..3c2848e91c1b 100644 2.18.4 -From 0e679c13dbf8f8dc0348c45707fbbf285bd19160 Mon Sep 17 00:00:00 2001 +From 812e9d193ca7916f0f48ab795426837061db7ca3 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 7 Apr 2020 10:42:14 +0100 -Subject: [PATCH 217/803] media: bcm2835-unicam: Add support for mulitple +Subject: [PATCH 217/834] media: bcm2835-unicam: Add support for mulitple device nodes. Move device node specific state out of the device state structure and @@ -152347,10 +152347,10 @@ index 9da9f22c3db5..b34551a3f44b 100644 2.18.4 -From d144e129bded6a997d18d457ef18481e60569c1a Mon Sep 17 00:00:00 2001 +From 151ccc747d74dd814c387aa690c5277150348ad1 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 16 Apr 2020 11:35:41 +0100 -Subject: [PATCH 218/803] media: bcm2835-unicam: Add embedded data node. +Subject: [PATCH 218/834] media: bcm2835-unicam: Add embedded data node. This patch adds a new node in the bcm2835-unicam driver to support CSI-2 embedded data streams. The subdevice is queried to see if @@ -153521,10 +153521,10 @@ index b34551a3f44b..d5e0f70b600c 100644 2.18.4 -From 211f70908590586045b18dea96f8cbed31ceac7f Mon Sep 17 00:00:00 2001 +From 5c12e94755c13c81778cc712354c84604afadad7 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 2 Apr 2020 16:08:51 +0100 -Subject: [PATCH 219/803] media: bcm2835-unicam: Use dummy buffer if none have +Subject: [PATCH 219/834] media: bcm2835-unicam: Use dummy buffer if none have been queued If no buffer has been queued by a userland application, we use an @@ -153835,10 +153835,10 @@ index d5e0f70b600c..933f1ba49e3d 100644 2.18.4 -From 7724a8d7633b055002cc6d437fc1a982892887fa Mon Sep 17 00:00:00 2001 +From 42769244d4c515b0ea0217c17c3ae38553369a0d Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 24 Mar 2020 23:13:02 +0200 -Subject: [PATCH 220/803] media: bcm2835-unicam: Disable event-related ioctls +Subject: [PATCH 220/834] media: bcm2835-unicam: Disable event-related ioctls on metadata node The unicam driver supports both the SOURCE_CHANGE and CTRL events. Both @@ -153872,10 +153872,10 @@ index 933f1ba49e3d..2d4c7a247fc5 100644 2.18.4 -From f6bf97eb560acc6484bffdc4f8a236c0e9f85200 Mon Sep 17 00:00:00 2001 +From c0b6101f7e560426cb827ccf49c58dc59ee379a3 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 24 Mar 2020 23:13:02 +0200 -Subject: [PATCH 221/803] media: bcm2835-unicam: Add support for the FRAME_SYNC +Subject: [PATCH 221/834] media: bcm2835-unicam: Add support for the FRAME_SYNC event The FRAME_SYNC event is useful for userspace image processing algorithms @@ -153933,10 +153933,10 @@ index 2d4c7a247fc5..21d3a8585118 100644 2.18.4 -From 525217e22f5d0be841c06b3d062722716c5b0c04 Mon Sep 17 00:00:00 2001 +From c9a5257475a61669eb83a2ba2e0c327811cd4e88 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 12 Mar 2020 14:09:38 +0000 -Subject: [PATCH 222/803] media: imx219: Advertise embedded data node on media +Subject: [PATCH 222/834] media: imx219: Advertise embedded data node on media pad 1 This commit updates the imx219 driver to adverise support for embedded @@ -154275,10 +154275,10 @@ index 4771d0ef2c46..5af610f7fc08 100644 2.18.4 -From 0f9669b4ea0d48dbba371fc7354f18e5996aaa3d Mon Sep 17 00:00:00 2001 +From d7fb471bf3df03bc043c9c4b4db095255b12cfef Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Apr 2020 16:26:03 +0100 -Subject: [PATCH 223/803] media: bcm2835-unicam: Re-fetch mbus code from subdev +Subject: [PATCH 223/834] media: bcm2835-unicam: Re-fetch mbus code from subdev on a g_fmt call The sensor subdevice may change the Bayer order if a H/V flip is @@ -154330,10 +154330,10 @@ index 21d3a8585118..d4684fb2797f 100644 2.18.4 -From c7f018dd76a2f8319356394076495eacbcea4973 Mon Sep 17 00:00:00 2001 +From baeaaa3a4ad6a58521283861ed5958d1e6e66992 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:20:26 +0100 -Subject: [PATCH 224/803] media: uapi: v4l2-core: Add ISP statistics output +Subject: [PATCH 224/834] media: uapi: v4l2-core: Add ISP statistics output V4L2 fourcc type Add V4L2_META_FMT_BCM2835_ISP_STATS V4L2 format type. @@ -154437,10 +154437,10 @@ index d93d5bb7059b..e9fbb04a3519 100644 2.18.4 -From 1086f143739bc389aeeb2e5cc4281053586e8af3 Mon Sep 17 00:00:00 2001 +From 900a8760221663fee91ca2a395878941568e2cc4 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Apr 2020 15:06:19 +0100 -Subject: [PATCH 225/803] media: uapi: v4l-ctrls: Add CID base for the +Subject: [PATCH 225/834] media: uapi: v4l-ctrls: Add CID base for the bcm2835-isp driver We are reserving controls for the new bcm2835-isp driver. @@ -154617,10 +154617,10 @@ index fbe96b80a748..0b8ae128b961 100644 2.18.4 -From 37943a66b8a3d7f6ab9dce702a24b11da3ba32ad Mon Sep 17 00:00:00 2001 +From 1139335e6c9cdcbbfe4c444c74228bb7f43c7079 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 22 Apr 2020 08:32:32 +0100 -Subject: [PATCH 226/803] staging: vchiq: Load bcm2835_isp driver from vchiq +Subject: [PATCH 226/834] staging: vchiq: Load bcm2835_isp driver from vchiq bcmn2835_isp is a platform driver dependent on vchiq, therefore add the load/unload functions for it to vchiq. @@ -154662,10 +154662,10 @@ index 8d518bd9a6cd..08083aa61808 100644 2.18.4 -From 45cd1bb3b07c324af201ac146d93e30b5ca18e22 Mon Sep 17 00:00:00 2001 +From d13df4f58bb450663599ba0091affe27c551fe51 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Apr 2019 13:33:47 +0100 -Subject: [PATCH 227/803] bcm2835-dma: Add proper 40-bit DMA support +Subject: [PATCH 227/834] bcm2835-dma: Add proper 40-bit DMA support BCM2711 has 4 DMA channels with a 40-bit address range, allowing them to access the full 4GB of memory on a Pi 4. @@ -155468,10 +155468,10 @@ index 87b5d0bef355..ac0458a8027f 100644 2.18.4 -From 69ff62872ca9d74683a9caa649965ff136a8bb40 Mon Sep 17 00:00:00 2001 +From 439d079c314e940b2bca9ae029ae18aead9a46a6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 1 May 2020 17:56:13 +0100 -Subject: [PATCH 228/803] overlays: Make the i2c-gpio overlay safe again +Subject: [PATCH 228/834] overlays: Make the i2c-gpio overlay safe again Like many overlays, the i2c-gpio overlay goes to efforts to avoid generating warnings about #address-cells and #size-cells not @@ -155506,10 +155506,10 @@ index 2323a61edf07..63231b5d7c0c 100644 2.18.4 -From c030b4143c7323537ba1dd0af4c41b59bde85c18 Mon Sep 17 00:00:00 2001 +From f1f7b2ff345e42400e40d304f8ad5b4f75cf4250 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Apr 2020 11:01:21 +0100 -Subject: [PATCH 229/803] media: i2c: imx219: Declare that the driver can +Subject: [PATCH 229/834] media: i2c: imx219: Declare that the driver can create events The flag V4L2_SUBDEV_FL_HAS_EVENTS is required if the subdev can @@ -155539,10 +155539,10 @@ index 5af610f7fc08..79faa8cce94e 100644 2.18.4 -From f3aff29ed63860726eeaf1a23f7bd0fd75dbc8b8 Mon Sep 17 00:00:00 2001 +From eb663bd20c53425cf721ab2e1c2abaf8a59eeb3b Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 15 Jan 2020 13:40:38 +0000 -Subject: [PATCH 230/803] media: ov5647: Fix return codes from +Subject: [PATCH 230/834] media: ov5647: Fix return codes from ov5647_write/ov5647_read functions. Previously they were returning positive non-zero codes for success, @@ -155619,10 +155619,10 @@ index 07550377be2e..6ecc018ac431 100644 2.18.4 -From 32bbaf4192cc61fe9da9d61636c8d7cd6b93c920 Mon Sep 17 00:00:00 2001 +From 0e80951f436bc241e1df6e3cec4276d62d525712 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:30:53 +0000 -Subject: [PATCH 231/803] media: ov5647: Add basic support for multiple sensor +Subject: [PATCH 231/834] media: ov5647: Add basic support for multiple sensor modes. Specifically: @@ -156032,10 +156032,10 @@ index 6ecc018ac431..0d84b7640cf3 100644 2.18.4 -From 3fffbecc17f68f7e19f7e17c1cc2b2c93aa67de2 Mon Sep 17 00:00:00 2001 +From 6aef36538f8f70444ca119306d781eb4a9fdc992 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:23 +0000 -Subject: [PATCH 232/803] media: ov5647: Add V4L2 controls for analogue gain, +Subject: [PATCH 232/834] media: ov5647: Add V4L2 controls for analogue gain, exposure and AWB Added basic v4l2_ctrl_handler infrastructure (there was none @@ -156315,10 +156315,10 @@ index 0d84b7640cf3..16cfafc9cf9c 100644 2.18.4 -From 42fd87a0f46ca0db808ceb85dd032f24d1898a14 Mon Sep 17 00:00:00 2001 +From e0e750144eea5aead8ce4230563ca6d74baeff0e Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:28 +0000 -Subject: [PATCH 233/803] media: ov5647: Add extra 10-bit sensor modes. +Subject: [PATCH 233/834] media: ov5647: Add extra 10-bit sensor modes. The 8-bit VGA mode remains, we add the following 10-bit modes: @@ -156870,10 +156870,10 @@ index 16cfafc9cf9c..fc6c5d9c4532 100644 2.18.4 -From 4f6df30fef9a1915f9294eb791758a43f502f5ef Mon Sep 17 00:00:00 2001 +From 42fc41d94248efff8e580e9b0815ff6492898cbc Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:32 +0000 -Subject: [PATCH 234/803] media: ov5647: change defaults to better match raw +Subject: [PATCH 234/834] media: ov5647: change defaults to better match raw camera applications. Specifically: @@ -156935,10 +156935,10 @@ index fc6c5d9c4532..66b3ee5cc190 100644 2.18.4 -From 2873e16008e901b627f8c60551f4246492fa2435 Mon Sep 17 00:00:00 2001 +From 6ca2ffffe31386dd5f5b5f511b935a501f237117 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 11:46:07 +0100 -Subject: [PATCH 235/803] media: i2c: ov5647: Add support for g_selection to +Subject: [PATCH 235/834] media: i2c: ov5647: Add support for g_selection to reflect cropping/binning In order to apply lens shading correctly the client needs to know how @@ -157147,10 +157147,10 @@ index 66b3ee5cc190..e7c7e3ab4b38 100644 2.18.4 -From 800034237f184d46f31a8de73a3c12832ac9c83d Mon Sep 17 00:00:00 2001 +From c5afc3cdb502aeb9638f69a165e0bcdf76c5f038 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 11:50:52 +0100 -Subject: [PATCH 236/803] media: i2c: ov5467: Fixup error path to release mutex +Subject: [PATCH 236/834] media: i2c: ov5467: Fixup error path to release mutex "87f3ab9 media: ov5647: Add basic support for multiple sensor modes." added a return path ov5647_set_fmt that didn't release the device @@ -157182,10 +157182,10 @@ index e7c7e3ab4b38..09d68b0b4a13 100644 2.18.4 -From 7485770298e7d4f07a77252247c1cae217a7cd9a Mon Sep 17 00:00:00 2001 +From bd45f7c4460f66070cde0e9c0bb310221e46d3a9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 12:25:13 +0100 -Subject: [PATCH 237/803] media: i2c: ov5647: Support V4L2_CID_PIXEL_RATE +Subject: [PATCH 237/834] media: i2c: ov5647: Support V4L2_CID_PIXEL_RATE Clients need to know the pixel rate in order to compute exposure and frame rate values. @@ -157319,10 +157319,10 @@ index 09d68b0b4a13..02d72feb837e 100644 2.18.4 -From c82f7eafecaf2205f686600bb20fc17c543c033f Mon Sep 17 00:00:00 2001 +From 665df16aed4bf10975c9b5f53ed97af316b615e2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 17:25:56 +0100 -Subject: [PATCH 238/803] media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS +Subject: [PATCH 238/834] media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS flag The ov5647 subdev can generate control events, therefore set @@ -157468,10 +157468,10 @@ index 02d72feb837e..c012e0b3d68b 100644 2.18.4 -From 045643337574421fa3a6432f1de5635fb4e7f6c1 Mon Sep 17 00:00:00 2001 +From a51d5580b219abb0cfa5fa149799f56ddab058ab Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 21:39:58 +0100 -Subject: [PATCH 239/803] media: i2c: ov5647: Add support for V4L2_CID_VBLANK +Subject: [PATCH 239/834] media: i2c: ov5647: Add support for V4L2_CID_VBLANK Adds vblank control to allow for frame rate control. @@ -157679,10 +157679,10 @@ index c012e0b3d68b..445a0ce186ec 100644 2.18.4 -From 7ec61b367e8747d6ef46609beaf7612aa7c56161 Mon Sep 17 00:00:00 2001 +From d20ca7affc6424e0b2bc8b9f7ea6b5ae3fd70d00 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 21:47:25 +0100 -Subject: [PATCH 240/803] media: i2c: ov5647: Neither analogue gain nor +Subject: [PATCH 240/834] media: i2c: ov5647: Neither analogue gain nor exposure need EXECUTE_ON_WRITE The controls for analogue gain and exposure were defined with @@ -157743,10 +157743,10 @@ index 445a0ce186ec..49247711221c 100644 2.18.4 -From 01537b382db156db8b355696e12a279d6055b3a6 Mon Sep 17 00:00:00 2001 +From 6c26e166db20814a5317a321d5ff2f0defe68712 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 22:11:01 +0100 -Subject: [PATCH 241/803] media: i2c: ov5647: Use member names in mode tables +Subject: [PATCH 241/834] media: i2c: ov5647: Use member names in mode tables To make adding new members to the mode structures easier, use the member names in the initialisers. @@ -157860,10 +157860,10 @@ index 49247711221c..da4ef30d8f32 100644 2.18.4 -From a517ade1c1be8b0b267c477a04f84a1910b2936d Mon Sep 17 00:00:00 2001 +From 3401db6a6746567487b2c68bc71aa0a5ba59c459 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 Apr 2020 11:03:00 +0100 -Subject: [PATCH 242/803] media: i2c: ov5647: Advertise the correct exposure +Subject: [PATCH 242/834] media: i2c: ov5647: Advertise the correct exposure range Exposure is clipped by the VTS of the mode, so needs to be updated as @@ -157985,10 +157985,10 @@ index da4ef30d8f32..6d84d2785f74 100644 2.18.4 -From b439bda0efe790b60145d9cde492ce22937778f3 Mon Sep 17 00:00:00 2001 +From 751e5f6e994806952e38b409792c447e422ff2a9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 16:45:02 +0100 -Subject: [PATCH 243/803] media: bcm2835-unicam: Add support for +Subject: [PATCH 243/834] media: bcm2835-unicam: Add support for VIDIOC_[S|G]_SELECTION Sensors are now reflecting cropping and scaling parameters through @@ -158073,10 +158073,10 @@ index d4684fb2797f..0e1d525a0b35 100644 2.18.4 -From 0712a0d978b45a07cc122fc54b2ea796da0a3ade Mon Sep 17 00:00:00 2001 +From a62face418eebc77442025a46528c62ef35e95ed Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 22:05:09 +0100 -Subject: [PATCH 244/803] media: bcm2835-unicam: Do not stop streaming in +Subject: [PATCH 244/834] media: bcm2835-unicam: Do not stop streaming in unicam_release unicam_release calls _vb2_fop_release, which will call stop_streaming @@ -158107,10 +158107,10 @@ index 0e1d525a0b35..c7e211d04ed3 100644 2.18.4 -From e0458a9b298c83aae470535070356b02777e7b36 Mon Sep 17 00:00:00 2001 +From 4a6ce618ce601861d8fec64a6fff720c3ecfdff6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 Apr 2020 09:52:50 +0100 -Subject: [PATCH 245/803] media: bcm2835-unicam: Fix reference counting in +Subject: [PATCH 245/834] media: bcm2835-unicam: Fix reference counting in unicam_open The reference counting of node->open was only incremented after @@ -158151,10 +158151,10 @@ index c7e211d04ed3..a79fc4d99d36 100644 2.18.4 -From 45c2f6396e2873974480e85d423f4d2d60bc9512 Mon Sep 17 00:00:00 2001 +From 590b976020dc820e5e47c9e3d7d0e202609d5819 Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:28:14 +0200 -Subject: [PATCH 246/803] media: i2c: tc358743: Fix fallthrough warning +Subject: [PATCH 246/834] media: i2c: tc358743: Fix fallthrough warning Signed-off-by: Jacko Dirks --- @@ -158177,10 +158177,10 @@ index b77b900bf6ad..ee6779a81d43 100644 2.18.4 -From db726a15f2d48468996c0cc5ce3ae7958e52d3cd Mon Sep 17 00:00:00 2001 +From fd60d4de54242308cd0fa6dcaadf6a625bc94c26 Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:33:31 +0200 -Subject: [PATCH 247/803] media: bcm2835: unicam: Fix uninitialized warning +Subject: [PATCH 247/834] media: bcm2835: unicam: Fix uninitialized warning Signed-off-by: Jacko Dirks --- @@ -158204,10 +158204,10 @@ index a79fc4d99d36..92e5deb4c6fd 100644 2.18.4 -From 5af83e3c718dff098cd1046ad00734a8dfe8619e Mon Sep 17 00:00:00 2001 +From 9a8e9844ce2a1b54980127bfbe33565d13257e1f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 19:45:41 +0100 -Subject: [PATCH 248/803] video: bcm2708_fb: Disable FB if no displays found +Subject: [PATCH 248/834] video: bcm2708_fb: Disable FB if no displays found If the firmware hasn't detected a display, the driver would assume one display was available, but because it had failed to retrieve the @@ -158244,10 +158244,10 @@ index 17e9260655e4..dac5c021ce52 100644 2.18.4 -From 855b391dddc520daa6f1317bccfbb61cfc1d9b38 Mon Sep 17 00:00:00 2001 +From 97b7115db69be89be7bb9255161ac6d227c925ad Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:50:54 +0100 -Subject: [PATCH 249/803] dt-bindings: media: i2c: Add IMX477 CMOS sensor +Subject: [PATCH 249/834] dt-bindings: media: i2c: Add IMX477 CMOS sensor binding Add YAML device tree binding for IMX477 CMOS image sensor. @@ -158381,10 +158381,10 @@ index 000000000000..0994e13e67f6 2.18.4 -From 10de3e371b0741bfabc2b34cf867cb077cb5ab71 Mon Sep 17 00:00:00 2001 +From 873af85d0a0f03f805bce217ce3f968d089aa8b5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 May 2020 18:28:27 +0100 -Subject: [PATCH 250/803] media: bcm2835-unicam: Always service interrupts +Subject: [PATCH 250/834] media: bcm2835-unicam: Always service interrupts From when bringing up the driver, there was a check in the isr to ignore interrupts (claiming them handled) should the driver @@ -158438,10 +158438,10 @@ index 92e5deb4c6fd..52a534d932bf 100644 2.18.4 -From d074f6fe07207961c0d2b29fececec708509e210 Mon Sep 17 00:00:00 2001 +From 11d7b1bbd63d2f1402bb562c7f4deb5ad5dcbf1f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 May 2020 20:10:15 +0100 -Subject: [PATCH 251/803] sc16is7xx: Fix for hardware flow control +Subject: [PATCH 251/834] sc16is7xx: Fix for hardware flow control The SC16IS7XX hardware flow control is mishandled by the driver in a number of ways: @@ -158514,10 +158514,10 @@ index f64e051c0030..8e3b83fac33c 100644 2.18.4 -From d538fd8e664f4c9aae2d5c0881dcbe1c08f1fe91 Mon Sep 17 00:00:00 2001 +From ed346efadcbd8fcde9903a9065a164d21f99efa7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:42:10 +0100 -Subject: [PATCH 252/803] staging: vc04_services: mmal-vchiq: Update parameters +Subject: [PATCH 252/834] staging: vc04_services: mmal-vchiq: Update parameters list Adds in a couple of new MMAL parameter defines. @@ -158548,10 +158548,10 @@ index 27bafc5f01d2..89059bca0b77 100644 2.18.4 -From 790d45dfef96e557e7001746c70d222097d25977 Mon Sep 17 00:00:00 2001 +From fd8bc06352e89a3e67c091a66e20d01b1be812b2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:48:59 +0100 -Subject: [PATCH 253/803] staging:vc04_services: bcm2835-camera: Request +Subject: [PATCH 253/834] staging:vc04_services: bcm2835-camera: Request headers with I-frame V4L2 wishes to have the codec header bytes in the same buffer as the @@ -158584,10 +158584,10 @@ index df90c1f9d148..bea37cb163fc 100644 2.18.4 -From 10751b73483bfda63a39cd6eb9e8af7d203296f5 Mon Sep 17 00:00:00 2001 +From a1a11cacba1c0f3198bfedf3163dbf75579f9c03 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 15:23:56 +0100 -Subject: [PATCH 254/803] kbuild: Disable gcc plugins +Subject: [PATCH 254/834] kbuild: Disable gcc plugins The GCC plugin feature leads to different kernel configurations on what ought to be equivalent build systems because they depend on the build @@ -158618,10 +158618,10 @@ index b79fd0bea838..c3d0c8fedbdd 100755 2.18.4 -From ba61af24b5f681189f377a6b6adcbc5bb2787fc2 Mon Sep 17 00:00:00 2001 +From 7f6022762c435e2d72179a0131e640ad6161e695 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 11:46:47 +0100 -Subject: [PATCH 255/803] media: bcm2835-unicam: Retain packing information on +Subject: [PATCH 255/834] media: bcm2835-unicam: Retain packing information on G_FMT The change to retrieve the pixel format always on g_fmt didn't @@ -158672,10 +158672,10 @@ index 52a534d932bf..b32b2d33a4e2 100644 2.18.4 -From 7c12bdbdc07784a7d9c1889cef22d90dd1fa5684 Mon Sep 17 00:00:00 2001 +From fdfc6b3a34626cf69f8c2f42196708e00059b4ff Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 15:23:32 +0100 -Subject: [PATCH 256/803] zswap: Defer zswap initialisation +Subject: [PATCH 256/834] zswap: Defer zswap initialisation Enabling zswap support in the kernel configuration costs about 1.5MB of RAM, even when zswap is not enabled at runtime. This cost can be @@ -158803,10 +158803,10 @@ index fbb782924ccc..0ca7f6a68d20 100644 2.18.4 -From ba8bc7e481f95b12cb79ff4bfeea2aad096f23bc Mon Sep 17 00:00:00 2001 +From e379d09083f08d6e0201c18f464378b0546e68fc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 May 2020 11:35:33 +0100 -Subject: [PATCH 257/803] SQUASH: pinctrl: bcm2835: Set base for bcm2711 GPIO +Subject: [PATCH 257/834] SQUASH: pinctrl: bcm2835: Set base for bcm2711 GPIO to 0 Without this patch GPIOs don't seem to work properly, primarily @@ -158836,10 +158836,10 @@ index bda29f421e78..c5d88157f4b2 100644 2.18.4 -From 7bc34dcfb46d6d5e365c5bb56e364ca826976739 Mon Sep 17 00:00:00 2001 +From e2a0020474d7469e87a8bd77500a52bc6027b6e4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 May 2020 16:36:33 +0100 -Subject: [PATCH 258/803] staging: vchiq_arm: Clean up 40-bit DMA support +Subject: [PATCH 258/834] staging: vchiq_arm: Clean up 40-bit DMA support Manage the split between addresses for the VPU and addresses for the 40-bit DMA controller with a dedicated DMA device pointer that on non- @@ -159018,10 +159018,10 @@ index 08083aa61808..c3ca18e4e85c 100644 2.18.4 -From 2278b5f327b8d5efdc8d2bab1b73ebfe07435c41 Mon Sep 17 00:00:00 2001 +From bb6169f610fb6a56d4c31053e2ce72941124c556 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 28 May 2020 11:09:48 +0100 -Subject: [PATCH 259/803] media: bcm2835-unicam: change minimum number of +Subject: [PATCH 259/834] media: bcm2835-unicam: change minimum number of vb2_queue buffers to 1 Since the unicam driver was modified to write to a dummy buffer when no @@ -159052,10 +159052,10 @@ index b32b2d33a4e2..e76323af0952 100644 2.18.4 -From af79e0d93181412fdcc5dc8c02e90ce58979feac Mon Sep 17 00:00:00 2001 +From dc8a9922e651f4fabe4aae787ef8234048db0bdc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 May 2020 09:46:12 +0100 -Subject: [PATCH 260/803] brcmfmac: BCM43436 needs dedicated firmware +Subject: [PATCH 260/834] brcmfmac: BCM43436 needs dedicated firmware Signed-off-by: Phil Elwell --- @@ -159088,10 +159088,10 @@ index bfe4b8e5a716..d6a4d6b8ea29 100644 2.18.4 -From 8eb7a364aeb2ea37a8b7b8495f908c9ac8be7574 Mon Sep 17 00:00:00 2001 +From a8b9e13586c88cb872648a64f8899bbcf4e05ba5 Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Fri, 5 Jun 2020 09:22:49 +0000 -Subject: [PATCH 261/803] snd_bcm2835: disable HDMI audio when vc4 is used +Subject: [PATCH 261/834] snd_bcm2835: disable HDMI audio when vc4 is used (#3640) Things don't work too well when both the vc4 driver and the firmware @@ -159127,10 +159127,10 @@ index f926784c622d..31968fec297f 100644 2.18.4 -From da34fe073782b099f1303fa7efe4ab60bcf7eb04 Mon Sep 17 00:00:00 2001 +From 0b750bb1a8601922243b0aa5242ff4965f2e7e33 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 24 Apr 2018 14:42:27 +0100 -Subject: [PATCH 262/803] gpiolib: Don't prevent IRQ usage of output GPIOs +Subject: [PATCH 262/834] gpiolib: Don't prevent IRQ usage of output GPIOs Upstream Linux deems using output GPIOs to generate IRQs as a bogus use case, even though the BCM2835 GPIO controller is capable of doing @@ -159183,10 +159183,10 @@ index af5bb8fedfea..2bd26c985246 100644 2.18.4 -From 835912556b74a8d2d51551f9306a3c7ef33da338 Mon Sep 17 00:00:00 2001 +From e023b0b64df19e4d805b40f30ae0a7ac45fbbc0d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 09:57:03 +0100 -Subject: [PATCH 263/803] PCI: brcmstb: Add DT property to control L1SS +Subject: [PATCH 263/834] PCI: brcmstb: Add DT property to control L1SS The BRCM PCIe block has controls to enable control of the CLKREQ# signal by the L1SS, and to gate the refclk with the CLKREQ# input. @@ -159268,10 +159268,10 @@ index 9c3d2982248d..fea54f6fb7b1 100644 2.18.4 -From bfe6926b773f3b846f88f3801adee70200ebc2a5 Mon Sep 17 00:00:00 2001 +From bbed804441fa0b286d85939f7ba0b787317a5fc7 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:24:31 +0200 -Subject: [PATCH 264/803] media: irs1125: Using i2c_transfer for ic2 reads +Subject: [PATCH 264/834] media: irs1125: Using i2c_transfer for ic2 reads Reading data over i2c is done by using i2c_transfer to ensure that this operation can't be interrupted. @@ -159339,10 +159339,10 @@ index 25e1dd5a08ef..6680afea5894 100644 2.18.4 -From dfbf1d26fc28ad91b61e7f1ad7e68784abf534b2 Mon Sep 17 00:00:00 2001 +From b60ed1625add41fbcd31e2c66c05c625ac9fb505 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:27:42 +0200 -Subject: [PATCH 265/803] media: irs1125: Refactoring and debug messages +Subject: [PATCH 265/834] media: irs1125: Refactoring and debug messages Changed some variable names to comply with checkpatch --strict mode. Debug messages added. @@ -159468,10 +159468,10 @@ index 6680afea5894..289f0c25b141 100644 2.18.4 -From d76193d2951d54b7ce56b87b0e546198fb6af87e Mon Sep 17 00:00:00 2001 +From 325e85dbc9bd1e007d60dbfb3baf2f15c5938e0c Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:31:36 +0200 -Subject: [PATCH 266/803] media: irs1125: Atomic access to imager +Subject: [PATCH 266/834] media: irs1125: Atomic access to imager reconfiguration Instead of changing the exposure and framerate settings for all sequences, @@ -159857,10 +159857,10 @@ index dccaca23aa76..96d676123d5e 100644 2.18.4 -From 2f4f94aa1a804c16d580b0bb3675fd22e7b27962 Mon Sep 17 00:00:00 2001 +From e7cc0d93403e7c568adf3a9d4862a68c9abd1d8d Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:33:56 +0200 -Subject: [PATCH 267/803] media: irs1125: Keep HW in sync after imager reset +Subject: [PATCH 267/834] media: irs1125: Keep HW in sync after imager reset When closing the video device, the irs1125 is put in power down state. To keep V4L2 ctrls and the HW in sync, v4l2_ctrl_handler_setup is @@ -160044,10 +160044,10 @@ index d59e05004a03..30c3d2640386 100644 2.18.4 -From e792793f1c73fa3bfbf5ea49028168d7642934ce Mon Sep 17 00:00:00 2001 +From 580cc0e136dc85a8d762cee2c55fe1d9f68c3fa8 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sat, 20 Jun 2020 15:40:00 +0300 -Subject: [PATCH 268/803] staging: bcm2835-audio: Add missing MODULE_ALIAS +Subject: [PATCH 268/834] staging: bcm2835-audio: Add missing MODULE_ALIAS Commit 8353fe6f1e0f ("Revert "staging: bcm2835-audio: Drop DT dependency"") reverts the upstream change and makes bcm2835-audio use @@ -160080,10 +160080,10 @@ index 31968fec297f..a0cba3823e5e 100644 2.18.4 -From 6c8e532beee708897c97fc3a5ae40ccb866af02d Mon Sep 17 00:00:00 2001 +From 4774c6a84c987827891d3733b464e2d2f8f64566 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 26 Jun 2020 11:51:05 +0100 -Subject: [PATCH 269/803] brcmfmac: Prefer a ccode from OTP over nvram file +Subject: [PATCH 269/834] brcmfmac: Prefer a ccode from OTP over nvram file Allow the nvram file to set a default ccode (regulatory domain) without overriding one set in OTP. @@ -160217,10 +160217,10 @@ index d821a4758f8c..adfea97c9a43 100644 2.18.4 -From 3644f105f7660f2a0310e44344f023828c7ae714 Mon Sep 17 00:00:00 2001 +From 73ac182c55624462842e2c9027d86659560c76e3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 10:05:57 +0100 -Subject: [PATCH 270/803] drivers: media: Remove the downstream version of +Subject: [PATCH 270/834] drivers: media: Remove the downstream version of bcm2835-unicam About to be replaced by the upstream version. @@ -163408,10 +163408,10 @@ index ae059a171d0f..000000000000 2.18.4 -From 0739c5f726a47498fa54422b0e830fe1da44b855 Mon Sep 17 00:00:00 2001 +From cced95e317aa18a19a679de7d062d931e3ddc74a Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 4 May 2020 12:25:41 +0300 -Subject: [PATCH 271/803] media: bcm2835-unicam: Driver for CCP2/CSI2 camera +Subject: [PATCH 271/834] media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface Add a driver for the Unicam camera receiver block on BCM283x processors. @@ -166576,10 +166576,10 @@ index 000000000000..ae059a171d0f 2.18.4 -From e644b079a05f0279df689af64254d41d2e3baceb Mon Sep 17 00:00:00 2001 +From c6a70ed48e789a9680f9e782eff93f4c6bf99e09 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 14:32:51 +0100 -Subject: [PATCH 272/803] media: bcm2835-unicam: Add support for +Subject: [PATCH 272/834] media: bcm2835-unicam: Add support for get_mbus_config to set num lanes Use the get_mbus_config pad subdev call to allow a source to use @@ -166638,10 +166638,10 @@ index 2e9387cbc1e0..9adfb2d217af 100644 2.18.4 -From 5e174983fb7b1ea9c4cb34886d1b4bfbb2b1cd20 Mon Sep 17 00:00:00 2001 +From 522b7a0db0480c5bb104f0bb6594f55b24ae4fb5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Jun 2020 15:53:44 +0100 -Subject: [PATCH 273/803] media: bcm2835-unicam: Avoid gcc warning over {0} on +Subject: [PATCH 273/834] media: bcm2835-unicam: Avoid gcc warning over {0} on endpoint Older gcc versions object to = { 0 } initialisation if the first @@ -166671,10 +166671,10 @@ index 9adfb2d217af..a65e1da55142 100644 2.18.4 -From 10d498a4261a7f7eecb1b80e6356a02f0ea72cbc Mon Sep 17 00:00:00 2001 +From ecc494a77e036dee3c496aa0aa34e787a083486f Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:46 +0200 -Subject: [PATCH 274/803] media: i2c: imx290: set the format before +Subject: [PATCH 274/834] media: i2c: imx290: set the format before VIDIOC_SUBDEV_G_FMT is called Commit d46cfdc86c30d5ec768924f0b1e2683c8d20b671 upstream. @@ -166717,10 +166717,10 @@ index adcddf3204f7..ad2318390678 100644 2.18.4 -From 686943a20f2dd7228c906019cb6fdbcbdd497c58 Mon Sep 17 00:00:00 2001 +From b5432daa5968d057654003ab078e758237e02df1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 08:28:51 +0100 -Subject: [PATCH 275/803] media: i2c: imx290: Add support for 74.25MHz clock +Subject: [PATCH 275/834] media: i2c: imx290: Add support for 74.25MHz clock The existing driver only supported a clock of 37.125MHz, but the sensor also supports 74.25MHz. @@ -166987,10 +166987,10 @@ index ad2318390678..fe1078f7721e 100644 2.18.4 -From ba30ed949816934954532135e1c6cdcfacebf069 Mon Sep 17 00:00:00 2001 +From d781a991d3153f70385b44e2c58342b2cd69c760 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 13:41:43 +0100 -Subject: [PATCH 276/803] media: i2c: imx290: Correct range for V4L2_CID_GAIN +Subject: [PATCH 276/834] media: i2c: imx290: Correct range for V4L2_CID_GAIN to 0-238 The datasheet lists the gain as being 0.0 to 72.0dB in 0.3dB steps, which @@ -167019,10 +167019,10 @@ index fe1078f7721e..c193b7b8d8e5 100644 2.18.4 -From ba9fee3190e54ed205622707b5686025f863df2d Mon Sep 17 00:00:00 2001 +From 3cdf20cbe069f92330f7bfd915095548be4fcab3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 14:36:40 +0100 -Subject: [PATCH 277/803] media: i2c: imx290: Convert HMAX setting into +Subject: [PATCH 277/834] media: i2c: imx290: Convert HMAX setting into V4L2_CID_HBLANK Userspace needs to know HBLANK if it is to work out exposure times @@ -167184,10 +167184,10 @@ index c193b7b8d8e5..b12213f6355b 100644 2.18.4 -From 99be3b33d3d48f4fbf249a64d3ecd5fc7d92f350 Mon Sep 17 00:00:00 2001 +From a05d4310a398167384b6c815aa144c68bce08c7c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:09:12 +0100 -Subject: [PATCH 278/803] media: i2c: imx290: Add support for V4L2_CID_VBLANK +Subject: [PATCH 278/834] media: i2c: imx290: Add support for V4L2_CID_VBLANK In order to calculate framerate and durations userspace needs the vertical blanking information. This can be configurable, @@ -167331,10 +167331,10 @@ index b12213f6355b..357614af64f7 100644 2.18.4 -From d621a59402ce4dcc5d9ccabbdd2a4a394a0b60fe Mon Sep 17 00:00:00 2001 +From 4e70d5796cf741ff776ce3545a8d032ecf8e741c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:19:13 +0100 -Subject: [PATCH 279/803] media: i2c: imx290: Add exposure control to the +Subject: [PATCH 279/834] media: i2c: imx290: Add exposure control to the driver. Adds support for V4L2_CID_EXPOSURE so that userspace can control @@ -167430,10 +167430,10 @@ index 357614af64f7..2eae36b0ad5c 100644 2.18.4 -From d2bd5635a639b8f8dacb0567bb479c5b986a1606 Mon Sep 17 00:00:00 2001 +From 0a4019dd88224715e2ee34dd7e619f0f2d7a9dec Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:34:16 +0100 -Subject: [PATCH 280/803] media: i2c: imx290: Add H and V flip controls +Subject: [PATCH 280/834] media: i2c: imx290: Add H and V flip controls The sensor supports horizontal and vertical flips, so support them through V4L2_CID_HFLIP and V4L2_CID_VFLIP. @@ -167519,10 +167519,10 @@ index 2eae36b0ad5c..3d6734da7d64 100644 2.18.4 -From 814bd371811ea82e1fb95bc7d0c24461ebcbfa03 Mon Sep 17 00:00:00 2001 +From 8b52714cb834d0926bfb54289e0a070bd143a878 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 16:52:14 +0100 -Subject: [PATCH 281/803] media: dt-bindings: media: i2c: Add mono version to +Subject: [PATCH 281/834] media: dt-bindings: media: i2c: Add mono version to IMX290 bindings The IMX290 module is available as either monochrome or colour and @@ -167561,10 +167561,10 @@ index a3cc21410f7c..294e63650d9e 100644 2.18.4 -From 5caeb5b8326e32a672ab9104e986fad4b057b18e Mon Sep 17 00:00:00 2001 +From 20ea2520e8d9b55cab20c23c487185da0ade380a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:03:11 +0100 -Subject: [PATCH 282/803] media : i2c: imx290: Add support for the mono sensor +Subject: [PATCH 282/834] media : i2c: imx290: Add support for the mono sensor variant. The IMX290 module is available as either mono or colour (Bayer). @@ -167752,10 +167752,10 @@ index 3d6734da7d64..09df70849928 100644 2.18.4 -From 9716ae98638735a2a5d60ff7605bab9ce11136b9 Mon Sep 17 00:00:00 2001 +From 539063dc09200406a56cc7eedaa6f83f6d5dac25 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Jun 2020 18:11:49 +0100 -Subject: [PATCH 283/803] media: i2c: imx290: Switch set_hmax to use +Subject: [PATCH 283/834] media: i2c: imx290: Switch set_hmax to use imx290_write_buffered_reg imx290_set_hmax was using two independent writes to set up hmax, @@ -167801,10 +167801,10 @@ index 09df70849928..b824dfe29bbd 100644 2.18.4 -From 1ec669e7dc972cad12fb1fc65f170dcbd5ab0db8 Mon Sep 17 00:00:00 2001 +From cd56dc1dd7cc3f50ffd73c6f9df4a051fddb9d80 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 2 Jul 2020 13:53:20 +0100 -Subject: [PATCH 284/803] serial: 8250: bcm2835aux - defer if clock is zero +Subject: [PATCH 284/834] serial: 8250: bcm2835aux - defer if clock is zero See: https://github.com/raspberrypi/linux/issues/3700 @@ -167835,10 +167835,10 @@ index fd95860cd661..fc36e5963e30 100644 2.18.4 -From 335798d105b6d665f8a43c30a52e0ec9976d34e5 Mon Sep 17 00:00:00 2001 +From 19389019def679cdc9cb06fa124dd792b9f33c49 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 May 2020 16:59:03 +0100 -Subject: [PATCH 285/803] media: Add a pixel format for MIPI packed 12bit luma +Subject: [PATCH 285/834] media: Add a pixel format for MIPI packed 12bit luma only. This is the format used by monochrome 12bit image sensors. @@ -167943,10 +167943,10 @@ index e9fbb04a3519..e72c28ea0235 100644 2.18.4 -From 36a18866b7444e0b413b705e13882dafb556d147 Mon Sep 17 00:00:00 2001 +From b1d1ad01ba201135dbd1704a87a4e723f924daee Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:51:03 +0100 -Subject: [PATCH 286/803] media: Add a pixel format for MIPI packed 14bit luma +Subject: [PATCH 286/834] media: Add a pixel format for MIPI packed 14bit luma only. This is the format used by monochrome 14bit image sensors. @@ -168060,10 +168060,10 @@ index e72c28ea0235..53d526dbe004 100644 2.18.4 -From 06c49808de8dfac15fb07629d2d07765445b4fbf Mon Sep 17 00:00:00 2001 +From 87ad9543873ea142edbcadec0536e496a4395ee2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:53:32 +0100 -Subject: [PATCH 287/803] media: bcm2835-unicam: Add support for 12bit mono +Subject: [PATCH 287/834] media: bcm2835-unicam: Add support for 12bit mono packed format Now that V4L2_PIX_FMT_Y12P is defined, allow passing raw 12bit @@ -168091,10 +168091,10 @@ index a65e1da55142..5edb58cc9f03 100644 2.18.4 -From 6019ecf313622fd453349e52e863c477795b0e56 Mon Sep 17 00:00:00 2001 +From 2c750eb7a63846bded5be2ed757164811f3d508a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 18:03:47 +0100 -Subject: [PATCH 288/803] media: bcm2835-unicam: Add support for 14bit mono +Subject: [PATCH 288/834] media: bcm2835-unicam: Add support for 14bit mono sources Now that V4L2_PIX_FMT_Y14 and V4L2_PIX_FMT_Y14P are defined, @@ -168126,10 +168126,10 @@ index 5edb58cc9f03..778153943160 100644 2.18.4 -From 78e50d4ba49d3f81eb72a34b60869ad62e0fae7d Mon Sep 17 00:00:00 2001 +From bf65370898e502ac6526ac4c415f617eb3f245a0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:57:57 +0100 -Subject: [PATCH 289/803] media: bcm2835-unicam: Add support for unpacked 14bit +Subject: [PATCH 289/834] media: bcm2835-unicam: Add support for unpacked 14bit Bayer formats Now that the 14bit non-packed Bayer formats are defined, add them @@ -168174,10 +168174,10 @@ index 778153943160..c97ecfc0e55b 100644 2.18.4 -From 10507fe2ac5b6ee04a4f1eb966cccc2f34e99fbf Mon Sep 17 00:00:00 2001 +From 134688ead514df8526c0430d5717013137790bc9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Jul 2020 20:28:27 +0100 -Subject: [PATCH 290/803] bcm2835-dma: Add NO_WAIT_RESP flag +Subject: [PATCH 290/834] bcm2835-dma: Add NO_WAIT_RESP flag Use bit 27 of the dreq value (the second cell of the DT DMA descriptor) to request that the WAIT_RESP bit is not set. @@ -168234,10 +168234,10 @@ index ac0458a8027f..84b1009da23b 100644 2.18.4 -From 852c72f90e4ae01739b62f85dde6d28ba6e54fd8 Mon Sep 17 00:00:00 2001 +From 7c813e43e93791f010c67835bc8f2fe5ef28dd57 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Fri, 17 May 2019 18:23:03 +0800 -Subject: [PATCH 291/803] media: i2c: add ov9281 driver. +Subject: [PATCH 291/834] media: i2c: add ov9281 driver. Change-Id: I7b77250bbc56d2f861450cf77271ad15f9b88ab1 Signed-off-by: Zefa Chen @@ -169463,10 +169463,10 @@ index 000000000000..4a6324a3e5da 2.18.4 -From f3b66271d97503b92b2e5b9649afce7002aef4d3 Mon Sep 17 00:00:00 2001 +From 6a1133f726c62fa99b43b26259d1bd7b3819aead Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 15:47:09 +0100 -Subject: [PATCH 292/803] media: i2c: ov9281: fix mclk issue when probe +Subject: [PATCH 292/834] media: i2c: ov9281: fix mclk issue when probe multiple camera. Takes the ov9281 part only from the Rockchip's patch. @@ -169529,10 +169529,10 @@ index 4a6324a3e5da..0d6759942f79 100644 2.18.4 -From 32448b0a42ecd9ff9310522787cc1bb3028ee74b Mon Sep 17 00:00:00 2001 +From 6d6e06d295aa939c1d825aaa12692a286a7931b7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 15:51:50 +0100 -Subject: [PATCH 293/803] media: i2c: ov9281: add enum_frame_interval function +Subject: [PATCH 293/834] media: i2c: ov9281: add enum_frame_interval function for iq tool 2.2 and hal3 Adds the ov9281 parts of the Rockchip patch adding enum_frame_interval to @@ -169632,10 +169632,10 @@ index 0d6759942f79..273aa904683c 100644 2.18.4 -From f4096a908a89901e7fd5e6785b0793164a82d5af Mon Sep 17 00:00:00 2001 +From b25564409b79211d35676399ab622f62f8f90c5d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 16:12:33 +0100 -Subject: [PATCH 294/803] media: i2c: ov9281: Fixup for recent kernel releases, +Subject: [PATCH 294/834] media: i2c: ov9281: Fixup for recent kernel releases, and remove custom code The Rockchip driver was based on a 4.4 kernel, and had several custom @@ -170315,10 +170315,10 @@ index 273aa904683c..7b9bea476cfb 100644 2.18.4 -From 617000888943080bb30cdd7cf73157369c342da7 Mon Sep 17 00:00:00 2001 +From 11ad5a9697e48a6076ac1afb0e199bebe13b7c9f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 17:51:32 +0100 -Subject: [PATCH 295/803] media: i2c: ov9281: Read chip ID via 2 reads +Subject: [PATCH 295/834] media: i2c: ov9281: Read chip ID via 2 reads Vision Components have made an OV9281 module which blocks reading back the majority of registers to comply with NDAs, and in doing @@ -170363,10 +170363,10 @@ index 7b9bea476cfb..bb8efc3d3cba 100644 2.18.4 -From 189588a502abb1e384fcf05ac568200b774a9550 Mon Sep 17 00:00:00 2001 +From 4a5a91342bd11b5311f7cda63215b861cb2ef407 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 10:31:53 +0100 -Subject: [PATCH 296/803] media: i2c: imx290: Explicitly set v&h blank on mode +Subject: [PATCH 296/834] media: i2c: imx290: Explicitly set v&h blank on mode change __v4l2_ctrl_modify_range only updates the current value should @@ -170415,10 +170415,10 @@ index b824dfe29bbd..b28834823f86 100644 2.18.4 -From f3ccc8d4a775f1bba245f5a1c6210fbdf3af584e Mon Sep 17 00:00:00 2001 +From f207668ccbffba65015443ca5c7e01df4f869e2e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 11:23:48 +0100 -Subject: [PATCH 297/803] media: i2c: imx290: Add support for g_selection to +Subject: [PATCH 297/834] media: i2c: imx290: Add support for g_selection to report cropping Userspace needs to know the cropping arrangements for each mode, @@ -170577,10 +170577,10 @@ index b28834823f86..24bf40d729b7 100644 2.18.4 -From d9d63eba0cb57f6f7efd3c207b4308e220552708 Mon Sep 17 00:00:00 2001 +From 59ab560d55cfdcbc596c4753f4e16b61a2b9eb39 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 11:51:26 +0100 -Subject: [PATCH 298/803] media: i2c: imx290: Set the colorspace fields in the +Subject: [PATCH 298/834] media: i2c: imx290: Set the colorspace fields in the format The colorspace fields were left untouched in imx290_set_fmt @@ -170614,10 +170614,10 @@ index 24bf40d729b7..2e646fb01856 100644 2.18.4 -From 30d4dcf9811f02bfe367ab5cd155d7a3d5ca3bc7 Mon Sep 17 00:00:00 2001 +From e9b1620886c6172f958e42a45d334137132dfa61 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 14:23:40 +0100 -Subject: [PATCH 299/803] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE +Subject: [PATCH 299/834] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE in the caps v4l2-compliance throws a failure if the device doesn't advertise @@ -170648,10 +170648,10 @@ index c97ecfc0e55b..20b46a9e04c3 100644 2.18.4 -From 4017969b54a502dff188fd5a092cebe81276e984 Mon Sep 17 00:00:00 2001 +From b2bc04bac9e7f6c9f98bd56470d00faf0a35e580 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 14:52:43 +0100 -Subject: [PATCH 300/803] media: bcm2835-unicam: Ensure type is VIDEO_CAPTURE +Subject: [PATCH 300/834] media: bcm2835-unicam: Ensure type is VIDEO_CAPTURE in [g|s]_selection [g|s]_selection pass in a buffer type that needs to be validated @@ -170690,10 +170690,10 @@ index 20b46a9e04c3..de288f87ff2f 100644 2.18.4 -From cf882806695f944f873bc8ebc76c94bdaeeec0b2 Mon Sep 17 00:00:00 2001 +From 2e130ed554197aca3e38f5dab8715393ff03da96 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 11 May 2020 13:02:22 +0100 -Subject: [PATCH 301/803] media: bcm2835: unicam: Set VPU min clock freq to +Subject: [PATCH 301/834] media: bcm2835: unicam: Set VPU min clock freq to 250Mhz. When streaming with Unicam, the VPU must have a clock frequency of at @@ -170823,10 +170823,10 @@ index de288f87ff2f..295db7564614 100644 2.18.4 -From a2fc994529f82518457db35773a367f5ba3f8eb5 Mon Sep 17 00:00:00 2001 +From b263d5c47cb49e3042c031d49fdb889813323e41 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 11 May 2020 13:06:27 +0100 -Subject: [PATCH 302/803] dt-bindings: bcm2835-unicam: Update documentation +Subject: [PATCH 302/834] dt-bindings: bcm2835-unicam: Update documentation with new clock params Update the documentation to reflect the new "VPU" clock needed @@ -170867,10 +170867,10 @@ index 7714fb374b34..164d0377dcd2 100644 2.18.4 -From 446efd2370b6d6557619a0a8e443f599a95ff96e Mon Sep 17 00:00:00 2001 +From efd34904ad25a554e994c8db1cbba1ad9a919d5b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 01:45:08 +0300 -Subject: [PATCH 303/803] media: i2c: ov5647: Parse and register properties +Subject: [PATCH 303/834] media: i2c: ov5647: Parse and register properties Parse device properties and register controls for them using the V4L2 fwnode properties helpers. @@ -170922,10 +170922,10 @@ index 6d84d2785f74..86a821a172b3 100644 2.18.4 -From 19c2f32e631e20c0f97b2137b392e12bc5fdf470 Mon Sep 17 00:00:00 2001 +From b3442b4c3dbded3959f06d8853091d1fc53c9163 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Jul 2020 10:33:19 +0100 -Subject: [PATCH 304/803] leds: Add the actpwr trigger +Subject: [PATCH 304/834] leds: Add the actpwr trigger The actpwr trigger is a meta trigger that cycles between an inverted mmc0 and default-on. It is written in a way that could fairly easily @@ -171168,10 +171168,10 @@ index 000000000000..1a52107ceb03 2.18.4 -From 5dd214bf937b5f2549ec874f4aacbf0ddbbd59af Mon Sep 17 00:00:00 2001 +From 3975bb7dd7a3e82cf94229f6caf9376d56dbc9c3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Jul 2020 17:34:09 +0100 -Subject: [PATCH 305/803] staging: vchiq_arm: children inherit DMA config +Subject: [PATCH 305/834] staging: vchiq_arm: children inherit DMA config Although it is no longer necessary for vchiq's children to have a different DMA configuration to the parent, they do still need to @@ -171210,10 +171210,10 @@ index c3ca18e4e85c..a936102dbc34 100644 2.18.4 -From 82c14121985ff9420b2ffd70bbbbe900d6588141 Mon Sep 17 00:00:00 2001 +From e5cad0bc759b69c96e88d48cbeb2da92e66a0cd0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 Jul 2020 17:59:31 +0100 -Subject: [PATCH 306/803] bcm2835-dma: Advertise the full DMA range +Subject: [PATCH 306/834] bcm2835-dma: Advertise the full DMA range Unless the DMA mask is set wider than 32 bits, DMA mapping will use a bounce buffer. @@ -171293,10 +171293,10 @@ index 84b1009da23b..d1127b9058a4 100644 2.18.4 -From 8cb18f3ea5e4bbab695d80ee19a40919ae5f037c Mon Sep 17 00:00:00 2001 +From ba1ca3b191e6e9e532e080f1c74e5e57d0d62c7d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jul 2020 13:47:55 +0100 -Subject: [PATCH 307/803] ARM: proc-v7: Force misalignment of early stmia +Subject: [PATCH 307/834] ARM: proc-v7: Force misalignment of early stmia In an attempt to prevent the problem of CPUn not starting, explicitly misalign the scratch space used to save registers acros the cache @@ -171359,10 +171359,10 @@ index 28c9d32fa99a..3e77e8982df3 100644 2.18.4 -From 1b021d70c80647438630bb1b5a461b7e93faa8f7 Mon Sep 17 00:00:00 2001 +From cb35d0a3d14c6a9f1f68148d807acd1f628f7004 Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Wed, 19 Aug 2020 17:02:22 +0300 -Subject: [PATCH 308/803] media: bcm2835: unicam: Select MEDIA_CONTROLLER and +Subject: [PATCH 308/834] media: bcm2835: unicam: Select MEDIA_CONTROLLER and VIDEO_V4L2_SUBDEV_API That is what almost all other drivers appear to be doing. @@ -171392,10 +171392,10 @@ index ec46e3ef053c..7d5a0e6ba762 100644 2.18.4 -From 57b23aff1acde2c92dde6a7c228bab3262a03bf3 Mon Sep 17 00:00:00 2001 +From 94637c5b9195f3f7f8573be6d7c998efbcb15591 Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Wed, 19 Aug 2020 17:05:53 +0300 -Subject: [PATCH 309/803] staging: media: rpivid: Select MEDIA_CONTROLLER and +Subject: [PATCH 309/834] staging: media: rpivid: Select MEDIA_CONTROLLER and MEDIA_CONTROLLER_REQUEST_API MEDIA_CONTROLLER_REQUEST_API is a hidden option. If rpivid depends on it, @@ -171430,10 +171430,10 @@ index 58b470c80db1..304c3edf0e71 100644 2.18.4 -From a0394ad80d289673bd7488ca4f493490ac7b0fc1 Mon Sep 17 00:00:00 2001 +From 06d5694dfdd736857e32fb610fd93b16d94b0d2f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 27 Aug 2020 16:30:26 +0100 -Subject: [PATCH 310/803] media: bcm2835-unicam: Drop WARN on uing direct cache +Subject: [PATCH 310/834] media: bcm2835-unicam: Drop WARN on uing direct cache alias Pi 0&1 pass all ARM accesses through the VPU L2 cache, therefore @@ -171470,10 +171470,10 @@ index 295db7564614..35ddb97f7f75 100644 2.18.4 -From 07493a23b71ab6a995e27e1e1ff6fd8501badbf0 Mon Sep 17 00:00:00 2001 +From 569354fb3fc66bd25f59d367ce18e01b6e75457f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 Jul 2020 12:40:50 +0100 -Subject: [PATCH 311/803] media: i2c: tc358743: Only allow supported pixel fmts +Subject: [PATCH 311/834] media: i2c: tc358743: Only allow supported pixel fmts in set_fmt Fix commit "media: tc358743: Return an appropriate colorspace from @@ -171506,10 +171506,10 @@ index ee6779a81d43..ce64c25c1511 100644 2.18.4 -From 0480f57671b2dff69f821ac7642cb0d6d9bd68fe Mon Sep 17 00:00:00 2001 +From d91871b102c3f9772661b71d7fa42d90b5336e67 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 18:29:10 +0100 -Subject: [PATCH 312/803] media: i2c: ov9281: Add support for 8 bit readout +Subject: [PATCH 312/834] media: i2c: ov9281: Add support for 8 bit readout The sensor supports 8 bit mode as well as 10bit, so add the relevant code to allow selection of this. @@ -171700,10 +171700,10 @@ index bb8efc3d3cba..9610c24ceff1 100644 2.18.4 -From 5c7f21e6533bcaeae7475ae9fb0891368cf460b7 Mon Sep 17 00:00:00 2001 +From ccac6534a6582b630596a209f4e68324324b7c97 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 3 Sep 2020 14:02:21 +0100 -Subject: [PATCH 313/803] bcm2835-mmc: uninitialized_var is no more +Subject: [PATCH 313/834] bcm2835-mmc: uninitialized_var is no more --- drivers/mmc/host/bcm2835-mmc.c | 2 +- @@ -171726,10 +171726,10 @@ index caf46be8eb0d..cdc1318e5936 100644 2.18.4 -From 3bdea8312db49442248f41ab91ce68cf6812ad0b Mon Sep 17 00:00:00 2001 +From 9937d5be4bb6fd966a86450a0ff91b1498e7b1dd Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 3 Sep 2020 14:02:41 +0100 -Subject: [PATCH 314/803] dwc_otg: whitelist_table is now productlist_table +Subject: [PATCH 314/834] dwc_otg: whitelist_table is now productlist_table --- drivers/usb/core/otg_productlist.h | 2 +- @@ -171752,10 +171752,10 @@ index 1839e169469b..b16e528859a8 100644 2.18.4 -From ec5615fad77ded013eed2128bd93f8ee62762125 Mon Sep 17 00:00:00 2001 +From 049912d6d8af3a089d010f5edc97dd353ce89163 Mon Sep 17 00:00:00 2001 From: detule Date: Tue, 2 Oct 2018 04:10:08 -0400 -Subject: [PATCH 315/803] vchiq_2835_arm: Implement a DMA pool for small bulk +Subject: [PATCH 315/834] vchiq_2835_arm: Implement a DMA pool for small bulk transfers (#2699) During a bulk transfer we request a DMA allocation to hold the @@ -171880,10 +171880,10 @@ index 76179739de12..2a1d8d6541b2 100644 2.18.4 -From 278b2a17940122c5d27f172586bde309701df43b Mon Sep 17 00:00:00 2001 +From aaa40e0be1193785b5f6c99b024fc66b74bf45f6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 3 Sep 2020 17:09:07 +0100 -Subject: [PATCH 316/803] include/firmware: Add enum for +Subject: [PATCH 316/834] include/firmware: Add enum for RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_ID Used by audio and FKMS. @@ -171909,10 +171909,10 @@ index d0c827064999..d0ee609a9043 100644 2.18.4 -From eef90cf79f453ba8894cae7fa1dabf73ae90071d Mon Sep 17 00:00:00 2001 +From c7888ad70297e7e784c4e39c7f761912ec480fb5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Apr 2020 19:07:50 +0100 -Subject: [PATCH 317/803] vc4_hdmi: BCM2835 requires a fixed hsm clock for CEC +Subject: [PATCH 317/834] vc4_hdmi: BCM2835 requires a fixed hsm clock for CEC to work Signed-off-by: popcornmix @@ -172032,10 +172032,10 @@ index 0526a9cf608a..32d09132fb44 100644 2.18.4 -From b0bd976891eae515530fdf81f9651b4d0e079aa0 Mon Sep 17 00:00:00 2001 +From 5bc46aa433e8181eba539c31cdcc5eac4efe977b Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 318/803] vc4_hdmi_regs: Add Intr2 register block +Subject: [PATCH 318/834] vc4_hdmi_regs: Add Intr2 register block Signed-off-by: Dom Cobley --- @@ -172136,10 +172136,10 @@ index 6c0dfbbe1a7e..10dd6097f2b5 100644 2.18.4 -From 84ea2f5857ef766fb5306067606e1a2999fb1368 Mon Sep 17 00:00:00 2001 +From d68750fa8e9adf3d7f78ff75573518fbb7428ca6 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 319/803] vc4_hdmi_regs: Make interrupt mask variant specific +Subject: [PATCH 319/834] vc4_hdmi_regs: Make interrupt mask variant specific Signed-off-by: Dom Cobley --- @@ -172247,10 +172247,10 @@ index be2c32a519b3..39630e9de1b0 100644 2.18.4 -From f569ffd67bbd886d9cda8818da8cbf7a88c37f92 Mon Sep 17 00:00:00 2001 +From be33544b178e6cb925fe2f2d339e018aef2e9caf Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 320/803] vc4_hdmi: Make irq shared +Subject: [PATCH 320/834] vc4_hdmi: Make irq shared Signed-off-by: Dom Cobley --- @@ -172275,10 +172275,10 @@ index 2206db78025a..412625246d5b 100644 2.18.4 -From 114ce36fd430896e48ca70797654cace15c4f186 Mon Sep 17 00:00:00 2001 +From b5225ab062e777f615be208558210fc9f0e93b17 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 14:54:28 +0100 -Subject: [PATCH 321/803] drm/vc4: Adopt the dma configuration from the HVS or +Subject: [PATCH 321/834] drm/vc4: Adopt the dma configuration from the HVS or V3D component vc4_drv isn't necessarily under the /soc node in DT as it is a @@ -172335,10 +172335,10 @@ index 839610f8092a..de02c57ed276 100644 2.18.4 -From 87a398d081819c9b0f091a41e6947d2e3f4ad4e3 Mon Sep 17 00:00:00 2001 +From 8e0351159e0dd1b6b623ad027a8b8f405c3a631e Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 23 Jun 2020 18:37:01 +0100 -Subject: [PATCH 322/803] vc4_hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET +Subject: [PATCH 322/834] vc4_hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET Symptom is random switching of speakers when using multichannel. @@ -172383,10 +172383,10 @@ index 412625246d5b..ba631560354c 100644 2.18.4 -From 86cb35aeb42ce1dc966e16591212232a6d18ec0b Mon Sep 17 00:00:00 2001 +From b2929be43654793af79d788034d396309b4d3a67 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 10 Mar 2020 22:21:15 +0000 -Subject: [PATCH 323/803] vc4_hdmi: Set HDMI_MAI_FMT +Subject: [PATCH 323/834] vc4_hdmi: Set HDMI_MAI_FMT The hardware uses this for generating the right audio data island packets when using formats other than PCM @@ -172515,10 +172515,10 @@ index 39630e9de1b0..c10402e103d6 100644 2.18.4 -From 30e3a583ec2851115d492747016d914daceb38d8 Mon Sep 17 00:00:00 2001 +From 5e55786b09373ba5ae12c40779b5a4e5b73d83ff Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 17 Mar 2020 12:12:22 +0100 -Subject: [PATCH 324/803] drm/vc4: add iec958 controls to vc4_hdmi +Subject: [PATCH 324/834] drm/vc4: add iec958 controls to vc4_hdmi Although vc4 get an IEC958 formatted stream passed in from userspace the driver needs the info from the channel status bits to properly @@ -172642,10 +172642,10 @@ index 16cc0e9abc36..c75d4c9e1515 100644 2.18.4 -From 354ce58959dd92328a96339cb6b08413c8fa72ff Mon Sep 17 00:00:00 2001 +From ba45ffd4d2e02f69a0ae111da58d1f879a101a3e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 19 Mar 2020 20:00:35 +0100 -Subject: [PATCH 325/803] drm/vc4: move setup from hw_params to prepare +Subject: [PATCH 325/834] drm/vc4: move setup from hw_params to prepare Configuring HDMI audio registers in prepare allows us to take IEC958 bits into account which are set by the alsa hook after @@ -172706,10 +172706,10 @@ index b2595ec65166..04b1807cb793 100644 2.18.4 -From 47d2fe8e569f17e91e8dda07610f39b0f639890a Mon Sep 17 00:00:00 2001 +From fcd8a24568e3d9efe1feaee7643d2d48445e247f Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Fri, 10 Jul 2020 11:51:16 +0100 -Subject: [PATCH 326/803] drm/vc4: enable HBR MAI format on HBR streams +Subject: [PATCH 326/834] drm/vc4: enable HBR MAI format on HBR streams Signed-off-by: Matthias Reichl --- @@ -172737,10 +172737,10 @@ index 04b1807cb793..c419a5d0c75d 100644 2.18.4 -From 7b10a4e2eeb5e9d5ded3ae52838ad4a4e1efce36 Mon Sep 17 00:00:00 2001 +From b34991f5d51693656ab70a0bc303dfc563029bdc Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 25 Jun 2020 18:48:40 +0100 -Subject: [PATCH 327/803] vc4_hdmi: Remove firmware logic for MAI threshold +Subject: [PATCH 327/834] vc4_hdmi: Remove firmware logic for MAI threshold setting This was a workaround for bugs in hardware on earlier Pi models @@ -172790,10 +172790,10 @@ index c419a5d0c75d..ecaa1979b3a7 100644 2.18.4 -From 1cf5dc43fc4484ba5e329b86d658d6bac8812e21 Mon Sep 17 00:00:00 2001 +From 31adaef921906df3a77eab14a271a8fab04f361a Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 30 Jun 2020 11:23:49 +0100 -Subject: [PATCH 328/803] vc_hdmi: Set VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE +Subject: [PATCH 328/834] vc_hdmi: Set VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE Without this bit set, HDMI_MAI_FORMAT doesn't pick up the format and samplerate from DVP_CFG_MAI0_FMT and you @@ -172820,10 +172820,10 @@ index ecaa1979b3a7..6c8891105f16 100644 2.18.4 -From 00401d6d35a887f9a87a59655514c94fcc75250f Mon Sep 17 00:00:00 2001 +From 45edcf09d4483267201a14f7aafe1e19e1e8b5d6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 20 Apr 2020 18:00:38 +0100 -Subject: [PATCH 329/803] vc4: Report channel mapping back to userspace +Subject: [PATCH 329/834] vc4: Report channel mapping back to userspace This follows logic in hdmi-codec.c to use speaker layout from ELD to choose a suitable speaker mapping based on @@ -173332,10 +173332,10 @@ index c75d4c9e1515..1680e1a56149 100644 2.18.4 -From 8ab6fa4adb7f5c55b8c5e9b0bd9f1b667f949e46 Mon Sep 17 00:00:00 2001 +From 1fad17a971b37c75bde94fc94e1cbf7fa8340862 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:25:41 +0000 -Subject: [PATCH 330/803] drm/vc4: Add support for DRM_FORMAT_P030 to vc4 +Subject: [PATCH 330/834] drm/vc4: Add support for DRM_FORMAT_P030 to vc4 planes This currently doesn't handle non-zero source rectangles correctly, @@ -173501,10 +173501,10 @@ index af4b8944a603..ec591839810a 100644 2.18.4 -From 4655ff3a92679059c8e004f08ba5ed40f645712c Mon Sep 17 00:00:00 2001 +From ac0d78649f7aa50f15e15f2f0faf018242110b50 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Sep 2019 18:28:17 +0100 -Subject: [PATCH 331/803] drm/vc4: Add support for YUV color encodings and +Subject: [PATCH 331/834] drm/vc4: Add support for YUV color encodings and ranges The BT601/BT709 color encoding and limited vs full @@ -173648,10 +173648,10 @@ index c10402e103d6..1f1ed7efaff7 100644 2.18.4 -From d3987af78ea3a28f432c73124b639b055cf2ef5d Mon Sep 17 00:00:00 2001 +From fa3dae8a61cb528e1b9ed2afa8f809f1fac0a358 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 7 Sep 2020 17:32:27 +0100 -Subject: [PATCH 332/803] drm/vc4: Add firmware-kms mode +Subject: [PATCH 332/834] drm/vc4: Add firmware-kms mode This is a squash of all firmware-kms related patches from previous branches, up to and including @@ -176032,10 +176032,10 @@ index d0ee609a9043..05c6989ec4c6 100644 2.18.4 -From 400ac3f7e28d976f01073a0733c68072a7d783e1 Mon Sep 17 00:00:00 2001 +From 6d2b7da9a7a2f1535d4ecd4c4b332cb3bfc89556 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 16:20:30 +0100 -Subject: [PATCH 333/803] drm/vc4: Add FKMS as an acceptable node for dma +Subject: [PATCH 333/834] drm/vc4: Add FKMS as an acceptable node for dma ranges. Under FKMS, the firmware (via FKMS) also requires the VideoCore cache @@ -176065,10 +176065,10 @@ index c8f9031fa946..d6576841d0fe 100644 2.18.4 -From ac4e667ce516a5324e210563778376e0a5b50f0f Mon Sep 17 00:00:00 2001 +From a53b5ea229cb381569b018fb0536ca3c07f6fe5b Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 8 May 2020 10:00:12 +0100 -Subject: [PATCH 334/803] media: i2c: Add driver for Sony IMX477 sensor +Subject: [PATCH 334/834] media: i2c: Add driver for Sony IMX477 sensor Adds a driver for the 12MPix Sony IMX477 CSI2 sensor. Whilst the sensor supports 2 or 4 CSI2 data lanes, this driver @@ -178344,10 +178344,10 @@ index 000000000000..ec56b0cfd57b 2.18.4 -From b9072481588ec0ace959338bd5ebfbc4edf47eaf Mon Sep 17 00:00:00 2001 +From 29a41228661795dce840c605b5d650191df918a1 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 8 May 2020 09:41:17 +0100 -Subject: [PATCH 335/803] media: i2c: imx477: Add support for adaptive frame +Subject: [PATCH 335/834] media: i2c: imx477: Add support for adaptive frame control Use V4L2_CID_EXPOSURE_AUTO_PRIORITY to control if the driver should @@ -178532,10 +178532,10 @@ index ec56b0cfd57b..bd0e2c291a32 100644 2.18.4 -From 38413578e3b981d62dd6a06f3bb44f2f61590d00 Mon Sep 17 00:00:00 2001 +From f0948355c2d333daa7b5a95355d7865076b6c4dc Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 16:56:33 +0100 -Subject: [PATCH 336/803] media: i2c: imx477: Return correct result on sensor +Subject: [PATCH 336/834] media: i2c: imx477: Return correct result on sensor id verification The test should return -EIO if the register read id does not match @@ -178563,10 +178563,10 @@ index bd0e2c291a32..e42a8633087d 100644 2.18.4 -From 71428dd270c956d89bbaca0ce307882a6fd386bc Mon Sep 17 00:00:00 2001 +From b577fef69f1daddec4c14ac4b2220eb4b3dad241 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 01:45:08 +0300 -Subject: [PATCH 337/803] media: i2c: imx477: Parse and register properties +Subject: [PATCH 337/834] media: i2c: imx477: Parse and register properties Parse device properties and register controls for them using the V4L2 fwnode properties helpers. @@ -178614,10 +178614,10 @@ index e42a8633087d..3fbb173fa079 100644 2.18.4 -From 599f6f28f2951f3ef771a70e10d1f3491ea18167 Mon Sep 17 00:00:00 2001 +From f70d45a34a1ca67a1b56a8311907b3cb3017f7f5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 May 2020 18:28:27 +0100 -Subject: [PATCH 338/803] media: bcm2835-unicam: Always service interrupts +Subject: [PATCH 338/834] media: bcm2835-unicam: Always service interrupts From when bringing up the driver, there was a check in the isr to ignore interrupts (claiming them handled) should the driver @@ -178671,10 +178671,10 @@ index 35ddb97f7f75..d4ba911fe7e7 100644 2.18.4 -From 4067057733596d09b09b9b4c730495610065b4bd Mon Sep 17 00:00:00 2001 +From f5da03b64eb9fb2315d157d58a208066fbe474ce Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:33:31 +0200 -Subject: [PATCH 339/803] media: bcm2835: unicam: Fix uninitialized warning +Subject: [PATCH 339/834] media: bcm2835: unicam: Fix uninitialized warning Signed-off-by: Jacko Dirks --- @@ -178698,10 +178698,10 @@ index d4ba911fe7e7..8b091d3a0d15 100644 2.18.4 -From b3a5801db03f4252e25bf84815c2723004b56bc7 Mon Sep 17 00:00:00 2001 +From 56dcf59b4741f8bb63f07d0f31bdb8989e0ed14e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 15:14:05 +0100 -Subject: [PATCH 340/803] media: bcm2835-unicam: Fixup review comments from +Subject: [PATCH 340/834] media: bcm2835-unicam: Fixup review comments from Hans. Updates the driver based on the upstream review comments from @@ -178950,10 +178950,10 @@ index 8b091d3a0d15..7dc96c3e8e83 100644 2.18.4 -From 22618bda672d2b99dc524a2fcd2be2d930a6aafe Mon Sep 17 00:00:00 2001 +From b9b07a398794b2455e28f77de20013bfa2e3826e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 11:46:47 +0100 -Subject: [PATCH 341/803] media: bcm2835-unicam: Retain packing information on +Subject: [PATCH 341/834] media: bcm2835-unicam: Retain packing information on G_FMT The change to retrieve the pixel format always on g_fmt didn't @@ -179004,10 +179004,10 @@ index 7dc96c3e8e83..98ae97c367ea 100644 2.18.4 -From 09a3204869f9f9bd252d8dfc58a4f6b1cae960e3 Mon Sep 17 00:00:00 2001 +From 5583c674ae3a038bc065dc5495bb36b9a912f916 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 28 May 2020 11:09:48 +0100 -Subject: [PATCH 342/803] media: bcm2835-unicam: change minimum number of +Subject: [PATCH 342/834] media: bcm2835-unicam: change minimum number of vb2_queue buffers to 1 Since the unicam driver was modified to write to a dummy buffer when no @@ -179038,10 +179038,10 @@ index 98ae97c367ea..6501fb205e20 100644 2.18.4 -From 5d0766870dd5fdaf37e02c583a829fa4974a3880 Mon Sep 17 00:00:00 2001 +From 27eb82c6a105a78603b9a2bf6e18e9f8e7e341f8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 18:15:27 +0100 -Subject: [PATCH 343/803] staging/fbtft: Add support for display variants +Subject: [PATCH 343/834] staging/fbtft: Add support for display variants Display variants are intended as a replacement for the now-deleted fbtft_device drivers. Drivers can register additional compatible @@ -179253,10 +179253,10 @@ index 76f8c090a837..f4f5ff0dc0c0 100644 2.18.4 -From 99258a1d4fca63e34b5fc2fe53492207fa4eff8c Mon Sep 17 00:00:00 2001 +From c7fd8cb4a55abbce0c4280ee8173ea0c75394235 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 09:32:22 +0000 -Subject: [PATCH 344/803] brcmfmac: Increase power saving delay to 2s +Subject: [PATCH 344/834] brcmfmac: Increase power saving delay to 2s Increase the delay before entering the lower power state to 2 seconds (the maximum allowed) in order to reduce the packet latencies, @@ -179292,10 +179292,10 @@ index 496f6125a3f6..e51b42b547be 100644 2.18.4 -From 3db9b30a1fa695bd3b5f514bd473f321ee12589a Mon Sep 17 00:00:00 2001 +From 3989f6c1e8bb2ebfb11b801aa1c374d1e52b1788 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 21 Sep 2020 14:02:44 +0100 -Subject: [PATCH 345/803] rpivid_h265: Fix width/height typo +Subject: [PATCH 345/834] rpivid_h265: Fix width/height typo Signed-off-by: popcornmix --- @@ -179319,10 +179319,10 @@ index 47d4de42c584..b677910e237c 100644 2.18.4 -From 270d003a40e18b02f04f1d17c05872897896a62b Mon Sep 17 00:00:00 2001 +From a9fe7ffb3380333e101c147374ade733af756207 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 25 Sep 2020 15:07:23 +0100 -Subject: [PATCH 346/803] net: bcmgenet: Reset RBUF on first open +Subject: [PATCH 346/834] net: bcmgenet: Reset RBUF on first open If the RBUF logic is not reset when the kernel starts then there may be some data left over from any network boot loader. If the @@ -179344,19 +179344,19 @@ Signed-off-by: Phil Elwell 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index ef75c4585a04..e01156434a02 100644 +index 06e0e3d0f2b5..8da6f867b6d2 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3243,7 +3243,7 @@ static void bcmgenet_get_hw_addr(struct bcmgenet_priv *priv, +@@ -3244,7 +3244,7 @@ static void bcmgenet_get_hw_addr(struct bcmgenet_priv *priv, } /* Returns a reusable dma control register value */ -static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) +static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv, bool flush_rx) { + unsigned int i; u32 reg; - u32 dma_ctrl; -@@ -3262,6 +3262,14 @@ static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) +@@ -3269,6 +3269,14 @@ static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) udelay(10); bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH); @@ -179372,8 +179372,8 @@ index ef75c4585a04..e01156434a02 100644 } @@ -3332,8 +3340,8 @@ static int bcmgenet_open(struct net_device *dev) - bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT); - } + + bcmgenet_set_hw_addr(priv, dev->dev_addr); - /* Disable RX/TX DMA and flush TX queues */ - dma_ctrl = bcmgenet_dma_disable(priv); @@ -179382,8 +179382,8 @@ index ef75c4585a04..e01156434a02 100644 /* Reinitialize TDMA and RDMA and SW housekeeping */ ret = bcmgenet_init_dma(priv); -@@ -4194,7 +4202,7 @@ static int bcmgenet_resume(struct device *d) - } +@@ -4187,7 +4195,7 @@ static int bcmgenet_resume(struct device *d) + bcmgenet_hfb_create_rxnfc_filter(priv, rule); /* Disable RX/TX DMA and flush TX queues */ - dma_ctrl = bcmgenet_dma_disable(priv); @@ -179395,10 +179395,10 @@ index ef75c4585a04..e01156434a02 100644 2.18.4 -From e285a5572c51defa5fcf1332854ea46602701918 Mon Sep 17 00:00:00 2001 +From 429fadc888bd0650ac9b6487ce4910640fe0175c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 28 Sep 2020 20:23:30 +0100 -Subject: [PATCH 347/803] char: Add broadcom char drivers back to build files +Subject: [PATCH 347/834] char: Add broadcom char drivers back to build files See: https://github.com/raspberrypi/linux/issues/3875 Signed-off-by: popcornmix @@ -179433,76 +179433,10 @@ index ffce287ef415..463ff9f136e4 100644 2.18.4 -From 81ad4bcea148a0dce3743fad7323d4ad25686446 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Wed, 30 Sep 2020 19:23:43 +0100 -Subject: [PATCH 348/803] USB: gadget: f_hid: avoid crashes and log spam - -Disconnecting and reconnecting the USB cable can lead to crashes and a -variety of kernel log spam. Try to fix or minimise both. - -See: https://github.com/raspberrypi/linux/issues/3870 - -Signed-off-by: Phil Elwell ---- - drivers/usb/gadget/function/f_hid.c | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - -diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c -index a82b3de1a54b..f6f5174213c6 100644 ---- a/drivers/usb/gadget/function/f_hid.c -+++ b/drivers/usb/gadget/function/f_hid.c -@@ -338,6 +338,11 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, - - spin_lock_irqsave(&hidg->write_spinlock, flags); - -+ if (!hidg->req) { -+ spin_unlock_irqrestore(&hidg->write_spinlock, flags); -+ return -ESHUTDOWN; -+ } -+ - #define WRITE_COND (!hidg->write_pending) - try_again: - /* write queue */ -@@ -358,7 +363,13 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, - count = min_t(unsigned, count, hidg->report_length); - - spin_unlock_irqrestore(&hidg->write_spinlock, flags); -- status = copy_from_user(req->buf, buffer, count); -+ if (req) { -+ status = copy_from_user(req->buf, buffer, count); -+ } else { -+ ERROR(hidg->func.config->cdev, "hidg->req is NULL\n"); -+ status = -ESHUTDOWN; -+ goto release_write_pending; -+ } - - if (status != 0) { - ERROR(hidg->func.config->cdev, -@@ -387,10 +398,13 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, - - spin_unlock_irqrestore(&hidg->write_spinlock, flags); - -+ if (!hidg->in_ep->enabled) { -+ ERROR(hidg->func.config->cdev, "in_ep is disabled\n"); -+ status = -ESHUTDOWN; -+ goto release_write_pending; -+ } - status = usb_ep_queue(hidg->in_ep, req, GFP_ATOMIC); - if (status < 0) { -- ERROR(hidg->func.config->cdev, -- "usb_ep_queue error on int endpoint %zd\n", status); - goto release_write_pending; - } else { - status = count; --- -2.18.4 - - -From 02d1ced8ecff4cf4d3002ef6646dc8d1b045e5a4 Mon Sep 17 00:00:00 2001 +From 7398a7e25650710d72c4f1e6274547f66457c172 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 7 Oct 2020 15:09:29 +0100 -Subject: [PATCH 349/803] dwc_otg: initialise sched_frame for periodic QHs that +Subject: [PATCH 348/834] dwc_otg: initialise sched_frame for periodic QHs that were parked If a periodic QH has no remaining QTDs, then it is removed from all @@ -179538,10 +179472,10 @@ index 2823dc9af63f..4503af692aef 100644 2.18.4 -From 678ca6716487eb7023d9f633a7818ee781e25afa Mon Sep 17 00:00:00 2001 +From 3f4bf7bf7a83f792063d79fc4387eb63c0e75a5c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Oct 2020 15:35:14 +0100 -Subject: [PATCH 350/803] staging: bcm2835-camera: Replace deprecated +Subject: [PATCH 349/834] staging: bcm2835-camera: Replace deprecated V4L2_PIX_FMT_BGR32 V4L2_PIX_FMT_BGR32 is deprecated as it is ambiguous over where @@ -179574,10 +179508,10 @@ index bea37cb163fc..e0a96dbb843d 100644 2.18.4 -From dbdd044b7cfc8af1a64e5422017d7c663d7d545a Mon Sep 17 00:00:00 2001 +From 1a3b465da1e1fc288237fb3ddedf4ebffc0b63cd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Oct 2020 18:49:52 +0100 -Subject: [PATCH 351/803] staging: vc04_services: Add new vc-sm-cma driver +Subject: [PATCH 350/834] staging: vc04_services: Add new vc-sm-cma driver Add Broadcom VideoCore Shared Memory support. @@ -182538,10 +182472,10 @@ index 000000000000..988fdd967922 2.18.4 -From bfa44e967f76733bc7ca4a1b6720333cc82dea15 Mon Sep 17 00:00:00 2001 +From 0abc3d9a3946886091d8209c2c19eccfda46da63 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:09:04 +0100 -Subject: [PATCH 352/803] staging: vchiq-mmal: Add support for 14bit Bayer +Subject: [PATCH 351/834] staging: vchiq-mmal: Add support for 14bit Bayer Add in the missing defines. @@ -182571,10 +182505,10 @@ index 44ba91aa6d47..be8af09a6c80 100644 2.18.4 -From 3ef6c59560e8bdcd346624a9fe97e0e2544ea7e2 Mon Sep 17 00:00:00 2001 +From cc2fc08dceaee401a5a9edc77b2567ccdbf31b3b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:11:14 +0100 -Subject: [PATCH 353/803] staging: mmal-vchiq: Add monochrome image formats +Subject: [PATCH 352/834] staging: mmal-vchiq: Add monochrome image formats Adds support for monochrome image formats in the various MIPI packings. @@ -182606,10 +182540,10 @@ index be8af09a6c80..897e6cdf8dd9 100644 2.18.4 -From 90a168f0d0f15522bfb42c7beb43e7ad4766a11c Mon Sep 17 00:00:00 2001 +From 1528cc8d1e027ce3125bbbd6993ee20106a68927 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 16:07:55 +0100 -Subject: [PATCH 354/803] staging: mmal-vchiq: Use vc-sm-cma to support zero +Subject: [PATCH 353/834] staging: mmal-vchiq: Use vc-sm-cma to support zero copy With the vc-sm-cma driver we can support zero copy of buffers between @@ -182780,10 +182714,10 @@ index e87f88f99338..247521fbcc1d 100644 2.18.4 -From 8b08512b71b33b58819aa3e427a0b1ca586144cf Mon Sep 17 00:00:00 2001 +From a941eec37121ef429259112ff14fae9157793d05 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Oct 2020 20:24:12 +0100 -Subject: [PATCH 355/803] staging: vc04_services: Add a V4L2 M2M codec driver +Subject: [PATCH 354/834] staging: vc04_services: Add a V4L2 M2M codec driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -185870,10 +185804,10 @@ index 000000000000..d490ff67f747 2.18.4 -From 11fe9ef9b5b002cac8e30371413c6239055e8ab6 Mon Sep 17 00:00:00 2001 +From a4cdd985a54892b7407cd74ce49a523d4c823303 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 11 Oct 2020 00:48:55 +0200 -Subject: [PATCH 356/803] bcm2835-dma: only reserve channel 0 if legacy dma +Subject: [PATCH 355/834] bcm2835-dma: only reserve channel 0 if legacy dma driver is enabled If CONFIG_DMA_BCM2708 isn't enabled there's no need to mask out @@ -185908,10 +185842,10 @@ index d1127b9058a4..0cbfa9d559a2 100644 2.18.4 -From 1b248f27e021244982a92e2d5d16bc6ed3470589 Mon Sep 17 00:00:00 2001 +From 7130cff582e9d49e1c327feede07cba6970e9681 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 12 Oct 2020 17:03:14 +0100 -Subject: [PATCH 357/803] uapi: bcm2835-isp: Add bcm2835-isp uapi header file +Subject: [PATCH 356/834] uapi: bcm2835-isp: Add bcm2835-isp uapi header file This file defines the userland interface to the bcm2835-isp driver that will follow in a separate commit. @@ -186253,10 +186187,10 @@ index 000000000000..cf8c0437f159 2.18.4 -From 9e8a8ee271cbeda6540876dd71d641d9ed4d1399 Mon Sep 17 00:00:00 2001 +From cb41e9be655549ead6e9e541a82fce416709ac1e Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:17:37 +0100 -Subject: [PATCH 358/803] staging: vc04_services: ISP: Add a more complex ISP +Subject: [PATCH 357/834] staging: vc04_services: ISP: Add a more complex ISP processing component Driver for the BCM2835 ISP hardware block. This driver uses the MMAL @@ -188688,10 +188622,10 @@ index 89059bca0b77..5b596b5c057f 100644 2.18.4 -From 31e91c4e2a049950edd60c76d9058d6845ff3719 Mon Sep 17 00:00:00 2001 +From b3617bfede3fa83f5508c9610a270e61482b7cbd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 31 Jul 2019 17:36:34 +0100 -Subject: [PATCH 359/803] drm/vc4: A present but empty dmas disables audio +Subject: [PATCH 358/834] drm/vc4: A present but empty dmas disables audio Overlays are unable to remove properties in the base DTB, but they can overwrite them. Allow a present but empty 'dmas' property @@ -188727,10 +188661,10 @@ index 37ce071354dc..94debdfbfbee 100644 2.18.4 -From 738bc124c625cc0a19f69733dee6214048d8d685 Mon Sep 17 00:00:00 2001 +From 1162005e5d9821a59c07ac9946d6c1e2bbf6cffb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 6 Oct 2020 18:44:42 +0100 -Subject: [PATCH 360/803] drm/vc4: Add debugfs node that dumps the current +Subject: [PATCH 359/834] drm/vc4: Add debugfs node that dumps the current display lists This allows easy analysis of display lists when debugging. @@ -188803,10 +188737,10 @@ index ad691571d759..b5015d036d46 100644 2.18.4 -From 95849e51e835cb6c5ace058c05c62592bf832911 Mon Sep 17 00:00:00 2001 +From 141e1e69cf1975dc64d7354fdc5ac4e37673438b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:00:54 +0100 -Subject: [PATCH 361/803] gpio: Add gpio-fsm driver +Subject: [PATCH 360/834] gpio: Add gpio-fsm driver The gpio-fsm driver implements simple state machines that allow GPIOs to be controlled in response to inputs from other GPIOs - real and @@ -189999,10 +189933,10 @@ index 000000000000..eb40cfdc71df 2.18.4 -From 0cd8e44ea3e883d2723eea4c05175fb683fbe014 Mon Sep 17 00:00:00 2001 +From 7d03d9bbe68582503c572d373907d40b1dfc1d4e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Oct 2020 18:34:56 +0100 -Subject: [PATCH 362/803] drm/vc4: Add all the HDMI registers into the debugfs +Subject: [PATCH 361/834] drm/vc4: Add all the HDMI registers into the debugfs dumps The vc5 HDMI registers hadn't been added into the debugfs @@ -190110,10 +190044,10 @@ index 1680e1a56149..1eb1fc0d95a3 100644 2.18.4 -From e1b3f725db9a6f981c148bf73ebb72708b699c37 Mon Sep 17 00:00:00 2001 +From 616f8e3c652b1f3fa51ad017f9504c7d320ef72e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 19 Mar 2020 10:04:46 +0000 -Subject: [PATCH 363/803] ARM: dts: bcm271x: Use a53 pmu, drop RPI364 +Subject: [PATCH 362/834] ARM: dts: bcm271x: Use a53 pmu, drop RPI364 The upstream bcm2837.dtsi uses cortex-a53-pmu, so we can do the same but with a fallback to the cortex-a7-pmu which is supported by the @@ -190193,10 +190127,10 @@ index 1fd86f81f542..bf69a4b0b172 100644 2.18.4 -From 768ccc10d7db8a92aa949ae40a06b1ae0883cd81 Mon Sep 17 00:00:00 2001 +From d7470c25d341360c367dc6d7029a5dd37451e143 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 23 Oct 2020 14:15:41 +0100 -Subject: [PATCH 364/803] overlays: Add option to disable composite to +Subject: [PATCH 363/834] overlays: Add option to disable composite to vc4-kms-v3d Composite gets enabled automatically if HDMI isn't detected, @@ -190237,10 +190171,10 @@ index 6d34a2bff49b..5a4efdeed663 100644 2.18.4 -From bf3466ab88d90c7d35b92de7e580d1fbf3bd66bb Mon Sep 17 00:00:00 2001 +From 53ac9173aaed79a1ddd81f77f2bce8685e8b42d4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:07:57 +0000 -Subject: [PATCH 365/803] overlays: imx219: Correct link frequency to match the +Subject: [PATCH 364/834] overlays: imx219: Correct link frequency to match the upstream driver The upstream driver is checking the link frequency parameter, and @@ -190268,10 +190202,10 @@ index 3484bde5a9e8..dce07b335c4e 100644 2.18.4 -From 63baefdf407741cb86f7801eb065bf492fc9b888 Mon Sep 17 00:00:00 2001 +From 833e878d86d4f92e8fd894f5e356e050aec2d807 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 23 Oct 2020 15:45:11 +0100 -Subject: [PATCH 366/803] dts: Add CM4 to arm64 dt files +Subject: [PATCH 365/834] dts: Add CM4 to arm64 dt files Signed-off-by: Dave Stevenson --- @@ -190305,10 +190239,10 @@ index 000000000000..8064a58155f1 2.18.4 -From bc392273fea6b393ec2cdbb5697584ada33573b2 Mon Sep 17 00:00:00 2001 +From 79ab46f9d2e66c5374f9fc5e3a3250ecd06f37da Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 26 Oct 2020 12:38:27 +0000 -Subject: [PATCH 367/803] drm/vc4: Add the 2711 HVS as a suitable DMA node +Subject: [PATCH 366/834] drm/vc4: Add the 2711 HVS as a suitable DMA node With vc4-drv node not being under /soc on Pi4, we need to adopt the correct DMA parameters from a suitable sub-component. @@ -190335,10 +190269,10 @@ index d6576841d0fe..617c113b033f 100644 2.18.4 -From 2794f4b8b3054c3dc59ec6eafb5531803d9dc88c Mon Sep 17 00:00:00 2001 +From 46960c9a16b676c3293eb1cf7dcf026826c036df Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Mon, 26 Oct 2020 14:03:35 +0000 -Subject: [PATCH 368/803] xhci: quirks: add link TRB quirk for VL805 +Subject: [PATCH 367/834] xhci: quirks: add link TRB quirk for VL805 The VL805 controller can't cope with the TR Dequeue Pointer for an endpoint being set to a Link TRB. The hardware-maintained endpoint context ends up @@ -190358,7 +190292,7 @@ Signed-off-by: Jonathan Bell 3 files changed, 12 insertions(+) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index d7c948f569be..b1fa78304d49 100644 +index 618a131bdd53..153165fb8d88 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -277,6 +277,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) @@ -190370,10 +190304,10 @@ index d7c948f569be..b1fa78304d49 100644 if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index a9bd2e340ead..35b246aeb902 100644 +index 9106f0a1909a..0797964e8f36 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -630,6 +630,16 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, +@@ -653,6 +653,16 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, } while (!cycle_found || !td_last_trb_found); @@ -190391,10 +190325,10 @@ index a9bd2e340ead..35b246aeb902 100644 state->new_deq_ptr = new_deq; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 4f24ad7eccd9..2cc777f66cdf 100644 +index 3bf1cf0aabb1..bea47cb6b9c5 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1881,6 +1881,7 @@ struct xhci_hcd { +@@ -1882,6 +1882,7 @@ struct xhci_hcd { #define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39) #define XHCI_NO_SOFT_RETRY BIT_ULL(40) #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(41) @@ -190406,10 +190340,10 @@ index 4f24ad7eccd9..2cc777f66cdf 100644 2.18.4 -From 43b6ef25115b8e10d1b143b82e01b8bf3e789305 Mon Sep 17 00:00:00 2001 +From d7c20d773dc387400730fb85149791e60863bef2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 15:01:21 +0000 -Subject: [PATCH 369/803] dts: Tidy the Raspberry Pi Makefile entries +Subject: [PATCH 368/834] dts: Tidy the Raspberry Pi Makefile entries Signed-off-by: Phil Elwell --- @@ -190457,10 +190391,10 @@ index 1e861e2bf2e0..996e670a6018 100644 2.18.4 -From d303efa59cc16f62ed31c0a614a665745aecfd84 Mon Sep 17 00:00:00 2001 +From ca37c3cf95e04d7fe93bac1929e766ce720a5354 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:23:22 +0000 -Subject: [PATCH 370/803] staging: bcm2835-audio: Add disable-headphones flag +Subject: [PATCH 369/834] staging: bcm2835-audio: Add disable-headphones flag Add a property to allow the headphone output to be disabled. Use an integer property rather than a boolean so that an overlay can clear it. @@ -190497,10 +190431,10 @@ index a0cba3823e5e..ccda115ab9e0 100644 2.18.4 -From 2ef79f0fcb8177e610a3a421496ac1851df781a3 Mon Sep 17 00:00:00 2001 +From 7a2983338f53f0ee0fca7ddf678a98783f25a527 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:18:50 +0000 -Subject: [PATCH 371/803] ARM: dts: Disable headphone audio on Zeroes, CM4 +Subject: [PATCH 370/834] ARM: dts: Disable headphone audio on Zeroes, CM4 Signed-off-by: Phil Elwell --- @@ -190549,10 +190483,10 @@ index 0ca3a0126220..fa7b16040f36 100644 2.18.4 -From c470599be30c6b7328925b42d66742dbd563d8c3 Mon Sep 17 00:00:00 2001 +From 1558023c3082a74c235e8173d861a5a678ab7c83 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:21:23 +0000 -Subject: [PATCH 372/803] overlays: Enable headphone audio in audremap +Subject: [PATCH 371/834] overlays: Enable headphone audio in audremap Signed-off-by: Phil Elwell --- @@ -190581,10 +190515,10 @@ index d624bb3a3fea..7324890ead86 100644 2.18.4 -From 6debb4ae7eca126f2c98e1d3dadd93080aebbe6c Mon Sep 17 00:00:00 2001 +From 2ecfbcb09cb1b01ca364414ad901df05523208a0 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 26 Oct 2020 16:38:21 +0000 -Subject: [PATCH 373/803] rpisense-fb: Set pseudo_pallete to prevent crash on +Subject: [PATCH 372/834] rpisense-fb: Set pseudo_pallete to prevent crash on fbcon takeover Signed-off-by: Serge Schneider @@ -190617,10 +190551,10 @@ index 26432a5a0b4b..325977def531 100644 2.18.4 -From 42765df47b98da2ee1ad0d52cd6c81dfca3e624d Mon Sep 17 00:00:00 2001 +From 1a7f5e058783ae337cc47c88cbcbe9cbaac76028 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:35:43 +0000 -Subject: [PATCH 374/803] ARM: dts: Expand PCIe space on BCM2711 +Subject: [PATCH 373/834] ARM: dts: Expand PCIe space on BCM2711 Attempts to connect external GPUs to Compute Module 4's PCIe bus have highlighted that the existing "outbound window" - the fraction of the @@ -190635,7 +190569,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index b4a18b627359..8ad6c3012fe3 100644 +index 6e0339266027..27c622ebee0d 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -503,8 +503,8 @@ @@ -190653,10 +190587,10 @@ index b4a18b627359..8ad6c3012fe3 100644 2.18.4 -From 273f60e4c0b500ff71c829636be035375747ab5c Mon Sep 17 00:00:00 2001 +From 3e81e61ce7fa49044453beb9d4f932944a43e0e6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 21:51:29 +0000 -Subject: [PATCH 375/803] configs: Set RASPBERRYPI_FIRMWARE for arm64 bcm2711 +Subject: [PATCH 374/834] configs: Set RASPBERRYPI_FIRMWARE for arm64 bcm2711 RASPBERRYPI_FIRMWARE was missing from the arm64 bcm2711_defconfig. bcmrpi3_defconfig was also missing a few options. Add the misssing @@ -190807,10 +190741,10 @@ index d542d2522076..6247c74639f7 100644 2.18.4 -From 2eded5f95a022079796dd4efcea41a5166684560 Mon Sep 17 00:00:00 2001 +From 43e5f8e0f3d2c1a2e7099cfb0664ccfd2fb00cef Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 09:59:49 +0000 -Subject: [PATCH 376/803] dwc_otg: Minimise header and fix build warnings +Subject: [PATCH 375/834] dwc_otg: Minimise header and fix build warnings Delete a large amount of unused declaration from "usb.h", some of which were causing build warnings, and get the module building cleanly. @@ -191712,10 +191646,10 @@ index e55ea9c74be4..76e94b4ebb43 100644 2.18.4 -From 53cf29baadb5f38feba278cc1e69c8ed1b7ec3dd Mon Sep 17 00:00:00 2001 +From 48f6bdbc5c0d8686d1c543ad356846812ebc4f7f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:10:04 +0000 -Subject: [PATCH 377/803] gpio-fsm: Fix a build warning +Subject: [PATCH 376/834] gpio-fsm: Fix a build warning Signed-off-by: Phil Elwell --- @@ -191740,10 +191674,10 @@ index eb8b4d58d2d0..2cab50e51315 100644 2.18.4 -From 442ffc5a0a745325ee8ce5c8394e570261298dca Mon Sep 17 00:00:00 2001 +From 58fb5e4be7f24c7c0e99ea2388fe0590d165b295 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:10:40 +0000 -Subject: [PATCH 378/803] rpivid_h625: Fix build warnings +Subject: [PATCH 377/834] rpivid_h625: Fix build warnings Signed-off-by: Phil Elwell --- @@ -191814,10 +191748,10 @@ index b677910e237c..fc3caed58187 100644 2.18.4 -From 077fd141792d85a245334bfb4ac80524388c3379 Mon Sep 17 00:00:00 2001 +From 3a349a34075bcc7657cb9086c087f5af9ecb181f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:12:22 +0000 -Subject: [PATCH 379/803] bcm2708_fb: Fix a build warning +Subject: [PATCH 378/834] bcm2708_fb: Fix a build warning Signed-off-by: Phil Elwell --- @@ -191842,10 +191776,10 @@ index dac5c021ce52..365c5b96b8a0 100644 2.18.4 -From fe80abfaa69c5a2c334dcf06e044d56395f77070 Mon Sep 17 00:00:00 2001 +From eda4c1320627f6e1ea7d177dcc3e847800da423a Mon Sep 17 00:00:00 2001 From: David Knell Date: Wed, 28 Oct 2020 14:18:42 +0000 -Subject: [PATCH 380/803] PiFi-40 defconfigs +Subject: [PATCH 379/834] PiFi-40 defconfigs Signed-off-by: David Knell --- @@ -191920,10 +191854,10 @@ index 6247c74639f7..bc02ce537715 100644 2.18.4 -From 03a37a505d6a1f2fa4680021689c98fa7ff252c9 Mon Sep 17 00:00:00 2001 +From 0bfc9ba676f7daf304a484e907e5d33bbdd1bef8 Mon Sep 17 00:00:00 2001 From: David Knell Date: Wed, 28 Oct 2020 14:20:56 +0000 -Subject: [PATCH 381/803] PiFi-40 Devicetree files +Subject: [PATCH 380/834] PiFi-40 Devicetree files Signed-off-by: David Knell --- @@ -192022,10 +191956,10 @@ index 000000000000..51a20e54977f 2.18.4 -From 4de07a4dbb0500090e50e1dbc1c17ceffc29e61d Mon Sep 17 00:00:00 2001 +From 49a8dabcc4e03cd42551004e6670e626c0a2113b Mon Sep 17 00:00:00 2001 From: David Knell Date: Wed, 28 Oct 2020 14:21:37 +0000 -Subject: [PATCH 382/803] PiFi-40 driver, Makefile and Kconfig +Subject: [PATCH 381/834] PiFi-40 driver, Makefile and Kconfig Signed-off-by: David Knell --- @@ -192365,10 +192299,10 @@ index 000000000000..ae699fb0485c 2.18.4 -From c335a3061f7640201903e85e101ed01d44bc5eae Mon Sep 17 00:00:00 2001 +From 77de4ab00bfd2aa8bb2a8542ecfc1abf707b56eb Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 27 Oct 2020 12:24:14 +0000 -Subject: [PATCH 383/803] bcm2835-pcm: Fix up multichannel pcm audio +Subject: [PATCH 382/834] bcm2835-pcm: Fix up multichannel pcm audio Fixes: a9c1660ff5f02d048c5f31abf1fd1108ccf9ef87 Signed-off-by: Dom Cobley @@ -192426,10 +192360,10 @@ index 3c0033101e6e..fa5cf5b9550f 100644 2.18.4 -From b93c9341becd590037a1fa2e9f67d79e5a2943d7 Mon Sep 17 00:00:00 2001 +From c9ebb73cb3bf7cb567931007fd1ce6085f706d85 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 22 Oct 2020 15:30:55 +0100 -Subject: [PATCH 384/803] watchdog: bcm2835: Ignore params after the partition +Subject: [PATCH 383/834] watchdog: bcm2835: Ignore params after the partition number Use sscanf to extract the partition number and ignore extra parameters @@ -192461,10 +192395,10 @@ index 62937e6f83ca..de25e3682f03 100644 2.18.4 -From 034ab45a7b35d5e27c92fcc01d9e6873e2beabed Mon Sep 17 00:00:00 2001 +From dc921b887feec4dda2b12eed443d08bc02873dab Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 20 Oct 2020 11:55:37 +0100 -Subject: [PATCH 385/803] firmware: raspberrypi: Add support for tryonce reboot +Subject: [PATCH 384/834] firmware: raspberrypi: Add support for tryonce reboot flag Define a new mailbox (SET_REBOOT_FLAGS) which may be used to @@ -192541,10 +192475,10 @@ index 05c6989ec4c6..6b393bbe7f52 100644 2.18.4 -From a640cfd7a296849454466b5cd9868b3328042001 Mon Sep 17 00:00:00 2001 +From f6aad75af10d7845e4c41b15f6c6f42c4406e10d Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:00:41 +0100 -Subject: [PATCH 386/803] phy: broadcom: split out the BCM54213PE from the +Subject: [PATCH 385/834] phy: broadcom: split out the BCM54213PE from the BCM54210E IDs The last nibble is a revision ID, and the 54213pe is a later rev @@ -192619,10 +192553,10 @@ index 54665952d6ad..92948c26da2a 100644 2.18.4 -From e306dac416afba8acf6c4483a929a93a6f68fc7d Mon Sep 17 00:00:00 2001 +From e03e89a80b476671c09d0be7559740b53922a1f0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 29 Oct 2020 14:10:56 +0000 -Subject: [PATCH 387/803] phy: broadcom: Add bcm54213pe configuration +Subject: [PATCH 386/834] phy: broadcom: Add bcm54213pe configuration Signed-off-by: Phil Elwell --- @@ -192659,10 +192593,10 @@ index 671517aae345..8b0ac38742d0 100644 2.18.4 -From 72b8ae0fc5dac4ca501810eba1d04794a9f4b2af Mon Sep 17 00:00:00 2001 +From 08ec7dc0e1185ac4cbd74d0add982aed92fb8831 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 2 Nov 2020 14:56:18 +0000 -Subject: [PATCH 388/803] configs: Add CONFIG_MAX31856=m +Subject: [PATCH 387/834] configs: Add CONFIG_MAX31856=m Enable support for MAX31856 temperature sensors. @@ -192741,10 +192675,10 @@ index bc02ce537715..680b51ab0642 100644 2.18.4 -From 9ff7540c75ecc069d913115450ffe17db969c187 Mon Sep 17 00:00:00 2001 +From a8057334bf56217f1e82701663d73c1958510c6b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 22 Oct 2020 17:11:12 +0100 -Subject: [PATCH 389/803] overlays: Add MAX31856 support to maxtherm overlay +Subject: [PATCH 388/834] overlays: Add MAX31856 support to maxtherm overlay Extend the maxtherm overlay with support for the MAX31856. The driver reads the thermocouple type from a property, which is much @@ -192851,10 +192785,10 @@ index 34d5727069ec..9964e246c14f 100644 2.18.4 -From 1afc3842abe31370fa2f0f1f1a8d0d1240296467 Mon Sep 17 00:00:00 2001 +From 473c2169a504c7e9111a54d277efda17b71e1c25 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2020 14:21:33 +0100 -Subject: [PATCH 390/803] ARM: dts: Add bcm2711-rpi-400.dts +Subject: [PATCH 389/834] ARM: dts: Add bcm2711-rpi-400.dts Signed-off-by: Phil Elwell --- @@ -193522,10 +193456,10 @@ index 000000000000..90c2b5a195d4 2.18.4 -From 4d7ae4b3de7810983690d122477db0ba945a1f14 Mon Sep 17 00:00:00 2001 +From 9008542bb3521ba35f405251838aefb3b29431e1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 4 Nov 2020 11:25:02 +0000 -Subject: [PATCH 391/803] overlays: Deprecate and delete the sdtweak overlay +Subject: [PATCH 390/834] overlays: Deprecate and delete the sdtweak overlay The sdtweak overlay has been superseded by the board-specific sd_* parameters such as sd_poll_once, sd_overclock etc. @@ -193647,10 +193581,10 @@ index 38157d2f9bf3..000000000000 2.18.4 -From c51d68b590f350647727bbe49900c0a8e61285dc Mon Sep 17 00:00:00 2001 +From c2ae0df0f34a6d2e8d03969da4f9fc56e09265fb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Nov 2020 11:39:35 +0000 -Subject: [PATCH 392/803] ARM: dts: bcm27xx: Remove enable_headphones setting +Subject: [PATCH 391/834] ARM: dts: bcm27xx: Remove enable_headphones setting The enable_headphones parameter of the snd_bcm2835 module is forced to 1 if enable_compat_alsa is 0, so setting them both on the kernel @@ -193735,7 +193669,7 @@ index 8989c00b03e5..d69d6a187e0c 100644 aliases { diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 74dce109a81b..42a0d5226e7c 100644 +index 3e67c2b634be..f4a8570397f9 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -322,7 +322,7 @@ @@ -193777,10 +193711,10 @@ index fa7b16040f36..49c69fdaef49 100644 2.18.4 -From 38c58d761a85a9f92a8fc3d612cb15f91dc35f8b Mon Sep 17 00:00:00 2001 +From 587fa539fcb6a7026c6f2592974786276c9fb281 Mon Sep 17 00:00:00 2001 From: menschel Date: Fri, 6 Nov 2020 23:32:22 +0100 -Subject: [PATCH 393/803] configs: Add CAN_MCP251XFD=m and CAN_ISOTP=m +Subject: [PATCH 392/834] configs: Add CAN_MCP251XFD=m and CAN_ISOTP=m * Add mcp251xfd driver module to the RPi kernel builds. * Add isotp can protocol module to the RPi kernel builds. @@ -193872,10 +193806,10 @@ index 680b51ab0642..ff74c23ef24e 100644 2.18.4 -From 557a9f82bbe72c1460a5a67d6d74aa60c97948ac Mon Sep 17 00:00:00 2001 +From 2640d5b18990e3ebbbe03d7cbbf5af912728bad5 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 9 Nov 2020 19:49:32 +0000 -Subject: [PATCH 394/803] vc4_hdmi: Report that 3d/stereo is allowed +Subject: [PATCH 393/834] vc4_hdmi: Report that 3d/stereo is allowed Signed-off-by: Dom Cobley --- @@ -193898,10 +193832,10 @@ index 9e0aa45fafa2..c421cca29ff4 100644 2.18.4 -From 9a76b95c6f1008eff3765a8677a35c8774e530a8 Mon Sep 17 00:00:00 2001 +From 91b5f8db639f169563e26135e38555eecaa624cb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 11 Nov 2020 17:08:33 +0000 -Subject: [PATCH 395/803] PCI: brcmstb: Restore initial fundamental reset +Subject: [PATCH 394/834] PCI: brcmstb: Restore initial fundamental reset [1] replaced a single reset function with a pointer to one of two implementations, but also removed the call asserting the reset @@ -193939,10 +193873,10 @@ index fea54f6fb7b1..bd0263d739c9 100644 2.18.4 -From f45d270dcb0bf2bb8b487e3818432988e7ae4e35 Mon Sep 17 00:00:00 2001 +From 36570bdfe580504fde265ce0f5013f5f1158a588 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 10 Nov 2020 20:04:08 +0000 -Subject: [PATCH 396/803] vc4: Clear unused infoframe packet RAM registers +Subject: [PATCH 395/834] vc4: Clear unused infoframe packet RAM registers Using a hdmi analyser the bytes in packet ram registers beyond the length were visible in the @@ -193990,10 +193924,10 @@ index c421cca29ff4..bbfd3e0358ed 100644 2.18.4 -From 520c1cd046ad0abf7a2b02aa68e2abd948d404fd Mon Sep 17 00:00:00 2001 +From c50b5e9a8eeed28696a3c3da9410524df1271c63 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Nov 2020 18:45:10 +0000 -Subject: [PATCH 397/803] Input: edt-ft5x06: Poll the device if no interrupt is +Subject: [PATCH 396/834] Input: edt-ft5x06: Poll the device if no interrupt is configured. Not all systems have the interrupt line wired up, so switch to @@ -194093,10 +194027,10 @@ index 6ff81d48da86..7e8acc0c19be 100644 2.18.4 -From 530ebb188ba221c3bce978b307021a8a3266d2c6 Mon Sep 17 00:00:00 2001 +From 6f2bf7d71bdd079de2dbe57b54da51041e13bd31 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Nov 2020 18:52:25 +0000 -Subject: [PATCH 398/803] dtoverlays: Add an overlay for the EDT FT5406 +Subject: [PATCH 397/834] dtoverlays: Add an overlay for the EDT FT5406 touchscreen This touchscreen controller is used by the 7" DSI panel, and @@ -194200,10 +194134,10 @@ index 000000000000..407af59bf468 2.18.4 -From ee9fa0122a08c2e5b23f87daf1cdb787b3f14dfa Mon Sep 17 00:00:00 2001 +From c65a82c816b4bd3377fd92575d136efc4345b71b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 23 Apr 2020 10:17:18 +0100 -Subject: [PATCH 399/803] drm/panel/raspberrypi-touchscreen: Use independent +Subject: [PATCH 398/834] drm/panel/raspberrypi-touchscreen: Use independent I2C actions with delay. We now have the hardware I2C controller pinmuxed to the drive the @@ -194220,7 +194154,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c -index 5e9ccefb88f6..7ebb5ee2a47d 100644 +index bbdd086be7f5..057263c89998 100644 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c @@ -219,7 +219,35 @@ static struct rpi_touchscreen *panel_to_ts(struct drm_panel *panel) @@ -194264,10 +194198,10 @@ index 5e9ccefb88f6..7ebb5ee2a47d 100644 2.18.4 -From 2c0b6d9580c3d57205935ee6846f460a614e69e8 Mon Sep 17 00:00:00 2001 +From 176b974d95f35350426d53cfb614be5de866c2f2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 10 Nov 2020 11:21:56 +0000 -Subject: [PATCH 400/803] drm/panel/raspberrypi-ts: Insert delay before polling +Subject: [PATCH 399/834] drm/panel/raspberrypi-ts: Insert delay before polling for startup state In switching to the hardware I2C controller there is an issue @@ -194281,7 +194215,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c -index 7ebb5ee2a47d..abb8a8586b6f 100644 +index 057263c89998..804bdcc978dd 100644 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c @@ -299,6 +299,7 @@ static int rpi_touchscreen_enable(struct drm_panel *panel) @@ -194296,10 +194230,10 @@ index 7ebb5ee2a47d..abb8a8586b6f 100644 2.18.4 -From b750fa1ed6e1da497e526b65f810923dc1d4f91c Mon Sep 17 00:00:00 2001 +From 3f8ce4c24c0394035aade2de6914b4141c7ae4b3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 10 Nov 2020 17:49:35 +0000 -Subject: [PATCH 401/803] Add devicetree support for RaspberryPi 7" panel over +Subject: [PATCH 400/834] Add devicetree support for RaspberryPi 7" panel over DSI I2C Signed-off-by: Dave Stevenson @@ -194407,10 +194341,10 @@ index 000000000000..086f4ffd633a 2.18.4 -From 83af2d88c94ef9964f11af87adfca775bd4f4b27 Mon Sep 17 00:00:00 2001 +From fba3cb5b99b4116784f35a581d3bb277e406e9e6 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 15 Nov 2019 00:54:07 +0100 -Subject: [PATCH 402/803] mcp251xfd: add overlay +Subject: [PATCH 401/834] mcp251xfd: add overlay Signed-off-by: Marc Kleine-Budde --- @@ -194701,10 +194635,10 @@ index 000000000000..65c861bbd340 2.18.4 -From b3b903e4cde3e5445d35009a89d6abb34aa4cfde Mon Sep 17 00:00:00 2001 +From 037cd644c52806c8c3cca05511cda1f4297005ab Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 23 Nov 2020 14:53:14 +0000 -Subject: [PATCH 403/803] configs: Regenerate the defconfigs +Subject: [PATCH 402/834] configs: Regenerate the defconfigs The CAN_ISOTP setting was in the wrong position, and it's better for bisecting and reverting if this doesn't get rolled into the next @@ -194816,10 +194750,10 @@ index ff74c23ef24e..6939accc59bf 100644 2.18.4 -From 3b986136b82e2730b777c0a1adce7187ec58d555 Mon Sep 17 00:00:00 2001 +From 0127f7f5ed5c6fb8a40300dc35972facba64d3bf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 23 Nov 2020 14:56:18 +0000 -Subject: [PATCH 404/803] configs: Restore BRIDGE_NETFILTER=m +Subject: [PATCH 403/834] configs: Restore BRIDGE_NETFILTER=m CONFIG_BRIDGE_NETFILTER=m used to be the default when CONFIG_NETFILTER was enabled, but that was removed in 5.9. The way that defconfigs work @@ -194901,10 +194835,10 @@ index 6939accc59bf..88ae301afcb4 100644 2.18.4 -From 71beae161025bda0f09d6497ea2ad62d0d59f1f7 Mon Sep 17 00:00:00 2001 +From 945a0316600bd2fddced8879b84d1e873b6bf2fb Mon Sep 17 00:00:00 2001 From: MichaIng Date: Mon, 23 Nov 2020 16:17:31 +0100 -Subject: [PATCH 405/803] configs: Enable WireGuard kernel module on armhf +Subject: [PATCH 404/834] configs: Enable WireGuard kernel module on armhf configs CONFIG_WIREGUARD=m implies CONFIG_ARM_CRYPTO=y, hence the latter is removed. @@ -194980,10 +194914,10 @@ index d8484c28caed..77c400a1ecd9 100644 2.18.4 -From 546babdacbec57d60acc363c364440ce534ead14 Mon Sep 17 00:00:00 2001 +From a81b425000643c31cac92aa0f4b697e5ceee56ae Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Sun, 22 Nov 2020 11:01:08 +0000 -Subject: [PATCH 406/803] media: ov9281: Add 1280x720 and 640x480 modes +Subject: [PATCH 405/834] media: ov9281: Add 1280x720 and 640x480 modes Breaks out common register set and adds the different registers for 1280x720 (cropped) and 640x480 (skipped) modes @@ -195195,10 +195129,10 @@ index 9610c24ceff1..12621c2dccd5 100644 2.18.4 -From 90069603168bc9343e4f1939d5c51a8ef98d3575 Mon Sep 17 00:00:00 2001 +From 512b757b76520bdc230e491709069851c0e0643b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Nov 2020 17:18:01 +0000 -Subject: [PATCH 407/803] drm/vc4: Add support for DSI0 +Subject: [PATCH 406/834] drm/vc4: Add support for DSI0 DSI0 was partially supported, but didn't register with the main driver, and the code was inconsistent as to whether it checked @@ -195276,10 +195210,10 @@ index eaf276978ee7..1680adf9fe31 100644 2.18.4 -From dc1f4be5ef7b0bddb280fc845c17480e94c31757 Mon Sep 17 00:00:00 2001 +From 606e0c99caddba58a05200e71f0d14a43f8a2e88 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 12 Nov 2020 17:01:52 +0000 -Subject: [PATCH 408/803] dt-bindings: Add compatible for BCM2711 DSI1 +Subject: [PATCH 407/834] dt-bindings: Add compatible for BCM2711 DSI1 DSI1 on BCM2711 doesn't require the DMA workaround that is used on BCM2835/6/7, therefore it needs a new compatible string. @@ -195305,10 +195239,10 @@ index eb44e072b6e5..90ee069ada8d 100644 2.18.4 -From 93f20124df7000b7e41699515eda660ba378bffb Mon Sep 17 00:00:00 2001 +From 34c2a35f0fcf0f0c3de182cc0c5e05f8883941fa Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 12 Nov 2020 17:18:13 +0000 -Subject: [PATCH 409/803] drm/vc4: Add configuration for BCM2711 DSI1. +Subject: [PATCH 408/834] drm/vc4: Add configuration for BCM2711 DSI1. BCM2711 DSI1 doesn't have the issue with the ARM not being able to write to the registers, therefore remove the DMA @@ -195350,10 +195284,10 @@ index 1680adf9fe31..0cd40d31e82d 100644 2.18.4 -From 9e3acf5993b015ec679f161503cabd55507c7441 Mon Sep 17 00:00:00 2001 +From 63bb961b057f845e61b59f0d52f6657e34195800 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 12 Nov 2020 18:42:30 +0000 -Subject: [PATCH 410/803] dt: Use compatible string for BCM2711 DSI1 +Subject: [PATCH 409/834] dt: Use compatible string for BCM2711 DSI1 Updates the compatible string for DSI1 on BCM2711 to differentiate it from BCM2835. @@ -195364,7 +195298,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 8ad6c3012fe3..7c2d374cb749 100644 +index 27c622ebee0d..9c615dd3715e 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -554,6 +554,7 @@ @@ -195379,10 +195313,10 @@ index 8ad6c3012fe3..7c2d374cb749 100644 2.18.4 -From e922ee7ef5ed9181390fdf5bee3cd8ff0b50bf4a Mon Sep 17 00:00:00 2001 +From c99c31fc8a8d3f9b5408aebcef2c27efa7dd1fc6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 30 Nov 2020 16:16:03 +0000 -Subject: [PATCH 411/803] drm/vc4: Correct DSI register definition +Subject: [PATCH 410/834] drm/vc4: Correct DSI register definition The DSI1_PHY_AFEC0_PD_DLANE1 and DSI1_PHY_AFEC0_PD_DLANE3 register definitions were swapped, so trying to use more than a single data @@ -195419,10 +195353,10 @@ index 0cd40d31e82d..bac5e07c05de 100644 2.18.4 -From 2adbe818368fc66ee3f266cb05bb6ef9f2569633 Mon Sep 17 00:00:00 2001 +From efc904f8221167b38b78c2ac3015e009fae207cf Mon Sep 17 00:00:00 2001 From: Sudeep Date: Fri, 23 Oct 2020 15:47:17 +0530 -Subject: [PATCH 412/803] Allo boss2 driver +Subject: [PATCH 411/834] Allo boss2 driver Signed-off-by: Sudeep --- @@ -196615,10 +196549,10 @@ index 000000000000..5ad7f16964aa 2.18.4 -From 04db23dc50858e2b02c16fdf7aefb5498b10360b Mon Sep 17 00:00:00 2001 +From e5f22813a152ec3eead82fa347fefe3d202e7efa Mon Sep 17 00:00:00 2001 From: Sudeep Date: Fri, 23 Oct 2020 15:51:15 +0530 -Subject: [PATCH 413/803] Add allo boss2 overlay +Subject: [PATCH 412/834] Add allo boss2 overlay Signed-off-by: Sudeep --- @@ -196724,10 +196658,10 @@ index 000000000000..a6adfb495eb9 2.18.4 -From dc440fcb4f13eeb98760bfea54d6e822bc9d80ce Mon Sep 17 00:00:00 2001 +From 7ad181956150e839280e54809685d703df5da708 Mon Sep 17 00:00:00 2001 From: Sudeep Date: Fri, 23 Oct 2020 15:52:38 +0530 -Subject: [PATCH 414/803] Add allo boss2 config +Subject: [PATCH 413/834] Add allo boss2 config Signed-off-by: Sudeep --- @@ -196802,10 +196736,10 @@ index 88ae301afcb4..2359f9c08650 100644 2.18.4 -From 32614666de89212df7f533cd6e58b2ac860f3da4 Mon Sep 17 00:00:00 2001 +From 8da6382ef982ea0ca051664645e747a8f4fd7ee5 Mon Sep 17 00:00:00 2001 From: paul-1 <6473457+paul-1@users.noreply.github.com> Date: Wed, 4 Nov 2020 19:17:48 -0500 -Subject: [PATCH 415/803] Overlay: Update Allo Piano Plus dac driver for 5.4.y +Subject: [PATCH 414/834] Overlay: Update Allo Piano Plus dac driver for 5.4.y kernels. Create unique names for the two instances of the codec driver. @@ -196838,10 +196772,10 @@ index 374c553db062..d47a35def4f7 100644 2.18.4 -From 8db1029a5df30784597b66b866b2e02db29ce99a Mon Sep 17 00:00:00 2001 +From dd04d5f6dd13fffb81f721b091b4e2e57a180cda Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 2 Dec 2020 15:22:23 +0000 -Subject: [PATCH 416/803] media: bcm2835-unicam: Correctly handle error +Subject: [PATCH 415/834] media: bcm2835-unicam: Correctly handle error propagation for stream on On a failure in start_streaming(), the error code would not propagate to @@ -196871,10 +196805,10 @@ index 6501fb205e20..c13a0a20fd12 100644 2.18.4 -From 439f2b56731b44d01081bc695040b01ea6e098ec Mon Sep 17 00:00:00 2001 +From 86ece89ab045205d7e2651a1c01137c0f332cf2d Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 2 Dec 2020 15:26:09 +0000 -Subject: [PATCH 417/803] media: bcm2835-unicam: Return early from +Subject: [PATCH 416/834] media: bcm2835-unicam: Return early from stop_streaming() if stopped clk_disable_unprepare() is called unconditionally in stop_streaming(). @@ -196941,10 +196875,10 @@ index c13a0a20fd12..60309de02369 100644 2.18.4 -From a85d94d15a142e27cd7080a59a42fcaa1e8484aa Mon Sep 17 00:00:00 2001 +From 7321065c173b611b7451601f77ef7177492ba536 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 2 Dec 2020 16:48:41 +0000 -Subject: [PATCH 418/803] media: bcm2835-unicam: Clear clock state when +Subject: [PATCH 417/834] media: bcm2835-unicam: Clear clock state when stopping streaming Commit 65e08c465020d4c5b51afb452efc2246d80fd66f failed to clear the @@ -196972,10 +196906,10 @@ index 60309de02369..a8b3f5433f04 100644 2.18.4 -From 52e3f0a20d64bba84bef1488bd7a9924e7a27dae Mon Sep 17 00:00:00 2001 +From 86dadbe88e5032c43e977535ddfdedcf184dc872 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 3 Dec 2020 13:44:42 +0000 -Subject: [PATCH 419/803] PCI: brcmstb: Advertise MSI-X support +Subject: [PATCH 418/834] PCI: brcmstb: Advertise MSI-X support Although the BRCMSTB PCIe interface doesn't technically support the MSI-X spec, in practise it seems to work provided no more than 32 @@ -197005,10 +196939,10 @@ index bd0263d739c9..840f264f7a9b 100644 2.18.4 -From eda63ec0ac29ce58798290dc3a645a95f8ca13b9 Mon Sep 17 00:00:00 2001 +From 8953df0508a3545bf05a8077f63a5984fe0b2728 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 09:35:57 +0000 -Subject: [PATCH 420/803] ARM: dts: CM4 audio pins are not connected +Subject: [PATCH 419/834] ARM: dts: CM4 audio pins are not connected Signed-off-by: Phil Elwell --- @@ -197032,10 +196966,10 @@ index 49c69fdaef49..dbe8afe9ac5f 100644 2.18.4 -From a81f47a6f239083732710b25e95f44cfce983409 Mon Sep 17 00:00:00 2001 +From cff742a9ec5b561e2be8f5b8dd68e64e6b90409b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 08:33:19 +0000 -Subject: [PATCH 421/803] configs: Add RTC_DRV_PCF85063=m +Subject: [PATCH 420/834] configs: Add RTC_DRV_PCF85063=m Include the driver module for the PCF85063 and PCF85063A RTC devices. @@ -197112,10 +197046,10 @@ index 2359f9c08650..5d6f27ec87f6 100644 2.18.4 -From 4e6939149071c955cfb64725297eb8d30999e9df Mon Sep 17 00:00:00 2001 +From 18c4551ba5202e7cc8bc7f6e83b3121ae1089b27 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 08:49:53 +0000 -Subject: [PATCH 422/803] overlays: Add PCF85063 and PCF85063A to i2c-rtc +Subject: [PATCH 421/834] overlays: Add PCF85063 and PCF85063A to i2c-rtc Add support for the PCF85063 and PCF85063A RTC devices to the i2c-rtc overlay. @@ -197459,10 +197393,10 @@ index 735ca303e4fa..759f532d5be1 100644 2.18.4 -From 2d2f1805fa0d129c286871e92f116dd809221990 Mon Sep 17 00:00:00 2001 +From 246ff7e6a2718e9676226a14fe138a3032378d36 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 17:18:39 +0000 -Subject: [PATCH 423/803] overlays: Fix cut-and-paste error in README +Subject: [PATCH 422/834] overlays: Fix cut-and-paste error in README Signed-off-by: Phil Elwell --- @@ -197489,10 +197423,10 @@ index d4cf4176a54b..2fa2bbb943cd 100644 2.18.4 -From 3844e361d651e79803a78251c27beb336ed0762f Mon Sep 17 00:00:00 2001 +From 738ed6b290ca5c6e4e90545bb9857cbfec888a42 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 4 Nov 2020 18:31:02 +0000 -Subject: [PATCH 424/803] staging/bcm2835-codec: Ensure OUTPUT timestamps are +Subject: [PATCH 423/834] staging/bcm2835-codec: Ensure OUTPUT timestamps are always forwarded The firmware by default tries to ensure that decoded frame @@ -197550,10 +197484,10 @@ index 5b596b5c057f..efda4dc039c3 100644 2.18.4 -From 43f57c2b6f429fb18cdba87c3e90feffade654ae Mon Sep 17 00:00:00 2001 +From 81b0f408f101cdf689eeed9033f3b8b3df75d01b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Dec 2020 16:38:37 +0000 -Subject: [PATCH 425/803] net: lan78xx: Ack pending PHY ints when resetting +Subject: [PATCH 424/834] net: lan78xx: Ack pending PHY ints when resetting lan78xx_link_reset explicitly clears the MAC's view of the PHY's IRQ status. In doing so it potentially leaves the PHY with a pending @@ -197588,10 +197522,10 @@ index 58f5b90f11d4..3cf5ad0bf0c1 100644 2.18.4 -From b1f90f772e54628f5cf014e2c17c9214b317d3c6 Mon Sep 17 00:00:00 2001 +From 1d282c1d9c1d010d00226eb1aba86c2b648a599c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Dec 2020 17:02:17 +0000 -Subject: [PATCH 426/803] overlays: mpu6050: Add 'addr' parameter +Subject: [PATCH 425/834] overlays: mpu6050: Add 'addr' parameter The mpu6050 starts up at address 0x68 by default, but can be set to 0x69 if the ADO pin is pulled high. Give the overlay an addr parameter @@ -197632,10 +197566,10 @@ index 3109d90562ae..1b4c06535687 100644 2.18.4 -From 9ecc197a646c34c9649388cbb2d98aa657740787 Mon Sep 17 00:00:00 2001 +From 233c2280c1ae30163aa0f5c8cd2d775d3b208362 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 15 Dec 2020 16:26:51 +0000 -Subject: [PATCH 427/803] drm/vc4: Make normalize_zpos conditional on using +Subject: [PATCH 426/834] drm/vc4: Make normalize_zpos conditional on using fkms Eric's view was that there was no point in having zpos @@ -197667,10 +197601,10 @@ index 65513a90d606..5d0974cdeaaa 100644 2.18.4 -From 8a9e4493a351b40904da994eef2db92d72bc0192 Mon Sep 17 00:00:00 2001 +From 4d2ee7561f9e18be170cde75ad9079e6759d6b17 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 16 Dec 2020 09:28:17 +0000 -Subject: [PATCH 428/803] overlays: Add missing addresses to ads1015/ads1115 +Subject: [PATCH 427/834] overlays: Add missing addresses to ads1015/ads1115 The overlays for the ads1015 and ads1115 I2C ADCs omitted the addresses in the main device node names. As well as breaking the conventions for @@ -197716,10 +197650,10 @@ index 4fc571c2db33..e44ced704ee2 100644 2.18.4 -From ea2a2413b482d353746e3e0945198520341631e2 Mon Sep 17 00:00:00 2001 +From 010505b4867fa1b316f676982935df4123e4d213 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 9 Dec 2020 11:30:12 +0000 -Subject: [PATCH 429/803] media: i2c: imx477: Selection compliance fixes +Subject: [PATCH 428/834] media: i2c: imx477: Selection compliance fixes To comply with the intended usage of the V4L2 selection target when used to retrieve a sensor image properties, adjust the rectangles @@ -197802,10 +197736,10 @@ index 3fbb173fa079..f68e7718b09c 100644 2.18.4 -From 7b4e9db20b96f4903322f37a437e7cb9a51c5621 Mon Sep 17 00:00:00 2001 +From ec19d6c4cd4a573fbc581539ca34247f17c030de Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Sun, 13 Dec 2020 16:45:58 +0000 -Subject: [PATCH 430/803] staging/vc04_services/codec: Add support for CID +Subject: [PATCH 429/834] staging/vc04_services/codec: Add support for CID MPEG_HEADER_MODE Control V4L2_CID_MPEG_VIDEO_HEADER_MODE controls whether the encoder @@ -197872,10 +197806,10 @@ index 3791ab4b4244..c368246cbb6a 100644 2.18.4 -From 6a0f1289e8ce0746910d4c03ff1622b0dc0ddef0 Mon Sep 17 00:00:00 2001 +From d6fc0c22328c151ac7d219e21eb55db3c6df9445 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Sun, 13 Dec 2020 16:54:43 +0000 -Subject: [PATCH 431/803] staging/vc04_services/codec: Clear last buf dequeued +Subject: [PATCH 430/834] staging/vc04_services/codec: Clear last buf dequeued flag on START It appears that the V4L2 M2M framework requires the driver to manually @@ -197915,10 +197849,10 @@ index c368246cbb6a..9673d807ca67 100644 2.18.4 -From 989d0096cae592b9543bda4231b82a01ff2a7a53 Mon Sep 17 00:00:00 2001 +From 7ebf24ee4b0456fce47c6c79a61e67aa1df1dffe Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 8 Oct 2020 14:44:08 +0200 -Subject: [PATCH 432/803] drm/atomic: Pass the full state to CRTC atomic +Subject: [PATCH 431/834] drm/atomic: Pass the full state to CRTC atomic enable/disable Commit 351f950db4ab28c321a1bd4b92e4bb03e34c4703 upstream. @@ -199188,10 +199122,10 @@ index 4efec30f8bad..bde42988c4b5 100644 2.18.4 -From 29dcfbfba4fb8a6c5269a78d8104bb306d0c0097 Mon Sep 17 00:00:00 2001 +From e5d7f6cc9884c03541286d44da560e4942576288 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 28 Oct 2020 13:32:21 +0100 -Subject: [PATCH 433/803] drm/atomic: Pass the full state to CRTC atomic_check +Subject: [PATCH 432/834] drm/atomic: Pass the full state to CRTC atomic_check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -199390,7 +199324,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max 30 files changed, 168 insertions(+), 110 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index 6eb308670f48..fc826d3bc47e 100644 +index bc9df3f216f5..0076470cdf64 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5601,17 +5601,19 @@ static void dm_update_crtc_active_planes(struct drm_crtc *crtc, @@ -200279,10 +200213,10 @@ index bde42988c4b5..b97441deaf93 100644 2.18.4 -From df0163e4e2a3cff2b5564a8427fef68a6db37de1 Mon Sep 17 00:00:00 2001 +From 0a5d5bfbb6f6fbf7a687852304440717743d99cf Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 28 Oct 2020 13:32:22 +0100 -Subject: [PATCH 434/803] drm/atomic: Pass the full state to CRTC atomic begin +Subject: [PATCH 433/834] drm/atomic: Pass the full state to CRTC atomic begin and flush MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -201377,10 +201311,10 @@ index b97441deaf93..f2de050085be 100644 2.18.4 -From 1ee8ea51315acf704b16732418b525b8a36a4457 Mon Sep 17 00:00:00 2001 +From cc0d425ddf82ce5588dc9bc28539ba33b1d7c312 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 7 Dec 2020 16:57:11 +0100 -Subject: [PATCH 435/803] drm/vc4: hvs: Align the HVS atomic hooks to the new +Subject: [PATCH 434/834] drm/vc4: hvs: Align the HVS atomic hooks to the new API Since the CRTC setup in vc4 is split between the PixelValves/TXP and the @@ -201498,10 +201432,10 @@ index 9970f90e1fe3..22430640786f 100644 2.18.4 -From 504c3663c8dcb73dce6717f43e171169e747d58f Mon Sep 17 00:00:00 2001 +From a054151048e9f97ab29604f976646962859e2db5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 15 Dec 2020 16:42:36 +0100 -Subject: [PATCH 436/803] drm/vc4: Pass the atomic state to encoder hooks +Subject: [PATCH 435/834] drm/vc4: Pass the atomic state to encoder hooks We'll need to access the connector state in our encoder setup, so let's just pass the whole DRM state to our private encoder hooks. @@ -201669,10 +201603,10 @@ index bbfd3e0358ed..325d6baf65ce 100644 2.18.4 -From 082ddf7fcdf88dee69a43fac324f7b1c18d13707 Mon Sep 17 00:00:00 2001 +From 3a2b1267d999c2c4a1c88db7cc9aa6b9fb67aef4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 15 Dec 2020 16:42:38 +0100 -Subject: [PATCH 437/803] drm/vc4: hdmi: Don't access the connector state in +Subject: [PATCH 436/834] drm/vc4: hdmi: Don't access the connector state in reset if kmalloc fails drm_atomic_helper_connector_reset uses kmalloc which, from an API @@ -201710,10 +201644,10 @@ index 325d6baf65ce..004acd57389e 100644 2.18.4 -From e053d0a13cea49e9f8e240ca24a2a6c8f841b59f Mon Sep 17 00:00:00 2001 +From 9be1c71dde8c5249ca9b39c6cd285e1540b1e700 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 15 Dec 2020 16:42:39 +0100 -Subject: [PATCH 438/803] drm/vc4: hdmi: Create a custom connector state +Subject: [PATCH 437/834] drm/vc4: hdmi: Create a custom connector state When run with a higher bpc than 8, the clock of the HDMI controller needs to be adjusted. Let's create a connector state that will be used at @@ -201806,10 +201740,10 @@ index 1eb1fc0d95a3..c4f24e1f1b20 100644 2.18.4 -From 0f07ca1bb45c014291a0d4e0f7aeecf560317741 Mon Sep 17 00:00:00 2001 +From 8da153d322f9ab24fe5e5ec7c66c60c4c3756568 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 15 Dec 2020 16:42:40 +0100 -Subject: [PATCH 439/803] drm/vc4: hdmi: Store pixel frequency in the connector +Subject: [PATCH 438/834] drm/vc4: hdmi: Store pixel frequency in the connector state The pixel rate is for now quite simple to compute, but with more features @@ -201911,10 +201845,10 @@ index c4f24e1f1b20..71816aba852b 100644 2.18.4 -From 18340c10d1ecadc539fb03fcfcf7b27365394a85 Mon Sep 17 00:00:00 2001 +From 8aee7c9febd2a5bc2d6d9fb15ce4706b7c3127fd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 15 Dec 2020 16:42:41 +0100 -Subject: [PATCH 440/803] drm/vc4: hdmi: Use the connector state pixel rate for +Subject: [PATCH 439/834] drm/vc4: hdmi: Use the connector state pixel rate for the PHY The PHY initialisation parameters are not based on the pixel clock but @@ -202023,10 +201957,10 @@ index 057796b54c51..36535480f8e2 100644 2.18.4 -From 520450fd5cb98cb42315fc82dd15d3816ef27868 Mon Sep 17 00:00:00 2001 +From d29998eb5c79f1057cfcddb7ecf26905f0f8332e Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 15 Dec 2020 16:42:43 +0100 -Subject: [PATCH 441/803] drm/vc4: hdmi: Enable 10/12 bpc output +Subject: [PATCH 440/834] drm/vc4: hdmi: Enable 10/12 bpc output The BCM2711 supports higher bpc count than just 8, so let's support it in our driver. @@ -202236,10 +202170,10 @@ index 10dd6097f2b5..9e85266e53f5 100644 2.18.4 -From c42b70700531a3b2c704b011c94943e078358c8b Mon Sep 17 00:00:00 2001 +From 29ce375faabc654503165ccfdb503322417a2c17 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 1 Dec 2020 14:57:41 +0000 -Subject: [PATCH 442/803] drm/vc4: Fixup fkms for API change +Subject: [PATCH 441/834] drm/vc4: Fixup fkms for API change Atomic flush and check changed API, so fix up the downstream-only FKMS driver. @@ -202292,10 +202226,10 @@ index f83efe013a5b..44b1addeb22e 100644 2.18.4 -From 72c71ac3c78f23f897df1ae6d44e185c3b58a01e Mon Sep 17 00:00:00 2001 +From afee087ce1e62b22249f5f07750f24f4d24554ae Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Dec 2020 20:00:38 +0000 -Subject: [PATCH 443/803] overlays: Rebuild "upstream" with latest ovmerge +Subject: [PATCH 442/834] overlays: Rebuild "upstream" with latest ovmerge The latest ovmerge drops disabled fragments, causing the "upstream" overlay to change. @@ -202591,10 +202525,10 @@ index 6195e02bf9ff..e0f7cc8ba9ea 100644 2.18.4 -From 45a77173d09129c0975d93b453e9bc65f09fad49 Mon Sep 17 00:00:00 2001 +From 1b0412ac9608801c7778f65c5ab587d57365b06c Mon Sep 17 00:00:00 2001 From: menschel Date: Wed, 30 Dec 2020 21:55:34 +0100 -Subject: [PATCH 444/803] Add overlay for Seeed Studio CAN BUS FD HAT (#4034) +Subject: [PATCH 443/834] Add overlay for Seeed Studio CAN BUS FD HAT (#4034) This patch adds the overlay for the Seeed Studio CAN BUS FD HAT with two CAN FD Channels and an RTC. @@ -202819,10 +202753,10 @@ index 000000000000..e843d0b19745 2.18.4 -From c2b065ef7520feef1c0dd942c6c61ae31df4e8de Mon Sep 17 00:00:00 2001 +From 44c84e57f7dadeda21d58d9dbf0fb587afbaadec Mon Sep 17 00:00:00 2001 From: gesangtome Date: Fri, 1 Jan 2021 18:03:17 +0800 -Subject: [PATCH 445/803] vc-sm-cma: fixed kbuild problem +Subject: [PATCH 444/834] vc-sm-cma: fixed kbuild problem error logs: drivers/staging/vc04_services/vc-sm-cma/Kconfig:1:error: recursive dependency detected! @@ -202855,10 +202789,10 @@ index a7c1a7bf516e..5df9198cdab1 100644 2.18.4 -From 6ab40c02d787045848d4802687fe6e5221e31883 Mon Sep 17 00:00:00 2001 +From 23868ba19dfa95c03c66813f1689be3966f3e920 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Sat, 2 Jan 2021 10:51:58 +0000 -Subject: [PATCH 446/803] staging/vc04-services/codec: Fix logical precedence +Subject: [PATCH 445/834] staging/vc04-services/codec: Fix logical precedence issue Two issues identified with operator precedence in logical @@ -202897,10 +202831,10 @@ index 9673d807ca67..8a8f1e8db7d0 100644 2.18.4 -From 3b9247a41536ba05de421b60c8a3578678f83c77 Mon Sep 17 00:00:00 2001 +From 1a3b1f0fda2f902568b699f7f9e40704dbe23278 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 Jan 2021 10:43:20 +0000 -Subject: [PATCH 447/803] staging/vc04_services: Add additional unpacked raw +Subject: [PATCH 446/834] staging/vc04_services: Add additional unpacked raw formats Support has been added for the unpacked (16bpp) versions of @@ -202954,10 +202888,10 @@ index 8eb6334ee055..59f7ad3a5b3b 100644 2.18.4 -From d1b51423c2dc2aeff14055ac193ae06dfd2ff841 Mon Sep 17 00:00:00 2001 +From 27c789e13224f6dda75a8c9375fccb0ed63c9c2c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 Jan 2021 10:45:16 +0000 -Subject: [PATCH 448/803] staging/bcm2835-codec: Add the unpacked (16bpp) raw +Subject: [PATCH 447/834] staging/bcm2835-codec: Add the unpacked (16bpp) raw formats Now that the firmware supports the unpacked (16bpp) variants @@ -203127,10 +203061,10 @@ index 8a8f1e8db7d0..c883db63808f 100644 2.18.4 -From bea75bc633aa2059a0a5a25a9db398a3ea6e3430 Mon Sep 17 00:00:00 2001 +From 68efb72efb8e475456c8646e79318da0969bf78f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 Jan 2021 11:41:26 +0000 -Subject: [PATCH 449/803] staging/bcm2835-codec: Log the number of excess +Subject: [PATCH 448/834] staging/bcm2835-codec: Log the number of excess supported formats When logging that the firmware has provided more supported formats @@ -203176,10 +203110,10 @@ index c883db63808f..94691ab7175a 100644 2.18.4 -From 2ec3bf52ffd21763163870e5c02f83129cadf43a Mon Sep 17 00:00:00 2001 +From f70eec2a50aac6fc0d419fa9343b4ae0b7f69fb6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 Jan 2021 11:37:10 +0000 -Subject: [PATCH 450/803] staging/bcm2835-isp: Add the unpacked (16bpp) raw +Subject: [PATCH 449/834] staging/bcm2835-isp: Add the unpacked (16bpp) raw formats Now that the firmware supports the unpacked (16bpp) variants @@ -203358,10 +203292,10 @@ index 8bb3d115b27a..9a313ffcabf5 100644 2.18.4 -From 6be2d552460366852483c29daf49cb9bdc06037c Mon Sep 17 00:00:00 2001 +From b981e926616ba51cf727961c53e28850d34681dd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 Jan 2021 11:43:22 +0000 -Subject: [PATCH 451/803] staging/bcm2835-isp: Log the number of excess +Subject: [PATCH 450/834] staging/bcm2835-isp: Log the number of excess supported formats When logging that the firmware has provided more supported formats @@ -203393,10 +203327,10 @@ index 9a313ffcabf5..afac2ad65790 100644 2.18.4 -From a757155dd681b016f4590a8cfc17e04d0a2a3964 Mon Sep 17 00:00:00 2001 +From 825237df5b1bc3b21a37d252551de8e5cc134ea3 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 30 Dec 2020 14:51:29 +0000 -Subject: [PATCH 452/803] bcm2835-dma: Add bcm2835-dma: Add DMA_WIDE_SOURCE and +Subject: [PATCH 451/834] bcm2835-dma: Add bcm2835-dma: Add DMA_WIDE_SOURCE and DMA_WIDE_DEST flags Use (reserved) bits 24 and 25 of the dreq value @@ -203463,10 +203397,10 @@ index 0cbfa9d559a2..5517d2135168 100644 2.18.4 -From 66cf54d5a1f51314b061d17bddd1ac9a803da508 Mon Sep 17 00:00:00 2001 +From b53e9bca1145e3dbed57ee3c1e36fc53e69e8a2b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 11 Jan 2021 14:49:33 +0000 -Subject: [PATCH 453/803] bcm2835-dma: Move WAIT_RESP from extra to info +Subject: [PATCH 452/834] bcm2835-dma: Move WAIT_RESP from extra to info Questionable: Might want to drop Signed-off-by: popcornmix @@ -203494,10 +203428,10 @@ index 5517d2135168..8b97b9f10a1a 100644 2.18.4 -From 970c6dd12da1bda1d99a5efcfeafad35e5091cc5 Mon Sep 17 00:00:00 2001 +From 9b95c619ea627ce090ec1c9dccba307406bec524 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 6 Jan 2021 18:16:10 +0000 -Subject: [PATCH 454/803] bcm2835-dma: Avoid losing CS flags after interrupt +Subject: [PATCH 453/834] bcm2835-dma: Avoid losing CS flags after interrupt Signed-off-by: Dom Cobley --- @@ -203521,10 +203455,10 @@ index 8b97b9f10a1a..94a1b40b1645 100644 2.18.4 -From bcaa03dbf1ba94dcdd86025c05fa6c9bddf52e6b Mon Sep 17 00:00:00 2001 +From 37cd45b1c0b634091d14a653f0c397d0c86caca8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 11 Jan 2021 13:06:23 +0000 -Subject: [PATCH 455/803] dt: Enable DMA_WIDE_SOURCE and DMA_WIDE_DEST for hdmi +Subject: [PATCH 454/834] dt: Enable DMA_WIDE_SOURCE and DMA_WIDE_DEST for hdmi audio Signed-off-by: popcornmix @@ -203572,10 +203506,10 @@ index bd77ba3a3562..47b958428d0c 100644 2.18.4 -From efae70a1ea7d809685252c6ba0c8a8c948a17ff8 Mon Sep 17 00:00:00 2001 +From 9c1c2761feb581d27f0245f0f008d4c6f66347ec Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 6 Jan 2021 18:16:29 +0000 -Subject: [PATCH 456/803] bcm2711-rpi.dtsi: Bump hdmi audio dma panic priority +Subject: [PATCH 455/834] bcm2711-rpi.dtsi: Bump hdmi audio dma panic priority to max Set panic priority to 15 and leave normal priority at 0 @@ -203611,10 +203545,10 @@ index 3dbfd601ca39..8053ef54acc8 100644 2.18.4 -From ea23e52df284cd783b4f9bd9c8afffa34b9fb710 Mon Sep 17 00:00:00 2001 +From 1fb7782ddca9cde3a490b9813509dbcfb6a3921c Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Tue, 22 Dec 2020 14:27:46 +0900 -Subject: [PATCH 457/803] media: i2c: ov5647: Selection compliance fixes +Subject: [PATCH 456/834] media: i2c: ov5647: Selection compliance fixes To comply with the intended usage of the V4L2 selection target when used to retrieve a sensor image properties, adjust the rectangles @@ -203705,10 +203639,10 @@ index 86a821a172b3..40d0d45a2481 100644 2.18.4 -From c22fb89d8bcbb282d6fc27a9e8202b65024cbb2b Mon Sep 17 00:00:00 2001 +From 843a78cb1047238146f6ec667c4990d599ff5d1d Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 2 Jan 2021 21:08:59 +0100 -Subject: [PATCH 458/803] overlays: give Seeed Studio CAN BUS FD HAT a -v2 +Subject: [PATCH 457/834] overlays: give Seeed Studio CAN BUS FD HAT a -v2 postfix There are several versions of the Seeed Studio CAN BUS FD HAT. This is the @@ -203763,10 +203697,10 @@ rename to arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts 2.18.4 -From 0293c85b3ec9d0f8c45f2eae7c79344d5752552a Mon Sep 17 00:00:00 2001 +From f938b5e38831c5cd4e84dd3c138cb4e43d8a1580 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 2 Jan 2021 21:38:58 +0100 -Subject: [PATCH 459/803] overlays: Add overlay for Seeed Studio CAN BUS FD HAT +Subject: [PATCH 458/834] overlays: Add overlay for Seeed Studio CAN BUS FD HAT v1 (based on mcp2517fd) This patch adds the overlay for the Seeed Studio CAN BUS FD HAT v1 with two CAN @@ -203966,10 +203900,10 @@ index 000000000000..210d027a073e 2.18.4 -From fdd90c097e3f1e8fc5fa237edd7139ecda0a2244 Mon Sep 17 00:00:00 2001 +From dc8d544f7fc3aa02a03c1006fd2a7745b23254c9 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Sat, 2 Jan 2021 02:34:03 +0000 -Subject: [PATCH 460/803] overlays: add wm8960-soundcard overlay +Subject: [PATCH 459/834] overlays: add wm8960-soundcard overlay add overlay for waveshare wm8960 simple-audio-card @@ -204106,10 +204040,10 @@ index 000000000000..289fa4dacdf1 2.18.4 -From e56c92a921bbec9b5df4aaa0cc0f81df6eca287f Mon Sep 17 00:00:00 2001 +From bb1c5cb18511301e58313d2c2dc6227993a06094 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Sat, 26 Dec 2020 03:13:14 +0000 -Subject: [PATCH 461/803] overlays: add spi override to merus-amp overlay +Subject: [PATCH 460/834] overlays: add spi override to merus-amp overlay adds an override to the merus-amp overlay to turn the spi bus off @@ -204158,10 +204092,10 @@ index 4501fbdc253d..bbffd7d26324 100644 2.18.4 -From ba090ae60a2303d2e2f22e2c7311494ceadd7edc Mon Sep 17 00:00:00 2001 +From 87790206339f7551f39b017b4344d9e16c3cf356 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Jan 2021 17:28:57 +0000 -Subject: [PATCH 462/803] dt: Add a camera regulator node to all downstream Pi +Subject: [PATCH 461/834] dt: Add a camera regulator node to all downstream Pi platforms The current firmware fixup of camera sensor overlays is not @@ -204458,7 +204392,7 @@ index f972979281f5..6743c984a316 100644 &uart0 { diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 42a0d5226e7c..dae841ce309f 100644 +index f4a8570397f9..32e7af96aa83 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -319,6 +319,7 @@ @@ -204519,10 +204453,10 @@ index 000000000000..55237d03ed94 2.18.4 -From 9e6add64ea438b83920e9d1d7c87a38d32d96b8e Mon Sep 17 00:00:00 2001 +From 4e4940571444ced0cd62522a1d7a7aa0ceaf53a7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Jan 2021 17:42:31 +0000 -Subject: [PATCH 463/803] dtoverlays: Update sensor overlays to use cam1_reg +Subject: [PATCH 462/834] dtoverlays: Update sensor overlays to use cam1_reg where possible Update those overlays that use the regulator framework to use the @@ -204776,10 +204710,10 @@ index 40b298d3dd86..b7a9c8c539da 100644 2.18.4 -From ddb5300a173c5cf71f20e71ddcd8ebbd5bef5a1c Mon Sep 17 00:00:00 2001 +From ea77ad440eac14206882b0246194a169bc21d959 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 9 Jan 2021 17:03:32 +0100 -Subject: [PATCH 464/803] overlays: seeed-can-fd-hat: clarify how to identify +Subject: [PATCH 463/834] overlays: seeed-can-fd-hat: clarify how to identify HAT version It turns out the used CAN SPI chip is not a good way to identify the version of @@ -204827,10 +204761,10 @@ index 5076ca440742..bc889782a30b 100644 2.18.4 -From a881fb7d76f992b82b6607d7c141df403f1ea664 Mon Sep 17 00:00:00 2001 +From e4020a9a98fc192cc4b2d128d132198ef3c45bfb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 Jan 2021 21:25:38 +0000 -Subject: [PATCH 465/803] SQUASH: Revert: "overlays: Make the i2c-gpio overlay +Subject: [PATCH 464/834] SQUASH: Revert: "overlays: Make the i2c-gpio overlay safe again" This revert and its neighbour are opposites. When squashing, delete @@ -204859,10 +204793,10 @@ index 63231b5d7c0c..2323a61edf07 100644 2.18.4 -From cfbf467dfc9573e53375403e5bb439c3fd244938 Mon Sep 17 00:00:00 2001 +From a3f62605e088f2c77931370d102010c9a0accbb6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 Jan 2021 21:27:56 +0000 -Subject: [PATCH 466/803] SQUASH: Revert "overlays: Fix dtc warnings in +Subject: [PATCH 465/834] SQUASH: Revert "overlays: Fix dtc warnings in i2c-gpio" This reverts commit 1c15edc0dca002c8536e9f1f5e1ec43017815018. @@ -204893,10 +204827,10 @@ index 2323a61edf07..63231b5d7c0c 100644 2.18.4 -From c09d070a358e4c2081788e3c503eb52a3d1476a2 Mon Sep 17 00:00:00 2001 +From 64f95abf17036fa5cb7060f25508d3d289afe586 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Jan 2021 08:57:21 +0000 -Subject: [PATCH 467/803] configs: Enable BCM2835 thermal driver in kernel8 +Subject: [PATCH 466/834] configs: Enable BCM2835 thermal driver in kernel8 The arm64 version of bcm2711_defconfig is intended for Pi 4, but the Raspberry Pi OS kernel8.img built from it is also used for Pi 3. It is @@ -204927,10 +204861,10 @@ index 325ff25a243d..eeb52d96e26b 100644 2.18.4 -From a438c24f53d3b4c5b24d27f500a42933cf6e70ad Mon Sep 17 00:00:00 2001 +From a8d5f97e7b99be680d7ab42c644b31d3acc7ab1b Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 14 Jan 2021 09:18:42 +0000 -Subject: [PATCH 468/803] uapi: bcm2835-isp: Add colour denoise configuration +Subject: [PATCH 467/834] uapi: bcm2835-isp: Add colour denoise configuration Add a configuration structure for colour denoise to the bcm2835_isp driver. @@ -204989,10 +204923,10 @@ index cf8c0437f159..c50e3ca81565 100644 2.18.4 -From 3b0dbe1d58e886c34c5a40826b51cde5b1219167 Mon Sep 17 00:00:00 2001 +From e421341ebd045b43cf38542b3a32f3130b2d7f52 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 14 Jan 2021 09:20:52 +0000 -Subject: [PATCH 469/803] staging: vc04_services: ISP: Add colour denoise +Subject: [PATCH 468/834] staging: vc04_services: ISP: Add colour denoise control Add colour denoise control to the bcm2835 driver through a new v4l2 @@ -205074,10 +205008,10 @@ index efda4dc039c3..79438d23912f 100644 2.18.4 -From 836fe1c0c1edf0d5d6cf68d1455342de1f9c677f Mon Sep 17 00:00:00 2001 +From 0ec9b5471a180eb87d575e7b592fda012b5438c3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 21 Jan 2021 18:27:08 +0000 -Subject: [PATCH 470/803] configs: Add CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +Subject: [PATCH 469/834] configs: Add CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m Signed-off-by: popcornmix --- @@ -205152,10 +205086,10 @@ index 5d6f27ec87f6..5b6a5d59b394 100644 2.18.4 -From d26b1f161f317c1792cc0e4ccaae961793da49b3 Mon Sep 17 00:00:00 2001 +From 887cd4d88febf00069caad583118a4cd07516441 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Jan 2021 09:28:06 +0000 -Subject: [PATCH 471/803] configs: Add CONFIG_USB_NET_AQC111=m +Subject: [PATCH 470/834] configs: Add CONFIG_USB_NET_AQC111=m See: https://github.com/raspberrypi/linux/pull/4086 @@ -205232,10 +205166,10 @@ index 5b6a5d59b394..655b1d87720b 100644 2.18.4 -From 1db55b7463dcf7dc2d6ab0c534341989cf7943ed Mon Sep 17 00:00:00 2001 +From a43703bbd4db33f806cc4ad6093fcb1a987136e3 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 10 Dec 2020 19:22:45 +0100 -Subject: [PATCH 472/803] dt-bindings: nvmem: Add bindings for rmem driver +Subject: [PATCH 471/834] dt-bindings: nvmem: Add bindings for rmem driver Firmware/co-processors might use reserved memory areas in order to pass data stemming from an nvmem device otherwise non accessible to Linux. @@ -205314,10 +205248,10 @@ index 000000000000..29b53871aa02 2.18.4 -From 4a7d77e8efb12c0e8cc1bc1e4f0d0c43a8cc8144 Mon Sep 17 00:00:00 2001 +From d40ed4f4df89639b628132efc965f652cf098256 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 10 Dec 2020 12:13:49 +0100 -Subject: [PATCH 473/803] nvmem: Add driver to expose reserved memory as nvmem +Subject: [PATCH 472/834] nvmem: Add driver to expose reserved memory as nvmem Firmware/co-processors might use reserved memory areas in order to pass data stemming from an nvmem device otherwise non accessible to Linux. @@ -205490,10 +205424,10 @@ index b557a0fcd4ba..281856ac1988 100644 2.18.4 -From 93063e9be4918f7562db0f0032cde8e46897457a Mon Sep 17 00:00:00 2001 +From 234f7e273da2d5e717c1777b367f7e9fc699640a Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 11 Dec 2020 12:22:01 +0100 -Subject: [PATCH 474/803] ARM: dts: bcm2711: Add reserved memory template to +Subject: [PATCH 473/834] ARM: dts: bcm2711: Add reserved memory template to hold firmware configuration RPi4's co-processor will copy the board's bootloader[1] configuration @@ -205518,7 +205452,7 @@ Changes since v1: 1 file changed, 17 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index dae841ce309f..22c562d4196a 100644 +index 32e7af96aa83..b8339a629fb9 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -24,6 +24,7 @@ @@ -205556,10 +205490,10 @@ index dae841ce309f..22c562d4196a 100644 2.18.4 -From 1be1c27cffe6b3f91fa1bfd0fb2beb1342542711 Mon Sep 17 00:00:00 2001 +From 4f0c827f772d36ba60d351ee2e383bfd8049304b Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 11 Dec 2020 13:04:37 +0100 -Subject: [PATCH 475/803] arm64: defconfig: Enable nvmem's rmem driver +Subject: [PATCH 474/834] arm64: defconfig: Enable nvmem's rmem driver It'll be used by the RPi4 family of boards to access its bootloader configuration. @@ -205585,10 +205519,10 @@ index 5cfe3cf6f2ac..a9f496d74639 100644 2.18.4 -From 1006e33b129a7783fe9b7da62e2ff7f71c7b4ff8 Mon Sep 17 00:00:00 2001 +From e4b7e810796fe2bcd569113c8728e19c4fbf4f1b Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 11 Dec 2020 13:15:41 +0100 -Subject: [PATCH 476/803] ARM: multi_v7_defconfig: Enable nvmem's rmem driver +Subject: [PATCH 475/834] ARM: multi_v7_defconfig: Enable nvmem's rmem driver It'll be used by the RPi4 family of boards to access its bootloader configuration. @@ -205614,10 +205548,10 @@ index a611b0c1e540..ea2715c9f923 100644 2.18.4 -From ed402a8fad1e2ec8c92b15be167362959bc99272 Mon Sep 17 00:00:00 2001 +From e1ebc9da8e42e59fc0e13163e069e1e87e386629 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Jan 2021 12:08:19 +0000 -Subject: [PATCH 477/803] configs: Add NVMEM_RMEM=m for 2711 +Subject: [PATCH 476/834] configs: Add NVMEM_RMEM=m for 2711 Signed-off-by: Phil Elwell --- @@ -205653,10 +205587,10 @@ index 590a235f9e25..4c4068953a97 100644 2.18.4 -From 96dcbb898335698e24906847b06378ef68b5b9df Mon Sep 17 00:00:00 2001 +From 0ddfb0cc5e38093ab4f6944cb31a6bb3038ac077 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Jan 2021 16:15:06 +0000 -Subject: [PATCH 478/803] configs: Add CRYPTO_ADIANTUM=m +Subject: [PATCH 477/834] configs: Add CRYPTO_ADIANTUM=m See: https://github.com/raspberrypi/linux/issues/3648 @@ -205733,10 +205667,10 @@ index 655b1d87720b..1ca2f13a2af5 100644 2.18.4 -From 0a86a01f3a21ab1bd7c6d178eaf4c6520232f0ed Mon Sep 17 00:00:00 2001 +From b4da1aed4d109f96b05b7d2c77af24aa083724b2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 28 Jan 2021 11:30:04 +0000 -Subject: [PATCH 479/803] spi: bcm2835: Workaround/fix for zero-length +Subject: [PATCH 478/834] spi: bcm2835: Workaround/fix for zero-length transfers A relatively recent commit ([1]) contained optimisation for the PIO @@ -205765,10 +205699,10 @@ Signed-off-by: Phil Elwell 1 file changed, 10 insertions(+) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c -index 59cff9ea8bea..9a47313cab46 100644 +index 1240422970df..4f40d2b9d468 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c -@@ -1090,6 +1090,16 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr, +@@ -1092,6 +1092,16 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr, unsigned long hz_per_byte, byte_limit; u32 cs = bs->prepare_cs[spi->chip_select]; @@ -205784,15 +205718,15 @@ index 59cff9ea8bea..9a47313cab46 100644 + /* set clock */ spi_hz = tfr->speed_hz; - clk_hz = clk_get_rate(bs->clk); + -- 2.18.4 -From b5482e638f0ba18a56cc2e483e05be3312eeb0ac Mon Sep 17 00:00:00 2001 +From d7f70abee6a51d6e82eb90c2da1287a57b71516e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Jan 2021 10:34:11 +0000 -Subject: [PATCH 480/803] kbuild: Silence unavoidable dtc overlay warnings +Subject: [PATCH 479/834] kbuild: Silence unavoidable dtc overlay warnings Much effort has been put into finding ways to avoid warnings from dtc about overlays, usually to do with the presence of #address-cells and @@ -205826,10 +205760,10 @@ index 9c0df5bde46c..43758c8d4b68 100644 2.18.4 -From 48161d09abe13d3508b740c1239e1502add4f53c Mon Sep 17 00:00:00 2001 +From ceca79d8a06503f94bcc4aa680318839215b65d6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 1 Feb 2021 12:45:29 +0000 -Subject: [PATCH 481/803] configs: Enable CONFIG_MEDIA_CEC_RC +Subject: [PATCH 480/834] configs: Enable CONFIG_MEDIA_CEC_RC See: https://www.raspberrypi.org/forums/viewtopic.php?f=44&t=301072 --- @@ -205912,10 +205846,10 @@ index 1ca2f13a2af5..aa89eb5704cb 100644 2.18.4 -From 99278ee42e2d829b323b3546c040392f4a677639 Mon Sep 17 00:00:00 2001 +From 873e042c6a137a6d127b0a73d83c494cecd2d2bb Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Fri, 29 Jan 2021 08:26:44 +0100 -Subject: [PATCH 482/803] Adds the DT-overlays to support Hifiberry AMP100 +Subject: [PATCH 481/834] Adds the DT-overlays to support Hifiberry AMP100 Adds new DT-overlay to control AMP100. @@ -206055,10 +205989,10 @@ index 000000000000..ebdef55d6110 2.18.4 -From c46fb0d731f6bb2cd87286adce1782d02e572992 Mon Sep 17 00:00:00 2001 +From 73dd8c18fd5fe4433dfe3a09038b1a63d93b39c2 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Fri, 29 Jan 2021 16:16:39 +0100 -Subject: [PATCH 483/803] Enhances the Hifiberry DAC+ driver for Hifiberry +Subject: [PATCH 482/834] Enhances the Hifiberry DAC+ driver for Hifiberry AMP100 support Adds the necessary GPIO handling and ALSA mixer extensions. @@ -206299,10 +206233,10 @@ index 157ab4c2cc85..bdcac1b6992c 100644 2.18.4 -From 03d11ac50e982d840a5842b9404ffa7919a305f7 Mon Sep 17 00:00:00 2001 +From 995fad2a0649f90a0f4fd3664f64b36a40d8c694 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 3 Feb 2021 16:23:43 +0000 -Subject: [PATCH 484/803] ARM: dts: Declare Pi400 and CM4 have no audio pins +Subject: [PATCH 483/834] ARM: dts: Declare Pi400 and CM4 have no audio pins The audio_pins node is left as a placeholder for the audremap overlay, and it must have (empty) brcm,function and brcm,pins properties @@ -206348,10 +206282,10 @@ index 7ab0aba5f1a3..9ab2feb4424f 100644 2.18.4 -From 3b03dcb65ccfd05e7d1de2ec09c280a5da8cd264 Mon Sep 17 00:00:00 2001 +From 10dd8edb76e329907063c2bff7e41b31cf0432be Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 4 Feb 2021 17:29:32 +0000 -Subject: [PATCH 485/803] media: i2c: imx290: Replace V4L2_CID_GAIN with +Subject: [PATCH 484/834] media: i2c: imx290: Replace V4L2_CID_GAIN with V4L2_CID_ANALOGUE_GAIN Most software (including libcamera) requires V4L2_CID_ANALOGUE_GAIN, @@ -206392,10 +206326,10 @@ index 2e646fb01856..a2df46e4aabc 100644 2.18.4 -From 5df007083936dec43492b5594bff55c5987ecb10 Mon Sep 17 00:00:00 2001 +From 057e24700fe53daf4ebd1615e464bbae068bf559 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 4 Feb 2021 21:21:44 +0000 -Subject: [PATCH 486/803] media: i2c: imx290: Fix number of controls in +Subject: [PATCH 485/834] media: i2c: imx290: Fix number of controls in v4l2_ctrl_handler_init The number is only a hint, but may as well be correct. @@ -206426,10 +206360,10 @@ index a2df46e4aabc..33ce80686163 100644 2.18.4 -From 7e970b75bb409636603e981748d3ba4e3b524311 Mon Sep 17 00:00:00 2001 +From da2844424f8ee1266120cb351333ab30f1a4a2a9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Feb 2021 09:20:31 +0000 -Subject: [PATCH 487/803] i2c: bcm2835: Handle untimely DONE signal +Subject: [PATCH 486/834] i2c: bcm2835: Handle untimely DONE signal Under certain circumstance the DONE flag can appear to be set early. Fortunately the TA flag is often still set at that time, and it can be @@ -206495,10 +206429,10 @@ index 5b2589b6b9cc..90ca593d8ae3 100644 2.18.4 -From 839e0f7e09f0327ec7cf2de82b3c375218d2608d Mon Sep 17 00:00:00 2001 +From 41cf99f004a8d1a4e7e14c0df43d393c73d7fd27 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Feb 2021 12:04:06 +0000 -Subject: [PATCH 488/803] configs: Add MICREL_PHY=y +Subject: [PATCH 487/834] configs: Add MICREL_PHY=y Signed-off-by: Phil Elwell --- @@ -206534,10 +206468,10 @@ index 6acc0dbe9187..a2531896a8b6 100644 2.18.4 -From ad97ee76cb1717e3008c32c230c229e21f4837e6 Mon Sep 17 00:00:00 2001 +From 1ef4ba4442ae0f1ba89e1a2069bc759927c9b478 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 8 Dec 2020 17:13:32 +0100 -Subject: [PATCH 489/803] Revert "vc4_hdmi: Make irq shared" +Subject: [PATCH 488/834] Revert "vc4_hdmi: Make irq shared" This reverts commit cd59e087d8bba4ba834565b4d48ba983143b5f27. --- @@ -206562,10 +206496,10 @@ index ef08ecb11f1a..d2665ceae0fc 100644 2.18.4 -From aca13db7f88a04e7ec938ca5e8182f8966ddad7e Mon Sep 17 00:00:00 2001 +From 6ec57818316f164caf4ce1733cdd741ffc9a1659 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 8 Dec 2020 17:13:33 +0100 -Subject: [PATCH 490/803] Revert "vc4_hdmi_regs: Make interrupt mask variant +Subject: [PATCH 489/834] Revert "vc4_hdmi_regs: Make interrupt mask variant specific" This reverts commit 37c74a07cf22a7385c93170a723d22b95ff20a51. @@ -206674,10 +206608,10 @@ index 1f1ed7efaff7..78fd28599aeb 100644 2.18.4 -From 8c2f0ca7b37676e780a8200388ce157d665ab5d2 Mon Sep 17 00:00:00 2001 +From 74b02aee281eb7dcd5ccf777b6e56bf6fcd96f4a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 8 Dec 2020 17:13:35 +0100 -Subject: [PATCH 491/803] Revert "vc4_hdmi_regs: Add Intr2 register block" +Subject: [PATCH 490/834] Revert "vc4_hdmi_regs: Add Intr2 register block" This reverts commit c865bb1bb6b481acfa4157e4331db278a176f887. --- @@ -206805,10 +206739,10 @@ index 9e85266e53f5..20a1438a72cb 100644 2.18.4 -From 37efaf7e9992bceea057015276331ccf599c5b13 Mon Sep 17 00:00:00 2001 +From d414fd32efadf59063d09d2e960e497fa37457ec Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 8 Dec 2020 17:13:38 +0100 -Subject: [PATCH 492/803] Revert "vc4_hdmi: BCM2835 requires a fixed hsm clock +Subject: [PATCH 491/834] Revert "vc4_hdmi: BCM2835 requires a fixed hsm clock for CEC to work" This reverts commit 1cad24365e9f4325d68d4a16025f77abe3eda2f7. @@ -206928,10 +206862,10 @@ index b0ba2421cc04..f18f1d775241 100644 2.18.4 -From 8a9c21fa038d44626c3ff60833c5c14b4692e275 Mon Sep 17 00:00:00 2001 +From 56264c76d7ceac36f9b78ec6d57e69ef49ee8766 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jan 2021 15:22:55 +0100 -Subject: [PATCH 493/803] ARM: bcm: Select BRCMSTB_L2_IRQ for bcm2835 +Subject: [PATCH 492/834] ARM: bcm: Select BRCMSTB_L2_IRQ for bcm2835 The BCM2711 has a number of instances of interrupt controllers handled by the driver behind the BRCMSTB_L2_IRQ Kconfig option (irq-brcmstb-l2). @@ -206973,10 +206907,10 @@ index 5c4ac1c9f4e0..2c5620822895 100644 2.18.4 -From 87acbbdb2ace304d22f5fb707f5f0c657996c65d Mon Sep 17 00:00:00 2001 +From cc07675d9aad9d4f183c0ca117d5830bd6b16733 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jan 2021 15:23:02 +0100 -Subject: [PATCH 494/803] drm/vc4: hdmi: Introduce a CEC clock +Subject: [PATCH 493/834] drm/vc4: hdmi: Introduce a CEC clock While the BCM2835 had the CEC clock derived from the HSM clock, the BCM2711 has a dedicated parent clock for it. @@ -207041,10 +206975,10 @@ index f18f1d775241..c9b4b7678df4 100644 2.18.4 -From a7633e3ec391bf3fead6e5599ae8885dac11b01b Mon Sep 17 00:00:00 2001 +From f7ea939df063c576ed3e67960911759a0e69afc4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jan 2021 15:23:03 +0100 -Subject: [PATCH 495/803] drm/vc4: hdmi: Split the interrupt handlers +Subject: [PATCH 494/834] drm/vc4: hdmi: Split the interrupt handlers The BCM2711 has two different interrupt sources to transmit and receive CEC messages, provided through an external interrupt chip shared between @@ -207188,10 +207122,10 @@ index 574bbed72383..335a9574007d 100644 2.18.4 -From 84876b2c2a66f60399b6aee6c66cd8ad4f2fd6fd Mon Sep 17 00:00:00 2001 +From 5eead4fdf658de8d90b256db7ce536399b6f1bd1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jan 2021 15:23:04 +0100 -Subject: [PATCH 496/803] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup +Subject: [PATCH 495/834] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup The HDMI controller found in the BCM2711 has an external interrupt controller for the CEC and hotplug interrupt shared between the two @@ -207312,10 +207246,10 @@ index c9b4b7678df4..ae1be14812b8 100644 2.18.4 -From ebd3e2c174c4dba8fa2b2c7d0aa82ab7e84dc675 Mon Sep 17 00:00:00 2001 +From 5503e4ee78422d7411b43914515fe5cf7003b5dc Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 11 Jan 2021 15:23:05 +0100 -Subject: [PATCH 497/803] drm/vc4: hdmi: Remove cec_available flag +Subject: [PATCH 496/834] drm/vc4: hdmi: Remove cec_available flag Now that our HDMI controller supports CEC for the BCM2711, let's remove that flag. @@ -207368,10 +207302,10 @@ index ae1be14812b8..cb2af9f144df 100644 2.18.4 -From f0a44e377042394be66c808936d8c6fb21d068e5 Mon Sep 17 00:00:00 2001 +From b749b160a14db8b92c7180538e33065547b84d98 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jan 2021 15:23:06 +0100 -Subject: [PATCH 498/803] drm/vc4: hdmi: Don't register the CEC adapter if +Subject: [PATCH 497/834] drm/vc4: hdmi: Don't register the CEC adapter if there's no interrupts We introduced the BCM2711 support to the vc4 HDMI controller with 5.10, @@ -207411,10 +207345,10 @@ index 21b547c158b1..b39cc371abdf 100644 2.18.4 -From 31e3a697352ca3ec9e8931982924cd0bdda480c7 Mon Sep 17 00:00:00 2001 +From 46a52546bba97b2825ce48e32f5ba49fb760aafc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jan 2021 15:23:07 +0100 -Subject: [PATCH 499/803] dt-binding: display: bcm2711-hdmi: Add CEC and +Subject: [PATCH 498/834] dt-binding: display: bcm2711-hdmi: Add CEC and hotplug interrupts The CEC and hotplug interrupts were missing when that binding was @@ -207468,10 +207402,10 @@ index 7ce06f9f9f8e..6e8ac910bdd8 100644 2.18.4 -From bf193a72df3d047638a558a790933a6352908074 Mon Sep 17 00:00:00 2001 +From 2aaa9552af8dcaed049f4de21968e771880e77ec Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jan 2021 15:23:08 +0100 -Subject: [PATCH 500/803] ARM: dts: bcm2711: Add the BSC interrupt controller +Subject: [PATCH 499/834] ARM: dts: bcm2711: Add the BSC interrupt controller The BSC controllers used for the HDMI DDC have an interrupt controller shared between both instances. Let's add it to avoid polling. @@ -207483,7 +207417,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 7c2d374cb749..786faf7050fc 100644 +index 9c615dd3715e..1646231f0076 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -308,6 +308,14 @@ @@ -207523,10 +207457,10 @@ index 7c2d374cb749..786faf7050fc 100644 2.18.4 -From 4a1656b71b9bb2053f22546c643e4bc44b9e7d37 Mon Sep 17 00:00:00 2001 +From e18fc7705b24d5f8843adde8673a487215070f07 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jan 2021 15:23:09 +0100 -Subject: [PATCH 501/803] ARM: dts: bcm2711: Add the CEC interrupt controller +Subject: [PATCH 500/834] ARM: dts: bcm2711: Add the CEC interrupt controller The CEC and hotplug interrupts go through an interrupt controller shared between the two HDMI controllers. @@ -207541,7 +207475,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 786faf7050fc..9e0d9b2ca586 100644 +index 1646231f0076..733d9ccf0514 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -316,6 +316,14 @@ @@ -207587,10 +207521,10 @@ index 786faf7050fc..9e0d9b2ca586 100644 2.18.4 -From c0d18c76196d5f8a6ccb81a5823d952c193b2e09 Mon Sep 17 00:00:00 2001 +From d387a5a5eee7139e4ab3f6dd419e1f80239bdd76 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 9 Dec 2020 16:37:01 +0000 -Subject: [PATCH 502/803] bcm2711: Disable bsc_intr and aon_intr by default and +Subject: [PATCH 501/834] bcm2711: Disable bsc_intr and aon_intr by default and enable in overlay Signed-off-by: Dom Cobley @@ -207600,7 +207534,7 @@ Signed-off-by: Dom Cobley 2 files changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 9e0d9b2ca586..0ef7bde01555 100644 +index 733d9ccf0514..271e6ff814df 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -314,6 +314,7 @@ @@ -207648,10 +207582,10 @@ index f721f12d729d..8e9220f303f0 100644 2.18.4 -From 9b8ec27905bc769c3d6a6d5185d1c1362011f4c2 Mon Sep 17 00:00:00 2001 +From 47e6e52a3b2e646e6f77f12685b956e123f5f8ae Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 15 Dec 2020 16:42:42 +0100 -Subject: [PATCH 503/803] drm/vc4: hdmi: Limit the BCM2711 to the max without +Subject: [PATCH 502/834] drm/vc4: hdmi: Limit the BCM2711 to the max without scrambling Unlike the previous generations, the HSM clock limitation is way above @@ -207699,10 +207633,10 @@ index b39cc371abdf..08f337a156ad 100644 2.18.4 -From 79d5c8ccc2dcbd24dddf16a40752544837c8bcb1 Mon Sep 17 00:00:00 2001 +From fcae6f6d0cc1301fd3b60c393bf401a7fe1bf109 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 11 Jan 2021 17:08:20 +0000 -Subject: [PATCH 504/803] bcm2711: Remove old GIC interrupt +Subject: [PATCH 503/834] bcm2711: Remove old GIC interrupt Now handled through aon_intr @@ -207712,7 +207646,7 @@ Signed-off-by: Dom Cobley 1 file changed, 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 0ef7bde01555..9d2730c27637 100644 +index 271e6ff814df..a4cd27fced4e 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -362,7 +362,6 @@ @@ -207735,10 +207669,10 @@ index 0ef7bde01555..9d2730c27637 100644 2.18.4 -From 2c7f3e3ab5e4b5aaf33dadeda84d983799a3644a Mon Sep 17 00:00:00 2001 +From b3951fe53c0aa243a80166f4dc19e65fbd198bda Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 8 Feb 2021 11:48:35 +0000 -Subject: [PATCH 505/803] staging:bcm2835-camera: Fix the cherry-pick of AWB +Subject: [PATCH 504/834] staging:bcm2835-camera: Fix the cherry-pick of AWB Greyworld The cherry-pick of the patch that added the greyworld AWB mode @@ -207769,10 +207703,10 @@ index a7af25f90449..f73daa38fa66 100644 2.18.4 -From 37a9bd3d059675c50c3746199f2c6e745683b2c1 Mon Sep 17 00:00:00 2001 +From 22d54d745024bd159d1bb7ee06305256c087a0e4 Mon Sep 17 00:00:00 2001 From: David Knell Date: Mon, 8 Feb 2021 03:33:30 +0000 -Subject: [PATCH 506/803] Overlays for PiFi-Mini amp +Subject: [PATCH 505/834] Overlays for PiFi-Mini amp Signed-off-by: David Knell --- @@ -207863,10 +207797,10 @@ index 000000000000..963597d611b5 2.18.4 -From 28aa1e30d19343bc2711e2a961ccf150c1de5a8f Mon Sep 17 00:00:00 2001 +From 126bd05432ee9627d1cf6f6a12ddf527be44d5e2 Mon Sep 17 00:00:00 2001 From: David Knell Date: Mon, 8 Feb 2021 03:35:15 +0000 -Subject: [PATCH 507/803] Added PiFi-Mini to rpi-simple-soundcard.c +Subject: [PATCH 506/834] Added PiFi-Mini to rpi-simple-soundcard.c Signed-off-by: David Knell --- @@ -208013,10 +207947,10 @@ index bf61a4239073..c25351e6ee90 100644 2.18.4 -From dbcecd692ffaecd3865a7473205e80cd5a97c8b7 Mon Sep 17 00:00:00 2001 +From 84a74a75da3b6d20772bbb6b3c0bd0f00c441aaa Mon Sep 17 00:00:00 2001 From: David Plowman Date: Tue, 12 Jan 2021 13:55:39 +0000 -Subject: [PATCH 508/803] bcm2835-isp: Allow formats with different colour +Subject: [PATCH 507/834] bcm2835-isp: Allow formats with different colour spaces. Each supported format now includes a mask showing the allowed colour @@ -208733,10 +208667,10 @@ index 4d24aec7203d..5cca8bdd1d65 100644 2.18.4 -From b6f99e12f9313b615bdc71bb32ef1fdac7d0a226 Mon Sep 17 00:00:00 2001 +From 4088e0c909b8c892a715a25b2c655b9e8dbf5994 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Mon, 1 Feb 2021 16:53:46 +0100 -Subject: [PATCH 509/803] Hifiberry DAC+ADC Pro fix for the PLL when changing +Subject: [PATCH 508/834] Hifiberry DAC+ADC Pro fix for the PLL when changing sample rates Adds 2 msecs delay when switching between oscillators to allow @@ -208795,10 +208729,10 @@ index 4c03927107e3..8b04d30bcbee 100644 2.18.4 -From d7ed500dc5d1cf5609cfdcef4066cd498fd2e595 Mon Sep 17 00:00:00 2001 +From 5664a7119ea91881f1bcff1b4bc79d43d5435661 Mon Sep 17 00:00:00 2001 From: Mathias Anhalt Date: Sun, 24 Jan 2021 15:15:01 +0100 -Subject: [PATCH 510/803] Fixed picture line bug in all ov9281 modes +Subject: [PATCH 509/834] Fixed picture line bug in all ov9281 modes Signed-off-by: Mathias Anhalt --- @@ -208839,10 +208773,10 @@ index 12621c2dccd5..c646f11ef1d5 100644 2.18.4 -From 68ddda59408600f96d2abc1707cd98879f2ab7b6 Mon Sep 17 00:00:00 2001 +From 11aaadb7637460e61a13905c83e0f19a113d7f52 Mon Sep 17 00:00:00 2001 From: Mathias Anhalt Date: Wed, 3 Feb 2021 20:34:09 +0100 -Subject: [PATCH 511/803] Added hflip and vflip controls to ov9281 +Subject: [PATCH 510/834] Added hflip and vflip controls to ov9281 Signed-off-by: Mathias Anhalt --- @@ -208957,10 +208891,10 @@ index c646f11ef1d5..16777b6f8e14 100644 2.18.4 -From df733dc09173cd90d6321e1e7bb8f6edd127e22a Mon Sep 17 00:00:00 2001 +From c38e62bf70edcbaed8287b35c9843a2353894555 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 12 Feb 2021 17:45:57 +0000 -Subject: [PATCH 512/803] Partial revert "bcm2711: Disable bsc_intr and +Subject: [PATCH 511/834] Partial revert "bcm2711: Disable bsc_intr and aon_intr by default and enable in overlay" This reverts commit c765fd45856a34b9e46daa9263faeafe006c3985. @@ -208974,7 +208908,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 8 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 9d2730c27637..be2f9ba08ea8 100644 +index a4cd27fced4e..7661afa8ef52 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -314,7 +314,6 @@ @@ -209007,10 +208941,10 @@ index 8e9220f303f0..6a11260a4f1a 100644 2.18.4 -From 134155c43a19e1b4b8b3493e9118feab23b72f02 Mon Sep 17 00:00:00 2001 +From 12a744b64c8a6746498a55ac04012cb0266b7955 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 12 Feb 2021 17:49:25 +0000 -Subject: [PATCH 513/803] Revert "ARM: dts: bcm2711: Add the BSC interrupt +Subject: [PATCH 512/834] Revert "ARM: dts: bcm2711: Add the BSC interrupt controller" This reverts commit 93a3b097c467bd5efc1ae3a271c336fdad3b2108. @@ -209029,7 +208963,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 12 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index be2f9ba08ea8..b4bca5af95e1 100644 +index 7661afa8ef52..ffd5fed3c4ed 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -308,14 +308,6 @@ @@ -209069,10 +209003,10 @@ index be2f9ba08ea8..b4bca5af95e1 100644 2.18.4 -From 5c8492c7047ec39cc0d07259da53e0f6449f1e9c Mon Sep 17 00:00:00 2001 +From 36a34a9337845aa3de7952f3193a568df95caef1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 15 Feb 2021 10:25:35 +0000 -Subject: [PATCH 514/803] gpio-fsm: Rename 'num-soft-gpios' to avoid warning +Subject: [PATCH 513/834] gpio-fsm: Rename 'num-soft-gpios' to avoid warning As of 5.10, the Device Tree parser warns about properties that look like references to "suppliers" of various services. "num-soft-gpios" @@ -209107,10 +209041,10 @@ index 2cab50e51315..708f258fda35 100644 2.18.4 -From a75252afd6baf55fb9db96e5011d9c066e5cd1c0 Mon Sep 17 00:00:00 2001 +From c0e8cb751a9e4cfd33c2132bfdaa0bbd20e8e9c2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 15 Feb 2021 10:32:18 +0000 -Subject: [PATCH 515/803] overlays: Rename gpio-fsm property num-soft-gpios +Subject: [PATCH 514/834] overlays: Rename gpio-fsm property num-soft-gpios The gpio-fsm property "num-soft-gpios" triggers a kernel DT checker that warns about the lack of #gpio-cells on a random node with the @@ -209153,10 +209087,10 @@ index afc9f034b5fc..3c997266a67d 100644 2.18.4 -From 13036a6b38a985f12e56e61e9d468ce9d39be2c0 Mon Sep 17 00:00:00 2001 +From e4bf9e38ab4e6d10a0291fa3edb416f73c0e0a11 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 27 Nov 2019 14:42:35 +0000 -Subject: [PATCH 516/803] drm: fix HDR static metadata type field numbering +Subject: [PATCH 515/834] drm: fix HDR static metadata type field numbering According to CTA-861 specification, HDR static metadata data block allows a sink to indicate which HDR metadata types it supports by setting the SM_0 to @@ -209190,10 +209124,10 @@ index 9850d59d6f1c..c8ec982ff498 100644 2.18.4 -From 3890fb2ba8cd9f46ff5668ab034cd48445c47a30 Mon Sep 17 00:00:00 2001 +From 266358cb481db6db7aa82dac4dcf65e8db11d9a4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 2 Dec 2020 18:36:24 +0000 -Subject: [PATCH 517/803] drm/vc4: Add HDR metadata property to the VC5 HDMI +Subject: [PATCH 516/834] drm/vc4: Add HDR metadata property to the VC5 HDMI connectors Now that we can export deeper colour depths, add in the signalling @@ -209297,10 +209231,10 @@ index cb2af9f144df..33b5f120bbeb 100644 2.18.4 -From 9566f19272cad9df22e83b2e6ec99be811c303e7 Mon Sep 17 00:00:00 2001 +From d4593df33434f153e7ecd9c0a7a98ae9ba016140 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Fri, 5 Feb 2021 14:07:12 +0000 -Subject: [PATCH 518/803] drm/vc4: Add connector check to trigger mode_change +Subject: [PATCH 517/834] drm/vc4: Add connector check to trigger mode_change when hdr metadata changes Signed-off-by: Dom Cobley @@ -209370,10 +209304,10 @@ index afe9308311af..f288a052c40c 100644 2.18.4 -From 267a63c7e97cc8f52fa18624a37dfb63ce06ba64 Mon Sep 17 00:00:00 2001 +From dffdedff44e88107930f37ca18f0d820abd9cc38 Mon Sep 17 00:00:00 2001 From: John Cox Date: Mon, 8 Feb 2021 16:01:37 +0000 -Subject: [PATCH 519/803] staging: rpivid: Fix crash when CMA alloc fails +Subject: [PATCH 518/834] staging: rpivid: Fix crash when CMA alloc fails If realloc to increase coeff size fails then attempt to re-allocate the original size. If that also fails then flag a fatal error to abort @@ -209496,10 +209430,10 @@ index fc3caed58187..e6b07920aa8c 100644 2.18.4 -From 0adfa946b797a062d121c528f370944ed3278982 Mon Sep 17 00:00:00 2001 +From bc2e0e2137273a1a776850256dfdd57f502d2f4d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 4 Feb 2021 14:23:58 +0000 -Subject: [PATCH 520/803] dt: Add option for dpi without DE and PCLK (for +Subject: [PATCH 519/834] dt: Add option for dpi without DE and PCLK (for VGA666) VGA666 doesn't use the DE or PCLK signals, therefore there is @@ -209532,10 +209466,10 @@ index e657affae46f..12c7b0b2bb5f 100644 2.18.4 -From a8545cf999fae700d0b2ab0abcc7d8907f8f7ffc Mon Sep 17 00:00:00 2001 +From 1ef654168851f0ed597704290adb79312a2df51e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 4 Feb 2021 14:50:59 +0000 -Subject: [PATCH 521/803] defconfigs: Add DRM_DISPLAY_CONNECTOR and +Subject: [PATCH 520/834] defconfigs: Add DRM_DISPLAY_CONNECTOR and DRM_SIMPLE_BRIDGE for VGA666 VGA666 uses "vga-connector" from DRM_DISPLAY_CONNECTOR, and @@ -209620,10 +209554,10 @@ index aa89eb5704cb..f0a791a03abd 100644 2.18.4 -From 9b288fa43f1944ebc76f91e43c1248160c062f12 Mon Sep 17 00:00:00 2001 +From 65b8e2c15a4ae32bb7bf94eea5f0ae5b6c69d3a4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 4 Feb 2021 14:41:10 +0000 -Subject: [PATCH 522/803] dtoverlays: Add an overlay for the VGA666 when used +Subject: [PATCH 521/834] dtoverlays: Add an overlay for the VGA666 when used with vc4-kms-v3d Includes optional use of GPIOs 0&1 / BSC0 for DDC to read the EDID @@ -209784,10 +209718,10 @@ index 000000000000..6e787099e861 2.18.4 -From 04d7cff5c60185d84ca4a436a6b4e9ea235af3a7 Mon Sep 17 00:00:00 2001 +From 6e3bb54543eaf8d00096c3b4cd2131957f85a3c8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 12 Feb 2021 17:31:37 +0000 -Subject: [PATCH 523/803] drm/vc4: Change the default DPI format to being +Subject: [PATCH 522/834] drm/vc4: Change the default DPI format to being 18bpp, not 24. DPI hasn't really been used up until now, so the default has @@ -209824,10 +209758,10 @@ index a90f2545baee..db63f4e11b17 100644 2.18.4 -From 9dac12d446e42487f1a48894641987182d6aa5e3 Mon Sep 17 00:00:00 2001 +From 550f899bcf4b849d4d057173d7b944ab0040efb7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 17 Oct 2020 15:42:54 +0100 -Subject: [PATCH 524/803] gpio-fsm: Show state info in /sys/class/gpio-fsm +Subject: [PATCH 523/834] gpio-fsm: Show state info in /sys/class/gpio-fsm Add gpio-fsm sysfs entries under /sys/class/gpio-fsm. For each state machine show the current state, which state (if any) will be entered @@ -210014,10 +209948,10 @@ index 708f258fda35..d71a81d9b669 100644 2.18.4 -From a1ec8966cb9b1503bd17c7347081368675de5506 Mon Sep 17 00:00:00 2001 +From b73e686dfeca70f9f47781a288f69047e5e157fd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 17 Feb 2021 09:21:30 +0000 -Subject: [PATCH 525/803] gpio-fsm: Fix shutdown timeout handling +Subject: [PATCH 524/834] gpio-fsm: Fix shutdown timeout handling The driver is intended to jump directly to a shutdown state in the event of a timeout during shutdown, but the sense of the test was @@ -210046,10 +209980,10 @@ index d71a81d9b669..306f5123546c 100644 2.18.4 -From e021d41d0537ff6ea8850173444d14a034f92edc Mon Sep 17 00:00:00 2001 +From 7528961609b478696c615fc5be61774bfd90dbee Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 17 Feb 2021 09:29:26 +0000 -Subject: [PATCH 526/803] overlays: fsm-demo: Ensure all LEDs are turned off +Subject: [PATCH 525/834] overlays: fsm-demo: Ensure all LEDs are turned off If the shutdown process is delayed enough to trigger the shutdown timeout then one or more states in the shutdown sequence might be @@ -210078,10 +210012,10 @@ index 9b5da179914f..e9944f5cd258 100644 2.18.4 -From 9fa672630e32c7f1efd51487d4cb45267ecc0172 Mon Sep 17 00:00:00 2001 +From 7307d9b684ad3098c51b5c99852758c2a7f94921 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 17 Feb 2021 09:52:27 +0000 -Subject: [PATCH 527/803] configs: Add various missing IPV6 modules +Subject: [PATCH 526/834] configs: Add various missing IPV6 modules See: https://github.com/raspberrypi/linux/issues/4144 @@ -210313,10 +210247,10 @@ index f0a791a03abd..60bda75b6965 100644 2.18.4 -From ffe3cdd6f24778e647a90c9519b3e7d0decfd41b Mon Sep 17 00:00:00 2001 +From ed80058d3f9e920c199fb872a1f5eeb2d7152993 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 10 Feb 2021 10:18:53 +0000 -Subject: [PATCH 528/803] media: i2c: imx477: Remove auto frame length +Subject: [PATCH 527/834] media: i2c: imx477: Remove auto frame length adjusting The V4L2_CID_EXPOSURE_AUTO_PRIORITY was used to let the sensor control @@ -210461,10 +210395,10 @@ index f68e7718b09c..30055244166b 100644 2.18.4 -From e53bbbd8d245377a01f3b7b4bf67e83b937c6601 Mon Sep 17 00:00:00 2001 +From aa4a9215be7202a69ef2f7c0b57956ef21bff4e7 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 10 Feb 2021 10:50:32 +0000 -Subject: [PATCH 529/803] media: i2c: imx477: Add very long exposure control to +Subject: [PATCH 528/834] media: i2c: imx477: Add very long exposure control to the driver Add support for very long exposures by using the exposure multiplier @@ -210593,10 +210527,10 @@ index 30055244166b..0143e3129258 100644 2.18.4 -From 518de6e320fae6ee9fdc52fad94c9761c74c1060 Mon Sep 17 00:00:00 2001 +From e757a38eb08bdc78a9a059270502d94c8c2b524a Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 17 Feb 2021 18:08:12 +0000 -Subject: [PATCH 530/803] media: i2c: imx290: Fix up exposure calcuations and +Subject: [PATCH 529/834] media: i2c: imx290: Fix up exposure calcuations and ranges Should now correspond exactly to the datasheet. @@ -210658,10 +210592,10 @@ index 33ce80686163..43e2f294a53b 100644 2.18.4 -From df5e3e0f2d45fdd1f944bfe044f088cb0f73876f Mon Sep 17 00:00:00 2001 +From 6221b58fa91b2c7da300b959a0b177f9e550b434 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 18 Feb 2021 11:58:29 +0000 -Subject: [PATCH 531/803] media: i2c: imx290: Handle exposure correctly when +Subject: [PATCH 530/834] media: i2c: imx290: Handle exposure correctly when vblank changes When vblank changes we must modify the exposure range. Also, with this @@ -210706,10 +210640,10 @@ index 43e2f294a53b..255f66985306 100644 2.18.4 -From b3b335a165bf48681715a9339e1c5f46dc27a755 Mon Sep 17 00:00:00 2001 +From e93ccf6f8171afc82699a813ecd284ad59883a09 Mon Sep 17 00:00:00 2001 From: pifi-bz <73530753+pifi-bz@users.noreply.github.com> Date: Fri, 19 Feb 2021 13:14:32 +0200 -Subject: [PATCH 532/803] DAC overlays (#4154) +Subject: [PATCH 531/834] DAC overlays (#4154) Adding overlays for PiFi DAC Zero and PiFi DAC HD. @@ -210873,10 +210807,10 @@ index 000000000000..645ea74cb435 2.18.4 -From ad8555e50fc899b463f21b1784678dc4131c7a1e Mon Sep 17 00:00:00 2001 +From 900e86a024de62b78820c59f7ac8bae7a472edcb Mon Sep 17 00:00:00 2001 From: Peter Harper Date: Mon, 22 Feb 2021 12:34:20 +0000 -Subject: [PATCH 533/803] configs: Change CONFIG_BLK_DEV_NVME=y for 2711 +Subject: [PATCH 532/834] configs: Change CONFIG_BLK_DEV_NVME=y for 2711 See https://github.com/raspberrypi/linux/issues/4163 --- @@ -210914,10 +210848,10 @@ index b5dce7480cff..8a643571a458 100644 2.18.4 -From 97c6a742ae478bccf1bad51befcfa726cc99bb3a Mon Sep 17 00:00:00 2001 +From ff33990bb69cfeb440f942afbc739fedaa1ec264 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 18 Feb 2021 15:05:57 +0000 -Subject: [PATCH 534/803] media: i2c: imx477: Fix crop height for 2028x1080 +Subject: [PATCH 533/834] media: i2c: imx477: Fix crop height for 2028x1080 mode The crop height for this mode was set at 2600 lines, it should be 2160 @@ -210945,10 +210879,10 @@ index 0143e3129258..e3d164555b09 100644 2.18.4 -From 77ee9fb397f94e0433476254932257233465f9ba Mon Sep 17 00:00:00 2001 +From 9d5b0a0a23c59225f6a4b967333ffcd1adc02d23 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 18 Feb 2021 15:23:11 +0000 -Subject: [PATCH 535/803] media: i2c: imx477: Replace existing 1012x760 mode +Subject: [PATCH 534/834] media: i2c: imx477: Replace existing 1012x760 mode The existing 1012x760 120 fps mode has significant IQ problem using the internal sensor scaler. Replace this mode with a 1332x990 120 fps @@ -211148,10 +211082,10 @@ index e3d164555b09..0c552b9d54c5 100644 2.18.4 -From 97dae5f5290baf83642020b2b963d98b5cd673d9 Mon Sep 17 00:00:00 2001 +From 85dfcb30108a879354cfa450afce24430e9a1b0a Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 19 Feb 2021 10:30:49 +0000 -Subject: [PATCH 536/803] media: i2c: imx477: Remove internal +Subject: [PATCH 535/834] media: i2c: imx477: Remove internal v4l2_mbus_framefmt from the state The only field in this struct that is used is the format code, so @@ -211224,10 +211158,10 @@ index 0c552b9d54c5..f43c86407d97 100644 2.18.4 -From 933ac1b749d2eba32930b5c55c49cd29367ac537 Mon Sep 17 00:00:00 2001 +From d715d913ca17915845b8f7efc41e2d42745ec667 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 19 Feb 2021 11:06:40 +0000 -Subject: [PATCH 537/803] media: i2c: imx477: Remove unused function parameter +Subject: [PATCH 536/834] media: i2c: imx477: Remove unused function parameter The struct imx477 *ctrl parameter is not used in the function imx477_adjust_exposure_range(), so remove it. @@ -211264,10 +211198,10 @@ index f43c86407d97..34bfd22cadc6 100644 2.18.4 -From 9832a8d7c76f4271102d160329bd350acc6fc0c5 Mon Sep 17 00:00:00 2001 +From 1e0b02ce50640ea31ef7eec0beb8fa8fad2613eb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 26 Feb 2021 14:19:00 +0000 -Subject: [PATCH 538/803] overlays: i2c-rtc: Add the Dallas DS1340 +Subject: [PATCH 537/834] overlays: i2c-rtc: Add the Dallas DS1340 See: https://github.com/raspberrypi/linux/issues/4180 @@ -211335,10 +211269,10 @@ index 759f532d5be1..408b71ec97b5 100644 2.18.4 -From 382902333650da27b154d6099a75353df0c686dd Mon Sep 17 00:00:00 2001 +From 1168d875fc65ca8d1753af72899368d0e1a9c468 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 26 Feb 2021 14:20:05 +0000 -Subject: [PATCH 539/803] overlays: Update the upstream overlay +Subject: [PATCH 538/834] overlays: Update the upstream overlay Signed-off-by: Phil Elwell --- @@ -211366,10 +211300,10 @@ index e0f7cc8ba9ea..f73a1879e690 100644 2.18.4 -From 212fe40ffc343239f415d1380c7584fc82d90d8a Mon Sep 17 00:00:00 2001 +From 1021a72cb8795169fd7e874124c4a76beeda0a2b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 1 Mar 2021 09:12:44 +0000 -Subject: [PATCH 540/803] Revert "Bluetooth: Always request for user +Subject: [PATCH 539/834] Revert "Bluetooth: Always request for user confirmation for Just Works (LE SC)" This reverts commit ffee202a78c2980688bc5d2f7d56480e69a5e0c9. @@ -211417,10 +211351,10 @@ index 2b7879afc333..36ac2db5340c 100644 2.18.4 -From 628ac02d4c6078970079f8fb8ff7062d3c26ff3f Mon Sep 17 00:00:00 2001 +From c6e643f252ecb4cb91148982525a83d245b4ed9c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 1 Mar 2021 09:14:35 +0000 -Subject: [PATCH 541/803] Revert "Bluetooth: Always request for user +Subject: [PATCH 540/834] Revert "Bluetooth: Always request for user confirmation for Just Works" This reverts commit 92516cd97fd4d8ad5b1421a0d51771044f453a5f. @@ -211466,10 +211400,10 @@ index 36ac2db5340c..7c3be6b3d454 100644 2.18.4 -From bd33799b7b98874eacaef1222bc272ae4a2c9882 Mon Sep 17 00:00:00 2001 +From 3fa4769bc63e910a9091269e06e2b80bc270624c Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 5 Mar 2021 15:40:45 +0000 -Subject: [PATCH 542/803] media: bcm2835-unicam: Fix bug in buffer swapping +Subject: [PATCH 541/834] media: bcm2835-unicam: Fix bug in buffer swapping logic If multiple sets of interrupts occur simultaneously, it may be unsafe @@ -211548,10 +211482,10 @@ index a8b3f5433f04..234f0eaf9c8c 100644 2.18.4 -From f9a399e807531be42c1e687d428022c661d5b556 Mon Sep 17 00:00:00 2001 +From 7979084b985787adfa23f8d40022dc7ae12a367d Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Mon, 8 Mar 2021 15:32:25 +0000 -Subject: [PATCH 543/803] Assign crypto aliases to different AES implementation +Subject: [PATCH 542/834] Assign crypto aliases to different AES implementation modules The kernel modules aes-neon-blk and aes-neon-bs perform poorly, at least on @@ -211663,10 +211597,10 @@ index fb507d569922..cc52829d426a 100644 2.18.4 -From 94425c7412e71808e37756c35de50221e86c7135 Mon Sep 17 00:00:00 2001 +From 28bfd4b5561d9beabb18899d435af999a149476e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Mar 2021 16:11:46 +0000 -Subject: [PATCH 544/803] overlays: Improve the i2c-rtc,i2c_csi_dsi option +Subject: [PATCH 543/834] overlays: Improve the i2c-rtc,i2c_csi_dsi option The i2c_csi_dsi parameter of the i2c-rtc overlay (added for the CM4IO board) causes the RTC devices to be probed on the I2C0 bus appearing @@ -211719,10 +211653,10 @@ index 408b71ec97b5..b9842e11b5e0 100644 2.18.4 -From f32b4fb1aec8d07a8faec47a8c26866dea7a8eb4 Mon Sep 17 00:00:00 2001 +From f0953fbd6056f4a499e56dd095bb6c32bb47ee3a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Mar 2021 16:59:05 +0000 -Subject: [PATCH 545/803] configs: Add CONFIG_RTS_HCTOSYS=y +Subject: [PATCH 544/834] configs: Add CONFIG_RTS_HCTOSYS=y The recently improved RTC_HCTOSYS option now works with RTC drivers in modules, making it much more useful in that it removes the need to run @@ -211803,10 +211737,10 @@ index 60bda75b6965..584e82f7de99 100644 2.18.4 -From af41e259a13d3d75e50942fb077ec8c473e12d18 Mon Sep 17 00:00:00 2001 +From 757864a31941cf69864277d6c1fbe19d9d5b3858 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 1 Feb 2021 18:48:47 +0000 -Subject: [PATCH 546/803] media/v4l2_m2m: In buffered mode run jobs if either +Subject: [PATCH 545/834] media/v4l2_m2m: In buffered mode run jobs if either port is streaming In order to get the intended behaviour of the stateful video @@ -211842,10 +211776,10 @@ index 34dd8ba5469f..329dc316934e 100644 2.18.4 -From 27a095489dc806c5f6806826492c9574d93a2cbd Mon Sep 17 00:00:00 2001 +From d6e77c08fc08f2a913e1c14ccfd5e26a157fc65b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 1 Feb 2021 18:55:37 +0000 -Subject: [PATCH 547/803] staging/bcm2835-codec: Correct logging of size_t to +Subject: [PATCH 546/834] staging/bcm2835-codec: Correct logging of size_t to %zu Fixes: "staging/bcm2835-codec: Log the number of excess supported formats" @@ -211882,10 +211816,10 @@ index 94691ab7175a..0c4d8bf77b91 100644 2.18.4 -From 9acc10109f1e91a2b3c46ef24f417720bfb59176 Mon Sep 17 00:00:00 2001 +From 7a361d367fa73cd22065f0d3e2d56b308db80f3f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 2 Feb 2021 15:50:18 +0000 -Subject: [PATCH 548/803] staging/bcm2835-codec: Add support for pixel aspect +Subject: [PATCH 547/834] staging/bcm2835-codec: Add support for pixel aspect ratio If the format is detected by the driver and a V4L2_EVENT_SOURCE_CHANGE @@ -211970,10 +211904,10 @@ index 0c4d8bf77b91..46f659e55f18 100644 2.18.4 -From e84f849c0a938bff3b1ed8ed08c947f6cb0f1e23 Mon Sep 17 00:00:00 2001 +From c384cb6964fff191b6e6525a00aa0d5f3b326fdb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 2 Feb 2021 16:46:39 +0000 -Subject: [PATCH 549/803] staging/bcm2835-codec: Implement additional +Subject: [PATCH 548/834] staging/bcm2835-codec: Implement additional g_selection calls for decode v4l_cropcap calls our vidioc_g_pixelaspect function to get the pixel @@ -212011,10 +211945,10 @@ index 46f659e55f18..7aa6c53e279e 100644 2.18.4 -From f8ea4578b83b994d66ec05e850d13d3d381e8d00 Mon Sep 17 00:00:00 2001 +From 9de0c2464a1fa6662a2bc73bbcb09c84becef101 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Mar 2021 19:07:48 +0000 -Subject: [PATCH 550/803] staging/bcm2835-codec: Add VC-1 support. +Subject: [PATCH 549/834] staging/bcm2835-codec: Add VC-1 support. Providing the relevant licence has been purchased, then Pi0-3 can decode VC-1. @@ -212046,10 +211980,10 @@ index 7aa6c53e279e..5729a8a7d94e 100644 2.18.4 -From 666547a723b99603d22477024d5bdb9830e1e216 Mon Sep 17 00:00:00 2001 +From ed6ca54149303a7ba668998e8bdb40104787c671 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Sun, 24 Jan 2021 15:44:10 +0000 -Subject: [PATCH 551/803] vc4/drm: Avoid full hdmi audio fifo writes +Subject: [PATCH 550/834] vc4/drm: Avoid full hdmi audio fifo writes We are getting occasional VC4_HD_MAI_CTL_ERRORF in HDMI_MAI_CTL which seem to correspond with audio dropouts. @@ -212084,10 +212018,10 @@ index f288a052c40c..e10bad628681 100644 2.18.4 -From 69efb2ec49484cc3e047d11e31d765c32e8aa185 Mon Sep 17 00:00:00 2001 +From 81fc7654ba56aab680db8bd53ea1c6ec3e698a3f Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Fri, 12 Mar 2021 11:26:29 +0000 -Subject: [PATCH 552/803] vc4/drm: Increase hdmi audio axi priority to avoid +Subject: [PATCH 551/834] vc4/drm: Increase hdmi audio axi priority to avoid lost samples With HBR audio (8 channel 192kHz) we get occasional VC4_HD_MAI_CTL_DLATE error flags in @@ -212126,10 +212060,10 @@ index 8053ef54acc8..20581ee97827 100644 2.18.4 -From 73a64bb05e54d778f3f9acd3cfcf02abaab67443 Mon Sep 17 00:00:00 2001 +From c16c4fa50118af3584d572f502f0e25ed0558249 Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Fri, 12 Mar 2021 00:13:07 -0700 -Subject: [PATCH 553/803] overlays: gpio-led: new overlay +Subject: [PATCH 552/834] overlays: gpio-led: new overlay Add generic connection between the kernel's LED framework and RPI's GPIO pins. @@ -212328,10 +212262,10 @@ index 000000000000..d8e9d53f1b61 2.18.4 -From 940d83d22ea8b5fd6ef54c82342c462706cfc10b Mon Sep 17 00:00:00 2001 +From f2b9668239052c65b9e6dd41742615833f1a0bd3 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Mon, 15 Mar 2021 17:25:02 +0100 -Subject: [PATCH 554/803] overlays: Add pcie-32bit-dma overlay +Subject: [PATCH 553/834] overlays: Add pcie-32bit-dma overlay In order to accommodate full PCI DMA access to memory on newer BCM2711 revisions, we're forced to map PCIe's view of physical memory with an @@ -212427,10 +212361,10 @@ index 000000000000..cca3e83721b7 2.18.4 -From a3b54c53bf6399cb972a4b35cdd34f1dc374acf4 Mon Sep 17 00:00:00 2001 +From 83c91e22f489898846bb3fec007c024e16cf7fd1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 17 Mar 2021 09:13:28 +0000 -Subject: [PATCH 555/803] Revert "i2c: bcm2835: Handle untimely DONE signal" +Subject: [PATCH 554/834] Revert "i2c: bcm2835: Handle untimely DONE signal" This reverts commit 431ac1d21b5e842c5a564bc0bab31d7dc11611f5. @@ -212494,10 +212428,10 @@ index 90ca593d8ae3..5b2589b6b9cc 100644 2.18.4 -From 4c9fabe1df5df18b224f616c016ff64488586ef1 Mon Sep 17 00:00:00 2001 +From 0cd1cae93b457c5e0928975113c359c54e9b4561 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 22 Mar 2021 09:27:16 +0000 -Subject: [PATCH 556/803] ARM: dts: bcm2711: Add aliases for additional SPIs +Subject: [PATCH 555/834] ARM: dts: bcm2711: Add aliases for additional SPIs Without aliases for the new SPI interfaces in BCM2711, spidev instances will be allocated sequential numbers that may not match the number of @@ -212511,7 +212445,7 @@ Signed-off-by: Phil Elwell 3 files changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 22c562d4196a..984c31db02e8 100644 +index b8339a629fb9..bc2f231f3568 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -354,6 +354,10 @@ @@ -212559,10 +212493,10 @@ index 9ab2feb4424f..9a999405ab85 100644 2.18.4 -From c02dc1ca14ae143822cadcddd816f0e0ca2bf357 Mon Sep 17 00:00:00 2001 +From f5e7f13d9c35ae814438ce8d5bd5ac3d3463f1e2 Mon Sep 17 00:00:00 2001 From: ProBackup-nl <515451+ProBackup-nl@users.noreply.github.com> Date: Thu, 18 Mar 2021 18:21:43 +0100 -Subject: [PATCH 557/803] Make rpi poe fan less noisy in cool environments +Subject: [PATCH 556/834] Make rpi poe fan less noisy in cool environments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -212589,10 +212523,10 @@ index 544038b614e1..af812132a8f7 100644 2.18.4 -From 1a527cc54380f62cbc07abfadfa334e1a88f7a05 Mon Sep 17 00:00:00 2001 +From 35890c146b3e45a4bd6138dc96c8e17867d37aff Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 22 Mar 2021 19:43:48 +0000 -Subject: [PATCH 558/803] vc4/drm: Fix source offsets with DRM_FORMAT_P030 +Subject: [PATCH 557/834] vc4/drm: Fix source offsets with DRM_FORMAT_P030 Spec says: bits [31:4] of the given address should point to the 128-bit word containing the desired starting pixel, @@ -212666,10 +212600,10 @@ index 3d33fe3dacea..4198eb81e62d 100644 2.18.4 -From ea7308a30e88cd4a094c3dc6807931f0a0ef2bad Mon Sep 17 00:00:00 2001 +From d3eff0045af7b152403b37833c70dd0c8e0bdc8d Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 15 Mar 2021 13:28:06 +0000 -Subject: [PATCH 559/803] vc4/drm: vc4_plane: Remove subpixel positioning check +Subject: [PATCH 558/834] vc4/drm: vc4_plane: Remove subpixel positioning check There is little harm in ignoring fractional coordinates (they just get truncated). @@ -212734,10 +212668,10 @@ index 4198eb81e62d..5a268ac6d6fc 100644 2.18.4 -From ffa16e8a6ded5ad697fc48645fc544d70f83787b Mon Sep 17 00:00:00 2001 +From 2645e92d68d90f3340f3b7af04b9db298b81f8e7 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 22 Feb 2021 18:47:19 +0000 -Subject: [PATCH 560/803] clk-raspberrypi: Also support HEVC clock +Subject: [PATCH 559/834] clk-raspberrypi: Also support HEVC clock Signed-off-by: Dom Cobley --- @@ -212760,10 +212694,10 @@ index f4884a5b598a..94ce38a2d5aa 100644 2.18.4 -From f734b7cf5611cc142fd52475e92a50261cd88e5b Mon Sep 17 00:00:00 2001 +From 69f7775f9aabe9a9132fd59b8f5d1f325fc18ad2 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 22 Feb 2021 18:47:43 +0000 -Subject: [PATCH 561/803] dt: Switch hevc clock from fixed to firmware driver +Subject: [PATCH 560/834] dt: Switch hevc clock from fixed to firmware driver Signed-off-by: Dom Cobley --- @@ -212803,10 +212737,10 @@ index 0a611b31b9d4..bdd1c0e5a915 100644 2.18.4 -From 00faeaf9333f1133006176abf464284971fc6969 Mon Sep 17 00:00:00 2001 +From a29d56b63ebfadd9aec2b098914f4cd87354bb28 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 22 Feb 2021 18:50:50 +0000 -Subject: [PATCH 562/803] rpivid: Request maximum hevc clock +Subject: [PATCH 561/834] rpivid: Request maximum hevc clock Query maximum and minimum clock from driver and use those @@ -212860,10 +212794,10 @@ index 3b9e51ca05b3..b377c17dfb21 100644 2.18.4 -From bdff4a93328897181cd321f677f903834c4fc5d6 Mon Sep 17 00:00:00 2001 +From 16f7e581c30ec16b9749a1efa4189f5d682afadd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 17 Mar 2021 12:34:57 +0000 -Subject: [PATCH 563/803] staging/bcm2835-camera: Add support for DMABUFs +Subject: [PATCH 562/834] staging/bcm2835-camera: Add support for DMABUFs DMABUFs are all handled by videobuf2, so there is no reason not to enable support for them. @@ -212903,10 +212837,10 @@ index e0a96dbb843d..7bee6e1bc69a 100644 2.18.4 -From 9d8ffe552847510854505b0388f520c765bc1b66 Mon Sep 17 00:00:00 2001 +From 3d42a3247e8787a65ee388e4feaedb544b50ff6e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 19 Feb 2021 10:25:01 +0000 -Subject: [PATCH 564/803] staging: fbtft: Add minipitft13 variant +Subject: [PATCH 563/834] staging: fbtft: Add minipitft13 variant The Adafruit Mini-PiTFT13 display needs offsets applying when rotated, so use the "variant" mechanism to select a custom set_addr_win method @@ -213014,10 +212948,10 @@ index 3a280cc1892c..af4e975e7b30 100644 2.18.4 -From 553bd51618db9a844d1d7ffbe60b3066d7888311 Mon Sep 17 00:00:00 2001 +From df88c24d27e7286b678fda80270325a9b801c4fe Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 18 Feb 2021 21:05:44 +0000 -Subject: [PATCH 565/803] overlays: Add minipitft13 overlay +Subject: [PATCH 564/834] overlays: Add minipitft13 overlay minipitft13 is an overlay for the Adafruit 1.3" 240x240 display (code 4484). @@ -213123,10 +213057,10 @@ index 000000000000..b1a0a2a41f72 2.18.4 -From 274809aaf7fc88cd81df6bef3a95f465cb89d35d Mon Sep 17 00:00:00 2001 +From 1e71895dab7b842b676b81dda12da0167bfb273e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 3 Mar 2021 10:31:13 +0000 -Subject: [PATCH 566/803] overlays: ghost-amp: Minor tweaks +Subject: [PATCH 565/834] overlays: ghost-amp: Minor tweaks 1. Reduce the delay between RELAY1 and RELAY2 to 1000ms. 2. Rename the states to simplify LED control by an external script. @@ -213201,10 +213135,10 @@ index 3c997266a67d..f051dfb0879f 100644 2.18.4 -From d4ab30765b2a1d918358933557003b972de0ca2f Mon Sep 17 00:00:00 2001 +From 83de5a18e0432f89199dce6b260423da235ab001 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 29 Mar 2021 12:05:06 +0100 -Subject: [PATCH 567/803] overlays: Add README entry for minipitft13 +Subject: [PATCH 566/834] overlays: Add README entry for minipitft13 Signed-off-by: Phil Elwell --- @@ -213237,10 +213171,10 @@ index d8a9ba5e9955..a5f1913d0367 100644 2.18.4 -From 4062e72eaebcb827d56ded859f2e18b342de9ab2 Mon Sep 17 00:00:00 2001 +From b0f48fed857836e6dc3d5489d1e592d5c2d3b552 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 31 Mar 2021 10:22:30 +0100 -Subject: [PATCH 568/803] ARM: dts: update bcm2711-rpi-cm4.dts and -400 +Subject: [PATCH 567/834] ARM: dts: update bcm2711-rpi-cm4.dts and -400 Neither CM4 nor Pi 400 have appeared upstream yet, and as a result they have missed out on improvements to the Pi 4B platform. @@ -213450,10 +213384,10 @@ index 9a999405ab85..a39e5c216e63 100644 2.18.4 -From de28f97b35bc64f1a316e35614b459189c57c35c Mon Sep 17 00:00:00 2001 +From d69683b75521837c5a26c37181cb0beaa47e5b04 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 31 Mar 2021 10:33:35 +0100 -Subject: [PATCH 569/803] Revert "usb: xhci: Disable the XHCI 5 second timeout" +Subject: [PATCH 568/834] Revert "usb: xhci: Disable the XHCI 5 second timeout" This reverts commit 0b387d58aacc006b3cb24415c7c62baa99edf743. --- @@ -213479,10 +213413,10 @@ index 494a059f2f5b..a04c4756eb74 100644 2.18.4 -From 64612f516b91782f32fdbcc694af05e0f8054de9 Mon Sep 17 00:00:00 2001 +From 523dbc9acc93dca89148acb1e548c8a894c12f0b Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 31 Mar 2021 18:12:55 +0100 -Subject: [PATCH 570/803] vc4/drm: SQUASH: Fix source offsets with +Subject: [PATCH 569/834] vc4/drm: SQUASH: Fix source offsets with DRM_FORMAT_P030 x_off should only be within current stripe @@ -213515,10 +213449,10 @@ index 5a268ac6d6fc..dc3581470261 100644 2.18.4 -From 97e6e709d7b53621f89d0247fe5a5cfbf226c9a7 Mon Sep 17 00:00:00 2001 +From dd92f742cf6f577ef5abbd956b3b783d1b7932cb Mon Sep 17 00:00:00 2001 From: Jo Henke <37883863+jo-he@users.noreply.github.com> Date: Tue, 6 Apr 2021 11:21:35 +0000 -Subject: [PATCH 571/803] dwc-otg: fix clang -Wignored-attributes warning +Subject: [PATCH 570/834] dwc-otg: fix clang -Wignored-attributes warning warning: attribute declaration must precede definition --- @@ -213557,10 +213491,10 @@ index 537cc237b4bc..86b4aaf977fb 100644 2.18.4 -From e4a106d30fc65de7ccc36918e1e9a60bdc31c20b Mon Sep 17 00:00:00 2001 +From 3a207a4ab23ff83b3c4917c367db99279e90298e Mon Sep 17 00:00:00 2001 From: Jo Henke <37883863+jo-he@users.noreply.github.com> Date: Tue, 6 Apr 2021 11:38:28 +0000 -Subject: [PATCH 572/803] dwc-otg: fix clang -Wsometimes-uninitialized warning +Subject: [PATCH 571/834] dwc-otg: fix clang -Wsometimes-uninitialized warning warning: variable 'retval' is used uninitialized whenever 'if' condition is false --- @@ -213584,10 +213518,10 @@ index 799ab14b9eda..e1c1e3804095 100644 2.18.4 -From 1634d3332bebfe344ea881b3dc11aabd75821d39 Mon Sep 17 00:00:00 2001 +From 14fe8db605a62181e6acba53ea5476b344a10a16 Mon Sep 17 00:00:00 2001 From: Jo Henke <37883863+jo-he@users.noreply.github.com> Date: Tue, 6 Apr 2021 11:45:14 +0000 -Subject: [PATCH 573/803] dwc-otg: fix clang -Wpointer-bool-conversion warning +Subject: [PATCH 572/834] dwc-otg: fix clang -Wpointer-bool-conversion warning warning: address of array 'desc->wMaxPacketSize' will always evaluate to 'true' @@ -213614,10 +213548,10 @@ index 9dabbe5c9791..2ffd4f11d0bf 100644 2.18.4 -From bdd8ec9f9319cea32520d5791dde8535834f1be4 Mon Sep 17 00:00:00 2001 +From 7d95cae35b223c4ca6f111c1f353fc5288a7c4f7 Mon Sep 17 00:00:00 2001 From: paul-1 <6473457+paul-1@users.noreply.github.com> Date: Fri, 2 Apr 2021 10:56:19 -0400 -Subject: [PATCH 574/803] Update Allo Piano Dac Driver +Subject: [PATCH 573/834] Update Allo Piano Dac Driver Add unique names to the individual dac coded drivers Remove some of the codec controls that are not used. @@ -213897,10 +213831,10 @@ index 0e04c4739858..fd0fe58421b0 100644 2.18.4 -From 67fd948af9f2a4cde7734b88a4c96bf680d718a9 Mon Sep 17 00:00:00 2001 +From 71474298d4b851dbb9071588349ce04b18d06fad Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 19 Mar 2021 11:21:41 +0100 -Subject: [PATCH 575/803] drm/connector: Create a helper to attach the +Subject: [PATCH 574/834] drm/connector: Create a helper to attach the hdr_output_metadata property All the drivers that implement HDR output call pretty much the same @@ -213920,7 +213854,7 @@ Signed-off-by: Maxime Ripard 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index fc826d3bc47e..5e659b743f04 100644 +index 0076470cdf64..2e5863405ef6 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6524,9 +6524,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, @@ -214010,10 +213944,10 @@ index 928136556174..7954234b7fdc 100644 2.18.4 -From 1e9da4dd9b929e2e969af55d43d1ac3d0a88fee6 Mon Sep 17 00:00:00 2001 +From 53904a06779c5d26dc8f9199d90f5d199f560ede Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 19 Mar 2021 13:05:53 +0100 -Subject: [PATCH 576/803] drm/connector: Add helper to compare HDR metadata +Subject: [PATCH 575/834] drm/connector: Add helper to compare HDR metadata All the drivers that support the HDR metadata property have a similar function to compare the metadata from one connector state to the next, @@ -214032,7 +213966,7 @@ Signed-off-by: Maxime Ripard 5 files changed, 33 insertions(+), 48 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index 5e659b743f04..390d562adda2 100644 +index 2e5863405ef6..c699f77027be 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5472,25 +5472,6 @@ static int fill_hdr_info_packet(const struct drm_connector_state *state, @@ -214192,10 +214126,10 @@ index 7954234b7fdc..ca94c7ae20eb 100644 2.18.4 -From 1670d6a448167fe681d662d45e06c330fa90797e Mon Sep 17 00:00:00 2001 +From 318f3406c362bd6d2922e71af7a10525fbd9cbc5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 9 Apr 2021 17:31:55 +0200 -Subject: [PATCH 577/803] drm/vc4: Use the new helpers +Subject: [PATCH 576/834] drm/vc4: Use the new helpers We just introduced new helpers, so let's use them. @@ -214260,10 +214194,10 @@ index e10bad628681..505e1466b3d4 100644 2.18.4 -From e476421f11ba64890b99ed4b62589749c3502926 Mon Sep 17 00:00:00 2001 +From 0381a31c5b71f48dfe98cf4ca8dcbfca85ce8547 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 9 Apr 2021 17:07:32 +0200 -Subject: [PATCH 578/803] drm/connector: Add a helper to attach the colorspace +Subject: [PATCH 577/834] drm/connector: Add a helper to attach the colorspace property The intel driver uses the same logic to attach the Colorspace property @@ -214336,10 +214270,10 @@ index ca94c7ae20eb..42cbacd1acb5 100644 2.18.4 -From f7512f1f10cc39ba208b95c8d374a754e4193f33 Mon Sep 17 00:00:00 2001 +From 67e37ec4664cc1149c9225c40649ad2797130ee4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 9 Apr 2021 17:16:42 +0200 -Subject: [PATCH 579/803] drm/vc4: hdmi: Signal the proper colorimetry info in +Subject: [PATCH 578/834] drm/vc4: hdmi: Signal the proper colorimetry info in the infoframe Our driver while supporting HDR didn't send the proper colorimetry info @@ -214392,10 +214326,10 @@ index 505e1466b3d4..21bb87217653 100644 2.18.4 -From 4b1d4b9d685461d752c040dd569a96bdb59de4c3 Mon Sep 17 00:00:00 2001 +From 6d11eb332e355fa4875a7a227af28c6961990f89 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 4 Nov 2020 18:54:20 +0000 -Subject: [PATCH 580/803] staging: vcsm-cma: Fix memory leak from not detaching +Subject: [PATCH 579/834] staging: vcsm-cma: Fix memory leak from not detaching dmabuf When importing there was a missing call to detach the buffer, @@ -214475,10 +214409,10 @@ index 40ce67f06fac..88c4df822922 100644 2.18.4 -From d6fa66fb75a0558c92565cf2cb211488fa200207 Mon Sep 17 00:00:00 2001 +From f84f0513a5db2bd9119ced9b845d61f6fedabd3c Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 12 Apr 2021 17:27:43 +0100 -Subject: [PATCH 581/803] vc4/kms: vc4_plane: Support 2020 colourspace for yuv +Subject: [PATCH 580/834] vc4/kms: vc4_plane: Support 2020 colourspace for yuv planes https://gist.github.com/popcornmix/6b3e23103c60170b02b148e0ba5d6ed7 @@ -214588,10 +214522,10 @@ index 78fd28599aeb..7538b84a6dca 100644 2.18.4 -From 2469b1b161eb0c73f143c893242d0eb7bc9786ee Mon Sep 17 00:00:00 2001 +From e215f4a961559d31cad4c54b6856ecbee8910e5d Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 15 Apr 2021 13:15:14 +0100 -Subject: [PATCH 582/803] sound/usb: add device quirks for A4Tech FHD 1080p +Subject: [PATCH 581/834] sound/usb: add device quirks for A4Tech FHD 1080p webcams These devices use a type of Sonix chipset that produces broken microphone @@ -214626,7 +214560,7 @@ index 5728bf722c88..18e5cec82bc2 100644 /* Creative BT-D1 */ USB_DEVICE(0x041e, 0x0005), diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index bddef8ad5778..23ce3ce3928a 100644 +index 33d185b62a76..06da60f08f7e 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1530,6 +1530,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) @@ -214641,10 +214575,10 @@ index bddef8ad5778..23ce3ce3928a 100644 2.18.4 -From 9ec04c62bbf36390386de2c9647ce1f66700e726 Mon Sep 17 00:00:00 2001 +From 6fd755de0f79a567ab8db523627752788c6fe092 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Fri, 16 Apr 2021 11:40:23 +0100 -Subject: [PATCH 583/803] sound/usb: call usb_autopm_get_interface() for +Subject: [PATCH 582/834] sound/usb: call usb_autopm_get_interface() for devices that should not be suspended Webcams with microphones are composite devices, and autosuspend is set @@ -214661,7 +214595,7 @@ Signed-off-by: Jonathan Bell 1 file changed, 5 insertions(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index 23ce3ce3928a..4e90c99c62c2 100644 +index 06da60f08f7e..ef92c567720f 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -531,6 +531,11 @@ static int setup_disable_autosuspend(struct snd_usb_audio *chip, @@ -214680,10 +214614,10 @@ index 23ce3ce3928a..4e90c99c62c2 100644 2.18.4 -From 102581236d7fd65960b00bad717e9a381d676d2f Mon Sep 17 00:00:00 2001 +From a1ca65bf728d54a85c9796ea9ce06ae90258cc76 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 16 Apr 2021 09:31:17 +0100 -Subject: [PATCH 584/803] overlays: ghost-amp: Add DAC mute control +Subject: [PATCH 583/834] overlays: ghost-amp: Add DAC mute control Signed-off-by: Phil Elwell --- @@ -214772,10 +214706,10 @@ index f051dfb0879f..dbedb4b76c74 100644 2.18.4 -From af4f6e0f120a465b137959fdda74ad201052ba1a Mon Sep 17 00:00:00 2001 +From a7684518102580c982aac2fe6523df14ec774eed Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 13 Apr 2021 11:00:01 +0200 -Subject: [PATCH 585/803] clk: Introduce a clock request API +Subject: [PATCH 584/834] clk: Introduce a clock request API It's not unusual to find clocks being shared across multiple devices that need to change the rate depending on what the device is doing at a @@ -215064,10 +214998,10 @@ index 7fd6a1febcf4..ab53a0873c8d 100644 2.18.4 -From 778c9f19f4054f61c7f024cb350040470f1dab01 Mon Sep 17 00:00:00 2001 +From e4a10fd3d9a4e22752450ecb54af2152b83ae135 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 13 Apr 2021 11:55:55 +0200 -Subject: [PATCH 586/803] drm/vc4: hdmi: Convert to the new clock request API +Subject: [PATCH 585/834] drm/vc4: hdmi: Convert to the new clock request API The new clock request API allows us to increase the rate of the HSM clock to match our pixel rate requirements while decreasing it when @@ -215148,10 +215082,10 @@ index 33b5f120bbeb..11a4b737d0ab 100644 2.18.4 -From fd2f0b6dcbe02475a66bdafcd0ff9ed28a833e61 Mon Sep 17 00:00:00 2001 +From 1feff5f0ceb1890e5ac7171ac206defe4f8219e0 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 13 Apr 2021 14:10:03 +0100 -Subject: [PATCH 587/803] drm/vc4: hdmi: Convert to the new clock request API +Subject: [PATCH 586/834] drm/vc4: hdmi: Convert to the new clock request API The new clock request API allows us to increase the rate of the core clock as required during mode set while decreasing it when @@ -215196,10 +215130,10 @@ index 5d0974cdeaaa..48e3dc11c493 100644 2.18.4 -From acbc0bfd02483b0f0cede61a88d916fbd3c0332d Mon Sep 17 00:00:00 2001 +From e29d466520ec225f5b340bb790a69ae2a530536a Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 13 Apr 2021 16:48:35 +0100 -Subject: [PATCH 588/803] bcm2835-unicam: Switch to new clock api +Subject: [PATCH 587/834] bcm2835-unicam: Switch to new clock api Signed-off-by: Dom Cobley --- @@ -215255,10 +215189,10 @@ index 234f0eaf9c8c..0d737e0c7f52 100644 2.18.4 -From 0ef23fcb326fc5493a4b1c0d0da33c69e068d02d Mon Sep 17 00:00:00 2001 +From 04fc8886fddec8ec70df1d621ab6c55600345610 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 19 Apr 2021 19:30:26 +0100 -Subject: [PATCH 589/803] rpivid: Switch to new clock api +Subject: [PATCH 588/834] rpivid: Switch to new clock api Signed-off-by: Dom Cobley --- @@ -215317,10 +215251,10 @@ index b377c17dfb21..def891a86e55 100644 2.18.4 -From 0b91854d963f465952d2b135cd5935084633ad34 Mon Sep 17 00:00:00 2001 +From 3fcda6d0e03907e0664df37d075297997643ca45 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 2 Nov 2020 11:45:04 +0000 -Subject: [PATCH 590/803] net: usb: r8152: Provide missing documentation for +Subject: [PATCH 589/834] net: usb: r8152: Provide missing documentation for some struct members commit 34e653efb602e0651867fb5ab14369b555a61dcd upstream. @@ -215345,7 +215279,7 @@ Signed-off-by: Jakub Kicinski 1 file changed, 6 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 95e27fb7d2c1..a1c2323f5942 100644 +index 105622e1defa..92e67f6f6f01 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -898,6 +898,7 @@ struct fw_header { @@ -215395,10 +215329,10 @@ index 95e27fb7d2c1..a1c2323f5942 100644 2.18.4 -From 364aa8fbe120725eb9b3bd3fe3eb31e2e58084e9 Mon Sep 17 00:00:00 2001 +From 86e9f69b461215c52ad4e4b8a653382cdf69ce9b Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 2 Nov 2020 11:45:09 +0000 -Subject: [PATCH 591/803] net: usb: r8152: Fix a couple of spelling errors in +Subject: [PATCH 590/834] net: usb: r8152: Fix a couple of spelling errors in fw_phy_nc's docs commit 9f07814d01ad085b2d9f1d55b4ce532fb2c27110 upstream. @@ -215417,7 +215351,7 @@ Signed-off-by: Jakub Kicinski 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index a1c2323f5942..3d12dc447cc9 100644 +index 92e67f6f6f01..4887256b6704 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -963,8 +963,8 @@ struct fw_phy_patch_key { @@ -215435,10 +215369,10 @@ index a1c2323f5942..3d12dc447cc9 100644 2.18.4 -From e32dedf049a5fc4eb985eaea2c2be3b5ea9d55e2 Mon Sep 17 00:00:00 2001 +From a0763c8ac111799b551cdadb6c2e211da889df0b Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Wed, 4 Nov 2020 10:19:22 +0800 -Subject: [PATCH 592/803] net/usb/r8153_ecm: support ECM mode for RTL8153 +Subject: [PATCH 591/834] net/usb/r8153_ecm: support ECM mode for RTL8153 commit c1aedf015ebdd0232757a66e2daccf1246bd609c upstream. @@ -215478,7 +215412,7 @@ index 99fd12be2111..99381e6bea78 100644 obj-$(CONFIG_USB_NET_DM9601) += dm9601.o obj-$(CONFIG_USB_NET_SR9700) += sr9700.o diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 3d12dc447cc9..35d60d2b12fc 100644 +index 4887256b6704..fba0b1430741 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -26,6 +26,7 @@ @@ -215530,7 +215464,7 @@ index 3d12dc447cc9..35d60d2b12fc 100644 struct tally_counter { __le64 tx_packets; __le64 rx_packets; -@@ -6601,7 +6578,7 @@ static int rtl_fw_init(struct r8152 *tp) +@@ -6602,7 +6579,7 @@ static int rtl_fw_init(struct r8152 *tp) return 0; } @@ -215539,7 +215473,7 @@ index 3d12dc447cc9..35d60d2b12fc 100644 { struct usb_device *udev = interface_to_usbdev(intf); u32 ocp_data = 0; -@@ -6659,12 +6636,13 @@ static u8 rtl_get_version(struct usb_interface *intf) +@@ -6660,12 +6637,13 @@ static u8 rtl_get_version(struct usb_interface *intf) return version; } @@ -215769,10 +215703,10 @@ index 000000000000..20d88b1defc3 2.18.4 -From f233bead9b1c81bdfe5c0c3d2dcca974bf4baac4 Mon Sep 17 00:00:00 2001 +From c546ba66a75beab8af35ebd95fa897d0949d3cdc Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing Date: Sun, 31 Jan 2021 00:47:29 +0100 -Subject: [PATCH 593/803] net: usb: r8152: use new tasklet API +Subject: [PATCH 592/834] net: usb: r8152: use new tasklet API commit f3163f1cb87141c7a41a15a5d4c98b353f807b04 upstream. @@ -215786,7 +215720,7 @@ Signed-off-by: Jakub Kicinski 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 35d60d2b12fc..d131ef915c16 100644 +index fba0b1430741..1db5ce3da19e 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -2393,11 +2393,9 @@ static void tx_bottom(struct r8152 *tp) @@ -215803,7 +215737,7 @@ index 35d60d2b12fc..d131ef915c16 100644 if (test_bit(RTL8152_UNPLUG, &tp->flags)) return; -@@ -6694,7 +6692,7 @@ static int rtl8152_probe(struct usb_interface *intf, +@@ -6695,7 +6693,7 @@ static int rtl8152_probe(struct usb_interface *intf, mutex_init(&tp->control); INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t); INIT_DELAYED_WORK(&tp->hw_phy_work, rtl_hw_phy_work_func_t); @@ -215816,10 +215750,10 @@ index 35d60d2b12fc..d131ef915c16 100644 2.18.4 -From 51ef9f4fcb9913125613d77b94c425d30291e1bb Mon Sep 17 00:00:00 2001 +From 5474cdc82894f25275303575621c44608c1fd4a3 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Wed, 3 Feb 2021 17:14:28 +0800 -Subject: [PATCH 594/803] r8152: replace several functions about phy patch +Subject: [PATCH 593/834] r8152: replace several functions about phy patch request commit a08c0d309d8c078d22717d815cf9853f6f2c07bd upstream. @@ -215842,7 +215776,7 @@ Signed-off-by: Jakub Kicinski 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index d131ef915c16..bdda8331fb03 100644 +index 1db5ce3da19e..629dd2a2a815 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3443,59 +3443,76 @@ static void rtl_clear_bp(struct r8152 *tp, u16 type) @@ -216020,10 +215954,10 @@ index d131ef915c16..bdda8331fb03 100644 2.18.4 -From ec759673006d2e7145ec9aca38b4338245f46ce1 Mon Sep 17 00:00:00 2001 +From b226d6d9a64f086046357a30459717818e9c6731 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Wed, 3 Feb 2021 17:14:29 +0800 -Subject: [PATCH 595/803] r8152: adjust the flow of power cut for RTL8153B +Subject: [PATCH 594/834] r8152: adjust the flow of power cut for RTL8153B commit 80fd850b31f09263ad175b2f640d5c5c6f76ed41 upstream. @@ -216041,7 +215975,7 @@ Signed-off-by: Jakub Kicinski 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index bdda8331fb03..bab89dce3d6b 100644 +index 629dd2a2a815..72ac6225b6f2 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -1371,6 +1371,10 @@ void write_mii_word(struct net_device *netdev, int phy_id, int reg, int val) @@ -216146,7 +216080,7 @@ index bdda8331fb03..bab89dce3d6b 100644 r8153b_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags)); -@@ -5521,9 +5536,6 @@ static void r8153b_init(struct r8152 *tp) +@@ -5522,9 +5537,6 @@ static void r8153b_init(struct r8152 *tp) /* MSC timer = 0xfff * 8ms = 32760 ms */ ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); @@ -216160,10 +216094,10 @@ index bdda8331fb03..bab89dce3d6b 100644 2.18.4 -From 110cb5539d6f41d66c152fed9437ec048933558f Mon Sep 17 00:00:00 2001 +From 591a86f91c1aae4e5cf6ecdcd057640b5feaa1f3 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 19 Feb 2021 17:04:40 +0800 -Subject: [PATCH 596/803] r8152: enable U1/U2 for USB_SPEED_SUPER +Subject: [PATCH 595/834] r8152: enable U1/U2 for USB_SPEED_SUPER commit 7a0ae61acde2cebd69665837170405eced86a6c7 upstream. @@ -216177,7 +216111,7 @@ Signed-off-by: Jakub Kicinski 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index bab89dce3d6b..1f5d80dc93b8 100644 +index 72ac6225b6f2..9d0ec9249916 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3335,7 +3335,7 @@ static void rtl8153b_runtime_enable(struct r8152 *tp, bool enable) @@ -216198,7 +216132,7 @@ index bab89dce3d6b..1f5d80dc93b8 100644 r8153b_u1u2en(tp, true); } -@@ -5549,8 +5549,9 @@ static void r8153b_init(struct r8152 *tp) +@@ -5550,8 +5550,9 @@ static void r8153b_init(struct r8152 *tp) ocp_data |= POLL_LINK_CHG; ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, ocp_data); @@ -216213,10 +216147,10 @@ index bab89dce3d6b..1f5d80dc93b8 100644 2.18.4 -From e41469645c52d4ff7fcf873ba5676d2f95d4d612 Mon Sep 17 00:00:00 2001 +From 4530d0937f9d1882a2e55b43d9b821ccc2ae0616 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 19 Feb 2021 17:04:41 +0800 -Subject: [PATCH 597/803] r8152: check if the pointer of the function exists +Subject: [PATCH 596/834] r8152: check if the pointer of the function exists commit c79515e47935c747282c6ed2ee5b2ef039756eeb upstream. @@ -216229,10 +216163,10 @@ Signed-off-by: Jakub Kicinski 1 file changed, 13 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 1f5d80dc93b8..e24f52e1cea5 100644 +index 9d0ec9249916..f8499c1ac04a 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c -@@ -5734,6 +5734,9 @@ static int rtl8152_runtime_suspend(struct r8152 *tp) +@@ -5735,6 +5735,9 @@ static int rtl8152_runtime_suspend(struct r8152 *tp) struct net_device *netdev = tp->netdev; int ret = 0; @@ -216242,7 +216176,7 @@ index 1f5d80dc93b8..e24f52e1cea5 100644 set_bit(SELECTIVE_SUSPEND, &tp->flags); smp_mb__after_atomic(); -@@ -6133,6 +6136,11 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) +@@ -6134,6 +6137,11 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) struct r8152 *tp = netdev_priv(net); int ret; @@ -216254,7 +216188,7 @@ index 1f5d80dc93b8..e24f52e1cea5 100644 ret = usb_autopm_get_interface(tp->intf); if (ret < 0) goto out; -@@ -6155,6 +6163,11 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) +@@ -6156,6 +6164,11 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) struct r8152 *tp = netdev_priv(net); int ret; @@ -216270,10 +216204,10 @@ index 1f5d80dc93b8..e24f52e1cea5 100644 2.18.4 -From 9f58f36755c7597bf01a4f986d6e75bf4c82e2ea Mon Sep 17 00:00:00 2001 +From e010da7ecd040874c3f8346727d96e51f088764a Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 19 Feb 2021 17:04:42 +0800 -Subject: [PATCH 598/803] r8152: replace netif_err with dev_err +Subject: [PATCH 597/834] r8152: replace netif_err with dev_err commit 156c3207611262266f0eea589ac3f00c5657320e upstream. @@ -216287,10 +216221,10 @@ Signed-off-by: Jakub Kicinski 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index e24f52e1cea5..5b46f5e1e8fb 100644 +index f8499c1ac04a..817454713356 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c -@@ -6570,7 +6570,7 @@ static int rtl_ops_init(struct r8152 *tp) +@@ -6571,7 +6571,7 @@ static int rtl_ops_init(struct r8152 *tp) default: ret = -ENODEV; @@ -216299,7 +216233,7 @@ index e24f52e1cea5..5b46f5e1e8fb 100644 break; } -@@ -6827,7 +6827,7 @@ static int rtl8152_probe(struct usb_interface *intf, +@@ -6828,7 +6828,7 @@ static int rtl8152_probe(struct usb_interface *intf, ret = register_netdev(netdev); if (ret != 0) { @@ -216312,10 +216246,10 @@ index e24f52e1cea5..5b46f5e1e8fb 100644 2.18.4 -From 24d3947e9b3fd57445ea9bf778bdedea4112cf92 Mon Sep 17 00:00:00 2001 +From 181916cb6ce0fb3d9b20f4821590f707bc4cba82 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 19 Feb 2021 17:04:43 +0800 -Subject: [PATCH 599/803] r8152: spilt rtl_set_eee_plus and r8153b_green_en +Subject: [PATCH 598/834] r8152: spilt rtl_set_eee_plus and r8153b_green_en commit 40fa7568ac230446d888b7ad402cff9e20fe3ad5 upstream. @@ -216328,7 +216262,7 @@ Signed-off-by: Jakub Kicinski 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 5b46f5e1e8fb..23fae943a119 100644 +index 817454713356..52a612aec78b 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -2632,21 +2632,24 @@ static inline u8 rtl8152_get_speed(struct r8152 *tp) @@ -216407,10 +216341,10 @@ index 5b46f5e1e8fb..23fae943a119 100644 2.18.4 -From 361af1442b856b30b74347babfe928ddf0e4f7e5 Mon Sep 17 00:00:00 2001 +From d4bb0866ba13923e24a4b3ef751cd0c745f6e087 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 16 Apr 2021 16:04:32 +0800 -Subject: [PATCH 600/803] r8152: set inter fram gap time depending on speed +Subject: [PATCH 599/834] r8152: set inter fram gap time depending on speed commit 5133bcc7481528e36fff0a3b056601efb704fb32 upstream. @@ -216432,7 +216366,7 @@ Signed-off-by: David S. Miller 1 file changed, 28 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 23fae943a119..a6fb2159df0a 100644 +index 52a612aec78b..d2add077e6ee 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -249,6 +249,9 @@ @@ -216488,10 +216422,10 @@ index 23fae943a119..a6fb2159df0a 100644 2.18.4 -From 32d02a61ff0e29fa574d112dc68ef1ef755f747b Mon Sep 17 00:00:00 2001 +From a87e0f4876dba5e9912857595725e2213d1624c5 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 16 Apr 2021 16:04:33 +0800 -Subject: [PATCH 601/803] r8152: adjust rtl8152_check_firmware function +Subject: [PATCH 600/834] r8152: adjust rtl8152_check_firmware function commit a8a7be178e81a3d4b6972cbeb0ccd091ca2f9f89 upstream. @@ -216504,7 +216438,7 @@ Signed-off-by: David S. Miller 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index a6fb2159df0a..2a22fc8bb96e 100644 +index d2add077e6ee..0ed030e47db1 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -874,6 +874,14 @@ struct fw_header { @@ -216646,10 +216580,10 @@ index a6fb2159df0a..2a22fc8bb96e 100644 2.18.4 -From 40cd221ae5e2b915f3d828ceb5be645737225cd5 Mon Sep 17 00:00:00 2001 +From 7aaaa3b48f0fbe090923ef6e038268ea0971e3f2 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 16 Apr 2021 16:04:34 +0800 -Subject: [PATCH 602/803] r8152: add help function to change mtu +Subject: [PATCH 601/834] r8152: add help function to change mtu commit 67ce1a806f164e59a074fea8809725d3411eaa20 upstream. @@ -216667,7 +216601,7 @@ Signed-off-by: David S. Miller 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 2a22fc8bb96e..2c8f26d10841 100644 +index 0ed030e47db1..adde6af84c26 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -657,15 +657,13 @@ enum rtl_register_content { @@ -216753,7 +216687,7 @@ index 2a22fc8bb96e..2c8f26d10841 100644 switch (tp->version) { case RTL_VER_03: -@@ -6494,12 +6492,21 @@ static int rtl8152_change_mtu(struct net_device *dev, int new_mtu) +@@ -6495,12 +6493,21 @@ static int rtl8152_change_mtu(struct net_device *dev, int new_mtu) dev->mtu = new_mtu; if (netif_running(dev)) { @@ -216780,7 +216714,7 @@ index 2a22fc8bb96e..2c8f26d10841 100644 } mutex_unlock(&tp->control); -@@ -6588,6 +6595,7 @@ static int rtl_ops_init(struct r8152 *tp) +@@ -6589,6 +6596,7 @@ static int rtl_ops_init(struct r8152 *tp) ops->in_nway = rtl8153_in_nway; ops->hw_phy_cfg = r8153_hw_phy_cfg; ops->autosuspend_en = rtl8153_runtime_enable; @@ -216788,7 +216722,7 @@ index 2a22fc8bb96e..2c8f26d10841 100644 if (tp->udev->speed < USB_SPEED_SUPER) tp->rx_buf_sz = 16 * 1024; else -@@ -6609,6 +6617,7 @@ static int rtl_ops_init(struct r8152 *tp) +@@ -6610,6 +6618,7 @@ static int rtl_ops_init(struct r8152 *tp) ops->in_nway = rtl8153_in_nway; ops->hw_phy_cfg = r8153b_hw_phy_cfg; ops->autosuspend_en = rtl8153b_runtime_enable; @@ -216796,7 +216730,7 @@ index 2a22fc8bb96e..2c8f26d10841 100644 tp->rx_buf_sz = 32 * 1024; tp->eee_en = true; tp->eee_adv = MDIO_EEE_1000T | MDIO_EEE_100TX; -@@ -6829,7 +6838,7 @@ static int rtl8152_probe(struct usb_interface *intf, +@@ -6830,7 +6839,7 @@ static int rtl8152_probe(struct usb_interface *intf, netdev->max_mtu = ETH_DATA_LEN; break; default: @@ -216809,10 +216743,10 @@ index 2a22fc8bb96e..2c8f26d10841 100644 2.18.4 -From 73122c084ee2dbc3b16626cb4491f57d1a185354 Mon Sep 17 00:00:00 2001 +From 5b91d869e08c35a482b065f3e2008e1e2e8f31cf Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 16 Apr 2021 16:04:35 +0800 -Subject: [PATCH 603/803] r8152: support new chips +Subject: [PATCH 602/834] r8152: support new chips commit 195aae321c829dd1945900d75561e6aa79cce208 upstream. @@ -216826,7 +216760,7 @@ Signed-off-by: David S. Miller 1 file changed, 2359 insertions(+), 275 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 2c8f26d10841..b0d9108b1802 100644 +index adde6af84c26..73685b8904d1 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -43,10 +43,14 @@ @@ -218551,7 +218485,7 @@ index 2c8f26d10841..b0d9108b1802 100644 mutex_lock(&tp->control); -@@ -5399,7 +6275,1068 @@ static void r8152b_init(struct r8152 *tp) +@@ -5400,7 +6276,1068 @@ static void r8152b_init(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); } @@ -219621,7 +219555,7 @@ index 2c8f26d10841..b0d9108b1802 100644 { u32 ocp_data; u16 data; -@@ -5408,7 +7345,17 @@ static void r8153_init(struct r8152 *tp) +@@ -5409,7 +7346,17 @@ static void r8153_init(struct r8152 *tp) if (test_bit(RTL8152_UNPLUG, &tp->flags)) return; @@ -219640,7 +219574,7 @@ index 2c8f26d10841..b0d9108b1802 100644 for (i = 0; i < 500; i++) { if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & -@@ -5417,14 +7364,15 @@ static void r8153_init(struct r8152 *tp) +@@ -5418,14 +7365,15 @@ static void r8153_init(struct r8152 *tp) msleep(20); if (test_bit(RTL8152_UNPLUG, &tp->flags)) @@ -219661,7 +219595,7 @@ index 2c8f26d10841..b0d9108b1802 100644 data = r8152_mdio_read(tp, MII_BMCR); if (data & BMCR_PDOWN) { -@@ -5433,118 +7381,57 @@ static void r8153_init(struct r8152 *tp) +@@ -5434,118 +7382,57 @@ static void r8153_init(struct r8152 *tp) } data = r8153_phy_status(tp, PHY_STAT_LAN_ON); @@ -219809,7 +219743,7 @@ index 2c8f26d10841..b0d9108b1802 100644 { u32 ocp_data; u16 data; -@@ -5553,8 +7440,31 @@ static void r8153b_init(struct r8152 *tp) +@@ -5554,8 +7441,31 @@ static void r8153b_init(struct r8152 *tp) if (test_bit(RTL8152_UNPLUG, &tp->flags)) return; @@ -219841,7 +219775,7 @@ index 2c8f26d10841..b0d9108b1802 100644 for (i = 0; i < 500; i++) { if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & AUTOLOAD_DONE) -@@ -5562,10 +7472,19 @@ static void r8153b_init(struct r8152 *tp) +@@ -5563,10 +7473,19 @@ static void r8153b_init(struct r8152 *tp) msleep(20); if (test_bit(RTL8152_UNPLUG, &tp->flags)) @@ -219862,7 +219796,7 @@ index 2c8f26d10841..b0d9108b1802 100644 data = r8152_mdio_read(tp, MII_BMCR); if (data & BMCR_PDOWN) { -@@ -5580,41 +7499,54 @@ static void r8153b_init(struct r8152 *tp) +@@ -5581,41 +7500,54 @@ static void r8153b_init(struct r8152 *tp) /* MSC timer = 0xfff * 8ms = 32760 ms */ ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); @@ -219938,7 +219872,7 @@ index 2c8f26d10841..b0d9108b1802 100644 set_bit(GREEN_ETHERNET, &tp->flags); -@@ -5991,6 +7923,22 @@ int rtl8152_get_link_ksettings(struct net_device *netdev, +@@ -5992,6 +7924,22 @@ int rtl8152_get_link_ksettings(struct net_device *netdev, mii_ethtool_get_link_ksettings(&tp->mii, cmd); @@ -219961,7 +219895,7 @@ index 2c8f26d10841..b0d9108b1802 100644 mutex_unlock(&tp->control); usb_autopm_put_interface(tp->intf); -@@ -6034,6 +7982,10 @@ static int rtl8152_set_link_ksettings(struct net_device *dev, +@@ -6035,6 +7983,10 @@ static int rtl8152_set_link_ksettings(struct net_device *dev, cmd->link_modes.advertising)) advertising |= RTL_ADVERTISED_1000_FULL; @@ -219972,7 +219906,7 @@ index 2c8f26d10841..b0d9108b1802 100644 mutex_lock(&tp->control); ret = rtl8152_set_speed(tp, cmd->base.autoneg, cmd->base.speed, -@@ -6623,6 +8575,67 @@ static int rtl_ops_init(struct r8152 *tp) +@@ -6624,6 +8576,67 @@ static int rtl_ops_init(struct r8152 *tp) tp->eee_adv = MDIO_EEE_1000T | MDIO_EEE_100TX; break; @@ -220040,7 +219974,7 @@ index 2c8f26d10841..b0d9108b1802 100644 default: ret = -ENODEV; dev_err(&tp->intf->dev, "Unknown Device\n"); -@@ -6636,11 +8649,13 @@ static int rtl_ops_init(struct r8152 *tp) +@@ -6637,11 +8650,13 @@ static int rtl_ops_init(struct r8152 *tp) #define FIRMWARE_8153A_3 "rtl_nic/rtl8153a-3.fw" #define FIRMWARE_8153A_4 "rtl_nic/rtl8153a-4.fw" #define FIRMWARE_8153B_2 "rtl_nic/rtl8153b-2.fw" @@ -220054,7 +219988,7 @@ index 2c8f26d10841..b0d9108b1802 100644 static int rtl_fw_init(struct r8152 *tp) { -@@ -6666,6 +8681,11 @@ static int rtl_fw_init(struct r8152 *tp) +@@ -6667,6 +8682,11 @@ static int rtl_fw_init(struct r8152 *tp) rtl_fw->pre_fw = r8153b_pre_firmware_1; rtl_fw->post_fw = r8153b_post_firmware_1; break; @@ -220066,7 +220000,7 @@ index 2c8f26d10841..b0d9108b1802 100644 default: break; } -@@ -6721,6 +8741,27 @@ u8 rtl8152_get_version(struct usb_interface *intf) +@@ -6722,6 +8742,27 @@ u8 rtl8152_get_version(struct usb_interface *intf) case 0x6010: version = RTL_VER_09; break; @@ -220094,7 +220028,7 @@ index 2c8f26d10841..b0d9108b1802 100644 default: version = RTL_VER_UNKNOWN; dev_info(&intf->dev, "Unknown version 0x%04x\n", ocp_data); -@@ -6833,12 +8874,29 @@ static int rtl8152_probe(struct usb_interface *intf, +@@ -6834,12 +8875,29 @@ static int rtl8152_probe(struct usb_interface *intf, /* MTU range: 68 - 1500 or 9194 */ netdev->min_mtu = ETH_MIN_MTU; switch (tp->version) { @@ -220127,7 +220061,7 @@ index 2c8f26d10841..b0d9108b1802 100644 break; } -@@ -6854,7 +8912,13 @@ static int rtl8152_probe(struct usb_interface *intf, +@@ -6855,7 +8913,13 @@ static int rtl8152_probe(struct usb_interface *intf, tp->advertising = RTL_ADVERTISED_10_HALF | RTL_ADVERTISED_10_FULL | RTL_ADVERTISED_100_HALF | RTL_ADVERTISED_100_FULL; if (tp->mii.supports_gmii) { @@ -220142,7 +220076,7 @@ index 2c8f26d10841..b0d9108b1802 100644 tp->advertising |= RTL_ADVERTISED_1000_FULL; } tp->duplex = DUPLEX_FULL; -@@ -6878,7 +8942,11 @@ static int rtl8152_probe(struct usb_interface *intf, +@@ -6879,7 +8943,11 @@ static int rtl8152_probe(struct usb_interface *intf, set_ethernet_addr(tp); usb_set_intfdata(intf, tp); @@ -220155,7 +220089,7 @@ index 2c8f26d10841..b0d9108b1802 100644 ret = register_netdev(netdev); if (ret != 0) { -@@ -6914,7 +8982,8 @@ static void rtl8152_disconnect(struct usb_interface *intf) +@@ -6915,7 +8983,8 @@ static void rtl8152_disconnect(struct usb_interface *intf) unregister_netdev(tp->netdev); tasklet_kill(&tp->tx_tl); cancel_delayed_work_sync(&tp->hw_phy_work); @@ -220165,7 +220099,7 @@ index 2c8f26d10841..b0d9108b1802 100644 rtl8152_release_firmware(tp); free_netdev(tp->netdev); } -@@ -6934,13 +9003,28 @@ static void rtl8152_disconnect(struct usb_interface *intf) +@@ -6935,13 +9004,28 @@ static void rtl8152_disconnect(struct usb_interface *intf) .idProduct = (prod), \ .bInterfaceClass = USB_CLASS_COMM, \ .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \ @@ -220198,10 +220132,10 @@ index 2c8f26d10841..b0d9108b1802 100644 2.18.4 -From a5b53c808d5cc3e12dbd31f9a647e3a28e6b14ae Mon Sep 17 00:00:00 2001 +From 2655f67e5da563c8037d07959861c20960ec57a0 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 16 Apr 2021 16:04:36 +0800 -Subject: [PATCH 604/803] r8152: support PHY firmware for RTL8156 series +Subject: [PATCH 603/834] r8152: support PHY firmware for RTL8156 series commit 4a51b0e8a0143b0e83d51d9c58c6416c3818a9f2 upstream. @@ -220214,7 +220148,7 @@ Signed-off-by: David S. Miller 1 file changed, 561 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index b0d9108b1802..58eb7d4380a0 100644 +index 73685b8904d1..6fb3a235bf91 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -974,8 +974,60 @@ enum rtl8152_fw_flags { @@ -220859,7 +220793,7 @@ index b0d9108b1802..58eb7d4380a0 100644 static void r8153_aldps_en(struct r8152 *tp, bool enable) { u16 data; -@@ -8650,12 +9197,16 @@ static int rtl_ops_init(struct r8152 *tp) +@@ -8651,12 +9198,16 @@ static int rtl_ops_init(struct r8152 *tp) #define FIRMWARE_8153A_4 "rtl_nic/rtl8153a-4.fw" #define FIRMWARE_8153B_2 "rtl_nic/rtl8153b-2.fw" #define FIRMWARE_8153C_1 "rtl_nic/rtl8153c-1.fw" @@ -220876,7 +220810,7 @@ index b0d9108b1802..58eb7d4380a0 100644 static int rtl_fw_init(struct r8152 *tp) { -@@ -8681,6 +9232,14 @@ static int rtl_fw_init(struct r8152 *tp) +@@ -8682,6 +9233,14 @@ static int rtl_fw_init(struct r8152 *tp) rtl_fw->pre_fw = r8153b_pre_firmware_1; rtl_fw->post_fw = r8153b_post_firmware_1; break; @@ -220895,10 +220829,10 @@ index b0d9108b1802..58eb7d4380a0 100644 2.18.4 -From 0ea869863d3850f7f3d3f54ee856e19ef5531d47 Mon Sep 17 00:00:00 2001 +From e9bc56757963a93f74012816e7db80519b28dc87 Mon Sep 17 00:00:00 2001 From: Hayes Wang Date: Fri, 16 Apr 2021 16:04:37 +0800 -Subject: [PATCH 605/803] r8152: search the configuration of vendor mode +Subject: [PATCH 604/834] r8152: search the configuration of vendor mode commit c2198943e33b100ed21dfb636c8fa6baef841e9d upstream. @@ -220912,7 +220846,7 @@ Signed-off-by: David S. Miller 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 58eb7d4380a0..5b3790553182 100644 +index 6fb3a235bf91..3560ee355e71 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -29,7 +29,7 @@ @@ -220924,7 +220858,7 @@ index 58eb7d4380a0..5b3790553182 100644 /* Information for net */ #define NET_VERSION "11" -@@ -8107,6 +8107,39 @@ static void r8156b_init(struct r8152 *tp) +@@ -8108,6 +8108,39 @@ static void r8156b_init(struct r8152 *tp) tp->coalesce = 15000; /* 15 us */ } @@ -220964,7 +220898,7 @@ index 58eb7d4380a0..5b3790553182 100644 static int rtl8152_pre_reset(struct usb_interface *intf) { struct r8152 *tp = usb_get_intfdata(intf); -@@ -9345,10 +9378,8 @@ static int rtl8152_probe(struct usb_interface *intf, +@@ -9346,10 +9379,8 @@ static int rtl8152_probe(struct usb_interface *intf, if (version == RTL_VER_UNKNOWN) return -ENODEV; @@ -220980,10 +220914,10 @@ index 58eb7d4380a0..5b3790553182 100644 2.18.4 -From c188ddb4605380f7be3aca648fb9e7a6444f3490 Mon Sep 17 00:00:00 2001 +From 557fe7cc13ff5f80bfde84f712531a149bd45a5e Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 20 Apr 2021 13:34:18 +0100 -Subject: [PATCH 606/803] rpivid: Only clk_request_done once +Subject: [PATCH 605/834] rpivid: Only clk_request_done once Fixes: 25486f49bfe2e3ae13b90478d1eebd91413136ad Signed-off-by: Dom Cobley @@ -221012,10 +220946,10 @@ index def891a86e55..37c8f62649d6 100644 2.18.4 -From 86dfd752c1830ccec6dd3a5998ebba66de290bb4 Mon Sep 17 00:00:00 2001 +From 2688f83f0ee3ffcef06b8cc3067b7d6a2a5e7884 Mon Sep 17 00:00:00 2001 From: wangzx <593074943@qq.com> Date: Tue, 20 Apr 2021 22:33:26 +0800 -Subject: [PATCH 607/803] dwc_otg: fix an undeclared variable Replace an +Subject: [PATCH 606/834] dwc_otg: fix an undeclared variable Replace an undeclared variable used by DWC_DEBUGPL with the real endpoint address. DWC_DEBUGPL does nothing with DEBUG undefined so it did not go wrong before. Signed-off-by: Zixuan Wang @@ -221042,10 +220976,10 @@ index 50c8705185ad..2ee27450c6f6 100644 2.18.4 -From f47a7906bfa39c5995e9d1981733cf93056a00c1 Mon Sep 17 00:00:00 2001 +From e79330d4081af17ef8c672b81d873c827d38d2db Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Mar 2021 18:40:51 +0000 -Subject: [PATCH 608/803] Revert "drm/vc4: Add configuration for BCM2711 DSI1." +Subject: [PATCH 607/834] Revert "drm/vc4: Add configuration for BCM2711 DSI1." This reverts commit 10faa28e1474e6cf33cb0809d2a6d5b7a8351a28. @@ -221087,10 +221021,10 @@ index bac5e07c05de..ce4db68827c8 100644 2.18.4 -From 2aa76580157699afc0a065d7c7f5dc06337b5824 Mon Sep 17 00:00:00 2001 +From 5781a77b3ad0dd41e7af162b2375af6c6bcebff0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Mar 2021 18:46:23 +0000 -Subject: [PATCH 609/803] Revert "drm/vc4: Add support for DSI0" +Subject: [PATCH 608/834] Revert "drm/vc4: Add support for DSI0" This reverts commit d704a3c965783ed51476031206b2120676418672. @@ -221166,10 +221100,10 @@ index ce4db68827c8..2646a6dbf584 100644 2.18.4 -From b40a221bb1c148f0ec3381c860dcc97322f74373 Mon Sep 17 00:00:00 2001 +From 161a522d4041be40ce9b014a8917ab7a17e47d97 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 3 Dec 2020 14:25:36 +0100 -Subject: [PATCH 610/803] drm/vc4: drv: Remove the DSI pointer in vc4_drv +Subject: [PATCH 609/834] drm/vc4: drv: Remove the DSI pointer in vc4_drv Commit 51f4fcd9c4ea867c3b4fe58111f342ad0e80642a upstream. @@ -221240,10 +221174,10 @@ index 2646a6dbf584..8c413d21f752 100644 2.18.4 -From a033586d55190c96f977fded8e20a6c81b01ee90 Mon Sep 17 00:00:00 2001 +From 8c7f5c1d0cc341fb13e7fadef7c2ef156e82fc03 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 3 Dec 2020 14:25:38 +0100 -Subject: [PATCH 611/803] drm/vc4: dsi: Use snprintf for the PHY clocks instead +Subject: [PATCH 610/834] drm/vc4: dsi: Use snprintf for the PHY clocks instead of an array Commit dc0bf36401e891c853e0a25baeb4e0b4e6f3626d upstream. @@ -221312,10 +221246,10 @@ index 8c413d21f752..2727ad61989f 100644 2.18.4 -From dfbc67f8e82b9a3ed48b594b90d0face9c8efa23 Mon Sep 17 00:00:00 2001 +From db9a965e3063828795b102cd3690924540f4d1e4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 3 Dec 2020 14:25:39 +0100 -Subject: [PATCH 612/803] drm/vc4: dsi: Introduce a variant structure +Subject: [PATCH 611/834] drm/vc4: dsi: Introduce a variant structure Commit d1d195ce26a14ec0a87816c09ae514e1c40e97f7 upstream. @@ -221509,10 +221443,10 @@ index 2727ad61989f..ea4cd8284454 100644 2.18.4 -From 6bf5de8851ca2a877798b01e9123ea58a5c09681 Mon Sep 17 00:00:00 2001 +From c8a9e9b6706f522ae749ad05cad5e15da3759fcd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 3 Dec 2020 14:25:40 +0100 -Subject: [PATCH 613/803] drm/vc4: dsi: Add support for DSI0 +Subject: [PATCH 612/834] drm/vc4: dsi: Add support for DSI0 Commit 4b265fe11fad4234b12d92dd8091f9aa0c878eea upstream. @@ -221559,10 +221493,10 @@ index ea4cd8284454..c2ed98013f9d 100644 2.18.4 -From 16702b5ac0500d23217900471e4c08977e8825bb Mon Sep 17 00:00:00 2001 +From 28a9223aa119c2ea31bac7c8a1bfff3151e5e24d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 3 Dec 2020 14:25:42 +0100 -Subject: [PATCH 614/803] drm/vc4: dsi: Add configuration for BCM2711 DSI1 +Subject: [PATCH 613/834] drm/vc4: dsi: Add configuration for BCM2711 DSI1 Commit d0666be8ef9e8e65d4b7fabc1606ec51f61384c0 upstream. @@ -221618,10 +221552,10 @@ index c2ed98013f9d..6dfcbd9e234e 100644 2.18.4 -From ca0c9290cdf12b58320afe5d2b84851c6d429e8e Mon Sep 17 00:00:00 2001 +From fb4983c4f72bee27c9ca44596ad7e7ab84478d8b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Feb 2021 18:37:04 +0000 -Subject: [PATCH 615/803] drm/vc4: Correct pixel order for DSI0 +Subject: [PATCH 614/834] drm/vc4: Correct pixel order for DSI0 For slightly unknown reasons, dsi0 takes a different pixel format to dsi1, and that has to be set in the pixel valve. @@ -221651,10 +221585,10 @@ index e02c8aabc8c7..1d1ae0d9e48f 100644 2.18.4 -From b4b3d267d1e6509802a35a661c25b52d722b38a9 Mon Sep 17 00:00:00 2001 +From dcbb72d6f68d5f554dba42984fa05cf35619f3e1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 8 Feb 2021 11:22:01 +0000 -Subject: [PATCH 616/803] drm/vc4: Register dsi0 as the correct vc4 encoder +Subject: [PATCH 615/834] drm/vc4: Register dsi0 as the correct vc4 encoder type vc4_dsi was registering both dsi0 and dsi1 as VC4_ENCODER_TYPE_DSI1 @@ -221686,10 +221620,10 @@ index 6dfcbd9e234e..053930eaa48f 100644 2.18.4 -From b7225998b2fd94d7ca9557451e53c89def0ad399 Mon Sep 17 00:00:00 2001 +From 09e118a8c634a376f1c1c46445d19d55a9fa62c0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Feb 2021 18:46:22 +0000 -Subject: [PATCH 617/803] drm/vc4: Fix dsi0 interrupt support. +Subject: [PATCH 616/834] drm/vc4: Fix dsi0 interrupt support. DSI0 seemingly had very little or no testing as a load of the register mappings were incorrect/missing, so host @@ -221880,10 +221814,10 @@ index 053930eaa48f..fb0efc67d31d 100644 2.18.4 -From f2c4baf1f812e1c16bfa57277743b09329d083ce Mon Sep 17 00:00:00 2001 +From 49c875e3f897e4dbe92cba8c2eb9caea4bb2de2c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 15 Apr 2021 16:18:16 +0100 -Subject: [PATCH 618/803] drm/vc4: Add correct stop condition to +Subject: [PATCH 617/834] drm/vc4: Add correct stop condition to vc4_dsi_encoder_disable iteration vc4_dsi_encoder_disable is partially an open coded version of @@ -221916,10 +221850,10 @@ index fb0efc67d31d..9861e2d2c05d 100644 2.18.4 -From 40f31655e67d2581f05c1a99953bf1f7d1c0f1fb Mon Sep 17 00:00:00 2001 +From dce31071927941990fab29229a01956bb5c22e98 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 Jan 2021 16:30:55 +0000 -Subject: [PATCH 619/803] drm/atomic: Don't fixup modes that haven't been reset +Subject: [PATCH 618/834] drm/atomic: Don't fixup modes that haven't been reset Signed-off-by: Dave Stevenson --- @@ -221946,10 +221880,10 @@ index 134d3000fb18..172144627c59 100644 2.18.4 -From 45873c5dec258a8479e1db23383381dd70f05c81 Mon Sep 17 00:00:00 2001 +From 1ad56b460e806419b2c6dae274f82a9882e4cd68 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 15 Apr 2021 17:30:35 +0100 -Subject: [PATCH 620/803] drm/panel: jdi-lt070me05000: Use +Subject: [PATCH 619/834] drm/panel: jdi-lt070me05000: Use gpiod_set_value_cansleep There is no reason why the control GPIOs for the panel can not @@ -222019,10 +221953,10 @@ index 733010b5e4f5..7fb4d98e166d 100644 2.18.4 -From 53f41cf0f830bf63b8dbfd0d54f1cfb85ac6bb0c Mon Sep 17 00:00:00 2001 +From 7c2143f51f80fbecaec8dfa1ba6192f84778fa87 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 15 Apr 2021 18:09:56 +0100 -Subject: [PATCH 621/803] defconfigs: Add PANEL_JDI_LT070ME05000 DSI panel +Subject: [PATCH 620/834] defconfigs: Add PANEL_JDI_LT070ME05000 DSI panel Used by the 2013 Nexus 7" tablet, and working via an adapter board on Compute Modules. @@ -222100,10 +222034,10 @@ index 584e82f7de99..ff857505902b 100644 2.18.4 -From ac131d36c10266c7344d0e2494d726fe86344553 Mon Sep 17 00:00:00 2001 +From 2b3f4dba7b8069bf3be0a9be7b0be53977aedee0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 15 Apr 2021 16:46:34 +0100 -Subject: [PATCH 622/803] dtoverlays: Add overlays for JDI LT070ME05000 +Subject: [PATCH 621/834] dtoverlays: Add overlays for JDI LT070ME05000 1200x1920 DSI panel Credit to forum member gizmomouse on @@ -222330,10 +222264,10 @@ index 000000000000..5dcd0f2243e2 2.18.4 -From d751de95b2086cc2ffccc968577dc56ae2ceb126 Mon Sep 17 00:00:00 2001 +From 84c333f6bd6a922334afa96fc66491cfa6c44f71 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 21 Apr 2021 12:14:44 +0200 -Subject: [PATCH 623/803] clk: requests: Ignore if the pointer is null +Subject: [PATCH 622/834] clk: requests: Ignore if the pointer is null Signed-off-by: Maxime Ripard --- @@ -222358,10 +222292,10 @@ index 031627757b11..af0f638d1769 100644 2.18.4 -From f925e3544cc17000dbefaabf25fbdb405b64bf58 Mon Sep 17 00:00:00 2001 +From 89d37b77b5e32278937d141c02350367f40383cb Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 16 Mar 2021 13:51:52 +0100 -Subject: [PATCH 624/803] drm/vc4: Rework the encoder retrieval code +Subject: [PATCH 623/834] drm/vc4: Rework the encoder retrieval code Due to a FIFO that cannot be flushed between the pixelvalve and the HDMI controllers on BCM2711, we need to carefully disable both at boot time @@ -222515,10 +222449,10 @@ index ca435d24b7dc..24e8e291e0ad 100644 2.18.4 -From 3062809c56aef46619b30ebf7e5a8ee639db5d28 Mon Sep 17 00:00:00 2001 +From 3102a1969defe96ff367d3081551690ecb813776 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 25 Feb 2021 14:42:03 +0100 -Subject: [PATCH 625/803] drm/vc4: hvs: Make the HVS bind first +Subject: [PATCH 624/834] drm/vc4: hvs: Make the HVS bind first We'll need to have the HVS binding before the HDMI controllers so that we can check whether the firmware allows to run in 4kp60. Reorder a bit @@ -222562,10 +222496,10 @@ index 8baa90837e9e..c404ef49f420 100644 2.18.4 -From 174428f34eae6756968f611a906c8e4e4be23902 Mon Sep 17 00:00:00 2001 +From ffbe720438657276b5c52d155e5e8e8b8d943af3 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 8 Oct 2020 16:06:08 +0200 -Subject: [PATCH 626/803] drm/vc4: hdmi: Properly compute the BVB clock rate +Subject: [PATCH 625/834] drm/vc4: hdmi: Properly compute the BVB clock rate The BVB clock rate computation doesn't take into account a mode clock of 594MHz that we're going to need to support 4k60. @@ -222623,10 +222557,10 @@ index 44913ca1a5e0..a83ee8427905 100644 2.18.4 -From 743009e86902920654fca17e67e1120c8e0503e8 Mon Sep 17 00:00:00 2001 +From 48920cef66fbccfa5bf8c0741a9163dc68c579bb Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 25 Feb 2021 15:35:02 +0100 -Subject: [PATCH 627/803] drm/vc4: hdmi: Check and warn if we can't reach 4kp60 +Subject: [PATCH 626/834] drm/vc4: hdmi: Check and warn if we can't reach 4kp60 frequencies In order to reach the frequencies needed to output at 594MHz, the @@ -222737,10 +222671,10 @@ index 11a4b737d0ab..23e8cfc22c4d 100644 2.18.4 -From b03468392428db5133be638b9cada2435e86c238 Mon Sep 17 00:00:00 2001 +From dc36d20ecff418f8155d5a2ea71eaa16e02567ae Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 8 Oct 2020 16:06:58 +0200 -Subject: [PATCH 628/803] drm/vc4: hdmi: Enable the scrambler +Subject: [PATCH 627/834] drm/vc4: hdmi: Enable the scrambler The HDMI controller on the BCM2711 includes a scrambler in order to reach the HDMI 2.0 modes that require it. Let's add the support for it. @@ -222887,10 +222821,10 @@ index 20a1438a72cb..a81fdf90f66b 100644 2.18.4 -From 3b958faa7e8d73f7441c18f9f9ede2b41dc84c9a Mon Sep 17 00:00:00 2001 +From bfb3da6e764f21151f473a9979f1971219cef7d3 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 8 Oct 2020 16:08:06 +0200 -Subject: [PATCH 629/803] drm/vc4: hdmi: Raise the maximum clock rate +Subject: [PATCH 628/834] drm/vc4: hdmi: Raise the maximum clock rate Now that we have the infrastructure in place, we can raise the maximum pixel rate we can reach for HDMI0 on the BCM2711. @@ -222923,10 +222857,10 @@ index c561b537e5b6..24d3ad18ea6e 100644 2.18.4 -From ff9fd82aa4d13cde787d96e061629ff3900a3741 Mon Sep 17 00:00:00 2001 +From 9a1c4bd691ed01173a766e09a77620d69c29127c Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 21 Apr 2021 15:15:42 +0100 -Subject: [PATCH 630/803] vc4/drm: hdmi: Handle case when bvb clock is null +Subject: [PATCH 629/834] vc4/drm: hdmi: Handle case when bvb clock is null Pi2/3 have no bvb clock but want the other clocks to remain enabled here @@ -222973,10 +222907,10 @@ index 24d3ad18ea6e..f55e522f0236 100644 2.18.4 -From ff53797977ee1e25f0c2722358da3a9ad510f26f Mon Sep 17 00:00:00 2001 +From d412ec39438705f89290e35071023c0c4847f248 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 19 Apr 2021 10:33:24 +0100 -Subject: [PATCH 631/803] overlays: spi-rtc: Add ds3232 and ds3234 +Subject: [PATCH 630/834] overlays: spi-rtc: Add ds3232 and ds3234 Extend the spi-rtc overlay to support the ds3232 and ds3234 RTCs, as well as adding parameters to select difference SPI controllers and @@ -223106,10 +223040,10 @@ index 9664afc9845c..51b7fec281c0 100644 2.18.4 -From 6f2f0642ae00a81e8976bbbd607a1c8aa4c0ec05 Mon Sep 17 00:00:00 2001 +From 2529c6d063e5bebd929b25746e393b3f58b27f9d Mon Sep 17 00:00:00 2001 From: kFYatek <4499762+kFYatek@users.noreply.github.com> Date: Sat, 27 Mar 2021 21:43:33 +0100 -Subject: [PATCH 632/803] drm/vc4: Fix VEC address for BCM2711 in the +Subject: [PATCH 631/834] drm/vc4: Fix VEC address for BCM2711 in the devicetrees The VEC has a different address (0x7ec13000) on the BCM2711 (used in @@ -223128,7 +223062,7 @@ Signed-off-by: Mateusz Kwiatkowski 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index b4bca5af95e1..11098835cc05 100644 +index ffd5fed3c4ed..23fb41c91c6b 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -300,6 +300,14 @@ @@ -223166,7 +223100,7 @@ index 47b958428d0c..06d8c3882cb7 100644 compatible = "brcm,bcm2835-pixelvalve2"; reg = <0x7e807000 0x100>; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 346838ee9d21..b95e0cf827d3 100644 +index 6d305b8b5ebe..06d04cde52b9 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -488,14 +488,6 @@ @@ -223188,10 +223122,10 @@ index 346838ee9d21..b95e0cf827d3 100644 2.18.4 -From aa194445403c2c3f849f1a8b45dc74f998fb5f92 Mon Sep 17 00:00:00 2001 +From add3c8c1bcbdee44f29750a4364544b8ba621be1 Mon Sep 17 00:00:00 2001 From: kFYatek <4499762+kFYatek@users.noreply.github.com> Date: Sat, 27 Mar 2021 21:43:40 +0100 -Subject: [PATCH 633/803] drm/vc4: Separate VEC compatible variants +Subject: [PATCH 632/834] drm/vc4: Separate VEC compatible variants The VEC's DAC on BCM2711 is slightly different compared to the one on BCM283x and needs different configuration. In particular, bit 3 @@ -223225,7 +223159,7 @@ index d900cc57b4ec..4d8a6b615e5b 100644 reg: maxItems: 1 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 11098835cc05..e8434edc2bff 100644 +index 23fb41c91c6b..2604ccfb6a6b 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -301,7 +301,7 @@ @@ -223304,10 +223238,10 @@ index bd5b8eb58b18..a467ceba75e4 100644 2.18.4 -From da31a4641dbd39d0601974128fc8cbd622cf25d9 Mon Sep 17 00:00:00 2001 +From 50b9dba5b7949b5a907f2ebe8f89c2227bd0edc8 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 1 Apr 2021 10:34:27 -0500 -Subject: [PATCH 634/803] configs: Enable ATA and AHCI for SATA drive support. +Subject: [PATCH 633/834] configs: Enable ATA and AHCI for SATA drive support. --- arch/arm/configs/bcm2711_defconfig | 3 +++ @@ -223346,10 +223280,10 @@ index 93159a7a2d9b..b90bcc5b6ef8 100644 2.18.4 -From b11bdd8641fc2ad222360cdb978778f6e189f524 Mon Sep 17 00:00:00 2001 +From 7f1782bcf74ee5e0c1535fb6a34bb96a8132566a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 22 Apr 2021 10:45:37 +0200 -Subject: [PATCH 635/803] clk: requests: Dereference the request pointer after +Subject: [PATCH 634/834] clk: requests: Dereference the request pointer after the check The current code will first dereference the req pointer and then test if @@ -223382,10 +223316,10 @@ index af0f638d1769..1b9a76c7dafa 100644 2.18.4 -From ac09fb28d944c3cd8a2d46daa95f4ec85760463d Mon Sep 17 00:00:00 2001 +From 4e09257b9ef7a298c73fb2bcb33a16110d9331c1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Mar 2021 18:28:40 +0000 -Subject: [PATCH 636/803] staging/bcm2835-codec: Fix support for levels 4.1 and +Subject: [PATCH 635/834] staging/bcm2835-codec: Fix support for levels 4.1 and 4.2 The driver said it supported H264 levels 4.1 and 4.2, but @@ -223424,10 +223358,10 @@ index 5729a8a7d94e..4622057e71cb 100644 2.18.4 -From e324f7a38e088193005bcacaa60475ce39162415 Mon Sep 17 00:00:00 2001 +From 87177a0c3ca5ed682fee43bef3263fd806c70812 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 4 Feb 2021 19:08:23 +0000 -Subject: [PATCH 637/803] staging/bcm2835-codec: Set the colourspace +Subject: [PATCH 636/834] staging/bcm2835-codec: Set the colourspace appropriately for RGB formats Video decode supports YUV and RGB formats. YUV needs to report SMPTE170M @@ -223514,10 +223448,10 @@ index 4622057e71cb..08429a42c847 100644 2.18.4 -From 214528d36aac8ba4bb555e6b655661d956162acb Mon Sep 17 00:00:00 2001 +From 0d4dcb1f6479e6e48575a79aff261e6e9c328a0c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 9 Dec 2020 18:53:56 +0000 -Subject: [PATCH 638/803] staging/bcm2835-codec: Pass corrupt frame flag. +Subject: [PATCH 637/834] staging/bcm2835-codec: Pass corrupt frame flag. MMAL has the flag MMAL_BUFFER_HEADER_FLAG_CORRUPTED but that wasn't being passed through, so add it. @@ -223562,10 +223496,10 @@ index 08429a42c847..3ed9f47a37fe 100644 2.18.4 -From 2cad3e237d3340323c8581c4ed01dfacb861fefb Mon Sep 17 00:00:00 2001 +From 2d0a9dfb04e8fca486d3a6daa3a6a70665bcee81 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Mar 2021 18:34:50 +0000 -Subject: [PATCH 639/803] staging/bcm2835-camera: Add support for H264 levels +Subject: [PATCH 638/834] staging/bcm2835-camera: Add support for H264 levels 4.1 and 4.2 Whilst the hardware can't achieve the limits of level 4.2 under @@ -223626,10 +223560,10 @@ index f73daa38fa66..f3480a5c5170 100644 2.18.4 -From 461fa525c6b75d0b14f1bf2ef0c438bf2acf0d36 Mon Sep 17 00:00:00 2001 +From 970ef88ea8a13b0893890b50f2dad0b485241742 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 15 Apr 2021 11:07:55 +0100 -Subject: [PATCH 640/803] staging/bcm2835-codec: Do not update crop from S_FMT +Subject: [PATCH 639/834] staging/bcm2835-codec: Do not update crop from S_FMT after res change During decode, setting the CAPTURE queue format was setting the crop @@ -223668,10 +223602,10 @@ index 3ed9f47a37fe..a97666a1a4be 100644 2.18.4 -From 872033efe23f2f80a59ec4e31f2964be78fdf55b Mon Sep 17 00:00:00 2001 +From 9c323e2c203cd9f5d3a9e3c28c8ed50d59917eeb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 23 Apr 2021 16:16:49 +0100 -Subject: [PATCH 641/803] staging/bcm2835-isp: Fix compiler warning +Subject: [PATCH 640/834] staging/bcm2835-isp: Fix compiler warning The result of dividing a u32 by a size_t is an unsigned int on arm32 and a long unsigned int on arm64. Use "%zu" (the size_t format) to @@ -223699,10 +223633,10 @@ index 5cca8bdd1d65..08dce8bba9bb 100644 2.18.4 -From 10f0715d18adfde6bf34bfcac22f143cad86b015 Mon Sep 17 00:00:00 2001 +From bebd18f15fe475af2275ee8fa0ba497aa420da5f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sun, 25 Apr 2021 21:07:03 +0100 -Subject: [PATCH 642/803] overlays: Allow multiple gpio-shutdown instances +Subject: [PATCH 641/834] overlays: Allow multiple gpio-shutdown instances There is no reason not to support multiple gpio-shutdown signals, so add the necessary __override__ magic. @@ -223747,10 +223681,10 @@ index 0a27595143ec..da148064aedd 100644 2.18.4 -From d836b4873673904e29c884523f0a217a1b79560a Mon Sep 17 00:00:00 2001 +From c7079794e8ca934396fd2e90d95b49e0e8683d15 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Apr 2021 09:58:14 +0100 -Subject: [PATCH 643/803] overlays: README - improve the gpio-poweroff guide +Subject: [PATCH 642/834] overlays: README - improve the gpio-poweroff guide Signed-off-by: Phil Elwell --- @@ -223783,10 +223717,10 @@ index 17521568cee5..b9be3bece19b 100644 2.18.4 -From 6a6150139061bcfc9f89ff1f1cbacb20c3dda3f5 Mon Sep 17 00:00:00 2001 +From 95d1d17f3242ffe76f3710c33d947f871dbe1bf4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Apr 2021 10:08:21 +0100 -Subject: [PATCH 644/803] SQUASH: overlays: Fix typo in README +Subject: [PATCH 643/834] SQUASH: overlays: Fix typo in README Signed-off-by: Phil Elwell --- @@ -223810,10 +223744,10 @@ index b9be3bece19b..79878f4f30e6 100644 2.18.4 -From 06b906e4adf2c21552b6e31c378827ba10cbecaa Mon Sep 17 00:00:00 2001 +From 45146512c40bcb89709a482eaf938f67dd21c1df Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Apr 2021 08:59:01 +0100 -Subject: [PATCH 645/803] gpio-poweroff: Remember the old poweroff handler +Subject: [PATCH 644/834] gpio-poweroff: Remember the old poweroff handler Keeping a copy of the old poweroff handler allows it to be restored should this module be unloaded, but also provides a fallback if the @@ -223869,10 +223803,10 @@ index e5dca66360a7..81e7acb8acb5 100644 2.18.4 -From 74758466b491e7baaa50de07a26c89f634b7c098 Mon Sep 17 00:00:00 2001 +From 23f3d53042cdfcb7d48237b39569ac8724877aa4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Apr 2021 16:14:21 +0100 -Subject: [PATCH 646/803] drm/vc4: Allow DBLCLK modes even if horz timing is +Subject: [PATCH 645/834] drm/vc4: Allow DBLCLK modes even if horz timing is odd. The 2711 pixel valve can't produce odd horizontal timings, and @@ -223917,10 +223851,10 @@ index f55e522f0236..417d3e9954c2 100644 2.18.4 -From a77bc1b2479cec54ca2f8cda56dcfe8cc718ce32 Mon Sep 17 00:00:00 2001 +From c83143d26ef6c8f3df5c4443d850566af4487e44 Mon Sep 17 00:00:00 2001 From: Christoph Date: Wed, 28 Apr 2021 20:30:44 +0200 -Subject: [PATCH 647/803] overlays: Add ugreen-dabboard overlay +Subject: [PATCH 646/834] overlays: Add ugreen-dabboard overlay This is a simple overlay based on the simple-audio-card and the dmic codec. It has the speciality that it is configured to use the codec @@ -224029,10 +223963,10 @@ index 000000000000..fc8d9b118068 2.18.4 -From d9fd4acc166409d2066df6ae3ccc5c21dbdc51e3 Mon Sep 17 00:00:00 2001 +From 2c74aba297502c7406a14af374fc880ad1174921 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 23 Apr 2021 15:02:58 +0100 -Subject: [PATCH 648/803] ARM: dts: bcm2711-rpi-400: Limit MDIO clock speed +Subject: [PATCH 647/834] ARM: dts: bcm2711-rpi-400: Limit MDIO clock speed Signed-off-by: Phil Elwell --- @@ -224058,10 +223992,10 @@ index 1bb8854e69d6..4ffd5e04ccf1 100644 2.18.4 -From a3c5e53cc92406f6167abf7d76f5ffa33021a941 Mon Sep 17 00:00:00 2001 +From bfd80357901a3c38996e870eb4b28c4ba71a30c7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 30 Apr 2021 08:34:36 +0100 -Subject: [PATCH 649/803] spi: bcm2835: Increase the CS limit to 24 +Subject: [PATCH 648/834] spi: bcm2835: Increase the CS limit to 24 Increase the maximum number of CS lines to 24, and ensure this limit is not exceeded. @@ -224075,7 +224009,7 @@ Signed-off-by: Phil Elwell 1 file changed, 6 insertions(+) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c -index 9a47313cab46..536935abb79d 100644 +index 4f40d2b9d468..0f6a2f7c8b53 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -28,6 +28,7 @@ @@ -224086,7 +224020,7 @@ index 9a47313cab46..536935abb79d 100644 #include #include -@@ -1298,6 +1299,11 @@ static int bcm2835_spi_probe(struct platform_device *pdev) +@@ -1299,6 +1300,11 @@ static int bcm2835_spi_probe(struct platform_device *pdev) struct bcm2835_spi *bs; int err; @@ -224102,10 +224036,10 @@ index 9a47313cab46..536935abb79d 100644 2.18.4 -From 87290e36304673191dc1682a2f52032405c8f684 Mon Sep 17 00:00:00 2001 +From bfd8a05c756bc08001fc7b216741f511f0f79537 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 May 2021 13:57:21 +0100 -Subject: [PATCH 650/803] configs: Regenerate defconfigs +Subject: [PATCH 649/834] configs: Regenerate defconfigs GENERIC_PHY=m is now implied by other settings on bcm2711. @@ -224143,10 +224077,10 @@ index b90bcc5b6ef8..5fb890f90233 100644 2.18.4 -From d2cac8af770a366fcdbe59a045d73f0acb99398f Mon Sep 17 00:00:00 2001 +From 4bc16f0bb959511dd8ac203c40dad928b6b70333 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 4 May 2021 15:14:16 +0200 -Subject: [PATCH 651/803] configs: add CONFIG_QCA7000_UART=m (#4322) +Subject: [PATCH 650/834] configs: add CONFIG_QCA7000_UART=m (#4322) This allows to use the UART interface instead of SPI of QCA7000 Ethernet over powerline chips. @@ -224224,10 +224158,10 @@ index ff857505902b..c38726720f27 100644 2.18.4 -From 578d876183ca933b04c812fa822fb90f3029912a Mon Sep 17 00:00:00 2001 +From a705293b668ee61185ce2490cb903ae32aa07481 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 5 May 2021 15:35:34 +0200 -Subject: [PATCH 652/803] clk: Always clamp the rounded rate +Subject: [PATCH 651/834] clk: Always clamp the rounded rate The current core while setting the min and max rate properly in the clk_request structure will not make sure that the requested rate is @@ -224258,10 +224192,10 @@ index 1b9a76c7dafa..f4695bac4cec 100644 2.18.4 -From 57de97a326f6931382548523a597bbcbc7ec8093 Mon Sep 17 00:00:00 2001 +From 1513a616ef9c5f7ca40c0a8ef5870940cd2c8bfe Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 5 May 2021 14:06:21 +0200 -Subject: [PATCH 653/803] Revert "drm/vc4: Rework the encoder retrieval code" +Subject: [PATCH 652/834] Revert "drm/vc4: Rework the encoder retrieval code" This reverts commit 3cf3d39b754a78c67134da7b8109eb968129ef8d. @@ -224402,10 +224336,10 @@ index 24e8e291e0ad..ca435d24b7dc 100644 2.18.4 -From 68f4a0bc83a18fe94d1b1f9b084282bd23444ae4 Mon Sep 17 00:00:00 2001 +From 99cf80b8b86145759bbb0574fb6c60909115ec81 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 May 2021 17:01:46 +0200 -Subject: [PATCH 654/803] drm/vc4: crtc: Pass the drm_atomic_state to config_pv +Subject: [PATCH 653/834] drm/vc4: crtc: Pass the drm_atomic_state to config_pv The vc4_crtc_config_pv will need to access the drm_atomic_state structure and its only parent function, vc4_crtc_atomic_enable already @@ -224454,10 +224388,10 @@ index 1d1ae0d9e48f..513c75288131 100644 2.18.4 -From 4e307e9e849e0a230740364f8a50bd1626a8826b Mon Sep 17 00:00:00 2001 +From 7ce38b11cd55ec2a58593645687875887dc7a385 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 May 2021 17:07:07 +0200 -Subject: [PATCH 655/803] drm/vc4: crtc: Fix vc4_get_crtc_encoder logic +Subject: [PATCH 654/834] drm/vc4: crtc: Fix vc4_get_crtc_encoder logic The vc4_get_crtc_encoder function currently only works when the connector->state->crtc pointer is set, which is only true when the @@ -224543,10 +224477,10 @@ index 513c75288131..a813b7de60ef 100644 2.18.4 -From 6898fadd6b81359a277e50ca0310626a66664ea5 Mon Sep 17 00:00:00 2001 +From a4d48e65a5ac6d2b922f41c5ec99fb321e820e67 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 May 2021 17:15:57 +0200 -Subject: [PATCH 656/803] drm/vc4: crtc: Lookup the encoder from the register +Subject: [PATCH 655/834] drm/vc4: crtc: Lookup the encoder from the register at boot At boot, we can't rely on the vc4_get_crtc_encoder since we don't have a @@ -224653,10 +224587,10 @@ index a813b7de60ef..a0b5503928df 100644 2.18.4 -From 369eed2c6612dc672283f0efdfff1e26f02a5d74 Mon Sep 17 00:00:00 2001 +From 89f43d82793763c2068efc395746cc1057912dd8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 29 Apr 2021 21:58:27 +0200 -Subject: [PATCH 657/803] drm/vc4: hdmi: Simplify the connector state retrieval +Subject: [PATCH 656/834] drm/vc4: hdmi: Simplify the connector state retrieval When we have the entire DRM state, retrieving the connector state only requires the drm_connector pointer. Fortunately for us, we have @@ -224711,10 +224645,10 @@ index 417d3e9954c2..e4bf7f34ddab 100644 2.18.4 -From 39bbd005ec24ec32aa71fd7a42a8c3b9d3acb2cd Mon Sep 17 00:00:00 2001 +From cc0abcfa13b63fc55896be1344a3401a13923989 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 29 Apr 2021 11:08:52 +0200 -Subject: [PATCH 658/803] drm/vc4: hdmi: Rely on interrupts to handle hotplug +Subject: [PATCH 657/834] drm/vc4: hdmi: Rely on interrupts to handle hotplug DRM currently polls for the HDMI connector status every 10s, which can be an issue when we connect/disconnect a display quickly or the device @@ -224795,10 +224729,10 @@ index e4bf7f34ddab..8bd32a639622 100644 2.18.4 -From a852f0c17735d83bea5f2507ac0f66c60a492c51 Mon Sep 17 00:00:00 2001 +From 42824de8c1dfbaf6dc23b2e8d6f501be4cd64881 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 May 2021 15:28:21 +0200 -Subject: [PATCH 659/803] drm/vc4: hdmi: Add a workqueue to set scrambling +Subject: [PATCH 658/834] drm/vc4: hdmi: Add a workqueue to set scrambling It looks like some displays (like the LG 27UL850-W) don't enable the scrambling when the HDMI driver enables it. However, if we set later the @@ -224894,10 +224828,10 @@ index 23e8cfc22c4d..67c372d743cb 100644 2.18.4 -From 60df68a24e02295b471b5ebe47ac4edc240a6b5f Mon Sep 17 00:00:00 2001 +From 50a5263c197999c838e3f2436e0d5ec8bd083c7f Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Fri, 7 May 2021 17:22:53 +0100 -Subject: [PATCH 660/803] vc4/drm: hdmi: Fix missing declaration +Subject: [PATCH 659/834] vc4/drm: hdmi: Fix missing declaration Fixes: 671a8068ee5feae1d92e6d48027fa8de062e2af2 Signed-off-by: Dom Cobley @@ -224921,10 +224855,10 @@ index b636cbcdd241..93a22bb4f6ea 100644 2.18.4 -From 55009ec214724375ed1caddb88f490dd223161b6 Mon Sep 17 00:00:00 2001 +From 0a9372d2d85bab701cc2d354830aaa8639ae5a7a Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Sun, 28 Mar 2021 21:46:09 +0200 -Subject: [PATCH 661/803] overlays: merus-amp: remove spi override +Subject: [PATCH 660/834] overlays: merus-amp: remove spi override Signed-off-by: AMuszkat --- @@ -224954,10 +224888,10 @@ index bbffd7d26324..4501fbdc253d 100644 2.18.4 -From 18d27e540306fac142364e683f32f16ad457e2b2 Mon Sep 17 00:00:00 2001 +From dce5cca04c65dd43144f05207d889804c73a2e50 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 10 May 2021 22:04:44 +0100 -Subject: [PATCH 662/803] configs: Add NF_LOG_ARP=m and NF_LOG_NETDEV=m +Subject: [PATCH 661/834] configs: Add NF_LOG_ARP=m and NF_LOG_NETDEV=m See: https://github.com/raspberrypi/linux/issues/3615 @@ -225074,10 +225008,10 @@ index c38726720f27..e10614d666dd 100644 2.18.4 -From 3296657c9a15077c3cb310f22f649e33626e3263 Mon Sep 17 00:00:00 2001 +From 45d5517786700fe632f5d5f050a51a21f6586fab Mon Sep 17 00:00:00 2001 From: David Plowman Date: Tue, 11 May 2021 12:52:26 +0100 -Subject: [PATCH 663/803] media: i2c: ov5647: Correct pixel array offset +Subject: [PATCH 662/834] media: i2c: ov5647: Correct pixel array offset The top offset in the pixel array is actually 6 (see page 3-1 of the OV5647 data sheet). @@ -225105,10 +225039,10 @@ index 40d0d45a2481..90486b528908 100644 2.18.4 -From 371a011f24c945d1abacd0375c32905a23555192 Mon Sep 17 00:00:00 2001 +From 17b3b961e4c88320128140b5e2c759edb6154d47 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Tue, 11 May 2021 12:57:22 +0100 -Subject: [PATCH 664/803] media: i2c: ov5647: Correct minimum VBLANK value +Subject: [PATCH 663/834] media: i2c: ov5647: Correct minimum VBLANK value Trial and error reveals that the minimum vblank value appears to be 24 (the OV5647 data sheet does not give any clues). This fixes streaming @@ -225137,10 +225071,10 @@ index 90486b528908..0437ae2d8dbe 100644 2.18.4 -From c0beca935ff5fd687f0b75b9de2e3e7729fe7602 Mon Sep 17 00:00:00 2001 +From 307d4f23e3902205003b8869edb8e04a03947da4 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 12 May 2021 07:39:21 +0100 -Subject: [PATCH 665/803] media: i2c: ov5647: Fix v4l2-compliance failure +Subject: [PATCH 664/834] media: i2c: ov5647: Fix v4l2-compliance failure subscribing to events Fixes the following v4l2-compliance failure: @@ -225177,10 +225111,10 @@ index 0437ae2d8dbe..98a5329d68fb 100644 2.18.4 -From 5c53ceea474dd4eeaa4189baa82d1ddce5329568 Mon Sep 17 00:00:00 2001 +From e5512b17c57d2574e100e46caafde3cbf2d2e09f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 12 May 2021 16:44:11 +0100 -Subject: [PATCH 666/803] dtoverlays: Add pinctrl-names to i2c0 overlay. +Subject: [PATCH 665/834] dtoverlays: Add pinctrl-names to i2c0 overlay. Using dtoverlay=i2c0 failed to set up the pinctrl nodes as pinctrl-name = "default"; was missing from the i2c0if node. @@ -225208,10 +225142,10 @@ index 7c6771f84d8e..058f1cb76c69 100644 2.18.4 -From a15e5665099ab7f1acbd011d9079883d206aed10 Mon Sep 17 00:00:00 2001 +From 94fba43996347b4dc935ac057fd61f5e2539b96f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 12 May 2021 16:47:05 +0100 -Subject: [PATCH 667/803] dtoverlays: Update /__symbols__/i2c0 from i2c0 +Subject: [PATCH 666/834] dtoverlays: Update /__symbols__/i2c0 from i2c0 overlay Update the symbol as well as the alias so that other overlays will @@ -225245,10 +225179,10 @@ index 058f1cb76c69..46bf1bf2dc5c 100644 2.18.4 -From b47e801322f76af8c9ae50dd8a104f74da53b4b0 Mon Sep 17 00:00:00 2001 +From 4a74891ac5fe12768e02a95c1ffd047b22e7eeb5 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 21 May 2020 11:49:37 +0100 -Subject: [PATCH 668/803] media: rpivid: Remove the need to have +Subject: [PATCH 667/834] media: rpivid: Remove the need to have num_entry_points set VAAPI H265 has num entry points but never sets it. Allow a VAAPI @@ -226228,10 +226162,10 @@ index e6b07920aa8c..434a366ecfc2 100644 2.18.4 -From 4b0420ad951e01d7bf49a8e346cfe358278812f9 Mon Sep 17 00:00:00 2001 +From 1b5b4eb65d32ab31235e501f87c484b4711822f6 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 11 Mar 2021 12:51:00 +0000 -Subject: [PATCH 669/803] media: rpivid: Convert to MPLANE +Subject: [PATCH 668/834] media: rpivid: Convert to MPLANE Use multi-planar interface rather than single plane interface. This allows dmabufs holding compressed data to be resized. @@ -226571,10 +226505,10 @@ index 9c4f3fb2f9f6..5c0fd9c8a6d7 100644 2.18.4 -From 91dc9bf3a398d831c4ff2b740b826d4eeccbf4e1 Mon Sep 17 00:00:00 2001 +From 996f80aac3424fe795a73c06bdbb68bb385c0143 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 11 Mar 2021 18:43:15 +0000 -Subject: [PATCH 670/803] media: rpivid: Add an enable count to irq claim Qs +Subject: [PATCH 669/834] media: rpivid: Add an enable count to irq claim Qs Add an enable count to the irq Q structures to allow the irq logic to block further callbacks if resources associated with the irq are not @@ -226815,10 +226749,10 @@ index cf4cc8be8a55..ec73a2332b73 100644 2.18.4 -From 62679b5ad0f48e388356830f81bebee61d774fde Mon Sep 17 00:00:00 2001 +From 11b72af352018311b34c1c0293615dbd3d789cfc Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Sun, 21 Mar 2021 16:38:54 -0300 -Subject: [PATCH 671/803] RFC: media: Add media_request_{pin,unpin} API +Subject: [PATCH 670/834] RFC: media: Add media_request_{pin,unpin} API This is probably not the API we will want to add, but it should show what semantics are needed by drivers. @@ -226917,10 +226851,10 @@ index 3cd25a2717ce..0de5c2c94188 100644 2.18.4 -From f9be6c0290c202af97da1da1877afe1b051dd40e Mon Sep 17 00:00:00 2001 +From c7fe61875d9c2cec362517acf252c36dfc84c459 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 11 Mar 2021 19:08:00 +0000 -Subject: [PATCH 672/803] media: rpivid: Add a Pass0 to accumulate slices and +Subject: [PATCH 671/834] media: rpivid: Add a Pass0 to accumulate slices and rework job finish Due to overheads in assembling controls and requests it is worth having @@ -227983,10 +227917,10 @@ index ada6107ab675..396263bb352e 100644 2.18.4 -From bf644c1be4cc9426991eaca3fa041e67a27bfe88 Mon Sep 17 00:00:00 2001 +From fd77a5bf6b7aa59276e965e96c39cf1a0ff18754 Mon Sep 17 00:00:00 2001 From: John Cox Date: Fri, 19 Mar 2021 17:26:09 +0000 -Subject: [PATCH 673/803] Revert "media: v4l2-mem2mem: allow request job buffer +Subject: [PATCH 672/834] Revert "media: v4l2-mem2mem: allow request job buffer processing after job finish" This reverts commit 40ce8267cb747b3a4f526ac2cf2f633a273c92ae. @@ -228262,10 +228196,10 @@ index 260593fffbc8..c203047eb834 100644 2.18.4 -From bec912b37a870ced47ff16c2d5eb4982089cf754 Mon Sep 17 00:00:00 2001 +From 0854f7fbea93fc260a286e097fe6379f2564bf1b Mon Sep 17 00:00:00 2001 From: John Cox Date: Mon, 29 Mar 2021 17:42:16 +0100 -Subject: [PATCH 674/803] media: rpivid: Map cmd buffer directly +Subject: [PATCH 673/834] media: rpivid: Map cmd buffer directly It is unnecessary to have a separate dmabuf to hold the cmd buffer. Map it directly from the kmalloc. @@ -228432,10 +228366,10 @@ index 396263bb352e..2bb86d564b33 100644 2.18.4 -From edd0c515e060c71102b327403da2f48a0396f2b6 Mon Sep 17 00:00:00 2001 +From 2f00b2ffa15bfac364e23997b9b8fb0b38d3fb25 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 1 Apr 2021 16:20:58 +0100 -Subject: [PATCH 675/803] media: rpivid: Improve values returned when setting +Subject: [PATCH 674/834] media: rpivid: Improve values returned when setting output format Guess a better value for the compressed bitstream buffer size @@ -228658,10 +228592,10 @@ index 5c0fd9c8a6d7..a3b228556497 100644 2.18.4 -From 928ab51a32cc4dab69aa78b55ec7d34589e2e427 Mon Sep 17 00:00:00 2001 +From 76482fd2a4fa7d26c87268de587fa215dd41b9d0 Mon Sep 17 00:00:00 2001 From: John Cox Date: Sat, 3 Apr 2021 16:27:03 +0100 -Subject: [PATCH 676/803] media: rpivid: Improve stream_on/off conformance & +Subject: [PATCH 675/834] media: rpivid: Improve stream_on/off conformance & clock setup Fix stream on & off such that failures leave the driver in the correct @@ -228930,10 +228864,10 @@ index 3d882a6853a5..705015890e71 100644 2.18.4 -From 6f73d4c37ff2d0b8ee74af6e4c9278827521b341 Mon Sep 17 00:00:00 2001 +From 1c071864a2764f8e42e731ab525da5c3ca0044e1 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 8 Apr 2021 18:34:09 +0100 -Subject: [PATCH 677/803] media: rpivid: Improve SPS/PPS error +Subject: [PATCH 676/834] media: rpivid: Improve SPS/PPS error handling/validation Move size and width checking from bitstream processing to control @@ -229196,10 +229130,10 @@ index ee5a48f26912..bb280b215a2e 100644 2.18.4 -From e677ab294fd6849241f083c995fec2229ef3487f Mon Sep 17 00:00:00 2001 +From 3cf22d803d1fb84107a1811406032409331a5dfb Mon Sep 17 00:00:00 2001 From: menschel Date: Fri, 14 May 2021 14:49:29 +0200 -Subject: [PATCH 678/803] Add CAN_J1939 as module to default build configs +Subject: [PATCH 677/834] Add CAN_J1939 as module to default build configs (#4346) There is a CAN protocol named J1939 which is supported by Linux Kernel @@ -229282,10 +229216,10 @@ index e10614d666dd..f8e5eac69f34 100644 2.18.4 -From af5719acba0a2f45aabe1ac131580ffb1a7646d5 Mon Sep 17 00:00:00 2001 +From 6460743ce5679034645abe30d22b89ffd0c2bee0 Mon Sep 17 00:00:00 2001 From: Mehmet Ahsen <2084476+mehmetahsen@users.noreply.github.com> Date: Fri, 21 May 2021 00:14:29 +0200 -Subject: [PATCH 679/803] overlays: add sensirion sgp30 to i2c-sensor overlay +Subject: [PATCH 678/834] overlays: add sensirion sgp30 to i2c-sensor overlay --- arch/arm/boot/dts/overlays/README | 3 +++ @@ -229346,10 +229280,10 @@ index ce97837b0db5..73c691c6a32f 2.18.4 -From d45922e6b4794f830250d5b0e0b5f80dcf689725 Mon Sep 17 00:00:00 2001 +From e08bc61174e02bca424ee6c9c2203cbdc350ea15 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 21 May 2021 10:05:15 +0100 -Subject: [PATCH 680/803] configs: Add CONFIG_SENSIRION_SGP30=m +Subject: [PATCH 679/834] configs: Add CONFIG_SENSIRION_SGP30=m See: https://github.com/raspberrypi/linux/pull/4355 @@ -229426,10 +229360,10 @@ index f8e5eac69f34..cb052fed296b 100644 2.18.4 -From 5e0ad9090021fcdee5b3d4c9f34e4cad3b6ef8d3 Mon Sep 17 00:00:00 2001 +From 1711c66c8f09020ea2cf5a31db154a7d57f7e417 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 21 May 2021 11:29:52 +0100 -Subject: [PATCH 681/803] overlays: Remove deleted merus-amp parameter +Subject: [PATCH 680/834] overlays: Remove deleted merus-amp parameter Signed-off-by: Phil Elwell --- @@ -229455,10 +229389,10 @@ index 2a7944054d4f..2c7f4791324f 100644 2.18.4 -From b7db58707a96a32131c8f589a877eb41153a7319 Mon Sep 17 00:00:00 2001 +From 502b77915fa0054a99e68407d65d1dccb6e176d2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 22 May 2021 08:55:29 +0100 -Subject: [PATCH 682/803] configs: Add GPIO_PCA953X_IRQ=y +Subject: [PATCH 681/834] configs: Add GPIO_PCA953X_IRQ=y Enable interrupt support for PCA953X GPIO expander. @@ -229537,10 +229471,10 @@ index cb052fed296b..869cb55cbf75 100644 2.18.4 -From e5b5813e276eaba49a84087a5f284915a6a2dc04 Mon Sep 17 00:00:00 2001 +From 040d371344c9f639b88dacb003bdd6f101466bc1 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 11 May 2021 11:51:35 +0200 -Subject: [PATCH 683/803] overlays: add bh1750 and ccs811 to i2c-sensor (#4334) +Subject: [PATCH 682/834] overlays: add bh1750 and ccs811 to i2c-sensor (#4334) See: https://github.com/raspberrypi/linux/pull/4334 --- @@ -229641,10 +229575,10 @@ index 73c691c6a32f..b05b0fa91942 100755 2.18.4 -From 1e5198e9fa986323d6acaea55d10e08de9e02691 Mon Sep 17 00:00:00 2001 +From 2fd6f875ed40cd2f0fb462b4c876b3c9c9245c5c Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 11 May 2021 11:51:59 +0200 -Subject: [PATCH 684/803] configs: add bh1750 and ccs811 to configs (#4334) +Subject: [PATCH 683/834] configs: add bh1750 and ccs811 to configs (#4334) See: https://github.com/raspberrypi/linux/pull/4334 --- @@ -229757,10 +229691,10 @@ index 869cb55cbf75..3200cc4c7225 100644 2.18.4 -From 39c34c47c802eb7a8c1e73e4103d29aa478ad895 Mon Sep 17 00:00:00 2001 +From c5faa5c6774b239210833e9b6ee54384a3dd3fb0 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 2 Dec 2019 14:48:05 +0000 -Subject: [PATCH 685/803] Add Raspberry Pi PoE+ HAT support +Subject: [PATCH 684/834] Add Raspberry Pi PoE+ HAT support Signed-off-by: Serge Schneider --- @@ -230166,10 +230100,10 @@ index 6b393bbe7f52..97ff2a59aa03 100644 2.18.4 -From ead8349bcc03e8b91b8c3e0895e177190aa66ef9 Mon Sep 17 00:00:00 2001 +From 8f8fb8697126839cbd3d11f14be73a769ab580d4 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 2 Dec 2019 14:48:05 +0000 -Subject: [PATCH 686/803] configs: Enable Raspberry Pi PoE+ HAT support +Subject: [PATCH 685/834] configs: Enable Raspberry Pi PoE+ HAT support Signed-off-by: Serge Schneider --- @@ -230244,10 +230178,10 @@ index 3200cc4c7225..10243e0e0658 100644 2.18.4 -From 8ca3fe0ba8ffad686ca48e86fad0a95ac7f80266 Mon Sep 17 00:00:00 2001 +From bb6d97c01aea942b6c37e182bfde2bdbaeffd763 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 2 Dec 2019 14:48:05 +0000 -Subject: [PATCH 687/803] overlays: Add rpi-poe-plus overlay +Subject: [PATCH 686/834] overlays: Add rpi-poe-plus overlay Signed-off-by: Serge Schneider --- @@ -230330,10 +230264,10 @@ index 000000000000..e0138847093b 2.18.4 -From e7679b4359d0589e8006910bb7d8336989c83303 Mon Sep 17 00:00:00 2001 +From 8f22e51217f65abe348ca28cd2284b351db66437 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 21 May 2021 11:15:04 +0100 -Subject: [PATCH 688/803] drm/vc4: FKMS: Change of Broadcast RGB mode needs a +Subject: [PATCH 687/834] drm/vc4: FKMS: Change of Broadcast RGB mode needs a mode change The Broadcast RGB (aka HDMI limited/full range) property is only @@ -230398,10 +230332,10 @@ index 44b1addeb22e..e643bbe96941 100644 2.18.4 -From 3af061346151bdf0515e405457c68a277e63df67 Mon Sep 17 00:00:00 2001 +From dcdaee9ee2d993e8b61940bc94dfb933c86b3714 Mon Sep 17 00:00:00 2001 From: Alex Kurichenko Date: Tue, 1 Jun 2021 01:53:47 +0300 -Subject: [PATCH 689/803] overlays: Add ssd1331-spi support for OLED screen +Subject: [PATCH 688/834] overlays: Add ssd1331-spi support for OLED screen Signed-off-by: Alex Kurichenko --- @@ -230538,10 +230472,10 @@ index 000000000000..9fd5ebf2feda 2.18.4 -From 4a7d037132e65f10b40413d76dca9d8b8163aa4d Mon Sep 17 00:00:00 2001 +From 3a4675a5ef3392fc382647bcf8cb32f28a782521 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Thu, 10 Jun 2021 13:14:05 +0200 -Subject: [PATCH 690/803] Fixes an onboard clock detection problem of the PRO +Subject: [PATCH 689/834] Fixes an onboard clock detection problem of the PRO versions Increasing the sleep time after clock selection to 3-4ms @@ -230584,10 +230518,10 @@ index 8b04d30bcbee..79eccdb4dc8c 100644 2.18.4 -From 5ed0f9d7aa4a682536f4bcae65aba1db60c73455 Mon Sep 17 00:00:00 2001 +From c86a7c88a7c440dae5d64e4c431b57a091c7a02a Mon Sep 17 00:00:00 2001 From: jc-kynesim Date: Fri, 11 Jun 2021 15:14:31 +0100 -Subject: [PATCH 691/803] bcm2835: Allow compressed frames to set sizeimage +Subject: [PATCH 690/834] bcm2835: Allow compressed frames to set sizeimage (#4386) Allow the user to set sizeimage in TRY_FMT and S_FMT if the format @@ -230637,10 +230571,10 @@ index a97666a1a4be..c3ba5c25a2ab 100644 2.18.4 -From 438fb33061f5c9c0c5917062c510e74cec19410c Mon Sep 17 00:00:00 2001 +From a62fb88751ef5f190368b42a066f143360642d0d Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 11 Jun 2021 12:47:07 +0100 -Subject: [PATCH 692/803] media: i2c: imx477: Fix for long exposure limit +Subject: [PATCH 691/834] media: i2c: imx477: Fix for long exposure limit calculations Do not scale IMX477_EXPOSURE_OFFSET with the long exposure factor during @@ -230669,10 +230603,10 @@ index 34bfd22cadc6..b06add219cb4 100644 2.18.4 -From 16e97b9018cc108277b0f1e23b265d44e5c777ac Mon Sep 17 00:00:00 2001 +From f0c36e8a27417f86f93d0ffc749ea2203c5af01c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 14 Jun 2021 15:07:38 +0100 -Subject: [PATCH 693/803] overlays: ghost-amp: Change early-disable sequence +Subject: [PATCH 692/834] overlays: ghost-amp: Change early-disable sequence In the event that the ENABLE signal from the codec goes low before RELAY2 has been enabled, wait until the full 1000ms has elapsed then @@ -230718,10 +230652,10 @@ index dbedb4b76c74..7509e00679c8 100644 2.18.4 -From 23d1bba3c4b70e7be66fbac0f7275d5efa2e4e50 Mon Sep 17 00:00:00 2001 +From bdc4a48f70b3db3f9cf35738e7863780858407c2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 31 May 2021 17:52:24 +0200 -Subject: [PATCH 694/803] drm: Introduce new state accessors in place of +Subject: [PATCH 693/834] drm: Introduce new state accessors in place of drm_atomic_get_crtc_state drm_atomic_get_crtc_state relies on drm_atomic_get_existing_crtc_state @@ -230886,10 +230820,10 @@ index d07c851d255b..feec1676fc03 100644 2.18.4 -From 41e56c41653006d65e216424b91119d8610b43a3 Mon Sep 17 00:00:00 2001 +From a2c7be6a856d32592c3da09282d134689eb16681 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 26 May 2021 16:07:01 +0200 -Subject: [PATCH 695/803] drm/vc4: Make vc4_crtc_get_encoder public +Subject: [PATCH 694/834] drm/vc4: Make vc4_crtc_get_encoder public We'll need that function in vc4_kms to compute the core clock rate requirements. @@ -230939,10 +230873,10 @@ index ca435d24b7dc..96cc262cb174 100644 2.18.4 -From 5fdc0749710a8434fc0d66b6da23d13c35f5f753 Mon Sep 17 00:00:00 2001 +From 93074386f064a9a28f9d5ea0cea4720f1c8158bc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 26 May 2021 16:13:02 +0200 -Subject: [PATCH 696/803] drm/vc4: Increase the core clock based on HVS load +Subject: [PATCH 695/834] drm/vc4: Increase the core clock based on HVS load Depending on a given HVS output (HVS to PixelValves) and input (planes attached to a channel) load, the HVS needs for the core clock to be @@ -231128,10 +231062,10 @@ index 48e3dc11c493..962d3f4397ae 100644 2.18.4 -From c26e18f1ba47cc29d798df1fc9608f6b0666e2e2 Mon Sep 17 00:00:00 2001 +From 22038e7861331f8c772613ba25d81a19397992b7 Mon Sep 17 00:00:00 2001 From: Sia Jee Heng Date: Thu, 4 Feb 2021 09:42:55 +0800 -Subject: [PATCH 697/803] ASoC: codec: hdmi-codec: Support IEC958 encoded PCM +Subject: [PATCH 696/834] ASoC: codec: hdmi-codec: Support IEC958 encoded PCM format Existing hdmi-codec driver only support standard pcm format. @@ -231189,10 +231123,10 @@ index 403d4c6a49a8..e071add934b7 100644 2.18.4 -From bb55c6d63a32b1bd0f59beee859081c807554108 Mon Sep 17 00:00:00 2001 +From cdea0c58c7069f1dc642ea72b1277b4f606573d0 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 28 Apr 2021 11:56:26 +0200 -Subject: [PATCH 698/803] ASoC: hdmi-codec: Rework to support more controls +Subject: [PATCH 697/834] ASoC: hdmi-codec: Rework to support more controls We're going to add more controls to support the IEC958 output, so let's rework the control registration a bit to support more of them. @@ -231271,10 +231205,10 @@ index e071add934b7..f0cd210704e2 100644 2.18.4 -From 9d3fdd282808f8ac5f4dcd0af72efc4a88011c9d Mon Sep 17 00:00:00 2001 +From 0f794be5b9c3046fdcc2b532704ccc24d9692693 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 28 Apr 2021 15:29:13 +0200 -Subject: [PATCH 699/803] snd: iec958: split status creation and fill +Subject: [PATCH 698/834] snd: iec958: split status creation and fill In some situations, like a codec probe, we need to provide an IEC status default but don't have access to the sampling rate and width yet since @@ -231488,10 +231422,10 @@ index f9a211cc1f2c..a60908efe159 100644 2.18.4 -From f1b2436feab58dae4c83140135d3d05120b0fdf8 Mon Sep 17 00:00:00 2001 +From 08af9552f05a62ffac731e80578629ce77db7933 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 28 Apr 2021 15:29:51 +0200 -Subject: [PATCH 700/803] ASoC: hdmi-codec: Add iec958 controls +Subject: [PATCH 699/834] ASoC: hdmi-codec: Add iec958 controls Signed-off-by: Maxime Ripard --- @@ -231607,10 +231541,10 @@ index f0cd210704e2..1320a9af9d35 100644 2.18.4 -From 34742fd97a03003fc00690314cb8554985d95474 Mon Sep 17 00:00:00 2001 +From 09dbd75774b34cb50bdca4c8a5ff2f912e9e4c48 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 30 Apr 2021 14:22:06 +0200 -Subject: [PATCH 701/803] ASoC: hdmi-codec: Add a prepare hook +Subject: [PATCH 700/834] ASoC: hdmi-codec: Add a prepare hook The IEC958 status bit is usually set by the userspace after hw_params has been called, so in order to use whatever is set by the userspace, we @@ -231816,10 +231750,10 @@ index 1320a9af9d35..b9e96d7ed00b 100644 2.18.4 -From 6bbb3d92d3f366bcd3c39b90ce53eeb2d6331f1a Mon Sep 17 00:00:00 2001 +From 2688f5333308f836eafa60fd6a2662ab88a2de67 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 26 Apr 2021 14:42:26 +0200 -Subject: [PATCH 702/803] drm/vc4: Register HDMI codec +Subject: [PATCH 701/834] drm/vc4: Register HDMI codec The hdmi-codec brings a lot of advanced features, including the HDMI channel mapping. Let's use it in our driver instead of our own codec. @@ -232726,10 +232660,10 @@ index 67c372d743cb..b91b0257dde2 100644 2.18.4 -From faf4ba26ee67b07c4c7c5b923e84be37b14480ea Mon Sep 17 00:00:00 2001 +From 546ef679d7342d6897b595dee27f6405f7a6823f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 27 Apr 2021 16:26:39 +0200 -Subject: [PATCH 703/803] drm/vc4: hdmi: Remove redundant variables +Subject: [PATCH 702/834] drm/vc4: hdmi: Remove redundant variables Signed-off-by: Maxime Ripard --- @@ -232848,10 +232782,10 @@ index b91b0257dde2..295962d83741 100644 2.18.4 -From 2fe386c92bf302057f7bc9254b7867ce57b6f2e9 Mon Sep 17 00:00:00 2001 +From d080d65284ef0c34e3c906eaad760f61c13e44dc Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 28 Apr 2021 16:10:02 +0200 -Subject: [PATCH 704/803] ARM: dts: bcm2711: Tune DMA parameters for HDMI audio +Subject: [PATCH 703/834] ARM: dts: bcm2711: Tune DMA parameters for HDMI audio Enable NO_WAIT_RESP, DMA_WIDE_SOURCE, DMA_WIDE_DEST, and bump the DMA panic and AXI priorities to avoid any DMA transfer error with HBR audio @@ -232864,7 +232798,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index e8434edc2bff..ef78c6e5f437 100644 +index 2604ccfb6a6b..c6b496f364c3 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -359,7 +359,7 @@ @@ -232889,10 +232823,10 @@ index e8434edc2bff..ef78c6e5f437 100644 2.18.4 -From 6a594e882279064a069e132a95271e13b5497607 Mon Sep 17 00:00:00 2001 +From 4a827e9c0565f30681b04bcf59cab23dfd73a534 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 16 Jun 2021 17:44:04 +0100 -Subject: [PATCH 705/803] configs: Enable Anbox support on arm64 builds +Subject: [PATCH 704/834] configs: Enable Anbox support on arm64 builds In order to allow containerised Android apps to run, add the following config settings on 64-bit builds: @@ -232961,10 +232895,10 @@ index 10243e0e0658..8a2c42e5d73b 100644 2.18.4 -From 454b32174b512f52c8dc1bca2860c64f7a084ba1 Mon Sep 17 00:00:00 2001 +From 375d233f4f8943564b1748cf33c70040ef3abce7 Mon Sep 17 00:00:00 2001 From: davidschillerJKU Date: Thu, 17 Jun 2021 09:55:45 +0200 -Subject: [PATCH 706/803] configs: add CONFIG_IR_TOY=m +Subject: [PATCH 705/834] configs: add CONFIG_IR_TOY=m This enables support for the Infrared Toy / Irdroid series of infrared transceivers @@ -233040,10 +232974,10 @@ index 8a2c42e5d73b..456b3000e6d6 100644 2.18.4 -From 70d058d88c0943d18e959d2396c534cb04f58536 Mon Sep 17 00:00:00 2001 +From 1a6a73508a836c72d92ef8ef685e1164277c5b9b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Nov 2017 17:14:54 +0000 -Subject: [PATCH 707/803] cgroup: Disable cgroup "memory" by default +Subject: [PATCH 706/834] cgroup: Disable cgroup "memory" by default Some Raspberry Pis have limited RAM and most users won't use the cgroup memory support so it is disabled by default. Enable with: @@ -233131,10 +233065,10 @@ index c8b811e039cc..b4ada2e9f499 100644 2.18.4 -From c0a97ad1efecf9c75d74c0736f213b559d509ad8 Mon Sep 17 00:00:00 2001 +From e3d734214e722429eb750ecb2767f0227b831432 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 17 Jun 2021 12:05:25 +0100 -Subject: [PATCH 708/803] media: i2c: imx290: Support 60fps in 2 lane operation +Subject: [PATCH 707/834] media: i2c: imx290: Support 60fps in 2 lane operation Commit "97589ad61c73 media: i2c: imx290: Add support for 2 data lanes" added support for running in two lane mode (instead of 4), but @@ -233446,10 +233380,10 @@ index 255f66985306..d2e7360712f5 100644 2.18.4 -From 5552c4b472736c5dc6d05135be6f1b7e3a327467 Mon Sep 17 00:00:00 2001 +From 85c412422c27b0a2b14853c2bd317dfa377408cc Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 17 Jun 2021 13:00:39 +0100 -Subject: [PATCH 709/803] media: i2c: imx290: Fix the pixel rate at 148.5Mpix/s +Subject: [PATCH 708/834] media: i2c: imx290: Fix the pixel rate at 148.5Mpix/s Whilst the datasheet lists the link frequency changing between 1080p and 720p modes, reality is that with the default blanking @@ -233501,10 +233435,10 @@ index d2e7360712f5..f13a0dd66351 100644 2.18.4 -From d854c0f779c71a73df8434a1c416dce44a7b28aa Mon Sep 17 00:00:00 2001 +From db2e02a4d28fca16c82a6330ae020d58f446ff17 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 17 Jun 2021 17:27:46 +0100 -Subject: [PATCH 710/803] media: i2c: imx290: Fix clock setup register +Subject: [PATCH 709/834] media: i2c: imx290: Fix clock setup register assignments When the clock setups were added for the alternate external clocks, @@ -233556,10 +233490,10 @@ index f13a0dd66351..24a7dee571cd 100644 2.18.4 -From fb2213d013c2b2cefcb5dec97e49c9090f105418 Mon Sep 17 00:00:00 2001 +From 6b35c342c40006c06748c7a0013340723cb92ddd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 21 Jun 2021 17:29:22 +0200 -Subject: [PATCH 711/803] Revert "drm/vc4: Increase the core clock based on HVS +Subject: [PATCH 710/834] Revert "drm/vc4: Increase the core clock based on HVS load" This reverts commit 1c3834201272ba6ae214af5f57acf0ece55142a5. @@ -233739,10 +233673,10 @@ index 962d3f4397ae..48e3dc11c493 100644 2.18.4 -From 200d13284d14f09b8a755669d3f206a79d4e210f Mon Sep 17 00:00:00 2001 +From 428d91dc3d6ce68937e2ed1a1aa63cee5ecdd9cb Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 23 Jun 2021 10:57:22 +0200 -Subject: [PATCH 712/803] Revert "drm: Introduce new state accessors in place +Subject: [PATCH 711/834] Revert "drm: Introduce new state accessors in place of drm_atomic_get_crtc_state" This reverts commit 040d0dd82dbfad11984b696e35beb56906f8f4a7. @@ -233895,10 +233829,10 @@ index feec1676fc03..d07c851d255b 100644 2.18.4 -From 84999a71c76294d9573a561e6e101462e9aff300 Mon Sep 17 00:00:00 2001 +From 6c4b01ff5dc58c415225be3121ae61c6d6ccce46 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 14 Jun 2021 15:27:24 +0200 -Subject: [PATCH 713/803] drm/vc4: crtc: Add encoder to vc4_crtc_config_pv +Subject: [PATCH 712/834] drm/vc4: crtc: Add encoder to vc4_crtc_config_pv prototype vc4_crtc_config_pv() retrieves the encoder again, even though its only @@ -233944,10 +233878,10 @@ index cea2cb87973c..5171c8ef9720 100644 2.18.4 -From ae84a6518f04a73b9e5c2408c968c4970c9da66d Mon Sep 17 00:00:00 2001 +From 967c4a7af789317ad56d42fdc054e3b8ea533d2d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 21 Jun 2021 16:07:22 +0200 -Subject: [PATCH 714/803] drm/vc4: crtc: Rework the encoder retrieval code +Subject: [PATCH 713/834] drm/vc4: crtc: Rework the encoder retrieval code (again) It turns out the encoder retrieval code, in addition to being @@ -234047,10 +233981,10 @@ index 96cc262cb174..c38fa9718e1c 100644 2.18.4 -From c6cc134a57fdeb18e45120d47dd3c9692825b5ee Mon Sep 17 00:00:00 2001 +From e76308f20183b19bc285a094c5893522e9a351ae Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 21 Jun 2021 16:13:02 +0200 -Subject: [PATCH 715/803] drm/vc4: crtc: Add some logging +Subject: [PATCH 714/834] drm/vc4: crtc: Add some logging The encoder retrieval code has been a source of bugs and glitches in the past and the crtc <-> encoder association been wrong in a number of @@ -234091,10 +234025,10 @@ index 44249f8a6877..651b1d67591c 100644 2.18.4 -From 3fdf1e8ec575537dba7465625b92694b25555ddb Mon Sep 17 00:00:00 2001 +From 9c092501e54ab9e159b61fc97feba2b191270c96 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 21 Jun 2021 17:19:22 +0200 -Subject: [PATCH 716/803] drm/vc4: Leverage the load tracker on the BCM2711 +Subject: [PATCH 715/834] drm/vc4: Leverage the load tracker on the BCM2711 The load tracker was initially designed to report and warn about a load too high for the HVS. To do so, it computes for each plane the impact @@ -234224,10 +234158,10 @@ index 26ea1f9dd7b3..333335f3c561 100644 2.18.4 -From acebafb193b0151ffa9aea921389b3f8a44e846c Mon Sep 17 00:00:00 2001 +From 90c81d1d576ee2421d61ae0f7f1fa5f9e70af27a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 26 May 2021 16:13:02 +0200 -Subject: [PATCH 717/803] drm/vc4: Increase the core clock based on HVS load +Subject: [PATCH 716/834] drm/vc4: Increase the core clock based on HVS load Depending on a given HVS output (HVS to PixelValves) and input (planes attached to a channel) load, the HVS needs for the core clock to be @@ -234483,10 +234417,10 @@ index e7dcb64b05ef..e77135b6985c 100644 2.18.4 -From 2e5efefb14f543924e6edce2699c7efab06b67ab Mon Sep 17 00:00:00 2001 +From 5c38c5c67ecacc37f911420912d4f44c33e160b7 Mon Sep 17 00:00:00 2001 From: kFYatek <4499762+kFYatek@users.noreply.github.com> Date: Wed, 23 Jun 2021 01:11:26 +0200 -Subject: [PATCH 718/803] drm/vc4: Fix timings for interlaced modes +Subject: [PATCH 717/834] drm/vc4: Fix timings for interlaced modes Increase the number of post-sync blanking lines on odd fields instead of decreasing it on even fields. This makes the total number of lines @@ -234574,10 +234508,10 @@ index 7035c27e84e3..9b62e6225fd0 100644 2.18.4 -From 005475214ba0b60a89060a1472df63c9f3167432 Mon Sep 17 00:00:00 2001 +From b60ab79bd1b3b1d28df89bf60e19dc2bd1cb91cc Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 24 Jun 2021 12:00:49 +0100 -Subject: [PATCH 719/803] drm/vc4: Don't create hvs_load_tracker on fkms +Subject: [PATCH 718/834] drm/vc4: Don't create hvs_load_tracker on fkms fkms doesn't use vc4->hvs so protect against that @@ -234603,10 +234537,10 @@ index d7104d8826f2..a95d88fea8d2 100644 2.18.4 -From b08f8afa5289e1c6b766989cc447a2aac77eb0fd Mon Sep 17 00:00:00 2001 +From f465dc8ada96dac47e5faba7f2556d09b78335b4 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 24 Jun 2021 14:43:49 +0100 -Subject: [PATCH 720/803] media: rpivid: Fix H265 aux ent reuse of the same +Subject: [PATCH 719/834] media: rpivid: Fix H265 aux ent reuse of the same slot It is legitimate, though unusual, for an aux ent associated with a slot @@ -234760,10 +234694,10 @@ index bb280b215a2e..a5a0e31bd5ba 100644 2.18.4 -From a4604cd7e2d6d136fa014a0ddf05fa1d0ef086c5 Mon Sep 17 00:00:00 2001 +From 69f03f7a761e3da2b4f42dc2294f411d64d9c38e Mon Sep 17 00:00:00 2001 From: Joerg Quinten Date: Fri, 18 Jun 2021 13:02:29 +0200 -Subject: [PATCH 721/803] Support RPi DPI interface in mode6 for 18-bit color +Subject: [PATCH 720/834] Support RPi DPI interface in mode6 for 18-bit color A matching media bus format was added and an overlay for using it, both with FB and VC4 was added as well. @@ -234988,10 +234922,10 @@ index 3c2848e91c1b..c4abd49af073 100644 2.18.4 -From adb56612e2924f515ef88a56c2374bd5b33efc41 Mon Sep 17 00:00:00 2001 +From 6584fb37ae7dbecd46a9fccaca8e073d8fb7c024 Mon Sep 17 00:00:00 2001 From: Joerg Quinten Date: Mon, 21 Jun 2021 16:10:32 +0200 -Subject: [PATCH 722/803] overlays: Add dpi18cpadhi, vc4-kms-dpi-at056tn53v1 +Subject: [PATCH 721/834] overlays: Add dpi18cpadhi, vc4-kms-dpi-at056tn53v1 Signed-off-by: Joerg Quinten --- @@ -235167,10 +235101,10 @@ index 000000000000..f7181c9828bf 2.18.4 -From aa042bf65fd92e65300679ef308c1700ec2632d6 Mon Sep 17 00:00:00 2001 +From 83413bd1ffdc2928534828aff7fcc2b0e007d29b Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 24 Jun 2021 17:58:05 +0100 -Subject: [PATCH 723/803] drm: vc4: Fix pixel-wrap issue with DVP teardown +Subject: [PATCH 722/834] drm: vc4: Fix pixel-wrap issue with DVP teardown Adjust the DVP enable/disable sequence to avoid a pixel getting stuck in an internal, non resettable FIFO within PixelValve when changing @@ -235235,10 +235169,10 @@ index 9b62e6225fd0..2d6291a0ca5d 100644 2.18.4 -From ada676eb045fe061182b24f0c4cd68c5eab946fb Mon Sep 17 00:00:00 2001 +From bc588e6a48827966e435816e7807ff059d79662a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 28 Jun 2021 11:15:13 +0200 -Subject: [PATCH 724/803] drm/vc4: Increase the core clock to a minimum of +Subject: [PATCH 723/834] drm/vc4: Increase the core clock to a minimum of 500MHz The core clock needs to be raised temporarily during a modeset to @@ -235282,10 +235216,10 @@ index e77135b6985c..7d159b32abba 100644 2.18.4 -From 2fd6db8e4fa99cc45e09cbe0ea73aabb4be470a5 Mon Sep 17 00:00:00 2001 +From 29e0368d696a8e1313bcb0c543d15329c77dc474 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 28 Jun 2021 10:49:04 +0100 -Subject: [PATCH 725/803] media: i2c: ov9281: Remove override of subdev name +Subject: [PATCH 724/834] media: i2c: ov9281: Remove override of subdev name From the original Rockchip driver, the subdev was renamed from the default to being "mov9281 " whereas the @@ -235316,10 +235250,10 @@ index 16777b6f8e14..6bfc79cd5897 100644 2.18.4 -From 41245a669b10c777328f55ddc643ecf1d4749513 Mon Sep 17 00:00:00 2001 +From ddca1754e7f454d0d4e3020868fdda7c0182a78c Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 28 Jun 2021 16:07:16 +0200 -Subject: [PATCH 726/803] drm/vc4: hdmi: Use a fixed rate for the HSM clock on +Subject: [PATCH 725/834] drm/vc4: hdmi: Use a fixed rate for the HSM clock on BCM2835 Before the introduction of the BCM2711 support, the HSM clock rate was @@ -235464,10 +235398,10 @@ index 295962d83741..49fc91962fe4 100644 2.18.4 -From 6119b1498fde764879cde90cb93401c741029000 Mon Sep 17 00:00:00 2001 +From e01c84757afb70f0c7159702001ac8bd79711fb9 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 25 Jun 2021 16:22:39 +0200 -Subject: [PATCH 727/803] drm/vc4: hdmi: Enable the scrambler on reconnection +Subject: [PATCH 726/834] drm/vc4: hdmi: Enable the scrambler on reconnection If we have a state already and disconnect/reconnect the display, the SCDC messages won't be sent again since we didn't go through a disable / @@ -235524,10 +235458,10 @@ index ca0016f032e7..e26622099ad5 100644 2.18.4 -From d4333e420abc618080f96624135be01f733ddbb5 Mon Sep 17 00:00:00 2001 +From 4f83a375c3409cf426335cbf3e876588d8e21000 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 May 2021 16:40:19 +0200 -Subject: [PATCH 728/803] drm/vc4: hdmi: Make sure the controller is powered in +Subject: [PATCH 727/834] drm/vc4: hdmi: Make sure the controller is powered in detect If the HPD GPIO is not available and drm_probe_ddc fails, we end up @@ -235590,10 +235524,10 @@ index e26622099ad5..c406b57d1ed1 100644 2.18.4 -From e88911aa798d3a7f2bcb84332991ad69501c42cc Mon Sep 17 00:00:00 2001 +From 14b06f5e9142aa05c54d3f279f1cd0fe66216202 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 29 Jun 2021 09:20:09 +0100 -Subject: [PATCH 729/803] configs: Add CONFIG_MACVTAP=m (arm64 only) +Subject: [PATCH 728/834] configs: Add CONFIG_MACVTAP=m (arm64 only) From the requesting issue: @@ -235637,10 +235571,10 @@ index 456b3000e6d6..da84139ca6ca 100644 2.18.4 -From 35ef8976c48c6b8e10d9f95d787c877eefe308a3 Mon Sep 17 00:00:00 2001 +From 14e484213da72b78ba2e8536a1ddd12793880c93 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 29 Jun 2021 12:50:58 +0100 -Subject: [PATCH 730/803] staging: vc04_services: isp: Set the YUV420/YVU420 +Subject: [PATCH 729/834] staging: vc04_services: isp: Set the YUV420/YVU420 format stride to 64 bytes The bcm2835 ISP requires the base address of all input/output planes to have 32 @@ -235682,10 +235616,10 @@ index 7541fb316cb9..f6d6c88d13ba 100644 2.18.4 -From c94f56feb515a615090e6cc97c1c7a04d7b73a8e Mon Sep 17 00:00:00 2001 +From 55d263ca3283511e1d829f8aa38a518e02021c67 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Tue, 29 Jun 2021 14:38:23 +0100 -Subject: [PATCH 731/803] Documentation: devicetree: Add documentation for +Subject: [PATCH 730/834] Documentation: devicetree: Add documentation for imx378 sensor The imx378 sensor is compatible with the imx477 and shares common @@ -235833,10 +235767,10 @@ index 937b6a1f99ec..1e0aa06f159d 100644 2.18.4 -From c7046afcd929949fc10d15c8268c799adacca80a Mon Sep 17 00:00:00 2001 +From aee985276c6402ea033e13eb30d332aa1be715e8 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Tue, 29 Jun 2021 14:41:15 +0100 -Subject: [PATCH 732/803] overlays: Add overlay for imx378 sensor +Subject: [PATCH 731/834] overlays: Add overlay for imx378 sensor This is based off a common overlay which is now also used by the imx477 sensor. @@ -236137,10 +236071,10 @@ index 000000000000..4e444709cc16 2.18.4 -From f6c0bb86b39e5a5b21aabbddfed62ee124c5ee98 Mon Sep 17 00:00:00 2001 +From 0109d70d15bc1ee47f82d3b292218c0dac6b1f84 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Tue, 29 Jun 2021 14:43:01 +0100 -Subject: [PATCH 733/803] media: i2c: imx477: Extend driver to support imx378 +Subject: [PATCH 732/834] media: i2c: imx477: Extend driver to support imx378 sensor The imx378 sensor is almost identical to the imx477 and can be @@ -236335,10 +236269,10 @@ index b06add219cb4..521953e71686 100644 2.18.4 -From 4d2ebf8b954c8074551f5821b9ee862bf70d607f Mon Sep 17 00:00:00 2001 +From e4ccebecc9b72ae2b4163efdca1ebb6d6c123040 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Jun 2021 17:03:00 +0100 -Subject: [PATCH 734/803] overlays: Make i2c-rtc and i2c-rtc-gpio share RTCs +Subject: [PATCH 733/834] overlays: Make i2c-rtc and i2c-rtc-gpio share RTCs Lift the set of RTCs out of i2c-rtc and i2c-rtc-gpio to update i2c-rtc-gpio and to reduce duplication. @@ -237266,10 +237200,10 @@ index b9842e11b5e0..1eae9e1a5c96 100644 2.18.4 -From 31279c2dc441a4cce289419786aaa34e80ddea75 Mon Sep 17 00:00:00 2001 +From 165318b2c3120d54362348927528ecfd72df09c2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 23 Jun 2021 11:47:38 +0200 -Subject: [PATCH 735/803] dt-bindings: clk: raspberrypi: Remove unused property +Subject: [PATCH 734/834] dt-bindings: clk: raspberrypi: Remove unused property The raspberrypi,firmware property has been documented as required in the binding but was never actually used in the final version of the binding. @@ -237312,10 +237246,10 @@ index d37bc311321d..2047e25700c6 100644 2.18.4 -From 98fa2302c94921c954e07c47863bd01eeb83604d Mon Sep 17 00:00:00 2001 +From b5ddbe2fd84036f1ba1e9ee2c396c2069d432b74 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 23 Jun 2021 11:48:35 +0200 -Subject: [PATCH 736/803] dt-bindings: display: vc4: Add phandle to the +Subject: [PATCH 735/834] dt-bindings: display: vc4: Add phandle to the firmware The vc4 driver will need to tell the firmware that it takes over the @@ -237349,10 +237283,10 @@ index 49a5e041aa49..eac739a812f5 100644 2.18.4 -From 861c1fd6b69911ebd93541793d93e57146ff9772 Mon Sep 17 00:00:00 2001 +From 24686b46dbd81ad761cdb779060d0b8a86b9799c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 23 Jun 2021 11:53:46 +0200 -Subject: [PATCH 737/803] firmware: raspberrypi: Add +Subject: [PATCH 736/834] firmware: raspberrypi: Add RPI_FIRMWARE_NOTIFY_DISPLAY_DONE The RPI_FIRMWARE_NOTIFY_DISPLAY_DONE firmware call allows to tell the @@ -237380,10 +237314,10 @@ index 97ff2a59aa03..cc0a0bc8d1e6 100644 2.18.4 -From f1c93074734437f3711240a10387ba2440332c70 Mon Sep 17 00:00:00 2001 +From d0121e32aa941f7dd646413b11a18a42116f8c47 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 25 Jun 2021 17:01:33 +0200 -Subject: [PATCH 738/803] drm/vc4: Remove conflicting framebuffers before +Subject: [PATCH 737/834] drm/vc4: Remove conflicting framebuffers before callind bind_all The bind hooks will modify their controller registers, so simplefb is @@ -237421,10 +237355,10 @@ index 3683780b9de8..9b9d088a3131 100644 2.18.4 -From 8d8af7e979bc441c17e6edb793953367fc4fe022 Mon Sep 17 00:00:00 2001 +From 49d4283dfaa152258d5d7c4acf2f7c1b4b816d37 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 23 Jun 2021 11:54:58 +0200 -Subject: [PATCH 739/803] drm/vc4: Notify the firmware when DRM is in charge +Subject: [PATCH 738/834] drm/vc4: Notify the firmware when DRM is in charge Once the call to drm_fb_helper_remove_conflicting_framebuffers() has been made, simplefb has been unregistered and the KMS driver is entirely @@ -237481,10 +237415,10 @@ index 9b9d088a3131..0d343e08fb18 100644 2.18.4 -From 664333737d59cdfb1da206a7f1fdc39060256a4c Mon Sep 17 00:00:00 2001 +From e0fa3d69e5d520e32650a5cbd9113d82e16f8d99 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 23 Jun 2021 11:56:56 +0200 -Subject: [PATCH 740/803] ARM: dts: rpi: Add the firmware node to vc4 +Subject: [PATCH 739/834] ARM: dts: rpi: Add the firmware node to vc4 Add the firmware phandle to the vc4 node so that we can send it the message that we're done with the firmware display. @@ -237511,7 +237445,7 @@ index 20581ee97827..ebf73b789b4a 100644 /* Limit cma to the lower 768MB to allow room for HIGHMEM on 32-bit */ alloc-ranges = <0x0 0x00000000 0x30000000>; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index 3b775a8e9aee..f71afafbc4b8 100644 +index 1b16cb9ccb88..edc55bba5ff4 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -76,6 +76,10 @@ @@ -237529,10 +237463,10 @@ index 3b775a8e9aee..f71afafbc4b8 100644 2.18.4 -From e2fd1c9e701f82636dd20b5b93904fa1de780e03 Mon Sep 17 00:00:00 2001 +From 9e388b692d12a82b8e84bb4d453959a570ad29df Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 29 Jun 2021 11:36:38 +0200 -Subject: [PATCH 741/803] drm/vc4: hdmi: Put the device on error in +Subject: [PATCH 740/834] drm/vc4: hdmi: Put the device on error in pre_crtc_configure In the vc4_hdmi_encoder_pre_crtc_configure() function error path we @@ -237600,10 +237534,10 @@ index c406b57d1ed1..8fc86d044023 100644 2.18.4 -From 9da170c31474ddae84ed796ffbe99f2f75316855 Mon Sep 17 00:00:00 2001 +From 4ddf5fd2ac065822258a067b1ee0193accb778dd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 29 Jun 2021 09:53:52 +0200 -Subject: [PATCH 742/803] drm/vc4: hdmi: Split the CEC disable / enable +Subject: [PATCH 741/834] drm/vc4: hdmi: Split the CEC disable / enable functions in two In order to ease further additions to the CEC enable and disable, let's @@ -237715,10 +237649,10 @@ index 8fc86d044023..fbb525d52ef6 100644 2.18.4 -From b4b25dceb56adf6a27bec5bb1236065dc21042aa Mon Sep 17 00:00:00 2001 +From 8b66c1276dfd089e3a4cf047c4d58746fe7e5894 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 29 Jun 2021 11:41:57 +0200 -Subject: [PATCH 743/803] drm/vc4: hdmi: Make sure the device is powered with +Subject: [PATCH 742/834] drm/vc4: hdmi: Make sure the device is powered with CEC Similarly to what we encountered with the detect hook with DRM, nothing @@ -237766,10 +237700,10 @@ index fbb525d52ef6..19b3dbce2ae9 100644 2.18.4 -From 61243702660fd8de90b8243748cfd99f1975bde0 Mon Sep 17 00:00:00 2001 +From f06d65d8f79806bf86a040ad5bbb62c44051b0bf Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 2 Jul 2021 17:44:56 +0200 -Subject: [PATCH 744/803] drm/vc4: hdmi: Add missing clk_disable_unprepare on +Subject: [PATCH 743/834] drm/vc4: hdmi: Add missing clk_disable_unprepare on error path In vc4_hdmi_encoder_pre_crtc_configure, if clk_request_start for the HSM @@ -237800,10 +237734,10 @@ index 19b3dbce2ae9..ebe88b5ee52f 100644 2.18.4 -From 486027397ddd8627c8e8997052bcf45ae6e60542 Mon Sep 17 00:00:00 2001 +From 9d033c38e84e89891dd2a8c026a4e879e13fd104 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 5 Jul 2021 10:32:30 +0200 -Subject: [PATCH 745/803] drm/vc4: hdmi: Warn if we access the controller while +Subject: [PATCH 744/834] drm/vc4: hdmi: Warn if we access the controller while disabled We've had many silent hangs where the kernel would look like it just @@ -237853,10 +237787,10 @@ index a81fdf90f66b..06b0739e2ba3 100644 2.18.4 -From 1f9fbfbf7296a175dd887edc8fcac2d5b8694589 Mon Sep 17 00:00:00 2001 +From 329457a3507743fdf513f5d6ae73967df2b94d22 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 5 Jul 2021 10:48:07 +0200 -Subject: [PATCH 746/803] drm/vc4: hdmi: Move initial register read after +Subject: [PATCH 745/834] drm/vc4: hdmi: Move initial register read after pm_runtime_get Commit ecdd08fd9bba ("drm/vc4: hdmi: Make sure the device is powered @@ -237896,10 +237830,10 @@ index ebe88b5ee52f..981c995c36a7 100644 2.18.4 -From 51d836042dca9b7666a1f465fe9fe54a1eb43458 Mon Sep 17 00:00:00 2001 +From a9803852c7fb07b0a543288f447e517d89e49890 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Mon, 5 Jul 2021 11:43:12 +0100 -Subject: [PATCH 747/803] vc4/drv: Only notify firmware of display done with +Subject: [PATCH 746/834] vc4/drv: Only notify firmware of display done with kms fkms driver still wants firmware display to be active @@ -237945,10 +237879,10 @@ index 0d343e08fb18..919b2d1e6bd5 100644 2.18.4 -From 4c7869b330ab2d39879e96beac43dfd4818f0a6e Mon Sep 17 00:00:00 2001 +From 5a9f03d9f166301e208a06729507e9dde256a969 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Jul 2021 19:38:21 +0100 -Subject: [PATCH 748/803] dwc_otg: Update NetBSD usb.h header licence +Subject: [PATCH 747/834] dwc_otg: Update NetBSD usb.h header licence NetBSD have changed their licensing requirements such that the 2-clause licence is preferred. Update usb.h in the downstream dwc_otg code @@ -237984,10 +237918,10 @@ index f78593575736..b1cedb1876b7 100644 2.18.4 -From c2774eac136e3d16d6d9971a880d27e2741fa873 Mon Sep 17 00:00:00 2001 +From e9634bac56a6c545443b5057ca45b08ec5966079 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 5 Jul 2021 15:47:43 +0200 -Subject: [PATCH 749/803] drm/vc4: hdmi: Drop devm interrupt handler for CEC +Subject: [PATCH 748/834] drm/vc4: hdmi: Drop devm interrupt handler for CEC interrupts The CEC interrupt handlers are registered through the @@ -238096,10 +238030,10 @@ index 981c995c36a7..e06dd2622a0d 100644 2.18.4 -From a9b39a904f670500da232f9f088ce3026d3d6278 Mon Sep 17 00:00:00 2001 +From 0f486a43cc699d01781c16fa3c1a1927af138559 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 5 Jul 2021 17:31:48 +0200 -Subject: [PATCH 750/803] drm/vc4: hdmi: Drop devm interrupt handler for +Subject: [PATCH 749/834] drm/vc4: hdmi: Drop devm interrupt handler for hotplug interrupts The hotplugs interrupt handlers are registered through the @@ -238213,10 +238147,10 @@ index e06dd2622a0d..7fa9c092415d 100644 2.18.4 -From 94c12371a0f1b48931d56bbe534da032ae0cd966 Mon Sep 17 00:00:00 2001 +From dcf76c1970e5297c9bad86492b2d56fac11e7d79 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 5 Jul 2021 16:15:56 +0200 -Subject: [PATCH 751/803] drm/vc4: hdmi: Only call into DRM framework if +Subject: [PATCH 750/834] drm/vc4: hdmi: Only call into DRM framework if registered Our hotplug handler will currently call the drm_kms_helper_hotplug_event @@ -238254,10 +238188,10 @@ index 7fa9c092415d..d036e21647ef 100644 2.18.4 -From c9f9b1c69a468798fe982ea44fc7480bf48f9e81 Mon Sep 17 00:00:00 2001 +From 7bd101d8ba734f4cc02602c01aa66b44dd6323d6 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 8 Jul 2021 13:48:11 +0100 -Subject: [PATCH 752/803] bcm2711_thermal: Don't clamp temperature at zero +Subject: [PATCH 751/834] bcm2711_thermal: Don't clamp temperature at zero The temperature sensor is valid below zero and the linux framework is happy with it. @@ -238284,10 +238218,10 @@ index 67c2a737bc9d..73cf85fc24b7 100644 2.18.4 -From 402b1b149d6be68c5663f9efa0bd08b941343785 Mon Sep 17 00:00:00 2001 +From f7ffa876ca3ec2d679151d5626428eaa5c23580d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= Date: Wed, 7 Jul 2021 22:48:20 +0200 -Subject: [PATCH 753/803] media: bcm2835-unicam: Forward input status from +Subject: [PATCH 752/834] media: bcm2835-unicam: Forward input status from subdevice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -238343,10 +238277,10 @@ index 0d737e0c7f52..59163f93b207 100644 2.18.4 -From 41e12866702fe68152598eeda4361f1c50aa78d7 Mon Sep 17 00:00:00 2001 +From 80886e37ac8b154313147d751670340b56d54941 Mon Sep 17 00:00:00 2001 From: "chipdip.lab" <43340836+chipdipru@users.noreply.github.com> Date: Fri, 9 Jul 2021 16:00:22 +0300 -Subject: [PATCH 754/803] overlays: Add overlay for Chipdip I2S master DAC +Subject: [PATCH 753/834] overlays: Add overlay for Chipdip I2S master DAC Signed-off-by: Evgenij Sapunov --- @@ -238448,10 +238382,10 @@ index 000000000000..a35ac36f8513 2.18.4 -From 672a664374ef50e34380331f9a9cb6d4e8cb08c3 Mon Sep 17 00:00:00 2001 +From bdb0ae58debd4ae6f7c7ae8f65e35abf9505480b Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 8 Jul 2021 19:16:42 +0100 -Subject: [PATCH 755/803] Revert "drm/vc4: Increase the core clock to a minimum +Subject: [PATCH 754/834] Revert "drm/vc4: Increase the core clock to a minimum of 500MHz" This reverts commit c53f42cc56350b4f4bc5542e48707e5e2bd90720. @@ -238486,10 +238420,10 @@ index 7d159b32abba..e77135b6985c 100644 2.18.4 -From 69461b091ea52511ca74953ef0a03c0bec73bfde Mon Sep 17 00:00:00 2001 +From ac5e64b327c5a30311c242cc00cb566b797761f7 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 8 Jul 2021 19:16:44 +0100 -Subject: [PATCH 756/803] Revert "drm/vc4: Increase the core clock based on HVS +Subject: [PATCH 755/834] Revert "drm/vc4: Increase the core clock based on HVS load" This reverts commit 69a25f086d2e81d6592f9f18f45f37ebab65297a. @@ -238739,10 +238673,10 @@ index e77135b6985c..e7dcb64b05ef 100644 2.18.4 -From 05dd586eafc80fd33630ebc2402ca2e52d0c3460 Mon Sep 17 00:00:00 2001 +From 6e7a6f66914a309c524be328b39e0c7fa538eb82 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 4 Dec 2020 16:11:32 +0100 -Subject: [PATCH 757/803] drm: Introduce an atomic_commit_setup function +Subject: [PATCH 756/834] drm: Introduce an atomic_commit_setup function Private objects storing a state shared across all CRTCs need to be carefully handled to avoid a use-after-free issue. @@ -238842,10 +238776,10 @@ index f2de050085be..f8225bcfee2e 100644 2.18.4 -From 5c2040d1f1feac68731f3e6724493efc7e4e80f4 Mon Sep 17 00:00:00 2001 +From 6f06903e15b91199ae28ae92aa9bff2dc789b6b4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 4 Dec 2020 16:11:33 +0100 -Subject: [PATCH 758/803] drm: Document use-after-free gotcha with private +Subject: [PATCH 757/834] drm: Document use-after-free gotcha with private objects The private objects have a gotcha that could result in a use-after-free, @@ -238892,10 +238826,10 @@ index d07c851d255b..5d34c1df03f3 100644 2.18.4 -From ebe9edbbab6db24ecc4eb6bd66a1449d01a876da Mon Sep 17 00:00:00 2001 +From f4d0bfba5752b6df29a78dd036b51854ddb32a12 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 4 Dec 2020 16:11:34 +0100 -Subject: [PATCH 759/803] drm/vc4: Simplify a bit the global atomic_check +Subject: [PATCH 758/834] drm/vc4: Simplify a bit the global atomic_check When we can't allocate a new channel, we can simply return instead of having to handle both cases, and that simplifies a bit the code. @@ -238942,10 +238876,10 @@ index e7dcb64b05ef..d842889f79e7 100644 2.18.4 -From b2879ae66f93c8ea820f968d4435b34565c0317e Mon Sep 17 00:00:00 2001 +From fc2d339afe43f88648389d9534f8acd6b55272b6 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 4 Dec 2020 16:11:35 +0100 -Subject: [PATCH 760/803] drm/vc4: kms: Wait on previous FIFO users before a +Subject: [PATCH 759/834] drm/vc4: kms: Wait on previous FIFO users before a commit If we're having two subsequent, non-blocking, commits on two different @@ -239186,10 +239120,10 @@ index d842889f79e7..4103c9bb58ee 100644 2.18.4 -From a5eec1d3422eb09e189d838c5ee27250699a4e9a Mon Sep 17 00:00:00 2001 +From 792e9324d200e2ab64f607a76e9df9e1360327f8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 4 Dec 2020 16:11:36 +0100 -Subject: [PATCH 761/803] drm/vc4: kms: Remove unassigned_channels from the HVS +Subject: [PATCH 760/834] drm/vc4: kms: Remove unassigned_channels from the HVS state The HVS state now has both unassigned_channels that reflects the @@ -239283,10 +239217,10 @@ index 4103c9bb58ee..7b02bff7d939 100644 2.18.4 -From dd7fe99d53fcf474e83b62006957473298295269 Mon Sep 17 00:00:00 2001 +From b8b45d036198b44ecb4e49e66d540b8b82004e94 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 4 Dec 2020 16:11:37 +0100 -Subject: [PATCH 762/803] drm/vc4: kms: Remove async modeset semaphore +Subject: [PATCH 761/834] drm/vc4: kms: Remove async modeset semaphore Now that we have proper ordering guaranteed by the previous patch, the semaphore is redundant and can be removed. @@ -239434,10 +239368,10 @@ index 7b02bff7d939..24dea3acb9de 100644 2.18.4 -From 55a697fcc17c0afc94535ab0e5a244093f7cea72 Mon Sep 17 00:00:00 2001 +From 6e6c25e5e31a989bc52feeefc2cee792c91873cd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 4 Dec 2020 16:11:38 +0100 -Subject: [PATCH 763/803] drm/vc4: kms: Convert to atomic helpers +Subject: [PATCH 762/834] drm/vc4: kms: Convert to atomic helpers Now that the semaphore is gone, our atomic_commit implementation is basically drm_atomic_helper_commit with a somewhat custom commit_tail, @@ -239639,10 +239573,10 @@ index 24dea3acb9de..45de906ba085 100644 2.18.4 -From e08f823ce8ba489ac35c92ac744cdb64d54ccd8c Mon Sep 17 00:00:00 2001 +From 564f93978293fe272d5d995460389eefd57681fa Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 26 May 2021 16:13:02 +0200 -Subject: [PATCH 764/803] drm/vc4: Increase the core clock based on HVS load +Subject: [PATCH 763/834] drm/vc4: Increase the core clock based on HVS load Depending on a given HVS output (HVS to PixelValves) and input (planes attached to a channel) load, the HVS needs for the core clock to be @@ -239906,10 +239840,10 @@ index 45de906ba085..0f7fad6b2393 100644 2.18.4 -From dec94858fc3adf533066d0414b28aa744019e4bb Mon Sep 17 00:00:00 2001 +From ee131f4c41e8930d0d8810c709fd9470a0f62422 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 28 Jun 2021 11:15:13 +0200 -Subject: [PATCH 765/803] drm/vc4: Increase the core clock to a minimum of +Subject: [PATCH 764/834] drm/vc4: Increase the core clock to a minimum of 500MHz The core clock needs to be raised temporarily during a modeset to @@ -239953,10 +239887,10 @@ index 0f7fad6b2393..a2a03b52b275 100644 2.18.4 -From 6fa4046d00e4cdc8c274820fa1ebc7d582b7c86a Mon Sep 17 00:00:00 2001 +From 0d4c841623ee574879d0a52f65067abe0b34423a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 3 Dec 2020 08:46:24 +0100 -Subject: [PATCH 766/803] drm/vc4: hdmi: Don't poll for the infoframes status +Subject: [PATCH 765/834] drm/vc4: hdmi: Don't poll for the infoframes status on setup The infoframes are sent at a regular interval as a data island packet, @@ -240022,10 +239956,10 @@ index d036e21647ef..87c7817c9003 100644 2.18.4 -From 91a4a4d954adf22940e22bef11d0cbc02657697f Mon Sep 17 00:00:00 2001 +From 0768eb0613dc127ca1b30dd373efcf374460267f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 15 Dec 2020 16:42:35 +0100 -Subject: [PATCH 767/803] drm/vc4: hvs: Align the HVS atomic hooks to the new +Subject: [PATCH 766/834] drm/vc4: hvs: Align the HVS atomic hooks to the new API Since the CRTC setup in vc4 is split between the PixelValves/TXP and the @@ -240121,10 +240055,10 @@ index 22430640786f..79ecaaa1ec42 100644 2.18.4 -From 6b483de692d2e12ca0be07757943f367cb21ec3b Mon Sep 17 00:00:00 2001 +From f2decba4290126f084d83dabf0b11cd14b67902d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 2 Nov 2020 14:38:34 +0100 -Subject: [PATCH 768/803] drm: Use the state pointer directly in atomic_check +Subject: [PATCH 767/834] drm: Use the state pointer directly in atomic_check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -240273,10 +240207,10 @@ index 8d9cd623d995..6c95271f13b6 100644 2.18.4 -From e817f38b594d325f81d802b2520b9088111c5010 Mon Sep 17 00:00:00 2001 +From e165b2078d3d07313f06e752e106786c8d8c6966 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 17 Jan 2018 23:15:18 +0200 -Subject: [PATCH 769/803] drm: vc4: Remove unnecessary drm_plane_cleanup() +Subject: [PATCH 768/834] drm: vc4: Remove unnecessary drm_plane_cleanup() wrapper Use the drm_plane_cleanup() function directly as the drm_plane_funcs @@ -240318,10 +240252,10 @@ index 333335f3c561..b4ba3b3b9129 100644 2.18.4 -From 6531b6b8bf93d93d283ba516b1ec7d8ba4efca26 Mon Sep 17 00:00:00 2001 +From de7ac18cf9266ebcf50558a9ce737ade1168aab7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 18 Mar 2021 17:13:27 +0100 -Subject: [PATCH 770/803] drm/vc4: plane: Remove redundant assignment +Subject: [PATCH 769/834] drm/vc4: plane: Remove redundant assignment The vc4_plane_atomic_async_update function assigns twice in a row the src_h field in the drm_plane_state structure to the same value. Remove @@ -240350,10 +240284,10 @@ index b4ba3b3b9129..faa1ce6d6584 100644 2.18.4 -From 8c20da72941611167ef29cd6278011c47063d720 Mon Sep 17 00:00:00 2001 +From a65cc3b3805c08d867748e603cedc33f2a97fd87 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 11 Dec 2020 13:42:36 +0200 -Subject: [PATCH 771/803] drm: automatic legacy gamma support +Subject: [PATCH 770/834] drm: automatic legacy gamma support To support legacy gamma ioctls the drivers need to set drm_crtc_funcs.gamma_set either to a custom implementation or to @@ -240393,7 +240327,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi 19 files changed, 102 insertions(+), 101 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index 390d562adda2..ccc0b1609e7e 100644 +index c699f77027be..87029151c0f1 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4988,7 +4988,6 @@ static void dm_disable_vblank(struct drm_crtc *crtc) @@ -240850,10 +240784,10 @@ index 85df04c8e62f..dc7e3aef7f13 100644 2.18.4 -From a369e7230d314ff9826ab9fce44bcc54f8b93f66 Mon Sep 17 00:00:00 2001 +From 5326d3543c8058d7690d259797c18bd46a0aa7b1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Nov 2020 10:47:58 +0100 -Subject: [PATCH 772/803] drm: Pass the full state to connectors atomic +Subject: [PATCH 771/834] drm: Pass the full state to connectors atomic functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -241239,10 +241173,10 @@ index f8225bcfee2e..cbe613858a93 100644 2.18.4 -From ff4317dbe179b58c003d0cdb1988606cb7b6e500 Mon Sep 17 00:00:00 2001 +From 778f01104c01f93e6ec71f122ffc6c67dd5137b0 Mon Sep 17 00:00:00 2001 From: Deepak R Varma Date: Fri, 6 Nov 2020 01:51:35 +0530 -Subject: [PATCH 773/803] drm/vc4: replace idr_init() by idr_init_base() +Subject: [PATCH 772/834] drm/vc4: replace idr_init() by idr_init_base() idr_init() uses base 0 which is an invalid identifier for this driver. The idr_alloc for this driver uses VC4_PERFMONID_MIN as start value for @@ -241277,10 +241211,10 @@ index f4aa75efd16b..18abc06335c1 100644 2.18.4 -From c1ce8883c926867f5e5e632a868e2c27983ccc65 Mon Sep 17 00:00:00 2001 +From 34096e0302d40152a3f58c18af50759d3447cd47 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 16 Nov 2020 17:41:07 +0000 -Subject: [PATCH 774/803] drm/vc4/vc4_hdmi_regs: Mark some data sets as +Subject: [PATCH 773/834] drm/vc4/vc4_hdmi_regs: Mark some data sets as __maybe_unused MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -241342,10 +241276,10 @@ index 06b0739e2ba3..99dde6e06a37 100644 2.18.4 -From c05a254ea010e28ff6807a0cda8158915bc477bb Mon Sep 17 00:00:00 2001 +From 8e47e6aecc8432d18408492efc23f1eec533b062 Mon Sep 17 00:00:00 2001 From: Bernard Zhao Date: Tue, 2 Feb 2021 04:23:38 -0800 -Subject: [PATCH 775/803] drm/vc4: remove unneeded variable: "ret" +Subject: [PATCH 774/834] drm/vc4: remove unneeded variable: "ret" remove unneeded variable: "ret". @@ -241383,10 +241317,10 @@ index b641252939d8..445d3bab89e0 100644 2.18.4 -From dfbc61331f577d45e3697c50147b50a38e0fca11 Mon Sep 17 00:00:00 2001 +From 4edc64ce0d4364f564d1781c6e44a65c8bf1399f Mon Sep 17 00:00:00 2001 From: Jesse Taube Date: Thu, 8 Jul 2021 16:32:16 -0400 -Subject: [PATCH 776/803] overlays: Add overlay for cap1106 capacitive touch +Subject: [PATCH 775/834] overlays: Add overlay for cap1106 capacitive touch sensor Signed-off-by: Jesse Taube @@ -241488,10 +241422,10 @@ index 000000000000..0a585e725f84 2.18.4 -From f779e5942b8f764f2f6b7fcb21bb04a06201965e Mon Sep 17 00:00:00 2001 +From f4a3e2ff15e1c8ecd02278a001bc180591bf021f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 10 Jul 2021 09:51:52 +0100 -Subject: [PATCH 777/803] configs: Add KEYBOARD_CAP11XX=m +Subject: [PATCH 776/834] configs: Add KEYBOARD_CAP11XX=m See: https://github.com/raspberrypi/linux/pull/4442 @@ -241568,10 +241502,10 @@ index da84139ca6ca..0cd854301692 100644 2.18.4 -From 55878a094ea69e6eb657831029898e8a84db92fc Mon Sep 17 00:00:00 2001 +From 2314a523e7808ceae150402631096d13cae9d971 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 12 Jul 2021 12:27:59 +0100 -Subject: [PATCH 778/803] drm/vc4: Fix margin calculations for the right/bottom +Subject: [PATCH 777/834] drm/vc4: Fix margin calculations for the right/bottom edges The calculations clipped the right/bottom edge of the clipped @@ -241612,10 +241546,10 @@ index faa1ce6d6584..7947cf47b6e1 100644 2.18.4 -From f93b4630a55587eb835dd034fc9dae9a09f507e0 Mon Sep 17 00:00:00 2001 +From a12b0cd6f9292f336c5dc12442fa73f4ed5f7892 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 12 Jul 2021 13:06:07 +0100 -Subject: [PATCH 779/803] ydrm/vc4: fkms: Fix margin calculations for the +Subject: [PATCH 778/834] ydrm/vc4: fkms: Fix margin calculations for the right/bottom edges The calculations clipped the right/bottom edge of the clipped @@ -241656,10 +241590,10 @@ index e643bbe96941..d6d50b5f64dd 100644 2.18.4 -From 1d1ccc38215547ed2e3522a62958b585f64d8fcf Mon Sep 17 00:00:00 2001 +From ed728af8bdd531d45d2184c986a479b1f590e681 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 12 Jul 2021 15:15:44 +0100 -Subject: [PATCH 780/803] ARM: dts: bcm2711: fold in the correct interrupt +Subject: [PATCH 779/834] ARM: dts: bcm2711: fold in the correct interrupt The new vec node in bcm2711.dtsi should have the correct interrupt number to start with, rather than include the bcm283x version and @@ -241671,7 +241605,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index ef78c6e5f437..b9edf0dee35c 100644 +index c6b496f364c3..2933cf91c27d 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -304,7 +304,7 @@ @@ -241695,10 +241629,10 @@ index ef78c6e5f437..b9edf0dee35c 100644 2.18.4 -From 45d64023bfa26566063f992fcd4f52fc8df138ac Mon Sep 17 00:00:00 2001 +From 0243394f36e7e45d4e4766c65fc2b7ee87ab9556 Mon Sep 17 00:00:00 2001 From: "Sunip K. Mukherjee" Date: Sun, 4 Jul 2021 16:03:07 -0400 -Subject: [PATCH 781/803] overlays: Add overlay for Si446x Transceiver SPI +Subject: [PATCH 780/834] overlays: Add overlay for Si446x Transceiver SPI See: https://github.com/raspberrypi/linux/pull/4430 @@ -241806,10 +241740,10 @@ index 000000000000..90495f0941fb 2.18.4 -From f9cd93f86dc30d02af21c995ed76d1f43f074710 Mon Sep 17 00:00:00 2001 +From bc19de734353b56663205e4da447d822517d73f3 Mon Sep 17 00:00:00 2001 From: Mateusz Kwiatkowski Date: Thu, 15 Jul 2021 01:07:30 +0200 -Subject: [PATCH 782/803] drm/vc4: Fix timings for VEC modes +Subject: [PATCH 781/834] drm/vc4: Fix timings for VEC modes This commit fixes vertical timings of the VEC (composite output) modes to accurately represent the 525-line ("NTSC") and 625-line ("PAL") ITU-R @@ -241962,10 +241896,10 @@ index a467ceba75e4..7008684f6936 100644 2.18.4 -From 24b41f15d1a44e397de345b2f3ce43ff4f7385f2 Mon Sep 17 00:00:00 2001 +From e3544a0369e5a8be1f0a5cd1f65923418e4d96ed Mon Sep 17 00:00:00 2001 From: Mateusz Kwiatkowski Date: Thu, 15 Jul 2021 01:07:49 +0200 -Subject: [PATCH 783/803] drm/vc4: Refactor VEC TV mode setting +Subject: [PATCH 782/834] drm/vc4: Refactor VEC TV mode setting Change the mode_set function pointer logic to declarative config0, config1 and custom_freq fields, to make TV mode setting logic more @@ -242135,10 +242069,10 @@ index 7008684f6936..aa3f11c383d7 100644 2.18.4 -From efcafc3cc35587ecd40d89e1fcb4b7131cb38003 Mon Sep 17 00:00:00 2001 +From 7e3081fcd393bce1f72d230689bc84fa94692b9b Mon Sep 17 00:00:00 2001 From: Mateusz Kwiatkowski Date: Thu, 15 Jul 2021 01:07:53 +0200 -Subject: [PATCH 784/803] drm/vc4: Fix definition of PAL-M mode +Subject: [PATCH 783/834] drm/vc4: Fix definition of PAL-M mode PAL-M is a Brazilian analog TV standard that uses a PAL-style chroma subcarrier at 3.575611[888111] MHz on top of 525-line (480i60) timings. @@ -242218,10 +242152,10 @@ index aa3f11c383d7..db489a1a65e3 100644 2.18.4 -From 74b81979744f62d9d0d82932f1b38ae97e67973a Mon Sep 17 00:00:00 2001 +From 5e252f8a42f841a8c99e628be9733dc5103a5cf2 Mon Sep 17 00:00:00 2001 From: Mateusz Kwiatkowski Date: Thu, 15 Jul 2021 01:07:58 +0200 -Subject: [PATCH 785/803] drm/vc4: Add support for more analog TV standards +Subject: [PATCH 784/834] drm/vc4: Add support for more analog TV standards Add support for the following composite output modes (all of them are somewhat more obscure than the previously defined ones): @@ -242372,10 +242306,10 @@ index db489a1a65e3..e316a3943566 100644 2.18.4 -From 4ba1d039257634ce48d8cfaf8ebaf7e103662405 Mon Sep 17 00:00:00 2001 +From 8bed5569bd09d5b93fe8eabd4251c59cf3f27397 Mon Sep 17 00:00:00 2001 From: Mateusz Kwiatkowski Date: Thu, 15 Jul 2021 01:08:01 +0200 -Subject: [PATCH 786/803] drm/vc4: Allow setting the TV norm via module +Subject: [PATCH 785/834] drm/vc4: Allow setting the TV norm via module parameter Similar to the ch7006 and nouveau drivers, introduce a "tv_mode" module @@ -242522,10 +242456,10 @@ index e316a3943566..b3eb3aaf0e89 100644 2.18.4 -From 83c2e9cfb4605116d508ca355171832f98676a1e Mon Sep 17 00:00:00 2001 +From d6dd3eea63465975eb285915e94a9c2376fdb2fd Mon Sep 17 00:00:00 2001 From: Mateusz Kwiatkowski Date: Thu, 15 Jul 2021 01:08:05 +0200 -Subject: [PATCH 787/803] drm/vc4: Refactor mode checking logic +Subject: [PATCH 786/834] drm/vc4: Refactor mode checking logic Replace drm_encoder_helper_funcs::atomic_check with drm_connector_helper_funcs::atomic_check - the former is not called @@ -242613,10 +242547,10 @@ index b3eb3aaf0e89..596b59ff6c9a 100644 2.18.4 -From ac2c826775c2881cb00b395e0c32ca4fa267b404 Mon Sep 17 00:00:00 2001 +From 00ce615ccdc8d5008377e6ad4207085d7cc3ba09 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 15 Jul 2021 20:08:13 +0100 -Subject: [PATCH 788/803] drm/vc4: Fix typo when getting firmware node +Subject: [PATCH 787/834] drm/vc4: Fix typo when getting firmware node Signed-off-by: Dom Cobley --- @@ -242640,10 +242574,10 @@ index 919b2d1e6bd5..dec3620bc7c5 100644 2.18.4 -From 4a7538f26df1d737c96202a95f49de78ea09013a Mon Sep 17 00:00:00 2001 +From 0776ab53fa2a7b34f0006d76c338bc9144338310 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 16 Jul 2021 15:23:50 +0100 -Subject: [PATCH 789/803] configs: Add SND_SOC_WM8960=m +Subject: [PATCH 788/834] configs: Add SND_SOC_WM8960=m Enable the WM8960 driver module, as used by the wm8960-soundcard overlay. @@ -242723,10 +242657,10 @@ index 0cd854301692..f2ed34ca43b0 100644 2.18.4 -From 11a489950c5e456f7883d652c2c505d9fc56f0fb Mon Sep 17 00:00:00 2001 +From 95f74f86fd0887182ebada8c086091aa2a747569 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 19 Jul 2021 10:47:02 +0100 -Subject: [PATCH 790/803] ARM: dts: bcm2711: Tidy the HDMI I2C aliases +Subject: [PATCH 789/834] ARM: dts: bcm2711: Tidy the HDMI I2C aliases The bcm2711 vc3-kms-v3d overlay enables the I2C instances used for EDID data. Give these distinct I2C interface numbers (20 & 21) to @@ -242744,7 +242678,7 @@ Signed-off-by: Phil Elwell 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 984c31db02e8..8f5045a33a88 100644 +index bc2f231f3568..016d4d466150 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -349,11 +349,12 @@ @@ -242843,10 +242777,10 @@ index a39e5c216e63..9f9a25bb52c3 100644 2.18.4 -From 7dbd3eecadbffbf15e608e9c4a75569e8069f12d Mon Sep 17 00:00:00 2001 +From 85c98baae842bf429d0541c4f8a7f434ee0d448f Mon Sep 17 00:00:00 2001 From: David Plowman Date: Tue, 20 Jul 2021 15:10:03 +0100 -Subject: [PATCH 791/803] media: i2c: imx477: Fix framerates for 1332x990 mode +Subject: [PATCH 790/834] media: i2c: imx477: Fix framerates for 1332x990 mode The imx477 driver's line length for this mode had not been updated to the value supplied to us by the sensor manufacturer. With this @@ -242874,10 +242808,10 @@ index 521953e71686..fcde88d90a8f 100644 2.18.4 -From 773008e10956e3808887273673d0753fd287ec65 Mon Sep 17 00:00:00 2001 +From 0e283796551423ec025648f21b26ba81b299c55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Sat, 13 Mar 2021 12:25:43 +0100 -Subject: [PATCH 792/803] drm/uapi: Add USB connector type +Subject: [PATCH 791/834] drm/uapi: Add USB connector type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -242931,10 +242865,10 @@ index 863eda048265..8bc13daec0a3 100644 2.18.4 -From 2948bc6ee2a20305649c61cb7f0fead1daf3cfb5 Mon Sep 17 00:00:00 2001 +From d3d1ee8d9e5f0a468f24c6f3ecc3cc5e0538f0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Sat, 13 Mar 2021 12:25:45 +0100 -Subject: [PATCH 793/803] drm: Add GUD USB Display driver +Subject: [PATCH 792/834] drm: Add GUD USB Display driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -245638,10 +245572,10 @@ index 000000000000..0b46b54fe56e 2.18.4 -From e89a63d6951535c5fe1fa8f5acd56215127b0710 Mon Sep 17 00:00:00 2001 +From 4a43d8191c1c9051d7020853500d6cc047c4513c Mon Sep 17 00:00:00 2001 From: kernel test robot Date: Mon, 22 Mar 2021 18:44:33 +0100 -Subject: [PATCH 794/803] drm/gud: fix sizeof use +Subject: [PATCH 793/834] drm/gud: fix sizeof use MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -245682,10 +245616,10 @@ index ec495dcd6122..9ae5a0020449 100644 2.18.4 -From ad886da2a21c5cfe7d1be3bcd2c8b1d7263501ae Mon Sep 17 00:00:00 2001 +From 72138879883cb2af1e6ef28c92e42bbfd96e2579 Mon Sep 17 00:00:00 2001 From: kernel test robot Date: Mon, 22 Mar 2021 18:44:34 +0100 -Subject: [PATCH 795/803] drm/gud: Remove unneeded semicolon +Subject: [PATCH 794/834] drm/gud: Remove unneeded semicolon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -245765,10 +245699,10 @@ index 15aa8877407e..4ea7b4dd2c4e 100644 2.18.4 -From b26cb9424af231b873c8d32a8fcd03af8919c455 Mon Sep 17 00:00:00 2001 +From 834a852f3adac6ee97c371e1b7a851d0dfd49a55 Mon Sep 17 00:00:00 2001 From: Bernard Zhao Date: Fri, 2 Apr 2021 01:55:21 -0700 -Subject: [PATCH 796/803] drm/gud: cleanup coding style a bit +Subject: [PATCH 795/834] drm/gud: cleanup coding style a bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -245812,10 +245746,10 @@ index de2f2d2dbc60..b65105585578 100644 2.18.4 -From 23bae27c34221a7e3d2cf120bbad3d78f6490056 Mon Sep 17 00:00:00 2001 +From fb5e161de22e7983c872d18be42371037ca83162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Thu, 1 Jul 2021 19:07:47 +0200 -Subject: [PATCH 797/803] drm/gud: Free buffers on device removal +Subject: [PATCH 796/834] drm/gud: Free buffers on device removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -245878,10 +245812,10 @@ index 610cb05a306a..868099878721 100644 2.18.4 -From c3ca8d0527ee56a1f48c1b258fdb82e5d4b7cf0b Mon Sep 17 00:00:00 2001 +From 43f10e0e333a4590e7882bfa873d4adb7368dde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Thu, 1 Jul 2021 19:07:48 +0200 -Subject: [PATCH 798/803] drm/gud: Use scatter-gather USB bulk transfer +Subject: [PATCH 797/834] drm/gud: Use scatter-gather USB bulk transfer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -246092,10 +246026,10 @@ index 4ea7b4dd2c4e..da4ebd1fe591 100644 2.18.4 -From 2ed9a9f69753cddb762727a272119183d714c57c Mon Sep 17 00:00:00 2001 +From c9c15400e525b90a88a6a6d42b60eafa90a14202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Sat, 3 Jul 2021 16:13:20 +0200 -Subject: [PATCH 799/803] drm/gud: Add Raspberry Pi Pico ID +Subject: [PATCH 798/834] drm/gud: Add Raspberry Pi Pico ID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -246129,10 +246063,10 @@ index 8666b4212a16..3afad229bb78 100644 2.18.4 -From ffbe4b3581d2899dfcfa17109b9ff34237723709 Mon Sep 17 00:00:00 2001 +From 4e8fd46a961fffd888baa62b8bba2a275d0cd802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Sat, 3 Jul 2021 16:13:21 +0200 -Subject: [PATCH 800/803] drm/gud: Add async_flush module parameter +Subject: [PATCH 799/834] drm/gud: Add async_flush module parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -246190,10 +246124,10 @@ index da4ebd1fe591..d04e777ccb37 100644 2.18.4 -From 96ab905061e5aa835b8b2850e53060cf20821c99 Mon Sep 17 00:00:00 2001 +From 786fc8167d172c3d32b7d3cfb9de164e4d8cf730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Thu, 8 Jul 2021 23:20:59 +0200 -Subject: [PATCH 801/803] configs: Add CONFIG_DRM_GUD=m +Subject: [PATCH 800/834] configs: Add CONFIG_DRM_GUD=m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -246273,10 +246207,10 @@ index f2ed34ca43b0..13aa02396b7b 100644 2.18.4 -From 802d91494e9bf3c9fae4b493b2015c45571e3b84 Mon Sep 17 00:00:00 2001 +From d37288d1d54e81b832c193136f480305a5c3db73 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 2 Jul 2021 12:03:28 +0200 -Subject: [PATCH 802/803] drm/vc4: hdmi: Make sure the controller is powered up +Subject: [PATCH 801/834] drm/vc4: hdmi: Make sure the controller is powered up during bind In the bind hook, we actually need the device to have the HSM clock @@ -246344,10 +246278,10 @@ index 87c7817c9003..81ea1fbbdaab 100644 2.18.4 -From 700ad3df69676c1f5689116b0df3079795d9949c Mon Sep 17 00:00:00 2001 +From 22afa5a4bd7a1574349d76d26d87a35238d33093 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 22 Jul 2021 14:34:42 +0100 -Subject: [PATCH 803/803] brcmfmac: Try product-specific clm_blob names first +Subject: [PATCH 802/834] brcmfmac: Try product-specific clm_blob names first Signed-off-by: Phil Elwell --- @@ -246514,3 +246448,3871 @@ index 9fb68c2dc7e3..9bf2dbd30ded 100644 -- 2.18.4 + +From 0af996d5347b511f9be7bcdc527a60faa409daa0 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 26 Jul 2021 11:05:18 +0100 +Subject: [PATCH 803/834] overlays: Set CMA to 512MB on Pi 4 for vc4 + +Pi 4s have at least 1GB, and there are advantages to having more CMA +available (HEVC works out of the box, support for more complex video +setups, etc.) without significant disadvantages. + +Can be overridden by appending a parameter to the dtoverlay line, e.g. +dtoverlay=vc4-fkms-v3d,cma-256 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/Makefile | 1 + + arch/arm/boot/dts/overlays/README | 17 +++++++ + arch/arm/boot/dts/overlays/overlay_map.dts | 9 ++++ + .../dts/overlays/upstream-pi4-overlay.dts | 2 +- + .../dts/overlays/vc4-fkms-v3d-pi4-overlay.dts | 44 +++++++++++++++++++ + .../dts/overlays/vc4-kms-v3d-pi4-overlay.dts | 6 ++- + 6 files changed, 77 insertions(+), 2 deletions(-) + create mode 100644 arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts + +diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile +index 11b2f5b8259b..bb350f667f0a 100644 +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -220,6 +220,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + upstream.dtbo \ + upstream-pi4.dtbo \ + vc4-fkms-v3d.dtbo \ ++ vc4-fkms-v3d-pi4.dtbo \ + vc4-kms-dpi-at056tn53v1.dtbo \ + vc4-kms-dsi-7inch.dtbo \ + vc4-kms-dsi-lt070me05000.dtbo \ +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 72e954fcb3ec..a2c7631cc6d7 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -3268,6 +3268,23 @@ Params: cma-512 CMA is 512MB (needs 1GB) + cma-default Use upstream's default value + + ++Name: vc4-fkms-v3d-pi4 ++Info: Enable Eric Anholt's DRM VC4 V3D driver on top of the dispmanx ++ display stack. ++Load: dtoverlay=vc4-fkms-v3d-pi4, ++Params: cma-512 CMA is 512MB (needs 1GB) ++ cma-448 CMA is 448MB (needs 1GB) ++ cma-384 CMA is 384MB (needs 1GB) ++ cma-320 CMA is 320MB (needs 1GB) ++ cma-256 CMA is 256MB (needs 1GB) ++ cma-192 CMA is 192MB (needs 1GB) ++ cma-128 CMA is 128MB ++ cma-96 CMA is 96MB ++ cma-64 CMA is 64MB ++ cma-size CMA size in bytes, 4MB aligned ++ cma-default Use upstream's default value ++ ++ + Name: vc4-kms-dpi-at056tn53v1 + Info: Enable an Innolux 5.6in VGA TFT connected to DPI interface under KMS. + Requires vc4-kms-v3d to be loaded. +diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts +index e9a15fab82c7..bc6e3bce22c7 100644 +--- a/arch/arm/boot/dts/overlays/overlay_map.dts ++++ b/arch/arm/boot/dts/overlays/overlay_map.dts +@@ -138,6 +138,15 @@ + bcm2711; + }; + ++ vc4-fkms-v3d { ++ bcm2835; ++ bcm2711 = "vc4-fkms-v3d-pi4"; ++ }; ++ ++ vc4-fkms-v3d-pi4 { ++ bcm2711; ++ }; ++ + vc4-kms-v3d { + bcm2835; + bcm2711 = "vc4-kms-v3d-pi4"; +diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts +index f73a1879e690..f4328634542e 100644 +--- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts ++++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts +@@ -6,7 +6,7 @@ + #include + + / { +- compatible = "brcm,bcm2835"; ++ compatible = "brcm,bcm2711"; + fragment@0 { + target = <&ddc0>; + __overlay__ { +diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts +new file mode 100644 +index 000000000000..bb6731e1c9c4 +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts +@@ -0,0 +1,44 @@ ++/* ++ * vc4-fkms-v3d-overlay.dts ++ */ ++ ++/dts-v1/; ++/plugin/; ++ ++#include "cma-overlay.dts" ++ ++&frag0 { ++ size = <(512*1024*1024)>; ++}; ++ ++/ { ++ compatible = "brcm,bcm2711"; ++ ++ fragment@1 { ++ target = <&fb>; ++ __overlay__ { ++ status = "disabled"; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&firmwarekms>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@3 { ++ target = <&v3d>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@4 { ++ target = <&vc4>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++}; +diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts +index 6a11260a4f1a..0480fa7a8129 100644 +--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts ++++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts +@@ -9,8 +9,12 @@ + + #include "cma-overlay.dts" + ++&frag0 { ++ size = <(512*1024*1024)>; ++}; ++ + / { +- compatible = "brcm,bcm2835"; ++ compatible = "brcm,bcm2711"; + + fragment@1 { + target = <&ddc0>; +-- +2.18.4 + + +From 3b0b13a6b7a0833a8ee36602987505b1104da7ab Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 26 Jul 2021 13:24:09 +0100 +Subject: [PATCH 804/834] ARM: dts: Correct CM4 PHY MDIO address + +The firmware patches the PHY MDIO address in the DTB to cope with +variations between board revisions, but the default for the CM4 PHY +is currently 1 when it should be 0. + +Reported-by: Stefan Wahren +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +index 9f9a25bb52c3..d9271012a572 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +@@ -277,9 +277,9 @@ + }; + + &genet_mdio { +- phy1: ethernet-phy@1 { ++ phy1: ethernet-phy@0 { + /* No PHY interrupt */ +- reg = <0x1>; ++ reg = <0x0>; + }; + }; + +-- +2.18.4 + + +From a297ead027637d1ef5899f239c4b65bc2e509060 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 26 Jul 2021 18:00:55 +0100 +Subject: [PATCH 805/834] Revert "drm/vc4: Increase the core clock to a minimum + of 500MHz" + +This reverts commit 0a7c2180876d9c7748e055091be21efb959934e2. +--- + drivers/gpu/drm/vc4/vc4_kms.c | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c +index a2a03b52b275..0f7fad6b2393 100644 +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -369,17 +369,11 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) + } + + if (vc4->hvs && vc4->hvs->hvs5) { +- unsigned long core_rate = max_t(unsigned long, +- 500000000, +- new_hvs_state->core_clock_rate); +- +- drm_dbg(dev, "Raising the core clock at %lu Hz\n", core_rate); +- + /* + * Do a temporary request on the core clock during the + * modeset. + */ +- core_req = clk_request_start(hvs->core_clk, core_rate); ++ core_req = clk_request_start(hvs->core_clk, 500000000); + + /* + * And remove the previous one based on the HVS +-- +2.18.4 + + +From 2dca34c0909db173d5342445eedd594fa946d665 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 26 Jul 2021 18:01:45 +0100 +Subject: [PATCH 806/834] Revert "drm/vc4: Increase the core clock based on HVS + load" + +This reverts commit 5146eb7b0878d80009e2b27c47a668316683ef7e. +--- + drivers/gpu/drm/vc4/vc4_crtc.c | 15 ----- + drivers/gpu/drm/vc4/vc4_drv.h | 3 - + drivers/gpu/drm/vc4/vc4_kms.c | 120 ++------------------------------- + 3 files changed, 6 insertions(+), 132 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c +index 6bb52539a5a6..0771fd91aee7 100644 +--- a/drivers/gpu/drm/vc4/vc4_crtc.c ++++ b/drivers/gpu/drm/vc4/vc4_crtc.c +@@ -660,27 +660,12 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc, + struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state); + struct drm_connector *conn; + struct drm_connector_state *conn_state; +- struct drm_encoder *encoder; + int ret, i; + + ret = vc4_hvs_atomic_check(crtc, state); + if (ret) + return ret; + +- encoder = vc4_get_crtc_encoder(crtc, crtc_state); +- if (encoder) { +- const struct drm_display_mode *mode = &crtc_state->adjusted_mode; +- struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder); +- +- mode = &crtc_state->adjusted_mode; +- if (vc4_encoder->type == VC4_ENCODER_TYPE_HDMI0) { +- vc4_state->hvs_load = max(mode->clock * mode->hdisplay / mode->htotal + 1000, +- mode->clock * 9 / 10) * 1000; +- } else { +- vc4_state->hvs_load = mode->clock * 1000; +- } +- } +- + for_each_new_connector_in_state(state, conn, conn_state, + i) { + if (conn_state->crtc != crtc) +diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h +index 7387244af483..9d7e0ee768e6 100644 +--- a/drivers/gpu/drm/vc4/vc4_drv.h ++++ b/drivers/gpu/drm/vc4/vc4_drv.h +@@ -324,7 +324,6 @@ struct vc4_hvs { + u32 __iomem *dlist; + + struct clk *core_clk; +- struct clk_request *core_req; + + /* Memory manager for CRTCs to allocate space in the display + * list. Units are dwords. +@@ -536,8 +535,6 @@ struct vc4_crtc_state { + unsigned int bottom; + } margins; + +- unsigned long hvs_load; +- + /* Transitional state below, only valid during atomic commits */ + bool update_muxing; + }; +diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c +index 0f7fad6b2393..45de906ba085 100644 +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -39,11 +39,9 @@ static struct vc4_ctm_state *to_vc4_ctm_state(struct drm_private_state *priv) + + struct vc4_hvs_state { + struct drm_private_state base; +- unsigned long core_clock_rate; + + struct { + unsigned in_use: 1; +- unsigned long fifo_load; + struct drm_crtc_commit *pending_commit; + } fifo_state[HVS_NUM_CHANNELS]; + }; +@@ -344,20 +342,11 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) + struct vc4_hvs *hvs = vc4->hvs; + struct drm_crtc_state *old_crtc_state; + struct drm_crtc_state *new_crtc_state; +- struct vc4_hvs_state *new_hvs_state; + struct drm_crtc *crtc; + struct vc4_hvs_state *old_hvs_state; + struct clk_request *core_req; + int i; + +- old_hvs_state = vc4_hvs_get_old_global_state(state); +- if (WARN_ON(!old_hvs_state)) +- return; +- +- new_hvs_state = vc4_hvs_get_new_global_state(state); +- if (WARN_ON(!new_hvs_state)) +- return; +- + for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) { + struct vc4_crtc_state *vc4_crtc_state; + +@@ -368,19 +357,12 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) + vc4_hvs_mask_underrun(dev, vc4_crtc_state->assigned_channel); + } + +- if (vc4->hvs && vc4->hvs->hvs5) { +- /* +- * Do a temporary request on the core clock during the +- * modeset. +- */ ++ if (vc4->hvs && vc4->hvs->hvs5) + core_req = clk_request_start(hvs->core_clk, 500000000); + +- /* +- * And remove the previous one based on the HVS +- * requirements if any. +- */ +- clk_request_done(hvs->core_req); +- } ++ old_hvs_state = vc4_hvs_get_old_global_state(state); ++ if (!old_hvs_state) ++ return; + + for_each_old_crtc_in_state(state, crtc, old_crtc_state, i) { + struct vc4_crtc_state *vc4_crtc_state = +@@ -431,20 +413,8 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) + + drm_atomic_helper_cleanup_planes(dev, state); + +- if (vc4->hvs && vc4->hvs->hvs5) { +- drm_dbg(dev, "Running the core clock at %lu Hz\n", +- new_hvs_state->core_clock_rate); +- +- /* +- * Request a clock rate based on the current HVS +- * requirements. +- */ +- hvs->core_req = clk_request_start(hvs->core_clk, +- new_hvs_state->core_clock_rate); +- +- /* And drop the temporary request */ ++ if (vc4->hvs && vc4->hvs->hvs5) + clk_request_done(core_req); +- } + } + + static int vc4_atomic_commit_setup(struct drm_atomic_state *state) +@@ -713,7 +683,6 @@ vc4_hvs_channels_duplicate_state(struct drm_private_obj *obj) + + for (i = 0; i < HVS_NUM_CHANNELS; i++) { + state->fifo_state[i].in_use = old_state->fifo_state[i].in_use; +- state->fifo_state[i].fifo_load = old_state->fifo_state[i].fifo_load; + + if (!old_state->fifo_state[i].pending_commit) + continue; +@@ -722,9 +691,6 @@ vc4_hvs_channels_duplicate_state(struct drm_private_obj *obj) + drm_crtc_commit_get(old_state->fifo_state[i].pending_commit); + } + +- state->core_clock_rate = old_state->core_clock_rate; +- +- + return &state->base; + } + +@@ -883,76 +849,6 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev, + return 0; + } + +-static int +-vc4_core_clock_atomic_check(struct drm_atomic_state *state) +-{ +- struct vc4_dev *vc4 = to_vc4_dev(state->dev); +- struct drm_private_state *priv_state; +- struct vc4_hvs_state *hvs_new_state; +- struct vc4_load_tracker_state *load_state; +- struct drm_crtc_state *old_crtc_state, *new_crtc_state; +- struct drm_crtc *crtc; +- unsigned int num_outputs; +- unsigned long pixel_rate; +- unsigned long cob_rate; +- unsigned int i; +- +- priv_state = drm_atomic_get_private_obj_state(state, +- &vc4->load_tracker); +- if (IS_ERR(priv_state)) +- return PTR_ERR(priv_state); +- +- load_state = to_vc4_load_tracker_state(priv_state); +- +- hvs_new_state = vc4_hvs_get_global_state(state); +- if (!hvs_new_state) +- return -EINVAL; +- +- for_each_oldnew_crtc_in_state(state, crtc, +- old_crtc_state, +- new_crtc_state, +- i) { +- if (old_crtc_state->active) { +- struct vc4_crtc_state *old_vc4_state = +- to_vc4_crtc_state(old_crtc_state); +- unsigned int channel = old_vc4_state->assigned_channel; +- +- hvs_new_state->fifo_state[channel].fifo_load = 0; +- } +- +- if (new_crtc_state->active) { +- struct vc4_crtc_state *new_vc4_state = +- to_vc4_crtc_state(new_crtc_state); +- unsigned int channel = new_vc4_state->assigned_channel; +- +- hvs_new_state->fifo_state[channel].fifo_load = +- new_vc4_state->hvs_load; +- } +- } +- +- cob_rate = 0; +- num_outputs = 0; +- for (i = 0; i < HVS_NUM_CHANNELS; i++) { +- if (!hvs_new_state->fifo_state[i].in_use) +- continue; +- +- num_outputs++; +- cob_rate += hvs_new_state->fifo_state[i].fifo_load; +- } +- +- pixel_rate = load_state->hvs_load; +- if (num_outputs > 1) { +- pixel_rate = (pixel_rate * 40) / 100; +- } else { +- pixel_rate = (pixel_rate * 60) / 100; +- } +- +- hvs_new_state->core_clock_rate = max(cob_rate, pixel_rate); +- +- return 0; +-} +- +- + static int + vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) + { +@@ -970,11 +866,7 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) + if (ret) + return ret; + +- ret = vc4_load_tracker_atomic_check(state); +- if (ret) +- return ret; +- +- return vc4_core_clock_atomic_check(state); ++ return vc4_load_tracker_atomic_check(state); + } + + static struct drm_mode_config_helper_funcs vc4_mode_config_helpers = { +-- +2.18.4 + + +From a6ccd0b5b3f097da23862c8f0f7968f436cca62d Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 26 Jul 2021 18:01:54 +0100 +Subject: [PATCH 807/834] Revert "drm/vc4: kms: Convert to atomic helpers" + +This reverts commit c9ba6cf8858b22fad16ddfe261a90181c4f9a504. +--- + drivers/gpu/drm/vc4/vc4_kms.c | 122 ++++++++++++++++++++++++++++++---- + 1 file changed, 109 insertions(+), 13 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c +index 45de906ba085..24dea3acb9de 100644 +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -335,7 +335,8 @@ static void vc5_hvs_pv_muxing_commit(struct vc4_dev *vc4, + } + } + +-static void vc4_atomic_commit_tail(struct drm_atomic_state *state) ++static void ++vc4_atomic_complete_commit(struct drm_atomic_state *state) + { + struct drm_device *dev = state->dev; + struct vc4_dev *vc4 = to_vc4_dev(dev); +@@ -360,6 +361,10 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) + if (vc4->hvs && vc4->hvs->hvs5) + core_req = clk_request_start(hvs->core_clk, 500000000); + ++ drm_atomic_helper_wait_for_fences(dev, state, false); ++ ++ drm_atomic_helper_wait_for_dependencies(state); ++ + old_hvs_state = vc4_hvs_get_old_global_state(state); + if (!old_hvs_state) + return; +@@ -413,27 +418,29 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) + + drm_atomic_helper_cleanup_planes(dev, state); + ++ drm_atomic_helper_commit_cleanup_done(state); ++ + if (vc4->hvs && vc4->hvs->hvs5) + clk_request_done(core_req); ++ ++ drm_atomic_state_put(state); ++} ++ ++static void commit_work(struct work_struct *work) ++{ ++ struct drm_atomic_state *state = container_of(work, ++ struct drm_atomic_state, ++ commit_work); ++ vc4_atomic_complete_commit(state); + } + + static int vc4_atomic_commit_setup(struct drm_atomic_state *state) + { +- struct drm_device *dev = state->dev; +- struct vc4_dev *vc4 = to_vc4_dev(dev); + struct drm_crtc_state *crtc_state; + struct vc4_hvs_state *hvs_state; + struct drm_crtc *crtc; + unsigned int i; + +- /* We know for sure we don't want an async update here. Set +- * state->legacy_cursor_update to false to prevent +- * drm_atomic_helper_setup_commit() from auto-completing +- * commit->flip_done. +- */ +- if (!vc4->firmware_kms) +- state->legacy_cursor_update = false; +- + hvs_state = vc4_hvs_get_new_global_state(state); + if (!hvs_state) + return -EINVAL; +@@ -457,6 +464,95 @@ static int vc4_atomic_commit_setup(struct drm_atomic_state *state) + return 0; + } + ++/** ++ * vc4_atomic_commit - commit validated state object ++ * @dev: DRM device ++ * @state: the driver state object ++ * @nonblock: nonblocking commit ++ * ++ * This function commits a with drm_atomic_helper_check() pre-validated state ++ * object. This can still fail when e.g. the framebuffer reservation fails. For ++ * now this doesn't implement asynchronous commits. ++ * ++ * RETURNS ++ * Zero for success or -errno. ++ */ ++static int vc4_atomic_commit(struct drm_device *dev, ++ struct drm_atomic_state *state, ++ bool nonblock) ++{ ++ int ret; ++ ++ if (state->async_update) { ++ ret = drm_atomic_helper_prepare_planes(dev, state); ++ if (ret) ++ return ret; ++ ++ drm_atomic_helper_async_commit(dev, state); ++ ++ drm_atomic_helper_cleanup_planes(dev, state); ++ ++ return 0; ++ } ++ ++ /* We know for sure we don't want an async update here. Set ++ * state->legacy_cursor_update to false to prevent ++ * drm_atomic_helper_setup_commit() from auto-completing ++ * commit->flip_done. ++ */ ++ if (!vc4->firmware_kms) ++ state->legacy_cursor_update = false; ++ ret = drm_atomic_helper_setup_commit(state, nonblock); ++ if (ret) ++ return ret; ++ ++ INIT_WORK(&state->commit_work, commit_work); ++ ++ ret = drm_atomic_helper_prepare_planes(dev, state); ++ if (ret) ++ return ret; ++ ++ if (!nonblock) { ++ ret = drm_atomic_helper_wait_for_fences(dev, state, true); ++ if (ret) { ++ drm_atomic_helper_cleanup_planes(dev, state); ++ return ret; ++ } ++ } ++ ++ /* ++ * This is the point of no return - everything below never fails except ++ * when the hw goes bonghits. Which means we can commit the new state on ++ * the software side now. ++ */ ++ ++ BUG_ON(drm_atomic_helper_swap_state(state, false) < 0); ++ ++ /* ++ * Everything below can be run asynchronously without the need to grab ++ * any modeset locks at all under one condition: It must be guaranteed ++ * that the asynchronous work has either been cancelled (if the driver ++ * supports it, which at least requires that the framebuffers get ++ * cleaned up with drm_atomic_helper_cleanup_planes()) or completed ++ * before the new state gets committed on the software side with ++ * drm_atomic_helper_swap_state(). ++ * ++ * This scheme allows new atomic state updates to be prepared and ++ * checked in parallel to the asynchronous completion of the previous ++ * update. Which is important since compositors need to figure out the ++ * composition of the next frame right after having submitted the ++ * current layout. ++ */ ++ ++ drm_atomic_state_get(state); ++ if (nonblock) ++ queue_work(system_unbound_wq, &state->commit_work); ++ else ++ vc4_atomic_complete_commit(state); ++ ++ return 0; ++} ++ + static struct drm_framebuffer *vc4_fb_create(struct drm_device *dev, + struct drm_file *file_priv, + const struct drm_mode_fb_cmd2 *mode_cmd) +@@ -681,6 +777,7 @@ vc4_hvs_channels_duplicate_state(struct drm_private_obj *obj) + + __drm_atomic_helper_private_obj_duplicate_state(obj, &state->base); + ++ + for (i = 0; i < HVS_NUM_CHANNELS; i++) { + state->fifo_state[i].in_use = old_state->fifo_state[i].in_use; + +@@ -871,12 +968,11 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) + + static struct drm_mode_config_helper_funcs vc4_mode_config_helpers = { + .atomic_commit_setup = vc4_atomic_commit_setup, +- .atomic_commit_tail = vc4_atomic_commit_tail, + }; + + static const struct drm_mode_config_funcs vc4_mode_funcs = { + .atomic_check = vc4_atomic_check, +- .atomic_commit = drm_atomic_helper_commit, ++ .atomic_commit = vc4_atomic_commit, + .fb_create = vc4_fb_create, + }; + +-- +2.18.4 + + +From c4e174420e8a85336e421dd11063aff275fd7505 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 26 Jul 2021 18:02:11 +0100 +Subject: [PATCH 808/834] Revert "drm/vc4: kms: Remove async modeset semaphore" + +This reverts commit a28f2f0df6da70dec509b965635f0d5f71f9a9f7. +--- + drivers/gpu/drm/vc4/vc4_crtc.c | 13 +++++++++++++ + drivers/gpu/drm/vc4/vc4_drv.h | 2 ++ + drivers/gpu/drm/vc4/vc4_kms.c | 24 ++++++++++++++++++++++-- + 3 files changed, 37 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c +index 0771fd91aee7..008d264cc372 100644 +--- a/drivers/gpu/drm/vc4/vc4_crtc.c ++++ b/drivers/gpu/drm/vc4/vc4_crtc.c +@@ -766,6 +766,7 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb) + container_of(cb, struct vc4_async_flip_state, cb); + struct drm_crtc *crtc = flip_state->crtc; + struct drm_device *dev = crtc->dev; ++ struct vc4_dev *vc4 = to_vc4_dev(dev); + struct drm_plane *plane = crtc->primary; + + vc4_plane_async_set_fb(plane, flip_state->fb); +@@ -797,6 +798,8 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb) + } + + kfree(flip_state); ++ ++ up(&vc4->async_modeset); + } + + /* Implements async (non-vblank-synced) page flips. +@@ -811,6 +814,7 @@ static int vc4_async_page_flip(struct drm_crtc *crtc, + uint32_t flags) + { + struct drm_device *dev = crtc->dev; ++ struct vc4_dev *vc4 = to_vc4_dev(dev); + struct drm_plane *plane = crtc->primary; + int ret = 0; + struct vc4_async_flip_state *flip_state; +@@ -839,6 +843,15 @@ static int vc4_async_page_flip(struct drm_crtc *crtc, + flip_state->crtc = crtc; + flip_state->event = event; + ++ /* Make sure all other async modesetes have landed. */ ++ ret = down_interruptible(&vc4->async_modeset); ++ if (ret) { ++ drm_framebuffer_put(fb); ++ vc4_bo_dec_usecnt(bo); ++ kfree(flip_state); ++ return ret; ++ } ++ + /* Save the current FB before it's replaced by the new one in + * drm_atomic_set_fb_for_plane(). We'll need the old FB in + * vc4_async_page_flip_complete() to decrement the BO usecnt and keep +diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h +index 9d7e0ee768e6..f73f0a6a7df8 100644 +--- a/drivers/gpu/drm/vc4/vc4_drv.h ++++ b/drivers/gpu/drm/vc4/vc4_drv.h +@@ -216,6 +216,8 @@ struct vc4_dev { + struct work_struct reset_work; + } hangcheck; + ++ struct semaphore async_modeset; ++ + struct drm_modeset_lock ctm_state_lock; + struct drm_private_obj ctm_manager; + struct drm_private_obj hvs_channels; +diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c +index 24dea3acb9de..7b02bff7d939 100644 +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -424,6 +424,8 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) + clk_request_done(core_req); + + drm_atomic_state_put(state); ++ ++ up(&vc4->async_modeset); + } + + static void commit_work(struct work_struct *work) +@@ -481,17 +483,26 @@ static int vc4_atomic_commit(struct drm_device *dev, + struct drm_atomic_state *state, + bool nonblock) + { ++ struct vc4_dev *vc4 = to_vc4_dev(dev); + int ret; + + if (state->async_update) { +- ret = drm_atomic_helper_prepare_planes(dev, state); ++ ret = down_interruptible(&vc4->async_modeset); + if (ret) + return ret; + ++ ret = drm_atomic_helper_prepare_planes(dev, state); ++ if (ret) { ++ up(&vc4->async_modeset); ++ return ret; ++ } ++ + drm_atomic_helper_async_commit(dev, state); + + drm_atomic_helper_cleanup_planes(dev, state); + ++ up(&vc4->async_modeset); ++ + return 0; + } + +@@ -508,14 +519,21 @@ static int vc4_atomic_commit(struct drm_device *dev, + + INIT_WORK(&state->commit_work, commit_work); + +- ret = drm_atomic_helper_prepare_planes(dev, state); ++ ret = down_interruptible(&vc4->async_modeset); + if (ret) + return ret; + ++ ret = drm_atomic_helper_prepare_planes(dev, state); ++ if (ret) { ++ up(&vc4->async_modeset); ++ return ret; ++ } ++ + if (!nonblock) { + ret = drm_atomic_helper_wait_for_fences(dev, state, true); + if (ret) { + drm_atomic_helper_cleanup_planes(dev, state); ++ up(&vc4->async_modeset); + return ret; + } + } +@@ -995,6 +1013,8 @@ int vc4_kms_load(struct drm_device *dev) + vc4->load_tracker_enabled = true; + } + ++ sema_init(&vc4->async_modeset, 1); ++ + /* Set support for vblank irq fast disable, before drm_vblank_init() */ + dev->vblank_disable_immediate = true; + +-- +2.18.4 + + +From a6ceb50128346c58e5221822fdeda61d1644a26c Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 26 Jul 2021 18:02:25 +0100 +Subject: [PATCH 809/834] Revert "drm/vc4: kms: Remove unassigned_channels from + the HVS state" + +This reverts commit 7ccf97eb2d8439b8fbc72b1a1ebd7f376422be32. +--- + drivers/gpu/drm/vc4/vc4_kms.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c +index 7b02bff7d939..4103c9bb58ee 100644 +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -39,6 +39,7 @@ static struct vc4_ctm_state *to_vc4_ctm_state(struct drm_private_state *priv) + + struct vc4_hvs_state { + struct drm_private_state base; ++ unsigned int unassigned_channels; + + struct { + unsigned in_use: 1; +@@ -795,6 +796,7 @@ vc4_hvs_channels_duplicate_state(struct drm_private_obj *obj) + + __drm_atomic_helper_private_obj_duplicate_state(obj, &state->base); + ++ state->unassigned_channels = old_state->unassigned_channels; + + for (i = 0; i < HVS_NUM_CHANNELS; i++) { + state->fifo_state[i].in_use = old_state->fifo_state[i].in_use; +@@ -845,6 +847,7 @@ static int vc4_hvs_channels_obj_init(struct vc4_dev *vc4) + if (!state) + return -ENOMEM; + ++ state->unassigned_channels = GENMASK(HVS_NUM_CHANNELS - 1, 0); + drm_atomic_private_obj_init(&vc4->base, &vc4->hvs_channels, + &state->base, + &vc4_hvs_state_funcs); +@@ -889,17 +892,12 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev, + struct vc4_hvs_state *hvs_new_state; + struct drm_crtc_state *old_crtc_state, *new_crtc_state; + struct drm_crtc *crtc; +- unsigned int unassigned_channels = 0; + unsigned int i; + + hvs_new_state = vc4_hvs_get_global_state(state); + if (!hvs_new_state) + return -EINVAL; + +- for (i = 0; i < ARRAY_SIZE(hvs_new_state->fifo_state); i++) +- if (!hvs_new_state->fifo_state[i].in_use) +- unassigned_channels |= BIT(i); +- + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { + struct vc4_crtc_state *old_vc4_crtc_state = + to_vc4_crtc_state(old_crtc_state); +@@ -922,6 +920,8 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev, + /* If we're disabling our CRTC, we put back our channel */ + if (!new_crtc_state->enable) { + channel = old_vc4_crtc_state->assigned_channel; ++ ++ hvs_new_state->unassigned_channels |= BIT(channel); + hvs_new_state->fifo_state[channel].in_use = false; + new_vc4_crtc_state->assigned_channel = VC4_HVS_CHANNEL_DISABLED; + continue; +@@ -951,13 +951,13 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev, + * the future, we will need to have something smarter, + * but it works so far. + */ +- matching_channels = unassigned_channels & vc4_crtc->data->hvs_available_channels; ++ matching_channels = hvs_new_state->unassigned_channels & vc4_crtc->data->hvs_available_channels; + if (!matching_channels) + return -EINVAL; + + channel = ffs(matching_channels) - 1; + new_vc4_crtc_state->assigned_channel = channel; +- unassigned_channels &= ~BIT(channel); ++ hvs_new_state->unassigned_channels &= ~BIT(channel); + hvs_new_state->fifo_state[channel].in_use = true; + } + +-- +2.18.4 + + +From 0d4d411d0fbb097f3db9080460a25789984ea053 Mon Sep 17 00:00:00 2001 +From: Maxime Ripard +Date: Fri, 4 Dec 2020 16:11:35 +0100 +Subject: [PATCH 810/834] Revert "drm/vc4: kms: Wait on previous FIFO users + before a commit" + +This reverts commit f100caadd1f31fde01681b993c8b9641dbdd6611. +--- + drivers/gpu/drm/vc4/vc4_kms.c | 123 +--------------------------------- + 1 file changed, 1 insertion(+), 122 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c +index 4103c9bb58ee..d842889f79e7 100644 +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -40,11 +40,6 @@ static struct vc4_ctm_state *to_vc4_ctm_state(struct drm_private_state *priv) + struct vc4_hvs_state { + struct drm_private_state base; + unsigned int unassigned_channels; +- +- struct { +- unsigned in_use: 1; +- struct drm_crtc_commit *pending_commit; +- } fifo_state[HVS_NUM_CHANNELS]; + }; + + static struct vc4_hvs_state * +@@ -190,32 +185,6 @@ vc4_ctm_commit(struct vc4_dev *vc4, struct drm_atomic_state *state) + VC4_SET_FIELD(ctm_state->fifo, SCALER_OLEDOFFS_DISPFIFO)); + } + +-static struct vc4_hvs_state * +-vc4_hvs_get_new_global_state(struct drm_atomic_state *state) +-{ +- struct vc4_dev *vc4 = to_vc4_dev(state->dev); +- struct drm_private_state *priv_state; +- +- priv_state = drm_atomic_get_new_private_obj_state(state, &vc4->hvs_channels); +- if (IS_ERR(priv_state)) +- return ERR_CAST(priv_state); +- +- return to_vc4_hvs_state(priv_state); +-} +- +-static struct vc4_hvs_state * +-vc4_hvs_get_old_global_state(struct drm_atomic_state *state) +-{ +- struct vc4_dev *vc4 = to_vc4_dev(state->dev); +- struct drm_private_state *priv_state; +- +- priv_state = drm_atomic_get_old_private_obj_state(state, &vc4->hvs_channels); +- if (IS_ERR(priv_state)) +- return ERR_CAST(priv_state); +- +- return to_vc4_hvs_state(priv_state); +-} +- + static struct vc4_hvs_state * + vc4_hvs_get_global_state(struct drm_atomic_state *state) + { +@@ -342,10 +311,8 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) + struct drm_device *dev = state->dev; + struct vc4_dev *vc4 = to_vc4_dev(dev); + struct vc4_hvs *hvs = vc4->hvs; +- struct drm_crtc_state *old_crtc_state; + struct drm_crtc_state *new_crtc_state; + struct drm_crtc *crtc; +- struct vc4_hvs_state *old_hvs_state; + struct clk_request *core_req; + int i; + +@@ -366,36 +333,6 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) + + drm_atomic_helper_wait_for_dependencies(state); + +- old_hvs_state = vc4_hvs_get_old_global_state(state); +- if (!old_hvs_state) +- return; +- +- for_each_old_crtc_in_state(state, crtc, old_crtc_state, i) { +- struct vc4_crtc_state *vc4_crtc_state = +- to_vc4_crtc_state(old_crtc_state); +- struct drm_crtc_commit *commit; +- unsigned int channel = vc4_crtc_state->assigned_channel; +- unsigned long done; +- +- if (channel == VC4_HVS_CHANNEL_DISABLED) +- continue; +- +- if (!old_hvs_state->fifo_state[channel].in_use) +- continue; +- +- commit = old_hvs_state->fifo_state[i].pending_commit; +- if (!commit) +- continue; +- +- done = wait_for_completion_timeout(&commit->hw_done, 10 * HZ); +- if (!done) +- drm_err(dev, "Timed out waiting for hw_done\n"); +- +- done = wait_for_completion_timeout(&commit->flip_done, 10 * HZ); +- if (!done) +- drm_err(dev, "Timed out waiting for flip_done\n"); +- } +- + drm_atomic_helper_commit_modeset_disables(dev, state); + + vc4_ctm_commit(vc4, state); +@@ -437,36 +374,6 @@ static void commit_work(struct work_struct *work) + vc4_atomic_complete_commit(state); + } + +-static int vc4_atomic_commit_setup(struct drm_atomic_state *state) +-{ +- struct drm_crtc_state *crtc_state; +- struct vc4_hvs_state *hvs_state; +- struct drm_crtc *crtc; +- unsigned int i; +- +- hvs_state = vc4_hvs_get_new_global_state(state); +- if (!hvs_state) +- return -EINVAL; +- +- for_each_new_crtc_in_state(state, crtc, crtc_state, i) { +- struct vc4_crtc_state *vc4_crtc_state = +- to_vc4_crtc_state(crtc_state); +- unsigned int channel = +- vc4_crtc_state->assigned_channel; +- +- if (channel == VC4_HVS_CHANNEL_DISABLED) +- continue; +- +- if (!hvs_state->fifo_state[channel].in_use) +- continue; +- +- hvs_state->fifo_state[channel].pending_commit = +- drm_crtc_commit_get(crtc_state->commit); +- } +- +- return 0; +-} +- + /** + * vc4_atomic_commit - commit validated state object + * @dev: DRM device +@@ -788,7 +695,6 @@ vc4_hvs_channels_duplicate_state(struct drm_private_obj *obj) + { + struct vc4_hvs_state *old_state = to_vc4_hvs_state(obj->state); + struct vc4_hvs_state *state; +- unsigned int i; + + state = kzalloc(sizeof(*state), GFP_KERNEL); + if (!state) +@@ -798,16 +704,6 @@ vc4_hvs_channels_duplicate_state(struct drm_private_obj *obj) + + state->unassigned_channels = old_state->unassigned_channels; + +- for (i = 0; i < HVS_NUM_CHANNELS; i++) { +- state->fifo_state[i].in_use = old_state->fifo_state[i].in_use; +- +- if (!old_state->fifo_state[i].pending_commit) +- continue; +- +- state->fifo_state[i].pending_commit = +- drm_crtc_commit_get(old_state->fifo_state[i].pending_commit); +- } +- + return &state->base; + } + +@@ -815,14 +711,6 @@ static void vc4_hvs_channels_destroy_state(struct drm_private_obj *obj, + struct drm_private_state *state) + { + struct vc4_hvs_state *hvs_state = to_vc4_hvs_state(state); +- unsigned int i; +- +- for (i = 0; i < HVS_NUM_CHANNELS; i++) { +- if (!hvs_state->fifo_state[i].pending_commit) +- continue; +- +- drm_crtc_commit_put(hvs_state->fifo_state[i].pending_commit); +- } + + kfree(hvs_state); + } +@@ -919,10 +807,7 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev, + + /* If we're disabling our CRTC, we put back our channel */ + if (!new_crtc_state->enable) { +- channel = old_vc4_crtc_state->assigned_channel; +- +- hvs_new_state->unassigned_channels |= BIT(channel); +- hvs_new_state->fifo_state[channel].in_use = false; ++ hvs_new_state->unassigned_channels |= BIT(old_vc4_crtc_state->assigned_channel); + new_vc4_crtc_state->assigned_channel = VC4_HVS_CHANNEL_DISABLED; + continue; + } +@@ -958,7 +843,6 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev, + channel = ffs(matching_channels) - 1; + new_vc4_crtc_state->assigned_channel = channel; + hvs_new_state->unassigned_channels &= ~BIT(channel); +- hvs_new_state->fifo_state[channel].in_use = true; + } + + return 0; +@@ -984,10 +868,6 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) + return vc4_load_tracker_atomic_check(state); + } + +-static struct drm_mode_config_helper_funcs vc4_mode_config_helpers = { +- .atomic_commit_setup = vc4_atomic_commit_setup, +-}; +- + static const struct drm_mode_config_funcs vc4_mode_funcs = { + .atomic_check = vc4_atomic_check, + .atomic_commit = vc4_atomic_commit, +@@ -1034,7 +914,6 @@ int vc4_kms_load(struct drm_device *dev) + } + + dev->mode_config.funcs = &vc4_mode_funcs; +- dev->mode_config.helper_private = &vc4_mode_config_helpers; + dev->mode_config.preferred_depth = 24; + dev->mode_config.async_page_flip = true; + dev->mode_config.allow_fb_modifiers = true; +-- +2.18.4 + + +From d7069397a173fd3228cfe40fe8078bb21f4d10af Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 26 Jul 2021 18:03:53 +0100 +Subject: [PATCH 811/834] Revert "Revert "drm/vc4: Increase the core clock + based on HVS load"" + +This reverts commit 8f42671317d0504008d2ea35110ac8153bab6b3a. +--- + drivers/gpu/drm/vc4/vc4_crtc.c | 15 +++++ + drivers/gpu/drm/vc4/vc4_drv.h | 3 + + drivers/gpu/drm/vc4/vc4_kms.c | 116 ++++++++++++++++++++++++++++++++- + 3 files changed, 131 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c +index 008d264cc372..6ac60e187015 100644 +--- a/drivers/gpu/drm/vc4/vc4_crtc.c ++++ b/drivers/gpu/drm/vc4/vc4_crtc.c +@@ -660,12 +660,27 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc, + struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state); + struct drm_connector *conn; + struct drm_connector_state *conn_state; ++ struct drm_encoder *encoder; + int ret, i; + + ret = vc4_hvs_atomic_check(crtc, state); + if (ret) + return ret; + ++ encoder = vc4_get_crtc_encoder(crtc, crtc_state); ++ if (encoder) { ++ const struct drm_display_mode *mode = &crtc_state->adjusted_mode; ++ struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder); ++ ++ mode = &crtc_state->adjusted_mode; ++ if (vc4_encoder->type == VC4_ENCODER_TYPE_HDMI0) { ++ vc4_state->hvs_load = max(mode->clock * mode->hdisplay / mode->htotal + 1000, ++ mode->clock * 9 / 10) * 1000; ++ } else { ++ vc4_state->hvs_load = mode->clock * 1000; ++ } ++ } ++ + for_each_new_connector_in_state(state, conn, conn_state, + i) { + if (conn_state->crtc != crtc) +diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h +index f73f0a6a7df8..7c749e08cb0c 100644 +--- a/drivers/gpu/drm/vc4/vc4_drv.h ++++ b/drivers/gpu/drm/vc4/vc4_drv.h +@@ -326,6 +326,7 @@ struct vc4_hvs { + u32 __iomem *dlist; + + struct clk *core_clk; ++ struct clk_request *core_req; + + /* Memory manager for CRTCs to allocate space in the display + * list. Units are dwords. +@@ -537,6 +538,8 @@ struct vc4_crtc_state { + unsigned int bottom; + } margins; + ++ unsigned long hvs_load; ++ + /* Transitional state below, only valid during atomic commits */ + bool update_muxing; + }; +diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c +index d842889f79e7..10990d7cc285 100644 +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -40,6 +40,9 @@ static struct vc4_ctm_state *to_vc4_ctm_state(struct drm_private_state *priv) + struct vc4_hvs_state { + struct drm_private_state base; + unsigned int unassigned_channels; ++ unsigned int num_outputs; ++ unsigned long fifo_load; ++ unsigned long core_clock_rate; + }; + + static struct vc4_hvs_state * +@@ -185,6 +188,19 @@ vc4_ctm_commit(struct vc4_dev *vc4, struct drm_atomic_state *state) + VC4_SET_FIELD(ctm_state->fifo, SCALER_OLEDOFFS_DISPFIFO)); + } + ++static struct vc4_hvs_state * ++vc4_hvs_get_new_global_state(struct drm_atomic_state *state) ++{ ++ struct vc4_dev *vc4 = to_vc4_dev(state->dev); ++ struct drm_private_state *priv_state; ++ ++ priv_state = drm_atomic_get_new_private_obj_state(state, &vc4->hvs_channels); ++ if (IS_ERR(priv_state)) ++ return ERR_CAST(priv_state); ++ ++ return to_vc4_hvs_state(priv_state); ++} ++ + static struct vc4_hvs_state * + vc4_hvs_get_global_state(struct drm_atomic_state *state) + { +@@ -312,10 +328,15 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) + struct vc4_dev *vc4 = to_vc4_dev(dev); + struct vc4_hvs *hvs = vc4->hvs; + struct drm_crtc_state *new_crtc_state; ++ struct vc4_hvs_state *hvs_state; + struct drm_crtc *crtc; + struct clk_request *core_req; + int i; + ++ hvs_state = vc4_hvs_get_new_global_state(state); ++ if (WARN_ON(!hvs_state)) ++ return; ++ + for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) { + struct vc4_crtc_state *vc4_crtc_state; + +@@ -326,9 +347,20 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) + vc4_hvs_mask_underrun(dev, vc4_crtc_state->assigned_channel); + } + +- if (vc4->hvs && vc4->hvs->hvs5) ++ if (vc4->hvs && vc4->hvs->hvs5) { ++ /* ++ * Do a temporary request on the core clock during the ++ * modeset. ++ */ + core_req = clk_request_start(hvs->core_clk, 500000000); + ++ /* ++ * And remove the previous one based on the HVS ++ * requirements if any. ++ */ ++ clk_request_done(hvs->core_req); ++ } ++ + drm_atomic_helper_wait_for_fences(dev, state, false); + + drm_atomic_helper_wait_for_dependencies(state); +@@ -358,8 +390,20 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) + + drm_atomic_helper_commit_cleanup_done(state); + +- if (vc4->hvs && vc4->hvs->hvs5) ++ if (vc4->hvs && vc4->hvs->hvs5) { ++ drm_dbg(dev, "Running the core clock at %lu Hz\n", ++ hvs_state->core_clock_rate); ++ ++ /* ++ * Request a clock rate based on the current HVS ++ * requirements. ++ */ ++ hvs->core_req = clk_request_start(hvs->core_clk, ++ hvs_state->core_clock_rate); ++ ++ /* And drop the temporary request */ + clk_request_done(core_req); ++ } + + drm_atomic_state_put(state); + +@@ -703,6 +747,9 @@ vc4_hvs_channels_duplicate_state(struct drm_private_obj *obj) + __drm_atomic_helper_private_obj_duplicate_state(obj, &state->base); + + state->unassigned_channels = old_state->unassigned_channels; ++ state->fifo_load = old_state->fifo_load; ++ state->num_outputs = old_state->num_outputs; ++ state->core_clock_rate = old_state->core_clock_rate; + + return &state->base; + } +@@ -848,6 +895,65 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev, + return 0; + } + ++static int ++vc4_core_clock_atomic_check(struct drm_atomic_state *state) ++{ ++ struct vc4_dev *vc4 = to_vc4_dev(state->dev); ++ struct drm_private_state *priv_state; ++ struct vc4_hvs_state *hvs_new_state; ++ struct vc4_load_tracker_state *load_state; ++ struct drm_crtc_state *old_crtc_state, *new_crtc_state; ++ struct drm_crtc *crtc; ++ unsigned long pixel_rate; ++ unsigned long cob_rate; ++ unsigned int i; ++ ++ priv_state = drm_atomic_get_private_obj_state(state, ++ &vc4->load_tracker); ++ if (IS_ERR(priv_state)) ++ return PTR_ERR(priv_state); ++ ++ load_state = to_vc4_load_tracker_state(priv_state); ++ ++ hvs_new_state = vc4_hvs_get_global_state(state); ++ if (!hvs_new_state) ++ return -EINVAL; ++ ++ for_each_oldnew_crtc_in_state(state, crtc, ++ old_crtc_state, ++ new_crtc_state, ++ i) { ++ if (old_crtc_state->active) { ++ struct vc4_crtc_state *old_vc4_state = ++ to_vc4_crtc_state(old_crtc_state); ++ ++ hvs_new_state->num_outputs -= 1; ++ hvs_new_state->fifo_load -= old_vc4_state->hvs_load; ++ } ++ ++ if (new_crtc_state->active) { ++ struct vc4_crtc_state *new_vc4_state = ++ to_vc4_crtc_state(new_crtc_state); ++ ++ hvs_new_state->num_outputs += 1; ++ hvs_new_state->fifo_load += new_vc4_state->hvs_load; ++ } ++ } ++ ++ cob_rate = hvs_new_state->fifo_load; ++ pixel_rate = load_state->hvs_load; ++ if (hvs_new_state->num_outputs > 1) { ++ pixel_rate = (pixel_rate * 40) / 100; ++ } else { ++ pixel_rate = (pixel_rate * 60) / 100; ++ } ++ ++ hvs_new_state->core_clock_rate = max(cob_rate, pixel_rate); ++ ++ return 0; ++} ++ ++ + static int + vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) + { +@@ -865,7 +971,11 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) + if (ret) + return ret; + +- return vc4_load_tracker_atomic_check(state); ++ ret = vc4_load_tracker_atomic_check(state); ++ if (ret) ++ return ret; ++ ++ return vc4_core_clock_atomic_check(state); + } + + static const struct drm_mode_config_funcs vc4_mode_funcs = { +-- +2.18.4 + + +From 981917257a0e0fa58df63105fb7a39876e5da1f2 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 26 Jul 2021 18:07:25 +0100 +Subject: [PATCH 812/834] Revert "Revert "drm/vc4: Increase the core clock to a + minimum of 500MHz"" + +This reverts commit af4a0a6ba1426de138eab330d901f204c9cecf7c. +--- + drivers/gpu/drm/vc4/vc4_kms.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c +index 10990d7cc285..fb2465964d46 100644 +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -348,11 +348,17 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) + } + + if (vc4->hvs && vc4->hvs->hvs5) { ++ unsigned long core_rate = max_t(unsigned long, ++ 500000000, ++ hvs_state->core_clock_rate); ++ ++ drm_dbg(dev, "Raising the core clock at %lu Hz\n", core_rate); ++ + /* + * Do a temporary request on the core clock during the + * modeset. + */ +- core_req = clk_request_start(hvs->core_clk, 500000000); ++ core_req = clk_request_start(hvs->core_clk, core_rate); + + /* + * And remove the previous one based on the HVS +-- +2.18.4 + + +From a34ed09fff9c496baabf805ca7b19f3137403453 Mon Sep 17 00:00:00 2001 +From: "chipdip.lab" <43340836+chipdipru@users.noreply.github.com> +Date: Mon, 26 Jul 2021 14:43:11 +0300 +Subject: [PATCH 813/834] overlays: Update and rename chipdip-i2s-master-dac + +Simple card fragment removed, GPIO fragment added. + +Signed-off-by: Evgenij Sapunov +--- + arch/arm/boot/dts/overlays/Makefile | 2 +- + arch/arm/boot/dts/overlays/README | 6 +-- + .../boot/dts/overlays/chipdip-dac-overlay.dts | 46 ++++++++++++++++ + .../chipdip-i2s-master-dac-overlay.dts | 53 ------------------- + 4 files changed, 50 insertions(+), 57 deletions(-) + create mode 100644 arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts + delete mode 100644 arch/arm/boot/dts/overlays/chipdip-i2s-master-dac-overlay.dts + +diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile +index bb350f667f0a..6ab8969f9d85 100644 +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -31,7 +31,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + audremap.dtbo \ + balena-fin.dtbo \ + cap1106.dtbo \ +- chipdip-i2s-master-dac.dtbo \ ++ chipdip-dac.dtbo \ + cma.dtbo \ + dht11.dtbo \ + dionaudio-loco.dtbo \ +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index a2c7631cc6d7..feb605b6cd01 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -628,9 +628,9 @@ Load: dtoverlay=cap1106,= + Params: int_pin GPIO pin for interrupt signal (default 23) + + +-Name: chipdip-i2s-master-dac +-Info: Configures Raspberry PI to work as I2S slave with BCLK=64Fs. +-Load: dtoverlay=chipdip-i2s-master-dac ++Name: chipdip-dac ++Info: Configures Chip Dip audio cards. ++Load: dtoverlay=chipdip-dac + Params: + + +diff --git a/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts +new file mode 100644 +index 000000000000..09c7417b4707 +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts +@@ -0,0 +1,46 @@ ++/* ++ * Device Tree overlay for ChipDip DAC ++ */ ++ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target = <&i2s>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@1 { ++ target-path = "/"; ++ __overlay__ { ++ spdif-transmitter { ++ #address-cells = <0>; ++ #size-cells = <0>; ++ #sound-dai-cells = <0>; ++ compatible = "linux,spdif-dit"; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&sound>; ++ __overlay__ { ++ compatible = "chipdip,chipdip-dac"; ++ i2s-controller = <&i2s>; ++ sr0-gpios = <&gpio 5 0>; ++ sr1-gpios = <&gpio 6 0>; ++ sr2-gpios = <&gpio 12 0>; ++ res0-gpios = <&gpio 24 0>; ++ res1-gpios = <&gpio 27 0>; ++ mute-gpios = <&gpio 4 0>; ++ sdwn-gpios = <&gpio 13 0>; ++ status = "okay"; ++ }; ++ }; ++}; +diff --git a/arch/arm/boot/dts/overlays/chipdip-i2s-master-dac-overlay.dts b/arch/arm/boot/dts/overlays/chipdip-i2s-master-dac-overlay.dts +deleted file mode 100644 +index a35ac36f8513..000000000000 +--- a/arch/arm/boot/dts/overlays/chipdip-i2s-master-dac-overlay.dts ++++ /dev/null +@@ -1,53 +0,0 @@ +-/* +- * Device Tree overlay for ChipDip I2S master DAC +- */ +- +-/dts-v1/; +-/plugin/; +- +-/ { +- compatible = "brcm,bcm2835"; +- fragment@0 { +- target = <&sound>; +- __overlay__ { +- compatible = "simple-audio-card"; +- simple-audio-card,name = "ChipDip I2S master DAC"; +- status="okay"; +- playback_link: simple-audio-card,dai-link@0 { +- format = "i2s"; +- bitclock-master = <&p_codec_dai>; +- frame-master = <&p_codec_dai>; +- p_cpu_dai: cpu { +- sound-dai = <&i2s>; +- dai-tdm-slot-num = <2>; +- dai-tdm-slot-width = <32>; +- }; +- +- p_codec_dai: codec { +- sound-dai = <&codec_out>; +- }; +- }; +- }; +- }; +- +- fragment@1 { +- target-path = "/"; +- __overlay__ { +- codec_out: spdif-transmitter { +- #address-cells = <0>; +- #size-cells = <0>; +- #sound-dai-cells = <0>; +- compatible = "linux,spdif-dit"; +- status = "okay"; +- }; +- }; +- }; +- +- fragment@2 { +- target = <&i2s>; +- __overlay__ { +- #sound-dai-cells = <0>; +- status = "okay"; +- }; +- }; +-}; +-- +2.18.4 + + +From e9f1f011b279fdeed6a62d1389eea71eb48ba763 Mon Sep 17 00:00:00 2001 +From: "chipdip.lab" <43340836+chipdipru@users.noreply.github.com> +Date: Mon, 26 Jul 2021 14:45:59 +0300 +Subject: [PATCH 814/834] ASoC: bcm: Add chipdip-dac driver + +Driver chipdip-dac.c added into sound/soc/bcm/, files +sound/soc/bcm/Kconfig and sound/soc/bcm/Makefile updated. + +Signed-off-by: Evgenij Sapunov +--- + sound/soc/bcm/Kconfig | 6 + + sound/soc/bcm/Makefile | 3 +- + sound/soc/bcm/chipdip-dac.c | 275 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 283 insertions(+), 1 deletion(-) + create mode 100644 sound/soc/bcm/chipdip-dac.c + +diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig +index 94c2a8e8ad2d..d65df373c39e 100644 +--- a/sound/soc/bcm/Kconfig ++++ b/sound/soc/bcm/Kconfig +@@ -27,6 +27,12 @@ config SND_BCM63XX_I2S_WHISTLER + + If you don't know what to do here, say N + ++config SND_BCM2708_SOC_CHIPDIP_DAC ++ tristate "Support for the ChipDip DAC" ++ depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S ++ help ++ Say Y or M if you want to add support for the ChipDip DAC soundcard ++ + config SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD + tristate "Support for Google voiceHAT soundcard" + depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S +diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile +index 942464a729b3..1efb734f1c86 100644 +--- a/sound/soc/bcm/Makefile ++++ b/sound/soc/bcm/Makefile +@@ -47,6 +47,7 @@ snd-soc-fe-pi-audio-objs := fe-pi-audio.o + snd-soc-rpi-simple-soundcard-objs := rpi-simple-soundcard.o + snd-soc-rpi-wm8804-soundcard-objs := rpi-wm8804-soundcard.o + snd-soc-pifi-40-objs := pifi-40.o ++snd-soc-chipdip-dac-objs := chipdip-dac.o + + obj-$(CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD) += snd-soc-googlevoicehat-codec.o + obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o +@@ -78,4 +79,4 @@ obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO) += snd-soc-fe-pi-audio.o + obj-$(CONFIG_SND_RPI_SIMPLE_SOUNDCARD) += snd-soc-rpi-simple-soundcard.o + obj-$(CONFIG_SND_RPI_WM8804_SOUNDCARD) += snd-soc-rpi-wm8804-soundcard.o + obj-$(CONFIG_SND_BCM2708_SOC_PIFI_40) += snd-soc-pifi-40.o +- ++obj-$(CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC) += snd-soc-chipdip-dac.o +diff --git a/sound/soc/bcm/chipdip-dac.c b/sound/soc/bcm/chipdip-dac.c +new file mode 100644 +index 000000000000..6cb53692b3c5 +--- /dev/null ++++ b/sound/soc/bcm/chipdip-dac.c +@@ -0,0 +1,275 @@ ++/* ++ * ASoC Driver for ChipDip DAC ++ * ++ * Author: Evgenij Sapunov ++ * Copyright 2021 ++ * based on code by Milan Neskovic ++ * based on code by Jaikumar ++ * ++ * Thanks to Phil Elwell (pelwell) for help. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define SR_BIT_0 0 //sample rate bits ++#define SR_BIT_1 1 ++#define SR_BIT_2 2 ++#define BD_BIT_0 3 //bit depth bits ++#define BD_BIT_1 4 ++ ++#define SAMPLE_RATE_MASK_44_1 0 ++#define SAMPLE_RATE_MASK_48 (1 << SR_BIT_0) ++#define SAMPLE_RATE_MASK_88_2 ((1 << SR_BIT_2) | (1 << SR_BIT_1)) ++#define SAMPLE_RATE_MASK_96 (1 << SR_BIT_1) ++#define SAMPLE_RATE_MASK_176_4 ((1 << SR_BIT_2) | (1 << SR_BIT_1) | (1 << SR_BIT_0)) ++#define SAMPLE_RATE_MASK_192 ((1 << SR_BIT_1) | (1 << SR_BIT_0)) ++#define SAMPLE_RATE_MASK ((1 << SR_BIT_2) | (1 << SR_BIT_1) | (1 << SR_BIT_0)) ++ ++#define BIT_DEPTH_MASK_16 0 ++#define BIT_DEPTH_MASK_24 (1 << BD_BIT_0) ++#define BIT_DEPTH_MASK_32 (1 << BD_BIT_1) ++#define BIT_DEPTH_MASK ((1 << BD_BIT_1) | (1 << BD_BIT_0)) ++ ++#define MUTE_ACTIVE 0 ++#define MUTE_NOT_ACTIVE 1 ++ ++#define HW_PARAMS_GPIO_COUNT 5 ++ ++static struct gpio_desc *mute_gpio; ++static struct gpio_desc *sdwn_gpio; ++static struct gpio_desc *hw_params_gpios[HW_PARAMS_GPIO_COUNT]; ++static int current_width; ++static int current_rate; ++ ++static void snd_rpi_chipdip_dac_gpio_array_set(int value); ++static void snd_rpi_chipdip_dac_gpio_set(struct gpio_desc *gpio_item, int value); ++ ++static void snd_rpi_chipdip_dac_gpio_array_set(int value) ++{ ++ int i = 0; ++ ++ for (i = 0; i < HW_PARAMS_GPIO_COUNT; i++) ++ snd_rpi_chipdip_dac_gpio_set(hw_params_gpios[i], ((value >> i) & 1)); ++} ++ ++static void snd_rpi_chipdip_dac_gpio_set(struct gpio_desc *gpio_item, int value) ++{ ++ if (gpio_item) ++ gpiod_set_value_cansleep(gpio_item, value); ++} ++ ++static int snd_rpi_chipdip_dac_init(struct snd_soc_pcm_runtime *rtd) ++{ ++ return 0; ++} ++ ++static int snd_rpi_chipdip_dac_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ int ret = 0; ++ int gpio_change_pending = 0; ++ int sample_rate_state = 0; ++ int bit_depth_state = 0; ++ int param_value = params_width(params); ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ ++ ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_cpu(rtd, 0), 2 * 32); ++ ++ if (current_width != param_value) { ++ current_width = param_value; ++ gpio_change_pending = 1; ++ ++ switch (param_value) { ++ case 16: ++ bit_depth_state = BIT_DEPTH_MASK_16; ++ break; ++ case 24: ++ bit_depth_state = BIT_DEPTH_MASK_24; ++ break; ++ case 32: ++ bit_depth_state = BIT_DEPTH_MASK_32; ++ break; ++ default: ++ return -EINVAL; ++ } ++ } ++ ++ param_value = params_rate(params); ++ if (current_rate != param_value) { ++ current_rate = param_value; ++ gpio_change_pending = 1; ++ ++ switch (param_value) { ++ case 44100: ++ sample_rate_state = SAMPLE_RATE_MASK_44_1; ++ break; ++ case 48000: ++ sample_rate_state = SAMPLE_RATE_MASK_48; ++ break; ++ case 88200: ++ sample_rate_state = SAMPLE_RATE_MASK_88_2; ++ break; ++ case 96000: ++ sample_rate_state = SAMPLE_RATE_MASK_96; ++ break; ++ case 176400: ++ sample_rate_state = SAMPLE_RATE_MASK_176_4; ++ break; ++ case 192000: ++ sample_rate_state = SAMPLE_RATE_MASK_192; ++ break; ++ default: ++ return -EINVAL; ++ } ++ } ++ ++ if (gpio_change_pending) { ++ snd_rpi_chipdip_dac_gpio_set(mute_gpio, MUTE_ACTIVE); ++ snd_rpi_chipdip_dac_gpio_array_set(bit_depth_state | sample_rate_state); ++ msleep(300); ++ snd_rpi_chipdip_dac_gpio_set(mute_gpio, MUTE_NOT_ACTIVE); ++ } ++ ++ return ret; ++} ++ ++static int snd_rpi_chipdip_dac_startup(struct snd_pcm_substream *substream) ++{ ++ return 0; ++} ++ ++static void snd_rpi_chipdip_dac_shutdown(struct snd_pcm_substream *substream) ++{ ++ ++} ++ ++/* machine stream operations */ ++static struct snd_soc_ops snd_rpi_chipdip_dac_ops = { ++ .hw_params = snd_rpi_chipdip_dac_hw_params, ++ .startup = snd_rpi_chipdip_dac_startup, ++ .shutdown = snd_rpi_chipdip_dac_shutdown, ++}; ++ ++SND_SOC_DAILINK_DEFS(hifi, ++ DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")), ++ DAILINK_COMP_ARRAY(COMP_CODEC("spdif-transmitter", "dit-hifi")), ++ DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0"))); ++ ++static struct snd_soc_dai_link snd_rpi_chipdip_dac_dai[] = { ++{ ++ .name = "ChipDip DAC", ++ .stream_name = "ChipDip DAC HiFi", ++ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM, ++ .ops = &snd_rpi_chipdip_dac_ops, ++ .init = snd_rpi_chipdip_dac_init, ++ SND_SOC_DAILINK_REG(hifi), ++}, ++}; ++ ++/* audio machine driver */ ++static struct snd_soc_card snd_rpi_chipdip_dac = { ++ .name = "ChipDipDAC", ++ .driver_name = "ChipdipDac", ++ .owner = THIS_MODULE, ++ .dai_link = snd_rpi_chipdip_dac_dai, ++ .num_links = ARRAY_SIZE(snd_rpi_chipdip_dac_dai), ++}; ++ ++static int snd_rpi_chipdip_dac_probe(struct platform_device *pdev) ++{ ++ int ret = 0; ++ int i = 0; ++ ++ snd_rpi_chipdip_dac.dev = &pdev->dev; ++ ++ if (pdev->dev.of_node) { ++ struct device_node *i2s_node; ++ struct snd_soc_dai_link *dai = &snd_rpi_chipdip_dac_dai[0]; ++ i2s_node = of_parse_phandle(pdev->dev.of_node, ++ "i2s-controller", 0); ++ ++ if (i2s_node) { ++ dai->cpus->dai_name = NULL; ++ dai->cpus->of_node = i2s_node; ++ dai->platforms->name = NULL; ++ dai->platforms->of_node = i2s_node; ++ } ++ } ++ ++ hw_params_gpios[SR_BIT_0] = devm_gpiod_get_optional(&pdev->dev, "sr0", GPIOD_OUT_LOW); ++ hw_params_gpios[SR_BIT_1] = devm_gpiod_get_optional(&pdev->dev, "sr1", GPIOD_OUT_LOW); ++ hw_params_gpios[SR_BIT_2] = devm_gpiod_get_optional(&pdev->dev, "sr2", GPIOD_OUT_LOW); ++ hw_params_gpios[BD_BIT_0] = devm_gpiod_get_optional(&pdev->dev, "res0", GPIOD_OUT_LOW); ++ hw_params_gpios[BD_BIT_1] = devm_gpiod_get_optional(&pdev->dev, "res1", GPIOD_OUT_LOW); ++ mute_gpio = devm_gpiod_get_optional(&pdev->dev, "mute", GPIOD_OUT_LOW); ++ sdwn_gpio = devm_gpiod_get_optional(&pdev->dev, "sdwn", GPIOD_OUT_HIGH); ++ ++ for (i = 0; i < HW_PARAMS_GPIO_COUNT; i++) { ++ if (IS_ERR(hw_params_gpios[i])) { ++ ret = PTR_ERR(hw_params_gpios[i]); ++ dev_err(&pdev->dev, "failed to get hw_params gpio: %d\n", ret); ++ return ret; ++ } ++ } ++ ++ if (IS_ERR(mute_gpio)) { ++ ret = PTR_ERR(mute_gpio); ++ dev_err(&pdev->dev, "failed to get mute gpio: %d\n", ret); ++ return ret; ++ } ++ ++ if (IS_ERR(sdwn_gpio)) { ++ ret = PTR_ERR(sdwn_gpio); ++ dev_err(&pdev->dev, "failed to get sdwn gpio: %d\n", ret); ++ return ret; ++ } ++ ++ snd_rpi_chipdip_dac_gpio_set(sdwn_gpio, 1); ++ ++ ret = devm_snd_soc_register_card(&pdev->dev, &snd_rpi_chipdip_dac); ++ if (ret && ret != -EPROBE_DEFER) ++ dev_err(&pdev->dev, ++ "snd_soc_register_card() failed: %d\n", ret); ++ ++ return ret; ++} ++ ++static const struct of_device_id snd_rpi_chipdip_dac_of_match[] = { ++ { .compatible = "chipdip,chipdip-dac", }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, snd_rpi_chipdip_dac_of_match); ++ ++static struct platform_driver snd_rpi_chipdip_dac_driver = { ++ .driver = { ++ .name = "snd-rpi-chipdip-dac", ++ .owner = THIS_MODULE, ++ .of_match_table = snd_rpi_chipdip_dac_of_match, ++ }, ++ .probe = snd_rpi_chipdip_dac_probe, ++}; ++ ++module_platform_driver(snd_rpi_chipdip_dac_driver); ++ ++MODULE_AUTHOR("Evgenij Sapunov "); ++MODULE_DESCRIPTION("ASoC Driver for ChipDip DAC"); ++MODULE_LICENSE("GPL v2"); +-- +2.18.4 + + +From a234311b9423fe84f4065dbadbe77fe2fd1b4558 Mon Sep 17 00:00:00 2001 +From: "chipdip.lab" <43340836+chipdipru@users.noreply.github.com> +Date: Mon, 26 Jul 2021 16:34:41 +0300 +Subject: [PATCH 815/834] configs: Add SND_BCM2708_SOC_CHIPDIP_DAC + +Enable the driver for the ChipDip DAC soundcard. + +Signed-off-by: Evgenij Sapunov +--- + arch/arm/configs/bcm2709_defconfig | 1 + + arch/arm/configs/bcm2711_defconfig | 1 + + arch/arm/configs/bcmrpi_defconfig | 1 + + arch/arm64/configs/bcm2711_defconfig | 1 + + arch/arm64/configs/bcmrpi3_defconfig | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig +index 639d69949862..55d68bdfde0b 100644 +--- a/arch/arm/configs/bcm2709_defconfig ++++ b/arch/arm/configs/bcm2709_defconfig +@@ -979,6 +979,7 @@ CONFIG_SND_USB_6FIRE=m + CONFIG_SND_USB_HIFACE=m + CONFIG_SND_SOC=m + CONFIG_SND_BCM2835_SOC_I2S=m ++CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m + CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m +diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig +index 068b2c8689be..64f1206f0bd5 100644 +--- a/arch/arm/configs/bcm2711_defconfig ++++ b/arch/arm/configs/bcm2711_defconfig +@@ -994,6 +994,7 @@ CONFIG_SND_USB_6FIRE=m + CONFIG_SND_USB_HIFACE=m + CONFIG_SND_SOC=m + CONFIG_SND_BCM2835_SOC_I2S=m ++CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m + CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m +diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig +index 7e5dcab65cdb..b939d3ba58b5 100644 +--- a/arch/arm/configs/bcmrpi_defconfig ++++ b/arch/arm/configs/bcmrpi_defconfig +@@ -972,6 +972,7 @@ CONFIG_SND_USB_6FIRE=m + CONFIG_SND_USB_HIFACE=m + CONFIG_SND_SOC=m + CONFIG_SND_BCM2835_SOC_I2S=m ++CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m + CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index 1771618bfe9e..01297528be0d 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -995,6 +995,7 @@ CONFIG_SND_USB_6FIRE=m + CONFIG_SND_USB_HIFACE=m + CONFIG_SND_SOC=m + CONFIG_SND_BCM2835_SOC_I2S=m ++CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m + CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index 13aa02396b7b..178848f3c993 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -907,6 +907,7 @@ CONFIG_SND_USB_CAIAQ_INPUT=y + CONFIG_SND_USB_6FIRE=m + CONFIG_SND_SOC=m + CONFIG_SND_BCM2835_SOC_I2S=m ++CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m + CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m +-- +2.18.4 + + +From 4de6970ce593fd33c5656df6dfdcb31cd90880f6 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 28 Jul 2021 09:49:21 +0100 +Subject: [PATCH 816/834] char: vc_mem: Delete dead code + +There are no error exists once device_create has succeeded, and +therefore no need to call device_destroy from vc_mem_init. + +Signed-off-by: Phil Elwell +--- + drivers/char/broadcom/vc_mem.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/char/broadcom/vc_mem.c b/drivers/char/broadcom/vc_mem.c +index b1b5a95baf02..195b61a4387c 100644 +--- a/drivers/char/broadcom/vc_mem.c ++++ b/drivers/char/broadcom/vc_mem.c +@@ -333,8 +333,6 @@ vc_mem_init(void) + vc_mem_inited = 1; + return 0; + +- device_destroy(vc_mem_class, vc_mem_devnum); +- + out_class_destroy: + class_destroy(vc_mem_class); + vc_mem_class = NULL; +-- +2.18.4 + + +From f6d360461100273be199ea994262dea268706754 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 28 Jul 2021 11:18:24 +0100 +Subject: [PATCH 817/834] configs: Add RANDOM_TRUST_BOOTLOADER=y + +See: https://github.com/raspberrypi/firmware/issues/1595 + +Signed-off-by: Phil Elwell +--- + arch/arm/configs/bcm2709_defconfig | 1 + + arch/arm/configs/bcm2711_defconfig | 1 + + arch/arm/configs/bcmrpi_defconfig | 1 + + arch/arm64/configs/bcm2711_defconfig | 1 + + arch/arm64/configs/bcmrpi3_defconfig | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig +index 55d68bdfde0b..dcaef9b8c9e7 100644 +--- a/arch/arm/configs/bcm2709_defconfig ++++ b/arch/arm/configs/bcm2709_defconfig +@@ -669,6 +669,7 @@ CONFIG_HW_RANDOM=y + CONFIG_RAW_DRIVER=y + CONFIG_TCG_TPM=m + CONFIG_TCG_TIS_SPI=m ++CONFIG_RANDOM_TRUST_BOOTLOADER=y + CONFIG_I2C=y + CONFIG_I2C_CHARDEV=m + CONFIG_I2C_MUX_GPMUX=m +diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig +index 64f1206f0bd5..b0d099ad9f2d 100644 +--- a/arch/arm/configs/bcm2711_defconfig ++++ b/arch/arm/configs/bcm2711_defconfig +@@ -682,6 +682,7 @@ CONFIG_HW_RANDOM=y + CONFIG_RAW_DRIVER=y + CONFIG_TCG_TPM=m + CONFIG_TCG_TIS_SPI=m ++CONFIG_RANDOM_TRUST_BOOTLOADER=y + CONFIG_I2C=y + CONFIG_I2C_CHARDEV=m + CONFIG_I2C_MUX_GPMUX=m +diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig +index b939d3ba58b5..fa02f75b2ed8 100644 +--- a/arch/arm/configs/bcmrpi_defconfig ++++ b/arch/arm/configs/bcmrpi_defconfig +@@ -663,6 +663,7 @@ CONFIG_HW_RANDOM=y + CONFIG_RAW_DRIVER=y + CONFIG_TCG_TPM=m + CONFIG_TCG_TIS_SPI=m ++CONFIG_RANDOM_TRUST_BOOTLOADER=y + CONFIG_I2C=y + CONFIG_I2C_CHARDEV=m + CONFIG_I2C_MUX_GPMUX=m +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index 01297528be0d..7f254d408ddc 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -677,6 +677,7 @@ CONFIG_HW_RANDOM=y + CONFIG_RAW_DRIVER=y + CONFIG_TCG_TPM=m + CONFIG_TCG_TIS_SPI=m ++CONFIG_RANDOM_TRUST_BOOTLOADER=y + CONFIG_I2C=y + CONFIG_I2C_CHARDEV=m + CONFIG_I2C_MUX_GPMUX=m +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index 178848f3c993..58a5e0535b6f 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -654,6 +654,7 @@ CONFIG_HW_RANDOM=y + CONFIG_RAW_DRIVER=y + CONFIG_TCG_TPM=m + CONFIG_TCG_TIS_SPI=m ++CONFIG_RANDOM_TRUST_BOOTLOADER=y + CONFIG_I2C=y + CONFIG_I2C_CHARDEV=m + CONFIG_I2C_MUX=m +-- +2.18.4 + + +From 1f6110115d8a7c745428eab5a9dd5ff83a011200 Mon Sep 17 00:00:00 2001 +From: WoodenNautilus <86767647+WoodenNautilus@users.noreply.github.com> +Date: Tue, 3 Aug 2021 11:13:06 +0200 +Subject: [PATCH 818/834] overlays: Add Ablic S35390A to i2c-rtc and -gpio + +See: https://github.com/raspberrypi/linux/pull/4492 + +Signed-off-by: Maxime Torrelli +--- + arch/arm/boot/dts/overlays/README | 4 ++++ + arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi | 17 ++++++++++++++++- + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index feb605b6cd01..022aae287ed7 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -1424,6 +1424,8 @@ Params: abx80x Select one of the ABx80x family: + + sd3078 Select the ZXW Shenzhen whwave SD3078 device + ++ s35390a Select the ABLIC S35390A device ++ + i2c0 Choose the I2C0 bus on GPIOs 0&1 + + i2c_csi_dsi Choose the I2C0 bus on GPIOs 44&45 +@@ -1487,6 +1489,8 @@ Params: abx80x Select one of the ABx80x family: + + sd3078 Select the ZXW Shenzhen whwave SD3078 device + ++ s35390a Select the ABLIC S35390A device ++ + addr Sets the address for the RTC. Note that the + device must be configured to use the specified + address. +diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi +index fd80027792d2..f51981aafda8 100644 +--- a/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi ++++ b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi +@@ -243,6 +243,19 @@ + }; + }; + ++ fragment@18 { ++ target = <&i2cbus>; ++ __dormant__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ s35390a: s35390a@30 { ++ compatible = "ablic,s35390a"; ++ reg = <0x30>; ++ }; ++ }; ++ }; ++ + __overrides__ { + abx80x = <0>,"+0"; + ds1307 = <0>,"+1"; +@@ -262,6 +275,7 @@ + sd3078 = <0>,"+14"; + pcf85063 = <0>,"+15"; + pcf85063a = <0>,"+16"; ++ s35390a = <0>,"+18"; + + addr = <&abx80x>, "reg:0", + <&ds1307>, "reg:0", +@@ -272,7 +286,8 @@ + <&pcf8523>, "reg:0", + <&pcf8563>, "reg:0", + <&m41t62>, "reg:0", +- <&rv1805>, "reg:0"; ++ <&rv1805>, "reg:0", ++ <&s35390a>, "reg:0"; + trickle-diode-type = <&abx80x>,"abracon,tc-diode", + <&rv1805>,"abracon,tc-diode"; + trickle-resistor-ohms = <&ds1339>,"trickle-resistor-ohms:0", +-- +2.18.4 + + +From cf58d094019a50a0c472b8b5e41fcbfb281df795 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Mon, 2 Aug 2021 14:30:15 +0100 +Subject: [PATCH 819/834] dtoverlays: Add orientation (and rotation) parameter + to sensor overlays + +Add the orientation parameter to all the camera sensor overlays to +avoid libcamera complaining, and add the rotation parameter where +it hadn't been added before. + +Signed-off-by: Dave Stevenson +--- + arch/arm/boot/dts/overlays/README | 26 ++++++++++++++++--- + arch/arm/boot/dts/overlays/imx219-overlay.dts | 2 ++ + .../boot/dts/overlays/imx290_327-overlay.dtsi | 5 ++++ + .../boot/dts/overlays/imx477_378-overlay.dtsi | 2 ++ + arch/arm/boot/dts/overlays/ov5647-overlay.dts | 2 ++ + arch/arm/boot/dts/overlays/ov7251-overlay.dts | 8 ++++++ + arch/arm/boot/dts/overlays/ov9281-overlay.dts | 7 +++++ + 7 files changed, 48 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 022aae287ed7..fafec158c1bb 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -1682,6 +1682,8 @@ Info: Sony IMX219 camera module. + Load: dtoverlay=imx219,= + Params: rotation Mounting rotation of the camera sensor (0 or + 180, default 180) ++ orientation Sensor orientation (0 = front, 1 = rear, ++ 2 = external, default external) + + + Name: imx290 +@@ -1698,6 +1700,10 @@ Params: 4lane Enable 4 CSI2 lanes. This requires a Compute + (the default), whilst those from Innomaker use + 74.25MHz. + mono Denote that the module is a mono sensor. ++ orientation Sensor orientation (0 = front, 1 = rear, ++ 2 = external, default external) ++ rotation Mounting rotation of the camera sensor (0 or ++ 180, default 0) + + + Name: imx378 +@@ -1707,6 +1713,8 @@ Info: Sony IMX378 camera module. + Load: dtoverlay=imx378,= + Params: rotation Mounting rotation of the camera sensor (0 or + 180, default 180) ++ orientation Sensor orientation (0 = front, 1 = rear, ++ 2 = external, default external) + + + Name: imx477 +@@ -1716,6 +1724,8 @@ Info: Sony IMX477 camera module. + Load: dtoverlay=imx477,= + Params: rotation Mounting rotation of the camera sensor (0 or + 180, default 180) ++ orientation Sensor orientation (0 = front, 1 = rear, ++ 2 = external, default external) + + + Name: iqaudio-codec +@@ -2141,22 +2151,30 @@ Info: Omnivision OV5647 camera module. + Load: dtoverlay=ov5647,= + Params: rotation Mounting rotation of the camera sensor (0 or + 180, default 0) ++ orientation Sensor orientation (0 = front, 1 = rear, ++ 2 = external, default external) + + + Name: ov7251 + Info: Omnivision OV7251 camera module. + Uses Unicam 1, which is the standard camera connector on most Pi + variants. +-Load: dtoverlay=ov7251 +-Params: ++Load: dtoverlay=ov7251,= ++Params: rotation Mounting rotation of the camera sensor (0 or ++ 180, default 0) ++ orientation Sensor orientation (0 = front, 1 = rear, ++ 2 = external, default external) + + + Name: ov9281 + Info: Omnivision OV9281 camera module. + Uses Unicam 1, which is the standard camera connector on most Pi + variants. +-Load: dtoverlay=ov9281 +-Params: ++Load: dtoverlay=ov9281,= ++Params: rotation Mounting rotation of the camera sensor (0 or ++ 180, default 0) ++ orientation Sensor orientation (0 = front, 1 = rear, ++ 2 = external, default external) + + + Name: papirus +diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts +index 0840e8b23b1a..0c065bf09f54 100644 +--- a/arch/arm/boot/dts/overlays/imx219-overlay.dts ++++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts +@@ -28,6 +28,7 @@ + VDDL-supply = <&imx219_vddl>; /* 1.2v */ + + rotation = <180>; ++ orientation = <2>; + + port { + imx219_0: endpoint { +@@ -109,5 +110,6 @@ + + __overrides__ { + rotation = <&imx219>,"rotation:0"; ++ orientation = <&imx219>,"orientation:0"; + }; + }; +diff --git a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi +index 6ecafdddbf0a..d4a5ed6dbbcf 100644 +--- a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi ++++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi +@@ -24,6 +24,9 @@ + clock-names = "xclk"; + clock-frequency = <37125000>; + ++ rotation = <0>; ++ orientation = <2>; ++ + vdda-supply = <&cam1_reg>; /* 2.8v */ + vdddo-supply = <&imx290_vdddo>; /* 1.8v */ + vddd-supply = <&imx290_vddd>; /* 1.5v */ +@@ -135,5 +138,7 @@ + 4lane = <0>, "-6+7-8+9"; + clock-frequency = <&imx290_clk>,"clock-frequency:0", + <&imx290>,"clock-frequency:0"; ++ rotation = <&imx290>,"rotation:0"; ++ orientation = <&imx290>,"orientation:0"; + }; + }; +diff --git a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi +index 4e444709cc16..bb9a9acdbbd7 100644 +--- a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi ++++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi +@@ -23,6 +23,7 @@ + VDDL-supply = <&imx477_vddl>; /* 1.8v */ + + rotation = <180>; ++ orientation = <2>; + + port { + imx477_0: endpoint { +@@ -104,5 +105,6 @@ + + __overrides__ { + rotation = <&imx477>,"rotation:0"; ++ orientation = <&imx477>,"orientation:0"; + }; + }; +diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts +index fd1e7a457f69..d7ed4703c9b0 100644 +--- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts ++++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts +@@ -22,6 +22,7 @@ + clocks = <&ov5647_clk>; + + rotation = <0>; ++ orientation = <2>; + + port { + ov5647_0: endpoint { +@@ -88,5 +89,6 @@ + + __overrides__ { + rotation = <&ov5647>,"rotation:0"; ++ orientation = <&ov5647>,"orientation:0"; + }; + }; +diff --git a/arch/arm/boot/dts/overlays/ov7251-overlay.dts b/arch/arm/boot/dts/overlays/ov7251-overlay.dts +index da77a95c1296..09dbeda39d06 100644 +--- a/arch/arm/boot/dts/overlays/ov7251-overlay.dts ++++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts +@@ -28,6 +28,9 @@ + vdda-supply = <&cam1_reg>; + vddd-supply = <&ov7251_dvdd>; + ++ rotation = <0>; ++ orientation = <2>; ++ + port { + ov7251_0: endpoint { + remote-endpoint = <&csi1_ep>; +@@ -102,4 +105,9 @@ + regulator-max-microvolt = <2800000>; + }; + }; ++ ++ __overrides__ { ++ rotation = <&ov7251>,"rotation:0"; ++ orientation = <&ov7251>,"orientation:0"; ++ }; + }; +diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts +index b7a9c8c539da..277236c03358 100644 +--- a/arch/arm/boot/dts/overlays/ov9281-overlay.dts ++++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts +@@ -27,6 +27,9 @@ + dovdd-supply = <&ov9281_dovdd>; + dvdd-supply = <&ov9281_dvdd>; + ++ rotation = <0>; ++ orientation = <2>; ++ + port { + ov9281_0: endpoint { + remote-endpoint = <&csi1_ep>; +@@ -103,4 +106,8 @@ + }; + }; + ++ __overrides__ { ++ rotation = <&ov9281>,"rotation:0"; ++ orientation = <&ov9281>,"orientation:0"; ++ }; + }; +-- +2.18.4 + + +From ac2b08a39d2288f0adf8e941057a60ddb225876f Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Tue, 3 Aug 2021 11:25:59 +0100 +Subject: [PATCH 820/834] media: i2c: imx290: Add fwnode properties controls + +Add call to v4l2_ctrl_new_fwnode_properties to read and +create the fwnode based controls. + +Signed-off-by: Dave Stevenson +--- + drivers/media/i2c/imx290.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c +index 24a7dee571cd..a26106c41cc6 100644 +--- a/drivers/media/i2c/imx290.c ++++ b/drivers/media/i2c/imx290.c +@@ -1242,6 +1242,7 @@ static const struct of_device_id imx290_of_match[] = { + + static int imx290_probe(struct i2c_client *client) + { ++ struct v4l2_fwnode_device_properties props; + struct device *dev = &client->dev; + struct fwnode_handle *endpoint; + /* Only CSI2 is supported for now: */ +@@ -1363,7 +1364,7 @@ static int imx290_probe(struct i2c_client *client) + */ + imx290_entity_init_cfg(&imx290->sd, NULL); + +- v4l2_ctrl_handler_init(&imx290->ctrls, 9); ++ v4l2_ctrl_handler_init(&imx290->ctrls, 11); + + v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops, + V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0); +@@ -1411,6 +1412,15 @@ static int imx290_probe(struct i2c_client *client) + ARRAY_SIZE(imx290_test_pattern_menu) - 1, + 0, 0, imx290_test_pattern_menu); + ++ ret = v4l2_fwnode_device_parse(&client->dev, &props); ++ if (ret) ++ goto free_ctrl; ++ ++ ret = v4l2_ctrl_new_fwnode_properties(&imx290->ctrls, &imx290_ctrl_ops, ++ &props); ++ if (ret) ++ goto free_ctrl; ++ + imx290->sd.ctrl_handler = &imx290->ctrls; + + if (imx290->ctrls.error) { +-- +2.18.4 + + +From c6411d06add690abe38cde2fb1d38c67a0a37717 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Tue, 3 Aug 2021 11:30:58 +0100 +Subject: [PATCH 821/834] media: i2c: ov9281: Add fwnode properties controls + +Add call to v4l2_ctrl_new_fwnode_properties to read and +create the fwnode based controls. + +Signed-off-by: Dave Stevenson +--- + drivers/media/i2c/ov9281.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c +index 6bfc79cd5897..a6ffcdd47b21 100644 +--- a/drivers/media/i2c/ov9281.c ++++ b/drivers/media/i2c/ov9281.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + #define OV9281_LINK_FREQ_400MHZ 400000000 +@@ -1020,6 +1021,7 @@ static const struct v4l2_ctrl_ops ov9281_ctrl_ops = { + + static int ov9281_initialize_controls(struct ov9281 *ov9281) + { ++ struct v4l2_fwnode_device_properties props; + const struct ov9281_mode *mode; + struct v4l2_ctrl_handler *handler; + struct v4l2_ctrl *ctrl; +@@ -1029,7 +1031,7 @@ static int ov9281_initialize_controls(struct ov9281 *ov9281) + + handler = &ov9281->ctrl_handler; + mode = ov9281->cur_mode; +- ret = v4l2_ctrl_handler_init(handler, 9); ++ ret = v4l2_ctrl_handler_init(handler, 11); + if (ret) + return ret; + handler->lock = &ov9281->mutex; +@@ -1091,6 +1093,15 @@ static int ov9281_initialize_controls(struct ov9281 *ov9281) + goto err_free_handler; + } + ++ ret = v4l2_fwnode_device_parse(&ov9281->client->dev, &props); ++ if (ret) ++ goto err_free_handler; ++ ++ ret = v4l2_ctrl_new_fwnode_properties(handler, &ov9281_ctrl_ops, ++ &props); ++ if (ret) ++ goto err_free_handler; ++ + ov9281->subdev.ctrl_handler = handler; + + return 0; +-- +2.18.4 + + +From e7ab9c5f7269cf350f586311c6eb53232fe8ad41 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Tue, 3 Aug 2021 11:33:33 +0100 +Subject: [PATCH 822/834] media: i2c: ov7251: Add fwnode properties controls + +Add call to v4l2_ctrl_new_fwnode_properties to read and +create the fwnode based controls. + +Signed-off-by: Dave Stevenson +--- + drivers/media/i2c/ov7251.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c +index 0c10203f822b..2c554626319d 100644 +--- a/drivers/media/i2c/ov7251.c ++++ b/drivers/media/i2c/ov7251.c +@@ -1253,6 +1253,7 @@ static const struct v4l2_subdev_ops ov7251_subdev_ops = { + + static int ov7251_probe(struct i2c_client *client) + { ++ struct v4l2_fwnode_device_properties props; + struct device *dev = &client->dev; + struct fwnode_handle *endpoint; + struct ov7251 *ov7251; +@@ -1338,7 +1339,7 @@ static int ov7251_probe(struct i2c_client *client) + + mutex_init(&ov7251->lock); + +- v4l2_ctrl_handler_init(&ov7251->ctrls, 7); ++ v4l2_ctrl_handler_init(&ov7251->ctrls, 9); + ov7251->ctrls.lock = &ov7251->lock; + + v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops, +@@ -1374,6 +1375,15 @@ static int ov7251_probe(struct i2c_client *client) + goto free_ctrl; + } + ++ ret = v4l2_fwnode_device_parse(&client->dev, &props); ++ if (ret) ++ goto free_ctrl; ++ ++ ret = v4l2_ctrl_new_fwnode_properties(&ov7251->ctrls, &ov7251_ctrl_ops, ++ &props); ++ if (ret) ++ goto free_ctrl; ++ + v4l2_i2c_subdev_init(&ov7251->sd, client, &ov7251_subdev_ops); + ov7251->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; + ov7251->pad.flags = MEDIA_PAD_FL_SOURCE; +-- +2.18.4 + + +From bc25d840f323d30e29d1d02ed713ac8c2e74bc13 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Tue, 3 Aug 2021 11:32:30 +0100 +Subject: [PATCH 823/834] overlays: Reduce Pi 4 vc4 CMA size to 320MB + +Reduce the default CMA allocation requested by the vc4-kms-v3d-pi4 and +vc4-fkms-v3d-pi4 overlays to 320MB. + +Use magic values of the form (*64 - 4)MB to encode default values +of *64MB, allowing these defaults to be distinguished from values +set explicitly by the user with the usual overlay parameters (e.g. +"cma-384"). Only default values will be capped if the Pi RAM is too +small or the gpu_mem setting too large for it to be viable. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts +index bb6731e1c9c4..7792ead0cbb3 100644 +--- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts ++++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts +@@ -8,7 +8,7 @@ + #include "cma-overlay.dts" + + &frag0 { +- size = <(512*1024*1024)>; ++ size = <((320-4)*1024*1024)>; + }; + + / { +diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts +index 0480fa7a8129..4285e12a4e53 100644 +--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts ++++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts +@@ -10,7 +10,7 @@ + #include "cma-overlay.dts" + + &frag0 { +- size = <(512*1024*1024)>; ++ size = <((320-4)*1024*1024)>; + }; + + / { +-- +2.18.4 + + +From 7a46ea6be7884bc47f7b75a1143357328bd5ceaa Mon Sep 17 00:00:00 2001 +From: Ahmet Inan +Date: Wed, 4 Aug 2021 10:10:11 +0200 +Subject: [PATCH 824/834] Revert "overlays: Update display GPIO declarations" + for Goodix + +This reverts commit b7d685c0b1bd1b98af0e9c1f5d43769982bdbfb2 for Goodix + +Signed-off-by: Ahmet Inan +--- + arch/arm/boot/dts/overlays/goodix-overlay.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/overlays/goodix-overlay.dts b/arch/arm/boot/dts/overlays/goodix-overlay.dts +index a11d65f81c5e..8571527de49a 100644 +--- a/arch/arm/boot/dts/overlays/goodix-overlay.dts ++++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts +@@ -31,7 +31,7 @@ + interrupt-parent = <&gpio>; + interrupts = <4 2>; // high-to-low edge triggered + irq-gpios = <&gpio 4 0>; // Pin7 on GPIO header +- reset-gpios = <&gpio 17 1>; // Pin11 on GPIO header ++ reset-gpios = <&gpio 17 0>; // Pin11 on GPIO header + }; + }; + }; +-- +2.18.4 + + +From e05e3083b57f13b4927784c6e5a4b54668d1d07d Mon Sep 17 00:00:00 2001 +From: pjx3 +Date: Sun, 8 Aug 2021 20:09:46 +0100 +Subject: [PATCH 825/834] overlays: Add midi-uart{2345}-overlay.dts + +Added overlays for enabling MIDI baudrates on additional UARTs + +Signed-off-by: Pete Marshall +--- + arch/arm/boot/dts/overlays/Makefile | 4 ++ + arch/arm/boot/dts/overlays/README | 28 ++++++++++++++ + .../boot/dts/overlays/midi-uart2-overlay.dts | 37 ++++++++++++++++++ + .../boot/dts/overlays/midi-uart3-overlay.dts | 38 +++++++++++++++++++ + .../boot/dts/overlays/midi-uart4-overlay.dts | 38 +++++++++++++++++++ + .../boot/dts/overlays/midi-uart5-overlay.dts | 38 +++++++++++++++++++ + 6 files changed, 183 insertions(+) + create mode 100644 arch/arm/boot/dts/overlays/midi-uart2-overlay.dts + create mode 100644 arch/arm/boot/dts/overlays/midi-uart3-overlay.dts + create mode 100644 arch/arm/boot/dts/overlays/midi-uart4-overlay.dts + create mode 100644 arch/arm/boot/dts/overlays/midi-uart5-overlay.dts + +diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile +index 6ab8969f9d85..fbcc3e35a747 100644 +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -123,6 +123,10 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + merus-amp.dtbo \ + midi-uart0.dtbo \ + midi-uart1.dtbo \ ++ midi-uart2.dtbo \ ++ midi-uart3.dtbo \ ++ midi-uart4.dtbo \ ++ midi-uart5.dtbo \ + minipitft13.dtbo \ + miniuart-bt.dtbo \ + mmc.dtbo \ +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index fafec158c1bb..57d5c2f45c50 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -2088,6 +2088,34 @@ Load: dtoverlay=midi-uart1 + Params: + + ++Name: midi-uart2 ++Info: Configures UART2 (ttyAMA1) so that a requested 38.4kbaud actually gets ++ 31.25kbaud, the frequency required for MIDI ++Load: dtoverlay=midi-uart2 ++Params: ++ ++ ++Name: midi-uart3 ++Info: Configures UART3 (ttyAMA2) so that a requested 38.4kbaud actually gets ++ 31.25kbaud, the frequency required for MIDI ++Load: dtoverlay=midi-uart3 ++Params: ++ ++ ++Name: midi-uart4 ++Info: Configures UART4 (ttyAMA3) so that a requested 38.4kbaud actually gets ++ 31.25kbaud, the frequency required for MIDI ++Load: dtoverlay=midi-uart4 ++Params: ++ ++ ++Name: midi-uart5 ++Info: Configures UART5 (ttyAMA4) so that a requested 38.4kbaud actually gets ++ 31.25kbaud, the frequency required for MIDI ++Load: dtoverlay=midi-uart5 ++Params: ++ ++ + Name: minipitft13 + Info: Overlay for AdaFruit Mini Pi 1.3" TFT via SPI using fbtft driver. + Load: dtoverlay=minipitft13,= +diff --git a/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts +new file mode 100644 +index 000000000000..66f3092e9a74 +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts +@@ -0,0 +1,37 @@ ++/dts-v1/; ++/plugin/; ++ ++#include ++ ++/* ++ * Fake a higher clock rate to get a larger divisor, and thereby a lower ++ * baudrate. The real clock is 48MHz, which we scale so that requesting ++ * 38.4kHz results in an actual 31.25kHz. ++ * ++ * 48000000*38400/31250 = 58982400 ++ */ ++ ++/{ ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target-path = "/"; ++ __overlay__ { ++ midi_clk: midi_clk2 { ++ compatible = "fixed-clock"; ++ #clock-cells = <0>; ++ clock-output-names = "uart2_pclk"; ++ clock-frequency = <58982400>; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&uart2>; ++ __overlay__ { ++ clocks = <&midi_clk>, ++ <&clocks BCM2835_CLOCK_VPU>; ++ }; ++ }; ++}; ++ +diff --git a/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts +new file mode 100644 +index 000000000000..55c6cb94f963 +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts +@@ -0,0 +1,38 @@ ++/dts-v1/; ++/plugin/; ++ ++#include ++ ++/* ++ * Fake a higher clock rate to get a larger divisor, and thereby a lower ++ * baudrate. The real clock is 48MHz, which we scale so that requesting ++ * 38.4kHz results in an actual 31.25kHz. ++ * ++ * 48000000*38400/31250 = 58982400 ++ */ ++ ++/{ ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target-path = "/"; ++ __overlay__ { ++ midi_clk: midi_clk3 { ++ compatible = "fixed-clock"; ++ #clock-cells = <0>; ++ clock-output-names = "uart3_pclk"; ++ clock-frequency = <58982400>; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&uart3>; ++ __overlay__ { ++ clocks = <&midi_clk>, ++ <&clocks BCM2835_CLOCK_VPU>; ++ }; ++ }; ++}; ++ ++ +diff --git a/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts +new file mode 100644 +index 000000000000..5819df1a6b2e +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts +@@ -0,0 +1,38 @@ ++/dts-v1/; ++/plugin/; ++ ++#include ++ ++/* ++ * Fake a higher clock rate to get a larger divisor, and thereby a lower ++ * baudrate. The real clock is 48MHz, which we scale so that requesting ++ * 38.4kHz results in an actual 31.25kHz. ++ * ++ * 48000000*38400/31250 = 58982400 ++ */ ++ ++/{ ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target-path = "/"; ++ __overlay__ { ++ midi_clk: midi_clk4 { ++ compatible = "fixed-clock"; ++ #clock-cells = <0>; ++ clock-output-names = "uart4_pclk"; ++ clock-frequency = <58982400>; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&uart4>; ++ __overlay__ { ++ clocks = <&midi_clk>, ++ <&clocks BCM2835_CLOCK_VPU>; ++ }; ++ }; ++}; ++ ++ +diff --git a/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts +new file mode 100644 +index 000000000000..a1d37f7103ff +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts +@@ -0,0 +1,38 @@ ++/dts-v1/; ++/plugin/; ++ ++#include ++ ++/* ++ * Fake a higher clock rate to get a larger divisor, and thereby a lower ++ * baudrate. The real clock is 48MHz, which we scale so that requesting ++ * 38.4kHz results in an actual 31.25kHz. ++ * ++ * 48000000*38400/31250 = 58982400 ++ */ ++ ++/{ ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target-path = "/"; ++ __overlay__ { ++ midi_clk: midi_clk5 { ++ compatible = "fixed-clock"; ++ #clock-cells = <0>; ++ clock-output-names = "uart5_pclk"; ++ clock-frequency = <58982400>; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&uart5>; ++ __overlay__ { ++ clocks = <&midi_clk>, ++ <&clocks BCM2835_CLOCK_VPU>; ++ }; ++ }; ++}; ++ ++ +-- +2.18.4 + + +From 379ca6c89a9188cad72b5db0ae0d1b9b84f7ea10 Mon Sep 17 00:00:00 2001 +From: Jonathan Bell +Date: Wed, 11 Aug 2021 15:33:57 +0100 +Subject: [PATCH 826/834] usb: xhci: workaround for bogus SET_DEQ_PENDING + endpoint state + +See https://github.com/raspberrypi/linux/issues/3981 + +An unknown unsafe memory access can result in the ep_state variable +in xhci_virt_ep being trampled with a stuck SET_DEQ_PENDING state +despite successful completion of a Set TR Deq Pointer command. + +All URB enqueue/dequeue calls for the endpoint will fail in this state +so no transfers are possible until the device is reconnected. + +As a workaround, clear the flag if we see it set and issue a new Set +TR Deq command anyway - this should be harmless, as a prior Set TR Deq +command will only have been issued in the Stopped state, and if the +endpoint is Running then the controller is required to ignore it and +respond with a Context State Error event TRB. + +Signed-off-by: Jonathan Bell +--- + drivers/usb/host/xhci-ring.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c +index 0797964e8f36..d5796c49aec7 100644 +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -4255,9 +4255,9 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci, + } + ep = &xhci->devs[slot_id]->eps[ep_index]; + if ((ep->ep_state & SET_DEQ_PENDING)) { +- xhci_warn(xhci, "WARN Cannot submit Set TR Deq Ptr\n"); +- xhci_warn(xhci, "A Set TR Deq Ptr command is pending.\n"); +- return; ++ xhci_warn(xhci, "WARN A Set TR Deq Ptr command is pending for slot %u ep %u\n", ++ slot_id, ep_index); ++ ep->ep_state &= ~SET_DEQ_PENDING; + } + + /* This function gets called from contexts where it cannot sleep */ +-- +2.18.4 + + +From 342d56f6f2952ad4db8287bb7690b0f8d9307d45 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 16 Aug 2021 11:11:35 +0100 +Subject: [PATCH 827/834] overlays: Add TI BQ32000 RTC support + +See: https://github.com/raspberrypi/linux/issues/4531 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/README | 10 ++++++++++ + .../arm/boot/dts/overlays/i2c-rtc-common.dtsi | 20 ++++++++++++++++++- + 2 files changed, 29 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 57d5c2f45c50..708ebaac9c92 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -1390,6 +1390,8 @@ Params: abx80x Select one of the ABx80x family: + AB0801, AB0803, AB0804, AB0805, + AB1801, AB1803, AB1804, AB1805 + ++ bq32000 Select the TI BQ32000 device ++ + ds1307 Select the DS1307 device + + ds1339 Select the DS1339 device +@@ -1434,6 +1436,9 @@ Params: abx80x Select one of the ABx80x family: + device must be configured to use the specified + address. + ++ trickle-diode-disable Do not use the internal trickle charger diode ++ (BQ32000 only) ++ + trickle-diode-type Diode type for trickle charge - "standard" or + "schottky" (ABx80x and RV1805 only) + +@@ -1455,6 +1460,8 @@ Params: abx80x Select one of the ABx80x family: + AB0801, AB0803, AB0804, AB0805, + AB1801, AB1803, AB1804, AB1805 + ++ bq32000 Select the TI BQ32000 device ++ + ds1307 Select the DS1307 device + + ds1339 Select the DS1339 device +@@ -1495,6 +1502,9 @@ Params: abx80x Select one of the ABx80x family: + device must be configured to use the specified + address. + ++ trickle-diode-disable Do not use the internal trickle charger diode ++ (BQ32000 only) ++ + trickle-diode-type Diode type for trickle charge - "standard" or + "schottky" (ABx80x and RV1805 only) + +diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi +index f51981aafda8..7f749fc2d802 100644 +--- a/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi ++++ b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi +@@ -256,6 +256,21 @@ + }; + }; + ++ fragment@19 { ++ target = <&i2cbus>; ++ __dormant__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ bq32000: bq32000@68 { ++ compatible = "ti,bq32000"; ++ trickle-resistor-ohms = <0>; ++ reg = <0x68>; ++ }; ++ }; ++ }; ++ ++ + __overrides__ { + abx80x = <0>,"+0"; + ds1307 = <0>,"+1"; +@@ -276,6 +291,7 @@ + pcf85063 = <0>,"+15"; + pcf85063a = <0>,"+16"; + s35390a = <0>,"+18"; ++ bq32000 = <0>,"+19"; + + addr = <&abx80x>, "reg:0", + <&ds1307>, "reg:0", +@@ -288,13 +304,15 @@ + <&m41t62>, "reg:0", + <&rv1805>, "reg:0", + <&s35390a>, "reg:0"; ++ trickle-diode-disable = <&bq32000>,"trickle-diode-disable?"; + trickle-diode-type = <&abx80x>,"abracon,tc-diode", + <&rv1805>,"abracon,tc-diode"; + trickle-resistor-ohms = <&ds1339>,"trickle-resistor-ohms:0", + <&ds1340>,"trickle-resistor-ohms:0", + <&abx80x>,"abracon,tc-resistor:0", + <&rv3028>,"trickle-resistor-ohms:0", +- <&rv1805>,"abracon,tc-resistor:0"; ++ <&rv1805>,"abracon,tc-resistor:0", ++ <&bq32000>,"abracon,tc-resistor:0"; + backup-switchover-mode = <&rv3028>,"backup-switchover-mode:0"; + wakeup-source = <&ds1339>,"wakeup-source?", + <&ds3231>,"wakeup-source?", +-- +2.18.4 + + +From 07ef5342d82ea46d2a1eb9a65c4fbc5cf7ee45fa Mon Sep 17 00:00:00 2001 +From: Jonathan Bell +Date: Mon, 16 Aug 2021 14:43:06 +0100 +Subject: [PATCH 828/834] xhci: guard accesses to ep_state in + xhci_endpoint_reset() + +See https://github.com/raspberrypi/linux/issues/3981 + +Two read-modify-write cycles on ep->ep_state are not guarded by +xhci->lock. Fix these. + +Signed-off-by: Jonathan Bell +--- + drivers/usb/host/xhci.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c +index a04c4756eb74..05e829a04fee 100644 +--- a/drivers/usb/host/xhci.c ++++ b/drivers/usb/host/xhci.c +@@ -3269,10 +3269,13 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd, + return; + + /* Bail out if toggle is already being cleared by a endpoint reset */ ++ spin_lock_irqsave(&xhci->lock, flags); + if (ep->ep_state & EP_HARD_CLEAR_TOGGLE) { + ep->ep_state &= ~EP_HARD_CLEAR_TOGGLE; ++ spin_unlock_irqrestore(&xhci->lock, flags); + return; + } ++ spin_unlock_irqrestore(&xhci->lock, flags); + /* Only interrupt and bulk ep's use data toggle, USB2 spec 5.5.4-> */ + if (usb_endpoint_xfer_control(&host_ep->desc) || + usb_endpoint_xfer_isoc(&host_ep->desc)) +@@ -3358,8 +3361,10 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd, + xhci_free_command(xhci, cfg_cmd); + cleanup: + xhci_free_command(xhci, stop_cmd); ++ spin_lock_irqsave(&xhci->lock, flags); + if (ep->ep_state & EP_SOFT_CLEAR_TOGGLE) + ep->ep_state &= ~EP_SOFT_CLEAR_TOGGLE; ++ spin_unlock_irqrestore(&xhci->lock, flags); + } + + static int xhci_check_streams_endpoint(struct xhci_hcd *xhci, +-- +2.18.4 + + +From 33c137d2cefc9a1cc10ecba1540c991838fe9821 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Tue, 27 Jul 2021 22:22:52 +0100 +Subject: [PATCH 829/834] ARM: dts: Adapt to upstream changes + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 4 ++-- + arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | 2 +- + arch/arm/boot/dts/bcm2708-rpi-b.dts | 2 +- + arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 2 +- + arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 2 +- + arch/arm/boot/dts/bcm2708-rpi-zero.dts | 2 +- + arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 4 ++-- + arch/arm/boot/dts/bcm270x.dtsi | 2 +- + arch/arm/boot/dts/bcm2710-rpi-2-b.dts | 4 ++-- + arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 4 ++-- + arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 4 ++-- + arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 2 +- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++-- + arch/arm/boot/dts/bcm2711-rpi-400.dts | 10 ++++++---- + arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 10 ++++++---- + 15 files changed, 31 insertions(+), 27 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +index 76bb3e11ce19..e42cba84ab0e 100644 +--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +@@ -90,13 +90,13 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&gpio 47 0>; + }; + +- pwr_led: pwr { ++ pwr_led: led-pwr { + label = "led1"; + linux,default-trigger = "input"; + gpios = <&gpio 35 0>; +diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts +index a8a3926ef69f..4ea1e68f5e29 100644 +--- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts +@@ -103,7 +103,7 @@ i2c_csi_dsi: &i2c1 { + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&gpio 16 1>; +diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts +index 5d4b7382e684..a152c1c8e648 100644 +--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts +@@ -90,7 +90,7 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&gpio 16 1>; +diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi +index dce160f420fd..d5572b2d2103 100644 +--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi ++++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi +@@ -2,7 +2,7 @@ + #include "bcm2708-rpi.dtsi" + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&gpio 47 0>; +diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +index abf490f93b96..75a5b41514f9 100644 +--- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +@@ -139,7 +139,7 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "actpwr"; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; +diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts +index 38fcd6e84796..84591bd7d423 100644 +--- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts +@@ -93,7 +93,7 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "actpwr"; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; +diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +index b0ccd8cd0705..e1381d2b3a2c 100644 +--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts ++++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +@@ -90,13 +90,13 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&gpio 47 0>; + }; + +- pwr_led: pwr { ++ pwr_led: led-pwr { + label = "led1"; + linux,default-trigger = "input"; + gpios = <&gpio 35 0>; +diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi +index 6a865d9f553f..8a0e2f200997 100644 +--- a/arch/arm/boot/dts/bcm270x.dtsi ++++ b/arch/arm/boot/dts/bcm270x.dtsi +@@ -33,7 +33,7 @@ + }; + #endif + +- /delete-node/ sdhci@7e300000; ++ /delete-node/ mmc@7e300000; + + sdhci: mmc: mmc@7e300000 { + compatible = "brcm,bcm2835-mmc", "brcm,bcm2835-sdhci"; +diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts +index b870b1cb9b93..ae9db1b1be1b 100644 +--- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts ++++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts +@@ -90,13 +90,13 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&gpio 47 0>; + }; + +- pwr_led: pwr { ++ pwr_led: led-pwr { + label = "led1"; + linux,default-trigger = "input"; + gpios = <&gpio 35 0>; +diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +index b713eca31221..7e12c05cc28b 100644 +--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +@@ -149,13 +149,13 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&gpio 29 0>; + }; + +- pwr_led: pwr { ++ pwr_led: led-pwr { + label = "led1"; + linux,default-trigger = "default-on"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; +diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +index ecab394195a4..d40722ddc286 100644 +--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts ++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +@@ -164,13 +164,13 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&virtgpio 0 0>; + }; + +- pwr_led: pwr { ++ pwr_led: led-pwr { + label = "led1"; + linux,default-trigger = "input"; + gpios = <&expgpio 7 0>; +diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +index 6743c984a316..c386a855cdc3 100644 +--- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts ++++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +@@ -123,7 +123,7 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&virtgpio 0 0>; +diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +index 016d4d466150..e0d1128c9439 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +@@ -579,13 +579,13 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; + }; + +- pwr_led: pwr { ++ pwr_led: led-pwr { + label = "led1"; + linux,default-trigger = "default-on"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; +diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts +index 8e69f0e14c2a..c25a97465d2b 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts +@@ -28,11 +28,11 @@ + }; + + leds { +- act { ++ led-act { + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; + }; + +- pwr { ++ led-pwr { + label = "PWR"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; + default-state = "keep"; +@@ -181,12 +181,14 @@ + &hdmi0 { + clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>; + clock-names = "hdmi", "bvb", "audio", "cec"; ++ wifi-2.4ghz-coexistence; + status = "okay"; + }; + + &hdmi1 { + clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>; + clock-names = "hdmi", "bvb", "audio", "cec"; ++ wifi-2.4ghz-coexistence; + status = "okay"; + }; + +@@ -586,14 +588,14 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "default-on"; + default-state = "on"; + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; + }; + +- pwr_led: pwr { ++ pwr_led: led-pwr { + label = "led1"; + linux,default-trigger = "default-on"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; +diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +index d9271012a572..1dcbb2173f5d 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +@@ -28,11 +28,11 @@ + }; + + leds { +- act { ++ led-act { + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; + }; + +- pwr { ++ led-pwr { + label = "PWR"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; + default-state = "keep"; +@@ -193,12 +193,14 @@ + &hdmi0 { + clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>; + clock-names = "hdmi", "bvb", "audio", "cec"; ++ wifi-2.4ghz-coexistence; + status = "okay"; + }; + + &hdmi1 { + clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>; + clock-names = "hdmi", "bvb", "audio", "cec"; ++ wifi-2.4ghz-coexistence; + status = "okay"; + }; + +@@ -597,13 +599,13 @@ + }; + + &leds { +- act_led: act { ++ act_led: led-act { + label = "led0"; + linux,default-trigger = "mmc0"; + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; + }; + +- pwr_led: pwr { ++ pwr_led: led-pwr { + label = "led1"; + linux,default-trigger = "default-on"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; +-- +2.18.4 + + +From 56b9556e5f053c3dbe9ede0e2fe6107e015dab38 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 18 Aug 2021 17:26:49 +0100 +Subject: [PATCH 830/834] overlays: rpi-poe-plus: Improve the cooling levels + +The PoE HAT cooling levels are not well suited for the PoE+ HAT - the +fan fails to come on until the temperature reaches the third trip point +(50C). + +Give the rpi-poe-plus overlay a different set of cooling levels - +0 32 64 128 255, as suggested by @chris-kai-in. + +See: https://github.com/raspberrypi/firmware/issues/1607 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts +index e0138847093b..5b12d02c3707 100644 +--- a/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts ++++ b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts +@@ -17,3 +17,7 @@ + }; + }; + }; ++ ++&fan0 { ++ cooling-levels = <0 32 64 128 255>; ++}; +-- +2.18.4 + + +From 747b25e1a8e191166da464dbaf1ecf0b0b116351 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Thu, 19 Aug 2021 14:28:56 +0100 +Subject: [PATCH 831/834] Makefiles: dt: Always set '-@' on ARCH_BCM2835 + +On the BCM2835 architecture, always add the '-@' option to enable the +generation of symbols, rather than relying on DTC_FLAGS being empty +or correct. + +See: https://github.com/raspberrypi/linux/issues/3846 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/Makefile | 2 +- + arch/arm64/boot/dts/broadcom/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 93815985f6e0..12cd8bf582e1 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -1432,5 +1432,5 @@ subdir-y := overlays + + # Enable fixups to support overlays on BCM2835 platforms + ifeq ($(CONFIG_ARCH_BCM2835),y) +- DTC_FLAGS ?= -@ ++ DTC_FLAGS += -@ + endif +diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile +index 2bca736a7197..69809bf2f45d 100644 +--- a/arch/arm64/boot/dts/broadcom/Makefile ++++ b/arch/arm64/boot/dts/broadcom/Makefile +@@ -16,5 +16,5 @@ subdir-y += stingray + + # Enable fixups to support overlays on BCM2835 platforms + ifeq ($(CONFIG_ARCH_BCM2835),y) +- DTC_FLAGS ?= -@ ++ DTC_FLAGS += -@ + endif +-- +2.18.4 + + +From 2ea25e3377e9df5118054845262e116f560ce44a Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Thu, 19 Aug 2021 10:32:35 +0200 +Subject: [PATCH 832/834] overlays: qca7000: Fix URL & README + +I2SE has been acquired by in-tech, so fix the URL & README accordingly. + +Signed-off-by: Stefan Wahren +--- + arch/arm/boot/dts/overlays/README | 2 +- + arch/arm/boot/dts/overlays/qca7000-overlay.dts | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 708ebaac9c92..d50d694c9e77 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -2504,7 +2504,7 @@ Params: gpio_pin Output GPIO (default 18) + + + Name: qca7000 +-Info: I2SE's Evaluation Board for PLC Stamp micro ++Info: in-tech's Evaluation Board for PLC Stamp micro + Load: dtoverlay=qca7000,= + Params: int_pin GPIO pin for interrupt signal (default 23) + +diff --git a/arch/arm/boot/dts/overlays/qca7000-overlay.dts b/arch/arm/boot/dts/overlays/qca7000-overlay.dts +index 9a451202a2eb..f695f36024fa 100644 +--- a/arch/arm/boot/dts/overlays/qca7000-overlay.dts ++++ b/arch/arm/boot/dts/overlays/qca7000-overlay.dts +@@ -1,5 +1,5 @@ +-// Overlay for the Qualcomm Atheros QCA7000 on I2SE's PLC Stamp micro EVK +-// Visit: https://www.i2se.com/product/plc-stamp-micro-evk for details ++// Overlay for the Qualcomm Atheros QCA7000 on PLC Stamp micro EVK ++// Visit: https://in-tech-smartcharging.com/products/evaluation-tools/plc-stamp-micro-2-evaluation-board for details + + /dts-v1/; + /plugin/; +-- +2.18.4 + + +From 8deac99deee8613c036bf40d8a31093ca1a0c58e Mon Sep 17 00:00:00 2001 +From: Maxime Ripard +Date: Thu, 19 Aug 2021 14:37:04 +0200 +Subject: [PATCH 833/834] drm/probe-helper: Create a HPD IRQ event helper for a + single connector + +The drm_helper_hpd_irq_event() function is iterating over all the +connectors when an hotplug event is detected. + +During that iteration, it will call each connector detect function and +figure out if its status changed. + +Finally, if any connector changed, it will notify the user-space and the +clients that something changed on the DRM device. + +This is supposed to be used for drivers that don't have a hotplug +interrupt for individual connectors. However, drivers that can use an +interrupt for a single connector are left in the dust and can either +reimplement the logic used during the iteration for each connector or +use that helper and iterate over all connectors all the time. + +Since both are suboptimal, let's create a helper that will only perform +the status detection on a single connector. + +Signed-off-by: Maxime Ripard +--- + drivers/gpu/drm/drm_probe_helper.c | 113 +++++++++++++++++++++-------- + include/drm/drm_probe_helper.h | 1 + + 2 files changed, 82 insertions(+), 32 deletions(-) + +diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c +index e5432dcf6999..0a4c7581b510 100644 +--- a/drivers/gpu/drm/drm_probe_helper.c ++++ b/drivers/gpu/drm/drm_probe_helper.c +@@ -794,6 +794,85 @@ void drm_kms_helper_poll_fini(struct drm_device *dev) + } + EXPORT_SYMBOL(drm_kms_helper_poll_fini); + ++static bool ++_drm_connector_helper_hpd_irq_event(struct drm_connector *connector, ++ bool notify) ++{ ++ struct drm_device *dev = connector->dev; ++ enum drm_connector_status old_status; ++ u64 old_epoch_counter; ++ bool changed = false; ++ ++ /* Only handle HPD capable connectors. */ ++ drm_WARN_ON(dev, !(connector->polled & DRM_CONNECTOR_POLL_HPD)); ++ ++ drm_WARN_ON(dev, !mutex_is_locked(&dev->mode_config.mutex)); ++ ++ old_status = connector->status; ++ old_epoch_counter = connector->epoch_counter; ++ ++ DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Old epoch counter %llu\n", ++ connector->base.id, ++ connector->name, ++ old_epoch_counter); ++ ++ connector->status = drm_helper_probe_detect(connector, NULL, ++ false); ++ DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", ++ connector->base.id, ++ connector->name, ++ drm_get_connector_status_name(old_status), ++ drm_get_connector_status_name(connector->status)); ++ ++ DRM_DEBUG_KMS("[CONNECTOR:%d:%s] New epoch counter %llu\n", ++ connector->base.id, ++ connector->name, ++ connector->epoch_counter); ++ ++ /* ++ * Check if epoch counter had changed, meaning that we need ++ * to send a uevent. ++ */ ++ if (old_epoch_counter != connector->epoch_counter) ++ changed = true; ++ ++ if (changed && notify) { ++ drm_kms_helper_hotplug_event(dev); ++ DRM_DEBUG_KMS("Sent hotplug event\n"); ++ } ++ ++ return changed; ++} ++ ++/** ++ * drm_connector_helper_hpd_irq_event - hotplug processing ++ * @connector: drm_connector ++ * ++ * Drivers can use this helper function to run a detect cycle on a connector ++ * which has the DRM_CONNECTOR_POLL_HPD flag set in its &polled member. ++ * ++ * This helper function is useful for drivers which can track hotplug ++ * interrupts for a single connector. ++ * ++ * This function must be called from process context with no mode ++ * setting locks held. ++ * ++ * Note that a connector can be both polled and probed from the hotplug ++ * handler, in case the hotplug interrupt is known to be unreliable. ++ */ ++bool drm_connector_helper_hpd_irq_event(struct drm_connector *connector) ++{ ++ struct drm_device *dev = connector->dev; ++ bool changed; ++ ++ mutex_lock(&dev->mode_config.mutex); ++ changed = _drm_connector_helper_hpd_irq_event(connector, true); ++ mutex_unlock(&dev->mode_config.mutex); ++ ++ return changed; ++} ++EXPORT_SYMBOL(drm_connector_helper_hpd_irq_event); ++ + /** + * drm_helper_hpd_irq_event - hotplug processing + * @dev: drm_device +@@ -821,9 +900,7 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) + { + struct drm_connector *connector; + struct drm_connector_list_iter conn_iter; +- enum drm_connector_status old_status; + bool changed = false; +- u64 old_epoch_counter; + + if (!dev->mode_config.poll_enabled) + return false; +@@ -831,37 +908,9 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) + mutex_lock(&dev->mode_config.mutex); + drm_connector_list_iter_begin(dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { +- /* Only handle HPD capable connectors. */ +- if (!(connector->polled & DRM_CONNECTOR_POLL_HPD)) +- continue; +- +- old_status = connector->status; +- +- old_epoch_counter = connector->epoch_counter; +- +- DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Old epoch counter %llu\n", connector->base.id, +- connector->name, +- old_epoch_counter); +- +- connector->status = drm_helper_probe_detect(connector, NULL, false); +- DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", +- connector->base.id, +- connector->name, +- drm_get_connector_status_name(old_status), +- drm_get_connector_status_name(connector->status)); +- +- DRM_DEBUG_KMS("[CONNECTOR:%d:%s] New epoch counter %llu\n", +- connector->base.id, +- connector->name, +- connector->epoch_counter); +- +- /* +- * Check if epoch counter had changed, meaning that we need +- * to send a uevent. +- */ +- if (old_epoch_counter != connector->epoch_counter) ++ if (_drm_connector_helper_hpd_irq_event(connector, ++ false)) + changed = true; +- + } + drm_connector_list_iter_end(&conn_iter); + mutex_unlock(&dev->mode_config.mutex); +diff --git a/include/drm/drm_probe_helper.h b/include/drm/drm_probe_helper.h +index 8d3ed2834d34..04c57564c397 100644 +--- a/include/drm/drm_probe_helper.h ++++ b/include/drm/drm_probe_helper.h +@@ -18,6 +18,7 @@ int drm_helper_probe_detect(struct drm_connector *connector, + void drm_kms_helper_poll_init(struct drm_device *dev); + void drm_kms_helper_poll_fini(struct drm_device *dev); + bool drm_helper_hpd_irq_event(struct drm_device *dev); ++bool drm_connector_helper_hpd_irq_event(struct drm_connector *connector); + void drm_kms_helper_hotplug_event(struct drm_device *dev); + + void drm_kms_helper_poll_disable(struct drm_device *dev); +-- +2.18.4 + + +From 6e06e65b8d9a5f4c3ec84b6dbfd65e1a299a58de Mon Sep 17 00:00:00 2001 +From: Maxime Ripard +Date: Thu, 19 Aug 2021 13:50:12 +0200 +Subject: [PATCH 834/834] drm/vc4: hdmi: Actually check for the connector + status in hotplug + +The drm_helper_hpd_irq_event() documentation states that this function +is "useful for drivers which can't or don't track hotplug interrupts for +each connector." and that "Drivers which support hotplug interrupts for +each connector individually and which have a more fine-grained detect +logic should bypass this code and directly call +drm_kms_helper_hotplug_event()". This is thus what we ended-up doing. + +However, what this actually means, and is further explained in the +drm_kms_helper_hotplug_event() documentation, is that +drm_kms_helper_hotplug_event() should be called by drivers that can +track the connection status change, and if it has changed we should call +that function. + +This underlying expectation we failed to provide is that the caller of +drm_kms_helper_hotplug_event() should call drm_helper_probe_detect() to +probe the new status of the connector. + +Since we didn't do it, it meant that even though we were sending the +notification to user-space and the DRM clients that something changed we +never probed or updated our internal connector status ourselves. + +This went mostly unnoticed since the detect callback usually doesn't +have any side-effect. Also, if we were using the DRM fbdev emulation +(which is a DRM client), or any user-space application that can deal +with hotplug events, chances are they would react to the hotplug event +by probing the connector status eventually. + +However, now that we have to enable the scrambler in detect() if it was +enabled it has a side effect, and an application such as Kodi or +modetest doesn't deal with hotplug events. This resulted with a black +screen when Kodi or modetest was running when a screen was disconnected +and then reconnected, or switched off and on. + +Signed-off-by: Maxime Ripard +--- + drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c +index 81ea1fbbdaab..01055f5ee175 100644 +--- a/drivers/gpu/drm/vc4/vc4_hdmi.c ++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +@@ -1623,10 +1623,11 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) + static irqreturn_t vc4_hdmi_hpd_irq_thread(int irq, void *priv) + { + struct vc4_hdmi *vc4_hdmi = priv; +- struct drm_device *dev = vc4_hdmi->connector.dev; ++ struct drm_connector *connector = &vc4_hdmi->connector; ++ struct drm_device *dev = connector->dev; + + if (dev && dev->registered) +- drm_kms_helper_hotplug_event(dev); ++ drm_connector_helper_hpd_irq_event(connector); + + return IRQ_HANDLED; + } +-- +2.18.4 + diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index b57c769..9031f0f 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,5 +1,5 @@ -%global commit_firmware_long 23507c0fc836b038dd0eaa9242f52f874eabacd7 -%global commit_linux_long 7aa66c086ae01c4f77d54aaeb1d9f62573a7b748 +%global commit_firmware_long 25e2b597ebfb2495eab4816a276758dcc6ea21f1 +%global commit_linux_long 2dd846fe1a7266153e129b55c01b6ac59119d395 ExclusiveArch: aarch64 armv7hl @@ -32,7 +32,7 @@ ExclusiveArch: aarch64 armv7hl %define extra_version 1 %define kversion 5.10 -%define kfullversion %{kversion}.52 +%define kfullversion %{kversion}.60 Name: raspberrypi2 Version: %{kfullversion} @@ -277,6 +277,9 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README %doc /boot/LICENCE.broadcom %changelog +* Sat Aug 21 2021 Pablo Greco - 5.10.60 +- Update to version v5.10.60 + * Fri Jul 23 2021 Pablo Greco - 5.10.52 - Update to version v5.10.52