From 7c59d1bed2b497a9ce572f626ae7825663ba9411 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mar 25 2021 12:35:44 +0000 Subject: Metadata --- diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index 01d62bf..0fca901 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,3 +1,3 @@ 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd SOURCES/linux-5.4.tar.xz -5a9ea09069d43d227f521a7ed4162097d82d9487 SOURCES/7d91570f20378afc9414107dccdad70705a8a342.tar.gz -db1c1c4a657da52e36075fe90f4b328a10df7457 SOURCES/patch-5.4.96.xz +a96d44d98a35968461e80e603a75564a4da4018d SOURCES/0591568b29a724de406aa737fc8e13f68c423f3f.tar.gz +b5f74127bf9efbf8f3df8133be89a1858ce9988d SOURCES/patch-5.4.105.xz diff --git a/SOURCES/rpi-5.4.x.patch b/SOURCES/rpi-5.4.x.patch index 1c0f4bd..8645c6c 100644 --- a/SOURCES/rpi-5.4.x.patch +++ b/SOURCES/rpi-5.4.x.patch @@ -1,7 +1,7 @@ -From a8244f30f4e4d5c44326e9c6d128270977baecd5 Mon Sep 17 00:00:00 2001 +From ee42832b8d2ca95c1e7ff9dad77afccee224927d Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Thu, 21 Sep 2017 09:55:42 -0500 -Subject: [PATCH 0001/1224] arm: partially revert +Subject: [PATCH 0001/1225] arm: partially revert 702b94bff3c50542a6e4ab9a4f4cef093262fe65 * Re-expose some dmi APIs for use in VCSM @@ -109,10 +109,10 @@ index e21249548e9fb..33e4a9b8f1ba3 100644 2.18.4 -From ea241fd29c65ff7f40cfb8367a2fae0442d84da7 Mon Sep 17 00:00:00 2001 +From c6a89a5201bb550e395144d972de855cc521a729 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 29 Oct 2018 14:45:45 +0000 -Subject: [PATCH 0002/1224] Revert "rtc: pcf8523: properly handle oscillator +Subject: [PATCH 0002/1225] Revert "rtc: pcf8523: properly handle oscillator stop bit" This reverts commit ede44c908d44b166a5b6bd7caacd105c2ff5a70f. @@ -171,10 +171,10 @@ index 2f435e533b10b..c85abf77ab509 100644 2.18.4 -From 3793d8b1f7ca87a515f4f06fa9ec08125d9825f2 Mon Sep 17 00:00:00 2001 +From f9d1e8e96004979926e1f6088ab6304a109345b6 Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Thu, 19 Feb 2015 18:47:12 +0000 -Subject: [PATCH 0003/1224] smsx95xx: fix crimes against truesize +Subject: [PATCH 0003/1225] 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. @@ -224,10 +224,10 @@ index bb4ccbda031ab..dedebce4b2d9a 100644 2.18.4 -From 151c681dd52b6268d49e5354f7b1bfc0bd3bc1bd Mon Sep 17 00:00:00 2001 +From 27cb72bf284e3b72ee408352e6db9487e744673e Mon Sep 17 00:00:00 2001 From: Sam Nazarko Date: Fri, 1 Apr 2016 17:27:21 +0100 -Subject: [PATCH 0004/1224] smsc95xx: Experimental: Enable turbo_mode and +Subject: [PATCH 0004/1225] smsc95xx: Experimental: Enable turbo_mode and packetsize=2560 by default See: http://forum.kodi.tv/showthread.php?tid=285288 @@ -273,10 +273,10 @@ index dedebce4b2d9a..c5ebcb114309b 100644 2.18.4 -From e88df992eae6c6bc7fc20237abb8989ec6cf7eb1 Mon Sep 17 00:00:00 2001 +From 8ca82c50dff5d7e639a4485468a0352266cee8f3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 26 Mar 2013 17:26:38 +0000 -Subject: [PATCH 0005/1224] Allow mac address to be set in smsc95xx +Subject: [PATCH 0005/1225] Allow mac address to be set in smsc95xx Signed-off-by: popcornmix --- @@ -375,10 +375,10 @@ index c5ebcb114309b..510f4d410f696 100644 2.18.4 -From e089be98d59f3194310ab4474cdf7e814592d03a Mon Sep 17 00:00:00 2001 +From c969ae61b6049bb3bbd8c5961aafdb434d766ce4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 13 Mar 2015 12:43:36 +0000 -Subject: [PATCH 0006/1224] Protect __release_resource against resources +Subject: [PATCH 0006/1225] Protect __release_resource against resources without parents Without this patch, removing a device tree overlay can crash here. @@ -409,10 +409,10 @@ index 841737bbda9e5..6877c789c5f6b 100644 2.18.4 -From 7c1f50484d3134b7b6ddac7eec826f81b48a63e5 Mon Sep 17 00:00:00 2001 +From 7386d593cd7f8a45957fae09c02243cf7522dbda Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 4 Dec 2015 17:41:50 +0000 -Subject: [PATCH 0007/1224] irq-bcm2836: Prevent spurious interrupts, and trap +Subject: [PATCH 0007/1225] irq-bcm2836: Prevent spurious interrupts, and trap them early The old arch-specific IRQ macros included a dsb to ensure the @@ -442,10 +442,10 @@ index 2038693f074cb..597d36ba601ea 100644 2.18.4 -From acb04fc8a5b8799b2e6d17392a084417272a5403 Mon Sep 17 00:00:00 2001 +From 3611856437945b966cc36a5c098c969c6da157ff Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:33:30 +0000 -Subject: [PATCH 0008/1224] irq-bcm2836: Avoid "Invalid trigger warning" +Subject: [PATCH 0008/1225] irq-bcm2836: Avoid "Invalid trigger warning" Initialise the level for each IRQ to avoid a warning from the arm arch timer code. @@ -472,10 +472,10 @@ index 597d36ba601ea..c006a8ac10d53 100644 2.18.4 -From 575a721cdf0a221d6a5b9f8b07c1510c982e6be7 Mon Sep 17 00:00:00 2001 +From 3bb7e0acebe56848804bc859a5d65c8772adc1ab 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 0009/1224] irqchip: bcm2835: Add FIQ support +Subject: [PATCH 0009/1225] irqchip: bcm2835: Add FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -607,10 +607,10 @@ index 418245d31921b..64472b25d0b4e 100644 2.18.4 -From f6b645a062b114da571b27ac6f7b15a111d6ed94 Mon Sep 17 00:00:00 2001 +From 8ccbfbd093fd06a523577d0f0e1c4c1c94fc851b 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 0010/1224] irqchip: irq-bcm2835: Add 2836 FIQ support +Subject: [PATCH 0010/1225] irqchip: irq-bcm2835: Add 2836 FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -712,10 +712,10 @@ index 64472b25d0b4e..2fccc5cfe9f33 100644 2.18.4 -From 0e969a7195c355581833667be97725850302478c Mon Sep 17 00:00:00 2001 +From fceea17693f034ca37bb2f73bf5180adfb07248e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 10:26:09 +0100 -Subject: [PATCH 0011/1224] spi: spidev: Completely disable the spidev warning +Subject: [PATCH 0011/1225] 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. @@ -742,10 +742,10 @@ index be503a0e6ef73..736af270d7a10 100644 2.18.4 -From bad635b8a6c5d5d30c46fdc5f835dbf465888b0e Mon Sep 17 00:00:00 2001 +From 0abf4c287ce2b3ffe2c888900bce1e1c021d568d 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 0012/1224] dmaengine: bcm2835: Load driver early and support +Subject: [PATCH 0012/1225] dmaengine: bcm2835: Load driver early and support legacy API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -851,10 +851,10 @@ index e4c593f48575c..6860131b02d9a 100644 2.18.4 -From 21ea9a980cd0a41f295d42c7e4453f6ce339ae86 Mon Sep 17 00:00:00 2001 +From 3d0750f9fb3039c683f718526e0e9b2377f75e82 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 25 Jan 2016 17:25:12 +0000 -Subject: [PATCH 0013/1224] firmware: Updated mailbox header +Subject: [PATCH 0013/1225] firmware: Updated mailbox header --- include/soc/bcm2835/raspberrypi-firmware.h | 3 +++ @@ -884,10 +884,10 @@ index 7800e12ee042c..3f357c05788e8 100644 2.18.4 -From af28d9cf3a717b0e7dfcd2413d98c6b1d60f5b87 Mon Sep 17 00:00:00 2001 +From 739bb6bac80015e0c3ec4f314939b110750b448a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 15 Jun 2016 16:48:41 +0100 -Subject: [PATCH 0014/1224] rtc: Add SPI alias for pcf2123 driver +Subject: [PATCH 0014/1225] rtc: Add SPI alias for pcf2123 driver Without this alias, Device Tree won't cause the driver to be loaded. @@ -910,10 +910,10 @@ index c3691fa4210e5..ead1fd376d2d8 100644 2.18.4 -From 1fbf677bdc4552f908d7bb8d1a22011c936215c8 Mon Sep 17 00:00:00 2001 +From e6753ad04f4cced29901b63f64ecb2d6ecf3b629 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 0015/1224] watchdog: bcm2835: Support setting reboot partition +Subject: [PATCH 0015/1225] watchdog: bcm2835: Support setting reboot partition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -1018,10 +1018,10 @@ index dec6ca019beaa..62937e6f83ca1 100644 2.18.4 -From 45a7ba2402238604f9c17a6f53dc3464c867cbf5 Mon Sep 17 00:00:00 2001 +From c33ea603c9187281c5422caf14a29ce8fb1c3f73 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 Apr 2016 19:40:12 +0100 -Subject: [PATCH 0016/1224] reboot: Use power off rather than busy spinning +Subject: [PATCH 0016/1225] reboot: Use power off rather than busy spinning when halt is requested --- @@ -1047,10 +1047,10 @@ index bb18ed0539f49..a8595ab97e5b5 100644 2.18.4 -From 35a0254ac4c012a5e8bbad03192d5f9f8b7aaf1d Mon Sep 17 00:00:00 2001 +From 274dfc5b3d2f8cdb69adf3ba80c8d2823ca73d15 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Nov 2016 13:02:52 +0000 -Subject: [PATCH 0017/1224] bcm: Make RASPBERRYPI_POWER depend on PM +Subject: [PATCH 0017/1225] bcm: Make RASPBERRYPI_POWER depend on PM --- drivers/soc/bcm/Kconfig | 1 + @@ -1072,10 +1072,10 @@ index 648e32693b7e3..f204562996e27 100644 2.18.4 -From 67fcd0869b90f39a1f1b72c4d30a1c0c3a94f5f8 Mon Sep 17 00:00:00 2001 +From 04deb410a25e843eac9e822008c6f28eb06db3ed Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Fri, 2 Sep 2016 16:45:27 +0100 -Subject: [PATCH 0018/1224] Register the clocks early during the boot process, +Subject: [PATCH 0018/1225] 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. @@ -1123,10 +1123,10 @@ index c5486537b9284..5c2eb7f66887d 100644 2.18.4 -From 2a9430b1f263f2a477065f57b35005f9c165f688 Mon Sep 17 00:00:00 2001 +From a8655b403f867afca6c730b51a5f5b0a2fff8cc5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 6 Dec 2016 17:05:39 +0000 -Subject: [PATCH 0019/1224] bcm2835-rng: Avoid initialising if already enabled +Subject: [PATCH 0019/1225] bcm2835-rng: Avoid initialising if already enabled Avoids the 0x40000 cycles of warmup again if firmware has already used it --- @@ -1154,10 +1154,10 @@ index f759790c3cdb6..1b85ebcbca803 100644 2.18.4 -From 563cf8a14fc5104caf734c10fe23459a954b8599 Mon Sep 17 00:00:00 2001 +From 7af5b41311e6b3109cc408b6ff6a39672e2b6148 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 0020/1224] clk-bcm2835: Mark used PLLs and dividers CRITICAL +Subject: [PATCH 0020/1225] 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 @@ -1188,10 +1188,10 @@ index 5c2eb7f66887d..7f6e174107d1c 100644 2.18.4 -From a5b9d22031592b8753ac7ab0509b935e60e624ad Mon Sep 17 00:00:00 2001 +From d719c114919f2a226882b9a61656a421e3f33970 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 0021/1224] clk-bcm2835: Add claim-clocks property +Subject: [PATCH 0021/1225] 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, @@ -1296,10 +1296,10 @@ index 7f6e174107d1c..70b5456529336 100644 2.18.4 -From 155c40771517fc39bf3fab9b13cef90c069813c7 Mon Sep 17 00:00:00 2001 +From 3f83bd6c892c6f37294173d40a227e240380a89e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Mar 2017 09:06:18 +0000 -Subject: [PATCH 0022/1224] clk-bcm2835: Read max core clock from firmware +Subject: [PATCH 0022/1225] 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 @@ -1417,10 +1417,10 @@ index 70b5456529336..9b9d17e9ad5cd 100644 2.18.4 -From 603f29c867917be49aa57a38f79b911fa2547bd3 Mon Sep 17 00:00:00 2001 +From 5b28203b1f4f2adf704d4c320dbde2e762b6717e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 9 May 2016 17:28:18 -0700 -Subject: [PATCH 0023/1224] clk: bcm2835: Mark GPIO clocks enabled at boot as +Subject: [PATCH 0023/1225] clk: bcm2835: Mark GPIO clocks enabled at boot as critical. These divide off of PLLD_PER and are used for the ethernet and wifi @@ -1461,10 +1461,10 @@ index 9b9d17e9ad5cd..db1df40271c08 100644 2.18.4 -From cd7ef0c820047cbb8668ef529c014d153d47ac74 Mon Sep 17 00:00:00 2001 +From 05fea835ddb1a447058202e80a637f16f5b87872 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:36:44 +0000 -Subject: [PATCH 0024/1224] sound: Demote deferral errors to INFO level +Subject: [PATCH 0024/1225] 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. @@ -1502,10 +1502,10 @@ index 9df20768a8f29..0b9f9a06bdb52 100644 2.18.4 -From fc603613ac05fb37757012e026121a88e0c5bab5 Mon Sep 17 00:00:00 2001 +From 35e2f51f89d564160b8289aab20c376b46f9383d Mon Sep 17 00:00:00 2001 From: Claggy3 Date: Sat, 11 Feb 2017 14:00:30 +0000 -Subject: [PATCH 0025/1224] Update vfpmodule.c +Subject: [PATCH 0025/1225] 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 @@ -1645,10 +1645,10 @@ index 8c9e7f9f0277d..f0ceb1975964f 100644 2.18.4 -From 83ccaf46310d7d591ce386b4509c4b98a6fdb15a Mon Sep 17 00:00:00 2001 +From b3eda4842100cf36d556ac7f54e0b051b439fd96 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 0026/1224] i2c: bcm2835: Add debug support +Subject: [PATCH 0026/1225] i2c: bcm2835: Add debug support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -1840,10 +1840,10 @@ index 5ab901ad615dd..beb67afa6a3c6 100644 2.18.4 -From fac2fbd5dc87cd737ae837924910e583cc29c8df Mon Sep 17 00:00:00 2001 +From 45ac9ad1c17c7678c3f2c97f13271d54b20cac86 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 18 Dec 2014 16:07:15 -0800 -Subject: [PATCH 0027/1224] mm: Remove the PFN busy warning +Subject: [PATCH 0027/1225] mm: Remove the PFN busy warning See commit dae803e165a11bc88ca8dbc07a11077caf97bbcb -- the warning is expected sometimes when using CMA. However, that commit still spams @@ -1871,10 +1871,10 @@ index 4357f5475a504..0f49656fc449b 100644 2.18.4 -From 88d4e6799cf14dfdd90904b9cdd3c90a679d1e41 Mon Sep 17 00:00:00 2001 +From 80b5eb7f4012451cf909588ddad39e4a04add10e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 23 Mar 2017 10:06:56 +0000 -Subject: [PATCH 0028/1224] ASoC: Add prompt for ICS43432 codec +Subject: [PATCH 0028/1225] ASoC: Add prompt for ICS43432 codec Without a prompt string, a config setting can't be included in a defconfig. Give CONFIG_SND_SOC_ICS43432 a prompt so that Pi soundcards @@ -1902,10 +1902,10 @@ index 229cc89f8c5a5..080a2cec3fa81 100644 2.18.4 -From 1644506dff2236b3dca712b43eacf952b67b883e Mon Sep 17 00:00:00 2001 +From 689e0edabee070d809074b204bb2916abac9fd2b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Jan 2018 16:52:45 +0000 -Subject: [PATCH 0029/1224] irqchip: irq-bcm2836: Remove regmap and syscon use +Subject: [PATCH 0029/1225] 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 @@ -2022,10 +2022,10 @@ index c006a8ac10d53..49642bcd0b75c 100644 2.18.4 -From e0cb536147d65386edc48d2158db8cbce9751d5b Mon Sep 17 00:00:00 2001 +From 922c6e017e19c205e77b1180a6b434179c4212c3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 17 Oct 2017 15:04:29 +0100 -Subject: [PATCH 0030/1224] lan78xx: Enable LEDs and auto-negotiation +Subject: [PATCH 0030/1225] 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 @@ -2076,10 +2076,10 @@ index 71cc5b63d8ced..ba42568316f1b 100644 2.18.4 -From db17ffec065375a62b79fa33dab1ec8e5acb629e Mon Sep 17 00:00:00 2001 +From 721fb1ffed7945874cb2cf5ab03fd368bdc0f4e6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Feb 2016 17:26:48 +0000 -Subject: [PATCH 0031/1224] amba_pl011: Don't use DT aliases for numbering +Subject: [PATCH 0031/1225] 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 @@ -2111,10 +2111,10 @@ index 16720c97a4dde..35dc702fad87a 100644 2.18.4 -From 7211091afc66ddeea79cdd98fd23584cbfb20bb2 Mon Sep 17 00:00:00 2001 +From 1238423ea128694f7a09dd08499fe69c46289eaf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Mar 2017 16:07:39 +0000 -Subject: [PATCH 0032/1224] amba_pl011: Round input clock up +Subject: [PATCH 0032/1225] 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 @@ -2203,10 +2203,10 @@ index 35dc702fad87a..b3e24efac6d81 100644 2.18.4 -From d106db899058cc6d95c1345f498835c9b0b6e16a Mon Sep 17 00:00:00 2001 +From c302155af23f7c76af0e7524dd95d9c79fa282bc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 0033/1224] amba_pl011: Insert mb() for correct FIFO handling +Subject: [PATCH 0033/1225] 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 @@ -2236,10 +2236,10 @@ index b3e24efac6d81..6d953abd37796 100644 2.18.4 -From 9baa77f0c94002cfb48c19fb29ed62ae90b681a1 Mon Sep 17 00:00:00 2001 +From 1aea8ed3abf6cb6e3b776fa5062316e080d4c67e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 0034/1224] amba_pl011: Add cts-event-workaround DT property +Subject: [PATCH 0034/1225] 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 @@ -2294,10 +2294,10 @@ index 6d953abd37796..ba2029bf1e639 100644 2.18.4 -From e40013b35e21a29618cd0166fce7b493f9f76ec1 Mon Sep 17 00:00:00 2001 +From f15529f197327d4f5eda60fc1059501b1108b39a Mon Sep 17 00:00:00 2001 From: notro Date: Thu, 10 Jul 2014 13:59:47 +0200 -Subject: [PATCH 0035/1224] pinctrl-bcm2835: Set base to 0 give expected gpio +Subject: [PATCH 0035/1225] pinctrl-bcm2835: Set base to 0 give expected gpio numbering Signed-off-by: Noralf Tronnes @@ -2322,10 +2322,10 @@ index 0de1a3a96984c..76fad11f2ad82 100644 2.18.4 -From f72a45b5cbf85096d76aadb226afa20aa635c554 Mon Sep 17 00:00:00 2001 +From 616b7d06f53ac9c4c1da43712aa6d8ef5691a047 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 12 May 2013 12:24:19 +0100 -Subject: [PATCH 0036/1224] Main bcm2708/bcm2709 linux port +Subject: [PATCH 0036/1225] Main bcm2708/bcm2709 linux port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -2484,10 +2484,10 @@ index 39761d1905459..9766d8b50778a 100644 2.18.4 -From 16b8a403d387111a7ecea39355959edef06a3bd5 Mon Sep 17 00:00:00 2001 +From 3c32d32b550de61590814c13821001dfca5780d9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 1 May 2013 19:46:17 +0100 -Subject: [PATCH 0037/1224] Add dwc_otg driver +Subject: [PATCH 0037/1225] Add dwc_otg driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -64185,10 +64185,10 @@ index 0000000000000..cdc9963176e5a 2.18.4 -From 45b1ecffe8984917bafa929a73947dd8919d2a02 Mon Sep 17 00:00:00 2001 +From 3437338c632ac8b59715b78ec6b6c18733ff045a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 17:06:34 +0100 -Subject: [PATCH 0038/1224] bcm2708 framebuffer driver +Subject: [PATCH 0038/1225] bcm2708 framebuffer driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -64291,7 +64291,7 @@ Signed-off-by: Dave Stevenson create mode 100644 drivers/video/fbdev/bcm2708_fb.c diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig -index 1e70e838530ee..a03d32346642d 100644 +index a7e5f12687b70..148521ffe8c65 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -219,6 +219,20 @@ config FB_TILEBLITTING @@ -67767,10 +67767,10 @@ index 3f357c05788e8..a5f3fff6773e6 100644 2.18.4 -From b294cd398f5756d25ccdf33ab8632a79218ae2ba Mon Sep 17 00:00:00 2001 +From 974836bb376c79ec2e45076c81c92ab06c77bbe4 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 14 Mar 2019 13:27:54 +0000 -Subject: [PATCH 0039/1224] Pulled in the multi frame buffer support from the +Subject: [PATCH 0039/1225] Pulled in the multi frame buffer support from the Pi3 repo --- @@ -68616,10 +68616,10 @@ index a5f3fff6773e6..25fca695f9039 100644 2.18.4 -From e339a7ac80bfcbf2f7fa812832b7560509c800c6 Mon Sep 17 00:00:00 2001 +From ee7146af2b3e19fc5ca3d6fb545afc82dce743ae Mon Sep 17 00:00:00 2001 From: Siarhei Siamashka Date: Mon, 17 Jun 2013 13:32:11 +0300 -Subject: [PATCH 0040/1224] fbdev: add FBIOCOPYAREA ioctl +Subject: [PATCH 0040/1225] fbdev: add FBIOCOPYAREA ioctl Based on the patch authored by Ali Gholami Rudi at https://lkml.org/lkml/2009/7/13/153 @@ -68953,10 +68953,10 @@ index b6aac7ee1f670..212b7d5cb94c1 100644 2.18.4 -From c4eae1eb1e9e2b5c5cf328cb427413a36d22de9b Mon Sep 17 00:00:00 2001 +From 0c369c4be6e8fba47f7fc86930ea4f948dd50785 Mon Sep 17 00:00:00 2001 From: Harm Hanemaaijer Date: Thu, 20 Jun 2013 20:21:39 +0200 -Subject: [PATCH 0041/1224] Speed up console framebuffer imageblit function +Subject: [PATCH 0041/1225] 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 @@ -69168,10 +69168,10 @@ index a2bb276a8b246..436494fba15ab 100644 2.18.4 -From 6438828094800fe561c99ad8cae270e256720b1a Mon Sep 17 00:00:00 2001 +From acd48afa5d4c8ca30ca78508ca05504c371bc994 Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Fri, 22 Nov 2013 14:22:53 +0100 -Subject: [PATCH 0042/1224] dmaengine: Add support for BCM2708 +Subject: [PATCH 0042/1225] dmaengine: Add support for BCM2708 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -69822,10 +69822,10 @@ index 0000000000000..6ca874d332a8b 2.18.4 -From 12287faa88e6c12a7653f069ca069e447b75e93e Mon Sep 17 00:00:00 2001 +From ac75d043374a8db8001eeaf9013b9d85a67a5d4e Mon Sep 17 00:00:00 2001 From: gellert Date: Fri, 15 Aug 2014 16:35:06 +0100 -Subject: [PATCH 0043/1224] MMC: added alternative MMC driver +Subject: [PATCH 0043/1225] MMC: added alternative MMC driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -71811,10 +71811,10 @@ index cf3780a6ccc4b..dc3fedec75d7b 100644 2.18.4 -From 44756d8a8ad089b01eb79b20a2c08c2a645ec889 Mon Sep 17 00:00:00 2001 +From 83c23a48a8bed92c92b16d9d4f58482b2b3d1273 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 25 Mar 2015 17:49:47 +0000 -Subject: [PATCH 0044/1224] Adding bcm2835-sdhost driver, and an overlay to +Subject: [PATCH 0044/1225] Adding bcm2835-sdhost driver, and an overlay to enable it BCM2835 has two SD card interfaces. This driver uses the other one. @@ -74304,10 +74304,10 @@ index 0000000000000..ba2dd8345fd44 2.18.4 -From e086410419329a0ac279e7356f952df072c7f53b Mon Sep 17 00:00:00 2001 +From c0ce37774ea37b850dd4960c14159429853d1fff Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 28 Oct 2016 15:36:43 +0100 -Subject: [PATCH 0045/1224] vc_mem: Add vc_mem driver for querying firmware +Subject: [PATCH 0045/1225] vc_mem: Add vc_mem driver for querying firmware memory addresses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -74826,10 +74826,10 @@ index 0000000000000..3c70792374964 2.18.4 -From 79de3b2443811f674b76c9837cf72765acad8d34 Mon Sep 17 00:00:00 2001 +From 78653bbaf282ce26e0d0c9577e7bab40a518cfe7 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 22 Jul 2014 15:41:04 +0100 -Subject: [PATCH 0046/1224] vcsm: VideoCore shared memory service for BCM2835 +Subject: [PATCH 0046/1225] vcsm: VideoCore shared memory service for BCM2835 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -79839,10 +79839,10 @@ index 0000000000000..2395ff08c5cee 2.18.4 -From c690752ec15edeb197e5a9d233a1952c2fa218f3 Mon Sep 17 00:00:00 2001 +From f0e0c50f00ab46c2e9799ae79b61855283513f74 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Fri, 21 Aug 2015 23:14:48 +0100 -Subject: [PATCH 0047/1224] Add /dev/gpiomem device for rootless user GPIO +Subject: [PATCH 0047/1225] Add /dev/gpiomem device for rootless user GPIO access Signed-off-by: Luke Wren @@ -80154,10 +80154,10 @@ index 0000000000000..f5e7f1ba8fb6f 2.18.4 -From 533833d39b8784440a935a7fd4b8604814be76f5 Mon Sep 17 00:00:00 2001 +From 5cb13cdd4310181f5b1242430e5de9d8c67f55af Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Sat, 5 Sep 2015 01:14:45 +0100 -Subject: [PATCH 0048/1224] Add SMI driver +Subject: [PATCH 0048/1225] Add SMI driver Signed-off-by: Luke Wren @@ -82092,10 +82092,10 @@ index 0000000000000..ee3a75edfc033 2.18.4 -From e4e8ed6129c1d46741cfdd95fa28223fc54f44b9 Mon Sep 17 00:00:00 2001 +From f091476fde8ecb9a1d0959be1b527d3ce24a9def Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 3 Jul 2013 00:49:20 +0100 -Subject: [PATCH 0049/1224] Add cpufreq driver +Subject: [PATCH 0049/1225] Add cpufreq driver Signed-off-by: popcornmix @@ -82363,10 +82363,10 @@ index 0000000000000..66184acdae491 2.18.4 -From 67fa7bcf6e869113c106b175f28e08f89af52768 Mon Sep 17 00:00:00 2001 +From e76fdf374fd986ab0591973aab094c0cb744d19a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 15:44:08 +0100 -Subject: [PATCH 0050/1224] Add Chris Boot's i2c driver +Subject: [PATCH 0050/1225] Add Chris Boot's i2c driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -83034,10 +83034,10 @@ index 0000000000000..962f2e5c7455d 2.18.4 -From e64d11e7a25a29a4c45a45260aeb882974912084 Mon Sep 17 00:00:00 2001 +From d2302bdb360707bf03e5c1672a5df5ff7b0c0408 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 0051/1224] char: broadcom: Add vcio module +Subject: [PATCH 0051/1225] char: broadcom: Add vcio module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -83300,10 +83300,10 @@ index 0000000000000..d2598663a2b5d 2.18.4 -From e9d37ef5d2474089d41deeb85bdcfc21b16c831a Mon Sep 17 00:00:00 2001 +From ba0a5d8e69daab4cb3d915387a0349aa11d20d9d 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 0052/1224] firmware: bcm2835: Support ARCH_BCM270x +Subject: [PATCH 0052/1225] firmware: bcm2835: Support ARCH_BCM270x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -83389,10 +83389,10 @@ index da26a584dca06..7162f6d6649c6 100644 2.18.4 -From fc374cb2abe830cb23ed15fb5a204c7107fe8207 Mon Sep 17 00:00:00 2001 +From 225c816975357d666baee1fec4c09fee9959ba28 Mon Sep 17 00:00:00 2001 From: notro Date: Wed, 9 Jul 2014 14:46:08 +0200 -Subject: [PATCH 0053/1224] BCM2708: Add core Device Tree support +Subject: [PATCH 0053/1225] BCM2708: Add core Device Tree support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -106002,10 +106002,10 @@ index a6d0044328b1f..bdec9e50358db 100644 2.18.4 -From c2af14c41b2e14d19649b44516b249fefa136a27 Mon Sep 17 00:00:00 2001 +From 914e3e148272bdcd596c8b537cd03afd040912fd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Feb 2015 13:50:57 +0000 -Subject: [PATCH 0054/1224] BCM270x_DT: Add pwr_led, and the required "input" +Subject: [PATCH 0054/1225] BCM270x_DT: Add pwr_led, and the required "input" trigger The "input" trigger makes the associated GPIO an input. This is to support @@ -106186,10 +106186,10 @@ index efb309dba914a..f94aa00431fb6 100644 2.18.4 -From f001f9b1ec8956125ba0b77b53451d61289c31b9 Mon Sep 17 00:00:00 2001 +From 8bfbb2d59ab051d1325a812f27470ebb99890ae6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 3 Jul 2013 00:54:08 +0100 -Subject: [PATCH 0055/1224] Added Device IDs for August DVB-T 205 +Subject: [PATCH 0055/1225] Added Device IDs for August DVB-T 205 --- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 ++++ @@ -106214,10 +106214,10 @@ index 1a36bda285421..9b1cb1908782a 100644 2.18.4 -From 6d90271f1a494026c7f5ed7c583f41e5f3084356 Mon Sep 17 00:00:00 2001 +From 64f710f387796625f4b4cf680df5f6eff5b9ce5a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 28 Nov 2016 16:50:04 +0000 -Subject: [PATCH 0056/1224] Improve __copy_to_user and __copy_from_user +Subject: [PATCH 0056/1225] Improve __copy_to_user and __copy_from_user performance Provide a __copy_from_user that uses memcpy. On BCM2708, use @@ -107800,10 +107800,10 @@ index 34fb06d1b477c..5742092f8c09e 100644 2.18.4 -From 03a31792dda7b1ddb7089d35704652cb89c2cbb9 Mon Sep 17 00:00:00 2001 +From 3021d0f5a023b28d49a26c34e6c6bb8bec075a94 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 25 Jun 2015 12:16:11 +0100 -Subject: [PATCH 0057/1224] gpio-poweroff: Allow it to work on Raspberry Pi +Subject: [PATCH 0057/1225] 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 @@ -107841,10 +107841,10 @@ index 6a4bbb5065510..beb1df358c8da 100644 2.18.4 -From e27a33b24eaa13ae60e291c91724c3f0687ecf54 Mon Sep 17 00:00:00 2001 +From 68ad8584e09cd31e022c5b12559e7678f0437002 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 14:32:47 +0100 -Subject: [PATCH 0058/1224] mfd: Add Raspberry Pi Sense HAT core driver +Subject: [PATCH 0058/1225] mfd: Add Raspberry Pi Sense HAT core driver mfd: Add rpi_sense_core of compatible string --- @@ -108255,7 +108255,7 @@ index 0000000000000..6cfd63e5e8b8d +MODULE_LICENSE("GPL"); + diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig -index a03d32346642d..11af544231a6b 100644 +index 148521ffe8c65..1a154908c7fb8 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2277,6 +2277,19 @@ config FB_SM712 @@ -108725,10 +108725,10 @@ index 0000000000000..56196dc2af10e 2.18.4 -From 891961905f8d4a8f7e6c54c9f7ca492820c62dc4 Mon Sep 17 00:00:00 2001 +From 148a2505561bfdb44ba988b98119bbe15eacee52 Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Mon, 25 Jan 2016 15:48:59 +0000 -Subject: [PATCH 0059/1224] ASoC: Add support for Rpi-DAC +Subject: [PATCH 0059/1225] ASoC: Add support for Rpi-DAC --- sound/soc/codecs/Kconfig | 5 +++ @@ -108859,10 +108859,10 @@ index 0000000000000..36b5b6c26655a 2.18.4 -From 3fd9b49ba49baf4f45c4d643303c50101e462d36 Mon Sep 17 00:00:00 2001 +From 4b330d648aacfafd15584ff6425def6b3df8ec88 Mon Sep 17 00:00:00 2001 From: Gordon Garrity Date: Sat, 8 Mar 2014 16:56:57 +0000 -Subject: [PATCH 0060/1224] Add IQaudIO Sound Card support for Raspberry Pi +Subject: [PATCH 0060/1225] Add IQaudIO Sound Card support for Raspberry Pi Set a limit of 0dB on Digital Volume Control @@ -109164,10 +109164,10 @@ index 0000000000000..b982320386164 2.18.4 -From 14d381e9949214d0feea528bcf8356bad21654d4 Mon Sep 17 00:00:00 2001 +From c4547f28b7e8c208ba021cfc14ae230c3ac700c4 Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Mon, 4 Aug 2014 10:06:56 +0200 -Subject: [PATCH 0061/1224] Added support for HiFiBerry DAC+ +Subject: [PATCH 0061/1225] Added support for HiFiBerry DAC+ The driver is based on the HiFiBerry DAC driver. However HiFiBerry DAC+ uses a different codec chip (PCM5122), therefore a new driver is necessary. @@ -109794,10 +109794,10 @@ index 0000000000000..fdf6e950abd8c 2.18.4 -From eeaaeefce46c21db1b3756785519bfd1aeca8d74 Mon Sep 17 00:00:00 2001 +From 0b093c9153e3a56de2263f0d31dda906fb5129ec Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Mon, 4 Aug 2014 11:09:58 +0200 -Subject: [PATCH 0062/1224] Added driver for HiFiBerry Amp amplifier add-on +Subject: [PATCH 0062/1225] Added driver for HiFiBerry Amp amplifier add-on board The driver contains a low-level hardware driver for the TAS5713 and the @@ -110456,10 +110456,10 @@ index 0000000000000..8f019e0489875 2.18.4 -From 4c62b1060e4e1d09adcd9e13b9fbc7dd7fed933e Mon Sep 17 00:00:00 2001 +From 4e02ff65a7091f46dc511a64a859160022a3a59b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 25 Mar 2015 09:26:17 +0100 -Subject: [PATCH 0063/1224] Add driver for rpi-proto +Subject: [PATCH 0063/1225] Add driver for rpi-proto Forward port of 3.10.x driver from https://github.com/koalo We are using a custom board and would like to use rpi 3.18.x @@ -110637,10 +110637,10 @@ index 0000000000000..8f3c2ef170ff2 2.18.4 -From 16c21c14b68b5aef115e147280120cd6d72d0fbe Mon Sep 17 00:00:00 2001 +From 4994b28e947fcdf2557d3bf0cccbf5657551d0aa Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Thu, 7 Apr 2016 21:26:21 +0100 -Subject: [PATCH 0064/1224] Add Support for JustBoom Audio boards +Subject: [PATCH 0064/1225] Add Support for JustBoom Audio boards justboom-dac: Adjust for ALSA API change @@ -110823,10 +110823,10 @@ index 0000000000000..62bd64cc09280 2.18.4 -From ffd5336502b45bd31e828d9e0cb3c778e8b4d93b Mon Sep 17 00:00:00 2001 +From 98b0c2c830056b37e28586424ebde8d2c303cdc7 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Mon, 16 May 2016 21:36:31 +1000 -Subject: [PATCH 0065/1224] New AudioInjector.net Pi soundcard with low jitter +Subject: [PATCH 0065/1225] New AudioInjector.net Pi soundcard with low jitter audio in and out. Contains the sound/soc/bcm ALSA machine driver and necessary alterations to the Kconfig and Makefile. @@ -111043,10 +111043,10 @@ index 0000000000000..21a46551a1c19 2.18.4 -From cfeee321251e3f5a727d2707a89252adaf1cc48a Mon Sep 17 00:00:00 2001 +From 70fb27b89315c3d321b73e96816467f3e3dc8c34 Mon Sep 17 00:00:00 2001 From: escalator2015 Date: Tue, 24 May 2016 16:20:09 +0100 -Subject: [PATCH 0066/1224] New driver for RRA DigiDAC1 soundcard using WM8741 +Subject: [PATCH 0066/1225] New driver for RRA DigiDAC1 soundcard using WM8741 + WM8804 ASoC: digidac1-soundcard: use modern dai_link style @@ -111488,10 +111488,10 @@ index 0000000000000..5046f88c496b7 2.18.4 -From 56a4dd59049d8c3a772dc01ca5eceddf048dd930 Mon Sep 17 00:00:00 2001 +From 3ac746a2f93fab2f48d975916285e912ada5c283 Mon Sep 17 00:00:00 2001 From: DigitalDreamtime Date: Sat, 2 Jul 2016 16:26:19 +0100 -Subject: [PATCH 0067/1224] Add support for Dion Audio LOCO DAC-AMP HAT +Subject: [PATCH 0067/1225] Add support for Dion Audio LOCO DAC-AMP HAT Using dedicated machine driver and pcm5102a codec driver. @@ -111632,10 +111632,10 @@ index 0000000000000..06af8363fb0ad 2.18.4 -From cb75566131fb9b5fd21677086a75d478c86a199b Mon Sep 17 00:00:00 2001 +From 0975a985ab3539da8f1f338cddfb670d3c32b15b Mon Sep 17 00:00:00 2001 From: Clive Messer Date: Mon, 19 Sep 2016 14:01:04 +0100 -Subject: [PATCH 0068/1224] Allo Piano DAC boards: Initial 2 channel (stereo) +Subject: [PATCH 0068/1225] Allo Piano DAC boards: Initial 2 channel (stereo) support (#1645) Add initial 2 channel (stereo) support for Allo Piano DAC (2.0/2.1) boards, @@ -111802,10 +111802,10 @@ index 0000000000000..61640fb954314 2.18.4 -From 12b8d87d86c1318f016aaa289572265369d589d2 Mon Sep 17 00:00:00 2001 +From 6722ab89eedb9781bbca7ca52af18bb946a8d36d Mon Sep 17 00:00:00 2001 From: Raashid Muhammed Date: Mon, 27 Mar 2017 12:35:00 +0530 -Subject: [PATCH 0069/1224] Add support for Allo Piano DAC 2.1 plus add-on +Subject: [PATCH 0069/1225] Add support for Allo Piano DAC 2.1 plus add-on board for Raspberry Pi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -112887,10 +112887,10 @@ index 0000000000000..e910d4a4546dc 2.18.4 -From 2e9d3c220017bdec1125088d7e2c9b918623654a Mon Sep 17 00:00:00 2001 +From f42d33f4338e7ce793a96ece63ac76011a43a6c1 Mon Sep 17 00:00:00 2001 From: BabuSubashChandar Date: Tue, 28 Mar 2017 20:04:42 +0530 -Subject: [PATCH 0070/1224] Add support for Allo Boss DAC add-on board for +Subject: [PATCH 0070/1225] Add support for Allo Boss DAC add-on board for Raspberry Pi. (#1924) Signed-off-by: Baswaraj K @@ -113574,10 +113574,10 @@ index 0000000000000..cd47413f870c3 2.18.4 -From 02d89377f88ec7702aa01f56304b3ca54717f42f Mon Sep 17 00:00:00 2001 +From 0f649e0e134263a95ea243d2a907b0d26c81048b Mon Sep 17 00:00:00 2001 From: gtrainavicius Date: Sun, 23 Oct 2016 12:06:53 +0300 -Subject: [PATCH 0071/1224] Support for Blokas Labs pisound board +Subject: [PATCH 0071/1225] Support for Blokas Labs pisound board Pisound dynamic overlay (#1760) @@ -115338,10 +115338,10 @@ index 0000000000000..6af9921b55c71 2.18.4 -From 5e3c45ab369caa95ac57387936d00175dab5576a Mon Sep 17 00:00:00 2001 +From 60f59eb81cfdbd6fa514c63636ec0096e1f71fcc Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 22 Jan 2017 12:49:37 +0100 -Subject: [PATCH 0072/1224] ASoC: Add driver for Cirrus Logic Audio Card +Subject: [PATCH 0072/1225] ASoC: Add driver for Cirrus Logic Audio Card Note: due to problems with deferred probing of regulators the following softdep should be added to a modprobe.d file @@ -116403,10 +116403,10 @@ index 0000000000000..a0a460f787d1b 2.18.4 -From 71ca5e7586c16766d66efa961acde55afbecfb57 Mon Sep 17 00:00:00 2001 +From ea0bdf7a80455c1361b6cb7aea41313cae5e7fbd Mon Sep 17 00:00:00 2001 From: Miquel Date: Fri, 24 Feb 2017 20:51:06 +0100 -Subject: [PATCH 0073/1224] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT +Subject: [PATCH 0073/1225] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT Signed-off-by: Miquel Blauw @@ -116554,10 +116554,10 @@ index 0000000000000..ca48aef621b66 2.18.4 -From 73bab37dcff9fb18bf162a3e3667e7ce7f44940d Mon Sep 17 00:00:00 2001 +From 1b5cb32c943382e5bc7745f42d139dfbf79ec880 Mon Sep 17 00:00:00 2001 From: Fe-Pi Date: Wed, 1 Mar 2017 04:42:43 -0700 -Subject: [PATCH 0074/1224] Add support for Fe-Pi audio sound card. (#1867) +Subject: [PATCH 0074/1225] Add support for Fe-Pi audio sound card. (#1867) Fe-Pi Audio Sound Card is based on NXP SGTL5000 codec. Mechanical specification of the board is the same the Raspberry Pi Zero. @@ -116737,10 +116737,10 @@ index 0000000000000..a58a215820b73 2.18.4 -From 824f9edebdef22df234322884db658bc39a74402 Mon Sep 17 00:00:00 2001 +From 2749a359ad9b1c1b9537affa03f9d9d98cbd4870 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Wed, 8 Mar 2017 20:04:13 +1100 -Subject: [PATCH 0075/1224] Add support for the AudioInjector.net Octo sound +Subject: [PATCH 0075/1225] Add support for the AudioInjector.net Octo sound card AudioInjector Octo: sample rates, regulators, reset @@ -117184,10 +117184,10 @@ index 94b1adb088fde..203e3f368bd54 100644 2.18.4 -From b9de927cccca8a6f7eeb90affecaac5e842ded70 Mon Sep 17 00:00:00 2001 +From 984387bafca04713b6e1a5d96b136b11cfaa3bdc Mon Sep 17 00:00:00 2001 From: Peter Malkin Date: Mon, 27 Mar 2017 16:38:21 -0700 -Subject: [PATCH 0076/1224] Driver support for Google voiceHAT soundcard. +Subject: [PATCH 0076/1225] Driver support for Google voiceHAT soundcard. ASoC: googlevoicehat-codec: Use correct device when grabbing GPIO @@ -117445,10 +117445,10 @@ index 0000000000000..871a25aa498e7 2.18.4 -From cda4155f010772bbe9cfea69eb9aa394c7297061 Mon Sep 17 00:00:00 2001 +From c74eb27cd7af605b71ed4d2b7e2d790ad1b266d4 Mon Sep 17 00:00:00 2001 From: allocom Date: Thu, 19 Apr 2018 12:12:26 +0530 -Subject: [PATCH 0077/1224] Driver and overlay for Allo Katana DAC +Subject: [PATCH 0077/1225] Driver and overlay for Allo Katana DAC Allo Katana DAC: Updated default values @@ -117866,10 +117866,10 @@ index 0000000000000..b0aebd40fe5ea 2.18.4 -From ffc9880705391d7071b7f7b4e00ba22167139fe3 Mon Sep 17 00:00:00 2001 +From 1d75bd607528910d1cfc2dce5f4191f3e21c05fd Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Wed, 27 Jun 2018 15:59:12 +0100 -Subject: [PATCH 0078/1224] ASoC: Add generic RPI driver for simple soundcards. +Subject: [PATCH 0078/1225] ASoC: Add generic RPI driver for simple soundcards. The RPI simple sound card driver provides a generic ALSA SOC card driver supporting a variety of Pi HAT soundcards. The intention is to avoid @@ -118197,10 +118197,10 @@ index 0000000000000..2023b0a18a2c6 2.18.4 -From 1d3c9599fb6f7bb36e9abc7cf36215bd0cb66419 Mon Sep 17 00:00:00 2001 +From f1efbab86331f284cf8497e2a24e6dd87cfaaab4 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Sep 2018 17:00:36 +0100 -Subject: [PATCH 0079/1224] ASoC: Add Kconfig and Makefile for sound/soc/bcm +Subject: [PATCH 0079/1225] ASoC: Add Kconfig and Makefile for sound/soc/bcm Signed-off-by: popcornmix --- @@ -118469,10 +118469,10 @@ index b81fa421ec272..522fc73571e4b 100644 2.18.4 -From 32b1be84bb209c79c19285d71e39f8a8d21d290c Mon Sep 17 00:00:00 2001 +From 2413b53ac248cd0b70429505e03fe8139427eb89 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Sat, 21 Jul 2018 20:07:46 +0100 -Subject: [PATCH 0080/1224] ASoC: Create a generic Pi Hat WM8804 driver +Subject: [PATCH 0080/1225] ASoC: Create a generic Pi Hat WM8804 driver Reduce the amount of duplicated code by creating a generic driver for Pi Hat digi cards using the WM8804 codec. @@ -118946,10 +118946,10 @@ index 0000000000000..b3c3c4ea1e75b 2.18.4 -From 7b7ae5e9c160377d8d036c29793aa9511c94aeaf Mon Sep 17 00:00:00 2001 +From 0fff8d6f7427d0931d0bc991f7bd826f54a93f4a Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 21 Oct 2015 14:55:21 +0100 -Subject: [PATCH 0081/1224] rpi_display: add backlight driver and overlay +Subject: [PATCH 0081/1225] 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 @@ -119129,10 +119129,10 @@ index 0000000000000..14a0d9b037395 2.18.4 -From eb73dcd26136709a32d23bcc23cd40a8bd2774c0 Mon Sep 17 00:00:00 2001 +From 4d2f71b58bd6d13f46405d314aa848b4a3663eba Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 23 Feb 2016 19:56:04 +0000 -Subject: [PATCH 0082/1224] bcm2835-virtgpio: Virtual GPIO driver +Subject: [PATCH 0082/1225] bcm2835-virtgpio: Virtual GPIO driver Add a virtual GPIO driver that uses the firmware mailbox interface to request that the VPU toggles LEDs. @@ -119396,10 +119396,10 @@ index 0000000000000..49e28ad9760e0 2.18.4 -From bb0b4487d8a4e99f06441e5e467cd0cc0299d79b Mon Sep 17 00:00:00 2001 +From 70d8d9004f145d5ac836763d58ca1b955d2bd1f1 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Sep 2012 17:10:23 +0100 -Subject: [PATCH 0083/1224] net: Add non-mainline source for rtl8192cu wlan +Subject: [PATCH 0083/1225] net: Add non-mainline source for rtl8192cu wlan We are now syncing with version from: https://github.com/pvaret/rtl8192cu-fixes @@ -292561,10 +292561,10 @@ index 0000000000000..24ab3720bef62 2.18.4 -From dca3c1fff01b7a50f83d034744ebea9cb20e73ad Mon Sep 17 00:00:00 2001 +From 263952b0b10bea86f66e97a53c2870880d530d31 Mon Sep 17 00:00:00 2001 From: Pantelis Antoniou Date: Wed, 3 Dec 2014 13:23:28 +0200 -Subject: [PATCH 0084/1224] OF: DT-Overlay configfs interface +Subject: [PATCH 0084/1225] 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. @@ -293002,10 +293002,10 @@ index 0000000000000..178f0629b0f01 2.18.4 -From 2aa0d0302437844ce54994dc86156443226b151b Mon Sep 17 00:00:00 2001 +From 8c8c962f9473c17cf60561c43f0c748dcfa61ba8 Mon Sep 17 00:00:00 2001 From: Cheong2K Date: Fri, 26 Feb 2016 18:20:10 +0800 -Subject: [PATCH 0085/1224] brcm: adds support for BCM43341 wifi +Subject: [PATCH 0085/1225] brcm: adds support for BCM43341 wifi brcmfmac: Disable power management @@ -293140,10 +293140,10 @@ index ef5521b9b3577..0c9f5b5791e93 100644 2.18.4 -From c09e09ea4b2c2a78e189b723d9f6c5690a1aed7f Mon Sep 17 00:00:00 2001 +From 393991a4d6c39a06e55950a3b7ae55b7cfd560de Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 17 Dec 2015 13:37:07 +0000 -Subject: [PATCH 0086/1224] hci_h5: Don't send conf_req when ACTIVE +Subject: [PATCH 0086/1225] 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. @@ -293152,7 +293152,7 @@ other with conf_req and conf_rsp messages, in a demented game of tag. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c -index e11af747395dd..c29c8c4c462ce 100644 +index bf3e23104194a..4abd08fccf3a2 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c @@ -342,7 +342,8 @@ static void h5_handle_internal_rx(struct hci_uart *hu) @@ -293169,10 +293169,10 @@ index e11af747395dd..c29c8c4c462ce 100644 2.18.4 -From 20fb181c868504f2308bae953efd23d6146787ea Mon Sep 17 00:00:00 2001 +From f48eea963e9b83e6f09681eea5f1b6f88321d357 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 13 Apr 2015 17:16:29 +0100 -Subject: [PATCH 0087/1224] config: Add default configs +Subject: [PATCH 0087/1225] config: Add default configs --- arch/arm/configs/bcm2709_defconfig | 1444 +++++++++++++++++++++++++ @@ -300266,10 +300266,10 @@ index 0000000000000..ca7668f549bcd 2.18.4 -From 61cd12e1b914a23f4ef274afe5daab6ce42b1293 Mon Sep 17 00:00:00 2001 +From 1e54cc88ab4330213cbacdf773a6be8d52158402 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 14 Jan 2017 21:43:57 -0800 -Subject: [PATCH 0088/1224] ARM64: Round-Robin dispatch IRQs between CPUs. +Subject: [PATCH 0088/1225] 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 @@ -300346,10 +300346,10 @@ index 49642bcd0b75c..d8ef8f7fee5bb 100644 2.18.4 -From cbfc9173012ca7dd33bffe54e93135a5aca00477 Mon Sep 17 00:00:00 2001 +From 3c2b025841e4779c205b395a076311468261f2fd Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 11 Feb 2017 01:18:31 -0800 -Subject: [PATCH 0089/1224] ARM64: Force hardware emulation of deprecated +Subject: [PATCH 0089/1225] ARM64: Force hardware emulation of deprecated instructions. --- @@ -300380,10 +300380,10 @@ index bcb14d11232f9..bfa3a069cbf1e 100644 2.18.4 -From 71e6e8706734c5735bdea575552add85cf27efe1 Mon Sep 17 00:00:00 2001 +From 6733c5f3ab76e98718409e93257857d726aa8287 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 10 Feb 2017 17:57:08 -0800 -Subject: [PATCH 0090/1224] build/arm64: Add rules for .dtbo files for dts +Subject: [PATCH 0090/1225] build/arm64: Add rules for .dtbo files for dts overlays We now create overlays as .dtbo files. @@ -300422,10 +300422,10 @@ index cd8f3cdabfd07..8e9bc1497a59a 100644 2.18.4 -From 72da7c069a4d1f7a630516053a6a88c650b916ac Mon Sep 17 00:00:00 2001 +From 8ccce4542ef44e6acf30b91ff1d84b1016e259f1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Nov 2018 21:01:18 +0000 -Subject: [PATCH 0091/1224] Revert "build/arm64: Add rules for .dtbo files for +Subject: [PATCH 0091/1225] Revert "build/arm64: Add rules for .dtbo files for dts overlays" DT build rules are now in the common top-level Makefile. @@ -300464,10 +300464,10 @@ index 8e9bc1497a59a..cd8f3cdabfd07 100644 2.18.4 -From 73b8c900fd6509c3652f80cd55c58a1271680cc5 Mon Sep 17 00:00:00 2001 +From cc8cbb17205dd054996b8b782510152fa1eb82dc Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 25 Aug 2017 19:18:13 +0100 -Subject: [PATCH 0092/1224] cache: export clean and invalidate +Subject: [PATCH 0092/1225] cache: export clean and invalidate hack: cache: Fix linker error --- @@ -300525,10 +300525,10 @@ index 0ee8fc4b4672c..8acb1857ff679 100644 2.18.4 -From 55343459001e6aff869c7b584515f5d342e5a1f5 Mon Sep 17 00:00:00 2001 +From b6da53648566967d24065a99f6183703d7af8e2a Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 14 Nov 2017 15:13:15 +0000 -Subject: [PATCH 0093/1224] AXI performance monitor driver (#2222) +Subject: [PATCH 0093/1225] AXI performance monitor driver (#2222) Uses the debugfs I/F to provide access to the AXI bus performance monitors. @@ -301224,10 +301224,10 @@ index 0000000000000..5ae2bdaa88b41 2.18.4 -From 5d8aaf1cddc7738eab0b79ab6bfc8ee8a0374b97 Mon Sep 17 00:00:00 2001 +From 6867c3e6899eefed20e73bf6a426a7e099ae8439 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Nov 2017 17:14:54 +0000 -Subject: [PATCH 0094/1224] cgroup: Disable cgroup "memory" by default +Subject: [PATCH 0094/1225] 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: @@ -301242,10 +301242,10 @@ Signed-off-by: Phil Elwell 1 file changed, 30 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c -index 35faf082a709c..9f97b287891b6 100644 +index 37db8eba149ac..2831a56cbe09f 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5720,6 +5720,8 @@ int __init cgroup_init_early(void) +@@ -5722,6 +5722,8 @@ int __init cgroup_init_early(void) } static u16 cgroup_disable_mask __initdata; @@ -301254,7 +301254,7 @@ index 35faf082a709c..9f97b287891b6 100644 /** * cgroup_init - cgroup initialization -@@ -5759,6 +5761,12 @@ int __init cgroup_init(void) +@@ -5761,6 +5763,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -301267,7 +301267,7 @@ index 35faf082a709c..9f97b287891b6 100644 for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -6178,6 +6186,28 @@ static int __init cgroup_disable(char *str) +@@ -6180,6 +6188,28 @@ static int __init cgroup_disable(char *str) } __setup("cgroup_disable=", cgroup_disable); @@ -301300,10 +301300,10 @@ index 35faf082a709c..9f97b287891b6 100644 2.18.4 -From 5b6f3667faf5bbd1da4afab07718f0f120583d7b Mon Sep 17 00:00:00 2001 +From ca90ee8389fc5babdf3d35841cbaf9bcb15e5968 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 0095/1224] ARM: bcm2835: Set Serial number and Revision +Subject: [PATCH 0095/1225] ARM: bcm2835: Set Serial number and Revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -301369,10 +301369,10 @@ index bfc556f767203..73ec2427fbcfb 100644 2.18.4 -From ae5fb1aea928caba362118be29e6394862ece8b6 Mon Sep 17 00:00:00 2001 +From 5b0ca4782f3d1f1ec29b09724594712c7ac262ed Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 16 Jul 2018 14:40:13 +0100 -Subject: [PATCH 0096/1224] dwc-otg: FIQ: Fix "bad mode in data abort handler" +Subject: [PATCH 0096/1225] 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 @@ -301491,10 +301491,10 @@ index 73ec2427fbcfb..9b6c921106b56 100644 2.18.4 -From ebbb17ba3803b1944059ed222db3a23d89232cd5 Mon Sep 17 00:00:00 2001 +From bfd19a6a93c20834772b9fdbfb8a462fb7ccbea6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Dec 2017 09:18:32 +0000 -Subject: [PATCH 0097/1224] ARM: Activate FIQs to avoid __irq_startup warnings +Subject: [PATCH 0097/1225] 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. @@ -301533,10 +301533,10 @@ index cd1234c103fcd..a0f96e3b88981 100644 2.18.4 -From bfcaba14bb76247e0f48bccf5b9a98c1e065c157 Mon Sep 17 00:00:00 2001 +From ab764307c3c749a0ca1a057bf482faa3e4de4cc9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 22 Jan 2018 17:26:38 +0000 -Subject: [PATCH 0098/1224] serial: 8250: bcm2835aux - suppress EPROBE_DEFER +Subject: [PATCH 0098/1225] serial: 8250: bcm2835aux - suppress EPROBE_DEFER Signed-off-by: Phil Elwell --- @@ -301561,10 +301561,10 @@ index 4997c519ebb3a..33da68341c3a7 100644 2.18.4 -From 10f9c35c69d075bc0129e93caf0e8b211eb0a0f5 Mon Sep 17 00:00:00 2001 +From de45f61c9be20b3c32e67dd8a4c09f697bdd92a8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 14 Sep 2016 09:16:19 +0100 -Subject: [PATCH 0099/1224] raspberrypi-firmware: Export the general +Subject: [PATCH 0099/1225] raspberrypi-firmware: Export the general transaction function. The vc4-firmware-kms module is going to be doing the MBOX FB call. @@ -301599,10 +301599,10 @@ index 7162f6d6649c6..7947e65a22da9 100644 2.18.4 -From 39c77eaf67aa99632788f8be1da400084f2ba0bc Mon Sep 17 00:00:00 2001 +From 10d4a3023346c69fb47d1acae5143af7b02f3d46 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 14 Sep 2016 08:39:33 +0100 -Subject: [PATCH 0100/1224] drm/vc4: Add a mode for using the closed firmware +Subject: [PATCH 0100/1225] drm/vc4: Add a mode for using the closed firmware for display. Signed-off-by: Eric Anholt @@ -302376,10 +302376,10 @@ index 0000000000000..78c3430593550 2.18.4 -From 2d2a391a56fab60de18a516978103f92dffd8aa8 Mon Sep 17 00:00:00 2001 +From 0efe0c83617fe48f1d42bd67816b3fda23d91765 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 1 Feb 2017 17:09:18 -0800 -Subject: [PATCH 0101/1224] drm/vc4: Name the primary and cursor planes in +Subject: [PATCH 0101/1225] drm/vc4: Name the primary and cursor planes in fkms. This makes debugging nicer, compared to trying to remember what the @@ -302407,10 +302407,10 @@ index 78c3430593550..d9a5551d01a21 100644 2.18.4 -From 8570594b338072c276f5d5d6a48a01352a9f09e7 Mon Sep 17 00:00:00 2001 +From 003a3da60f7c7e7cfe15773c06f7c989a81d0428 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 1 Feb 2017 17:10:09 -0800 -Subject: [PATCH 0102/1224] drm/vc4: Add DRM_DEBUG_ATOMIC for the insides of +Subject: [PATCH 0102/1225] drm/vc4: Add DRM_DEBUG_ATOMIC for the insides of fkms. Trying to debug weston on fkms involved figuring out what calls I was @@ -302483,10 +302483,10 @@ index d9a5551d01a21..e372666af0119 100644 2.18.4 -From 7e3160c4096d141f9bd18046134770786a33653d Mon Sep 17 00:00:00 2001 +From 351b376dfe02cbbbede6654d71d2492ae644ff1e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 Feb 2017 09:42:18 -0800 -Subject: [PATCH 0103/1224] drm/vc4: Fix sending of page flip completion events +Subject: [PATCH 0103/1225] drm/vc4: Fix sending of page flip completion events in FKMS mode. In the rewrite of vc4_crtc.c for fkms, I dropped the part of the @@ -302531,10 +302531,10 @@ index e372666af0119..4d7b7f218cbbc 100644 2.18.4 -From 213022f5230df97de8ee6e47f50dd0f5cfc88c21 Mon Sep 17 00:00:00 2001 +From 6cdd28fb8ccccce1be566ba4305c541f3ab0118a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 6 Jul 2017 11:45:48 -0700 -Subject: [PATCH 0104/1224] drm/vc4: Add support for setting DPMS in +Subject: [PATCH 0104/1225] drm/vc4: Add support for setting DPMS in firmwarekms. This ensures that the screen goes blank during DPMS (screensaver), @@ -302641,10 +302641,10 @@ index 4d7b7f218cbbc..809437cf32158 100644 2.18.4 -From f51321196a1a738b92986c63db914d12a4c64ca8 Mon Sep 17 00:00:00 2001 +From 61fd1678f92b76bd60002dce2e468369f1b59820 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 7 Jun 2017 14:39:49 -0700 -Subject: [PATCH 0105/1224] drm/vc4: Add FB modifier support to firmwarekms. +Subject: [PATCH 0105/1225] drm/vc4: Add FB modifier support to firmwarekms. Signed-off-by: Eric Anholt (cherry picked from commit 11752d73488e08aaeb65fe8289a9c016acde26c2) @@ -302679,10 +302679,10 @@ index 809437cf32158..d5066f395b621 100644 2.18.4 -From decc7ddf01470a75a3a25723b0d298fb70e47b4a Mon Sep 17 00:00:00 2001 +From f407c87b3d3cb16c01c99bfa44130124d9c1ba54 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 30 Jan 2018 14:21:02 -0800 -Subject: [PATCH 0106/1224] drm/vc4: Add missing enable/disable vblank handlers +Subject: [PATCH 0106/1225] drm/vc4: Add missing enable/disable vblank handlers in fkms. Fixes hang at boot in 4.14. @@ -302766,10 +302766,10 @@ index d5066f395b621..e3dfc20c404ca 100644 2.18.4 -From f4833c7225a9c5d674a5d832cc130954ae03c4d5 Mon Sep 17 00:00:00 2001 +From e7b35a12185154594485d0ccc6ecde620816a066 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Apr 2017 21:43:46 +0100 -Subject: [PATCH 0107/1224] vc4_fkms: Apply firmware overscan offset to +Subject: [PATCH 0107/1225] vc4_fkms: Apply firmware overscan offset to hardware cursor --- @@ -302829,10 +302829,10 @@ index e3dfc20c404ca..7edb38953a6a2 100644 2.18.4 -From b4db876edac270dd1ba3c35cab0cbfd672d14301 Mon Sep 17 00:00:00 2001 +From a7b3599eddb6fadc629c19e3a80347e5ad691656 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:01:02 +0000 -Subject: [PATCH 0108/1224] drm/vc4: Fix warning about vblank interrupts before +Subject: [PATCH 0108/1225] drm/vc4: Fix warning about vblank interrupts before DRM core is ready. The SMICS interrupt fires continuously, but since it's 1/100 the rate @@ -302885,10 +302885,10 @@ index 7edb38953a6a2..967a0bf5886b7 100644 2.18.4 -From e2d36a4e48aa5ba2200d11742eb87dc01ff45ae8 Mon Sep 17 00:00:00 2001 +From 40b1e8a5b8e82e52afc5114615d5300fb8420cdc Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:02:30 +0000 -Subject: [PATCH 0109/1224] drm/vc4: Skip SET_CURSOR_INFO when the cursor +Subject: [PATCH 0109/1225] drm/vc4: Skip SET_CURSOR_INFO when the cursor contents didn't change. Signed-off-by: Eric Anholt @@ -302948,10 +302948,10 @@ index 967a0bf5886b7..462d9084ce53d 100644 2.18.4 -From 126093d4a44bac5d67bc7ddc15c5239885e5137a Mon Sep 17 00:00:00 2001 +From 5ac55396c85cac27337ae469f174842e1da85fd6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:22:03 +0000 -Subject: [PATCH 0110/1224] drm/vc4: Remove duplicate primary/cursor fields +Subject: [PATCH 0110/1225] drm/vc4: Remove duplicate primary/cursor fields from FKMS driver. The CRTC has those fields and we can just use them. @@ -303025,10 +303025,10 @@ index 462d9084ce53d..60e9d8fa55113 100644 2.18.4 -From c1921da42db10b64c6fc3f151384e5225d1a4131 Mon Sep 17 00:00:00 2001 +From a1a1ac744506359d5e92499d1b953b37e8991b3d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 17 Jun 2018 13:22:07 +0100 -Subject: [PATCH 0111/1224] vc4_firmware_kms: fix build +Subject: [PATCH 0111/1225] vc4_firmware_kms: fix build --- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 8 ++++++-- @@ -303090,10 +303090,10 @@ index 60e9d8fa55113..1584f90face03 100644 2.18.4 -From 85a8eb7b80e74af0709d7866062dea9bbff3ed07 Mon Sep 17 00:00:00 2001 +From cb5371cdabe4392ff06b60c52af96a3002a71ad9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Feb 2019 15:06:31 +0000 -Subject: [PATCH 0112/1224] gpu:vc4-fkms: Update driver to not use plane->crtc. +Subject: [PATCH 0112/1225] gpu:vc4-fkms: Update driver to not use plane->crtc. Following on from commit 2f958af7fc248 ("drm/vc4: Stop updating plane->fb/crtc") @@ -303132,10 +303132,10 @@ index 1584f90face03..347ad72682dc2 100644 2.18.4 -From ef5b049af7c76dd897d8ed421069e4338a1d7f3e Mon Sep 17 00:00:00 2001 +From ac83e79e526afefd8b48c5cdc9f41a15e1725190 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:53:18 +0000 -Subject: [PATCH 0113/1224] drm/vc4: Don't wait for vblank on fkms cursor +Subject: [PATCH 0113/1225] drm/vc4: Don't wait for vblank on fkms cursor updates. We don't use the same async update path between fkms and normal kms, @@ -303166,10 +303166,10 @@ index 78d4fb0499e39..75d3e8c6b6507 100644 2.18.4 -From cf3b4d273f64b78dbaa7e1fc82c76d43b71c37b6 Mon Sep 17 00:00:00 2001 +From 2b11c3e10c03abb785e833ebf57823c44374a59b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 20 Feb 2018 10:07:27 +0000 -Subject: [PATCH 0114/1224] i2c-gpio: Also set bus numbers from reg property +Subject: [PATCH 0114/1225] 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 @@ -303207,10 +303207,10 @@ index a4a6825c87583..cfbcf3952ddc9 100644 2.18.4 -From 505104f4f0eff7709d1e558aed4f61f29ae6846a Mon Sep 17 00:00:00 2001 +From 418cb242565ecafb37d454935ae6856d4cc9d70c Mon Sep 17 00:00:00 2001 From: hdoverobinson Date: Tue, 13 Mar 2018 06:58:39 -0400 -Subject: [PATCH 0115/1224] added capture_clear option to pps-gpio via +Subject: [PATCH 0115/1225] added capture_clear option to pps-gpio via dtoverlay (#2433) --- @@ -303234,10 +303234,10 @@ index e0de1df2ede07..ee7d8f4e7f2e2 100644 2.18.4 -From 66d6410970dd908f91b7f8255ced48eb93fc450d Mon Sep 17 00:00:00 2001 +From db7798f7f8e05eee6e67b112e4814d0938c9cf02 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Mar 2018 12:01:00 +0000 -Subject: [PATCH 0116/1224] lan78xx: Read initial EEE status from DT +Subject: [PATCH 0116/1225] lan78xx: Read initial EEE status from DT Add two new DT properties: * microchip,eee-enabled - a boolean to enable EEE @@ -303280,10 +303280,10 @@ index ba42568316f1b..e266ca2191ed3 100644 2.18.4 -From 38ee846e1b70c5850c4d237193165d07d0ef40aa Mon Sep 17 00:00:00 2001 +From fe9d6ff6fc39e6ea72d7c6913d8c0fd8a0e34a84 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 14 Jul 2014 22:02:09 +0100 -Subject: [PATCH 0117/1224] hid: Reduce default mouse polling interval to 60Hz +Subject: [PATCH 0117/1225] hid: Reduce default mouse polling interval to 60Hz Reduces overhead when using X --- @@ -303318,10 +303318,10 @@ index 17a638f150824..ce8ef69307951 100644 2.18.4 -From 9c489086b89f30bfc81a8fed179839a4ee56f460 Mon Sep 17 00:00:00 2001 +From 17b875c511cecea925a781044f5c73399e357136 Mon Sep 17 00:00:00 2001 From: Nick Bulleid Date: Thu, 10 May 2018 21:57:02 +0100 -Subject: [PATCH 0118/1224] Add ability to export gpio used by gpio-poweroff +Subject: [PATCH 0118/1225] Add ability to export gpio used by gpio-poweroff Signed-off-by: Nick Bulleid @@ -303383,10 +303383,10 @@ index beb1df358c8da..608d78f0514a0 100644 2.18.4 -From 2a927682617386302d60ab81a26e8e101c71fdb6 Mon Sep 17 00:00:00 2001 +From 5248f88cd54dd96076351ead08ef04f15dbb127e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 12 May 2018 21:35:43 +0100 -Subject: [PATCH 0119/1224] firmware/raspberrypi: Notify firmware of a reboot +Subject: [PATCH 0119/1225] firmware/raspberrypi: Notify firmware of a reboot Register for reboot notifications, sending RPI_FIRMWARE_NOTIFY_REBOOT over the mailbox interface on reception. @@ -303473,10 +303473,10 @@ index 7947e65a22da9..9ad10f7e019b8 100644 2.18.4 -From 42d9b363c7eac43007451b1962a4628a80114715 Mon Sep 17 00:00:00 2001 +From 5c3eff10b674ad8a819603fc1008f9871a42743f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 11:21:04 +0100 -Subject: [PATCH 0120/1224] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time +Subject: [PATCH 0120/1225] 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 @@ -303545,10 +303545,10 @@ index 93878d725f260..40c1b38d5db5c 100644 2.18.4 -From a0d469981d89169f99cb92c165663658cd6a9de5 Mon Sep 17 00:00:00 2001 +From 03f2bddb5ac945a78884a1542f99004e6161be78 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 15:07:26 +0100 -Subject: [PATCH 0121/1224] of: configfs: Use of_overlay_fdt_apply API call +Subject: [PATCH 0121/1225] 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 @@ -303665,10 +303665,10 @@ index 178f0629b0f01..ac04301dabe13 100644 2.18.4 -From aa694ad96df741364931c200429f199f2a47b3be Mon Sep 17 00:00:00 2001 +From 98e5d450640efa90a18fa7787a623ea307fe0237 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Jun 2018 15:21:10 +0100 -Subject: [PATCH 0122/1224] net: lan78xx: Disable TCP Segmentation Offload +Subject: [PATCH 0122/1225] net: lan78xx: Disable TCP Segmentation Offload (TSO) TSO seems to be having issues when packets are dropped and the @@ -303728,10 +303728,10 @@ index e266ca2191ed3..3b904c55a21aa 100644 2.18.4 -From ace8453026d971919e0bdbd67f7745fc2f468793 Mon Sep 17 00:00:00 2001 +From b35f4e193edb4ad42e1ee2e4e8b24a9f01b3e607 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 Jun 2018 12:20:01 +0100 -Subject: [PATCH 0123/1224] brcmfmac: Re-enable firmware roaming support +Subject: [PATCH 0123/1225] 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 @@ -303763,10 +303763,10 @@ index 5c2a03d629e48..dec25e4156199 100644 2.18.4 -From 5e1b9f386def9806ba88b8fc5d96c94b7346af43 Mon Sep 17 00:00:00 2001 +From 5c4d30710c52ec9a890e02935da35ca62cf94d51 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Apr 2018 14:46:11 +0100 -Subject: [PATCH 0124/1224] lan78xx: Move enabling of EEE into PHY init code +Subject: [PATCH 0124/1225] 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 @@ -303833,10 +303833,10 @@ index 3b904c55a21aa..3bf87542c2ec9 100644 2.18.4 -From 42c24860a5dde0121b7a257f3347cb4f354f0afa Mon Sep 17 00:00:00 2001 +From f866b29ba9c93e3e01d49e6a91ca288550547dc1 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 9 Jul 2018 12:54:25 +0100 -Subject: [PATCH 0125/1224] Add rpi-poe-fan driver +Subject: [PATCH 0125/1225] Add rpi-poe-fan driver Signed-off-by: Serge Schneider @@ -304427,10 +304427,10 @@ index 0000000000000..3effaf2eb86db 2.18.4 -From 6a766423d16465bf6043149abca6289eb67078a8 Mon Sep 17 00:00:00 2001 +From 19c50e7e6f9ca1dd8f8105c00d4fc63bea54fd9e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 17 Sep 2018 17:31:18 +0100 -Subject: [PATCH 0126/1224] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 +Subject: [PATCH 0126/1225] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT --- @@ -304453,10 +304453,10 @@ index bcc49cb47de63..2068f4b9fc376 100644 2.18.4 -From 84c00774980d37ead1707a2bfe6139cb1aee6cb5 Mon Sep 17 00:00:00 2001 +From f4ca96cdeac443896c75c9f9df887a8ccd009be9 Mon Sep 17 00:00:00 2001 From: detule Date: Tue, 2 Oct 2018 04:10:08 -0400 -Subject: [PATCH 0127/1224] vchiq_2835_arm: Implement a DMA pool for small bulk +Subject: [PATCH 0127/1225] vchiq_2835_arm: Implement a DMA pool for small bulk transfers (#2699) During a bulk transfer we request a DMA allocation to hold the @@ -304583,10 +304583,10 @@ index 8dc730cfe7a63..dc13c7df8c1c0 100644 2.18.4 -From 24d8efa341949205b60d2ed151816e5fcb8b9452 Mon Sep 17 00:00:00 2001 +From c6130c8a823ed679d13a4f5c7a0a04f2d18ac8fe Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 6 Oct 2018 16:46:18 +0200 -Subject: [PATCH 0128/1224] hwmon: raspberrypi: Prevent voltage low warnings +Subject: [PATCH 0128/1225] hwmon: raspberrypi: Prevent voltage low warnings from filling log Although the correct fix for low voltage warnings is to @@ -304664,10 +304664,10 @@ index d3a64a35f7a9a..db3b03438dd05 100644 2.18.4 -From 0693b201262383e75be08d07a715dd8758363165 Mon Sep 17 00:00:00 2001 +From 723cc988236a5d9091ba714f61f1ca28a4a7ff2a Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 13:31:21 +0200 -Subject: [PATCH 0129/1224] firmware: raspberrypi: Add backward compatible +Subject: [PATCH 0129/1225] firmware: raspberrypi: Add backward compatible get_throttled Avoid a hard userspace ABI change by adding a compatible get_throttled @@ -304749,10 +304749,10 @@ index 9ad10f7e019b8..e834e300bb6f6 100644 2.18.4 -From 1fd2db367d2d5c92f35d535743ae4d31cfb75fe2 Mon Sep 17 00:00:00 2001 +From acab6ce05f69f547c666a905f8a66abb711ba96f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 6 Nov 2018 12:57:48 +0000 -Subject: [PATCH 0130/1224] sc16is7xx: Don't spin if no data received +Subject: [PATCH 0130/1225] sc16is7xx: Don't spin if no data received See: https://github.com/raspberrypi/linux/issues/2676 @@ -304778,10 +304778,10 @@ index 7d3ae31cc7204..fe486498530da 100644 2.18.4 -From d0a7a703702ba5e5b5f8acac434cf769e676e627 Mon Sep 17 00:00:00 2001 +From 8134185e622db51cfba8a20a807709ddffb99f81 Mon Sep 17 00:00:00 2001 From: Ram Chandrasekar Date: Mon, 7 May 2018 11:54:08 -0600 -Subject: [PATCH 0131/1224] drivers: thermal: step_wise: add support for +Subject: [PATCH 0131/1225] drivers: thermal: step_wise: add support for hysteresis Step wise governor increases the mitigation level when the temperature @@ -304878,10 +304878,10 @@ index 6e051cbd824ff..7d30b8d928ab2 100644 2.18.4 -From 998dd8e215938014be20ce8b9d815bfc65d92ddb Mon Sep 17 00:00:00 2001 +From c9e7ff8217beec46d68f85482d26a6c7bdd9f20d Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 2 Oct 2018 11:14:15 +0100 -Subject: [PATCH 0132/1224] drivers: thermal: step_wise: avoid throttling at +Subject: [PATCH 0132/1225] drivers: thermal: step_wise: avoid throttling at hysteresis temperature after dropping below it Signed-off-by: Serge Schneider @@ -304906,10 +304906,10 @@ index 7d30b8d928ab2..c481ed33810cd 100644 2.18.4 -From 23b1ad7a0ba34e63912c139185d908bfa39d981e Mon Sep 17 00:00:00 2001 +From 9245edb3d50465ac1e97a39150adbd46af8d687b Mon Sep 17 00:00:00 2001 From: James Hughes Date: Fri, 2 Nov 2018 11:55:49 +0000 -Subject: [PATCH 0133/1224] Update issue templates (#2736) +Subject: [PATCH 0133/1225] Update issue templates (#2736) --- .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++++++++++ @@ -304960,10 +304960,10 @@ index 0000000000000..09bdc4a968383 2.18.4 -From 6c568f38cb5508ccd4a7a8cb74da22edf9b7d065 Mon Sep 17 00:00:00 2001 +From 607b008c988faa82053806f2fee4c747bae8ac34 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 24 Apr 2018 14:42:27 +0100 -Subject: [PATCH 0134/1224] gpiolib: Don't prevent IRQ usage of output GPIOs +Subject: [PATCH 0134/1225] 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 @@ -305016,10 +305016,10 @@ index abdf448b11a3d..1e6bc8ecb5dc6 100644 2.18.4 -From 5c9e6c6d2ab02a677ca2273ea640cb4921795de7 Mon Sep 17 00:00:00 2001 +From 57fd5560e2d9fc8ffec0730c4e380fa260794a69 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Nov 2018 19:46:58 +0000 -Subject: [PATCH 0135/1224] net: lan78xx: Support auto-downshift to 100Mb/s +Subject: [PATCH 0135/1225] 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 @@ -305117,10 +305117,10 @@ index 517288da19fd3..626c450d71f45 100644 2.18.4 -From ac4bde3bca7dcdb3643bcae483e3ae511e82dff0 Mon Sep 17 00:00:00 2001 +From b95edb42c7232e695a60e0e832aed7c54c087643 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 14:21:04 +0000 -Subject: [PATCH 0136/1224] staging: bcm2835-camera: Ensure H264 header bytes +Subject: [PATCH 0136/1225] staging: bcm2835-camera: Ensure H264 header bytes get a sensible timestamp H264 header come from VC with 0 timestamps, which means they get a @@ -305215,10 +305215,10 @@ index b5fce38de038c..dcb1b8e1f4e00 100644 2.18.4 -From 8da3993140b61115985644e00bf9d9ddaa0cdab0 Mon Sep 17 00:00:00 2001 +From 7f6e94414082753b35312601323b22e708794fa3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 10 Jan 2019 17:58:06 +0000 -Subject: [PATCH 0137/1224] firmware: raspberrypi: Report the fw variant during +Subject: [PATCH 0137/1225] firmware: raspberrypi: Report the fw variant during probe The driver already reported the firmware build date during probe. @@ -305334,10 +305334,10 @@ index 25fca695f9039..9c6027fc25dae 100644 2.18.4 -From cf79b8f9c788b29c9ebdec00d718e87f9200be36 Mon Sep 17 00:00:00 2001 +From 69e0a1b53c11fbaf8222c71de055a8ff689a0770 Mon Sep 17 00:00:00 2001 From: Joshua Emele Date: Wed, 7 Nov 2018 16:07:40 -0800 -Subject: [PATCH 0138/1224] lan78xx: Debounce link events to minimize poll +Subject: [PATCH 0138/1225] lan78xx: Debounce link events to minimize poll storm The bInterval is set to 4 (i.e. 8 microframes => 1ms) and the only bit @@ -305386,10 +305386,10 @@ index 3bf87542c2ec9..3ce3c651d1580 100644 2.18.4 -From 3c4c9bacf8497ec996ee7652a4189cd2b6a6bb11 Mon Sep 17 00:00:00 2001 +From 20cc1fd9c4f518d566dda9268fdd5a9a9e03b53f Mon Sep 17 00:00:00 2001 From: b-ak Date: Thu, 3 Jan 2019 00:01:08 +0530 -Subject: [PATCH 0139/1224] ASoC: Add support for AudioSense-Pi add-on +Subject: [PATCH 0139/1225] ASoC: Add support for AudioSense-Pi add-on soundcard AudioSense-Pi is a RPi HAT based on a TI's TLV320AIC32x4 stereo codec @@ -305724,10 +305724,10 @@ index 0000000000000..d247ee8e61272 2.18.4 -From 6740d62b71d57282f3c9d394005cf24cdfbdc2f6 Mon Sep 17 00:00:00 2001 +From ba195084718b21f0ed356c52f3d5848dfe64f497 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Jan 2019 12:39:50 +0000 -Subject: [PATCH 0140/1224] spi: spi-bcm2835: Re-enable HW CS +Subject: [PATCH 0140/1225] spi: spi-bcm2835: Re-enable HW CS Signed-off-by: Phil Elwell --- @@ -305810,10 +305810,10 @@ index 56ee84e85bee2..b5efa2236b614 100644 2.18.4 -From caa237a4947d61b0f609b47e94452efadfbd365a Mon Sep 17 00:00:00 2001 +From 22cb2bbb3b8702ff274d24b95f6c165f53ae30f8 Mon Sep 17 00:00:00 2001 From: HiFiBerry Date: Mon, 8 Oct 2018 18:10:12 +0200 -Subject: [PATCH 0141/1224] Added driver for the HiFiBerry DAC+ ADC (#2694) +Subject: [PATCH 0141/1225] Added driver for the HiFiBerry DAC+ ADC (#2694) Signed-off-by: Daniel Matuschek @@ -306285,10 +306285,10 @@ index 0000000000000..ab454f2ecb17b 2.18.4 -From 4da4fe1d2bd0f74cba6f6a77d9857ec4c4fce00a Mon Sep 17 00:00:00 2001 +From 7443edfc73c27e69d8854b79ba0ee23d37c8301c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 7 Feb 2019 18:16:25 +0000 -Subject: [PATCH 0142/1224] configs: Enable the AD193x codecs +Subject: [PATCH 0142/1225] configs: Enable the AD193x codecs See: https://github.com/raspberrypi/linux/issues/2850 @@ -306319,10 +306319,10 @@ index 26f2b5b3e9682..eea92595d5e15 100644 2.18.4 -From 233a1cae70fab00e127e7d4da11792f94ce3516e Mon Sep 17 00:00:00 2001 +From 4e19fb9551020d2774f5bb749996246f4efedb03 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 Mar 2019 09:51:22 +0000 -Subject: [PATCH 0143/1224] lan78xx: EEE support is now a PHY property +Subject: [PATCH 0143/1225] 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. @@ -306351,10 +306351,10 @@ index 3ce3c651d1580..8a197006eb6ef 100644 2.18.4 -From 699df0f662d6828d5f244898b9ffac22a1bf9174 Mon Sep 17 00:00:00 2001 +From cf43b7db2b14d1060d1b62feba76d6301f0f63c9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 Mar 2019 16:28:09 +0000 -Subject: [PATCH 0144/1224] Revert "staging: vchiq: delete vchiq_killable.h" +Subject: [PATCH 0144/1225] Revert "staging: vchiq: delete vchiq_killable.h" This reverts commit 2da56630b1cc422f58408033102b8f91ae97bc91. --- @@ -306492,10 +306492,10 @@ index 5e6d3035dc058..7b38afd4739df 100644 2.18.4 -From be76f55838cee71a07dd291a752e4dad90df8167 Mon Sep 17 00:00:00 2001 +From a7c4529c90cf5ce1c50985f5ff8f02558dccdbd4 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 15 Mar 2019 21:11:10 +0000 -Subject: [PATCH 0145/1224] Revert "staging: bcm2835-audio: Drop DT dependency" +Subject: [PATCH 0145/1225] Revert "staging: bcm2835-audio: Drop DT dependency" This reverts commit b7491a9fca2dc2535b9dc922550a37c5baae9d3d. --- @@ -306503,7 +306503,7 @@ This reverts commit b7491a9fca2dc2535b9dc922550a37c5baae9d3d. 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index cf5f80f5ca6b0..86b921030db7b 100644 +index c250fbef2fa3d..b42917c250504 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -6,13 +6,13 @@ @@ -306594,10 +306594,10 @@ index cf5f80f5ca6b0..86b921030db7b 100644 2.18.4 -From 12cca2a40c467a79e55a7f8f94191fa2235462c4 Mon Sep 17 00:00:00 2001 +From 563733ec36df46b7b7157ffb2c63c427461a93ab Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 28 Jan 2019 14:40:16 +0000 -Subject: [PATCH 0146/1224] gpu: vc4_firmware_kms: Fix up 64 bit compile +Subject: [PATCH 0146/1225] gpu: vc4_firmware_kms: Fix up 64 bit compile warnings. Resolve two build warnings with regard using incorrectly @@ -306666,10 +306666,10 @@ index 347ad72682dc2..85e273665836d 100644 2.18.4 -From d97a8f46e5b16bb0fa9d21ea119321cdc10765f9 Mon Sep 17 00:00:00 2001 +From 7712da9bb2b90e50908db614ecfba7b07a69ca84 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 20 Jul 2018 22:03:41 +0100 -Subject: [PATCH 0147/1224] bcm2835-dma: Add support for per-channel flags +Subject: [PATCH 0147/1225] 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 @@ -306720,10 +306720,10 @@ index 6860131b02d9a..1e5d6f1bed4ec 100644 2.18.4 -From 969d7fc15fde191f6545b77f8f20cd0e35957322 Mon Sep 17 00:00:00 2001 +From 765f715538558218a25d792658e4d0113cbade98 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Feb 2019 15:18:25 +0000 -Subject: [PATCH 0148/1224] drm: vc4: Programming the CTM is conditional on +Subject: [PATCH 0148/1225] drm: vc4: Programming the CTM is conditional on running full KMS vc4_ctm_commit writes to HVS registers, so this is only applicable @@ -306752,10 +306752,10 @@ index 75d3e8c6b6507..57124fe942472 100644 2.18.4 -From 7b169e02e86f32b58caa549893f57c2511d82b98 Mon Sep 17 00:00:00 2001 +From 57cfe054f90f9fbf8eebe5e697df04572526740d Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 29 Mar 2019 10:53:14 +0000 -Subject: [PATCH 0149/1224] rtc: rv3028: Add backup switchover mode support +Subject: [PATCH 0149/1225] rtc: rv3028: Add backup switchover mode support Signed-off-by: Phil Howard --- @@ -306808,10 +306808,10 @@ index bbdfebd706442..8b2446909a1bb 100644 2.18.4 -From 800dd57c0be01968f320b32b542dad9192f7ba95 Mon Sep 17 00:00:00 2001 +From 2014e6a2e084f160898f645c8c8571215c52f75b Mon Sep 17 00:00:00 2001 From: FERHAT Nicolas Date: Fri, 5 Apr 2019 13:06:42 +0100 -Subject: [PATCH 0150/1224] Audiophonics I-Sabre 9038Q2M DAC driver +Subject: [PATCH 0150/1225] Audiophonics I-Sabre 9038Q2M DAC driver Signed-off-by: Audiophonics @@ -307524,10 +307524,10 @@ index 0000000000000..9cac5a2446b9e 2.18.4 -From b50fce8d6dae29859631937b20d273d944baffbc Mon Sep 17 00:00:00 2001 +From 3fbc0ddcf470737f6c746952a77deee05aad6cfb Mon Sep 17 00:00:00 2001 From: P33M Date: Thu, 2 May 2019 11:53:45 +0100 -Subject: [PATCH 0151/1224] lan78xx: use default alignment for rx buffers +Subject: [PATCH 0151/1225] 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 @@ -307553,10 +307553,10 @@ index 8a197006eb6ef..f72ab25e7d06c 100644 2.18.4 -From 3d235253c9f3a4cd294b551577122ab0ea6d9a74 Mon Sep 17 00:00:00 2001 +From c968bbe4e9e9b8d7becdc777cb5a754a73946a12 Mon Sep 17 00:00:00 2001 From: IQaudIO Date: Mon, 13 May 2019 21:53:05 +0100 -Subject: [PATCH 0152/1224] Added IQaudIO Pi-Codec board support (#2969) +Subject: [PATCH 0152/1225] Added IQaudIO Pi-Codec board support (#2969) Add support for the IQaudIO Pi-Codec board. @@ -307896,10 +307896,10 @@ index 0000000000000..83f2dba1f5d63 2.18.4 -From b18a3d2950a379de097dea0cbac21bb80a20c6a5 Mon Sep 17 00:00:00 2001 +From b3da40462881591c446f5412551a779d0b0c6349 Mon Sep 17 00:00:00 2001 From: Klaus Schulz Date: Thu, 16 May 2019 13:35:32 +0200 -Subject: [PATCH 0153/1224] sound: pcm512x-codec: Adding 352.8kHz samplerate +Subject: [PATCH 0153/1225] sound: pcm512x-codec: Adding 352.8kHz samplerate support --- @@ -307923,10 +307923,10 @@ index 4cbef9affffda..604b405c81ac9 100644 2.18.4 -From 16e2b1b558c353a7020952b4dc431522b9ee732e Mon Sep 17 00:00:00 2001 +From b71830203eaff2f50fe3aaf536be5371ff93236b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:55:37 +0000 -Subject: [PATCH 0154/1224] media: ov5647: Add set_fmt and get_fmt calls. +Subject: [PATCH 0154/1225] media: ov5647: Add set_fmt and get_fmt calls. There's no way to query the subdevice for the supported resolutions. @@ -307976,10 +307976,10 @@ index e7d2e5b4ad4b9..3e587eb0a30e6 100644 2.18.4 -From 264972047eb9133751690ac17e4077d89eb9d55c Mon Sep 17 00:00:00 2001 +From 4e8413caf68921e5e39d21ef34b9f35d704f2efc Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:55:59 +0000 -Subject: [PATCH 0155/1224] [media] Documentation: DT: add device tree for PWDN +Subject: [PATCH 0155/1225] [media] Documentation: DT: add device tree for PWDN control Add optional GPIO pwdn to connect to the PWDN line on the sensor. @@ -308015,10 +308015,10 @@ index 22e44945b6610..70f06c24f4709 100644 2.18.4 -From 2568a2a8c059416f4f4011ec90df7c66beee9eea Mon Sep 17 00:00:00 2001 +From d3e5bd3b74dabbabd2da4786d3724d8b61b509de Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:33 +0000 -Subject: [PATCH 0156/1224] media: ov5647: Add support for PWDN GPIO. +Subject: [PATCH 0156/1225] media: ov5647: Add support for PWDN GPIO. Add support for an optional GPIO connected to PWDN on the sensor. @@ -308113,10 +308113,10 @@ index 3e587eb0a30e6..c39e3d20e3efd 100644 2.18.4 -From ef25052089db59d3cc8c71206bb2839a84c12d0e Mon Sep 17 00:00:00 2001 +From ce3446de5a7efd90318f2e197bebbaaae65312c4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:47 +0000 -Subject: [PATCH 0157/1224] media: ov5647: Add support for non-continuous clock +Subject: [PATCH 0157/1225] media: ov5647: Add support for non-continuous clock mode The driver was only supporting continuous clock mode @@ -308198,10 +308198,10 @@ index c39e3d20e3efd..8a1a515388e0e 100644 2.18.4 -From 69d29ed69d9694fc99e230952ea28eef8def1806 Mon Sep 17 00:00:00 2001 +From 402073f4fb8ccc6cb392f7db10ae98e0e092fbea Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:59 +0000 -Subject: [PATCH 0158/1224] media: tc358743: Increase FIFO level to 374. +Subject: [PATCH 0158/1225] 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 @@ -308235,10 +308235,10 @@ index cff99cf61ed4d..5b40de02f0d14 100644 2.18.4 -From cd05dc8586311a24d83542b735b4dd8c25d1ff5c Mon Sep 17 00:00:00 2001 +From 90b0340d23be287119b1312ee8a673a91c468eda Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 21 Sep 2017 17:30:24 +0200 -Subject: [PATCH 0159/1224] media: tc358743: fix connected/active CSI-2 lane +Subject: [PATCH 0159/1225] media: tc358743: fix connected/active CSI-2 lane reporting g_mbus_config was supposed to indicate all supported lane numbers, not @@ -308317,10 +308317,10 @@ index c072ed1418113..c90b6a7535b5b 100644 2.18.4 -From 2660b1be4475b32730e3baf7961885c5fc9b4543 Mon Sep 17 00:00:00 2001 +From fd11a8d8a974265f50cb0f100aa5039e86ef9647 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:21 +0000 -Subject: [PATCH 0160/1224] media: tc358743: Add support for 972Mbit/s link +Subject: [PATCH 0160/1225] media: tc358743: Add support for 972Mbit/s link freq. Adds register setups for running the CSI lanes at 972Mbit/s, @@ -308403,10 +308403,10 @@ index 98cee67005cbc..4a6de85326bfa 100644 2.18.4 -From ac3508b94ecd959d0fa4f6c6643485361d361cf7 Mon Sep 17 00:00:00 2001 +From e82310dfb91e5efdff3e788974671f8791843f8f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:34 +0000 -Subject: [PATCH 0161/1224] media: tc358743: Check I2C succeeded during probe. +Subject: [PATCH 0161/1225] 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. @@ -308507,10 +308507,10 @@ index 4a6de85326bfa..843f341a7eab6 100644 2.18.4 -From 83de5cfdc90f8d7584e663507183e30016b33eeb Mon Sep 17 00:00:00 2001 +From 8380dc9b7be1ef404ad1d45a2e94815bf8411fd3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:46 +0000 -Subject: [PATCH 0162/1224] media: adv7180: Default to the first valid input +Subject: [PATCH 0162/1225] media: adv7180: Default to the first valid input The hardware default is differential CVBS on AIN1 & 2, which isn't very useful. @@ -308558,10 +308558,10 @@ index e780969cc2f26..43229fccf83a3 100644 2.18.4 -From 75730294be8095bfd557920607e8067f044a441c Mon Sep 17 00:00:00 2001 +From c98187a4c2fe196a6a108e8e4e5d5c4d9370bf1f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:56 +0000 -Subject: [PATCH 0163/1224] media: adv7180: Add YPrPb support for ADV7282M +Subject: [PATCH 0163/1225] 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 @@ -308588,10 +308588,10 @@ index 43229fccf83a3..8e3cf751a5a1d 100644 2.18.4 -From ecb96bd9272c80ccdbe1ff58425d4dda07381b5e Mon Sep 17 00:00:00 2001 +From cfa1a4a7259c4f611d705b3bc2de76f0c1b93d20 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:58:08 +0000 -Subject: [PATCH 0164/1224] media: videodev2: Add helper defines for printing +Subject: [PATCH 0164/1225] media: videodev2: Add helper defines for printing FOURCCs New helper defines that allow printing of a FOURCC using @@ -308622,10 +308622,10 @@ index 3210b3c82a4a2..456dfa847ccb1 100644 2.18.4 -From 299da3fa15dd526b57288c47dd2db5c97773d1fa Mon Sep 17 00:00:00 2001 +From e10e0924dd3fe69ac737b27c9b5977b6c906da9a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:06 +0000 -Subject: [PATCH 0165/1224] dt-bindings: Document BCM283x CSI2/CCP2 receiver +Subject: [PATCH 0165/1225] dt-bindings: Document BCM283x CSI2/CCP2 receiver Document the DT bindings for the CSI2/CCP2 receiver peripheral (known as Unicam) on BCM283x SoCs. @@ -308732,10 +308732,10 @@ index 0000000000000..7714fb374b34d 2.18.4 -From 981b7a694383d6e449c4f950689a21b612e9430f Mon Sep 17 00:00:00 2001 +From 3ec1fdaede7c64500d254df1f41caaa37bc5bca3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:40 +0000 -Subject: [PATCH 0166/1224] MAINTAINERS: Add entry for BCM2835 Unicam driver +Subject: [PATCH 0166/1225] MAINTAINERS: Add entry for BCM2835 Unicam driver Adds entry for the new BCM2835 Unicam (CSI-2 receiver) driver @@ -308766,10 +308766,10 @@ index 1407008df7491..b7685777a8061 100644 2.18.4 -From 7239e930505e041f94f3653adf859aad2c1bc4ff Mon Sep 17 00:00:00 2001 +From 46d0664059fca54d8fa7b3c3750a493304a96efe Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 22 Nov 2018 17:31:06 +0000 -Subject: [PATCH 0167/1224] media: tc358743: Return an appropriate colorspace +Subject: [PATCH 0167/1225] media: tc358743: Return an appropriate colorspace from tc358743_set_fmt When calling tc358743_set_fmt, the code was calling tc358743_get_fmt @@ -308870,10 +308870,10 @@ index 843f341a7eab6..01e255aede504 100644 2.18.4 -From 3ecc6aa60848e1fab027d7ffd547ed76f09371af Mon Sep 17 00:00:00 2001 +From 0b12bc226f1dc5babe139a02d6c2814254013fc2 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 20:51:23 +0200 -Subject: [PATCH 0168/1224] staging: vchiq_arm: Fix platform device +Subject: [PATCH 0168/1225] staging: vchiq_arm: Fix platform device unregistration In error case platform_device_register_data would return an ERR_PTR @@ -308903,10 +308903,10 @@ index d927c67012b0b..006566ae27754 100644 2.18.4 -From 80f6bf34ed362dd2033344f3e20bd05750da0f8f Mon Sep 17 00:00:00 2001 +From d68c6d2da3e14c45b33738974f7fab6aa4fde2c5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 15:48:54 +0000 -Subject: [PATCH 0169/1224] staging: bcm2835-camera: Fix logical continuation +Subject: [PATCH 0169/1225] staging: bcm2835-camera: Fix logical continuation splits Fix checkpatch errors for "Logical continuations should be @@ -308936,10 +308936,10 @@ index e5f651f78441a..d220b20518913 100644 2.18.4 -From 4b19d2b8a8241fabd2637b318db6d7d63c038081 Mon Sep 17 00:00:00 2001 +From 1491e69afba25fb68bebb56fcc6816406a1af2d5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 24 Jul 2018 12:08:29 +0100 -Subject: [PATCH 0170/1224] staging: bcm2835-camera: Ensure timestamps never go +Subject: [PATCH 0170/1225] staging: bcm2835-camera: Ensure timestamps never go backwards. There is an awkward situation with H264 header bytes. Currently @@ -308980,10 +308980,10 @@ index d220b20518913..74b7db3204eca 100644 2.18.4 -From aeade17652a7dafb5b6438a0170afb0dfd994391 Mon Sep 17 00:00:00 2001 +From 9432d2b43b4c31c0f456d94b864df4eba4c67232 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:30:37 +0100 -Subject: [PATCH 0171/1224] staging: vc04_services: Split vchiq-mmal into a +Subject: [PATCH 0171/1225] staging: vc04_services: Split vchiq-mmal into a module In preparation for adding a video codec V4L2 module which also @@ -309294,10 +309294,10 @@ rename to drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h 2.18.4 -From 45151d9292ff559e63897cfa52d5554b0798dbf0 Mon Sep 17 00:00:00 2001 +From 781b31e09a2c42cd01695c1e265cb7f8cfc40ccf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:51:13 +0100 -Subject: [PATCH 0172/1224] staging: mmal-vchiq: Allocate and free components +Subject: [PATCH 0172/1225] staging: mmal-vchiq: Allocate and free components as required The existing code assumed that there would only ever be 4 components, @@ -309409,10 +309409,10 @@ index 47897e81ec586..4e34728d87e53 100644 2.18.4 -From 7eb60781239b6facfe434da4ad4108433780dad5 Mon Sep 17 00:00:00 2001 +From ab1387d1275a09d9fe24d64cc82ee7addb58c235 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 16:20:46 +0000 -Subject: [PATCH 0173/1224] staging: mmal-vchiq: Avoid use of bool in +Subject: [PATCH 0173/1225] staging: mmal-vchiq: Avoid use of bool in structures Fixes up a checkpatch error "Avoid using bool structure members @@ -309440,10 +309440,10 @@ index f619697b09a17..38db20d42e42a 100644 2.18.4 -From 7fdf9845178380bcecfa666dd974e4d43883ad54 Mon Sep 17 00:00:00 2001 +From caf48a255ead9e814e07b15407d7f38e2f64eb05 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:57:09 +0100 -Subject: [PATCH 0174/1224] staging: mmal-vchiq: Make timeout a defined +Subject: [PATCH 0174/1225] staging: mmal-vchiq: Make timeout a defined parameter The timeout period for VPU communications is a useful thing @@ -309485,10 +309485,10 @@ index 38db20d42e42a..9aeb5ac086835 100644 2.18.4 -From 51c6c527285b9dac4a704910e80f5d1b8aaf8791 Mon Sep 17 00:00:00 2001 +From ff7671618dd6845ba050fb0ba42c93bae6110e91 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 17:33:37 +0100 -Subject: [PATCH 0175/1224] staging: mmal-vchiq: Make a mmal_buf struct for +Subject: [PATCH 0175/1225] staging: mmal-vchiq: Make a mmal_buf struct for passing parameters The callback from vchi_mmal to the client was growing lots of extra @@ -309775,10 +309775,10 @@ index 4e34728d87e53..cca7289761c2a 100644 2.18.4 -From 8fc9c4b407612b1d00fbb04a14e30d643703dc24 Mon Sep 17 00:00:00 2001 +From 09530776e15d847fa57aaac09147044239100aac Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:15:38 +0100 -Subject: [PATCH 0176/1224] staging: mmal-vchiq: Add support for event +Subject: [PATCH 0176/1225] staging: mmal-vchiq: Add support for event callbacks. (Preparation for the codec driver). @@ -310144,10 +310144,10 @@ index cca7289761c2a..eeef5ee9467a3 100644 2.18.4 -From adf1d8c00a147d718dbc5fb6e9a1ffbb850cd7b0 Mon Sep 17 00:00:00 2001 +From 9ea8d51642c9ac8dfe7f6902ef5a3d9d42e5a38c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:26:02 +0100 -Subject: [PATCH 0177/1224] staging: vc04_services: Support sending data to +Subject: [PATCH 0177/1225] staging: vc04_services: Support sending data to MMAL ports Add the ability to send data to ports. This only supports @@ -310192,10 +310192,10 @@ index f66d28ed7c840..a75e9fd8cbe1d 100644 2.18.4 -From f68e559ec390d3098a3f67103cd4b93fcf4eb72b Mon Sep 17 00:00:00 2001 +From 0c3098a254b6475804b8be56710eb40f47154a87 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 16:57:40 +0100 -Subject: [PATCH 0178/1224] staging: vc04_services: Fixup vchiq-mmal include +Subject: [PATCH 0178/1225] staging: vc04_services: Fixup vchiq-mmal include ordering There were dependencies on including the headers in the correct @@ -310236,10 +310236,10 @@ index eeef5ee9467a3..7a490f29737ac 100644 2.18.4 -From 9b6ac99313bf768b08749a72183a8f179c8c65fd Mon Sep 17 00:00:00 2001 +From 466eba4d6730ddab28e23cc45cea3513b8af464f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 10:27:11 +0100 -Subject: [PATCH 0179/1224] staging: vc04_services: Add new vc-sm-cma driver +Subject: [PATCH 0179/1225] staging: vc04_services: Add new vc-sm-cma driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -313453,10 +313453,10 @@ index 0000000000000..107460ad1be34 2.18.4 -From c07cc02356c1620e143a23e939fdf97a318765ad Mon Sep 17 00:00:00 2001 +From d4a1159432b5ccf7badb3818a6aeeeefe8bb0870 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 16:07:55 +0100 -Subject: [PATCH 0180/1224] staging: vc04_services: Use vc-sm-cma to support +Subject: [PATCH 0180/1225] staging: vc04_services: Use vc-sm-cma to support zero copy With the vc-sm-cma driver we can support zero copy of buffers between @@ -313642,10 +313642,10 @@ index 7a490f29737ac..ae6c69ba16ee9 100644 2.18.4 -From 8a6cdbe4916b8b7bcfebb01ca6fe0a4a0a1e98e9 Mon Sep 17 00:00:00 2001 +From 49f932b1752614f5786d3fb13e2f2b1daabcf40f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 17:57:45 +0000 -Subject: [PATCH 0181/1224] media: videobuf2: Allow exporting of a struct +Subject: [PATCH 0181/1225] media: videobuf2: Allow exporting of a struct dmabuf videobuf2 only allowed exporting a dmabuf as a file descriptor, @@ -313734,10 +313734,10 @@ index 640aabe69450c..d86d888247a15 100644 2.18.4 -From 532edfe81989132448132304d71ffe3d71022423 Mon Sep 17 00:00:00 2001 +From 93f67fb054623d35088fb178cea3da57757788d0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 14:53:49 +0100 -Subject: [PATCH 0182/1224] staging: vc04_services: Add a V4L2 M2M codec driver +Subject: [PATCH 0182/1225] staging: vc04_services: Add a V4L2 M2M codec driver This adds a V4L2 memory to memory device that wraps the MMAL video decode and video_encode components for H264 and MJPEG encode @@ -316221,10 +316221,10 @@ index 0000000000000..4e4e4fb69ade1 2.18.4 -From c1ec8624f91d6fda06afe99ab3c33199b324f3a7 Mon Sep 17 00:00:00 2001 +From a79e0dd8c94bbd0d0194a646113492cfe6b50e5b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 22 Jan 2019 12:04:09 +0000 -Subject: [PATCH 0183/1224] staging: mmal-vchiq: Fix client_component for 64 +Subject: [PATCH 0183/1225] staging: mmal-vchiq: Fix client_component for 64 bit kernel The MMAL client_component field is used with the event @@ -316297,10 +316297,10 @@ index ae6c69ba16ee9..247521fbcc1d8 100644 2.18.4 -From ff8637fd8bfcc8031e859c5e91282a654096ba74 Mon Sep 17 00:00:00 2001 +From c013b962ea762257ecd4f236a0045565a4c25b84 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 15:09:28 +0000 -Subject: [PATCH 0184/1224] clk: clk-bcm2835: Use %zd when printing size_t +Subject: [PATCH 0184/1225] 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". @@ -316327,10 +316327,10 @@ index db1df40271c08..d4bf9e376318c 100644 2.18.4 -From d8fa4529efa0ec84ecb2ae73c974435a295ccb05 Mon Sep 17 00:00:00 2001 +From 4355d7cfd85deb034ad74c8e7f02ac41d0d515b5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Sep 2018 11:08:51 +0100 -Subject: [PATCH 0185/1224] media: ov5647: Use gpiod_set_value_cansleep +Subject: [PATCH 0185/1225] 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 @@ -316387,10 +316387,10 @@ index 8a1a515388e0e..07550377be2ef 100644 2.18.4 -From 6df7261e8fae11d6f458bffa4c7e7818d8e298e3 Mon Sep 17 00:00:00 2001 +From bc19c33d70d357fa5d2cc33d8de823c336680e12 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 16:40:01 +0000 -Subject: [PATCH 0186/1224] staging: bcm2835-codec: variable vb2 may be used +Subject: [PATCH 0186/1225] staging: bcm2835-codec: variable vb2 may be used uninitialised In op_buffer_cb, the failure path checked whether there was @@ -316430,10 +316430,10 @@ index 4e4e4fb69ade1..4ef16379f2161 100644 2.18.4 -From 7d8b8741f952e1b9e6b4f1b5deedd2875118af70 Mon Sep 17 00:00:00 2001 +From b891b294918d32649888fde5409a261c8d8ba38c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 16:36:19 +0000 -Subject: [PATCH 0187/1224] staging: bcm2835-codec: Fix potentially +Subject: [PATCH 0187/1225] staging: bcm2835-codec: Fix potentially uninitialised vars src_m2m_buf and dst_m2m_buf were printed in log messages @@ -316461,10 +316461,10 @@ index 4ef16379f2161..c26760faae2d6 100644 2.18.4 -From 0f4d69e310db5516c0f10ca70bd2f3cdb29a8a5a Mon Sep 17 00:00:00 2001 +From b92c47aa1a468b9decf930ac03b09181bba4cd0e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:33:29 +0000 -Subject: [PATCH 0188/1224] staging: mmal_vchiq: Add in the Bayer encoding +Subject: [PATCH 0188/1225] staging: mmal_vchiq: Add in the Bayer encoding formats The list of formats was copied before Bayer support was added. @@ -316518,10 +316518,10 @@ index 2be9941a1f30e..44ba91aa6d479 100644 2.18.4 -From 4d7dd255d214f9a2b472064f10367d6e437854d8 Mon Sep 17 00:00:00 2001 +From 9a17fc820766744bec70c67ddf2084c05eac7bfb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:36:56 +0000 -Subject: [PATCH 0189/1224] staging: mmal-vchiq: Always return the param size +Subject: [PATCH 0189/1225] staging: mmal-vchiq: Always return the param size from param_get mmal-vchiq is a reimplementation of the userland library for MMAL. @@ -316562,10 +316562,10 @@ index 9416cbeae3a34..59a4d24140693 100644 2.18.4 -From 87dd677addb930cd6e74cb40500ac819070216d6 Mon Sep 17 00:00:00 2001 +From 8ba511ac85b3fbce22eee1115da791da6243e6bb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:51:03 +0000 -Subject: [PATCH 0190/1224] staging: mmal-vchiq: If the VPU returns an error, +Subject: [PATCH 0190/1225] staging: mmal-vchiq: If the VPU returns an error, don't negate it There is an enum for the errors that the VPU can return. @@ -316597,10 +316597,10 @@ index 59a4d24140693..cfc861d0a214e 100644 2.18.4 -From 77a2d720ddfd1ac4f7515c811c9f1f7bc410d178 Mon Sep 17 00:00:00 2001 +From 56d7d9d5397cab275af7b955ab411dc39922a7fe Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 13:44:00 +0000 -Subject: [PATCH 0191/1224] staging: bcm2835_codec: Query supported formats +Subject: [PATCH 0191/1225] staging: bcm2835_codec: Query supported formats from the component The driver was previously working with hard coded tables of @@ -317330,10 +317330,10 @@ index c26760faae2d6..7b8de26ca43b5 100644 2.18.4 -From 8358d51e8f106a12db5c752fc1483a845147d1ee Mon Sep 17 00:00:00 2001 +From ecc6c3ed914ba238310eb13d54fcabcf701461fd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 14:07:52 +0000 -Subject: [PATCH 0192/1224] staging: bcm2835_codec: Add support for the ISP as +Subject: [PATCH 0192/1225] staging: bcm2835_codec: Add support for the ISP as an M2M device The MMAL ISP component can also use this same V4L2 wrapper to @@ -317720,10 +317720,10 @@ index 7b8de26ca43b5..f9fd5e8ac9141 100644 2.18.4 -From 8c1bbd67a9eccacd6838eb1eb7de2c92c166ae9f Mon Sep 17 00:00:00 2001 +From 45f397f903b7c3a34a00ad4080221a9cdceeca8f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 Feb 2019 11:36:14 +0000 -Subject: [PATCH 0193/1224] staging: bcm2835_codec: Add an option for ignoring +Subject: [PATCH 0193/1225] staging: bcm2835_codec: Add an option for ignoring Bayer formats. This is a workaround for GStreamer currently not identifying Bayer @@ -317905,10 +317905,10 @@ index f9fd5e8ac9141..5141034835ca9 100644 2.18.4 -From 24b548ecc9e794b5285826982f76b78fbff770be Mon Sep 17 00:00:00 2001 +From 0a7c369baea5059758d5a2949181537919e27771 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 Feb 2019 11:38:45 +0000 -Subject: [PATCH 0194/1224] staging: bcm2835_codec: Fix handling of +Subject: [PATCH 0194/1225] staging: bcm2835_codec: Fix handling of VB2_MEMORY_DMABUF buffers If the queue is configured as VB2_MEMORY_DMABUF then vb2_core_expbuf @@ -318101,10 +318101,10 @@ index 247521fbcc1d8..0a75c96f6d586 100644 2.18.4 -From 27ae3de4c0c6756a88f2114b38517b2590e09799 Mon Sep 17 00:00:00 2001 +From 6d363b9cd0f2b2380f5f0497f50dc8e5b2a9a277 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 18 Feb 2019 15:52:29 +0000 -Subject: [PATCH 0195/1224] staging: mmal-vchiq: Update mmal_parameters.h with +Subject: [PATCH 0195/1225] staging: mmal-vchiq: Update mmal_parameters.h with recently defined params mmal_parameters.h hasn't been updated to reflect additions made @@ -318163,10 +318163,10 @@ index 80a99128f5f3e..926392d754c76 100644 2.18.4 -From 2640015b72431485693d201ebea46127cda2eaa0 Mon Sep 17 00:00:00 2001 +From e2d023ad7ddfcf6e170b49ee5af821ec653a576b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 18 Feb 2019 15:56:42 +0000 -Subject: [PATCH 0196/1224] staging: bcm2835_codec: Include timing info in SPS +Subject: [PATCH 0196/1225] staging: bcm2835_codec: Include timing info in SPS headers Inserting timing information into the VUI block of the SPS is @@ -318213,10 +318213,10 @@ index 67d42bf6251b1..eb5c07bc73d06 100644 2.18.4 -From e686b70949411ae252f7b8bbdc4da98612d78243 Mon Sep 17 00:00:00 2001 +From 164ecbc03203b6b23dfaf510386cd69aad77d7f4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Mar 2019 17:55:09 +0000 -Subject: [PATCH 0197/1224] staging: bcm2835-codec: NULL component handle on +Subject: [PATCH 0197/1225] staging: bcm2835-codec: NULL component handle on queue_setup failure queue_setup tries creating the relevant MMAL component and configures @@ -318278,10 +318278,10 @@ index eb5c07bc73d06..ad555ceb8f63e 100644 2.18.4 -From 6232c66559be282223876d04b15fc297bacd7277 Mon Sep 17 00:00:00 2001 +From 27839895494f7efe2caa3b558c0ce1d5777093ee Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 11:26:00 +0000 -Subject: [PATCH 0198/1224] staging: bcm2835_codec: Clean up logging on +Subject: [PATCH 0198/1225] staging: bcm2835_codec: Clean up logging on unloading the driver The log line was missing a closing \n, so wasn't added to the @@ -318333,10 +318333,10 @@ index ad555ceb8f63e..837fbec5ab4f8 100644 2.18.4 -From 872ca7af45883d7726313387108b058d9638167c Mon Sep 17 00:00:00 2001 +From 4c189c7828e247d4e01b22f9b7d12c1dacf36d96 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 20 Mar 2019 10:06:51 +0000 -Subject: [PATCH 0199/1224] staging: bcm2835-codec: Refactor default resolution +Subject: [PATCH 0199/1225] staging: bcm2835-codec: Refactor default resolution code The default resolution code was different for each role @@ -318493,10 +318493,10 @@ index 837fbec5ab4f8..4b67c9ea73e13 100644 2.18.4 -From dabe62b9f4695f52f931c35812c9609a4bd3ec10 Mon Sep 17 00:00:00 2001 +From 4dcc300c8edaba2d969be6fd1ca364a3cda7ed9a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 14:30:24 +0100 -Subject: [PATCH 0200/1224] staging: bcm2835-codec: Correct port width calc for +Subject: [PATCH 0200/1225] staging: bcm2835-codec: Correct port width calc for truncation The calculation converting from V4L2 bytesperline to MMAL @@ -318528,10 +318528,10 @@ index 4b67c9ea73e13..97b1f2b953eca 100644 2.18.4 -From 35454cbe531c1ceecf0954a7eb42698481993549 Mon Sep 17 00:00:00 2001 +From 25311318ef57fab7c56c2ed8f4ebd7d1c144dc8d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 14:32:21 +0100 -Subject: [PATCH 0201/1224] staging: bcm2835-codec: Remove height padding for +Subject: [PATCH 0201/1225] staging: bcm2835-codec: Remove height padding for ISP role The ISP has no need for heights to be a multiple of macroblock @@ -318595,10 +318595,10 @@ index 97b1f2b953eca..22588f78287e5 100644 2.18.4 -From 67b275f34074106b28f9ec3058ac0295c355d806 Mon Sep 17 00:00:00 2001 +From 483ec1a51b9ef11c7ca0bff2de792c7a8712a357 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 May 2019 13:27:23 +0100 -Subject: [PATCH 0202/1224] staging: mmal-vchiq: Free the event context for +Subject: [PATCH 0202/1225] staging: mmal-vchiq: Free the event context for control ports vchiq_mmal_component_init calls init_event_context for the @@ -318629,10 +318629,10 @@ index 2018c28daf686..4d9d7beb91446 100644 2.18.4 -From db6dfe1808eabf268d0e0a8586b72a68518d5113 Mon Sep 17 00:00:00 2001 +From e86c53d7082a36ea2e78b7afdaa41c30b4d09cdf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 15:50:01 +0100 -Subject: [PATCH 0203/1224] staging: mmal-vchiq: Fix memory leak in error path +Subject: [PATCH 0203/1225] staging: mmal-vchiq: Fix memory leak in error path On error, vchiq_mmal_component_init could leave the event context allocated for ports. @@ -318711,10 +318711,10 @@ index 4d9d7beb91446..61a3593cdcfc3 100644 2.18.4 -From 3ba606d5a329294a1c9ab82f5259996e1918c1cf Mon Sep 17 00:00:00 2001 +From c6ddb5f58810fce2d940f87224ea82f4cdf8c732 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2019 14:11:58 +0100 -Subject: [PATCH 0204/1224] staging: bcm2835-codec: Convert V4L2 nsec +Subject: [PATCH 0204/1225] staging: bcm2835-codec: Convert V4L2 nsec timestamps to MMAL usec V4L2 uses nsecs, whilst MMAL uses usecs, but the code wasn't converting @@ -318763,10 +318763,10 @@ index 22588f78287e5..5c7fc39cd9218 100644 2.18.4 -From 761a1009d4bdd05cd7917a6343b1aecd6e4db3de Mon Sep 17 00:00:00 2001 +From e43acaa45f2a816753c0e35eaddd89dcb756885e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2019 14:13:11 +0100 -Subject: [PATCH 0205/1224] staging: bcm2835-codec: Add support for setting +Subject: [PATCH 0205/1225] staging: bcm2835-codec: Add support for setting S_PARM and G_PARM Video encode can use the frame rate for rate control calculations, @@ -318887,10 +318887,10 @@ index 5c7fc39cd9218..708f76b7aa92b 100644 2.18.4 -From 8d8e7bbb00d917c43f2a7d5435e3c42dcec11049 Mon Sep 17 00:00:00 2001 +From e88d1382e5b2b9b03a7654a9cdc3ff681f8ffe95 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Jun 2019 17:15:05 +0100 -Subject: [PATCH 0206/1224] w1: w1-gpio: Make GPIO an output for strong pullup +Subject: [PATCH 0206/1225] 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 @@ -318920,10 +318920,10 @@ index d4632aace4022..4832cd8c2596a 100644 2.18.4 -From c8511e3ed09babfc67c5ecb3eee47cecc012e7bf Mon Sep 17 00:00:00 2001 +From 9300850858b0dcd31ff2bc1767333592c2c0a567 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 Feb 2019 08:49:39 +0000 -Subject: [PATCH 0207/1224] arm: bcm2835: Fix FIQ early ioremap +Subject: [PATCH 0207/1225] arm: bcm2835: Fix FIQ early ioremap The ioremapping creates mappings within the vmalloc area. The equivalent early function, create_mapping, now checks that the @@ -318999,10 +318999,10 @@ index 9b6c921106b56..9bd9842da59fa 100644 2.18.4 -From f970ad445dc60cf7fcb3c279995b7ccc33a9b2b0 Mon Sep 17 00:00:00 2001 +From 040bb1bc83ac8afe815a17e5b38693126ff60b70 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 14 Mar 2019 10:16:02 +0000 -Subject: [PATCH 0208/1224] Fix copy_from_user if BCM2835_FAST_MEMCPY=n +Subject: [PATCH 0208/1225] Fix copy_from_user if BCM2835_FAST_MEMCPY=n The change which introduced CONFIG_BCM2835_FAST_MEMCPY unconditionally changed the behaviour of arm_copy_from_user. The page pinning code @@ -319044,10 +319044,10 @@ index 296c2985ac176..ab150e8281f3e 100644 2.18.4 -From a2e24fd800aabf198333e2281eea1a252f547f0d Mon Sep 17 00:00:00 2001 +From f11e7d76653690c04a905840c470ee1ffa92920f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0209/1224] PCI: brcmstb: Add Broadcom STB PCIe host controller +Subject: [PATCH 0209/1225] PCI: brcmstb: Add Broadcom STB PCIe host controller driver This commit adds the basic Broadcom STB PCIe controller. Missing is @@ -320245,10 +320245,10 @@ index 0000000000000..d922906790671 2.18.4 -From 5cf6f8ad04fa4aff282cffab326544a46fb51588 Mon Sep 17 00:00:00 2001 +From 42f46d467dd4ee310cbf1a2132afbd2836ab185b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0210/1224] PCI: brcmstb: Add dma-range mapping for inbound +Subject: [PATCH 0210/1225] PCI: brcmstb: Add dma-range mapping for inbound traffic The Broadcom STB PCIe host controller is intimately related to the @@ -320820,10 +320820,10 @@ index babef9191e88c..27bcf83c99d7e 100644 2.18.4 -From 6b48f56646a3a662f3750092a1fc22f3e4c4eb04 Mon Sep 17 00:00:00 2001 +From 1abcbd041d8e4236e053eea1906ad6b788d94029 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0211/1224] PCI: brcmstb: Add MSI capability +Subject: [PATCH 0211/1225] PCI: brcmstb: Add MSI capability This commit adds MSI to the Broadcom STB PCIe host controller. It does not add MSIX since that functionality is not in the HW. The MSI @@ -321369,10 +321369,10 @@ index 27bcf83c99d7e..b028d4be81a23 100644 2.18.4 -From 76091ef33e9f902f70619eb693aa64614969e93a Mon Sep 17 00:00:00 2001 +From 4115097402829fcf07435ec4674a6522851a0830 Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 15 Jan 2018 18:28:39 -0500 -Subject: [PATCH 0212/1224] dt-bindings: pci: Add DT docs for Brcmstb PCIe +Subject: [PATCH 0212/1225] dt-bindings: pci: Add DT docs for Brcmstb PCIe device The DT bindings description of the Brcmstb PCIe device is described. This @@ -321454,10 +321454,10 @@ index 0000000000000..a1a9ad5e70cab 2.18.4 -From ffcc2c70823bbf058467973515512d95af618948 Mon Sep 17 00:00:00 2001 +From 66e28056fbfa164a41fc910e335f4ad94c6b3134 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0213/1224] pcie-brcmstb: Changes for BCM2711 +Subject: [PATCH 0213/1225] pcie-brcmstb: Changes for BCM2711 The initial brcmstb PCIe driver - originally taken from the V3(?) patch set - has been modified significantly for the BCM2711. @@ -322903,10 +322903,10 @@ index 0000000000000..254783d1065f7 2.18.4 -From e55872c077f8f0e01ceacddda9610ec698e391f8 Mon Sep 17 00:00:00 2001 +From 46ba27d0dc107da012d1ccf27bc5c48909b3f119 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 May 2019 15:47:42 +0100 -Subject: [PATCH 0214/1224] arm: bcm2835: DMA can only address 1GB +Subject: [PATCH 0214/1225] 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. @@ -322934,10 +322934,10 @@ index 9bd9842da59fa..7d59a93641757 100644 2.18.4 -From 8ff9e19fd952805ca992097ad2479af7ce6f408d Mon Sep 17 00:00:00 2001 +From 07b7370db44b13b4424b3a7ef30733dca25f9eba Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Sep 2018 16:24:05 +0100 -Subject: [PATCH 0215/1224] mmc: sdhci: Mask "spurious" interrupts +Subject: [PATCH 0215/1225] mmc: sdhci: Mask "spurious" interrupts Add a filter for "spurious" Transfer Complete interrupts, attempting to make it as specific as possible: @@ -322969,10 +322969,10 @@ index a1aeb2e105641..c140c8dfd56ef 100644 2.18.4 -From 470b66533832fc2f52a7f3d1ab236a8b3968e39c Mon Sep 17 00:00:00 2001 +From 4e0a7a579845b6fe6a93998ba84d2bea12949ca6 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 4 May 2019 17:06:15 +0200 -Subject: [PATCH 0216/1224] hwrng: iproc-rng200: Add BCM2838 support +Subject: [PATCH 0216/1225] 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. @@ -323135,10 +323135,10 @@ index 92be1c0ab99f3..f971a4cb8951c 100644 2.18.4 -From 587261299e991de4be5c4631e26ac857d119add0 Mon Sep 17 00:00:00 2001 +From 3e149f99eb8d649a40c771e4864412a38aeec393 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 18 May 2019 12:26:11 +0200 -Subject: [PATCH 0217/1224] thermal: brcmstb_thermal: Add BCM2838 support +Subject: [PATCH 0217/1225] thermal: brcmstb_thermal: Add BCM2838 support The BCM2838 has an AVS TMON hardware block. This adds the necessary support to the brcmstb_thermal driver ( no trip handling ). @@ -323295,10 +323295,10 @@ index 680f1a0706065..7a7c6ad7b8a04 100644 2.18.4 -From aaf3fe2045d950f710ef1382028f1a26b44a2ec7 Mon Sep 17 00:00:00 2001 +From 68edd9d5e056dcc29bfa0f82e5541d4cc0b61be8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 1 Nov 2018 17:31:37 +0000 -Subject: [PATCH 0218/1224] vchiq: Add 36-bit address support +Subject: [PATCH 0218/1225] 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 @@ -323501,17 +323501,17 @@ index b424323e96134..5448918f0f364 100644 2.18.4 -From 609f22e830d3ecada941639f864dfd58948752de Mon Sep 17 00:00:00 2001 +From 7f13ae34269fc780d231141f54a01a4fe84814ed Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 30 Apr 2019 19:15:30 +0100 -Subject: [PATCH 0219/1224] bcm2835-pcm.c: Support multichannel audio +Subject: [PATCH 0219/1225] bcm2835-pcm.c: Support multichannel audio --- .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c -index 826016c3431a1..e4603ba742e45 100644 +index 8708f97b46f3a..db889f6da395b 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c @@ -14,9 +14,9 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_hw = { @@ -323553,10 +323553,10 @@ index 826016c3431a1..e4603ba742e45 100644 2.18.4 -From cb1d05f8905b3fecc90f95100190abe9bd551575 Mon Sep 17 00:00:00 2001 +From b5985b071c3eec021776847eae1ceef6e5054ad0 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 12 Sep 2018 14:44:53 +0100 -Subject: [PATCH 0220/1224] bcmgenet: constrain max DMA burst length +Subject: [PATCH 0220/1225] bcmgenet: constrain max DMA burst length --- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +- @@ -323579,10 +323579,10 @@ index 5b7c2f9241d0f..e59f53c582ca5 100644 2.18.4 -From 354fd4c6d65cbb896adec4cc3769f260ea5f0b4b Mon Sep 17 00:00:00 2001 +From d199f169f1d04d60bc9193535dbc1ae61daf5194 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 27 Mar 2019 13:45:46 +0000 -Subject: [PATCH 0221/1224] bcmgenet: Better coalescing parameter defaults +Subject: [PATCH 0221/1225] bcmgenet: Better coalescing parameter defaults Set defaults for TX and RX packet coalescing to be equivalent to: @@ -323628,10 +323628,10 @@ index b27da024aa9d9..8cd9d5a9e7f5b 100644 2.18.4 -From bd27cb29a13afafb17ed853404a832952dcdcd65 Mon Sep 17 00:00:00 2001 +From 86130345a73e0c653966113579a7f16cf5fa5f14 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:17:59 +0100 -Subject: [PATCH 0222/1224] net: genet: enable link energy detect powerdown for +Subject: [PATCH 0222/1225] net: genet: enable link energy detect powerdown for external PHYs There are several warts surrounding bcmgenet_mii_probe() as this @@ -323665,10 +323665,10 @@ index dbe18cdf6c1b8..3ba7332957186 100644 2.18.4 -From 9fdc070ec7f8e31615e7adc2f51d1c5f5dea6c69 Mon Sep 17 00:00:00 2001 +From c5fd4ea0eb6f023bff5e66fc36411e8c630314d6 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:00:41 +0100 -Subject: [PATCH 0223/1224] phy: broadcom: split out the BCM54213PE from the +Subject: [PATCH 0223/1225] phy: broadcom: split out the BCM54213PE from the BCM54210E IDs The last nibble is a revision ID, and the 54213pe is a later rev @@ -323743,10 +323743,10 @@ index 6db2d9a6e5031..bfb37218f435c 100644 2.18.4 -From 4432abd93bb92306f0ff1bf8fe8e5854476c3c16 Mon Sep 17 00:00:00 2001 +From 8c6d285a3f1a4077dc57116e044578e5c147bded Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Fri, 17 May 2019 13:31:21 +0100 -Subject: [PATCH 0224/1224] phy: bcm54213pe: configure the LED outputs to be +Subject: [PATCH 0224/1225] phy: bcm54213pe: configure the LED outputs to be more user-friendly The default state was both LEDs indicating link speed. @@ -323815,10 +323815,10 @@ index bfb37218f435c..d7ebafbb32218 100644 2.18.4 -From 5d24b76ed6b8346f5e04e4bc770d5202edd3f2c8 Mon Sep 17 00:00:00 2001 +From a72ed12c6acf00f5ff2a71b04dfcf0fedd2d2447 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 22 Mar 2019 09:47:14 +0000 -Subject: [PATCH 0225/1224] usb: xhci: Disable the XHCI 5 second timeout +Subject: [PATCH 0225/1225] 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 @@ -323832,7 +323832,7 @@ on the first boot. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index 70aa3055c41e7..3b4e5b7798952 100644 +index 91330517444e7..f7be9267130f5 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -196,8 +196,9 @@ int xhci_reset(struct xhci_hcd *xhci) @@ -323850,10 +323850,10 @@ index 70aa3055c41e7..3b4e5b7798952 100644 2.18.4 -From 21df0da44969cec04b1bcdd59ff14947f8690dd9 Mon Sep 17 00:00:00 2001 +From febe72daa726f1600d56a7f2b53881e318b99d47 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 23 May 2019 15:08:30 +0100 -Subject: [PATCH 0226/1224] usb: xhci: Show that the VIA VL805 supports LPM +Subject: [PATCH 0226/1225] usb: xhci: Show that the VIA VL805 supports LPM Signed-off-by: Phil Elwell --- @@ -323879,10 +323879,10 @@ index d08b0079eecb1..e7fecc34aaa13 100644 2.18.4 -From f7f5bd3a7fe9e068900ccdca35c05b069b46da72 Mon Sep 17 00:00:00 2001 +From f8f0ecbe1a4d032ee2dba6b6e654474698732fae Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Mon, 13 May 2019 11:05:27 +0000 -Subject: [PATCH 0227/1224] spi: bcm2835: enable shared interrupt support +Subject: [PATCH 0227/1225] spi: bcm2835: enable shared interrupt support Add shared interrupt support for this driver. @@ -323920,10 +323920,10 @@ index b5efa2236b614..7ac3563f458b1 100644 2.18.4 -From 78b28b1186f8b382464acccde2d1eaca0b957bbd Mon Sep 17 00:00:00 2001 +From af6e5153fc6d3ed59c42afe55b950f99a22cacf2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 23 Jan 2019 16:11:50 +0000 -Subject: [PATCH 0228/1224] clk-bcm2835: Don't wait for pllh lock +Subject: [PATCH 0228/1225] clk-bcm2835: Don't wait for pllh lock Signed-off-by: Phil Elwell --- @@ -323964,10 +323964,10 @@ index d4bf9e376318c..b83a963eceab6 100644 2.18.4 -From 76b65133205978df0d2c5f905dfa7ae4bc765821 Mon Sep 17 00:00:00 2001 +From d308cd601a10755070e697bdbca8cc7bfc9ebf63 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 11 Jan 2019 17:31:07 -0800 -Subject: [PATCH 0229/1224] soc: bcm: bcm2835-pm: Add support for 2711. +Subject: [PATCH 0229/1225] 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 @@ -324076,10 +324076,10 @@ index ed37dc40e82a8..b2d157091e12b 100644 2.18.4 -From f4ad6cfbac46d22ca9fe9cc20e85cd797a877049 Mon Sep 17 00:00:00 2001 +From 36f8bd94ee17d3dd07f0c6bdaa3b3880811782c6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Sep 2018 11:50:25 +0100 -Subject: [PATCH 0230/1224] config: Permit LPAE and PCIE_BRCMSTB on BCM2835 +Subject: [PATCH 0230/1225] config: Permit LPAE and PCIE_BRCMSTB on BCM2835 --- arch/arm/mach-bcm/Kconfig | 4 ++++ @@ -324128,10 +324128,10 @@ index e57bbd0ec9a71..650b3b56153cb 100644 2.18.4 -From 2cf771b9883f85bc43596041747614698edb983c Mon Sep 17 00:00:00 2001 +From ce30dd36e003d798f9e66cf758ca53cdd2e2150d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:11:05 -0700 -Subject: [PATCH 0231/1224] clk: bcm2835: Add support for setting leaf clock +Subject: [PATCH 0231/1225] 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 @@ -324187,10 +324187,10 @@ index b83a963eceab6..47ead0f239d68 100644 2.18.4 -From d91672c18c85221e6a26c88d79c94c8d270d3fe4 Mon Sep 17 00:00:00 2001 +From c7db1ebf7596cdac3559d540deea928626c00545 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:24:04 -0700 -Subject: [PATCH 0232/1224] clk: bcm2835: Allow reparenting leaf clocks while +Subject: [PATCH 0232/1225] clk: bcm2835: Allow reparenting leaf clocks while they're running. This falls under the same "we can reprogram glitch-free as long as we @@ -324264,10 +324264,10 @@ index 47ead0f239d68..079748e686863 100644 2.18.4 -From 0de024a4df4de0c6ec02980fa793db24a39672c9 Mon Sep 17 00:00:00 2001 +From 9c10d5f8470df73d50403025396e89a7e5635b76 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 10:55:00 +0100 -Subject: [PATCH 0233/1224] usb: add plumbing for updating interrupt endpoint +Subject: [PATCH 0233/1225] usb: add plumbing for updating interrupt endpoint interval state xHCI caches device and endpoint data after the interface is configured, @@ -324380,10 +324380,10 @@ index 712b2a603645f..879b59e4f013c 100644 2.18.4 -From 4a80b5cec54b4593eaec9dcb47b5770247c3f0da Mon Sep 17 00:00:00 2001 +From 22f0727c759a3028a89e62ada099508e21041907 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:33:39 +0100 -Subject: [PATCH 0234/1224] xhci: implement xhci_fixup_endpoint for interval +Subject: [PATCH 0234/1225] xhci: implement xhci_fixup_endpoint for interval adjustments Must be called in a non-atomic context, after the endpoint @@ -324396,7 +324396,7 @@ Signed-off-by: Jonathan Bell 1 file changed, 98 insertions(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index 3b4e5b7798952..3fbbb2a33eeb5 100644 +index f7be9267130f5..8c7ab53e296d7 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1455,6 +1455,103 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, @@ -324515,10 +324515,10 @@ index 3b4e5b7798952..3fbbb2a33eeb5 100644 2.18.4 -From b0d81f77786f0551f667bbc0834515ac6d0c3e50 Mon Sep 17 00:00:00 2001 +From bea80db52cdca3a7654bba02c402d58c2f6919ff Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:42:03 +0100 -Subject: [PATCH 0235/1224] usbhid: call usb_fixup_endpoint after mangling +Subject: [PATCH 0235/1225] usbhid: call usb_fixup_endpoint after mangling intervals Lets the mousepoll override mechanism work with xhci. @@ -324544,10 +324544,10 @@ index ce8ef69307951..4b73a15fdfae3 100644 2.18.4 -From 04a2c43efcdd45965fd41216d33d32fbc34b06c8 Mon Sep 17 00:00:00 2001 +From ffc48c27eb0b1ac382a14e3bb901a452f5229083 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 11 Jun 2019 17:38:28 +0100 -Subject: [PATCH 0236/1224] arm: bcm2835: Add bcm2838 compatible string. +Subject: [PATCH 0236/1225] arm: bcm2835: Add bcm2838 compatible string. Signed-off-by: Phil Elwell --- @@ -324570,10 +324570,10 @@ index 7d59a93641757..282a023027fc0 100644 2.18.4 -From 4d2dd36d523843e9874001e0433a1e4fd5f7b054 Mon Sep 17 00:00:00 2001 +From 75fe27eda0b1947e3ae6f85cb27d4220eb680371 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 4 Mar 2019 11:59:34 -0800 -Subject: [PATCH 0237/1224] drm/vc4: Fix oops at boot with firmwarekms on 4.19. +Subject: [PATCH 0237/1225] drm/vc4: Fix oops at boot with firmwarekms on 4.19. Signed-off-by: Eric Anholt --- @@ -324598,10 +324598,10 @@ index 57124fe942472..92aafec3d57af 100644 2.18.4 -From 87ef1c06ad74309a547c2e14aea3730887444623 Mon Sep 17 00:00:00 2001 +From 1f44a20c3040daf421ace7581875c829ee1407f7 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 4 Oct 2018 17:22:43 -0700 -Subject: [PATCH 0238/1224] drm/v3d: Add support for 2711. +Subject: [PATCH 0238/1225] drm/v3d: Add support for 2711. Signed-off-by: Eric Anholt --- @@ -324624,10 +324624,10 @@ index 3506ae2723ae1..cb60018f799ea 100644 2.18.4 -From 2baea522b86491ddd5466f6cfef42d834142988f Mon Sep 17 00:00:00 2001 +From 40fb642c0d83bf28d70cdff042ea4c4204618002 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 12:35:43 -0800 -Subject: [PATCH 0239/1224] drm/v3d: Skip MMU flush if the device is currently +Subject: [PATCH 0239/1225] 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 @@ -324682,10 +324682,10 @@ index 395e81d971632..6cc67cab320ea 100644 2.18.4 -From 4b1b618989ba45a0541f7e173a9e5940dec8ee3e Mon Sep 17 00:00:00 2001 +From 94eca318ab845a3c7ed8c68fc4f3a146639f9c9a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 14:47:57 -0800 -Subject: [PATCH 0240/1224] drm/v3d: Hook up the runtime PM ops. +Subject: [PATCH 0240/1225] 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 @@ -324722,10 +324722,10 @@ index cb60018f799ea..d225152e7e36e 100644 2.18.4 -From c98d45550461016cbaa0a078bf5cd7aae98bec17 Mon Sep 17 00:00:00 2001 +From d1618fff13457f2cb767ec8201f0b4fef2843073 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 28 Mar 2019 11:58:51 -0700 -Subject: [PATCH 0241/1224] drm/vc4: Fix synchronization firmwarekms against GL +Subject: [PATCH 0241/1225] drm/vc4: Fix synchronization firmwarekms against GL rendering. We would present the framebuffer immediately without waiting for @@ -324772,10 +324772,10 @@ index 85e273665836d..ee0e6afa211b9 100644 2.18.4 -From 39cfcfc1e9041bf8969f5ceea928f61dc29680b9 Mon Sep 17 00:00:00 2001 +From 95b238c71aea6ff0e9c727b52f2cf781298429e9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 18 Mar 2019 16:38:32 -0700 -Subject: [PATCH 0242/1224] drm/vc4: Expose the format modifiers for firmware +Subject: [PATCH 0242/1225] drm/vc4: Expose the format modifiers for firmware kms. This should technically not expose VC4_T_TILED on pi4. However, if we @@ -324858,10 +324858,10 @@ index ee0e6afa211b9..93bf71f983139 100644 2.18.4 -From d587c84236a2fec92319d64cc1bb3c09320aa7b6 Mon Sep 17 00:00:00 2001 +From a39854d74d259837ac061ecd477f03c30b7e61db Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Apr 2019 13:29:00 -0700 -Subject: [PATCH 0243/1224] drm/vc4: Fix vblank timestamping for firmwarekms. +Subject: [PATCH 0243/1225] drm/vc4: Fix vblank timestamping for firmwarekms. The core doesn't expect a false return from the scanoutpos function in normal usage, so we were doing the precise vblank timestamping path @@ -324919,10 +324919,10 @@ index 93bf71f983139..eb5eb67b70f5d 100644 2.18.4 -From 443238af3a7850486c9e32e0cae1eac5983abdfb Mon Sep 17 00:00:00 2001 +From 7166cf878d2b5757113b1220004b6db9591a7d28 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 26 Mar 2019 14:43:06 +0000 -Subject: [PATCH 0244/1224] gpu: vc4-fkms: Switch to the newer mailbox frame +Subject: [PATCH 0244/1225] gpu: vc4-fkms: Switch to the newer mailbox frame buffer API. The old mailbox FB API was ideally deprecated but still used by @@ -325104,10 +325104,10 @@ index eb5eb67b70f5d..512036c82db0a 100644 2.18.4 -From 187aa19300df18144a895578bb9174e8022199c7 Mon Sep 17 00:00:00 2001 +From ba90d78a01f6c1670d7e07221b3c97169c7d22e0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 27 Mar 2019 17:45:01 +0000 -Subject: [PATCH 0245/1224] drm: vc4: Add an overlay plane to vc4-firmware-kms +Subject: [PATCH 0245/1225] drm: vc4: Add an overlay plane to vc4-firmware-kms This uses a new API that is exposed via the mailbox service to stick an element straight on the screen using DispmanX. @@ -325970,10 +325970,10 @@ index 9c6027fc25dae..f0c15eefa3aa2 100644 2.18.4 -From eff1059ebcda3fb958714550a28d2ca1a56f6e23 Mon Sep 17 00:00:00 2001 +From 9e815c11d09d7de7f79d5b476d1b4d27bf5796fb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Apr 2019 15:20:05 +0100 -Subject: [PATCH 0246/1224] drm: vc4: Increase max screen size to 4096x4096. +Subject: [PATCH 0246/1225] drm: vc4: Increase max screen size to 4096x4096. We now should support 4k screens, therefore this limit needs to be increased. @@ -326002,10 +326002,10 @@ index cd37209694428..9e20e1ac77f8a 100644 2.18.4 -From 09596e25d996070e9f5d9632d6971dbf31113e24 Mon Sep 17 00:00:00 2001 +From 06797e7ee85e279a5706094e078158dbae88a058 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Apr 2019 17:15:45 +0100 -Subject: [PATCH 0247/1224] drm: vc4: Add support for multiple displays to fkms +Subject: [PATCH 0247/1225] drm: vc4: Add support for multiple displays to fkms There is a slightly nasty hack in that all crtcs share the same SMI interrupt from the firmware. This seems to currently @@ -326290,10 +326290,10 @@ index 54bb885a86dc2..d8e278a0b7892 100644 2.18.4 -From eafef3a4fdfe923d676fd3ac42feea2f5a51cf3a Mon Sep 17 00:00:00 2001 +From 098c42e6a375a70f5ff7ad0abaf09af29c478b96 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:21:56 +0100 -Subject: [PATCH 0248/1224] drm: vc4: Fix build warning +Subject: [PATCH 0248/1225] drm: vc4: Fix build warning Signed-off-by: Dave Stevenson --- @@ -326317,10 +326317,10 @@ index d8e278a0b7892..b952f27e41682 100644 2.18.4 -From 0d6479f617d1ff5533a8909daefc7bdd84557691 Mon Sep 17 00:00:00 2001 +From b09e0f211a41d12a71eca974698d715f28008555 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:23:15 +0100 -Subject: [PATCH 0249/1224] drm: vc4: Select display to blank during +Subject: [PATCH 0249/1225] drm: vc4: Select display to blank during initialisation Otherwise the rainbow splash screen remained in the display list @@ -326377,10 +326377,10 @@ index b952f27e41682..099124575435b 100644 2.18.4 -From 7e18d574973a736730586ba3fdad53dbdee2f115 Mon Sep 17 00:00:00 2001 +From 50f9ce8eb6862a2de0c3d13c59228b7c23537526 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:24:20 +0100 -Subject: [PATCH 0250/1224] drm: vc4: Remove now unused structure. +Subject: [PATCH 0250/1225] drm: vc4: Remove now unused structure. Cleaning up structure that was unused after fbb59a2 drm: vc4: Add an overlay plane to vc4-firmware-kms @@ -326424,10 +326424,10 @@ index 099124575435b..1155680fdfc69 100644 2.18.4 -From 7d8401b8630e4a6803734f7d534e84cd9c76e04f Mon Sep 17 00:00:00 2001 +From 58e93f90bccd5a25a28ad75a5575f8f51e509618 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 12:37:28 +0100 -Subject: [PATCH 0251/1224] drm: vc4: Query the display ID for each display in +Subject: [PATCH 0251/1225] drm: vc4: Query the display ID for each display in FKMS Replace the hard coded list of display IDs for a mailbox call @@ -326490,10 +326490,10 @@ index f0c15eefa3aa2..10f5dc53fd34d 100644 2.18.4 -From e2fc80ee75a2d51076faaf0fd4351b5102abfc6e Mon Sep 17 00:00:00 2001 +From 3bbc8ea02fc519c4180ae34cc51777398c89cd0d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 14:00:07 +0100 -Subject: [PATCH 0252/1224] drm/vc4: Set the display number when querying the +Subject: [PATCH 0252/1225] drm/vc4: Set the display number when querying the display resolution Without this the two displays got set to the same resolution. @@ -326599,10 +326599,10 @@ index 38b09f5ad2b27..b15c001621d84 100644 2.18.4 -From b48a29af8fcd09ed1c9eb13a3ecfe7a9661596e4 Mon Sep 17 00:00:00 2001 +From 12333bf7c79ac6eaa5a79f414e60248d9c9aa04c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 18:14:44 +0100 -Subject: [PATCH 0253/1224] drm: vc4: Need to call drm_crtc_vblank_[on|off] +Subject: [PATCH 0253/1225] drm: vc4: Need to call drm_crtc_vblank_[on|off] from vc4_crtc_[en|dis]able vblank needs to be enabled and disabled by the driver to avoid the @@ -326659,10 +326659,10 @@ index b15c001621d84..b86c9d98df4d5 100644 2.18.4 -From 1dfb14274cc74840c1a6c5634b80d85327bc90ed Mon Sep 17 00:00:00 2001 +From 6e9cbb0456fa70743ed52c2b124160affd0a7f64 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 17:19:51 +0100 -Subject: [PATCH 0254/1224] drm: vc4: Add support for H & V flips on each plane +Subject: [PATCH 0254/1225] drm: vc4: Add support for H & V flips on each plane for FKMS They are near zero cost options for the HVS, therefore they @@ -326751,10 +326751,10 @@ index b86c9d98df4d5..bb98a8a71555b 100644 2.18.4 -From 8b7423563839fa39446d53ff518b3a6f72c4a0d5 Mon Sep 17 00:00:00 2001 +From 908e25f76271ebd03834b3c8b2f0e7d3b4d14f99 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:35:05 +0100 -Subject: [PATCH 0255/1224] drm: vc4: Remove unused vc4_fkms_cancel_page_flip +Subject: [PATCH 0255/1225] drm: vc4: Remove unused vc4_fkms_cancel_page_flip function "32a3dbe drm/vc4: Nuke preclose hook" removed vc4_cancel_page_flip, @@ -326815,10 +326815,10 @@ index bb98a8a71555b..fe966ebb045af 100644 2.18.4 -From 3b65e6d1c3e21fa81044fc648dd9d07b4224dbd9 Mon Sep 17 00:00:00 2001 +From 178a0b990896e2f07a0eb5a8a35f4cf32194e071 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:42:37 +0100 -Subject: [PATCH 0256/1224] drm: vc4: Iterate over all planes in +Subject: [PATCH 0256/1225] drm: vc4: Iterate over all planes in vc4_crtc_[dis|en]able Fixes a FIXME where the overlay plane wouldn't be restored. @@ -326878,10 +326878,10 @@ index fe966ebb045af..81afd7782f65e 100644 2.18.4 -From c8711256a3012c5eb2093e62076173e7862d38f5 Mon Sep 17 00:00:00 2001 +From 70d4a348e8985453d79b538a000d714643522a81 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:43:57 +0100 -Subject: [PATCH 0257/1224] drm: vc4: Bring fkms into line with kms in blocking +Subject: [PATCH 0257/1225] drm: vc4: Bring fkms into line with kms in blocking doublescan modes Implement vc4_crtc_mode_valid so that it blocks doublescan modes @@ -326931,10 +326931,10 @@ index 81afd7782f65e..97ab24d0cbde4 100644 2.18.4 -From 724cdfa0a610c2c23f5db606a3b1b845b5d47a35 Mon Sep 17 00:00:00 2001 +From e0dfcac43bee6c09ec06286679c3cdc2bd115fbf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Apr 2019 18:45:00 +0100 -Subject: [PATCH 0258/1224] drm: vc4: Increase max_width/height to 7680. +Subject: [PATCH 0258/1225] drm: vc4: Increase max_width/height to 7680. There are some limits still being investigated that stop us going up to 8192, but 7680 is sufficient for dual 4k @@ -326964,10 +326964,10 @@ index 9e20e1ac77f8a..8b4bec771a146 100644 2.18.4 -From 1cdb76521125ad3cd9bf36b13c34f01f43799b6f Mon Sep 17 00:00:00 2001 +From 740eb189c3dc980a54bc931d79faeecffd417989 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 18:23:41 +0100 -Subject: [PATCH 0259/1224] drm: vc4: FKMS reads the EDID from fw, and supports +Subject: [PATCH 0259/1225] drm: vc4: FKMS reads the EDID from fw, and supports mode setting This extends FKMS to read the EDID from the display, and support @@ -327529,10 +327529,10 @@ index 10f5dc53fd34d..1a5dd091dfd96 100644 2.18.4 -From 7539650ec301f39122d4a852f76e2e388d437785 Mon Sep 17 00:00:00 2001 +From 98611ae647c73901ceed24bc00d47e19a47e761c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 May 2019 13:58:03 +0100 -Subject: [PATCH 0260/1224] drm: vc4-firmware-kms: Remove incorrect overscan +Subject: [PATCH 0260/1225] drm: vc4-firmware-kms: Remove incorrect overscan support. The overscan support was required for the old mailbox API @@ -327590,10 +327590,10 @@ index e4b978ce85efd..71889e0e334aa 100644 2.18.4 -From 5b9c371fcb24d5e5e19b2e9ee28ada75aa898391 Mon Sep 17 00:00:00 2001 +From c77b781c74526774bc626dc6a3ef8a3646b6e2ca Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 May 2019 12:13:34 +0100 -Subject: [PATCH 0261/1224] drm: vc4: Log flags in fkms mode set +Subject: [PATCH 0261/1225] drm: vc4: Log flags in fkms mode set The flags contain info such as limited/full range RGB, aspect ratio, and a fwe other useful things. @@ -327627,10 +327627,10 @@ index 71889e0e334aa..b18cb9d5e3456 100644 2.18.4 -From 19c8bf367635dcc2e20b86fc8d8286adc03ef2d4 Mon Sep 17 00:00:00 2001 +From 6cf5a3ca508e4ff93a26cfecd1ea60a98a2b82dc Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 16 May 2019 17:49:42 +0100 -Subject: [PATCH 0262/1224] drm: vc4-firmware-kms: Fix DSI display support +Subject: [PATCH 0262/1225] drm: vc4-firmware-kms: Fix DSI display support The mode was incorrectly listed as interlaced, which was then rejected. @@ -327658,10 +327658,10 @@ index b18cb9d5e3456..9fbdcd3538b31 100644 2.18.4 -From 5ce19adbf96c6f892658e217b4c65407db74057c Mon Sep 17 00:00:00 2001 +From 22f97131b76ba56b90036793badbef851bb120da Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 May 2019 11:50:00 +0100 -Subject: [PATCH 0263/1224] drm: vc4: Probe DPI/DSI timings from the firmware +Subject: [PATCH 0263/1225] drm: vc4: Probe DPI/DSI timings from the firmware For DPI and DSI displays query the firmware as to the configuration and add it as the only mode for DRM. @@ -327804,10 +327804,10 @@ index 1a5dd091dfd96..ca1344c957eae 100644 2.18.4 -From 61345da112c2324cbe091993a3b85ebe00c849b4 Mon Sep 17 00:00:00 2001 +From 8b127021f15028553680feda67f7df25d43acfbc Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 28 May 2019 13:56:06 +0100 -Subject: [PATCH 0264/1224] drm: vc4: handle the case where there are no +Subject: [PATCH 0264/1225] drm: vc4: handle the case where there are no available displays It's reasonable for the firmware to return zero as the number of @@ -327877,10 +327877,10 @@ index 0b0a155bc3b56..04b929a6cb0fc 100644 2.18.4 -From c5ecf1c071131d1f25fcafa8cfee0f531bb1e6ee Mon Sep 17 00:00:00 2001 +From 143b9854ea2785887f053f90eef8ad7cafe96f96 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 May 2019 17:59:01 +0100 -Subject: [PATCH 0265/1224] drm/vc4: Support the VEC in FKMS +Subject: [PATCH 0265/1225] drm/vc4: Support the VEC in FKMS Extends the DPI/DSI support to also report the VEC output which supports interlacing too. @@ -327945,10 +327945,10 @@ index 04b929a6cb0fc..f1306752da3dc 100644 2.18.4 -From 6d8f0edd75ae0da0a745a511ac2a54193d37e1ad Mon Sep 17 00:00:00 2001 +From 648d1701a6756bd78500839dcdaa0f00d35c80bb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 May 2019 15:00:02 +0100 -Subject: [PATCH 0266/1224] drm: vc4: Fixup typo when setting HDMI aspect ratio +Subject: [PATCH 0266/1225] drm: vc4: Fixup typo when setting HDMI aspect ratio Assignment was to the wrong structure. @@ -327990,10 +327990,10 @@ index f1306752da3dc..1081878ecfdd7 100644 2.18.4 -From 7a268f317477af50e2c62036a57d9cd2232c0509 Mon Sep 17 00:00:00 2001 +From ee4329b9cdb26c53506380a71eb397d9f2ac4441 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 May 2019 15:44:11 +0100 -Subject: [PATCH 0267/1224] drm/vc4: Correct SAND support for FKMS. +Subject: [PATCH 0267/1225] drm/vc4: Correct SAND support for FKMS. It was accepting NV21 which doesn't map through, but also wasn't advertising the modifier so nothing would know @@ -328036,10 +328036,10 @@ index 1081878ecfdd7..3b9dc3e892bb7 100644 2.18.4 -From a2ce983164b73c7d9a3cd1c4e42f08536dcc6f3b Mon Sep 17 00:00:00 2001 +From c794148a9a0df77b69313db35fed181ccb5c9b37 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 May 2019 13:56:15 +0100 -Subject: [PATCH 0268/1224] drm/vc4: fkms to query the VPU for HDMI clock +Subject: [PATCH 0268/1225] drm/vc4: fkms to query the VPU for HDMI clock limits The VPU has configured clocks for 4k (or not) via config.txt, @@ -328181,10 +328181,10 @@ index ca1344c957eae..102c2e5dd2f2c 100644 2.18.4 -From 6c8dca934b43150617f346f4ef1d75ddd6d95f58 Mon Sep 17 00:00:00 2001 +From 65125962deda9fb9a681eb30548de7dc9c556919 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 May 2019 15:55:15 +0100 -Subject: [PATCH 0269/1224] drm/vc4: Max resolution of 7680 is conditional on +Subject: [PATCH 0269/1225] drm/vc4: Max resolution of 7680 is conditional on being Pi4 The max resolution had been increased from 2048 to 7680 for all @@ -328233,10 +328233,10 @@ index 8b4bec771a146..7e31e2ca726c1 100644 2.18.4 -From d4bf11f2256518dce9bcb56c5c2fd230407b0371 Mon Sep 17 00:00:00 2001 +From d6be037e575c828ee449ab422e20a3c5849e4742 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 7 Jun 2019 11:31:21 +0100 -Subject: [PATCH 0270/1224] drm/vc4: Fix T-format modifiers in FKMS. +Subject: [PATCH 0270/1225] drm/vc4: Fix T-format modifiers in FKMS. The wrong vc_image formats were being checked for in the switch statement. Correct these. @@ -328267,10 +328267,10 @@ index cb2f24dece9f5..339c8768f4464 100644 2.18.4 -From 548be42b0cf0041bd657d14541378ecd2905f480 Mon Sep 17 00:00:00 2001 +From d59dfb0fadfb461e037122c965624add59f2db7d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 10 Jun 2019 16:32:51 +0100 -Subject: [PATCH 0271/1224] drm/vc4: Remove 340MHz clock limit from FKMS now +Subject: [PATCH 0271/1225] drm/vc4: Remove 340MHz clock limit from FKMS now scrambling issues resolved Firmware TMDS scrambling is now being correctly configured, so @@ -328302,10 +328302,10 @@ index 339c8768f4464..fdbd1d1cf7965 100644 2.18.4 -From d6b43077f25959ae678c939ce9199f7f2c49c49f Mon Sep 17 00:00:00 2001 +From 48a83580081e32b267cd3c8c3a680cc061e5efe2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 4 Jun 2019 12:14:30 +0100 -Subject: [PATCH 0272/1224] drm: vc4: Add status of which display is updated +Subject: [PATCH 0272/1225] drm: vc4: Add status of which display is updated through vblank Previously multiple displays were slaved off the same SMI @@ -328393,10 +328393,10 @@ index fdbd1d1cf7965..8ca9cb202f5e8 100644 2.18.4 -From adf4e31a49d0785cf849aaf0cf75650a3ae3df4e Mon Sep 17 00:00:00 2001 +From 7e364ecb41f278dcfe77eb34389a432ef76c0307 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 12 Jun 2019 17:13:21 +0100 -Subject: [PATCH 0273/1224] drm/vc4: In FKMS look at the modifiers correctly +Subject: [PATCH 0273/1225] drm/vc4: In FKMS look at the modifiers correctly for SAND Incorrect masking was used in the switch for the modifier, @@ -328435,10 +328435,10 @@ index 8ca9cb202f5e8..4fd2629e430a3 100644 2.18.4 -From 8b8519e735a79ca6f01b02647cb2e1d2376203e9 Mon Sep 17 00:00:00 2001 +From c3e08d93b1e4329a7e650e86a9b4a18c45d5420d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Jun 2019 21:37:45 +0100 -Subject: [PATCH 0274/1224] drm/vc4: Limit fkms to modes <= 85Hz +Subject: [PATCH 0274/1225] drm/vc4: Limit fkms to modes <= 85Hz Selecting 1080p100 and 120 has very limited gain, but don't want to block VGA85 and similar. @@ -328467,10 +328467,10 @@ index 4fd2629e430a3..b97798c823710 100644 2.18.4 -From 12ca71647c87bf516783cec9fa551735d3bf54e7 Mon Sep 17 00:00:00 2001 +From 9be1d717d7024235ca6deae40cbaad77b126eaa9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 19 Jul 2019 14:29:28 +0100 -Subject: [PATCH 0275/1224] drm/vc4: Ignore HVS unless initialised +Subject: [PATCH 0275/1225] drm/vc4: Ignore HVS unless initialised An upstream commit to report HVS underruns causes VC4 in firmware KMS mode to cross into the HVS side, where it crashes due to a NULL hvs @@ -328518,10 +328518,10 @@ index 7e31e2ca726c1..1b921e114c034 100644 2.18.4 -From 6a6163ed9e6b5b3c691b55db6075f1ce112e3853 Mon Sep 17 00:00:00 2001 +From dce96cc5b02a27bd5a4560290b9b1198ed4e3b28 Mon Sep 17 00:00:00 2001 From: Chris Miller Date: Wed, 26 Jun 2019 10:40:30 +0100 -Subject: [PATCH 0276/1224] drm: vc4_dsi: Fix DMA channel and memory leak in +Subject: [PATCH 0276/1225] drm: vc4_dsi: Fix DMA channel and memory leak in vc4 (#3012) Signed-off-by: Chris G Miller @@ -328659,10 +328659,10 @@ index c78fa8144776e..3448b314d3617 100644 2.18.4 -From f5b110dcdc937b8fc4832e221767922c8409fec8 Mon Sep 17 00:00:00 2001 +From 62fc3162cc949cc38fa1b72400eda7a35bf4129b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Jun 2019 02:29:40 +0100 -Subject: [PATCH 0277/1224] drm/vc4: Add support for color encoding on YUV +Subject: [PATCH 0277/1225] drm/vc4: Add support for color encoding on YUV planes Adds signalling for BT601/709/2020, and limited/full range @@ -328778,10 +328778,10 @@ index 669a70fdb8913..0bdffe5dd1e9a 100644 2.18.4 -From 29aea2add4037be63027a82f44f36353782f8938 Mon Sep 17 00:00:00 2001 +From dec5f1cd100d590a6f5d1017dd533a344b24e564 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jul 2019 13:13:39 +0100 -Subject: [PATCH 0278/1224] tty: amba-pl011: Make TX optimisation conditional +Subject: [PATCH 0278/1225] 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 @@ -328869,10 +328869,10 @@ index ba2029bf1e639..83676bc79a195 100644 2.18.4 -From 34b22b281862917031d1e50f9eeee6b01bc82b21 Mon Sep 17 00:00:00 2001 +From 71d572971e8570be717dce6d0f89143cdf32e31a Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 11 Jul 2019 17:55:43 +0100 -Subject: [PATCH 0279/1224] xhci: add quirk for host controllers that don't +Subject: [PATCH 0279/1225] 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 @@ -328909,7 +328909,7 @@ index e7fecc34aaa13..73600f6b2c1b8 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 52e156c018042..32939242ec170 100644 +index 900ea91fb3c6b..0f575ef59e756 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -527,7 +527,10 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, @@ -328954,7 +328954,7 @@ index 52e156c018042..32939242ec170 100644 /* diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index b483317bcb17b..4ded7bc60d99f 100644 +index 1ad1d6e9e9979..133d0ea9d70cb 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1873,6 +1873,7 @@ struct xhci_hcd { @@ -328962,17 +328962,17 @@ index b483317bcb17b..4ded7bc60d99f 100644 #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) +#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36) + #define XHCI_SKIP_PHY_INIT BIT_ULL(37) #define XHCI_DISABLE_SPARSE BIT_ULL(38) - unsigned int num_active_eps; -- 2.18.4 -From 49252a71364bc68f1471153292ebfa00cffdabc9 Mon Sep 17 00:00:00 2001 +From 2dc4b3ba442f81a145113b6140277d630c67be8d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 15:38:35 +0100 -Subject: [PATCH 0280/1224] i2c: bcm2835: Set clock-stretch timeout to 35ms +Subject: [PATCH 0280/1225] 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 @@ -329022,10 +329022,10 @@ index beb67afa6a3c6..9f4f4964a5076 100644 2.18.4 -From b467fafdfd2686516e7d5ad69fc08fa32686cbcf Mon Sep 17 00:00:00 2001 +From c5bf1c3d656976bda52f921be3fbc24dfe3ccee0 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 16 Jul 2019 13:28:22 +0100 -Subject: [PATCH 0281/1224] arm64/mm: Limit the DMA zone for arm64 +Subject: [PATCH 0281/1225] arm64/mm: Limit the DMA zone for arm64 On RaspberryPi, only the first 1Gb can be used for DMA[1]. @@ -329053,10 +329053,10 @@ index 602bd19630ff8..798cface99928 100644 2.18.4 -From 5295fd2fbff70b58e39a7eb3498451e53e74fd22 Mon Sep 17 00:00:00 2001 +From fedebfc4e661002ebfbd7179fe60e25acfb6e6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= Date: Sat, 3 Aug 2019 14:34:59 +0200 -Subject: [PATCH 0282/1224] staging: vc04_services: fix compiling in separate +Subject: [PATCH 0282/1225] staging: vc04_services: fix compiling in separate directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -329087,10 +329087,10 @@ index 5820ec1f89ece..7fb908d824b2f 100644 2.18.4 -From 16bb4abc691dab2d81e416b159ba52e2697183f0 Mon Sep 17 00:00:00 2001 +From 459d73659e7ca7edb0a1211f706e60f9e3ecf5d9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Apr 2019 13:33:47 +0100 -Subject: [PATCH 0283/1224] bcm2835-dma: Add proper 40-bit DMA support +Subject: [PATCH 0283/1225] bcm2835-dma: Add proper 40-bit DMA support The 40-bit additions are not fully tested, but it should be capable of supporting both 40-bit memcpy on BCM2711 and regular @@ -330043,10 +330043,10 @@ index 782725e3adad5..746cfb405ad38 100644 2.18.4 -From 49bb2fdc3e132478535afbe800e07a7959350d74 Mon Sep 17 00:00:00 2001 +From c12064581bd795e8ea9a1a5e24347a6415300ef9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 6 Aug 2019 15:23:14 +0100 -Subject: [PATCH 0284/1224] clk-bcm2835: Avoid null pointer exception +Subject: [PATCH 0284/1225] clk-bcm2835: Avoid null pointer exception clk_desc_array[BCM2835_PLLB] doesn't exist so we dereference null when iterating @@ -330078,10 +330078,10 @@ index 079748e686863..f1d73d83ee16b 100644 2.18.4 -From 612ac25ad7083e76edee7def2fbaefbfcca438ce Mon Sep 17 00:00:00 2001 +From 8400c3a49fa5bd5f5b0eda075bae70ddb28cfe2a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 7 Aug 2019 17:19:33 +0100 -Subject: [PATCH 0285/1224] pcie-brcmstb: Don't set DMA ops for root complex +Subject: [PATCH 0285/1225] pcie-brcmstb: Don't set DMA ops for root complex A change to arm_get_dma_map_ops has stopped get_dma_ops from working on the root complex, causing an error to be logged. However, there is @@ -330111,10 +330111,10 @@ index 746cfb405ad38..87fd40ae31400 100644 2.18.4 -From b08c83215f6450ad9b0df6f8c0777cfc872cd400 Mon Sep 17 00:00:00 2001 +From 16611ec40c4496fa4cc0e37a4c72d8ce81bc646c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 15 Aug 2019 08:39:08 +0100 -Subject: [PATCH 0286/1224] drm/vc4: Prevent load tracking from breaking FKMS +Subject: [PATCH 0286/1225] drm/vc4: Prevent load tracking from breaking FKMS Firmware KMS uses a mixture of VC4 processing and dedicated code. The load tracking support in VC4 assumes it is dealing with vc4_plane_state @@ -330191,10 +330191,10 @@ index 862e89b8c4789..ff96ba01144d6 100644 2.18.4 -From 033b41aec45da3b5192d36560f594636c9dd369c Mon Sep 17 00:00:00 2001 +From c27cc768ad93c098c160afa4ae80a576d1cafafd Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 22 Aug 2019 23:32:46 +0800 -Subject: [PATCH 0287/1224] rtl8192cu: Let it support to build in the non-src +Subject: [PATCH 0287/1225] rtl8192cu: Let it support to build in the non-src folder If we build the kernel with "-O=$non-src-folder", this driver will @@ -330222,10 +330222,10 @@ index c399011a3e377..ef6156c0f3687 100644 2.18.4 -From 1084460af78120c0a595837e23bfdc22f164584b Mon Sep 17 00:00:00 2001 +From 9dfd679b3db23fb835d731500a05d982a415d1b1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 15:13:17 -0800 -Subject: [PATCH 0288/1224] drm/v3d: HACK: gut runtime pm for now. +Subject: [PATCH 0288/1225] 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 @@ -330339,10 +330339,10 @@ index d225152e7e36e..15a5f92aa7b4e 100644 2.18.4 -From bd46b29fb1bf6a5f72f77d3e0f370a43d08ff5f3 Mon Sep 17 00:00:00 2001 +From 432bac7d1ba2f0acb6d3e102c3a177ac074b2313 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 13:22:53 -0700 -Subject: [PATCH 0289/1224] drm/v3d: Clock V3D down when not in use. +Subject: [PATCH 0289/1225] 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. @@ -330510,10 +330510,10 @@ index 19c092d75266b..28f8eb664a581 100644 2.18.4 -From ba90f4b137082dbf0c6f5e82c294b8d025247a71 Mon Sep 17 00:00:00 2001 +From 722810682a69a45ecbac80d515f11c81c4570ff6 Mon Sep 17 00:00:00 2001 From: Hermann Lauer Date: Thu, 8 Aug 2019 15:40:37 +0200 -Subject: [PATCH 0290/1224] According to 5713 pdf doc CLOCK_CTRL is a readonly +Subject: [PATCH 0290/1225] According to 5713 pdf doc CLOCK_CTRL is a readonly status register, and it behaves so. Remove useless setting --- @@ -330547,10 +330547,10 @@ index 9c1c92e57bbfa..53acd2b355d63 100644 2.18.4 -From 94637e677394dfabe4a09d3be5aedcf11a65f5b0 Mon Sep 17 00:00:00 2001 +From defd300d5799585fe13844b518f619ddd78d835e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 28 Jun 2018 15:57:25 +0100 -Subject: [PATCH 0291/1224] staging: bcm2835_camera: Ensure all buffers are +Subject: [PATCH 0291/1225] staging: bcm2835_camera: Ensure all buffers are returned on disable With the recent change to match MMAL and V4L2 buffers there @@ -330580,10 +330580,10 @@ index 61a3593cdcfc3..341594ab669f3 100644 2.18.4 -From d5471008a1876573fdc3b0f671bc9657a5fb1c95 Mon Sep 17 00:00:00 2001 +From e0ad1803a8152067c2a8483a91d47a6557ca5457 Mon Sep 17 00:00:00 2001 From: yaroslavros Date: Wed, 14 Aug 2019 15:22:55 +0100 -Subject: [PATCH 0292/1224] Ported pcie-brcmstb bounce buffer implementation to +Subject: [PATCH 0292/1225] Ported pcie-brcmstb bounce buffer implementation to ARM64. (#3144) Ported pcie-brcmstb bounce buffer implementation to ARM64. @@ -331308,10 +331308,10 @@ index 87fd40ae31400..e8c8b355548a5 100644 2.18.4 -From 8e1799060b738cea81dded2343c7debea5473331 Mon Sep 17 00:00:00 2001 +From e7eec95ece62c7a4aabf0fc2090cf2ab6d161cc1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Jul 2019 17:44:53 +0100 -Subject: [PATCH 0293/1224] drm/vc4: Query firmware for custom HDMI mode +Subject: [PATCH 0293/1225] drm/vc4: Query firmware for custom HDMI mode Allow custom HDMI modes to be specified from config.txt, and these then override EDID parsing. @@ -331493,10 +331493,10 @@ index ff96ba01144d6..3ea7974a4ed3a 100644 2.18.4 -From 8af7cfa359741f9faaae6442295758c320ff82b4 Mon Sep 17 00:00:00 2001 +From 9d20d97bc1351b2ae3158a8b30326714c80cb6cb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 15:12:05 +0100 -Subject: [PATCH 0294/1224] drm/vc4: Pass the drm vrefresh to the firmware on +Subject: [PATCH 0294/1225] drm/vc4: Pass the drm vrefresh to the firmware on mode set More for completeness than need, but use drm_mode_vrefresh @@ -331536,10 +331536,10 @@ index 3ea7974a4ed3a..6bf51f45cadbb 100644 2.18.4 -From 81de30523033619d2c37cdb265208260ec6fcbba Mon Sep 17 00:00:00 2001 +From a9d19c7a5fc554799bf63938c3e676ac1ebcfdb3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 19 Jul 2019 15:35:13 +0100 -Subject: [PATCH 0295/1224] drm/vc4: Add support for margins to fkms +Subject: [PATCH 0295/1225] drm/vc4: Add support for margins to fkms Allows for overscan to be configured under FKMS. NB This is rescaling the planes, not reducing the size of the @@ -331870,10 +331870,10 @@ index 6bf51f45cadbb..5526b7dd52ee5 100644 2.18.4 -From 7fcaf45dce5b20716d4eb74598b722c171f50d2d Mon Sep 17 00:00:00 2001 +From 67c0879d392f8d5fbc0112d986bef2772f70bb3d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 19 Jul 2019 17:49:00 +0100 -Subject: [PATCH 0296/1224] drm/vc4: Ensure zpos is always initialised +Subject: [PATCH 0296/1225] drm/vc4: Ensure zpos is always initialised The compiler is warning that default_zpos can be used uninitialised as there is no default case to catch all plane @@ -331902,10 +331902,10 @@ index 5526b7dd52ee5..653c9f6d5ce5c 100644 2.18.4 -From e16bd544b3590a9285d03c658ab9eec5a85e61b6 Mon Sep 17 00:00:00 2001 +From fde76e4193f00026fb1ab2af1f8ad8db668fae57 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Tue, 23 Jul 2019 16:57:35 +0200 -Subject: [PATCH 0297/1224] adds the Hifiberry DAC+ADC PRO version +Subject: [PATCH 0297/1225] adds the Hifiberry DAC+ADC PRO version This adds the driver for the DAC+ADC PRO version of the Hifiberry soundcard with software controlled PCM1863 ADC Signed-off-by: Joerg Schambacher joerg@i2audio.com @@ -332511,10 +332511,10 @@ index 0000000000000..ed080b24eb494 2.18.4 -From b44d80e0ccc574797aceceb76aa021a5cdd4a9a5 Mon Sep 17 00:00:00 2001 +From 685c2a524e21bc564fbcfab74daf8eeefedeafa4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 31 Jul 2019 17:36:34 +0100 -Subject: [PATCH 0298/1224] drm/vc4: A present but empty dmas disables audio +Subject: [PATCH 0298/1225] 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 @@ -332550,10 +332550,10 @@ index 54435b72b7611..d59fd8714c5d8 100644 2.18.4 -From 5cad4a8feebaf6bead1c4ea263dd2dea4f4fe25b Mon Sep 17 00:00:00 2001 +From e38e1d0ed84d0b8718693d15791d96ee7a0e846d Mon Sep 17 00:00:00 2001 From: James Hughes Date: Mon, 29 Jul 2019 12:02:59 +0100 -Subject: [PATCH 0299/1224] Fixup FKMS interrupt handing for non-existent +Subject: [PATCH 0299/1225] Fixup FKMS interrupt handing for non-existent display If an errant interrupt flag was received from a non-existent display, @@ -332596,10 +332596,10 @@ index 653c9f6d5ce5c..14d660add41c8 100644 2.18.4 -From bd49fb33de1aca12284a6d8d1f556df58052c7dd Mon Sep 17 00:00:00 2001 +From 402e990b54af7c0c12a8b599d78d02b09b2ddf29 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 9 May 2019 14:30:37 +0100 -Subject: [PATCH 0300/1224] drivers: char: add chardev for mmap'ing the RPiVid +Subject: [PATCH 0300/1225] drivers: char: add chardev for mmap'ing the RPiVid control registers Based on the gpiomem driver, allow mapping of the decoder register @@ -333000,10 +333000,10 @@ index b2d157091e12b..f70a810c55f7d 100644 2.18.4 -From a702c6e0eeb0f0736b2dae1bd2e75f75039db721 Mon Sep 17 00:00:00 2001 +From 6c53d8295d3db668dfe068b5a07143ea06224d6f Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 1 Aug 2019 16:41:20 +0100 -Subject: [PATCH 0301/1224] hid: usb: Add device quirks for Freeway Airmouse T3 +Subject: [PATCH 0301/1225] hid: usb: Add device quirks for Freeway Airmouse T3 and MX3 These wireless mouse/keyboard combo remote control devices specify @@ -333024,7 +333024,7 @@ Signed-off-by: Jonathan Bell 2 files changed, 8 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 33183933337af..f41a18a3b0abb 100644 +index d004f5645b30c..0c0cb398bdcda 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -223,6 +223,9 @@ @@ -333037,7 +333037,7 @@ index 33183933337af..f41a18a3b0abb 100644 #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1254,6 +1257,9 @@ +@@ -1257,6 +1260,9 @@ #define USB_VENDOR_ID_XAT 0x2505 #define USB_DEVICE_ID_XAT_CSR 0x0220 @@ -333048,7 +333048,7 @@ index 33183933337af..f41a18a3b0abb 100644 #define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE 0x05e1 #define USB_DEVICE_ID_THT_2P_ARCADE 0x75e1 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 60d188a704e5e..3f4b7416dcbfc 100644 +index f35d919c4ebab..10d5a2943a3b7 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -41,6 +41,7 @@ static const struct hid_device_id hid_quirks[] = { @@ -333059,7 +333059,7 @@ index 60d188a704e5e..3f4b7416dcbfc 100644 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, -@@ -190,6 +191,7 @@ static const struct hid_device_id hid_quirks[] = { +@@ -191,6 +192,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, @@ -333071,10 +333071,10 @@ index 60d188a704e5e..3f4b7416dcbfc 100644 2.18.4 -From 2996c035c7f7d695adbf07a9f4ab29d54609041e Mon Sep 17 00:00:00 2001 +From eaf91407f52ee4d320f2be54851ffdb6668d406b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 14 Jun 2019 10:12:07 +0100 -Subject: [PATCH 0302/1224] drm/vc4: Add "Broadcast RGB" connector property +Subject: [PATCH 0302/1225] drm/vc4: Add "Broadcast RGB" connector property Some HDMI monitors do not abide by the full or limited (16-235) range RGB flags in the AVI infoframe. This can @@ -333379,10 +333379,10 @@ index 14d660add41c8..bf882b38830a8 100644 2.18.4 -From 7c69a61dbb08b4dcef45b02db9a6a0152dfc1d5d Mon Sep 17 00:00:00 2001 +From b92696dfe12f3e14f0abefbbc8d0a96f46885ed0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jul 2019 11:09:26 +0100 -Subject: [PATCH 0303/1224] drm/vc4: fkms: Set default state margin at reset +Subject: [PATCH 0303/1225] drm/vc4: fkms: Set default state margin at reset Now that the TV margins are properly parsed and filled into drm_cmdline_mode, we just need to initialise the first state at reset to @@ -333419,10 +333419,10 @@ index bf882b38830a8..fa8a538f5d669 100644 2.18.4 -From a4f1805f2a55375b3b96f05e526401de32109039 Mon Sep 17 00:00:00 2001 +From 1c97b357faf33c2bad57501d71a62edba279ba49 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 18 Jul 2019 17:07:05 +0800 -Subject: [PATCH 0304/1224] staging: bcm2835-codec: switch to multi-planar API +Subject: [PATCH 0304/1225] staging: bcm2835-codec: switch to multi-planar API There are two APIs for mem2mem devices, the older single-planar API and the newer multi-planar one. Without making things overly complex, the @@ -333772,10 +333772,10 @@ index 708f76b7aa92b..0ecf3e5c59a85 100644 2.18.4 -From 254efc58b8c8d775bfa0ae243a5a17fac4f1280d Mon Sep 17 00:00:00 2001 +From c94713685c38965db3a7e64c94043d1c0eb9b24c Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Mon, 22 Jul 2019 22:13:30 +0800 -Subject: [PATCH 0305/1224] staging: bcm2835-codec: implement +Subject: [PATCH 0305/1225] staging: bcm2835-codec: implement V4L2_CID_MIN_BUFFERS_FOR_CAPTURE The stateful decoder specification shows an optional step for retrieving @@ -333824,10 +333824,10 @@ index 0ecf3e5c59a85..d515bc75d5cb0 100644 2.18.4 -From dbd6f4b3e4a8323a9b97faa889c2e710092c087e Mon Sep 17 00:00:00 2001 +From 67dec63f786fb3299793c3bf6d61f5b8d9305270 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Mon, 22 Jul 2019 22:20:55 +0800 -Subject: [PATCH 0306/1224] staging: bcm2835-codec: set device_caps in struct +Subject: [PATCH 0306/1225] staging: bcm2835-codec: set device_caps in struct video_device Instead of filling in the struct v4l2_capability device_caps @@ -333870,10 +333870,10 @@ index d515bc75d5cb0..47e79a0f0c3e8 100644 2.18.4 -From 5e8626775d7b4819b5fc56a7b5f811d7182dca4b Mon Sep 17 00:00:00 2001 +From 8bec8f5e6861e08971cf51b2d1c92032f0e344f7 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 16 Jul 2019 12:18:21 +0100 -Subject: [PATCH 0307/1224] Add HDMI1 facility to the driver. +Subject: [PATCH 0307/1225] 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 @@ -333884,7 +333884,7 @@ test those. 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index 86b921030db7b..4d5b99d8ae9dc 100644 +index b42917c250504..eb8a8a5b7ec8d 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -79,7 +79,11 @@ static int bcm2835_audio_alsa_newpcm(struct bcm2835_chip *chip, @@ -333963,10 +333963,10 @@ index ed0feb34b6c88..1a25cdad94dcd 100644 2.18.4 -From 2f1e490ec7174323d5dc6484473e1aff4d8d35d4 Mon Sep 17 00:00:00 2001 +From d72b7ab66d6e523e747234d1d6fbffdc431886d0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jul 2019 17:27:44 +0100 -Subject: [PATCH 0308/1224] drm/vc4: Resolve the vblank warnings on mode +Subject: [PATCH 0308/1225] drm/vc4: Resolve the vblank warnings on mode switching The details over when and how a driver is to service the @@ -334069,10 +334069,10 @@ index fa8a538f5d669..d9779b993c392 100644 2.18.4 -From e97a21aca329098e0043fca2c5523eb696c2f82f Mon Sep 17 00:00:00 2001 +From 5a95faa888ed432dc1d217a50ae01e13e856a1d1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jul 2019 17:34:29 +0100 -Subject: [PATCH 0309/1224] drm/vc4: Remove unused mode variable +Subject: [PATCH 0309/1225] drm/vc4: Remove unused mode variable "89d1376 drm/vc4: Add support for margins to fkms" removed the requirement for having the mode structure from vc4_plane_to_mb, @@ -334102,10 +334102,10 @@ index d9779b993c392..8b18389193777 100644 2.18.4 -From d79b71261c7fda83a0c3b35212c7fba57050dee0 Mon Sep 17 00:00:00 2001 +From 076048f8e2b528f03ddc79aa69dada55a5ac1ad3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 14:57:09 +0100 -Subject: [PATCH 0310/1224] staging:bcm2835-codec: Expand logging on format +Subject: [PATCH 0310/1225] staging:bcm2835-codec: Expand logging on format setting Adds some more useful logging during format changed events and @@ -334150,10 +334150,10 @@ index 47e79a0f0c3e8..eadc0fab2fb9c 100644 2.18.4 -From 58ede83cb650ec442e9122463e0da787c72404de Mon Sep 17 00:00:00 2001 +From dde26943837377c94a35459a7b2d782ad7244396 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 14:58:35 +0100 -Subject: [PATCH 0311/1224] staging: bcm2835-codec: Correct bytesperline on +Subject: [PATCH 0311/1225] staging: bcm2835-codec: Correct bytesperline on format changed The handling of format changed events incorrectly set bytesperline @@ -334186,10 +334186,10 @@ index eadc0fab2fb9c..24a8e7cc7de7e 100644 2.18.4 -From d3b7ff308975c129a9ccb99115cb5480a016aad9 Mon Sep 17 00:00:00 2001 +From b2cae8b15117716078292b0d7b32c88ae6a6c410 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 7 Aug 2019 11:31:08 +0100 -Subject: [PATCH 0312/1224] drm/vc4: Add missing NULL check to +Subject: [PATCH 0312/1225] drm/vc4: Add missing NULL check to vc4_crtc_consume_event vc4_crtc_consume_event wasn't checking crtc->state->event was @@ -334220,10 +334220,10 @@ index 8b18389193777..004a0bce94acb 100644 2.18.4 -From 0dacc3c34828b8ecabce5150e79fefc253889810 Mon Sep 17 00:00:00 2001 +From 903eecd9d8e94b9a1ffb78db3c576fd4ff80155f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Aug 2019 08:51:43 +0100 -Subject: [PATCH 0313/1224] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail +Subject: [PATCH 0313/1225] 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 @@ -334277,10 +334277,10 @@ index 8cd9d5a9e7f5b..35816fe2ffd95 100644 2.18.4 -From 5c86d0dd5fa189554bfba5ff5ff4df80aef559d3 Mon Sep 17 00:00:00 2001 +From 13c626a9fe1074f9d0055e10f19651851dbe784d Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 13 Aug 2019 15:53:29 +0100 -Subject: [PATCH 0314/1224] xhci: Use more event ring segment table entries +Subject: [PATCH 0314/1225] 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 @@ -334327,7 +334327,7 @@ index 9764122c9cdf2..ff6004b3f6b9b 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 4ded7bc60d99f..1bd165cbd74f0 100644 +index 133d0ea9d70cb..a3e6983f846c5 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1649,8 +1649,8 @@ struct urb_priv { @@ -334345,10 +334345,10 @@ index 4ded7bc60d99f..1bd165cbd74f0 100644 2.18.4 -From d8dd39a1c1fd5c3a8fb08f405368f73e302507ca Mon Sep 17 00:00:00 2001 +From 1f3bb3d22700b2fd37b025d156c9472833e79539 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 15 Aug 2019 12:02:34 +0100 -Subject: [PATCH 0315/1224] configs: arm64/bcm2711: Enable V3D +Subject: [PATCH 0315/1225] configs: arm64/bcm2711: Enable V3D Enable the V3D driver, which depends on BCM2835_POWER. @@ -334392,10 +334392,10 @@ index 9a5c44606337e..b0e0486979642 100644 2.18.4 -From 57a86626ebe8d1609a182265a5440eb64194fa58 Mon Sep 17 00:00:00 2001 +From e25236c3eb1476173ca9494ecd211c3b1f785809 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Thu, 22 Aug 2019 22:31:37 +0000 -Subject: [PATCH 0316/1224] staging: bcm2835-codec: add support for +Subject: [PATCH 0316/1225] staging: bcm2835-codec: add support for V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME fixes #3171 @@ -334453,10 +334453,10 @@ index 24a8e7cc7de7e..1a384e70eb98e 100644 2.18.4 -From 9570f943878f33c1659593d9cee4002c450f29ad Mon Sep 17 00:00:00 2001 +From b1bb9fc7d4bf7ba3542e738e36e5d3911ff6f764 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Fri, 23 Aug 2019 16:29:07 -0700 -Subject: [PATCH 0317/1224] staging: bcm2835-codec: remove unnecessary padding +Subject: [PATCH 0317/1225] staging: bcm2835-codec: remove unnecessary padding on encoder input The ISP and ENCODE roles have the same underlying hardware. Neither requires vertical alignment. @@ -334489,10 +334489,10 @@ index 1a384e70eb98e..a82d7345389db 100644 2.18.4 -From 43f4c39ac911ceb39e77be8e8175990ae3251070 Mon Sep 17 00:00:00 2001 +From fac991189b72366f9d8bb65a92527749db5cd54e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:16:56 +0100 -Subject: [PATCH 0318/1224] arch/arm: Add model string to cpuinfo +Subject: [PATCH 0318/1225] arch/arm: Add model string to cpuinfo Signed-off-by: Phil Elwell --- @@ -334531,10 +334531,10 @@ index d0a464e317eac..d658d022f6a7c 100644 2.18.4 -From 90a8f8412cb346f3669590e8e2803de6f3c8c5f3 Mon Sep 17 00:00:00 2001 +From 9bc3132d6eaa3871ff8eb1bee7b92d7706660d64 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:17:25 +0100 -Subject: [PATCH 0319/1224] arch/arm64: Add Revision, Serial, Model to cpuinfo +Subject: [PATCH 0319/1225] arch/arm64: Add Revision, Serial, Model to cpuinfo Signed-off-by: Phil Elwell --- @@ -334595,10 +334595,10 @@ index 05933c065732b..86bbf8762dc95 100644 2.18.4 -From 37c525802379c777e3793efe67f105e3f86677ef Mon Sep 17 00:00:00 2001 +From 0edf69f77edd1b43f2632e7b0feb6b8bfd34dd77 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:34:30 +0100 -Subject: [PATCH 0320/1224] media: dt-bindings: Add binding for the Sony IMX219 +Subject: [PATCH 0320/1225] media: dt-bindings: Add binding for the Sony IMX219 sensor The IMX219 is an 8MPix CSI2 sensor, supporting 2 or 4 data lanes. @@ -334679,10 +334679,10 @@ index 0000000000000..a02f1ce1e1204 2.18.4 -From fc39030b3652bc68aa2ad6d28241a4032ea4fb05 Mon Sep 17 00:00:00 2001 +From a5e8aa9b514461f31424d8df6bb4c09ea0989af7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:34:49 +0100 -Subject: [PATCH 0321/1224] media: i2c: Add driver for Sony IMX219 sensor +Subject: [PATCH 0321/1225] media: i2c: Add driver for Sony IMX219 sensor Adds a driver for the 8MPix Sony IMX219 CSI2 sensor. Whilst the sensor supports 2 or 4 CSI2 data lanes, this driver @@ -335836,10 +335836,10 @@ index 0000000000000..682397a484922 2.18.4 -From bb98504e64f696bde7d5c1e562a2e3b58d8b75be Mon Sep 17 00:00:00 2001 +From b36c0ec448b7b9cdc3d4f98b99fbc1837f8123ff Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Sun, 28 Apr 2019 12:15:35 +0200 -Subject: [PATCH 0322/1224] staging: bcm2835-codec: Fix non-documentation +Subject: [PATCH 0322/1225] staging: bcm2835-codec: Fix non-documentation comment block The job_ready comment is incorrectly using the documentation prefix @@ -335869,10 +335869,10 @@ index a82d7345389db..4c69087328c00 100644 2.18.4 -From 19c656ea909c7a67e4162aacab1a3886b7fccc67 Mon Sep 17 00:00:00 2001 +From 29a9985dc43d8b58fe2568ecc66e0a69bf6ebc88 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:42:39 +0000 -Subject: [PATCH 0323/1224] staging: bcm2835-codec: Fix declaration of roles +Subject: [PATCH 0323/1225] staging: bcm2835-codec: Fix declaration of roles The static role text is declared incorrectly. The static should be first, and the roles should also be constified. @@ -335901,10 +335901,10 @@ index 4c69087328c00..1a00c8d253700 100644 2.18.4 -From 132075a68e4c33463af2400e58a3e83ebb207dac Mon Sep 17 00:00:00 2001 +From 7c0a04403d62922ff997adff51fc1140bd009aa5 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:55:43 +0000 -Subject: [PATCH 0324/1224] staging: bcm2835-codec: Add role to device name +Subject: [PATCH 0324/1225] staging: bcm2835-codec: Add role to device name Three entities are created, Decode, Encode and ISP but all of the video nodes use the same video name string "bcm2835-codec" which makes it @@ -335952,10 +335952,10 @@ index 1a00c8d253700..46b8dd782c465 100644 2.18.4 -From a32478ba549b3e950da354d788a14e13c17afed3 Mon Sep 17 00:00:00 2001 +From 5ae5fc1d3e14ff7a2f1c96dc56d9a0b9a738ddec Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:35:26 +0000 -Subject: [PATCH 0325/1224] staging: bcm2835-codec: Pass driver context to +Subject: [PATCH 0325/1225] staging: bcm2835-codec: Pass driver context to create entities Pass the bcm2835_codec_driver driver context directly into the @@ -336019,10 +336019,10 @@ index 46b8dd782c465..a08a75d3ff88c 100644 2.18.4 -From 3f9a5054a5f78f6aad465c8b008f93227bf9e4b8 Mon Sep 17 00:00:00 2001 +From e09c1d806cfbfe1c52632ccae929a29844eb81bb Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 12:54:15 +0000 -Subject: [PATCH 0326/1224] staging: bcm2835-codec: add media controller +Subject: [PATCH 0326/1225] staging: bcm2835-codec: add media controller support Provide a single media device to contain all of the bcm2835_codec @@ -336191,10 +336191,10 @@ index a08a75d3ff88c..fb99bfb5bc1df 100644 2.18.4 -From 2d9cdf1a3a71eaaa280f642ef177003134fe7a36 Mon Sep 17 00:00:00 2001 +From 93083920fb00580bf6da6bfb32f617a5d1569966 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:04:51 +0100 -Subject: [PATCH 0327/1224] v4l2: Add a Greyworld AWB mode. +Subject: [PATCH 0327/1225] 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) @@ -336206,7 +336206,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 2 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index cd84dbbf6a890..c7bf6f51ccddd 100644 +index 3fe99519fedfb..2161cc497abd7 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -271,6 +271,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) @@ -336233,10 +336233,10 @@ index a2669b79b2949..616a7c64c4d20 100644 2.18.4 -From c49240d8f4e52ff3d6860c4cc15635419b83902b Mon Sep 17 00:00:00 2001 +From 66dc6deee690af686f779e2bbccef10f7f2c5bd3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:13:06 +0100 -Subject: [PATCH 0328/1224] staging: bcm2835-camera: Add greyworld AWB mode +Subject: [PATCH 0328/1225] 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. @@ -336289,10 +336289,10 @@ index 926392d754c76..d3d7828d1e56c 100644 2.18.4 -From 3955ea5ba0b45d027a31eada9b44b4510d8a7f1f Mon Sep 17 00:00:00 2001 +From ae480d13fcf9f3c5b6acc93aec6cb414206277a7 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 11 Sep 2019 14:57:18 +0100 -Subject: [PATCH 0329/1224] drm/vc4: Fix for margins in composite/SDTV mode +Subject: [PATCH 0329/1225] drm/vc4: Fix for margins in composite/SDTV mode (#3223) Margins were incorrectly assumed to be setup in SDTV mode, but were @@ -336329,11 +336329,11 @@ index 004a0bce94acb..a487fcf1eaf39 100644 2.18.4 -From 3eef8fe3625f0cfa3eca370b334e84aca55b3676 Mon Sep 17 00:00:00 2001 +From d1296adcfa2d4205e5d6702d32d35eb13a3e56d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?= Date: Thu, 12 Sep 2019 14:57:32 +0200 -Subject: [PATCH 0330/1224] Add Hifiberry DAC+DSP soundcard driver (#3224) +Subject: [PATCH 0330/1225] Add Hifiberry DAC+DSP soundcard driver (#3224) Adds the driver for the Hifiberry DAC+DSP. It supports capture and playback depending on the DSP firmware. @@ -336582,10 +336582,10 @@ index 2023b0a18a2c6..133b6d98f515f 100644 2.18.4 -From 0842bfa8c90301b1051eecf9a5b345b4c5402690 Mon Sep 17 00:00:00 2001 +From 1595ad0b4cf3248f9238c307c8deda2d0cf35488 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 17:24:55 +0100 -Subject: [PATCH 0331/1224] staging: bcm2835-codec: Allow height of 1920. +Subject: [PATCH 0331/1225] staging: bcm2835-codec: Allow height of 1920. The codec is happy with video up to 1920 high if the width is suitably reduced to stay within level limits. eg 1080x1920 @@ -336615,10 +336615,10 @@ index fb99bfb5bc1df..19d046767dbbd 100644 2.18.4 -From 8aca44c47e41e9d0fb9a4a2b19d7ab3ffda1bd4d Mon Sep 17 00:00:00 2001 +From 2ffeb42e31ae53b41d4a326b0b179d7964584296 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 15:11:47 +0100 -Subject: [PATCH 0332/1224] staging: bcm2835-codec: Correct g/s_selection API +Subject: [PATCH 0332/1225] staging: bcm2835-codec: Correct g/s_selection API MPLANE support The g_selection and s_selection API is messed up and requires @@ -336728,10 +336728,10 @@ index 19d046767dbbd..ce63643222667 100644 2.18.4 -From 4c109d1a1876b7a1b89756d7155065046bf3eb90 Mon Sep 17 00:00:00 2001 +From 06d5e5db02fc506cf6fc2fa78c64811dbd049b60 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Sep 2019 17:22:36 +0100 -Subject: [PATCH 0333/1224] drm/v3d: Delete pm_runtime support +Subject: [PATCH 0333/1225] drm/v3d: Delete pm_runtime support The pm_runtime was blocking changelist submission, so delete it as a temporary workaround. @@ -336798,10 +336798,10 @@ index 6cc67cab320ea..5294dd884867a 100644 2.18.4 -From 6d1b770b81acb022a8d4ad9e51c6ff91230b3efb Mon Sep 17 00:00:00 2001 +From dcc47773280b4bc5680f4e02478ca084ce7c0c36 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 19 Sep 2019 13:39:15 +0100 -Subject: [PATCH 0334/1224] configs: Regenerate defconfigs +Subject: [PATCH 0334/1225] configs: Regenerate defconfigs Signed-off-by: Phil Elwell --- @@ -336824,10 +336824,10 @@ index 33686cf34ff9c..4719d38c4b4e5 100644 2.18.4 -From 2df1afb3e90e61ca31e80749f2793763b160ded7 Mon Sep 17 00:00:00 2001 +From 9b1b1843ee00740f300e27bc6439092825e2a7af Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Sep 2019 09:02:10 +0100 -Subject: [PATCH 0335/1224] dts: Add DTS for Pi 2B rev 1.2 with BCM2837 (#3235) +Subject: [PATCH 0335/1225] dts: Add DTS for Pi 2B rev 1.2 with BCM2837 (#3235) Signed-off-by: Phil Elwell --- @@ -336863,10 +336863,10 @@ index 0000000000000..116cdbf94b9b0 2.18.4 -From 55d709d2587ef35df03db646e3ff3d62b676782f Mon Sep 17 00:00:00 2001 +From faf38aa2d2f4fc2b1440ca2ef4ddd6cf1f8dda9a Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 3 Sep 2019 08:45:24 +0200 -Subject: [PATCH 0336/1224] drm/v3d: clean caches at the end of render jobs on +Subject: [PATCH 0336/1225] drm/v3d: clean caches at the end of render jobs on request from user space Extends the user space ioctl for CL submissions so it can include a request @@ -337037,10 +337037,10 @@ index 58fbe48c91e90..b8c6f9d909424 100644 2.18.4 -From 4988fd3b482940c8591ac225e8a09ac93d63d7a8 Mon Sep 17 00:00:00 2001 +From 06935208ff07126f8dbdc2906a275e8b6984c635 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 23 Sep 2019 09:26:41 +0100 -Subject: [PATCH 0337/1224] kbuild: Allow .dtbo overlays to be built piecemeal +Subject: [PATCH 0337/1225] 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: @@ -337062,10 +337062,10 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile -index 7a47a2594f957..f67764a2f8693 100644 +index e27d031f3241e..d7281cd933a86 100644 --- a/Makefile +++ b/Makefile -@@ -1267,6 +1267,9 @@ ifneq ($(dtstree),) +@@ -1261,6 +1261,9 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ @@ -337079,10 +337079,10 @@ index 7a47a2594f957..f67764a2f8693 100644 2.18.4 -From 61c1df9f21c2422172d258330ce0174a33c5786a Mon Sep 17 00:00:00 2001 +From ef8c68926bb49687097444ea13907f545c7c40b3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 25 Sep 2019 09:49:58 +0100 -Subject: [PATCH 0338/1224] dma-direct: Temporary DMA fix on arm64 +Subject: [PATCH 0338/1225] dma-direct: Temporary DMA fix on arm64 See: https://github.com/raspberrypi/linux/issues/3251 @@ -337108,10 +337108,10 @@ index 0a093a675b632..d2b4628354698 100644 2.18.4 -From c7af8adaf295a1a119544bec2e77c845f4b7025c Mon Sep 17 00:00:00 2001 +From 67b355cb8dac1f9d9cea438bcf38bfd01f245df4 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 19 Sep 2019 20:45:30 +0200 -Subject: [PATCH 0339/1224] ARM: bcm: Switch board, clk and pinctrl to bcm2711 +Subject: [PATCH 0339/1225] ARM: bcm: Switch board, clk and pinctrl to bcm2711 compatible After the decision to use bcm2711 compatible for upstream, we should @@ -337140,10 +337140,10 @@ index 282a023027fc0..e538e0f899a58 100644 2.18.4 -From ac92454a5aaaa36d3d983520245c97a3d0b55326 Mon Sep 17 00:00:00 2001 +From 5bc364e51e677ca8c9b066945314efdf59709e9b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 21 Jul 2019 16:01:36 +0200 -Subject: [PATCH 0340/1224] pinctrl: bcm2835: Add support for BCM2711 pull-up +Subject: [PATCH 0340/1225] pinctrl: bcm2835: Add support for BCM2711 pull-up functionality commit e38a9a437fb93ddafab5030165e4c6a3a5021669 upstream. @@ -337186,10 +337186,10 @@ index 76fad11f2ad82..3cd4c4f1a47c2 100644 2.18.4 -From 20e2bb2304e1a80a31155fbc6ebf119ea7e9ca05 Mon Sep 17 00:00:00 2001 +From 0dae8aedc5c85227f3fe21d08aa2381685d21a05 Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Sun, 6 Oct 2019 03:23:15 +0200 -Subject: [PATCH 0341/1224] vchiq_2835_arm: suppress warning +Subject: [PATCH 0341/1225] vchiq_2835_arm: suppress warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -337224,10 +337224,10 @@ index 230e1b1144a9d..2dfdee1f814f1 100644 2.18.4 -From cfeb64b06e54b2ab4e9372fb7532fa519be68d4c Mon Sep 17 00:00:00 2001 +From 1f3b35863ae588c86aabddaabfa59c53b228a2e0 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 24 Sep 2019 18:26:55 +0100 -Subject: [PATCH 0342/1224] Rename HDMI ALSA device names, check for enable +Subject: [PATCH 0342/1225] Rename HDMI ALSA device names, check for enable state HDMI Alsa devices renamed to match names used by DRM, to @@ -337247,7 +337247,7 @@ Signed-off-by: James Hughes 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index 4d5b99d8ae9dc..2f465dba54bfc 100644 +index eb8a8a5b7ec8d..f926784c622de 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -9,8 +9,9 @@ @@ -337370,10 +337370,10 @@ index 4d5b99d8ae9dc..2f465dba54bfc 100644 2.18.4 -From 96fb54f6618ad2b255f15a009945ec918305ae30 Mon Sep 17 00:00:00 2001 +From 34674b1f9eeade6fde22862d554538be8d5bc21a Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Fri, 4 Oct 2019 16:41:30 +0200 -Subject: [PATCH 0343/1224] pcie-brcmstb-bounce64.c: dev_err() -> dev_info() +Subject: [PATCH 0343/1225] pcie-brcmstb-bounce64.c: dev_err() -> dev_info() for info messages "dmabounce: initialised" is not an error, so do not log it as such. @@ -337401,10 +337401,10 @@ index 6a872975ba9e1..ac8dde3c030b7 100644 2.18.4 -From 35a691552beb78c8f2a557def752425a2c5a8429 Mon Sep 17 00:00:00 2001 +From e5cc69ca674a1e794594de7b4b17d7e640ef06cf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Sep 2019 18:28:17 +0100 -Subject: [PATCH 0344/1224] drm/vc4: Add support for YUV color encodings and +Subject: [PATCH 0344/1225] drm/vc4: Add support for YUV color encodings and ranges The BT601/BT709 color encoding and limited vs full @@ -337420,10 +337420,10 @@ Signed-off-by: Dave Stevenson 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 5e5f90810acaf..1c5eef3ac4415 100644 +index 363f456ea7134..5ea6c84d7f6d7 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -577,6 +577,53 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state) +@@ -585,6 +585,53 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state) return 0; } @@ -337477,7 +337477,7 @@ index 5e5f90810acaf..1c5eef3ac4415 100644 /* Writes out a full display list for an active plane to the plane's * private dlist state. */ -@@ -856,9 +903,20 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -864,9 +911,20 @@ static int vc4_plane_mode_set(struct drm_plane *plane, /* Colorspace conversion words */ if (vc4_state->is_yuv) { @@ -337501,7 +337501,7 @@ index 5e5f90810acaf..1c5eef3ac4415 100644 } vc4_state->lbm_offset = 0; -@@ -1265,5 +1323,13 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1275,5 +1333,13 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y); @@ -337547,10 +337547,10 @@ index b5a6b4cdd3328..8416fdaf2ec47 100644 2.18.4 -From 935f37e6837a05bfb76d732a18a78b26d3445915 Mon Sep 17 00:00:00 2001 +From 9ed8bce668ca16d7780819932e2676f37ea95088 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Sep 2019 18:36:32 +0100 -Subject: [PATCH 0345/1224] drm/vc4: Add support for H & V flips +Subject: [PATCH 0345/1225] drm/vc4: Add support for H & V flips The HVS supports horizontal and vertical flips whilst composing. @@ -337562,10 +337562,10 @@ Signed-off-by: Dave Stevenson 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 1c5eef3ac4415..f21c03f550e58 100644 +index 5ea6c84d7f6d7..68aa6db8ea053 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -637,6 +637,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -645,6 +645,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, const struct hvs_format *format = vc4_get_hvs_format(fb->format->format); u64 base_format_mod = fourcc_mod_broadcom_mod(fb->modifier); int num_planes = fb->format->num_planes; @@ -337573,7 +337573,7 @@ index 1c5eef3ac4415..f21c03f550e58 100644 u32 h_subsample = fb->format->hsub; u32 v_subsample = fb->format->vsub; bool mix_plane_alpha; -@@ -654,6 +655,24 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -662,6 +663,24 @@ static int vc4_plane_mode_set(struct drm_plane *plane, if (ret) return ret; @@ -337598,7 +337598,7 @@ index 1c5eef3ac4415..f21c03f550e58 100644 /* SCL1 is used for Cb/Cr scaling of planar formats. For RGB * and 4:4:4, scl1 should be set to scl0 so both channels of * the scaler do the same thing. For YUV, the Y plane needs -@@ -668,15 +687,15 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -676,15 +695,15 @@ static int vc4_plane_mode_set(struct drm_plane *plane, scl1 = vc4_get_scl_field(state, 0); } @@ -337623,7 +337623,7 @@ index 1c5eef3ac4415..f21c03f550e58 100644 switch (base_format_mod) { case DRM_FORMAT_MOD_LINEAR: -@@ -736,7 +755,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -744,7 +763,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, * definitely required (I guess it's also related to the "going * backward" situation). */ @@ -337632,7 +337632,7 @@ index 1c5eef3ac4415..f21c03f550e58 100644 y_off = tile_h_mask - y_off; pitch0 = SCALER_PITCH0_TILE_LINE_DIR; } else { -@@ -834,7 +853,9 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -842,7 +861,9 @@ static int vc4_plane_mode_set(struct drm_plane *plane, VC4_SET_FIELD(tiling, SCALER_CTL0_TILING) | (vc4_state->is_unity ? SCALER_CTL0_UNITY : 0) | VC4_SET_FIELD(scl0, SCALER_CTL0_SCL0) | @@ -337643,7 +337643,7 @@ index 1c5eef3ac4415..f21c03f550e58 100644 /* Position Word 0: Image Positions and Alpha Value */ vc4_state->pos0_offset = vc4_state->dlist_count; -@@ -1331,5 +1352,11 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1341,5 +1362,11 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, DRM_COLOR_YCBCR_BT709, DRM_COLOR_YCBCR_LIMITED_RANGE); @@ -337659,10 +337659,10 @@ index 1c5eef3ac4415..f21c03f550e58 100644 2.18.4 -From 1a2ba80072d667adc4391d19fd0b5dfed81b25da Mon Sep 17 00:00:00 2001 +From 6015d481906ec9d5863c4d0bee98b998a14a94c3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 18 Sep 2019 15:49:13 +0100 -Subject: [PATCH 0346/1224] drm/vc4: Correct handling of rotation parameter in +Subject: [PATCH 0346/1225] drm/vc4: Correct handling of rotation parameter in fkms One bit within DRM_MODE_ROTATE_MASK will always be set to @@ -337751,10 +337751,10 @@ index a487fcf1eaf39..f3ec265a9798d 100644 2.18.4 -From 9af8c5d615462865b7474ce7715ca3c7426d0c0a Mon Sep 17 00:00:00 2001 +From 827414925d70a6e9facf05726ce87e1c7a4890b8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 9 Oct 2019 17:22:07 +0100 -Subject: [PATCH 0347/1224] bcm2711: Retain support for old dtbs +Subject: [PATCH 0347/1225] bcm2711: Retain support for old dtbs The recent series switching to bcm2711 as the DT identifier broke Pis running with old DTBs. Add some bcm2838 compatible strings as a @@ -337816,10 +337816,10 @@ index 3cd4c4f1a47c2..e77c3ea15fdea 100644 2.18.4 -From 8e89efb2400e30bcb09a32da27a57f796385a471 Mon Sep 17 00:00:00 2001 +From 27935ca91e74af32db8345e6f12322d1e9b12bce Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Thu, 10 Oct 2019 19:12:08 +0200 -Subject: [PATCH 0348/1224] dt-bindings: Add binding for the Infineon IRS1125 +Subject: [PATCH 0348/1225] dt-bindings: Add binding for the Infineon IRS1125 sensor Adds a binding for the Infineon IRS1125 time-of-flight depth @@ -337889,10 +337889,10 @@ index 0000000000000..25a48028c9577 2.18.4 -From 1217c65764878cc001ac7e8503bb14ca6a506409 Mon Sep 17 00:00:00 2001 +From a78d0aaf87f10b0990795f6eecd2b363503134ca Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Thu, 10 Oct 2019 19:12:36 +0200 -Subject: [PATCH 0349/1224] media: i2c: Add a driver for the Infineon IRS1125 +Subject: [PATCH 0349/1225] media: i2c: Add a driver for the Infineon IRS1125 depth sensor The Infineon IRS1125 is a time of flight depth sensor that @@ -339134,10 +339134,10 @@ index 0000000000000..dccaca23aa76a 2.18.4 -From d28ef16111bf1422c74be6a63d90f777377cdabd Mon Sep 17 00:00:00 2001 +From 4637ff37b9e2d17476cb105157e2a1c247106ff1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 17:19:33 +0100 -Subject: [PATCH 0350/1224] staging:bcm2835-codec: Add support for +Subject: [PATCH 0350/1225] staging:bcm2835-codec: Add support for ENUM_FRAMESIZES Required for compliance testing for the encoder. @@ -339238,10 +339238,10 @@ index ce63643222667..09d662d1dee33 100644 2.18.4 -From d8e733dd739ebf1d4b8b07d6d5dc86f881d8409d Mon Sep 17 00:00:00 2001 +From 1ea0fd3d0aaab282b4aa87821fc1c106ab02abd6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 17:22:08 +0100 -Subject: [PATCH 0351/1224] staging: bcm2835-codec: Correct buffer type check +Subject: [PATCH 0351/1225] staging: bcm2835-codec: Correct buffer type check on G_PARM The output queue buffer type is now OUTPUT_MPLANE. @@ -339269,10 +339269,10 @@ index 09d662d1dee33..a0d4b0d006c64 100644 2.18.4 -From 309cdf513ec1002dfd796fa905263ef6c4f897e9 Mon Sep 17 00:00:00 2001 +From 7aeee361372d2a87eac8182e8119a401ff84a84e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 17:23:26 +0100 -Subject: [PATCH 0352/1224] staging: bcm2835-codec: Set default and error check +Subject: [PATCH 0352/1225] staging: bcm2835-codec: Set default and error check timeperframe G_PARM default was invalid as 0/0, and the driver didn't check @@ -339312,10 +339312,10 @@ index a0d4b0d006c64..41fca575b3952 100644 2.18.4 -From 3b57a3583152d7e6e65a283fa4c4ad47928f940b Mon Sep 17 00:00:00 2001 +From cedcd13c5eae542cb233684df96611435203e626 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 7 Oct 2019 14:02:57 +0100 -Subject: [PATCH 0353/1224] staging: bcm2835-codec: Fix imbalance in +Subject: [PATCH 0353/1225] staging: bcm2835-codec: Fix imbalance in dma_buf_get/dma_buf_put When represented with a dmabuf buffer that had previously been @@ -339348,10 +339348,10 @@ index 41fca575b3952..f5adaac765cdf 100644 2.18.4 -From 8a9390691ad3c802d4214072ce7ccae64b860723 Mon Sep 17 00:00:00 2001 +From a4e90c2d3f9758ab6f76b118e25f28a397c32c06 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 16 Oct 2019 14:49:23 +0100 -Subject: [PATCH 0354/1224] drm:vc4 Added calls for firmware display +Subject: [PATCH 0354/1225] drm:vc4 Added calls for firmware display blank/unblank Requires new display power mailbox call to be present. @@ -339444,10 +339444,10 @@ index 102c2e5dd2f2c..ae71820af8e59 100644 2.18.4 -From 47ede0b7c0aee8639d69fdb21f835ad4705a2269 Mon Sep 17 00:00:00 2001 +From f7a5a3039b789c130fd2dcb088de3fb14c65c988 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 4 Nov 2019 00:52:35 +0000 -Subject: [PATCH 0355/1224] configs: Rebuild with savedefconfig +Subject: [PATCH 0355/1225] configs: Rebuild with savedefconfig --- arch/arm/configs/bcm2711_defconfig | 8 -------- @@ -339518,10 +339518,10 @@ index ec25f919fe4b9..0775637872ca7 100644 2.18.4 -From 8f75c14d23c305b970f774b04df8fed953614cb7 Mon Sep 17 00:00:00 2001 +From 93f0e42741f570c838323ec9dac36769593e6eab Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 Nov 2019 11:28:19 +0000 -Subject: [PATCH 0356/1224] Revert "pinctrl: bcm2835: Pass irqchip when adding +Subject: [PATCH 0356/1225] Revert "pinctrl: bcm2835: Pass irqchip when adding gpiochip" This reverts commit 73345a18d464b1b945b29f54f630ace6873344e2. @@ -339631,10 +339631,10 @@ index e77c3ea15fdea..4ce2dd704c130 100644 2.18.4 -From 568cb2bce3e0e83b1d6b628d67d82426c0056893 Mon Sep 17 00:00:00 2001 +From 77ab67a0d4528e4a8150cbaae21b9c4472f6aa0c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Nov 2019 14:01:41 +0000 -Subject: [PATCH 0357/1224] drm/v3d: Don't clear MMU control bits on exception +Subject: [PATCH 0357/1225] 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 @@ -339671,10 +339671,10 @@ index 662e67279a7bb..fe2060c6b495a 100644 2.18.4 -From 8c296ab6e56447b0b576c94e4aa824ef39588d33 Mon Sep 17 00:00:00 2001 +From 8e0ffa8b471d14c240b5667163b2a8a3e90c5273 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Nov 2019 20:18:08 +0000 -Subject: [PATCH 0358/1224] drm/v3d: Suppress all but the first MMU error +Subject: [PATCH 0358/1225] 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. @@ -339716,10 +339716,10 @@ index fe2060c6b495a..7dde90d846f19 100644 2.18.4 -From 5649796126f1fdfeadcebbe237df962fde0e424c Mon Sep 17 00:00:00 2001 +From 853b9ed836f64f374ea703830a7b2c1c17021526 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 Nov 2019 16:41:21 +0000 -Subject: [PATCH 0359/1224] drm/v3d: Plug dma_fence leak +Subject: [PATCH 0359/1225] 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 @@ -339750,10 +339750,10 @@ index 035de14066d0b..8b5dc2b20e387 100644 2.18.4 -From baa2aacf729eb924f070f62ce97b970ee0046fcc Mon Sep 17 00:00:00 2001 +From 793d167ef831e9b73ac45f46c809cb2add858681 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:57:48 +0000 -Subject: [PATCH 0360/1224] staging: vchiq_arm: Register vcsm-cma as a platform +Subject: [PATCH 0360/1225] staging: vchiq_arm: Register vcsm-cma as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, @@ -339796,10 +339796,10 @@ index 4e684ccd9346a..2b859b98e17ba 100644 2.18.4 -From d2f0af0dc3b74deac2184689a73330e0a9d057ac Mon Sep 17 00:00:00 2001 +From c4514f3ce0858967e4bd65911839c4111d3f8117 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:57:58 +0000 -Subject: [PATCH 0361/1224] staging: vchiq_arm: Register bcm2835-codec as a +Subject: [PATCH 0361/1225] staging: vchiq_arm: Register bcm2835-codec as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, @@ -339842,10 +339842,10 @@ index 2b859b98e17ba..1e8b2c460783c 100644 2.18.4 -From f91a5f474a8037447a01e3075ee5cb6842e4d68f Mon Sep 17 00:00:00 2001 +From a720f5810a9dc847f72d28d745f627316a0a0890 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:58:08 +0000 -Subject: [PATCH 0362/1224] staging: bcm2835-codec: Fix potential memory leak +Subject: [PATCH 0362/1225] staging: bcm2835-codec: Fix potential memory leak of isp instance "d867785 staging: bcm2835-codec: add media controller support" added @@ -339877,10 +339877,10 @@ index f5adaac765cdf..50395795c3dba 100644 2.18.4 -From 902c5d41066e191d49690eff0ee3cb2702a8eb81 Mon Sep 17 00:00:00 2001 +From 9665d968ec90236608b704bd2329d74ac74cb3a4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:58:18 +0000 -Subject: [PATCH 0363/1224] staging: vchiq_arm: Unify the unload handling of +Subject: [PATCH 0363/1225] staging: vchiq_arm: Unify the unload handling of platform devs A helper function vchiq_register_child was added to deal with @@ -339912,10 +339912,10 @@ index 1e8b2c460783c..d9492e24e07d0 100644 2.18.4 -From d6c77371176b15bedf94576852175ff7a27454c4 Mon Sep 17 00:00:00 2001 +From 5f903b7d80117a8085ab6521217aed0ecffda60c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Nov 2019 11:59:01 +0000 -Subject: [PATCH 0364/1224] net: bcmgenet: The second IRQ is optional +Subject: [PATCH 0364/1225] 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. @@ -339942,10 +339942,10 @@ index 7dde90d846f19..586fb850f00fe 100644 2.18.4 -From ac10d17bfef8e5e7afc52115765c6f2d8748c9c8 Mon Sep 17 00:00:00 2001 +From 9ec7ef510eb4b69d2117727184e67146d088fb93 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Nov 2019 12:00:43 +0000 -Subject: [PATCH 0365/1224] drm/v3d: The third IRQ is optional +Subject: [PATCH 0365/1225] drm/v3d: The third IRQ is optional As of 5.4, the kernel logs errors for absent IRQs unless requested with platform_get_irq_optional. @@ -339972,10 +339972,10 @@ index 35816fe2ffd95..aba145a144b46 100644 2.18.4 -From 78f526821c09b9f0a1f3146ee0e4f300cb702165 Mon Sep 17 00:00:00 2001 +From 90e59895e2cd8311b9c581770cff286385ca4624 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 15 Nov 2019 08:48:08 +0000 -Subject: [PATCH 0366/1224] dwc_otg: Declare DMA capability with HCD_DMA flag +Subject: [PATCH 0366/1225] dwc_otg: Declare DMA capability with HCD_DMA flag Following [1], USB controllers have to declare DMA capabilities in order for them to be used by adding the HCD_DMA flag to their hc_driver @@ -340005,10 +340005,10 @@ index 9a150d6fdeb43..70cce7abfb8d8 100644 2.18.4 -From 7c27a355bb269b6134549979f18af85f2a22c095 Mon Sep 17 00:00:00 2001 +From cbde7cf6dc496ae6df0e6efb96c26041d223d54f Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 31 Oct 2019 13:37:16 +0000 -Subject: [PATCH 0367/1224] rpi-poe-fan: fix def_pwm1 writes +Subject: [PATCH 0367/1225] rpi-poe-fan: fix def_pwm1 writes Signed-off-by: Serge Schneider --- @@ -340032,10 +340032,10 @@ index 3effaf2eb86db..c9654e9e9f2d0 100644 2.18.4 -From 21b06dfb4c20490e13ad73a9e1d95e16968f6525 Mon Sep 17 00:00:00 2001 +From c2dcd0206f710f62a17b757a0992cfe389104dcc Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 31 Oct 2019 14:39:44 +0000 -Subject: [PATCH 0368/1224] net:phy:2711 Allow ethernet LED mode to be set via +Subject: [PATCH 0368/1225] net:phy:2711 Allow ethernet LED mode to be set via device tree Add device tree entries and code to allow the specification of @@ -340163,10 +340163,10 @@ index f5881fb95a5bf..8f26eaf2280c9 100644 2.18.4 -From f85a908f494e0b27c94c84ff5b5937f18759fb9b Mon Sep 17 00:00:00 2001 +From 42803b1497ea8f4b7605261694bb00e3572811eb Mon Sep 17 00:00:00 2001 From: Pierre-jean Texier Date: Wed, 6 Nov 2019 10:00:43 +0100 -Subject: [PATCH 0369/1224] overlays: smi: fix typo in comment (#3320) +Subject: [PATCH 0369/1225] overlays: smi: fix typo in comment (#3320) 5 represent alt1 function not alt0. @@ -340192,10 +340192,10 @@ index 70104c11627cf..bb8c7830df23f 100644 2.18.4 -From 339bb6af3f93b823e0a6df80f885479fce9d1609 Mon Sep 17 00:00:00 2001 +From 0ec66e4879ce5703d4ab8e153d6019ddcc1b1678 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 7 Nov 2019 14:59:59 +0000 -Subject: [PATCH 0370/1224] net:phy:2711 Change the default ethernet LED +Subject: [PATCH 0370/1225] net:phy:2711 Change the default ethernet LED actions This should return default behaviour back to that of previous @@ -340232,10 +340232,10 @@ index 8f26eaf2280c9..ed394d48ea247 100644 2.18.4 -From d100dd9248b7fd00da060232c6ca7a92e7eef78f Mon Sep 17 00:00:00 2001 +From c063cb2504586cfdbff7e19e98cb5315e6ea7bef Mon Sep 17 00:00:00 2001 From: Michael Kaplan Date: Fri, 8 Nov 2019 10:35:57 +0100 -Subject: [PATCH 0371/1224] overlays: Add apds9960 overlay +Subject: [PATCH 0371/1225] overlays: Add apds9960 overlay Add an overlay for the AVAGO APDS9960 digital proximity, ambient light, rgb and gesture sensor. Also update overlay README and Makefile. @@ -340346,10 +340346,10 @@ index 0000000000000..c216932278ab7 2.18.4 -From d723532cf3f7ecb37c07fb7f19f0c75dccc5ebe8 Mon Sep 17 00:00:00 2001 +From 98d2abf9f80ef13cbbb9a1ad1ccfa34bd0cb2582 Mon Sep 17 00:00:00 2001 From: Michael Kaplan Date: Fri, 8 Nov 2019 11:13:25 +0100 -Subject: [PATCH 0372/1224] configs: apds9960: add module to defconfigs +Subject: [PATCH 0372/1225] configs: apds9960: add module to defconfigs Signed-off-by: Michael Kaplan --- @@ -340431,10 +340431,10 @@ index ca7668f549bcd..d87831d79a03d 100644 2.18.4 -From 7e1e9145d5f67c935ff9b40c7bad57f5b4129052 Mon Sep 17 00:00:00 2001 +From 7b0e3cc5e82f704cd10ba0ad8c22fda57af723b5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Oct 2019 10:19:50 +0100 -Subject: [PATCH 0373/1224] overlays: Remove hack from uart0 overlay +Subject: [PATCH 0373/1225] overlays: Remove hack from uart0 overlay The uart0 overlay contained a hack to return GPIOs 14 and 15 to inputs when the UART0 function was moved to alternative pins. This has the @@ -340482,10 +340482,10 @@ index 57ba7745d0233..73d563bbaabfa 100755 2.18.4 -From 45393bacca8931185fb10569f5bc2ab8d279dced Mon Sep 17 00:00:00 2001 +From ab92079854e024a5e3f20e1c5a8cddf2cc916be7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 Nov 2019 16:28:10 +0000 -Subject: [PATCH 0374/1224] Revert "brcmfmac: Disable power management" +Subject: [PATCH 0374/1225] Revert "brcmfmac: Disable power management" Shortly after the release of the Pi 3B, a loss of SSH connectivity over WiFi was traced to the power management handling, so power @@ -340527,10 +340527,10 @@ index 4b97dfcda3cd3..4beef16e328ff 100644 2.18.4 -From 22feb6b2eca74c94e13c36974412a23d31d9cf37 Mon Sep 17 00:00:00 2001 +From 65939cdd2a03cf5f3fec4d1a7cb7871729c31c89 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Nov 2019 16:20:24 +0000 -Subject: [PATCH 0375/1224] arm: dts: overlays: pitft35-resistive: add upstream +Subject: [PATCH 0375/1225] arm: dts: overlays: pitft35-resistive: add upstream compatible The upstream hx8357d driver uses "adafruit,yx350hv15" for the compatible @@ -340560,10 +340560,10 @@ index a69b6c2c76081..37629f18a7400 100644 2.18.4 -From ffd65780799fc0da3531206a78d51fdda10f4b2a Mon Sep 17 00:00:00 2001 +From 0930ebaf0e89715cefb971ce2e5bccc1ebbc11f1 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 23 Aug 2019 16:34:38 +0100 -Subject: [PATCH 0376/1224] v3d_drv: Handle missing clock more gracefully +Subject: [PATCH 0376/1225] v3d_drv: Handle missing clock more gracefully Signed-off-by: popcornmix --- @@ -340591,10 +340591,10 @@ index 72da17e4963ee..8b08ad828fe72 100644 2.18.4 -From 4a994850d6e14f15486a2dd31f855d7ce62bf798 Mon Sep 17 00:00:00 2001 +From 1b965c126f9cc8ea2e7d1bd215ee78f0d8c97312 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 23:50:44 +0100 -Subject: [PATCH 0377/1224] v3d_drv: Allow clock retrieval by name +Subject: [PATCH 0377/1225] v3d_drv: Allow clock retrieval by name Signed-off-by: Phil Elwell --- @@ -340620,10 +340620,10 @@ index 8b08ad828fe72..2f50268c0159c 100644 2.18.4 -From 827697d15c4c5a2699f667bbffc1acf58880e44e Mon Sep 17 00:00:00 2001 +From 89dc3728ec767ebd54097b058e7b438df16694f9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 5 Sep 2019 17:59:14 +0100 -Subject: [PATCH 0378/1224] v3d_gem: Kick the clock so firmware knows we are +Subject: [PATCH 0378/1225] 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 @@ -340653,10 +340653,10 @@ index 8b5dc2b20e387..2d0626a527063 100644 2.18.4 -From fa17e8cd84ee79b586a89eb9abe0227d0ec0feeb Mon Sep 17 00:00:00 2001 +From 0aa16c6b740470e0e38a83e3c6abc57030b1d883 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 15:49:56 +0100 -Subject: [PATCH 0379/1224] clk-raspberrypi: Allow cpufreq driver to also +Subject: [PATCH 0379/1225] clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks For performance/power it is beneficial to adjust gpu clocks with arm clock. @@ -340684,10 +340684,10 @@ index 1654fd0eedc94..e4e1392403406 100644 2.18.4 -From 14abbeeb9eccd5a136e462bc04515b1791442841 Mon Sep 17 00:00:00 2001 +From c4190a1609b5626833ded832ab03142041b5f66a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 21 Aug 2019 14:55:56 +0100 -Subject: [PATCH 0380/1224] clk-raspberrypi: Also support v3d clock +Subject: [PATCH 0380/1225] clk-raspberrypi: Also support v3d clock Signed-off-by: popcornmix --- @@ -341337,10 +341337,10 @@ index e4e1392403406..8daf26df54308 100644 2.18.4 -From 300cccb2b3a80e105c9f99d9422327e646570bd7 Mon Sep 17 00:00:00 2001 +From 67b4e7f5f6ebfe5756cd364ec6241ffda6d5f355 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 3 Sep 2019 20:28:00 +0100 -Subject: [PATCH 0381/1224] clk-bcm2835: Disable v3d clock +Subject: [PATCH 0381/1225] clk-bcm2835: Disable v3d clock This is controlled by firmware, see clk-raspberrypi.c @@ -341401,10 +341401,10 @@ index 3921480d89fdd..8175ecea0fd9f 100644 2.18.4 -From 7725220135b0bee580f60001f5bcdc7a8c205b3a Mon Sep 17 00:00:00 2001 +From bac12a26702b3303a96824c687e78d73af44306e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 20 Aug 2019 17:53:47 +0100 -Subject: [PATCH 0382/1224] config: Switch to upstream cpufreq driver +Subject: [PATCH 0382/1225] config: Switch to upstream cpufreq driver Signed-off-by: popcornmix --- @@ -341437,10 +341437,10 @@ index 5f08fcdb02b19..3d437a331698a 100644 2.18.4 -From b16172b28f75fd5a4460cfee0d3dad80df87037f Mon Sep 17 00:00:00 2001 +From 9118e22d231e624423a43d206d21715d82bdbb82 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 13 Sep 2019 13:45:11 +0100 -Subject: [PATCH 0383/1224] raspberrypi-cpufreq: Only report integer pll +Subject: [PATCH 0383/1225] raspberrypi-cpufreq: Only report integer pll divisor frequencies --- @@ -341483,10 +341483,10 @@ index 2bc7d9734272a..8bcfab2749a8d 100644 2.18.4 -From 2b2b5ded6285c91323d8ccef5ae592d3352b411f Mon Sep 17 00:00:00 2001 +From 84156314fa7e95dd364fe4e10112efb4b3de3574 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 11:38:09 +0000 -Subject: [PATCH 0384/1224] configs: Regenerate defconfigs +Subject: [PATCH 0384/1225] configs: Regenerate defconfigs Signed-off-by: Phil Elwell --- @@ -341720,10 +341720,10 @@ index d87831d79a03d..7a29553d08d66 100644 2.18.4 -From c66dba8c47e96a8d84ba66e3a5b441b2e3cfbd09 Mon Sep 17 00:00:00 2001 +From e72c03079758fa49e4ab41bf154111a04f35e1f5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 11:44:30 +0000 -Subject: [PATCH 0385/1224] configs:2711: Add V3D clock support on arm64 +Subject: [PATCH 0385/1225] configs:2711: Add V3D clock support on arm64 The V3D driver now depends on the CLK_RASPBERRYPI and ARM_RASPBERRYPI_CPUFREQ drivers for dynamic clock control. Without @@ -341759,10 +341759,10 @@ index edab9acd21c8b..cbdad7c47bf33 100644 2.18.4 -From 8389c7b5437deb6f9ead57980ea0cfc3ef54f2cd Mon Sep 17 00:00:00 2001 +From 1c95a138fcde68071cabe7a681c768e3515ab932 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 15:08:25 +0000 -Subject: [PATCH 0386/1224] arm/dts: Correct Pi 4B LED values +Subject: [PATCH 0386/1225] arm/dts: Correct Pi 4B LED values The initial PHY LED settings are wrong Pi 4B (the correct values got dropped somewhere along the way). The PHY declaration should arguably @@ -341806,10 +341806,10 @@ index bacebaaac9d3e..d9a09e1296569 100644 2.18.4 -From 281c99865aeb0e215536b5e0d1af2de10a40e289 Mon Sep 17 00:00:00 2001 +From e647fd733d7d452aae305f1caa130d231b36e136 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 16:23:32 +0000 -Subject: [PATCH 0387/1224] drm/v3d: Set dma_mask as well as coherent_dma_mask +Subject: [PATCH 0387/1225] 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 @@ -341839,10 +341839,10 @@ index 2f50268c0159c..87ce683f3c04d 100644 2.18.4 -From 48ad9346cb4dc4d10e088d73fbd164ef26aa5b5c Mon Sep 17 00:00:00 2001 +From 0991224c72c83ea736137cc039acda17dcdd7cf3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 28 Nov 2019 15:49:08 +0000 -Subject: [PATCH 0388/1224] arm/dts: 2711: Add 'pcie0' alias +Subject: [PATCH 0388/1225] arm/dts: 2711: Add 'pcie0' alias It is useful for the firmware to be able to locate the pcie DT node, so add an alias pointing to it in the same way that "ethernet0" @@ -341869,10 +341869,10 @@ index 6ce9a58a6ed57..a967a7b86f2c1 100644 2.18.4 -From e64f582f2f30934fd011059475e5a85685101b17 Mon Sep 17 00:00:00 2001 +From ce4cd8bd72b45dd874a828b50b263bf73247f4d1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 28 Nov 2019 15:51:58 +0000 -Subject: [PATCH 0389/1224] Revert "drm/vc4: Add support for H & V flips" +Subject: [PATCH 0389/1225] Revert "drm/vc4: Add support for H & V flips" This reverts commit 3293cb5284bf7c80217cba8e7c3f67fba1953e1d. This functionality has already been added via @@ -341886,10 +341886,10 @@ Signed-off-by: Dave Stevenson 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index f21c03f550e58..1c5eef3ac4415 100644 +index 68aa6db8ea053..5ea6c84d7f6d7 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -637,7 +637,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -645,7 +645,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, const struct hvs_format *format = vc4_get_hvs_format(fb->format->format); u64 base_format_mod = fourcc_mod_broadcom_mod(fb->modifier); int num_planes = fb->format->num_planes; @@ -341897,7 +341897,7 @@ index f21c03f550e58..1c5eef3ac4415 100644 u32 h_subsample = fb->format->hsub; u32 v_subsample = fb->format->vsub; bool mix_plane_alpha; -@@ -655,24 +654,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -663,24 +662,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, if (ret) return ret; @@ -341922,7 +341922,7 @@ index f21c03f550e58..1c5eef3ac4415 100644 /* SCL1 is used for Cb/Cr scaling of planar formats. For RGB * and 4:4:4, scl1 should be set to scl0 so both channels of * the scaler do the same thing. For YUV, the Y plane needs -@@ -687,15 +668,15 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -695,15 +676,15 @@ static int vc4_plane_mode_set(struct drm_plane *plane, scl1 = vc4_get_scl_field(state, 0); } @@ -341947,7 +341947,7 @@ index f21c03f550e58..1c5eef3ac4415 100644 switch (base_format_mod) { case DRM_FORMAT_MOD_LINEAR: -@@ -755,7 +736,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -763,7 +744,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, * definitely required (I guess it's also related to the "going * backward" situation). */ @@ -341956,7 +341956,7 @@ index f21c03f550e58..1c5eef3ac4415 100644 y_off = tile_h_mask - y_off; pitch0 = SCALER_PITCH0_TILE_LINE_DIR; } else { -@@ -853,9 +834,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -861,9 +842,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, VC4_SET_FIELD(tiling, SCALER_CTL0_TILING) | (vc4_state->is_unity ? SCALER_CTL0_UNITY : 0) | VC4_SET_FIELD(scl0, SCALER_CTL0_SCL0) | @@ -341967,7 +341967,7 @@ index f21c03f550e58..1c5eef3ac4415 100644 /* Position Word 0: Image Positions and Alpha Value */ vc4_state->pos0_offset = vc4_state->dlist_count; -@@ -1352,11 +1331,5 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1362,11 +1341,5 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, DRM_COLOR_YCBCR_BT709, DRM_COLOR_YCBCR_LIMITED_RANGE); @@ -341983,10 +341983,10 @@ index f21c03f550e58..1c5eef3ac4415 100644 2.18.4 -From f2eee09ddbd832f0d8466cceb287e8c3f01efcd9 Mon Sep 17 00:00:00 2001 +From eaa9e9525affb25fa452726ebac352f3bf390f55 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 30 Nov 2019 23:10:26 +0100 -Subject: [PATCH 0390/1224] rpi-cirrus-wm5102-overlay: fix pinctrl +Subject: [PATCH 0390/1225] rpi-cirrus-wm5102-overlay: fix pinctrl configuration Separate GPIOs connected to wm5102 and wm8804 into 2 pinctrl @@ -342113,10 +342113,10 @@ index e2c25a0535e68..1cbf5812af35e 100644 2.18.4 -From 33484cf35250cbd9076ac729c1d1fcc6e8746364 Mon Sep 17 00:00:00 2001 +From 305981f66ba418a896769d38389c0d2b3a5f2d36 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Jan 2019 16:13:25 +0000 -Subject: [PATCH 0391/1224] staging: vchiq_arm: Set up dma ranges on child +Subject: [PATCH 0391/1225] staging: vchiq_arm: Set up dma ranges on child devices The VCHIQ driver now loads the audio, camera, codec, and vc-sm @@ -342152,10 +342152,10 @@ index d9492e24e07d0..d556f42f575a1 100644 2.18.4 -From 131332988984c828e08bc95ec1ed7c68ec55ba74 Mon Sep 17 00:00:00 2001 +From 877bbd42ea51b83b212afb585cbb0fa8aee0e6f3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Jun 2019 12:15:50 +0100 -Subject: [PATCH 0392/1224] staging: vchiq: Use the old dma controller for OF +Subject: [PATCH 0392/1225] 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 @@ -342209,10 +342209,10 @@ index d556f42f575a1..d84f7324fe148 100644 2.18.4 -From 5b0555cb028850a582b4184eecf32b2b587027ca Mon Sep 17 00:00:00 2001 +From 25a5b8e1937d77d34030b4c3da2f9f79c02d4a59 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 5 Dec 2019 16:34:39 +0000 -Subject: [PATCH 0393/1224] Revert "staging: bcm2835_camera: Ensure all buffers +Subject: [PATCH 0393/1225] Revert "staging: bcm2835_camera: Ensure all buffers are returned on disable" This reverts commit d70c57a7c6a069977a0d827e1d5e2de53fb87e6d. @@ -342242,10 +342242,10 @@ index 341594ab669f3..61a3593cdcfc3 100644 2.18.4 -From c086b83f958bd7616fd86f046f3218b91adbc977 Mon Sep 17 00:00:00 2001 +From e8aa8c39f8ae03b208b6b5d14d18b68b2d1df6fa Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Sun, 17 Nov 2019 10:31:46 +0800 -Subject: [PATCH 0394/1224] dwc_otg: checking the urb->transfer_buffer too +Subject: [PATCH 0394/1225] dwc_otg: checking the urb->transfer_buffer too early (#3332) After enable the HIGHMEM and VMSPLIT_3G, the dwc_otg driver doesn't @@ -342307,10 +342307,10 @@ index 70cce7abfb8d8..eda7a33908b33 100644 2.18.4 -From 8dc7ed993176bc71c98e3e02c4d2a9fb26f6cead Mon Sep 17 00:00:00 2001 +From bf52c237279aa1e5946529db0db65d983e7d52c3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Dec 2019 12:32:20 +0000 -Subject: [PATCH 0395/1224] overlays: Make mcp342x run-time compatible +Subject: [PATCH 0395/1225] overlays: Make mcp342x run-time compatible The order of processing of run-time overlays differs from that done by the firmware. This means that certain parameter processing techniques @@ -342522,10 +342522,10 @@ index 7bbb528f804f5..714eca5a4b5e0 100644 2.18.4 -From 71597d2503de5f7f2ea4ef0525c57ce1147f0b5f Mon Sep 17 00:00:00 2001 +From 7960bab1f8cde93b5f9ccba2c6db7666c2f5c93f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 29 Nov 2019 16:37:26 +0000 -Subject: [PATCH 0396/1224] config: arm64: Switch to upstream cpufreq driver +Subject: [PATCH 0396/1225] config: arm64: Switch to upstream cpufreq driver Signed-off-by: popcornmix --- @@ -342550,10 +342550,10 @@ index cbdad7c47bf33..7c14f88445a84 100644 2.18.4 -From 72f636a4c5173ed4b2f1e5408b0336cac975f6bf Mon Sep 17 00:00:00 2001 +From 49ae48cca455f8705cf1c4ec68483c01dc4618ff Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 16 Dec 2019 23:25:44 +0100 -Subject: [PATCH 0397/1224] rpi-cirrus-wm5102-overlay: use reset-gpios instead +Subject: [PATCH 0397/1225] rpi-cirrus-wm5102-overlay: use reset-gpios instead of wlf,reset wlf,reset has been deprecated in favour of the standard reset-gpios @@ -342582,10 +342582,10 @@ index 1cbf5812af35e..ed0c2745399f6 100644 2.18.4 -From 4a146b44206c2502d2c62f0c1bd68cefd1d7b944 Mon Sep 17 00:00:00 2001 +From 615588a45e7e9d2bc6c8f62e34543d8b78c1a71f Mon Sep 17 00:00:00 2001 From: Johannes Krude Date: Sat, 16 Nov 2019 12:41:06 +0100 -Subject: [PATCH 0398/1224] sound/soc: only first codec is master in multicodec +Subject: [PATCH 0398/1225] sound/soc: only first codec is master in multicodec setup When using multiple codecs, at most one codec should generate the master @@ -342622,10 +342622,10 @@ index 0b9f9a06bdb52..dd7fdb53cd643 100644 2.18.4 -From e405868905ea60cc607a849b3f2c10354cdf14a7 Mon Sep 17 00:00:00 2001 +From fda6a71de2c76ca747a7c91f820dda496f143495 Mon Sep 17 00:00:00 2001 From: Johannes Krude Date: Sat, 16 Nov 2019 13:14:43 +0100 -Subject: [PATCH 0399/1224] Allow simultaneous use of JustBoom DAC and Digi +Subject: [PATCH 0399/1225] Allow simultaneous use of JustBoom DAC and Digi Signed-off-by: Johannes Krude --- @@ -343137,10 +343137,10 @@ index 0000000000000..3d0194c1cab8b 2.18.4 -From 0354cf1d2d0cc14c14812df77c8440bc803306f8 Mon Sep 17 00:00:00 2001 +From 9303d665456c7117a01860f9a16c8fe4428e1498 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Dec 2019 10:41:33 +0000 -Subject: [PATCH 0400/1224] overlays: dht11: Allow multiple instantiation +Subject: [PATCH 0400/1225] overlays: dht11: Allow multiple instantiation Add addresses to the dht11 and dht11_pins nodes to allow unique names to be generated by assigning to the "reg" property. @@ -343177,10 +343177,10 @@ index 8de67527e3179..6feeeb402493e 100644 2.18.4 -From 7f5aeb01f89b132dfdcd6b793701d1934a52d859 Mon Sep 17 00:00:00 2001 +From b117876155649831f85c782010f5cbe4ae3c8ac0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 20 Dec 2019 15:50:19 +0000 -Subject: [PATCH 0401/1224] configs: Add CONFIG_NET_SCH_CAKE=m +Subject: [PATCH 0401/1225] configs: Add CONFIG_NET_SCH_CAKE=m See: https://github.com/raspberrypi/linux/issues/3180 @@ -343257,10 +343257,10 @@ index cfef51db953ab..10cf5ac4b833c 100644 2.18.4 -From 252496746e193bfeef3bfad5b6781903fd053d75 Mon Sep 17 00:00:00 2001 +From 7924ce0a5e048e32fb24a67a58739b7f99f18960 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sun, 22 Dec 2019 15:13:37 +0000 -Subject: [PATCH 0402/1224] configs: Add RTS_DRV_PCF85363 +Subject: [PATCH 0402/1225] configs: Add RTS_DRV_PCF85363 See: https://github.com/raspberrypi/firmware/issues/1309 @@ -343337,10 +343337,10 @@ index 10cf5ac4b833c..d8efa2d79d10a 100644 2.18.4 -From be0fbc709b99f2aeef0309ac769425fbccd541c2 Mon Sep 17 00:00:00 2001 +From 57033899cb6c46aad094668d87d044e85ed9903f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sun, 22 Dec 2019 15:29:40 +0000 -Subject: [PATCH 0403/1224] overlays: i2c-rtc: Add pcf85363 support +Subject: [PATCH 0403/1225] overlays: i2c-rtc: Add pcf85363 support See: https://github.com/raspberrypi/firmware/issues/1309 @@ -343401,10 +343401,10 @@ index af5ca042de75a..5df390b52a7bb 100644 2.18.4 -From 690e1b2eb6b6c5ccb44a122c118a9399c183702b Mon Sep 17 00:00:00 2001 +From 76f46142559db5a0bee421486f6def2aaf2ef74d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jan 2020 16:04:30 +0000 -Subject: [PATCH 0404/1224] pinctrl: bcm2835: Remove gpiochip on error +Subject: [PATCH 0404/1225] 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. @@ -343432,10 +343432,10 @@ index 4ce2dd704c130..c8db202f239da 100644 2.18.4 -From 8ff23d41091e193c6f83b8cf850d3b160254027f Mon Sep 17 00:00:00 2001 +From 7debe817f52cc14a6765cb97292095d63b1d4301 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jan 2020 14:05:42 +0000 -Subject: [PATCH 0405/1224] pinctrl: bcm2835: Change init order for gpio hogs +Subject: [PATCH 0405/1225] 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 @@ -343526,10 +343526,10 @@ index c8db202f239da..cf308212fecab 100644 2.18.4 -From 291ed023bad196beb148a918f1c046b224994667 Mon Sep 17 00:00:00 2001 +From 744ad8cce775cef2e8aea09a9af643c62d8b2916 Mon Sep 17 00:00:00 2001 From: Giedrius Date: Tue, 7 Jan 2020 11:04:21 +0200 -Subject: [PATCH 0406/1224] Pisound: MIDI communication fixes for scaled down +Subject: [PATCH 0406/1225] Pisound: MIDI communication fixes for scaled down CPU. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -343632,10 +343632,10 @@ index 6af9921b55c71..c9a881cf8f7c7 100644 2.18.4 -From a05222750f0e288c1738dd43007c675c266fe5e9 Mon Sep 17 00:00:00 2001 +From 5c0e88884b4814d557fb5f0b09fe5bf8477d1748 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Jan 2020 17:21:09 +0000 -Subject: [PATCH 0407/1224] pcie-brcmstb: Eliminate arch_dma_ops error message +Subject: [PATCH 0407/1225] pcie-brcmstb: Eliminate arch_dma_ops error message The driver attempts to set the dma_ops for the root complex, but doing so causes an error message and only the end points need it. Fix the @@ -343786,10 +343786,10 @@ index e8c8b355548a5..e646818ff21c3 100644 2.18.4 -From fad59ef5048812820c323de59393bc73b62f48e5 Mon Sep 17 00:00:00 2001 +From b777a48c092c99a3ec209901b4724a50c8bdc09e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Jan 2020 14:15:39 +0000 -Subject: [PATCH 0408/1224] brcmfmac: Disable power management +Subject: [PATCH 0408/1225] brcmfmac: Disable power management Disable power management in the brcmfmac driver again as it is still causing problems for some users. @@ -343823,10 +343823,10 @@ index 4beef16e328ff..4b97dfcda3cd3 100644 2.18.4 -From 7db06cba57bf2e641641d8411ab0b40340147667 Mon Sep 17 00:00:00 2001 +From ff29490388c9b1b96808f449f1e3d18430248189 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 8 Dec 2019 14:45:14 +0100 -Subject: [PATCH 0409/1224] Revert "mmc: sdhci: Mask "spurious" interrupts" +Subject: [PATCH 0409/1225] Revert "mmc: sdhci: Mask "spurious" interrupts" This reverts commit adac895210b88770190e9a501462f2100ab40ac8, because this issue is already addressed by commit 19ec6bb80290e496021488084944b77f03a87dd7. @@ -343855,10 +343855,10 @@ index c140c8dfd56ef..a1aeb2e105641 100644 2.18.4 -From 71f0b07054d8cf052be4f2bb591b7ac14f65d641 Mon Sep 17 00:00:00 2001 +From 354a3770dca47604064e1068ed65d1359b606c4b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 16 Aug 2019 22:32:02 +0200 -Subject: [PATCH 0410/1224] ARM: dts: bcm283x: Remove simple-bus from fixed +Subject: [PATCH 0410/1225] ARM: dts: bcm283x: Remove simple-bus from fixed clocks commit 4b2d24662126b1e2a6b95c9dfe9e9044e105e5bd upstream. @@ -343912,10 +343912,10 @@ index f0dbd6af90fae..701123c5f6ee2 100644 2.18.4 -From a926b083f4be303174e3d3e50f0219010945728a Mon Sep 17 00:00:00 2001 +From ce0a2c99d7ab699ee381bb7485eb8a6de3981b60 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:15:00 +0100 -Subject: [PATCH 0411/1224] ARM: dts: bcm283x: Move system timer back to +Subject: [PATCH 0411/1225] ARM: dts: bcm283x: Move system timer back to bcm283x.dtsi During Raspberry Pi 4 upstream discussion Tim Gover confirmed that the @@ -343995,10 +343995,10 @@ index 701123c5f6ee2..c9f405a0f5ecb 100644 2.18.4 -From ed76f92bcb8fed11d27d62929a2982078fa096b9 Mon Sep 17 00:00:00 2001 +From f686ae3e886fa17a68366aec1f497c53355d6da6 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 16:06:13 +0100 -Subject: [PATCH 0412/1224] ARM: dts: bcm283x: Move pixelvalve to +Subject: [PATCH 0412/1225] ARM: dts: bcm283x: Move pixelvalve to bcm2835-common.dtsi According to Eric Anholt the pixelvalves doesn't exists on BCM2711. @@ -344117,10 +344117,10 @@ index c9f405a0f5ecb..1a78bd08c19ee 100644 2.18.4 -From 995ebc3146c431f455e4471d668c8239ea3b8a90 Mon Sep 17 00:00:00 2001 +From da64d7c47aa108f9e1d7f4131b3ed161e777ae97 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 15:32:29 +0100 -Subject: [PATCH 0413/1224] ARM: dts: bcm2838-rpi-4-b: Fix memory node +Subject: [PATCH 0413/1225] ARM: dts: bcm2838-rpi-4-b: Fix memory node We need to declare the proper device type, otherwise U-Boot won't boot with this devicetree. While we are this let the bootloader set the actual @@ -344149,10 +344149,10 @@ index 7170a97bd3e4f..35502763882e0 100644 2.18.4 -From c73c928c50bf5dfabff0cf51de23a09fba4906ee Mon Sep 17 00:00:00 2001 +From db25c317d748a0f20af9c226f1754ed178affee8 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 15:43:41 +0100 -Subject: [PATCH 0414/1224] ARM: dts: bcm2838-rpi-4-b: Backport BT part from +Subject: [PATCH 0414/1225] ARM: dts: bcm2838-rpi-4-b: Backport BT part from upstream The CYW43455 on the Raspberry Pi 4 doesn't use an external pin as lower @@ -344182,10 +344182,10 @@ index 35502763882e0..e65f924e1fd29 100644 2.18.4 -From f4fa7637922fbf9590c338efd7657f5ff8407ca4 Mon Sep 17 00:00:00 2001 +From b5eac63c392299915ff0f1542afe2eca452cd544 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 15:55:29 +0100 -Subject: [PATCH 0415/1224] ARM: dts: bcm2838: Backport node names from +Subject: [PATCH 0415/1225] ARM: dts: bcm2838: Backport node names from upstream According to devicetree specification the node name should describe @@ -344231,10 +344231,10 @@ index f7b64e0770431..9b6edd6af4f27 100644 2.18.4 -From 458d46a1ff481a83dc404048f4946ed41202be4a Mon Sep 17 00:00:00 2001 +From a99b940466be37c74d684b8731edbf655e93f0ec Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 18:01:57 +0100 -Subject: [PATCH 0416/1224] ARM: dts: bcm283x: Move intc label to +Subject: [PATCH 0416/1225] ARM: dts: bcm283x: Move intc label to bcm2835-common.dtsi The intc label isn't defined in bcm283x.dtsi, so we cannot use it there. @@ -344275,10 +344275,10 @@ index 1a78bd08c19ee..3706a795b586c 100644 2.18.4 -From 8323c79d5b071a171925a10fd64201ceb1cc66b2 Mon Sep 17 00:00:00 2001 +From 7595cb3a2b62d86125b69309ead0385601655e98 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 18:19:28 +0100 -Subject: [PATCH 0417/1224] ARM: dts: bcm2838: Remove always-on from +Subject: [PATCH 0417/1225] ARM: dts: bcm2838: Remove always-on from armv7-timer After moving bcm2835-system-timer to bcm283x.dtsi there is no need for @@ -344305,10 +344305,10 @@ index 9b6edd6af4f27..bfde2a2ad3d00 100644 2.18.4 -From 2d8f7dcfd9069ce37afd5b50d4363a19487b7366 Mon Sep 17 00:00:00 2001 +From 672c755b3ceb3ca1c531c7472940c441e7add6ec Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 13:48:08 +0100 -Subject: [PATCH 0418/1224] Revert "phy: bcm54213pe: configure the LED outputs +Subject: [PATCH 0418/1225] Revert "phy: bcm54213pe: configure the LED outputs to be more user-friendly" This reverts commit 0f6693225eee62ee01c479c86fff76442979f906. @@ -344371,10 +344371,10 @@ index d7ebafbb32218..bfb37218f435c 100644 2.18.4 -From 94bd9be35f254e8e26cbe6680db8536ed2ed29ec Mon Sep 17 00:00:00 2001 +From 4ad96ffa99356f182866bb7d64c596d3166f08fc Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 13:48:32 +0100 -Subject: [PATCH 0419/1224] Revert "phy: broadcom: split out the BCM54213PE +Subject: [PATCH 0419/1225] Revert "phy: broadcom: split out the BCM54213PE from the BCM54210E IDs" This reverts commit a377688aa4f69ebfe75c9dfc986e7d19605eb39f. @@ -344445,10 +344445,10 @@ index bfb37218f435c..6db2d9a6e5031 100644 2.18.4 -From a09aa24ee44e0a078947fb13b531d8134af1d4f1 Mon Sep 17 00:00:00 2001 +From 97b50bdeae5969d707e9ae1d02afb4b0ce04605c Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 16:35:54 +0100 -Subject: [PATCH 0420/1224] net: bcmgenet: Add RGMII_RXID support +Subject: [PATCH 0420/1225] net: bcmgenet: Add RGMII_RXID support This adds the missing support for the PHY mode RGMII_RXID. It's necessary for the Raspberry Pi 4. @@ -344479,10 +344479,10 @@ index 3ba7332957186..0516d14f47035 100644 2.18.4 -From f7924ab0a508a2f86a37abd9859e5d37fc61d89a Mon Sep 17 00:00:00 2001 +From bd53efe21597747d45f4a0ba0cc695fe72f7af28 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 16:40:47 +0100 -Subject: [PATCH 0421/1224] ARM: dts: bcm2838: Backport genet from upstream +Subject: [PATCH 0421/1225] ARM: dts: bcm2838: Backport genet from upstream This backport all genet differences (different compatible, right PHY mode, board specific stuff) from upstream. @@ -344586,10 +344586,10 @@ index bfde2a2ad3d00..e6c79a2949e55 100644 2.18.4 -From bac29a8f32d0a3f151c9708782bf3941d5d22394 Mon Sep 17 00:00:00 2001 +From f2210d9c24d1391d4897a05ed036f1683c7362c8 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:40:56 +0100 -Subject: [PATCH 0422/1224] ARM: bcm: Backport BCM2711 support from upstream +Subject: [PATCH 0422/1225] ARM: bcm: Backport BCM2711 support from upstream Make the BCM2711 a different machine, but keep it in board_bcm2835. @@ -344684,10 +344684,10 @@ index 9dccf4db319b1..a65d89ff6a374 100644 2.18.4 -From 90838fddfee49dfb579a834d8256e00109a4a114 Mon Sep 17 00:00:00 2001 +From 5892877b8efc46b6164cd2900bada4a0ac29b899 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:55:59 +0100 -Subject: [PATCH 0423/1224] hwrng: iproc-rng200 - Add support for BCM2711 +Subject: [PATCH 0423/1225] hwrng: iproc-rng200 - Add support for BCM2711 commit 0f95b09a5f624964d520c8f6a2674090fb98ae25 upstream. @@ -344719,10 +344719,10 @@ index f971a4cb8951c..7b6966b7f6028 100644 2.18.4 -From 545aefa25e53ac28dcd37febf2418abe6d23eac9 Mon Sep 17 00:00:00 2001 +From 5aea2e9d7f15d96a7f4e38531e1b75ae17c2c562 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 12:01:17 +0100 -Subject: [PATCH 0424/1224] ARM: dts: bcm2838: Add upstream RNG compatible +Subject: [PATCH 0424/1225] ARM: dts: bcm2838: Add upstream RNG compatible This adds the ability to use the RNG with an upstream kernel. Keep the old one for backward compatibility. @@ -344749,10 +344749,10 @@ index e6c79a2949e55..60c706b4def06 100644 2.18.4 -From c44e78e19003ab432ae8b9fbed256c710d14f5bc Mon Sep 17 00:00:00 2001 +From 44a5d8c438b69e5514c6b151621a3ecb638369a2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 13:59:57 +0000 -Subject: [PATCH 0425/1224] driver: char: rpivid: Destroy the legacy device on +Subject: [PATCH 0425/1225] driver: char: rpivid: Destroy the legacy device on remove The legacy name support created a new device that was never destroyed. @@ -344781,10 +344781,10 @@ index e4e5fb1fb8209..f69047d6f9644 100644 2.18.4 -From 256495fb5f9a71f799fb8d0ce42685aba37a07b0 Mon Sep 17 00:00:00 2001 +From eba59fd6d4750f150ecae16e902fb76a9cd2e4be Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 Jan 2020 16:24:45 +0000 -Subject: [PATCH 0426/1224] driver: char: rpivid: Clean up error handling use +Subject: [PATCH 0426/1225] driver: char: rpivid: Clean up error handling use of ERR_PTR/IS_ERR The driver used an unnecessary intermediate void* variable so it @@ -344849,10 +344849,10 @@ index f69047d6f9644..ab42526ea8cf7 100644 2.18.4 -From cbc5e17da0887572ca8abbf3ad90f78f3362023f Mon Sep 17 00:00:00 2001 +From 23b14fe0d71270602beb1c7a488a725b2f2f4188 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 14:02:43 +0000 -Subject: [PATCH 0427/1224] driver: char: rpivid: Add error handling to the +Subject: [PATCH 0427/1225] driver: char: rpivid: Add error handling to the legacy device load The return value from device_create for the legacy device was never @@ -344897,10 +344897,10 @@ index ab42526ea8cf7..331e2e72aa4b1 100644 2.18.4 -From beded161cb59daed41d789cb2b359ea099440851 Mon Sep 17 00:00:00 2001 +From 31bb075f4b782d5c6f50fd6acd8852b469fd6467 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 14:05:45 +0000 -Subject: [PATCH 0428/1224] driver: char: rpivid: Fix coding style whitespace +Subject: [PATCH 0428/1225] driver: char: rpivid: Fix coding style whitespace issues. Makes checkpatch happier. @@ -344934,10 +344934,10 @@ index 331e2e72aa4b1..432fb05944f2a 100644 2.18.4 -From daf1060ae4ea6c100d98b267acaa28cbbd895af1 Mon Sep 17 00:00:00 2001 +From 2c6fece3ef55c0783ece1e3138ed68c8f0d3cbbf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 14:07:16 +0000 -Subject: [PATCH 0429/1224] driver: char: rpimem: Add SPDX licence header. +Subject: [PATCH 0429/1225] driver: char: rpimem: Add SPDX licence header. Stops checkpatch complaining. @@ -344959,10 +344959,10 @@ index 432fb05944f2a..fa97649b86c0b 100644 2.18.4 -From c39eb015059d7bca4cb8d58e7d5b7d9dec9f2a41 Mon Sep 17 00:00:00 2001 +From d2bc1cda074704019cf6bde1513b3226014c79ec Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 Jan 2020 16:44:14 +0000 -Subject: [PATCH 0430/1224] driver: char: rpivid: Fix access to freed memory +Subject: [PATCH 0430/1225] driver: char: rpivid: Fix access to freed memory The error path during probe frees the private memory block, and then promptly dereferences it to log an error message. @@ -344992,10 +344992,10 @@ index fa97649b86c0b..fbf3d4f3fe0cb 100644 2.18.4 -From 657c1b9029545abe4fc799ee733825f72ecd816a Mon Sep 17 00:00:00 2001 +From 4809a60b154be7935b6f86020c9a36d9f7fccf20 Mon Sep 17 00:00:00 2001 From: Willem Remie Date: Thu, 9 Jan 2020 21:16:49 +0100 -Subject: [PATCH 0431/1224] add BME680 to i2c-sensor overlay +Subject: [PATCH 0431/1225] add BME680 to i2c-sensor overlay --- arch/arm/boot/dts/overlays/README | 7 +++++-- @@ -345067,10 +345067,10 @@ index 777e4a68190a4..40881d72a1574 100644 2.18.4 -From 6e724d5b71180aab1c148db385c7539d36b03ae3 Mon Sep 17 00:00:00 2001 +From d99a6c66fc9553e9d26b3071e02a8ea4f06b3a5e Mon Sep 17 00:00:00 2001 From: Willem Remie Date: Thu, 9 Jan 2020 21:54:11 +0100 -Subject: [PATCH 0432/1224] configs: Add BME680 +Subject: [PATCH 0432/1225] configs: Add BME680 --- arch/arm/configs/bcm2709_defconfig | 1 + @@ -345144,10 +345144,10 @@ index d8efa2d79d10a..48eb2e6e342b9 100644 2.18.4 -From 552d06886e092a9dc705ec899b8250d7f005fbcc Mon Sep 17 00:00:00 2001 +From c57743bb7d3ce4aa43782083296d38972b18f556 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 7 Jan 2020 10:08:19 +0000 -Subject: [PATCH 0433/1224] dwc_otg: constrain endpoint max packet and transfer +Subject: [PATCH 0433/1225] dwc_otg: constrain endpoint max packet and transfer size on split IN The hcd would unconditionally set the transfer length to the endpoint @@ -345193,10 +345193,10 @@ index 9f2cd510c3015..cba2aa07e8b87 100644 2.18.4 -From 1c9cb4aa5771ca280949846eeb9237b87f854480 Mon Sep 17 00:00:00 2001 +From 406e82bec81678e41a30c5c65d37f8fe676fa53b Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 8 Jan 2020 12:48:09 +0000 -Subject: [PATCH 0434/1224] dwc_otg: fiq_fsm: pause when cancelling split +Subject: [PATCH 0434/1225] dwc_otg: fiq_fsm: pause when cancelling split transactions Non-periodic splits will DMA to/from the driver-provided transfer_buffer, @@ -345296,10 +345296,10 @@ index 0e9a34fe3a5c8..7a77977c9ddf9 100644 2.18.4 -From c0fd833b98df26bfe190d9bcdb5e470178896093 Mon Sep 17 00:00:00 2001 +From f78dc7587a0b5ff18fa59368b505b07aff67a6fb Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Mon, 13 Jan 2020 15:54:55 +0000 -Subject: [PATCH 0435/1224] dwc_otg: fiq_fsm: add a barrier on entry into FIQ +Subject: [PATCH 0435/1225] dwc_otg: fiq_fsm: add a barrier on entry into FIQ handler(s) On BCM2835, there is no hardware guarantee that multiple outstanding @@ -345351,10 +345351,10 @@ index a86d8ed771409..490a7801e737e 100644 2.18.4 -From 6957a9930f419c335c65d004a018643426b07ffd Mon Sep 17 00:00:00 2001 +From e68a99316187010324bf19ab0a6a4f6c495e2d33 Mon Sep 17 00:00:00 2001 From: Ed Spiridonov Date: Tue, 10 Dec 2019 22:45:04 +0300 -Subject: [PATCH 0436/1224] Add universal device tree overlay for SPI devices +Subject: [PATCH 0436/1225] Add universal device tree overlay for SPI devices Just specify the SPI address and device name ("compatible" property). This overlay lacks any device-specific parameter support! @@ -345635,11 +345635,11 @@ index 0000000000000..87523dcca318c 2.18.4 -From 3fb612689292d00cdce6cbc908b1511ce4c4eb57 Mon Sep 17 00:00:00 2001 +From 50906edac7bf4243919ddc269ee260e6cf329389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?= Date: Tue, 21 Jan 2020 15:58:39 +0100 -Subject: [PATCH 0437/1224] sound: Add the HiFiBerry DAC+HD version +Subject: [PATCH 0437/1225] sound: Add the HiFiBerry DAC+HD version This adds the driver for the DAC+HD version supporting HiFiBerry's PCM179x based DACs. It also adds PLL control for clock generation. @@ -346526,10 +346526,10 @@ index 0000000000000..79436dd0e06da 2.18.4 -From 503ab294120e4987db80257365a8179923577e2e Mon Sep 17 00:00:00 2001 +From 5363eaa0b49fbfdcce6d55638759f846f01a8eec Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Jan 2020 15:02:05 +0000 -Subject: [PATCH 0438/1224] configs: Add missing HIFIBERRYs to +Subject: [PATCH 0438/1225] configs: Add missing HIFIBERRYs to bcmrpi3_defconfig Signed-off-by: Phil Elwell @@ -346555,10 +346555,10 @@ index 3adf9e47b802c..ff65bc543f61f 100644 2.18.4 -From ea703c7bd69db8fbd346c1b4bf8b260e70ccac8b Mon Sep 17 00:00:00 2001 +From c8821a1dc0dbf85746cf0dfce08821b619c1f924 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 0439/1224] Initialise rpi-firmware before clk-bcm2835 +Subject: [PATCH 0439/1225] 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 @@ -346610,11 +346610,11 @@ index 6ab3bec57532e..4f3ab14d275a2 100644 2.18.4 -From fce9871adfbf136361d234d5e1e181885b216087 Mon Sep 17 00:00:00 2001 +From b62543644208a781db4f81e65b116288bc0551d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?= Date: Thu, 23 Jan 2020 13:32:13 +0100 -Subject: [PATCH 0440/1224] Fix master mode settings of HiFiBerry DAC+ADC PRO +Subject: [PATCH 0440/1225] Fix master mode settings of HiFiBerry DAC+ADC PRO card (#3424) This patch fixes the board DAI setting when in master-mode. @@ -346642,10 +346642,10 @@ index cc33d41748396..06e0b6a8fda62 100644 2.18.4 -From 400faf9ba6e3cb70f076dff9e1c6f404e5244442 Mon Sep 17 00:00:00 2001 +From 4b2a4efdf6ee8f7c14054181926a5774dfe8f02b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Jan 2020 09:02:37 +0000 -Subject: [PATCH 0441/1224] overlays: Use preferred compatible strings +Subject: [PATCH 0441/1225] overlays: Use preferred compatible strings Make sure all overlays have correct compatible strings before enabling the automated checking. @@ -346728,10 +346728,10 @@ index b610d82836081..bafab6c92506d 100644 2.18.4 -From 860ccc1915b30e398f41c19a004c5c1986b394ae Mon Sep 17 00:00:00 2001 +From 6161b1e0062f2521851eb020c074c53503d5d60a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Jan 2020 11:38:28 +0000 -Subject: [PATCH 0442/1224] tty: amba-pl011: Add un/throttle support +Subject: [PATCH 0442/1225] 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 @@ -346795,10 +346795,10 @@ index 83676bc79a195..6d90ee44036b3 100644 2.18.4 -From 8209de102ea7ededc96238d5636b21e376fd6496 Mon Sep 17 00:00:00 2001 +From 8fb301eadda7711c53efdc3ec9dff10e147a0a37 Mon Sep 17 00:00:00 2001 From: MikeDK Date: Sun, 26 Jan 2020 23:33:54 +0100 -Subject: [PATCH 0443/1224] Fix i2c-pwm-pca9685a overlay +Subject: [PATCH 0443/1225] Fix i2c-pwm-pca9685a overlay --- arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts | 2 +- @@ -346821,10 +346821,10 @@ index 108165df165ef..9bb16465a50e7 100644 2.18.4 -From 3952eece2224a75df530cd60fd19996c821f2b70 Mon Sep 17 00:00:00 2001 +From 97f39ea8496b0af5691d03e2293fd72ff4b79056 Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Mon, 27 Jan 2020 17:45:51 +0100 -Subject: [PATCH 0444/1224] adds LED OFF feature to HiFiBerry DAC+ADC PRO sound +Subject: [PATCH 0444/1225] adds LED OFF feature to HiFiBerry DAC+ADC PRO sound card This adds a DT overlay parameter 'leds_off' which allows @@ -346920,10 +346920,10 @@ index 06e0b6a8fda62..2883c3ce9488b 100644 2.18.4 -From 91ae3e4db4f27a1bbfd038ac423f9a1ec40c4bd9 Mon Sep 17 00:00:00 2001 +From 9ce27f466a890dd41b3b1251e4643bd021e797b8 Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Mon, 27 Jan 2020 20:37:34 +0100 -Subject: [PATCH 0445/1224] adds LED OFF feature to HiFiBerry DAC+ADC sound +Subject: [PATCH 0445/1225] adds LED OFF feature to HiFiBerry DAC+ADC sound card This adds a DT overlay parameter 'leds_off' which allows @@ -347007,10 +347007,10 @@ index ab454f2ecb17b..ca763fea1d823 100644 2.18.4 -From 463aa962ab9fdfd352238b184934493b47d059c3 Mon Sep 17 00:00:00 2001 +From 10e4c457d9703f26ed32c7e5a54abaadf1c6f950 Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Mon, 27 Jan 2020 20:58:24 +0100 -Subject: [PATCH 0446/1224] adds LED OFF feature to HiFiBerry DAC+/DAC+PRO +Subject: [PATCH 0446/1225] adds LED OFF feature to HiFiBerry DAC+/DAC+PRO sound cards This adds a DT overlay parameter 'leds_off' which allows @@ -347094,10 +347094,10 @@ index fdf6e950abd8c..4cde60a5b6f6a 100644 2.18.4 -From db44ad654688e43743a53e4b8ea26fd752ee28b6 Mon Sep 17 00:00:00 2001 +From 1072ec2cddfe36522f205ddf2cec62800cd1b95f Mon Sep 17 00:00:00 2001 From: gtrainavicius Date: Tue, 28 Jan 2020 14:16:37 +0200 -Subject: [PATCH 0447/1224] pisound: Added reading Pisound board hardware +Subject: [PATCH 0447/1225] pisound: Added reading Pisound board hardware revision and exposing it (#3425) pisound: Added reading Pisound board hardware revision and exposing it in kernel log and sysfs file: @@ -347301,10 +347301,10 @@ index c9a881cf8f7c7..3d0861082c83d 100644 2.18.4 -From 83de33f8ab5dfb30e541a9147e4b094235a51875 Mon Sep 17 00:00:00 2001 +From aa13752a5920eee8f512d7b692de3bcaf3af7d54 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 2 Aug 2019 15:20:11 +0100 -Subject: [PATCH 0448/1224] mmc: sdhci-iproc: Fix vmmc regulators on iProc +Subject: [PATCH 0448/1225] 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 @@ -347353,10 +347353,10 @@ index f4f5f0a70cda8..203940fd2900b 100644 2.18.4 -From f0321789209164a1f8bdc2ba417b0832938490eb Mon Sep 17 00:00:00 2001 +From 91ed14055e0f9fdf0351c81d2e456c862eefaab5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 30 Jul 2019 12:37:02 +0100 -Subject: [PATCH 0449/1224] ARM: dts: Declare RPi 4B SD card power regulator +Subject: [PATCH 0449/1225] ARM: dts: Declare RPi 4B SD card power regulator Later revisions of the Raspberry Pi 4B have a separate control over the SD card power. Expose that control to Linux as a fixed regulator with @@ -347428,10 +347428,10 @@ index a0605e2480afc..315576a5b9579 100644 2.18.4 -From 8d3840ef137446f5f30b0ea08ce2cf18b26d5d4f Mon Sep 17 00:00:00 2001 +From 8c9114a179813171bb767be731d6dbf760bcce7d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 11:41:25 +0100 -Subject: [PATCH 0450/1224] pcie-brcmstb: Bounce buffer support is for +Subject: [PATCH 0450/1225] pcie-brcmstb: Bounce buffer support is for BCM2711B0 Add a new compatible string to identify BCM2711B0, as later revisions @@ -347523,10 +347523,10 @@ index e646818ff21c3..fb777a4e47502 100644 2.18.4 -From 1fa9ea2bc9e8098501ecd5bec0ec0b76ff4f5049 Mon Sep 17 00:00:00 2001 +From 61d432de6cdcf1bd355a15cfb3a399c720696022 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 11:43:03 +0100 -Subject: [PATCH 0451/1224] bcm2838.dtsi: Use BCM2711 PCIe compatible string +Subject: [PATCH 0451/1225] bcm2838.dtsi: Use BCM2711 PCIe compatible string The BCM2711 PCIe controller has a limited address range in the B0 silicon, and the driver uses a compatible string to identify the @@ -347558,10 +347558,10 @@ index 60c706b4def06..847dc7e35c945 100644 2.18.4 -From af8b7ba7aac9f16e87b91989d6e7bec8ebeaa50d Mon Sep 17 00:00:00 2001 +From fb304dbcf572358b33c03189c7d753cfb284ef53 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 11:29:06 +0000 -Subject: [PATCH 0452/1224] ARM: dts: Remove bcm2838-rpi-4-b.dts +Subject: [PATCH 0452/1225] ARM: dts: Remove bcm2838-rpi-4-b.dts Upstream are not going to use the bcm2838 identifier, so begin the cleanup by removing the suggested upstream Pi 4 .dts file. @@ -347729,10 +347729,10 @@ index 7c3fc83fe66eb..0000000000000 2.18.4 -From 350f2761b28be1e82c49a21775367953d45b27fc Mon Sep 17 00:00:00 2001 +From 6b24fb277cf56b88ddfda30780a9cbf7513c3034 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 09:35:19 +0000 -Subject: [PATCH 0453/1224] tty: amba-pl011: Avoid rare write-when-full error +Subject: [PATCH 0453/1225] 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 @@ -347777,10 +347777,10 @@ index 6d90ee44036b3..3cd3028827d23 100644 2.18.4 -From cfd87be35784b34adedd30ca7a82f9f223488a6c Mon Sep 17 00:00:00 2001 +From ad97609acf3b107cee40dfca561393de02ca7d3e Mon Sep 17 00:00:00 2001 From: Tim Gover <990920+timg236@users.noreply.github.com> Date: Wed, 15 Jan 2020 11:26:19 +0000 -Subject: [PATCH 0454/1224] usb: xhci: Raspberry Pi FW loader for VIA VL805 +Subject: [PATCH 0454/1225] usb: xhci: Raspberry Pi FW loader for VIA VL805 The VL805 FW may either be loaded from an SPI EEPROM or alternatively loaded directly by the VideoCore firmware. A PCI reset will reset @@ -347869,10 +347869,10 @@ index ae71820af8e59..05c6989ec4c66 100644 2.18.4 -From 3075fe49eae127f27dba8e095faba5799e41271c Mon Sep 17 00:00:00 2001 +From d902511ec997560cba2de3f78b80c8ab701bbe59 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 14:32:51 +0000 -Subject: [PATCH 0455/1224] overlays: Correct the eth_led* colour assignments +Subject: [PATCH 0455/1225] overlays: Correct the eth_led* colour assignments See: https://github.com/raspberrypi/firmware/issues/1311 @@ -347926,10 +347926,10 @@ index 3f324380a9f2d..4032e1120d037 100644 2.18.4 -From d91f91143aeb50324dc19992ca8836bc31177bfb Mon Sep 17 00:00:00 2001 +From 32fc3e9cc01f8d6bd6abde452b83cb8d61ab94f2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 30 Jan 2020 12:42:07 +0000 -Subject: [PATCH 0456/1224] Revert "staging: vchiq_arm: Register a platform +Subject: [PATCH 0456/1225] Revert "staging: vchiq_arm: Register a platform device for audio" This reverts commit 25c7597af20d2b1d042bafd9be84eaa69c1690b7. @@ -347961,10 +347961,10 @@ index d84f7324fe148..7a9de9d0193c2 100644 2.18.4 -From 2f483ae71e9e48332902cfff839fa32cca1e6cbb Mon Sep 17 00:00:00 2001 +From 9c7d180740d2e5deee2f0bbf9aa9c25aef073a39 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jan 2020 09:47:00 +0000 -Subject: [PATCH 0457/1224] ARM: dts: Add sd_poll_once dtparam to bcm283x/2711 +Subject: [PATCH 0457/1225] ARM: dts: Add sd_poll_once dtparam to bcm283x/2711 The old sdtweak overlay allowed the SD interface to be effectively disabled unless there was a card present at boot time, but that @@ -348030,10 +348030,10 @@ index 4032e1120d037..699bf9a2fa858 100644 2.18.4 -From aa8e81fb6a51ceae686a4e4915903f01eea51b16 Mon Sep 17 00:00:00 2001 +From 3987a756932b06d3095bfc0e5424aeaf8285c7e3 Mon Sep 17 00:00:00 2001 From: MikeDK Date: Fri, 31 Jan 2020 10:57:21 +0100 -Subject: [PATCH 0458/1224] overlays: Add ssd1306-spi, ssh1106-spi, +Subject: [PATCH 0458/1225] overlays: Add ssd1306-spi, ssh1106-spi, ssd-1351-spi Add overlays for SSD1306, SH1106 and SSD1351 based OLED displays. @@ -348401,10 +348401,10 @@ index 0000000000000..0eb1451b36c07 2.18.4 -From e4421b96c350a26c587e4eee100c563d7c9adb3b Mon Sep 17 00:00:00 2001 +From 1ec284e567a17b6898fa8d2d1be758108683feec Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 12:42:27 +0000 -Subject: [PATCH 0459/1224] configs: Add NFS 4.2 support +Subject: [PATCH 0459/1225] configs: Add NFS 4.2 support See: https://github.com/raspberrypi/linux/issues/3397 @@ -348482,10 +348482,10 @@ index ff65bc543f61f..4688da5d2e645 100644 2.18.4 -From fe5ade74c00812b3d0fe9c4a274a639544349b3f Mon Sep 17 00:00:00 2001 +From e43256c9970c73dae1738a3399197a86eb7cc7d8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 13:03:21 +0000 -Subject: [PATCH 0460/1224] overlays: dwc2: Increase RX FIFO size +Subject: [PATCH 0460/1225] overlays: dwc2: Increase RX FIFO size The previous version of the dwc2 overlay set the RX FIFO size to 256 4-byte words. This sounds large enough for a 1024 byte packet (the @@ -348536,10 +348536,10 @@ index 6112640837fc0..96837d962188c 100644 2.18.4 -From e465ea00686540f595c77af701dbd171e20b7734 Mon Sep 17 00:00:00 2001 +From 9af8788281cca2562d07d3950e41053764018db5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 15:22:55 +0000 -Subject: [PATCH 0461/1224] overlays: Fix mcp23017's addr parameter +Subject: [PATCH 0461/1225] overlays: Fix mcp23017's addr parameter The addr parameter of the mcp23017 overlay was broken by the addition of the noints parameter; splitting the mcp node in two without also @@ -348588,10 +348588,10 @@ index 16af971c3bdb7..c546d8ba7e6d2 100644 2.18.4 -From cf639b37e4be7962de95d398759a4c2b27dd0d1f Mon Sep 17 00:00:00 2001 +From a4b0704b019f3f5220b18233f5c24191a9c655f1 Mon Sep 17 00:00:00 2001 From: Michael Kaplan Date: Wed, 5 Feb 2020 10:27:23 +0100 -Subject: [PATCH 0462/1224] overlays: add hdmi-backlight-hwhack-gpio-overlay +Subject: [PATCH 0462/1225] overlays: add hdmi-backlight-hwhack-gpio-overlay This is a Devicetree overlay for GPIO based backlight on/off capability. @@ -348705,10 +348705,10 @@ index 0000000000000..50b9a2665c80b 2.18.4 -From a4de1a16c8c7216838d09f344eb0570e2e540ba3 Mon Sep 17 00:00:00 2001 +From 0ba13b4c5a950b29d3dbb61c28bbfc06d050ddc7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 Nov 2019 16:28:10 +0000 -Subject: [PATCH 0463/1224] Revert "brcmfmac: Disable power management" +Subject: [PATCH 0463/1225] Revert "brcmfmac: Disable power management" Shortly after the release of the Pi 3B, a loss of SSH connectivity over WiFi was traced to the power management handling, so power @@ -348750,10 +348750,10 @@ index 4b97dfcda3cd3..4beef16e328ff 100644 2.18.4 -From d2520cfe768f1fd66e9f0a23b20001d006f3cac5 Mon Sep 17 00:00:00 2001 +From c76b9b1f302e225e9266909ab82d96af96e104a9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 09:32:22 +0000 -Subject: [PATCH 0464/1224] brcmfmac: Increase power saving delay to 2s +Subject: [PATCH 0464/1225] 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, @@ -348781,10 +348781,10 @@ index 4beef16e328ff..16bfcbe191c2d 100644 2.18.4 -From 9e6373b66474b5e599d31331156512280fcb0ff2 Mon Sep 17 00:00:00 2001 +From f985d5d37f52a68ec4beb86f492e7f33dd0c1e6a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jan 2020 11:39:39 +0000 -Subject: [PATCH 0465/1224] ARM: dts: Revert all changes to upstream dts files +Subject: [PATCH 0465/1225] ARM: dts: Revert all changes to upstream dts files With the possible exception of bcm2711* files where there is a name clash, we should not be modifying upstream DTS files. @@ -350742,10 +350742,10 @@ index 3706a795b586c..202a61f574c73 100644 2.18.4 -From f7bf1e94b992d8b5cfdcca601d93f294b01135cb Mon Sep 17 00:00:00 2001 +From 56427bf7869f6911890f28a78d0fe4ab27a317a2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 16:53:13 +0000 -Subject: [PATCH 0466/1224] ARM: dts: Clean out downstream BCM2711/2838 files +Subject: [PATCH 0466/1225] ARM: dts: Clean out downstream BCM2711/2838 files Signed-off-by: Phil Elwell --- @@ -352607,10 +352607,10 @@ index 847dc7e35c945..0000000000000 2.18.4 -From 0b0a05311947e8225c6ca222f4f4475f47bc2f03 Mon Sep 17 00:00:00 2001 +From 7b235a0eb46315b0f6bce7990ee553f3ddb9fba5 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 6 Oct 2019 15:41:25 +0200 -Subject: [PATCH 0467/1224] ARM: dts: Add minimal Raspberry Pi 4 support +Subject: [PATCH 0467/1225] ARM: dts: Add minimal Raspberry Pi 4 support This adds minimal support for the new Raspberry Pi 4 without the fancy stuff like GENET, PCIe, xHCI, 40 bit DMA and V3D. The RPi 4 is @@ -353646,10 +353646,10 @@ index 0000000000000..0ff0e9e253272 2.18.4 -From d07fcf610118ad3a6517c0f14ed2df11ad24f7a8 Mon Sep 17 00:00:00 2001 +From b98140a43e09d48403cde7b83887ff7daaf29b4f Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 6 Nov 2019 10:59:44 +0100 -Subject: [PATCH 0468/1224] ARM: dts: bcm2711: force CMA into first GB of +Subject: [PATCH 0468/1225] ARM: dts: bcm2711: force CMA into first GB of memory arm64 places the CMA in ZONE_DMA32, which is not good enough for the @@ -353698,10 +353698,10 @@ index ac83dac2e6ba6..34d24fe272e27 100644 2.18.4 -From 36ad4620f448c4caca15d2af9e62a721f1b06d76 Mon Sep 17 00:00:00 2001 +From ed848d16f61df183e40b32bc1aa850e401df421a Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 11 Nov 2019 20:49:26 +0100 -Subject: [PATCH 0469/1224] ARM: dts: bcm2711-rpi-4: Enable GENET support +Subject: [PATCH 0469/1225] ARM: dts: bcm2711-rpi-4: Enable GENET support This enables the Gigabit Ethernet support on the Raspberry Pi 4. The defined PHY mode is equivalent to the default register settings @@ -353792,10 +353792,10 @@ index 34d24fe272e27..961bed832755b 100644 2.18.4 -From 70596204d20d09bc7592f293b556da28dd226ca0 Mon Sep 17 00:00:00 2001 +From b255aaa69c39d580fd241bc1ad11d4e14ffe6a37 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 4 Dec 2019 13:56:33 +0100 -Subject: [PATCH 0470/1224] ARM: dts: bcm2711: fix soc's node dma-ranges +Subject: [PATCH 0470/1225] ARM: dts: bcm2711: fix soc's node dma-ranges Raspberry Pi's firmware has a feature to select how much memory to reserve for its GPU called 'gpu_mem'. The possible values go from 16MB @@ -353838,10 +353838,10 @@ index 961bed832755b..e2f6ffb00aa94 100644 2.18.4 -From 711288010f3bcc2fc73a6b5f1f2df20a0c1448cf Mon Sep 17 00:00:00 2001 +From 808d31828b7226bd0e245e2915b53bc9089edb0b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jan 2020 15:48:00 +0000 -Subject: [PATCH 0471/1224] ARM: dts: Rebuild downstream DTS files +Subject: [PATCH 0471/1225] ARM: dts: Rebuild downstream DTS files Refactor the tree of downstream DTS files to achieve approximately the same end result but wihout modifying upstream files (except for @@ -354938,10 +354938,10 @@ index 0000000000000..6c8b263882291 2.18.4 -From a44b8e76beaedd2cdd840286b7766badeb879633 Mon Sep 17 00:00:00 2001 +From a0ff8ecf8d8988cec491fafc950528746ddca323 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 15:47:43 +0000 -Subject: [PATCH 0472/1224] Revert "bcm2711: Retain support for old dtbs" +Subject: [PATCH 0472/1225] Revert "bcm2711: Retain support for old dtbs" This reverts commit 61a505c739150c8dbb57a73db5c6c720d5160157. --- @@ -354996,10 +354996,10 @@ index cf308212fecab..43e3127e25cda 100644 2.18.4 -From 0918288c4a016f1c103b9137e78159fca3aa76ed Mon Sep 17 00:00:00 2001 +From 90e5db5691fac8bcf09482034eb7975a362091d7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:26:18 +0000 -Subject: [PATCH 0473/1224] staging/vchiq_arm: Fix bcm2711 compatible string +Subject: [PATCH 0473/1225] staging/vchiq_arm: Fix bcm2711 compatible string Fixes: "vchiq: Add 36-bit address support" @@ -355034,10 +355034,10 @@ index 7a9de9d0193c2..3a120f3b33ad4 100644 2.18.4 -From a5d421feab233b9cf6a75977a2e42d79b17bff1a Mon Sep 17 00:00:00 2001 +From 036cce42b518acdb8e412fdfc5183de7e73f68ac Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:28:57 +0000 -Subject: [PATCH 0474/1224] bcm2835-dma: Correct SoC name +Subject: [PATCH 0474/1225] bcm2835-dma: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355529,10 +355529,10 @@ index 87fd58272e95f..8d7c80536aa42 100644 2.18.4 -From a635907a0aa7b6f74b8b6fae95237c0813dc170c Mon Sep 17 00:00:00 2001 +From 4d74aec6a193fb23949d7488a5ceadd7523c15fd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:33:40 +0000 -Subject: [PATCH 0475/1224] thermal: brcmstb_thermal: Correct SoC name +Subject: [PATCH 0475/1225] thermal: brcmstb_thermal: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355582,10 +355582,10 @@ index 7a7c6ad7b8a04..08f71fec51520 100644 2.18.4 -From 12fde8b86743b2b19495a92f7f127ad553f3cb91 Mon Sep 17 00:00:00 2001 +From dc8398aceb84b89be685dc0a2cff86b30d1c7518 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:36:57 +0000 -Subject: [PATCH 0476/1224] hwrng: iproc-rng200: Correct SoC name +Subject: [PATCH 0476/1225] hwrng: iproc-rng200: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355657,10 +355657,10 @@ index 7b6966b7f6028..857dacd49c3b2 100644 2.18.4 -From c2ebb6b7d56eb0180b3a9580dfa24dffd98ee66a Mon Sep 17 00:00:00 2001 +From b8b337a005de62f5cec66a1b7a1dbb97aee091b8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:39:40 +0000 -Subject: [PATCH 0477/1224] pcie-brcmstb: Correct SoC name +Subject: [PATCH 0477/1225] pcie-brcmstb: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355761,10 +355761,10 @@ index ac8dde3c030b7..dec65992902e4 100644 2.18.4 -From 4d64a5161ed0321b8eba6571b19d2a57c6d78810 Mon Sep 17 00:00:00 2001 +From 3165b9c6d98bd55603856294028521a3cbd4fcc3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 15:24:59 +0000 -Subject: [PATCH 0478/1224] ARM: dts: Correct SoC name +Subject: [PATCH 0478/1225] ARM: dts: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355817,10 +355817,10 @@ index 6c8b263882291..29e7aa15d5a37 100644 2.18.4 -From bf20c265c8922aa240cf526541296d858af1862f Mon Sep 17 00:00:00 2001 +From dfd3e14f4504d5a079deb8cc58ed012767a8b868 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 1 Feb 2020 08:58:11 +0000 -Subject: [PATCH 0479/1224] ARM: dts: Remove CMA allocation from Pi 4 dts +Subject: [PATCH 0479/1225] ARM: dts: Remove CMA allocation from Pi 4 dts The 5.5 tree includes a patch to disable the CMA command line parameter and replace it with properties from a DT node. @@ -355855,10 +355855,10 @@ index 2013cf8325679..f5bd44ea2bf19 100644 2.18.4 -From f8d830a803f9dbbc2c3cbb48483dbba59731e8cd Mon Sep 17 00:00:00 2001 +From 4b3a22c6c3f7013a0a3b5a4ec9b9593df419d1c5 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 6 Dec 2018 19:28:55 +0100 -Subject: [PATCH 0480/1224] staging: vchiq_arm: Register a platform device for +Subject: [PATCH 0480/1225] staging: vchiq_arm: Register a platform device for audio Following Eric's commit 37b7b3087a2f ("staging/vc04_services: Register a @@ -355896,10 +355896,10 @@ index 3a120f3b33ad4..57867b75d61a2 100644 2.18.4 -From 6bbcf9fa31a01854a1feae900670ce162d87d1c6 Mon Sep 17 00:00:00 2001 +From 188862cb54c27a47b51e0184c84f0b0b2bd16240 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 17:30:46 +0000 -Subject: [PATCH 0481/1224] staging: vchiq_arm: Give vchiq children DT nodes +Subject: [PATCH 0481/1225] 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 @@ -355941,10 +355941,10 @@ index 57867b75d61a2..a3fcb1830995c 100644 2.18.4 -From 4613136c281ae0ecd654c30bfc2c7895b4fef36e Mon Sep 17 00:00:00 2001 +From 8e1eec432db4ef4f6ae62bef94444ccd9fbc82c0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 17:03:29 +0000 -Subject: [PATCH 0482/1224] ARM: dts: Move audio node under the vchiq parent +Subject: [PATCH 0482/1225] ARM: dts: Move audio node under the vchiq parent VCHIQ kernel clients are now instantiated as platform drivers rather than using DT, but the children of the vchiq device can optionally be @@ -356028,10 +356028,10 @@ index 29e7aa15d5a37..a71b2eb74723f 100644 2.18.4 -From 7dc4d38685fe7471a93671e7478330e74b0daf03 Mon Sep 17 00:00:00 2001 +From 741fed199d5795ae479428519e4775279a1c0de8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Feb 2020 13:34:08 +0000 -Subject: [PATCH 0483/1224] ARM: dts: bcm283x: Restore simple-bus to /clocks +Subject: [PATCH 0483/1225] ARM: dts: bcm283x: Restore simple-bus to /clocks Commit [1] ([2] upstream) removed the "simple-bus" compatible string, "#address-cells" and "#size-cells" to fix some DT scheme warnings. In @@ -356069,10 +356069,10 @@ index 202a61f574c73..18a95aaca1912 100644 2.18.4 -From 7b7ef6a752a4cfac5e47d0aa5d410a340ee2adbc Mon Sep 17 00:00:00 2001 +From 85a0a8beb491f6e8be77d5f224897b509fc8e031 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Feb 2020 10:22:48 +0000 -Subject: [PATCH 0484/1224] Revert "ARM: dts: bcm283x: Restore simple-bus to +Subject: [PATCH 0484/1225] Revert "ARM: dts: bcm283x: Restore simple-bus to /clocks" This reverts commit 894dece014e4df68c9f6a11a0761fba1fcfc844f. @@ -356099,10 +356099,10 @@ index 18a95aaca1912..202a61f574c73 100644 2.18.4 -From d71598fa796262159d886fe01e688e3f64cf1675 Mon Sep 17 00:00:00 2001 +From edf58ce4d1da636633d4b5db06840d7e9a94c48c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Feb 2020 11:22:40 +0000 -Subject: [PATCH 0485/1224] ARM: dts: overlays: Create custom clocks in / +Subject: [PATCH 0485/1225] ARM: dts: overlays: Create custom clocks in / Change [1] removes the simple-bus compatible string from the "/clocks" node, preventing any custom clocks placed there from being initialised. @@ -356192,10 +356192,10 @@ index 7bf0317ea83bd..c5583e010339e 100644 2.18.4 -From 015c7cc059fec4867d8b081885c3a9d7e9a5f1f2 Mon Sep 17 00:00:00 2001 +From 6c56ee82778be33bd66f04a957eb9767a57289a7 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 30 Jan 2020 12:35:44 +0000 -Subject: [PATCH 0486/1224] staging: vc04_services: Fix vcsm overflow bug when +Subject: [PATCH 0486/1225] staging: vc04_services: Fix vcsm overflow bug when counting transactions The response block and local state were using u16 and u32 respectively @@ -356224,10 +356224,10 @@ index 83110c55f4402..c87b964abb315 100644 2.18.4 -From 71b7891805dcaac852a0d2d4db4d320f8eb67b8b Mon Sep 17 00:00:00 2001 +From 501dd506eef580d3dec3bed2837935f28c7c1e18 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 7 Feb 2020 09:51:31 +0000 -Subject: [PATCH 0487/1224] overlays: Add timeout_ms parameter to gpio-poweroff +Subject: [PATCH 0487/1225] overlays: Add timeout_ms parameter to gpio-poweroff The timeout_ms parameter specifies in milliseconds how long the kernel waits for power-down before issuing a WARN. The default value is 3000 ms. @@ -356266,10 +356266,10 @@ index bb8cd3bf264d1..416aa2bc797a3 100644 2.18.4 -From 4542c8966f0d44e5094958c8edaffe656257cc6b Mon Sep 17 00:00:00 2001 +From 3b002940e1542a19ee039ac726a5f6391b5ab29d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 10 Feb 2020 15:47:07 +0100 -Subject: [PATCH 0488/1224] defconfigs: enable CONFIG_BPF_LIRC_MODE2 +Subject: [PATCH 0488/1225] defconfigs: enable CONFIG_BPF_LIRC_MODE2 This enables support for IR decoding via BPF programs. @@ -356333,10 +356333,10 @@ index 6b4eae39fee66..894168aeef610 100644 2.18.4 -From 6bb278001735ea315fcd032a696e2b50defaf86f Mon Sep 17 00:00:00 2001 +From 15ed176e9c86733deb0fc177074c1b22579e0d18 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 10 Feb 2020 18:21:02 +0100 -Subject: [PATCH 0489/1224] bcmrpi3_defconfig: align RC config with +Subject: [PATCH 0489/1225] bcmrpi3_defconfig: align RC config with bcm2711_defconfig Signed-off-by: Matthias Reichl @@ -356385,10 +356385,10 @@ index 4688da5d2e645..1dad7bcb579ab 100644 2.18.4 -From 43fe7cca0f1f3d3ebfc8d0b4eb171dc5ae0a02c9 Mon Sep 17 00:00:00 2001 +From ee231645e452a0ec8d1854e3e9ef13e6d6d4cf65 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 6 Feb 2020 12:23:15 +0000 -Subject: [PATCH 0490/1224] of: overlay: Correct symbol path fixups +Subject: [PATCH 0490/1225] 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 @@ -356428,10 +356428,10 @@ index 1688f576ee8ac..bef83edca195b 100644 2.18.4 -From f429d5646ed1b9e794674eaf6abe4a8799259f05 Mon Sep 17 00:00:00 2001 +From 560ae06d8078070e4090c86ed5ea605ac44fb0ac Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 24 Feb 2020 11:13:09 +0000 -Subject: [PATCH 0491/1224] configs: Add CONFIG_HID_STEAM=m +Subject: [PATCH 0491/1225] configs: Add CONFIG_HID_STEAM=m See: https://github.com/raspberrypi/linux/issues/3344 @@ -356508,10 +356508,10 @@ index 1dad7bcb579ab..fa691991528fb 100644 2.18.4 -From f7619ee25c87f9b982bf2f9a1327bc0a09488196 Mon Sep 17 00:00:00 2001 +From 51c4dba3b9875dff3ce07f1b796fe23b202bddcd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Feb 2020 11:23:09 +0000 -Subject: [PATCH 0492/1224] configs: Add CONFIG_EXT4_ENCRYPTION=y +Subject: [PATCH 0492/1225] configs: Add CONFIG_EXT4_ENCRYPTION=y Enable EXT4 encryption support for all configurations except those based on the original BCM2835, i.e. not on B+, Zero, etc. This @@ -356620,10 +356620,10 @@ index fa691991528fb..b40477e1553be 100644 2.18.4 -From def283294db405c6a585930afae314af362babce Mon Sep 17 00:00:00 2001 +From 173373174ff942a7542d5bc05b71ab415840995e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Feb 2020 17:25:52 +0000 -Subject: [PATCH 0493/1224] configs: Add KVM support to arm64 bcm2711_defconfig +Subject: [PATCH 0493/1225] configs: Add KVM support to arm64 bcm2711_defconfig See: https://github.com/raspberrypi/linux/issues/3035 @@ -356651,10 +356651,10 @@ index 6be7a169eac1a..bf0551437fd7f 100644 2.18.4 -From 325543e987e4ac05a3bffe751368f1bae0cdb054 Mon Sep 17 00:00:00 2001 +From ef7060905605b55305e25c238c8e5c88120fded3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Mar 2020 09:43:41 +0000 -Subject: [PATCH 0494/1224] overlays: sc16ic750-i2c: Fix xtal parameter +Subject: [PATCH 0494/1225] overlays: sc16ic750-i2c: Fix xtal parameter The xtal parameter is targetting the wrong node - fix it. @@ -356682,10 +356682,10 @@ index 5fbff2e6c02df..16fe0d08cef1b 100644 2.18.4 -From 4487c8491a9a2b289fc9f424fc299d55f780529a Mon Sep 17 00:00:00 2001 +From 895755c2d2ad303cbfa35d9751edd9d70dc9b428 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:11 +0000 -Subject: [PATCH 0495/1224] Revert "pcie-brcmstb: Correct SoC name" +Subject: [PATCH 0495/1225] Revert "pcie-brcmstb: Correct SoC name" This reverts commit 900b4ad0814df7dbacb01318bf49af5bab605fa0. --- @@ -356781,10 +356781,10 @@ index dec65992902e4..ac8dde3c030b7 100644 2.18.4 -From 31e6782f7c81aa15dbfe77eaf3af058d36e6b4c4 Mon Sep 17 00:00:00 2001 +From 1fd62ff769d6669abb2156e37bbeee9bdefa749e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:23 +0000 -Subject: [PATCH 0496/1224] Revert "pcie-brcmstb: Bounce buffer support is for +Subject: [PATCH 0496/1225] Revert "pcie-brcmstb: Bounce buffer support is for BCM2711B0" This reverts commit 58ac2d4474e531300f9f83773aa4d09e95ee2626. @@ -356873,10 +356873,10 @@ index fb777a4e47502..e646818ff21c3 100644 2.18.4 -From 1641a0f37516a72599fa80e783220315bcc14819 Mon Sep 17 00:00:00 2001 +From f1d1c2391baa201b147ed2f55bf52d88e27bf5cf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:39 +0000 -Subject: [PATCH 0497/1224] Revert "pcie-brcmstb: Eliminate arch_dma_ops error +Subject: [PATCH 0497/1225] Revert "pcie-brcmstb: Eliminate arch_dma_ops error message" This reverts commit 27cf0ad95cdf30f52a5fc6c69014a0d7bf5a1222. @@ -357022,10 +357022,10 @@ index e646818ff21c3..e8c8b355548a5 100644 2.18.4 -From 9850d017ee5f4244c107ec5fbec30d977129b0bd Mon Sep 17 00:00:00 2001 +From 3325fe42e7654e2e5f8bc1a704acf1bfb836b7d0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:51 +0000 -Subject: [PATCH 0498/1224] Revert "pcie-brcmstb-bounce64.c: dev_err() -> +Subject: [PATCH 0498/1225] Revert "pcie-brcmstb-bounce64.c: dev_err() -> dev_info() for info messages" This reverts commit 2340a88a493d750dc3fcfa48de880fc4b8e479d2. @@ -357050,10 +357050,10 @@ index ac8dde3c030b7..6a872975ba9e1 100644 2.18.4 -From 4cb6a9aa2895bac0edb313ec985f889edb87733c Mon Sep 17 00:00:00 2001 +From 8048a6cdce337fc9a295fdbedf630d956f2258b6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 17:00:01 +0000 -Subject: [PATCH 0499/1224] Revert "Ported pcie-brcmstb bounce buffer +Subject: [PATCH 0499/1225] Revert "Ported pcie-brcmstb bounce buffer implementation to ARM64. (#3144)" This reverts commit 60f3db31d4cb785befed715b80c430f60f647701. @@ -357775,10 +357775,10 @@ index e8c8b355548a5..87fd40ae31400 100644 2.18.4 -From 0a417e8cbe381f717a0f09f3d53ccefedbb2b168 Mon Sep 17 00:00:00 2001 +From 8405f803a4ba5c8dc6d65b6936ffd53bc6b928ca Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 17:00:16 +0000 -Subject: [PATCH 0500/1224] Revert "pcie-brcmstb: Don't set DMA ops for root +Subject: [PATCH 0500/1225] Revert "pcie-brcmstb: Don't set DMA ops for root complex" This reverts commit 510a127017a0aada2734dbf57d25aaa0189198ff. @@ -357804,10 +357804,10 @@ index 87fd40ae31400..746cfb405ad38 100644 2.18.4 -From e32587ca4c007738971f07d0afaf1a434349ecf1 Mon Sep 17 00:00:00 2001 +From 684f596fddd25e8b0e51505cd4e8c19dd07eeff0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:06:59 +0000 -Subject: [PATCH 0501/1224] Revert "bcm2835-dma: Correct SoC name" +Subject: [PATCH 0501/1225] Revert "bcm2835-dma: Correct SoC name" This reverts commit f498861a16d0b9a189a329080da1aa64d6e9bda7. --- @@ -358297,10 +358297,10 @@ index 8d7c80536aa42..87fd58272e95f 100644 2.18.4 -From a9e25fa9e52a6b1cd3c515f1fd41236d9b89a3f8 Mon Sep 17 00:00:00 2001 +From b4377e1ddf288c6080f0a4319566c69995ab3dc3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:07:15 +0000 -Subject: [PATCH 0502/1224] Revert "bcm2835-dma: Add proper 40-bit DMA support" +Subject: [PATCH 0502/1225] Revert "bcm2835-dma: Add proper 40-bit DMA support" This reverts commit 773a2db89ad2785d72b215673d87c0a51d769f61. --- @@ -359249,10 +359249,10 @@ index 746cfb405ad38..782725e3adad5 100644 2.18.4 -From 0910ff5a7cc2f96f3a5dde41438991694feb783f Mon Sep 17 00:00:00 2001 +From ae9ea92b1d5ef8af5fdc17b6e6a1c39a2da1d457 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:07:39 +0000 -Subject: [PATCH 0503/1224] Revert "pcie-brcmstb: Changes for BCM2711" +Subject: [PATCH 0503/1225] Revert "pcie-brcmstb: Changes for BCM2711" This reverts commit 1dab5ded41ed07adc12f26e529aa64209a7c44b6. --- @@ -360695,10 +360695,10 @@ index 254783d1065f7..0000000000000 2.18.4 -From cf8ed44134a338fc1a4b7640ab7a9bf4873e2f36 Mon Sep 17 00:00:00 2001 +From 565b8b42998fe448da28a13f005a9682ac3e5a67 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:08:35 +0000 -Subject: [PATCH 0504/1224] Revert "PCI: brcmstb: Add MSI capability" +Subject: [PATCH 0504/1225] Revert "PCI: brcmstb: Add MSI capability" This reverts commit b1619c83208e7b804e2c3547dbf24bb02b3be239. --- @@ -361234,10 +361234,10 @@ index b028d4be81a23..27bcf83c99d7e 100644 2.18.4 -From 03168e40862a0f8cf6c957f737dc66ca39ce86f0 Mon Sep 17 00:00:00 2001 +From 3c9a9291dcfee159549b1a8cdabfb6fe1d8b3a30 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:08:49 +0000 -Subject: [PATCH 0505/1224] Revert "PCI: brcmstb: Add dma-range mapping for +Subject: [PATCH 0505/1225] Revert "PCI: brcmstb: Add dma-range mapping for inbound traffic" This reverts commit d45590eb858ac7a2578d477791881ba7ffb1e615. @@ -361742,10 +361742,10 @@ index 27bcf83c99d7e..babef9191e88c 100644 2.18.4 -From 86bc66f74411d20b1e92249feaec876ec3d7efce Mon Sep 17 00:00:00 2001 +From 4733a1a8d525d5db3ba7010ff9d21db188587ea8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:10:54 +0000 -Subject: [PATCH 0506/1224] Revert "PCI: brcmstb: Add Broadcom STB PCIe host +Subject: [PATCH 0506/1225] Revert "PCI: brcmstb: Add Broadcom STB PCIe host controller driver" This reverts commit 79624ca23c53064fefee774a89952a587b72cc01. @@ -362932,10 +362932,10 @@ index d922906790671..0000000000000 2.18.4 -From ad21f0500daebd98e0826bd5cc9eb89fea175b01 Mon Sep 17 00:00:00 2001 +From e5f4fb3ca40fb31e0949a86747c11c9ed6745381 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 12 Mar 2020 12:16:18 +0000 -Subject: [PATCH 0507/1224] Revert "arm64/mm: Limit the DMA zone for arm64" +Subject: [PATCH 0507/1225] Revert "arm64/mm: Limit the DMA zone for arm64" This reverts commit 47fec0dcefa53f44985e95785021447d646daa2b. --- @@ -362959,10 +362959,10 @@ index 798cface99928..602bd19630ff8 100644 2.18.4 -From addded01078402c5fc70a23a726d2669235b53de Mon Sep 17 00:00:00 2001 +From 5e32d49925bf4c08fc34fcb969f098021393bfad Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 12 Mar 2020 14:06:04 +0000 -Subject: [PATCH 0508/1224] Revert "dma-direct: check for overflows on 32 bit +Subject: [PATCH 0508/1225] Revert "dma-direct: check for overflows on 32 bit DMA addresses" This reverts commit e44850bd4205a8cf17f23c44668c0f8d28ad40b1. @@ -363009,10 +363009,10 @@ index 6a18a97b76a87..adf993a3bd580 100644 2.18.4 -From 45510fe0978a9ba3b578789942ea3eaaa965041f Mon Sep 17 00:00:00 2001 +From 0745b9854237dff10ec1a65460b0c120cd60a3a6 Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 3 Jul 2019 18:23:01 +0100 -Subject: [PATCH 0509/1224] of/address: Introduce of_get_next_dma_parent() +Subject: [PATCH 0509/1225] of/address: Introduce of_get_next_dma_parent() helper commit 862ab5578f754117742c8b8c8e5ddf98bdb190ba upstream. @@ -363055,10 +363055,10 @@ index 5abb056b2b515..b2a86049c4232 100644 2.18.4 -From 980eaec51baf6de23bf6fc1bc3a29b4e42fa71df Mon Sep 17 00:00:00 2001 +From d539353641085b43573c21465cb8b87d02c505e8 Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 3 Jul 2019 14:47:31 +0100 -Subject: [PATCH 0510/1224] of: address: Follow DMA parent for "dma-coherent" +Subject: [PATCH 0510/1225] of: address: Follow DMA parent for "dma-coherent" commit c60bf3eb888a362100aa1bdbea351dab681e262a upstream. @@ -363091,10 +363091,10 @@ index b2a86049c4232..42269c8a308b2 100644 2.18.4 -From b4b7f15a7b5e0d55bfc4c990baad84bc6e508fcf Mon Sep 17 00:00:00 2001 +From 9f021d81e7bb5c9d5b6dd60a34735907a0096bb7 Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Tue, 2 Jul 2019 18:42:39 +0100 -Subject: [PATCH 0511/1224] of: Factor out #{addr,size}-cells parsing +Subject: [PATCH 0511/1225] of: Factor out #{addr,size}-cells parsing In some cases such as PCI host controllers, we may have a "parent bus" which is an OF leaf node, but still need to correctly parse ranges from @@ -363218,10 +363218,10 @@ index 24786818e32e5..66294d29942ae 100644 2.18.4 -From 2ecd255d7afddfc05f2ea74951ac8a324968a64f Mon Sep 17 00:00:00 2001 +From 6aeba248c7083e5b10080a12b6a0f74deff3089b Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 4 Sep 2019 11:43:30 +0100 -Subject: [PATCH 0512/1224] of/address: Translate 'dma-ranges' for parent nodes +Subject: [PATCH 0512/1225] of/address: Translate 'dma-ranges' for parent nodes missing 'dma-ranges' commit 81db12ee15cb83926e290a8a3654a2dfebc80935 upstream. @@ -363264,10 +363264,10 @@ index 104617bffcc8e..4e41ab740fc3b 100644 2.18.4 -From 2290883b8dae5bc6dae243ddbc67b2c8a2f9c34b Mon Sep 17 00:00:00 2001 +From 0c993ce3db1aaaef831e5f1efc9272a15fa88450 Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 3 Jul 2019 18:42:20 +0100 -Subject: [PATCH 0513/1224] of: Make of_dma_get_range() work on bus nodes +Subject: [PATCH 0513/1225] of: Make of_dma_get_range() work on bus nodes commit 951d48855d86e72e0d6de73440fe09d363168064 upstream. @@ -363377,10 +363377,10 @@ index 4e41ab740fc3b..100b762ac0809 100644 2.18.4 -From f8196801ba924ebf460458048cf125d7147b8d5b Mon Sep 17 00:00:00 2001 +From d829512f3069900c904e074e822bd174ba5d657e Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:43 +0200 -Subject: [PATCH 0514/1224] arm64: mm: use arm64_dma_phys_limit instead of +Subject: [PATCH 0514/1225] arm64: mm: use arm64_dma_phys_limit instead of calling max_zone_dma_phys() commit ae970dc096b2d39f65f2e18d142e3978dc9ee1c7 upstream. @@ -363413,10 +363413,10 @@ index 602bd19630ff8..0b91dc1b825a0 100644 2.18.4 -From ccf6ba32add9e6a5fdf43e1342190e2b5d5b95e7 Mon Sep 17 00:00:00 2001 +From f7699481f4dec4c0d9dd44f62ad24f7588d5ab8b Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:44 +0200 -Subject: [PATCH 0515/1224] arm64: rename variables used to calculate +Subject: [PATCH 0515/1225] arm64: rename variables used to calculate ZONE_DMA32's size commit a573cdd7973dedd87e62196c400332896bb236c8 upstream. @@ -363536,10 +363536,10 @@ index 0b91dc1b825a0..95210411c6ba3 100644 2.18.4 -From e4511f47c40cf433d9ac505f2300715cdbc2aeb7 Mon Sep 17 00:00:00 2001 +From d29589f2ce1f4f023f7e1b93d7e5eba647300770 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:45 +0200 -Subject: [PATCH 0516/1224] arm64: use both ZONE_DMA and ZONE_DMA32 +Subject: [PATCH 0516/1225] arm64: use both ZONE_DMA and ZONE_DMA32 commit 1a8e1cef7603e218339ac63cb3178b25554524e5 upstream. @@ -363566,7 +363566,7 @@ Signed-off-by: Catalin Marinas 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index a0bc9bbb92f34..1dbeca5e80c97 100644 +index 9c8ea59398658..802f9931358c6 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -267,6 +267,10 @@ config GENERIC_CSUM @@ -363720,10 +363720,10 @@ index 95210411c6ba3..501158e47fa2d 100644 2.18.4 -From a8f27e2bbe1d26f250fb0e1f8a5bbd55d09cbc74 Mon Sep 17 00:00:00 2001 +From a0caea5d0a47b82026682d7a789acfe85cf2d7eb Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:46 +0200 -Subject: [PATCH 0517/1224] mm: refresh ZONE_DMA and ZONE_DMA32 comments in +Subject: [PATCH 0517/1225] mm: refresh ZONE_DMA and ZONE_DMA32 comments in 'enum zone_type' commit 734f9246e791d8da278957b2c326d7709b2a97c0 upstream. @@ -363808,10 +363808,10 @@ index a90aba3d6afb4..6d8ea64eeb286 100644 2.18.4 -From 355ae92aaf372e64797c2245028b1a80b9afe67c Mon Sep 17 00:00:00 2001 +From d3e00aa9beea550cd142da82fd97fcc745033633 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 28 Oct 2019 11:32:32 -0500 -Subject: [PATCH 0518/1224] resource: Add a resource_list_first_type helper +Subject: [PATCH 0518/1225] resource: Add a resource_list_first_type helper commit 494f8b10d832456a96be4ee7317425f6936cabc8 upstream. @@ -363850,10 +363850,10 @@ index 06da59b23b79d..ff0339df56afc 100644 2.18.4 -From f9d43c0112b564eec6773f40c19d8aae63ee1544 Mon Sep 17 00:00:00 2001 +From 0eb923acc7e1dc2adb309dcb386b0932ce7089ee Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Mon, 14 Oct 2019 20:31:03 +0200 -Subject: [PATCH 0519/1224] dma/direct: turn ARCH_ZONE_DMA_BITS into a variable +Subject: [PATCH 0519/1225] dma/direct: turn ARCH_ZONE_DMA_BITS into a variable commit 8b5369ea580964dbc982781bfb9fb93459fc5e8d upstream. @@ -364065,10 +364065,10 @@ index d2b4628354698..947823f1ccdfb 100644 2.18.4 -From cff555155dd9be3827520a3a0701d46acf3b5119 Mon Sep 17 00:00:00 2001 +From 63ceef2e3d19187babdb02f0b08c0379a9216a7e Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 Nov 2019 16:06:44 +0100 -Subject: [PATCH 0520/1224] dma-direct: check for overflows on 32 bit DMA +Subject: [PATCH 0520/1225] dma-direct: check for overflows on 32 bit DMA addresses As seen on the new Raspberry Pi 4 and sta2x11's DMA implementation it is @@ -364135,10 +364135,10 @@ index d03af3605460f..7aadb776924de 100644 2.18.4 -From 0154534393a006cebf01fb54277600e79aa516e8 Mon Sep 17 00:00:00 2001 +From 4c7f64bf99afc85992fbad43bcbea6ab33297a7d Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 Nov 2019 16:06:45 +0100 -Subject: [PATCH 0521/1224] x86/PCI: sta2x11: use default DMA address +Subject: [PATCH 0521/1225] x86/PCI: sta2x11: use default DMA address translation commit e380a0394c36a3a878c858418d5dd7f5f195b6fc upstream. @@ -364407,10 +364407,10 @@ index 6269a175385d4..4a631264b8097 100644 2.18.4 -From 5fe14cad31024a6ff3f7e2bf6244f669b06d2fd6 Mon Sep 17 00:00:00 2001 +From 073b78e53041df842c7e0fd4e9485e09dcc88173 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 30 Oct 2019 17:30:57 -0500 -Subject: [PATCH 0522/1224] PCI: of: Add inbound resource parsing to helpers +Subject: [PATCH 0522/1225] PCI: of: Add inbound resource parsing to helpers Extend devm_of_pci_get_host_bridge_resources() and pci_parse_request_of_pci_ranges() helpers to also parse the inbound @@ -364876,10 +364876,10 @@ index 6a6a819c5b49b..df23d35175455 100644 2.18.4 -From fea11bce6af9e291cd9008f75927e627be9dfeb1 Mon Sep 17 00:00:00 2001 +From 1a45e3675ca17df3a5d143b925c661447ce2064c Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 12 Nov 2019 17:06:04 +0100 -Subject: [PATCH 0523/1224] dma-direct: unify the dma_capable definitions +Subject: [PATCH 0523/1225] dma-direct: unify the dma_capable definitions commit 130c1ccbf55330b55e82612a6e54eebb82c9d746 upstream. @@ -364991,10 +364991,10 @@ index 7aadb776924de..9e2e3d37b15c2 100644 2.18.4 -From f73b18d947b5c13f2f894a358c208bf5bc64d4fb Mon Sep 17 00:00:00 2001 +From 2da0ca56449fc61493691db721f089335bffe3f1 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 12 Nov 2019 17:07:43 +0100 -Subject: [PATCH 0524/1224] dma-direct: avoid a forward declaration for +Subject: [PATCH 0524/1225] dma-direct: avoid a forward declaration for phys_to_dma Move dma_capable down a bit so that we don't need a forward declaration @@ -365066,10 +365066,10 @@ index 9e2e3d37b15c2..f812ea2459f12 100644 2.18.4 -From fdf950a1a4b205b961d071aec2b963337d9e6b23 Mon Sep 17 00:00:00 2001 +From 61c755eb67849fd183224b1d538ecf0659ff9ee5 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 19 Nov 2019 17:38:58 +0100 -Subject: [PATCH 0525/1224] dma-direct: exclude dma_direct_map_resource from +Subject: [PATCH 0525/1225] dma-direct: exclude dma_direct_map_resource from the min_low_pfn check commit 68a33b1794665ba8a1d1ef1d3bfcc7c587d380a6 upstream. @@ -365195,10 +365195,10 @@ index f99b79d7e1235..8d230ee47e120 100644 2.18.4 -From 9487216533ac9c6e01a0b22343c974e72dc7ae01 Mon Sep 17 00:00:00 2001 +From 259b6883011790f9693f6e47e2bbcbda0ace4110 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 21 Nov 2019 10:26:44 +0100 -Subject: [PATCH 0526/1224] dma-mapping: treat dev->bus_dma_mask as a DMA limit +Subject: [PATCH 0526/1225] dma-mapping: treat dev->bus_dma_mask as a DMA limit commit a7ba70f1787f977f970cd116076c6fce4b9e01cc upstream. @@ -365329,7 +365329,7 @@ index fa4352dce491c..3a75d665d43c4 100644 } diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c -index 9268c12458c84..a03614bd3e1a2 100644 +index dfa01bcdc3694..6c02c01773624 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -367,7 +367,7 @@ bool force_dma_unencrypted(struct device *dev) @@ -365591,10 +365591,10 @@ index 803bb857aa1bf..085a0db545c74 100644 2.18.4 -From 15de927d1351b6585363dbd266aa15d03f97b421 Mon Sep 17 00:00:00 2001 +From 1dd1254ee6b2d0bd222a42e4c43f075080d7ca5a Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Mon, 16 Dec 2019 12:01:08 +0100 -Subject: [PATCH 0527/1224] ARM: dts: bcm2711: Enable PCIe controller +Subject: [PATCH 0527/1225] ARM: dts: bcm2711: Enable PCIe controller commit d5c8dc0d4c880fbde5293cc186b1ab23466254c4 upstream. @@ -365653,10 +365653,10 @@ index e2f6ffb00aa94..b56388ce12163 100644 2.18.4 -From 7ea03501c141a30b9acf7dbe12277ea77e55f0ff Mon Sep 17 00:00:00 2001 +From 633d7a4a081506d100b1716185d7e181b8090b7b Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 16 Dec 2019 12:01:09 +0100 -Subject: [PATCH 0528/1224] PCI: brcmstb: Add Broadcom STB PCIe host controller +Subject: [PATCH 0528/1225] PCI: brcmstb: Add Broadcom STB PCIe host controller driver commit c0452137034bda8f686dd9a2e167949bfffd6776 upstream. @@ -366474,10 +366474,10 @@ index 0000000000000..3250a2e6b1b41 2.18.4 -From baea018c5b22e84e61dfb09e5a5b0cc0995998d6 Mon Sep 17 00:00:00 2001 +From 3fff61c8af398bae52c083e8981a68f18ef71f6a Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 16 Dec 2019 12:01:10 +0100 -Subject: [PATCH 0529/1224] PCI: brcmstb: Add MSI support +Subject: [PATCH 0529/1225] PCI: brcmstb: Add MSI support commit 40ca1bf580ef24df30702032ba5e40dfdcaa200b upstream. @@ -366865,10 +366865,10 @@ index 3250a2e6b1b41..d20aabc26273c 100644 2.18.4 -From 1cec46a604d867bfe6c1502701aaab24277c7d9b Mon Sep 17 00:00:00 2001 +From b3a1633a491f14d821d604fa51941413ae7e254c Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 27 Feb 2020 12:51:46 +0100 -Subject: [PATCH 0530/1224] PCI: brcmstb: Fix build on 32bit ARM platforms with +Subject: [PATCH 0530/1225] PCI: brcmstb: Fix build on 32bit ARM platforms with older compilers commit 73a7a271b3eee7b83f29b13866163776f1cbef89 upstream. @@ -366909,10 +366909,10 @@ index d20aabc26273c..3a10e678c7f47 100644 2.18.4 -From 66b8271db808c3100f342f1dcbe939c2ffe99f6f Mon Sep 17 00:00:00 2001 +From d1fe9c9031f102723f044349943a49601b217391 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 2 Mar 2020 15:05:25 +0000 -Subject: [PATCH 0531/1224] bcm2711-rpi.dtsi: Use upstream pcie node +Subject: [PATCH 0531/1225] bcm2711-rpi.dtsi: Use upstream pcie node Now that the upstream bcm2711 DT has a pcie DT node there's no need to define one downstream. @@ -366992,10 +366992,10 @@ index a71b2eb74723f..18ba012413aaf 100644 2.18.4 -From 54d2adf3836f016dd6dfb57aeade5e7fbc98dc63 Mon Sep 17 00:00:00 2001 +From 694afa14a3a8ab9436e92b56b471317060dbd32b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:14:49 +0000 -Subject: [PATCH 0532/1224] Revert "media: i2c: Add driver for Sony IMX219 +Subject: [PATCH 0532/1225] Revert "media: i2c: Add driver for Sony IMX219 sensor" This reverts commit 39d484cb87cbe5da5035199fbdec1f3c0b71d2ea. @@ -368143,10 +368143,10 @@ index 682397a484922..0000000000000 2.18.4 -From e891358739c1e344df0bbe11030b82819e0e4487 Mon Sep 17 00:00:00 2001 +From 700b24a3e545410c0e848400f5a246000660a2b0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:14:58 +0000 -Subject: [PATCH 0533/1224] Revert "media: dt-bindings: Add binding for the +Subject: [PATCH 0533/1225] Revert "media: dt-bindings: Add binding for the Sony IMX219 sensor" This reverts commit e3dca865875b345a2fa45e8295e32d701c666334. @@ -368224,10 +368224,10 @@ index a02f1ce1e1204..0000000000000 2.18.4 -From a5e4e2e0d5c673c534a83880423919cdaafda919 Mon Sep 17 00:00:00 2001 +From f5c5db73480accb32f52a90051e1717e5fe3edb4 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Mon, 20 Jan 2020 05:15:57 -0300 -Subject: [PATCH 0534/1224] media: dt-bindings: media: i2c: Add IMX219 CMOS +Subject: [PATCH 0534/1225] media: dt-bindings: media: i2c: Add IMX219 CMOS sensor binding Commit 9d730f2cf4c0391785855dd231577d2de2594df9 upstream. @@ -368389,10 +368389,10 @@ index b7685777a8061..d99bdf9347058 100644 2.18.4 -From 1ec4f84401d06c7c463b8f8ac4d5e6f1e7f64713 Mon Sep 17 00:00:00 2001 +From 0b9c3f3e02bdb87abc223a904aef04406980d88b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Jan 2020 05:15:58 -0300 -Subject: [PATCH 0535/1224] media: i2c: Add driver for Sony IMX219 sensor +Subject: [PATCH 0535/1225] media: i2c: Add driver for Sony IMX219 sensor Commit 1283b3b8f82b9004fbb94398cade5c8e797a2c8d upstream. (Currently on linux-media/master, queued for 5.7) @@ -369772,10 +369772,10 @@ index 0000000000000..f1effb5a5f66a 2.18.4 -From 421092bd4049cb5c3ed2e64b4ed52a74b8f0ed7c Mon Sep 17 00:00:00 2001 +From 9500af2dfab9b5294c8d35ffee8498a29d39d5b8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:07:57 +0000 -Subject: [PATCH 0536/1224] overlays: imx219: Correct link frequency to match +Subject: [PATCH 0536/1225] overlays: imx219: Correct link frequency to match the upstream driver The upstream driver is checking the link frequency parameter, and @@ -369803,10 +369803,10 @@ index 2a1500d07b680..b9e3d9e5730d4 100644 2.18.4 -From 0052e51be6703d8151c03ec96d89ea617ef3d7e6 Mon Sep 17 00:00:00 2001 +From 0d57b524e4b3c89b0c2a337b17a8eea296c7463f Mon Sep 17 00:00:00 2001 From: Nataliya Korovkina Date: Thu, 12 Mar 2020 17:22:53 -0400 -Subject: [PATCH 0537/1224] Kbuild: Allow .dtbo overlays to be built, adjust. +Subject: [PATCH 0537/1225] Kbuild: Allow .dtbo overlays to be built, adjust. This is adjustment to commit d368ceaacdccd7732dc97d1d7987bdf7149d62e3 "kbuild: Allow .dtbo overlays to be built piecemeal" @@ -369819,10 +369819,10 @@ Signed-off-by: Nataliya Korovkina 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index f67764a2f8693..0c547f803af5d 100644 +index d7281cd933a86..506484cd38e78 100644 --- a/Makefile +++ b/Makefile -@@ -1267,7 +1267,7 @@ ifneq ($(dtstree),) +@@ -1261,7 +1261,7 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ @@ -369835,10 +369835,10 @@ index f67764a2f8693..0c547f803af5d 100644 2.18.4 -From 955051bfd24d3ac963a0b6d40d548e19694590fc Mon Sep 17 00:00:00 2001 +From f606c261381d376e3cf80340aa4e21bfc59c3b32 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 15 Jan 2020 13:40:38 +0000 -Subject: [PATCH 0538/1224] media: ov5647: Fix return codes from +Subject: [PATCH 0538/1225] media: ov5647: Fix return codes from ov5647_write/ov5647_read functions. Previously they were returning positive non-zero codes for success, @@ -369915,10 +369915,10 @@ index 07550377be2ef..6ecc018ac4317 100644 2.18.4 -From 50d67aa96df20610eaf64f51fe403e3d1a2aeee2 Mon Sep 17 00:00:00 2001 +From 69e0cb3769fb2e759785baaeb909016fb0701180 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:30:53 +0000 -Subject: [PATCH 0539/1224] media: ov5647: Add basic support for multiple +Subject: [PATCH 0539/1225] media: ov5647: Add basic support for multiple sensor modes. Specifically: @@ -370328,10 +370328,10 @@ index 6ecc018ac4317..0d84b7640cf39 100644 2.18.4 -From 990e104201e11e46d3430360dfb84b594e917c14 Mon Sep 17 00:00:00 2001 +From 9ccd61102123178ee81e3488e0706b67ffce5e7f Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:23 +0000 -Subject: [PATCH 0540/1224] media: ov5647: Add V4L2 controls for analogue gain, +Subject: [PATCH 0540/1225] media: ov5647: Add V4L2 controls for analogue gain, exposure and AWB Added basic v4l2_ctrl_handler infrastructure (there was none @@ -370611,10 +370611,10 @@ index 0d84b7640cf39..16cfafc9cf9cb 100644 2.18.4 -From 9775211ee7b50fff23fb11d56f939c22b8f960ad Mon Sep 17 00:00:00 2001 +From 84652d60f6e91d8020936695129c2c00949ad43b Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:28 +0000 -Subject: [PATCH 0541/1224] media: ov5647: Add extra 10-bit sensor modes. +Subject: [PATCH 0541/1225] media: ov5647: Add extra 10-bit sensor modes. The 8-bit VGA mode remains, we add the following 10-bit modes: @@ -371166,10 +371166,10 @@ index 16cfafc9cf9cb..fc6c5d9c4532c 100644 2.18.4 -From 00af5eb64c36b5c35dd02b6ad4ddb81d8f3a948b Mon Sep 17 00:00:00 2001 +From 7c66c8631be51d7a0741f715de92ad4cf6146023 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:32 +0000 -Subject: [PATCH 0542/1224] media: ov5647: change defaults to better match raw +Subject: [PATCH 0542/1225] media: ov5647: change defaults to better match raw camera applications. Specifically: @@ -371231,10 +371231,10 @@ index fc6c5d9c4532c..66b3ee5cc1909 100644 2.18.4 -From 166380f69a8abd4e09f3f54f2e016e58e3d90ee6 Mon Sep 17 00:00:00 2001 +From c428b8de37f8ccb2aa52c735d226869c6e8de557 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 15:44:31 +0100 -Subject: [PATCH 0543/1224] drm/vc4: fkms: Change crtc_state structure name to +Subject: [PATCH 0543/1225] drm/vc4: fkms: Change crtc_state structure name to avoid conflict Signed-off-by: Maxime Ripard @@ -371316,10 +371316,10 @@ index b0c1096efbe59..2bfa10660fe09 100644 2.18.4 -From 6c1ecf6f7615591e7947fee969c47a7534c25756 Mon Sep 17 00:00:00 2001 +From 64535d64d40036d8ad99d35c922d1220f413005d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:22:06 +0000 -Subject: [PATCH 0544/1224] drm/fourcc: Add packed 10bit YUV 4:2:0 format +Subject: [PATCH 0544/1225] 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). @@ -371379,10 +371379,10 @@ index 3feeaa3f987a7..9847286609a86 100644 2.18.4 -From 285b8b9e6905485b0efc776a57a202e30e5cbf8b Mon Sep 17 00:00:00 2001 +From 826ae0b8bfbb2f1bef8b20b2489c5d752444dd21 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:24:33 +0000 -Subject: [PATCH 0545/1224] drm/vc4: Add DRM_FORMAT_P030 support to +Subject: [PATCH 0545/1225] drm/vc4: Add DRM_FORMAT_P030 support to firmware-kms Adds support for this format which is 3 10bit samples packed into @@ -371459,10 +371459,10 @@ index 0bdffe5dd1e9a..8e76576733ef4 100644 2.18.4 -From cc9a894ba7916e5be1ffde27871f6dfe9948b757 Mon Sep 17 00:00:00 2001 +From 698f5a6345615787c4a4f4a7bcc7c1ab555c0043 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 6 Mar 2020 11:08:10 +0100 -Subject: [PATCH 0546/1224] gpio-ir-overlay: add parameter to configure signal +Subject: [PATCH 0546/1225] gpio-ir-overlay: add parameter to configure signal polarity (#3490) Standard IR receivers use inverted / active-low signalling @@ -371512,10 +371512,10 @@ index 58f588498d68e..162b6ce07dc91 100644 2.18.4 -From 27295be1c56d4f5937541d60077cc8251b9bc78e Mon Sep 17 00:00:00 2001 +From 4a385e931595699785e04d4106a037ad0f968c5f Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Mon, 24 Feb 2020 22:56:59 +0100 -Subject: [PATCH 0547/1224] Add support for merus-amp soundcard and ma120x0p +Subject: [PATCH 0547/1225] Add support for merus-amp soundcard and ma120x0p codec correct checkpatch warnings and errors @@ -373121,10 +373121,10 @@ index 0000000000000..39c74b17e0077 2.18.4 -From e3324f5eb4a5197d711f698cb982972f1da95229 Mon Sep 17 00:00:00 2001 +From 355acf10031fd8f916a3fdfbe149178f58e89175 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 17 Mar 2020 16:39:07 +0000 -Subject: [PATCH 0548/1224] ARM: dts: bcm2711: Add 32-bit PMU compatibility +Subject: [PATCH 0548/1225] ARM: dts: bcm2711: Add 32-bit PMU compatibility The "arm" architecture has no support for the cortex-a72 as such, but the performance and measurement unit from the cortex-a15 seems to be @@ -373154,10 +373154,10 @@ index 18ba012413aaf..b434b8392e9ef 100644 2.18.4 -From a0c9921879c2cda261cb27548ed5d5ae4ad12a3d Mon Sep 17 00:00:00 2001 +From 72a695503f36ab84ee4eee5ba9bd392b81344f52 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 19 Mar 2020 10:04:46 +0000 -Subject: [PATCH 0549/1224] ARM: dts: bcm271x: Use a53 pmu, drop RPI364 +Subject: [PATCH 0549/1225] 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 @@ -373237,10 +373237,10 @@ index 1fd86f81f5426..bf69a4b0b172a 100644 2.18.4 -From 6c5683fbf18a8b907b340ace5a3e1eafb1209447 Mon Sep 17 00:00:00 2001 +From e74a36cea50f4cc978469b4f0ef52c6e2e437d21 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Tue, 25 Feb 2020 14:11:59 +0100 -Subject: [PATCH 0550/1224] net: bcmgenet: Clear ID_MODE_DIS in +Subject: [PATCH 0550/1225] net: bcmgenet: Clear ID_MODE_DIS in EXT_RGMII_OOB_CTRL when not needed commit 402482a6a78e5c61d8a2ec6311fc5b4aca392cd6 upstream. @@ -373275,10 +373275,10 @@ index 0516d14f47035..942ee7cc82668 100644 2.18.4 -From f4cdff8c476396c1486147043757a824a0af8c70 Mon Sep 17 00:00:00 2001 +From 51564d1dce9aece2107b3e0370848ebdda52a5c9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:22 +0100 -Subject: [PATCH 0551/1224] drm/modes: parse_cmdline: Fix possible reference +Subject: [PATCH 0551/1225] drm/modes: parse_cmdline: Fix possible reference past end of string Commit 8582e244e5fe72d2e9ace186fa8f3ed3bb4122e1 upstream. @@ -373422,10 +373422,10 @@ index 3fd35e6b9d535..86fb462a8ca12 100644 2.18.4 -From e8ed4a956ba580017a9351ac40f9bd8197e28ee4 Mon Sep 17 00:00:00 2001 +From 8cb8182a1a0e01e72fc7c3ba9ef996eeef109bdc Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:23 +0100 -Subject: [PATCH 0552/1224] drm/modes: parse_cmdline: Make various char +Subject: [PATCH 0552/1225] drm/modes: parse_cmdline: Make various char pointers const Commit 83e14ea3a64f00897cc31974d3ae4e27e5a7405b upstream. @@ -373478,10 +373478,10 @@ index 86fb462a8ca12..342fe8076ee7e 100644 2.18.4 -From 25d370763b3d08c8dd37875ca542c435bbf8ea0d Mon Sep 17 00:00:00 2001 +From f684286b86e6cddc02aba1893f59df7bee5ad511 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:24 +0100 -Subject: [PATCH 0553/1224] drm/modes: parse_cmdline: Stop parsing extras after +Subject: [PATCH 0553/1225] drm/modes: parse_cmdline: Stop parsing extras after bpp / refresh at ', ' Commit c2ed3e941901810ad3d55ce1935fa22c5007fee4 upstream. @@ -373583,10 +373583,10 @@ index 035f86c5d6482..7b199acaf2926 100644 2.18.4 -From 5a1c6f4e99f6e0b6dd3fcb0554ab1515ae8b8926 Mon Sep 17 00:00:00 2001 +From 8116606b0c26ab0afd7ee2387053705a1e1f51a3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:25 +0100 -Subject: [PATCH 0554/1224] drm/modes: parse_cmdline: Accept extras directly +Subject: [PATCH 0554/1225] drm/modes: parse_cmdline: Accept extras directly after mode combined with options Commit cfb0881b8f621b656a9e23b31944a5db94cf5842 upstream. @@ -373670,10 +373670,10 @@ index 7b199acaf2926..a1210b7bf937c 100644 2.18.4 -From eedb4fc7899f41984ea7b31c71036d1ba73a7998 Mon Sep 17 00:00:00 2001 +From e5aed675ca4c4abe52ad73f10b9ffcd775dfa153 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:26 +0100 -Subject: [PATCH 0555/1224] drm/modes: parse_cmdline: Rework +Subject: [PATCH 0555/1225] drm/modes: parse_cmdline: Rework drm_mode_parse_cmdline_options() Commit 739b200c2edcaaa7a86f37b0c11db57956433dfb upstream. @@ -373752,10 +373752,10 @@ index ff9d9daf2631f..0d7de6f4dec00 100644 2.18.4 -From c16f51dd4bd53d87232a76ac9b5d56ebbd61a845 Mon Sep 17 00:00:00 2001 +From fb9c514bfe34cee8140c6aa776551f68a8ef0af5 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:27 +0100 -Subject: [PATCH 0556/1224] drm/modes: parse_cmdline: Add freestanding argument +Subject: [PATCH 0556/1225] drm/modes: parse_cmdline: Add freestanding argument to drm_mode_parse_cmdline_options() Commit 99e2716e053734b70434502867be24d20a3e2d84 upstream. @@ -373807,10 +373807,10 @@ index 0d7de6f4dec00..d4b9e7ed6dfeb 100644 2.18.4 -From ad8b02342b236f45c8a48009ea7c6b2a37392fb3 Mon Sep 17 00:00:00 2001 +From e3c56a121ba6c94783a2f6e607af11116e7507ef Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:28 +0100 -Subject: [PATCH 0557/1224] drm/modes: parse_cmdline: Set bpp/refresh_specified +Subject: [PATCH 0557/1225] drm/modes: parse_cmdline: Set bpp/refresh_specified after successful parsing Commit 6a2d163756545aa3180d7851d5f8322b865e72be upstream. @@ -373877,10 +373877,10 @@ index d4b9e7ed6dfeb..7b9f067a88984 100644 2.18.4 -From 7fa11c97fd8e5c3f3fe3031597619784000428c6 Mon Sep 17 00:00:00 2001 +From 7f12c07b42a99bd2c84d0031d8e66f2aa7a7e331 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:29 +0100 -Subject: [PATCH 0558/1224] drm/modes: parse_cmdline: Allow specifying +Subject: [PATCH 0558/1225] drm/modes: parse_cmdline: Allow specifying stand-alone options Commit 7b1cce760afe38b40f0989cdf10b2190dccf9815 upstream. @@ -374133,10 +374133,10 @@ index a1210b7bf937c..9835dd329cfc9 100644 2.18.4 -From 566455c471bbbd8ec76af97ea14a9a2b0559b8fb Mon Sep 17 00:00:00 2001 +From 4c50f1359cecb1f84834a4a37297b051542aee5d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:30 +0100 -Subject: [PATCH 0559/1224] drm/modes: parse_cmdline: Add support for +Subject: [PATCH 0559/1225] drm/modes: parse_cmdline: Add support for specifying panel_orientation (v2) Commit 4e7a4a6fbdc669c44e6079f9d5eb25673749455f upstream. @@ -374304,10 +374304,10 @@ index 681cb590f9521..3fbcf7d3fcafe 100644 2.18.4 -From a3c1cfd25ba0598eba7c512ac2b19064ee812435 Mon Sep 17 00:00:00 2001 +From 1b569658fa65f867b2fb056c0c4a824ab7443268 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:31 +0100 -Subject: [PATCH 0560/1224] drm/modes: parse_cmdline: Remove some unnecessary +Subject: [PATCH 0560/1225] drm/modes: parse_cmdline: Remove some unnecessary code (v2) Commit 5b926617cdef41ce0696e09834991194b1759e28 upstream. @@ -374348,10 +374348,10 @@ index 378a915b81dd3..99149616fce05 100644 2.18.4 -From a45cf9983524c563737b3ca419ba1a1f5960edc3 Mon Sep 17 00:00:00 2001 +From 30405c1b06d2ae3029708f6cdb26544f5c72e117 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:32 +0100 -Subject: [PATCH 0561/1224] drm/modes: parse_cmdline: Explicitly memset the +Subject: [PATCH 0561/1225] drm/modes: parse_cmdline: Explicitly memset the passed in drm_cmdline_mode struct Commit d1fe276b5115f0d581c3cfe6154633b3547e8aab upstream. @@ -374395,10 +374395,10 @@ index 99149616fce05..afc0ee99b1389 100644 2.18.4 -From 56322532c2e1fcddf0c180997232ecbd8b0cb112 Mon Sep 17 00:00:00 2001 +From 6dc269acb725142f439fc9f9e44033a59b5f43ea Mon Sep 17 00:00:00 2001 From: Yukimasa Sugizaki <4298265+Terminus-IMRC@users.noreply.github.com> Date: Fri, 20 Mar 2020 19:01:23 +0900 -Subject: [PATCH 0562/1224] drm/v3d: Replace wait_for macros to remove use of +Subject: [PATCH 0562/1225] drm/v3d: Replace wait_for macros to remove use of msleep (#3510) commit 9daee6141cc9c75b09659b02b1cb9eeb2f5e16cc upstream. @@ -374490,10 +374490,10 @@ index 15bc4e28b6ccd..197dd4a8a7e1e 100644 2.18.4 -From 88847966d49ef97223df049fe70886f05895385e Mon Sep 17 00:00:00 2001 +From 3f6fa4fe88af0a3010b7b51d9f1153564947c11e Mon Sep 17 00:00:00 2001 From: Nick B Date: Mon, 9 Mar 2020 09:05:39 -0400 -Subject: [PATCH 0563/1224] Reduce noise from rpi poe hat fan +Subject: [PATCH 0563/1225] Reduce noise from rpi poe hat fan This adds 2 extra states, at 40c and 45c, with PWM of 31 and 63 (out of 255) for the rpi poe hat fan. This significantly improves user @@ -374592,10 +374592,10 @@ index 21f8fe6f12295..544038b614e10 100644 2.18.4 -From bab01e8d8db2d28fbc866817002a335a583a3399 Mon Sep 17 00:00:00 2001 +From b08b74c21155511d2a21fa1aca57a0eaa244ecae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 7 Mar 2020 22:37:52 +0100 -Subject: [PATCH 0564/1224] add Sensirion SPS30 to i2c-sensor overlay +Subject: [PATCH 0564/1225] add Sensirion SPS30 to i2c-sensor overlay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -374659,10 +374659,10 @@ index 40881d72a1574..ce97837b0db50 100644 2.18.4 -From 81d843737be4bda7de2f08c01d140f4072c9477e Mon Sep 17 00:00:00 2001 +From c114a3953ffeb372245de1c7297e82fb900c587a Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 7 Oct 2019 12:06:31 -0300 -Subject: [PATCH 0565/1224] media: add V4L2_CTRL_TYPE_AREA control type +Subject: [PATCH 0565/1225] media: add V4L2_CTRL_TYPE_AREA control type Commit d1dc49370f8371b00e682ac409aa1987ce641e93 upstream. @@ -374679,7 +374679,7 @@ Signed-off-by: Mauro Carvalho Chehab 3 files changed, 69 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index c7bf6f51ccddd..665a36f4f6f83 100644 +index 2161cc497abd7..9123372e22601 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1673,6 +1673,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, @@ -374702,7 +374702,7 @@ index c7bf6f51ccddd..665a36f4f6f83 100644 default: return -EINVAL; } -@@ -2422,6 +2428,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, +@@ -2423,6 +2429,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, case V4L2_CTRL_TYPE_VP8_FRAME_HEADER: elem_size = sizeof(struct v4l2_ctrl_vp8_frame_header); break; @@ -374712,7 +374712,7 @@ index c7bf6f51ccddd..665a36f4f6f83 100644 default: if (type < V4L2_CTRL_COMPOUND_TYPES) elem_size = sizeof(s32); -@@ -4086,6 +4095,18 @@ int __v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s) +@@ -4087,6 +4096,18 @@ int __v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s) } EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl_string); @@ -374826,10 +374826,10 @@ index 456dfa847ccb1..0ffaad82040d6 100644 2.18.4 -From 5552c2f10035535eb282e054522248f4697c6bb9 Mon Sep 17 00:00:00 2001 +From 6423b30063ab132178a77107b1de9fa29421100d Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 7 Oct 2019 12:06:33 -0300 -Subject: [PATCH 0566/1224] media: add V4L2_CID_UNIT_CELL_SIZE control +Subject: [PATCH 0566/1225] media: add V4L2_CID_UNIT_CELL_SIZE control Commit 61fd036d01111679b01e4b92e6bd0cdd33809aea upstream. @@ -374848,7 +374848,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 6 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 665a36f4f6f83..90bc4e490f800 100644 +index 9123372e22601..0bb2532c4f39b 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -995,6 +995,7 @@ const char *v4l2_ctrl_get_name(u32 id) @@ -374886,10 +374886,10 @@ index 616a7c64c4d20..d21ac75456263 100644 2.18.4 -From a25ae9abe49cbc6cc5d1029ac1f803a66db638f8 Mon Sep 17 00:00:00 2001 +From 428c4c37d280e3633666e88dec339ac9daaa2058 Mon Sep 17 00:00:00 2001 From: Benoit Parrot Date: Mon, 7 Oct 2019 12:10:07 -0300 -Subject: [PATCH 0567/1224] media: v4l2-common: add pixel encoding support +Subject: [PATCH 0567/1225] media: v4l2-common: add pixel encoding support Commit d5a897c8428b38053df4b427a4277b1a0722bfa0 upstream. @@ -375123,10 +375123,10 @@ index c070d8ae11e5e..d8c29e0890009 100644 2.18.4 -From bac05e10378a9214ef35424bf8bc10bb2f991922 Mon Sep 17 00:00:00 2001 +From 590e15f3132970a085dbf982f467f31fba0b7a7b Mon Sep 17 00:00:00 2001 From: Benoit Parrot Date: Mon, 7 Oct 2019 12:10:08 -0300 -Subject: [PATCH 0568/1224] media: v4l2-common: add RGB565 and RGB55 to +Subject: [PATCH 0568/1225] media: v4l2-common: add RGB565 and RGB55 to v4l2_format_info Commit b373f84d77e1c409aacb4ff5bb5726c45fc8b166 upstream. @@ -375157,10 +375157,10 @@ index 09a3915b98a33..d0e5ebc736f9f 100644 2.18.4 -From 706ca64e752352b53f4ac231f0e4593f3bded9ac Mon Sep 17 00:00:00 2001 +From 361c3487061d4d7008bd047b117a0e2f3e4c78d9 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:40 -0300 -Subject: [PATCH 0569/1224] media: vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF +Subject: [PATCH 0569/1225] media: vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF This patch adds support for the V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF flag. @@ -375357,10 +375357,10 @@ index 0ffaad82040d6..a3fc685be5148 100644 2.18.4 -From 9a14a4748b29489c4b70b6ff609975fe1339c844 Mon Sep 17 00:00:00 2001 +From 400b97abd115c2f405921c22794f45934fec3b53 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:41 -0300 -Subject: [PATCH 0570/1224] media: v4l2-mem2mem: support held capture buffers +Subject: [PATCH 0570/1225] media: v4l2-mem2mem: support held capture buffers Commit f8cca8c97a63d77f48334cde81d15014f43530ef upstream. @@ -375625,10 +375625,10 @@ index 0b9c3a287061e..229d9f5d43708 100644 2.18.4 -From 0eabd705d8524ba86051b25797cdef4f29e54040 Mon Sep 17 00:00:00 2001 +From 11f8ad54f593305c830776c11e8426f01bede44a Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:42 -0300 -Subject: [PATCH 0571/1224] media: videodev2.h: add V4L2_DEC_CMD_FLUSH +Subject: [PATCH 0571/1225] media: videodev2.h: add V4L2_DEC_CMD_FLUSH Add this new V4L2_DEC_CMD_FLUSH decoder command and document it. @@ -375692,10 +375692,10 @@ index a3fc685be5148..05ed1aaf0e9e3 100644 2.18.4 -From 12921d38ca0f626e7992381d371e42c458e46f2a Mon Sep 17 00:00:00 2001 +From 16ce386ea4cc626f9eaa750175af252578edf821 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 11 Oct 2019 06:32:43 -0300 -Subject: [PATCH 0572/1224] media: v4l2-mem2mem: add +Subject: [PATCH 0572/1225] media: v4l2-mem2mem: add stateless_(try_)decoder_cmd ioctl helpers Commit bef41d93aac64b54c3008ca6170bec54f85784f5 upstream. @@ -375796,10 +375796,10 @@ index 229d9f5d43708..3d9e48ed88170 100644 2.18.4 -From 92ec5702b1b25a13d5859271595c07f25373453f Mon Sep 17 00:00:00 2001 +From 9a39591832a7f30b0e4435d8b5013947b0cba218 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:44 -0300 -Subject: [PATCH 0573/1224] media: v4l2-mem2mem: add new_frame detection +Subject: [PATCH 0573/1225] media: v4l2-mem2mem: add new_frame detection Commit f07602ac388723233e9e3c5a05b54baf34e0a3e9 upstream. @@ -375873,10 +375873,10 @@ index 3d9e48ed88170..1d85e24791e42 100644 2.18.4 -From e4f0e7c08a5b490146c5aa936494ab5a3b346974 Mon Sep 17 00:00:00 2001 +From 5880d66548c46d32f08a51162d769ba8b4bd49d7 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 7 Oct 2019 12:06:32 -0300 -Subject: [PATCH 0574/1224] media: Documentation: media: Document +Subject: [PATCH 0574/1225] media: Documentation: media: Document V4L2_CTRL_TYPE_AREA Commit 8ae3a0862993c09a8ef0f9abb379553370c517e3 upstream. @@ -375927,10 +375927,10 @@ index a79028e4d9296..c23e5ef30c78d 100644 2.18.4 -From a32c6e90aeccba2be6af1aad2c949d7e8360b249 Mon Sep 17 00:00:00 2001 +From 110c103ff88b984a5b731341d418f0e12f68ea25 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 22 Oct 2019 12:26:52 -0300 -Subject: [PATCH 0575/1224] media: v4l: Add definitions for HEVC stateless +Subject: [PATCH 0575/1225] media: v4l: Add definitions for HEVC stateless decoding This introduces the required definitions for HEVC decoding support with @@ -376600,7 +376600,7 @@ index c23e5ef30c78d..cb6ccf91776e6 100644 # V4L2 capability defines diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 90bc4e490f800..14710e949be3c 100644 +index 0bb2532c4f39b..d34a95d41afbf 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -567,6 +567,16 @@ const char * const *v4l2_ctrl_get_menu(u32 id) @@ -376759,7 +376759,7 @@ index 90bc4e490f800..14710e949be3c 100644 default: return -EINVAL; } -@@ -2433,6 +2531,15 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, +@@ -2434,6 +2532,15 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, case V4L2_CTRL_TYPE_VP8_FRAME_HEADER: elem_size = sizeof(struct v4l2_ctrl_vp8_frame_header); break; @@ -376776,7 +376776,7 @@ index 90bc4e490f800..14710e949be3c 100644 elem_size = sizeof(struct v4l2_area); break; diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 58868d7129ebd..6081072b55db4 100644 +index 24db33f803c06..4f4fcbe09fbd8 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1356,6 +1356,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -377041,10 +377041,10 @@ index e7f93109e4a42..65575e9b5a2b1 100644 2.18.4 -From d35737a5631eeb46e7709f2edaf7362d4c2028b8 Mon Sep 17 00:00:00 2001 +From b1fdacfbd98530682408eccad542a4ecbe0003d2 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Wed, 6 Nov 2019 08:02:53 +0100 -Subject: [PATCH 0576/1224] media: v4l2-mem2mem: Fix hold buf flag checks +Subject: [PATCH 0576/1225] media: v4l2-mem2mem: Fix hold buf flag checks Commit 1076df3a77b490d33429560a9e0603b3673223e2 upstream. @@ -377084,10 +377084,10 @@ index 5867d81f3d2c6..cc34c5ab70099 100644 2.18.4 -From af529f2251a10fe40a1e771a9ff4eb4a0159f4ff Mon Sep 17 00:00:00 2001 +From 680d574213dcfb33dd640991cfedc09d71c4b305 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 22 Oct 2019 12:26:53 -0300 -Subject: [PATCH 0577/1224] media: pixfmt: Document the HEVC slice pixel format +Subject: [PATCH 0577/1225] media: pixfmt: Document the HEVC slice pixel format Commit de06f289283298e2938445019999cec46435375c upstream. @@ -377140,10 +377140,10 @@ index 292fdc116c777..7e9b2b939e594 100644 2.18.4 -From cb2a2d6c3ec6796f9d34d812772ed770313fdd61 Mon Sep 17 00:00:00 2001 +From 42e9609a48c5775ad1dd7b6641c036f2501a67b2 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 13 Dec 2019 17:04:25 +0100 -Subject: [PATCH 0578/1224] media: uapi: hevc: Add scaling matrix control +Subject: [PATCH 0578/1225] media: uapi: hevc: Add scaling matrix control Taken from https://patchwork.linuxtv.org/patch/60728/ Changes (mainly documentation) have been requested. @@ -377223,7 +377223,7 @@ index 7e9b2b939e594..2069e5fc2b995 100644 Buffers associated with this pixel format must contain the appropriate number of macroblocks to decode a full corresponding frame. diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 14710e949be3c..4f15335636550 100644 +index d34a95d41afbf..b733ada15e551 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -974,6 +974,7 @@ const char *v4l2_ctrl_get_name(u32 id) @@ -377254,7 +377254,7 @@ index 14710e949be3c..4f15335636550 100644 case V4L2_CTRL_TYPE_AREA: area = p; if (!area->width || !area->height) -@@ -2540,6 +2547,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, +@@ -2541,6 +2548,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, case V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS: elem_size = sizeof(struct v4l2_ctrl_hevc_slice_params); break; @@ -377302,10 +377302,10 @@ index 1009cf0891cc6..1592e52c36144 100644 2.18.4 -From 0474f3bf3291c695e1279a36209d17597a5ca6f5 Mon Sep 17 00:00:00 2001 +From 0ed3377aa5740e97be8c6d70d0a1ff3c545ba359 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 13 Dec 2019 17:04:27 +0100 -Subject: [PATCH 0579/1224] media: uapi: hevc: Add segment address field +Subject: [PATCH 0579/1225] media: uapi: hevc: Add segment address field From https://patchwork.linuxtv.org/patch/60725/ Changes requested, but mainly docs. @@ -377371,10 +377371,10 @@ index 1592e52c36144..3e2e320983128 100644 2.18.4 -From 40a58800f1e204d167e5581028249c764d91c940 Mon Sep 17 00:00:00 2001 +From 2a3917066d100cd80857d8f88a97f50794cd0bae Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 23 Mar 2020 18:34:01 +0000 -Subject: [PATCH 0580/1224] media: hevc_ctrls: Add slice param dependent slice +Subject: [PATCH 0580/1225] media: hevc_ctrls: Add slice param dependent slice segment Adds V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT define. @@ -377400,10 +377400,10 @@ index 3e2e320983128..0ba7735465a24 100644 2.18.4 -From 53b1ef3f5eb78dbc3f02cdc91ca19c43f0846f85 Mon Sep 17 00:00:00 2001 +From 31415e9d15616a2419195c3fb0ca9d20d6e0bb63 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 23 Mar 2020 19:00:17 +0000 -Subject: [PATCH 0581/1224] media: uapi: Add hevc ctrls for WPP decoding +Subject: [PATCH 0581/1225] media: uapi: Add hevc ctrls for WPP decoding WPP can allow greater parallelism within the decode, but needs offset information to be passed in. @@ -377446,10 +377446,10 @@ index 0ba7735465a24..9c976b3cf0924 100644 2.18.4 -From 198e807a3a234f25f70daa326146a4268ec2a6ea Mon Sep 17 00:00:00 2001 +From 6539eb82f49d156e9cc6bf53f56f7af33b59209d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:28:21 +0000 -Subject: [PATCH 0582/1224] media: videodev2.h: Add a format for column +Subject: [PATCH 0582/1225] 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 @@ -377732,7 +377732,7 @@ index 867470e5f9e12..962f5c367ebcd 100644 pixfmt-nv16m pixfmt-nv24 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 6081072b55db4..360200ed4f083 100644 +index 4f4fcbe09fbd8..1e37b3591b898 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1258,6 +1258,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -377763,10 +377763,10 @@ index 05ed1aaf0e9e3..5d28d8ef6c0cc 100644 2.18.4 -From ef791656096752929093016fc076db0572d8e013 Mon Sep 17 00:00:00 2001 +From 8153e90e5ae5704a15d379840c1ac4ee167e0124 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 5 Mar 2020 14:46:54 +0000 -Subject: [PATCH 0583/1224] media: v4l2-mem2mem: allow request job buffer +Subject: [PATCH 0583/1225] media: v4l2-mem2mem: allow request job buffer processing after job finish Allow the capture buffer to be detached from a v4l2 request job such @@ -378047,10 +378047,10 @@ index 59bf33a12648b..b5b5fad97de72 100644 2.18.4 -From 77d3060bb546bfd0bfb1f46048ec3ae99e049f65 Mon Sep 17 00:00:00 2001 +From 6bb92ca2a470144734bb419c034a45e5e25200b9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Mar 2020 10:53:16 +0000 -Subject: [PATCH 0584/1224] media: dt-bindings: media: Add binding for the +Subject: [PATCH 0584/1225] 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. @@ -378162,10 +378162,10 @@ index d99bdf9347058..9a76a6de3e984 100644 2.18.4 -From 0122fdf9f17969a04fedd123a516b5470f07c2be Mon Sep 17 00:00:00 2001 +From 1e311cca665e4b643921a8cf7240e98ca950ce9d Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 5 Mar 2020 18:30:41 +0000 -Subject: [PATCH 0585/1224] staging: media: Add Raspberry Pi V4L2 H265 decoder +Subject: [PATCH 0585/1225] 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. @@ -382565,10 +382565,10 @@ index 0000000000000..9c4f3fb2f9f6b 2.18.4 -From f924eddd3c2dbf49490821bec7ba16b9c6b05927 Mon Sep 17 00:00:00 2001 +From 8d299e4fca00ff197dd99f009c5ed71ea98581d2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Mar 2020 16:52:55 +0000 -Subject: [PATCH 0586/1224] dtoverlays: Add overlay to enable the HEVC V4L2 +Subject: [PATCH 0586/1225] dtoverlays: Add overlay to enable the HEVC V4L2 driver This replaces the rpivid_mem register mapping driver. @@ -382699,10 +382699,10 @@ index e4ea63553dc06..5fe23a0bf27fe 100644 2.18.4 -From 5184a3b2fd941f61eb4aa2ad6981026fc1ecb0e8 Mon Sep 17 00:00:00 2001 +From dcf6e188d40d2f549b4054d2ddaf928a68e20db3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Mar 2020 16:55:32 +0000 -Subject: [PATCH 0587/1224] defconfig: Add V4L2 HEVC driver to +Subject: [PATCH 0587/1225] defconfig: Add V4L2 HEVC driver to bcm2711_defconfig This replaces the register mapped driver. @@ -382736,10 +382736,10 @@ index 5fe23a0bf27fe..e4ea63553dc06 100644 2.18.4 -From 364bf1cda9b3e90097d89100c5d1e17db6b0c813 Mon Sep 17 00:00:00 2001 +From 10522012c9d042ba053b99ea8976529ed511ba59 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 6 Dec 2019 13:05:27 +0100 -Subject: [PATCH 0588/1224] mmc: sdhci: Silence MMC warnings +Subject: [PATCH 0588/1225] 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. @@ -382784,10 +382784,10 @@ index a1aeb2e105641..86586f08a853e 100644 2.18.4 -From 1153701fac4e5cf768623a1b30331f8dea74447c Mon Sep 17 00:00:00 2001 +From f062e1cf8c4b72eb4a4aef21930b923e917ccd98 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 17 Feb 2020 16:20:27 +0100 -Subject: [PATCH 0589/1224] Revert "v3d_drv: Allow clock retrieval by name" +Subject: [PATCH 0589/1225] Revert "v3d_drv: Allow clock retrieval by name" This reverts commit 229fbb896ca6e0a40272cc846e41eeb0c29a551f. --- @@ -382813,10 +382813,10 @@ index 87ce683f3c04d..91b0769b69efe 100644 2.18.4 -From 5df737f8a3410584233abc1689eb964b116df939 Mon Sep 17 00:00:00 2001 +From 1765fc86f5d9bc5dfc967c7ebb27381613998381 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 09:33:51 +0100 -Subject: [PATCH 0590/1224] Revert "clk-raspberrypi: Also support v3d clock" +Subject: [PATCH 0590/1225] Revert "clk-raspberrypi: Also support v3d clock" This reverts commit 54354f31352ca1e058b029abd384819435c9ef47. --- @@ -383466,10 +383466,10 @@ index 8daf26df54308..e4e1392403406 100644 2.18.4 -From 46add86ce734cda37c666c7e310a4af6f237b2ec Mon Sep 17 00:00:00 2001 +From 15d8af5eedff3538bf1afb55872f4fce9b6e5826 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 09:33:59 +0100 -Subject: [PATCH 0591/1224] Revert "clk-raspberrypi: Allow cpufreq driver to +Subject: [PATCH 0591/1225] Revert "clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks" This reverts commit 60dc4841efc8fe97b710b49d37d50bd719e8ca07. @@ -383494,10 +383494,10 @@ index e4e1392403406..1654fd0eedc94 100644 2.18.4 -From abdd098b3a251a3c05cd6b1a8c631b121d6edf0f Mon Sep 17 00:00:00 2001 +From b0f56947a3d93c1a56a4494b433647eda1ae4ce2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 16:55:01 +0100 -Subject: [PATCH 0592/1224] dt-bindings: i2c: brcmstb: Convert the BRCMSTB +Subject: [PATCH 0592/1225] dt-bindings: i2c: brcmstb: Convert the BRCMSTB binding to a schema Switch the DT binding to a YAML schema to enable the DT validation. @@ -383632,10 +383632,10 @@ index 9a76a6de3e984..faa83d7e339fe 100644 2.18.4 -From 6353ac14372692802967055844c7ba0cd9520c74 Mon Sep 17 00:00:00 2001 +From a01bc69afa2f51ef13d9a6b1846db7a7cb75988d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 17 Dec 2019 09:58:34 +0100 -Subject: [PATCH 0593/1224] dt-bindings: i2c: brcmstb: Add BCM2711 BSC/AUTO-I2C +Subject: [PATCH 0593/1225] dt-bindings: i2c: brcmstb: Add BCM2711 BSC/AUTO-I2C binding The HDMI blocks in the BCM2771 have an i2c controller to retrieve the @@ -383734,10 +383734,10 @@ index 3189d74096e89..edbca24761283 100644 2.18.4 -From 983492af321ebae4d639fde2d339bed7566c036b Mon Sep 17 00:00:00 2001 +From 804c208a443f6a733d1d3e8b69db4dee70debadc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 17 Dec 2019 09:58:34 +0100 -Subject: [PATCH 0594/1224] i2c: brcmstb: Support BCM2711 HDMI BSC controllers +Subject: [PATCH 0594/1225] i2c: brcmstb: Support BCM2711 HDMI BSC controllers The HDMI blocks in the BCM2771 have an i2c controller to retrieve the EDID. This block is split into two parts, the BSC and the AUTO_I2C, @@ -383766,7 +383766,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 33 insertions(+) diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c -index 506991596b68d..169a2836922d2 100644 +index 5e89cd6b690ce..d2cde8e2a3703 100644 --- a/drivers/i2c/busses/i2c-brcmstb.c +++ b/drivers/i2c/busses/i2c-brcmstb.c @@ -580,6 +580,31 @@ static void brcmstb_i2c_set_bsc_reg_defaults(struct brcmstb_i2c_dev *dev) @@ -383827,10 +383827,10 @@ index 506991596b68d..169a2836922d2 100644 2.18.4 -From 7f280c64bd03d2657eab85a79c8286882acf9f64 Mon Sep 17 00:00:00 2001 +From 715e8c00fb9b7170c3331c732f85ff9abdadd57c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 Jan 2020 13:36:42 +0100 -Subject: [PATCH 0595/1224] i2c: brcmstb: Allow to compile it on BCM2835 +Subject: [PATCH 0595/1225] i2c: brcmstb: Allow to compile it on BCM2835 The BCM2711, supported by ARCH_BCM2835, also has a controller by the brcmstb driver so let's allow it to be compiled on that platform. @@ -383864,10 +383864,10 @@ index 539f9309f6e67..f82da9d5c0f99 100644 2.18.4 -From 9135d9c6c98cc260d978c00fb273e8439d101bb6 Mon Sep 17 00:00:00 2001 +From dd94b1988cdcc9a8f715b553faccfa06be96dff0 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:51:09 +0100 -Subject: [PATCH 0596/1224] dt-bindings: clock: Add a binding for the RPi +Subject: [PATCH 0596/1225] dt-bindings: clock: Add a binding for the RPi Firmware clocks The firmare running on the RPi VideoCore can be used to discover and @@ -383934,10 +383934,10 @@ index 0000000000000..d37bc311321de 2.18.4 -From f2fa4e46585d50a51671c8e4af672078d196b43e Mon Sep 17 00:00:00 2001 +From 2898886d3686b7a43d6f53cfd8b8e405b707acb7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 23 Dec 2019 19:58:08 +0100 -Subject: [PATCH 0597/1224] clk: bcm: rpi: Allow the driver to be probed by DT +Subject: [PATCH 0597/1225] clk: bcm: rpi: Allow the driver to be probed by DT The current firmware clock driver for the RaspberryPi can only be probed by manually registering an associated platform_device. @@ -384000,10 +384000,10 @@ index 1654fd0eedc94..94870234824cd 100644 2.18.4 -From 086e071da96feacd6d494efb7153d35e61308889 Mon Sep 17 00:00:00 2001 +From 22d3a0002bd772952c2355c56a766d90e15d0686 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 14:17:54 +0100 -Subject: [PATCH 0598/1224] clk: bcm: rpi: Statically init clk_init_data +Subject: [PATCH 0598/1225] clk: bcm: rpi: Statically init clk_init_data Instead of declaring the clk_init_data and then calling memset on it, just initialise properly. @@ -384038,10 +384038,10 @@ index 94870234824cd..64fd91b5ffe9d 100644 2.18.4 -From 7249de6c0e4e2bc252ede4566d990570cffadaab Mon Sep 17 00:00:00 2001 +From db5ceb1ab2a24fdfbe12ef9053dab490760f21b0 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:40:00 +0100 -Subject: [PATCH 0599/1224] clk: bcm: rpi: Use clk_hw_register for pllb_arm +Subject: [PATCH 0599/1225] clk: bcm: rpi: Use clk_hw_register for pllb_arm The pllb_arm clock is defined as a fixed factor clock with the pllb clock as a parent. However, all its configuration is entirely static, and thus we @@ -384100,10 +384100,10 @@ index 64fd91b5ffe9d..48cffa44db648 100644 2.18.4 -From 94d088ef901221e02a7db4dacea4039ece6a27a0 Mon Sep 17 00:00:00 2001 +From 4c9a50d4570e4a820871a523ba79346115d00a6c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:41:37 +0100 -Subject: [PATCH 0600/1224] clk: bcm: rpi: Remove global pllb_arm clock pointer +Subject: [PATCH 0600/1225] clk: bcm: rpi: Remove global pllb_arm clock pointer The pllb_arm clk_hw pointer in the raspberry_clk structure isn't used anywhere but in the raspberrypi_register_pllb_arm. @@ -384151,10 +384151,10 @@ index 48cffa44db648..61a942f9a6a2a 100644 2.18.4 -From 67d1b74a3b6b539e00af316aa4d1284cdad21000 Mon Sep 17 00:00:00 2001 +From eb587de09a852073eea47172d5b8f01d5a925ecc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:42:40 +0100 -Subject: [PATCH 0601/1224] clk: bcm: rpi: Make sure pllb_arm is removed +Subject: [PATCH 0601/1225] clk: bcm: rpi: Make sure pllb_arm is removed The pllb_arm clock was created at probe time, but was never removed if something went wrong later in probe, or if the driver was ever removed from @@ -384197,10 +384197,10 @@ index 61a942f9a6a2a..783c8c5e53734 100644 2.18.4 -From 01a309bb687e7ff8efae75e4f598a606da451706 Mon Sep 17 00:00:00 2001 +From bb8de4ea7776181a23d3ae6e6e01dcff4119df6d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:46:24 +0100 -Subject: [PATCH 0602/1224] clk: bcm: rpi: Remove pllb_arm_lookup global +Subject: [PATCH 0602/1225] clk: bcm: rpi: Remove pllb_arm_lookup global pointer The pllb_arm_lookup pointer in the struct raspberrypi_clk is not used for @@ -384255,10 +384255,10 @@ index 783c8c5e53734..0c1d6c2923029 100644 2.18.4 -From 52f8bf639221eeafded2500481cc69d01ca8b5e2 Mon Sep 17 00:00:00 2001 +From 0f7b85dfef3512df9a9c0e35f95d32d1297563a4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 14:21:45 +0100 -Subject: [PATCH 0603/1224] clk: bcm: rpi: Switch to clk_hw_register_clkdev +Subject: [PATCH 0603/1225] clk: bcm: rpi: Switch to clk_hw_register_clkdev Since we don't care about retrieving the clk_lookup structure pointer returned by clkdev_hw_create, we can just use the clk_hw_register_clkdev @@ -384306,10 +384306,10 @@ index 0c1d6c2923029..b97c7ec613769 100644 2.18.4 -From 8f01d1b6c2c8d6e6e70b0ed584cda739dfa595cb Mon Sep 17 00:00:00 2001 +From 86cf75d30116ccab23aa7b1f06ac983a09446faa Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:47:13 +0100 -Subject: [PATCH 0604/1224] clk: bcm: rpi: Make sure the clkdev lookup is +Subject: [PATCH 0604/1225] clk: bcm: rpi: Make sure the clkdev lookup is removed The clkdev lookup created for the cpufreq device is never removed if @@ -384347,10 +384347,10 @@ index b97c7ec613769..b8b55134ba3fa 100644 2.18.4 -From 26a3725455d853d777d377637e0cde7164a56aac Mon Sep 17 00:00:00 2001 +From 89b1944d8b6c26bbecf6d366f9f0519cc2e172c8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:01:33 +0100 -Subject: [PATCH 0605/1224] clk: bcm: rpi: Create a data structure for the +Subject: [PATCH 0605/1225] clk: bcm: rpi: Create a data structure for the clocks So far the driver has really only been providing a single clock, and stored @@ -384480,10 +384480,10 @@ index b8b55134ba3fa..964fc8f792cc7 100644 2.18.4 -From 87f44318c3a3598bcd7e20b6b29a6fc908908032 Mon Sep 17 00:00:00 2001 +From d2cc87f5a7be499355869fb7b5e0322720c1c63a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:04:16 +0100 -Subject: [PATCH 0606/1224] clk: bcm: rpi: Add clock id to data +Subject: [PATCH 0606/1225] clk: bcm: rpi: Add clock id to data The driver has really only supported one clock so far and has hardcoded the ID used in communications with the firmware in all the functions @@ -384572,10 +384572,10 @@ index 964fc8f792cc7..e796dabbc6415 100644 2.18.4 -From c114a14e89cc3df41bf9349e6fc6aa79facb7c8a Mon Sep 17 00:00:00 2001 +From bcea652aa754558bf17bc3e38c5b288e1c924cb6 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:08:17 +0100 -Subject: [PATCH 0607/1224] clk: bcm: rpi: Pass the clocks data to the firmware +Subject: [PATCH 0607/1225] clk: bcm: rpi: Pass the clocks data to the firmware function The raspberry_clock_property only takes the clock ID as an argument, but @@ -384674,10 +384674,10 @@ index e796dabbc6415..055dd34c5acc1 100644 2.18.4 -From eb8e22ed3ad39453d19fdd3b145d387ef2307351 Mon Sep 17 00:00:00 2001 +From f37f394752a04623056bf0c6a1c7ae2eb95f0848 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 20 Feb 2020 12:45:47 +0100 -Subject: [PATCH 0608/1224] clk: bcm: rpi: Rename is_prepared function +Subject: [PATCH 0608/1225] clk: bcm: rpi: Rename is_prepared function The raspberrypi_fw_pll_is_on function doesn't only apply to PLL registered in the driver, but any clock exposed by the firmware. @@ -384720,10 +384720,10 @@ index 055dd34c5acc1..2f10bccf03a54 100644 2.18.4 -From 368c775fcd556bdda58fad90c164cfbf7a6c1b93 Mon Sep 17 00:00:00 2001 +From a648a655f23c1413cf34e72738c28c891423d254 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:14:18 +0100 -Subject: [PATCH 0609/1224] clk: bcm: rpi: Split pllb clock hooks +Subject: [PATCH 0609/1225] clk: bcm: rpi: Split pllb clock hooks The driver only supports the pllb for now and all the clock framework hooks are a mix of the generic firmware interface and the specifics of the pllb. @@ -384806,10 +384806,10 @@ index 2f10bccf03a54..d1b5826c95bb2 100644 2.18.4 -From b8088391cf4bfefbc7acc797efb90ee4042e9510 Mon Sep 17 00:00:00 2001 +From f60340e242238e5eadae74421efaa93d0be6bae1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:30:01 +0100 -Subject: [PATCH 0610/1224] clk: bcm: rpi: Make the PLLB registration function +Subject: [PATCH 0610/1225] clk: bcm: rpi: Make the PLLB registration function return a clk_hw The raspberrypi_register_pllb has been returning an integer so far to @@ -384956,10 +384956,10 @@ index d1b5826c95bb2..05ed2f2cde318 100644 2.18.4 -From 09bef02e31ff607446f6a4607c5945de0523b4e5 Mon Sep 17 00:00:00 2001 +From ca5ece377992e519659930bdc70a1e8d881694b1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 17:03:46 +0100 -Subject: [PATCH 0611/1224] clk: bcm: rpi: Add DT provider for the clocks +Subject: [PATCH 0611/1225] clk: bcm: rpi: Add DT provider for the clocks For the upcoming registration of the clocks provided by the firmware, make sure it's exposed to the device tree providers. @@ -385029,10 +385029,10 @@ index 05ed2f2cde318..f2fbcef54c9c7 100644 2.18.4 -From da480995cfb8e879408c9c6f1ed9014e8f966120 Mon Sep 17 00:00:00 2001 +From d9128677c7b83d710213634b74306d38c47ffa3d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 10 Feb 2020 14:06:09 +0100 -Subject: [PATCH 0612/1224] clk: bcm: rpi: Discover the firmware clocks +Subject: [PATCH 0612/1225] clk: bcm: rpi: Discover the firmware clocks The RaspberryPi4 firmware actually exposes more clocks than are currently handled by the driver and we will need to change some of them directly @@ -385210,10 +385210,10 @@ index 05c6989ec4c66..3335c2a2993c2 100644 2.18.4 -From 717fc52aa6fd8d635102e979df590185994fcff8 Mon Sep 17 00:00:00 2001 +From f41c487b6b65c1ae50a6852feef5b73613198177 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 23 Dec 2019 19:58:30 +0100 -Subject: [PATCH 0613/1224] ARM: dts: bcm2711: Add firmware clocks node +Subject: [PATCH 0613/1225] ARM: dts: bcm2711: Add firmware clocks node Now that we have a clock driver for the clocks exposed by the firmware, let's add the device tree nodes for it. @@ -385257,10 +385257,10 @@ index b56388ce12163..7acd4a3cf1e55 100644 2.18.4 -From 21d40cd9477ee0bae26c26196bfbb80119053aba Mon Sep 17 00:00:00 2001 +From 42198025b1ed3199059d927319c04250fa9cd00b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 09:33:52 +0100 -Subject: [PATCH 0614/1224] reset: Move reset-simple header out of +Subject: [PATCH 0614/1225] reset: Move reset-simple header out of drivers/reset The reset-simple code can be useful for drivers outside of drivers/reset @@ -385354,10 +385354,10 @@ rename to include/linux/reset/reset-simple.h 2.18.4 -From 2c0049dfe0728b6ae6444551967586951b7fb53f Mon Sep 17 00:00:00 2001 +From 67d1a1b448390826e53b027cb8abb2031dc7147a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 16:22:20 +0100 -Subject: [PATCH 0615/1224] reset: simple: Add reset callback +Subject: [PATCH 0615/1225] reset: simple: Add reset callback The reset-simple code lacks a reset callback that is still pretty easy to implement. The only real thing to consider is the delay needed for a device @@ -385447,10 +385447,10 @@ index 08ccb25a55e65..5eb83625a495f 100644 2.18.4 -From 087ca5378b0a4d3a8ebd14cc1b4a4a89eed61078 Mon Sep 17 00:00:00 2001 +From df91ad09992c5e6f856bcd23fcb555e395e2375c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:50:31 +0100 -Subject: [PATCH 0616/1224] dt-bindings: clock: Add BCM2711 DVP binding +Subject: [PATCH 0616/1225] dt-bindings: clock: Add BCM2711 DVP binding The BCM2711 has a unit controlling the HDMI0 and HDMI1 clock and reset signals. Let's add a binding for it. @@ -385522,10 +385522,10 @@ index 0000000000000..08543ecbe35b2 2.18.4 -From 1faf7a485638179df281cb1f7b06c303a0e2b069 Mon Sep 17 00:00:00 2001 +From cd5a321b6add6c87033c13a4fd85efaf83df5415 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 09:36:27 +0100 -Subject: [PATCH 0617/1224] clk: bcm: Add BCM2711 DVP driver +Subject: [PATCH 0617/1225] clk: bcm: Add BCM2711 DVP driver The HDMI block has a block that controls clocks and reset signals to the HDMI0 and HDMI1 controllers. @@ -385705,10 +385705,10 @@ index 0000000000000..bfe4e5b4a1482 2.18.4 -From b129304aafe33e6050462e5ef2b4c900ebd2cfe5 Mon Sep 17 00:00:00 2001 +From 141cdad4989a404b5a8b4a93fbb021d191f77b34 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 09:37:06 +0100 -Subject: [PATCH 0618/1224] ARM: dts: bcm2711: Add HDMI DVP +Subject: [PATCH 0618/1225] ARM: dts: bcm2711: Add HDMI DVP Now that we have a driver for the DVP, let's add its DT node. @@ -385754,10 +385754,10 @@ index 7acd4a3cf1e55..7cf1a9748f006 100644 2.18.4 -From 4f3093520123b325e9ef961234a1ce67c263dd7f Mon Sep 17 00:00:00 2001 +From c094dca2de0a371eefa6beccf4fa39f462705ad6 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:42:05 +0100 -Subject: [PATCH 0619/1224] dt-bindings: display: Convert VC4 bindings to +Subject: [PATCH 0619/1225] dt-bindings: display: Convert VC4 bindings to schemas The BCM283x SoCs have a display pipeline composed of several controllers @@ -386497,10 +386497,10 @@ index faa83d7e339fe..b1b23c6921865 100644 2.18.4 -From 025a5d23b8af68b079c433e5066ca7818c7bacc8 Mon Sep 17 00:00:00 2001 +From bab54d1b5966394144a731b811224f52ff2a7d96 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:47:18 +0100 -Subject: [PATCH 0620/1224] dt-bindings: display: vc4: dpi: Add missing +Subject: [PATCH 0620/1225] dt-bindings: display: vc4: dpi: Add missing clock-names property While the device tree and the driver expected a clock-names property, it @@ -386541,10 +386541,10 @@ index 288494b70e821..58213c564e034 100644 2.18.4 -From 187348e697846a5ea98f169c3e27973cb3bccc30 Mon Sep 17 00:00:00 2001 +From e1ba40b1f9810409218ed0f83aa17a1530ccfe97 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:47:18 +0100 -Subject: [PATCH 0621/1224] dt-bindings: display: vc4: dsi: Add missing clock +Subject: [PATCH 0621/1225] dt-bindings: display: vc4: dsi: Add missing clock properties While the device tree and the driver expected a clock-names and a @@ -386601,10 +386601,10 @@ index 3887675f844ec..3c643b227a70c 100644 2.18.4 -From 5af0a796a44cadc1fea6281cc0fc695bc18103a0 Mon Sep 17 00:00:00 2001 +From c558fbc97f6fe098c4c0113a33f3099581cdf37c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:47:18 +0100 -Subject: [PATCH 0622/1224] dt-bindings: display: vc4: hdmi: Add missing +Subject: [PATCH 0622/1225] dt-bindings: display: vc4: hdmi: Add missing clock-names property While the device tree and the driver expected a clock-names property, it @@ -386641,10 +386641,10 @@ index 834cc5f1c2546..52b3cdac0bdf0 100644 2.18.4 -From 106c1159d6d99d3ec91149ad7abeffd6f0ebdd19 Mon Sep 17 00:00:00 2001 +From 827031236dc89ccc644047dbd90f4bf2a95778e2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:40:56 +0100 -Subject: [PATCH 0623/1224] dt-bindings: display: vc4: Document BCM2711 VC5 +Subject: [PATCH 0623/1225] dt-bindings: display: vc4: Document BCM2711 VC5 The BCM2711 comes with a new VideoCore. Add a compatible for it. @@ -386671,10 +386671,10 @@ index 0dcf0c3973759..49a5e041aa493 100644 2.18.4 -From 4e84299018b5e74fd1bb7ba799fcf0d60be4e905 Mon Sep 17 00:00:00 2001 +From 2be70c6a73877a4b05966698f0946914f5b16d1d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 18:08:48 +0100 -Subject: [PATCH 0624/1224] drm/vc4: drv: Add include guards +Subject: [PATCH 0624/1225] drm/vc4: drv: Add include guards vc4_drv.h doesn't have any include guards which prevents it from being included twice. Let's add them. @@ -386707,10 +386707,10 @@ index 308f0473592a6..95f7433c86309 100644 2.18.4 -From c2146d3f464ab79b7dae61a494bed9cd38af5c71 Mon Sep 17 00:00:00 2001 +From c964c61d7a8313bb139890903722627c3d48a400 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 15:40:34 +0100 -Subject: [PATCH 0625/1224] drm/vc4: drv: Support BCM2711 +Subject: [PATCH 0625/1225] drm/vc4: drv: Support BCM2711 The BCM2711 has a reworked display pipeline, and the load tracker needs some adjustement to operate properly. Let's add a compatible for BCM2711 @@ -386809,10 +386809,10 @@ index 1b921e114c034..b821361383707 100644 drm_mode_config_reset(dev); diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 1c5eef3ac4415..81ec016a12d8f 100644 +index 5ea6c84d7f6d7..12080775a7700 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -492,6 +492,11 @@ static void vc4_plane_calc_load(struct drm_plane_state *state) +@@ -500,6 +500,11 @@ static void vc4_plane_calc_load(struct drm_plane_state *state) struct vc4_plane_state *vc4_state; struct drm_crtc_state *crtc_state; unsigned int vscale_factor; @@ -386828,10 +386828,10 @@ index 1c5eef3ac4415..81ec016a12d8f 100644 2.18.4 -From 17a2bbccd0ffc64b6cb30584b9a074422d107627 Mon Sep 17 00:00:00 2001 +From 148b1ac94dab420be74bf4babaf77c64f3fa77f3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Aug 2019 17:51:07 +0100 -Subject: [PATCH 0626/1224] drm/vc4: drv: Add support for the BCM2711 HVS5 +Subject: [PATCH 0626/1225] drm/vc4: drv: Add support for the BCM2711 HVS5 The HVS found in the BCM2711 is slightly different from the previous generations. @@ -386950,7 +386950,7 @@ index 9936b15d0bf1f..650d4d9a5980c 100644 /* Upload filter kernels. We only have the one for now, so we * keep it around for the lifetime of the driver. diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 81ec016a12d8f..49c16d0e25278 100644 +index 12080775a7700..770f4112b3f9a 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -32,45 +32,60 @@ static const struct hvs_format { @@ -387024,7 +387024,7 @@ index 81ec016a12d8f..49c16d0e25278 100644 .pixel_order = HVS_PIXEL_ORDER_XBGR, }, { -@@ -828,35 +843,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -836,35 +851,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, return -EINVAL; } @@ -387060,7 +387060,7 @@ index 81ec016a12d8f..49c16d0e25278 100644 /* Don't waste cycles mixing with plane alpha if the set alpha * is opaque or there is no per-pixel alpha information. * In any case we use the alpha property value as the fixed alpha. -@@ -864,20 +850,120 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -872,20 +858,120 @@ static int vc4_plane_mode_set(struct drm_plane *plane, mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE && fb->format->has_alpha; @@ -387194,7 +387194,7 @@ index 81ec016a12d8f..49c16d0e25278 100644 /* Pointer Word 0/1/2: RGB / Y / Cb / Cr Pointers -@@ -1266,6 +1352,10 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, +@@ -1276,6 +1362,10 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, default: return false; } @@ -387339,10 +387339,10 @@ index 8416fdaf2ec47..22b8952585451 100644 2.18.4 -From 50308dfb94084e8ffa5364bf3b81dd415b61eba5 Mon Sep 17 00:00:00 2001 +From 1851a487910a4c7f8b194d166a86eb8d0211aeca Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 11 Feb 2020 16:55:02 +0000 -Subject: [PATCH 0627/1224] drm/vc4: plane: Improve LBM usage +Subject: [PATCH 0627/1225] drm/vc4: plane: Improve LBM usage LBM allocations were always taking the worst case sizing of max(src_width, dst_width) * 16. This is significantly over @@ -387359,7 +387359,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 49c16d0e25278..ed07e25f6b941 100644 +index 770f4112b3f9a..694779cfafe08 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -142,9 +142,10 @@ static const struct hvs_format *vc4_get_hvs_format(u32 drm_format) @@ -387375,7 +387375,7 @@ index 49c16d0e25278..ed07e25f6b941 100644 return VC4_SCALING_NONE; if (3 * dst >= 2 * src) return VC4_SCALING_PPF; -@@ -369,9 +370,11 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) +@@ -377,9 +378,11 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) return ret; vc4_state->x_scaling[0] = vc4_get_scaling_mode(vc4_state->src_w[0], @@ -387389,7 +387389,7 @@ index 49c16d0e25278..ed07e25f6b941 100644 vc4_state->is_unity = (vc4_state->x_scaling[0] == VC4_SCALING_NONE && vc4_state->y_scaling[0] == VC4_SCALING_NONE); -@@ -384,10 +387,12 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) +@@ -392,10 +395,12 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) vc4_state->x_scaling[1] = vc4_get_scaling_mode(vc4_state->src_w[1], @@ -387404,7 +387404,7 @@ index 49c16d0e25278..ed07e25f6b941 100644 /* YUV conversion requires that horizontal scaling be enabled * on the UV plane even if vc4_get_scaling_mode() returned -@@ -437,10 +442,7 @@ static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst) +@@ -445,10 +450,7 @@ static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst) static u32 vc4_lbm_size(struct drm_plane_state *state) { struct vc4_plane_state *vc4_state = to_vc4_plane_state(state); @@ -387416,7 +387416,7 @@ index 49c16d0e25278..ed07e25f6b941 100644 u32 lbm; /* LBM is not needed when there's no vertical scaling. */ -@@ -448,6 +450,11 @@ static u32 vc4_lbm_size(struct drm_plane_state *state) +@@ -456,6 +458,11 @@ static u32 vc4_lbm_size(struct drm_plane_state *state) vc4_state->y_scaling[1] == VC4_SCALING_NONE) return 0; @@ -387428,7 +387428,7 @@ index 49c16d0e25278..ed07e25f6b941 100644 if (!vc4_state->is_yuv) { if (vc4_state->y_scaling[0] == VC4_SCALING_TPZ) lbm = pix_per_line * 8; -@@ -583,7 +590,9 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state) +@@ -591,7 +598,9 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state) spin_lock_irqsave(&vc4->hvs->mm_lock, irqflags); ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm, &vc4_state->lbm, @@ -387443,10 +387443,10 @@ index 49c16d0e25278..ed07e25f6b941 100644 2.18.4 -From d1d706662e58064e14784705e8c48a8098a958bb Mon Sep 17 00:00:00 2001 +From c49293cc0f7e25605e57576cfd45d41a598897c9 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:32:57 +0100 -Subject: [PATCH 0628/1224] drm/vc4: plane: Move planes creation to its own +Subject: [PATCH 0628/1225] drm/vc4: plane: Move planes creation to its own function The planes so far were created as part of the CRTC binding code with @@ -387529,10 +387529,10 @@ index db414d9f7630d..7364b266ba5b4 100644 u32 vc4_plane_dlist_size(const struct drm_plane_state *state); void vc4_plane_async_set_fb(struct drm_plane *plane, diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index ed07e25f6b941..940d046b07b64 100644 +index 694779cfafe08..0fa3df7d6d599 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1437,3 +1437,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1447,3 +1447,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, return plane; } @@ -387578,10 +387578,10 @@ index ed07e25f6b941..940d046b07b64 100644 2.18.4 -From 6ff81c7cf898a1c7446062348e178a41e3e9ec46 Mon Sep 17 00:00:00 2001 +From 040d134263213832932311aadc7f4d46ccafb54e Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:41:41 +0100 -Subject: [PATCH 0629/1224] drm/vc4: plane: Move additional planes creation to +Subject: [PATCH 0629/1225] drm/vc4: plane: Move additional planes creation to driver So far the plane creation was done when each CRTC was bound, and those @@ -387661,10 +387661,10 @@ index a726d262a0fac..3f523e1bee7f1 100644 2.18.4 -From ebd80c04a57ffc08ff23958fc10c8db0cade95f7 Mon Sep 17 00:00:00 2001 +From 982ebde824b1498e69c50263cec2e5bf4bd5539f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:46:14 +0100 -Subject: [PATCH 0630/1224] drm/vc4: plane: Register all the planes at once +Subject: [PATCH 0630/1225] drm/vc4: plane: Register all the planes at once Instead of creating planes for each CRTC, we eventually want to create all the planes for each CRTCs. @@ -387721,10 +387721,10 @@ index 7364b266ba5b4..d2d253a942880 100644 u32 vc4_plane_dlist_size(const struct drm_plane_state *state); void vc4_plane_async_set_fb(struct drm_plane *plane, diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 940d046b07b64..603351b4c428f 100644 +index 0fa3df7d6d599..9e4f663c7d2be 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1438,39 +1438,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1448,39 +1448,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, return plane; } @@ -387796,10 +387796,10 @@ index 940d046b07b64..603351b4c428f 100644 2.18.4 -From 8ff9438e17e72768c62796b43d4203dd90a10d44 Mon Sep 17 00:00:00 2001 +From dfe0563a5e08149b5f1f559936571b4bd1b3f21d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:50:06 +0100 -Subject: [PATCH 0631/1224] drm/vc4: plane: Create overlays for any CRTC +Subject: [PATCH 0631/1225] drm/vc4: plane: Create overlays for any CRTC Now that we have everything in place, we can now register all the overlay planes that can be assigned to all the CRTCs. @@ -387820,10 +387820,10 @@ Signed-off-by: Maxime Ripard 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 603351b4c428f..744034c41ce20 100644 +index 9e4f663c7d2be..1a972505c3695 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1444,26 +1444,27 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) +@@ -1454,26 +1454,27 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) struct drm_crtc *crtc; unsigned int i; @@ -387872,10 +387872,10 @@ index 603351b4c428f..744034c41ce20 100644 2.18.4 -From 40e4aed21dda87fbef22a1ea55884eb8b6adc40f Mon Sep 17 00:00:00 2001 +From b3edc9febdb77abc926f1e350c40af1d7355d274 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:52:42 +0100 -Subject: [PATCH 0632/1224] drm/vc4: plane: Create more planes +Subject: [PATCH 0632/1225] drm/vc4: plane: Create more planes Let's now create more planes that can be affected to all the CRTCs. @@ -387894,10 +387894,10 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 744034c41ce20..887ef481e7463 100644 +index 1a972505c3695..54bdbeb46390d 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1453,7 +1453,7 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) +@@ -1463,7 +1463,7 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) * modest number of planes to expose, that should hopefully * still cover any sane usecase. */ @@ -387910,10 +387910,10 @@ index 744034c41ce20..887ef481e7463 100644 2.18.4 -From e3c46e302637ceed886f47f1fba46a69607c9ac3 Mon Sep 17 00:00:00 2001 +From f28b06496f6324bb1bb691b42f206bbb949e24bb Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 11:45:04 +0100 -Subject: [PATCH 0633/1224] drm/vc4: crtc: Rename SoC data structures +Subject: [PATCH 0633/1225] drm/vc4: crtc: Rename SoC data structures Since we're going to introduce pixelvalve data structures for other SoCs than the BCM2835, let's rename the structures defined in the code to @@ -387972,10 +387972,10 @@ index c570dd09b180c..8e6c6784f9a3f 100644 2.18.4 -From 08b467c4f63f4c44708214e5f1901b7b41adff08 Mon Sep 17 00:00:00 2001 +From 68d660f2ebb77e84d3a9510a86ad0c3786a0c114 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 15:45:04 +0100 -Subject: [PATCH 0634/1224] drm/vc4: crtc: Move crtc state to common header +Subject: [PATCH 0634/1225] drm/vc4: crtc: Move crtc state to common header We'll need to access the crtc_state from outside of vc4_crtc.c, so let's move it to vc4_drv.h @@ -388054,10 +388054,10 @@ index d2d253a942880..2703b9d8936bb 100644 2.18.4 -From 9c1cfd324d182d8fc0e59512977ffdaa39f15855 Mon Sep 17 00:00:00 2001 +From 4dbdac5e42a96a28bed7aeb829234a83f4d17111 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 11:36:50 +0100 -Subject: [PATCH 0635/1224] drm/vc4: crtc: Deal with different number of pixel +Subject: [PATCH 0635/1225] drm/vc4: crtc: Deal with different number of pixel per clock Some of the HDMI pixelvalves in vc5 output two pixels per clock cycle. @@ -388148,10 +388148,10 @@ index 2703b9d8936bb..dabf9951c3750 100644 2.18.4 -From 7f23b970c9e7c0c24e5c5d27e04986b4f524bbff Mon Sep 17 00:00:00 2001 +From 5906eceded0faa1e8cbdd18f2e8880a76068f941 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 9 Jan 2020 18:40:49 +0100 -Subject: [PATCH 0636/1224] drm/vc4: crtc: Use a shared interrupt +Subject: [PATCH 0636/1225] drm/vc4: crtc: Use a shared interrupt Some pixelvalves in vc5 use the same interrupt line so let's register our interrupt handler as a shared one. @@ -388180,10 +388180,10 @@ index 5e94adb4f70b4..4eedaddb8c922 100644 2.18.4 -From d2a7eecd494d3abf918b3890989ce7adaca0cf34 Mon Sep 17 00:00:00 2001 +From f6ba63df08f3ea4ea90c39019f6761920a87c7f7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Jan 2020 13:39:32 +0100 -Subject: [PATCH 0637/1224] drm/vc4: crtc: Turn static const variable into a +Subject: [PATCH 0637/1225] drm/vc4: crtc: Turn static const variable into a define The hvs_latency_pix variable doesn't need to be a variable and can just be @@ -388236,10 +388236,10 @@ index 4eedaddb8c922..7b08e6fd1fb1e 100644 2.18.4 -From 4910044a1dfa3b3772af123d2732ce38073924f5 Mon Sep 17 00:00:00 2001 +From 5778154592da3e830fb60bdb382b1aefba9ae5ca Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 15:48:09 +0100 -Subject: [PATCH 0638/1224] drm/vc4: crtc: Move the cob allocation outside of +Subject: [PATCH 0638/1225] drm/vc4: crtc: Move the cob allocation outside of bind The COB allocation depends on the HVS channel used for a given @@ -388354,10 +388354,10 @@ index dabf9951c3750..a7c9295aecc30 100644 2.18.4 -From d2b3c8d21ed0ba351d7d707b6b44baf5d8cba270 Mon Sep 17 00:00:00 2001 +From ffb7d6679e6b0bade6875a56878069bb64c2407b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 13:49:17 +0100 -Subject: [PATCH 0639/1224] drm/vc4: crtc: Rename HVS channel to output +Subject: [PATCH 0639/1225] drm/vc4: crtc: Rename HVS channel to output In vc5, the HVS has 6 outputs and 3 FIFOs (or channels), with pixelvalves each being assigned to a given output, but each output can @@ -388442,10 +388442,10 @@ index a7c9295aecc30..f6fc92663191a 100644 2.18.4 -From a1d57be5e9077a58ce3d05be496dac0b7218ae28 Mon Sep 17 00:00:00 2001 +From 177a8f98764a3a0a568f17f4bd605762256cc422 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 Jan 2020 13:37:27 +0100 -Subject: [PATCH 0640/1224] drm/vc4: crtc: Use local chan variable +Subject: [PATCH 0640/1225] drm/vc4: crtc: Use local chan variable The vc4_crtc_handle_page_flip already has a local variable holding the value of vc4_crtc->channel, so let's use it instead. @@ -388472,10 +388472,10 @@ index 8267e38abd5ff..2e1aee1ba05be 100644 2.18.4 -From 092cb08989703d7791f358969a7b790bbbbb4c64 Mon Sep 17 00:00:00 2001 +From 748e86f08225dd2c2256f6e4d2a55cc0bcb8b429 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 14:34:31 +0100 -Subject: [PATCH 0641/1224] drm/vc4: crtc: Enable and disable the PV in +Subject: [PATCH 0641/1225] drm/vc4: crtc: Enable and disable the PV in atomic_enable / disable The VIDEN bit in the pixelvalve currently being used to enable or disable @@ -388533,10 +388533,10 @@ index 2e1aee1ba05be..b394f873b194f 100644 2.18.4 -From 12602615dba33e1a391ff60e006af8c7d98cdb27 Mon Sep 17 00:00:00 2001 +From 10b7575146254fbbaa96e0f26085270f1242fc44 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 17:53:18 +0100 -Subject: [PATCH 0642/1224] drm/vc4: crtc: Assign output to channel +Subject: [PATCH 0642/1225] drm/vc4: crtc: Assign output to channel automatically The HVS found in the BCM2711 has 6 outputs and 3 FIFOs, with each output @@ -389005,10 +389005,10 @@ index 22b8952585451..1300198716aa6 100644 2.18.4 -From 1a6c56d6d2c44b649333ebed6a4a14b643dbbacc Mon Sep 17 00:00:00 2001 +From 8edf3f55094ceacac5826a6cfd45c12891673e54 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Jan 2020 13:39:20 +0100 -Subject: [PATCH 0643/1224] drm/vc4: crtc: Add FIFO depth to vc4_crtc_data +Subject: [PATCH 0643/1225] drm/vc4: crtc: Add FIFO depth to vc4_crtc_data Not all pixelvalve FIFOs in vc5 have the same depth, so we need to add that to our vc4_crtc_data structure to be able to compute the fill level @@ -389099,10 +389099,10 @@ index 8208dfd0cb088..6eb030445419f 100644 2.18.4 -From e6000a3e68915ea4684823220c05b3cfa9234e03 Mon Sep 17 00:00:00 2001 +From 1ce7bc8343e759abcb066f6ce32fdbf4b84ce605 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Jan 2020 13:40:37 +0100 -Subject: [PATCH 0644/1224] drm/vc4: crtc: Add function to compute FIFO level +Subject: [PATCH 0644/1225] drm/vc4: crtc: Add function to compute FIFO level bits The longer FIFOs in vc5 pixelvalves means that the FIFO full level @@ -389149,10 +389149,10 @@ index 961da7b2439d2..81d144fd446d1 100644 2.18.4 -From 74b6dc7f694731dcedccfa2f48b8d8efe97e7838 Mon Sep 17 00:00:00 2001 +From 4dea37e6f5f84bd1cf16ab49626b74464b474992 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 9 Jan 2020 18:35:13 +0100 -Subject: [PATCH 0645/1224] drm/vc4: crtc: Rename HDMI encoder type to HDMI0 +Subject: [PATCH 0645/1225] drm/vc4: crtc: Rename HDMI encoder type to HDMI0 The previous generations were only supporting a single HDMI controller, but that's about to change, so put an index as well to differentiate between @@ -389208,10 +389208,10 @@ index d59fd8714c5d8..821eb9c4dfbf0 100644 2.18.4 -From 2a4347262aa1bed99854872f41ca1cf5818d815a Mon Sep 17 00:00:00 2001 +From 6a164ada56401eab3aecfd87a4c16c132e01262a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 9 Jan 2020 18:39:30 +0100 -Subject: [PATCH 0646/1224] drm/vc4: crtc: Add HDMI1 encoder type +Subject: [PATCH 0646/1225] drm/vc4: crtc: Add HDMI1 encoder type The BCM2711 sports a second HDMI controller, so let's add that second HDMI encoder type. @@ -389237,10 +389237,10 @@ index 4aed118c79252..4a83b8879f1ce 100644 2.18.4 -From 93fba6ac35c2440596a78e6f931e57a8c6960eed Mon Sep 17 00:00:00 2001 +From 44f1b43fd2c4d00b3469e98bbc0fb82ddf859671 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 16:48:19 +0100 -Subject: [PATCH 0647/1224] drm/vc4: crtc: Remove redundant call to +Subject: [PATCH 0647/1225] drm/vc4: crtc: Remove redundant call to drm_crtc_enable_color_mgmt The driver calls the helper to add the color management properties twice, @@ -389267,10 +389267,10 @@ index fa68ddfc93607..312077e84f630 100644 2.18.4 -From 4ac9e12f1b13ca443ca3b829d348a619955da217 Mon Sep 17 00:00:00 2001 +From 4a5f991cbc554ec783dc6918701d3d64a1d13965 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 16:54:21 +0100 -Subject: [PATCH 0648/1224] drm/vc4: crtc: Disable color management for HVS5 +Subject: [PATCH 0648/1225] drm/vc4: crtc: Disable color management for HVS5 The HVS5 uses different color matrices. Disable color management support for now. @@ -389327,10 +389327,10 @@ index 312077e84f630..daf882b7f95ee 100644 2.18.4 -From fcf5ac918206ea2ce166408237cc450b35157296 Mon Sep 17 00:00:00 2001 +From 3eec89bef9147b13b79e179db32e83b991989d2d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:07:02 +0100 -Subject: [PATCH 0649/1224] dt-bindings: display: vc4: pv: Add BCM2711 pixel +Subject: [PATCH 0649/1225] dt-bindings: display: vc4: pv: Add BCM2711 pixel valves The BCM2711 comes with other pixelvalves that have different requirements @@ -389363,10 +389363,10 @@ index e60791db1fa12..4e1ba03f6477f 100644 2.18.4 -From 392238049d991ee3be02f139bbc74f8f8f917bec Mon Sep 17 00:00:00 2001 +From 8ba33f91225abb8adf12ebd03a7da09d71b3ff44 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 11:35:58 +0100 -Subject: [PATCH 0650/1224] drm/vc4: crtc: Add BCM2711 pixelvalves +Subject: [PATCH 0650/1225] drm/vc4: crtc: Add BCM2711 pixelvalves The BCM2711 has 5 pixelvalves, so now that our driver is ready, let's add support for them. @@ -389523,10 +389523,10 @@ index 1300198716aa6..ca563d373d9da 100644 2.18.4 -From 5454ff4f2311d3492ae2daf318f6b5e4cc4f1cc1 Mon Sep 17 00:00:00 2001 +From bfd287bdcb97841e5b9ed159c913c43f0f4c4420 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 Jan 2020 17:24:32 +0100 -Subject: [PATCH 0651/1224] drm/vc4: hdmi: Use debugfs private field +Subject: [PATCH 0651/1225] drm/vc4: hdmi: Use debugfs private field We're calling vc4_debugfs_add_file with our struct vc4_hdmi pointer set in the private field, but we don't use that field and go through the @@ -389559,10 +389559,10 @@ index 821eb9c4dfbf0..3bcb6ff781ecf 100644 2.18.4 -From 3d0d9bcf4ca0ce10e4aa067c9c51d4513aac41f0 Mon Sep 17 00:00:00 2001 +From 36f18b64efeb15750961f90703648eff1bfc4564 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Dec 2019 18:35:12 +0100 -Subject: [PATCH 0652/1224] drm/vc4: hdmi: Move structure to header +Subject: [PATCH 0652/1225] drm/vc4: hdmi: Move structure to header We will need to share the vc4_hdmi and related structures with multiple files, so let's create a header for it. @@ -389763,10 +389763,10 @@ index 0000000000000..5ec5d1f6b1e60 2.18.4 -From cf9c34f1bcea9b8ff7c7c1f61bd852b2dc3e6722 Mon Sep 17 00:00:00 2001 +From 50d5fb18535f3d7fb1b0ee1c57a2b772a4876af0 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 17:17:29 +0100 -Subject: [PATCH 0653/1224] drm/vc4: hdmi: rework connectors and encoders +Subject: [PATCH 0653/1225] drm/vc4: hdmi: rework connectors and encoders the vc4_hdmi driver has some custom structures to hold the data it needs to associate with the drm_encoder and drm_connector structures. @@ -390119,10 +390119,10 @@ index 5ec5d1f6b1e60..17079a39f1b10 100644 2.18.4 -From 845318111c76bacc5fb2849ca68cbefd412cf388 Mon Sep 17 00:00:00 2001 +From e6f79d87671125762b3fee3109726cce6f9a1533 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:07:05 +0100 -Subject: [PATCH 0654/1224] drm/vc4: hdmi: Rename hdmi to vc4_hdmi +Subject: [PATCH 0654/1225] drm/vc4: hdmi: Rename hdmi to vc4_hdmi The driver isn't consistent with the name given to the vc4_hdmi structure pointer in its functions. Make sure to use a consistent name. @@ -390806,10 +390806,10 @@ index e8de9fa499ae1..45892e16eb04f 100644 2.18.4 -From d8332ea2223833e5f2c5e6f390ed91974fb508c8 Mon Sep 17 00:00:00 2001 +From 49f0a6be020498553fec00422bbb7350ab698d43 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:21:44 +0100 -Subject: [PATCH 0655/1224] drm/vc4: hdmi: Move accessors to vc4_hdmi +Subject: [PATCH 0655/1225] drm/vc4: hdmi: Move accessors to vc4_hdmi The current driver only supports a single HDMI controller, and part of the issue is that the main vc4_dev structure holds a pointer to its @@ -390966,10 +390966,10 @@ index 17079a39f1b10..cdc9d90f62ac5 100644 2.18.4 -From 7458a5fa9c3d84303d6ca2c1fa569ab21b2d063a Mon Sep 17 00:00:00 2001 +From b5ef8537a9a220728905aa8e5c6631be9deec0fe Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:44:36 +0100 -Subject: [PATCH 0656/1224] drm/vc4: hdmi: Use local vc4_hdmi directly +Subject: [PATCH 0656/1225] drm/vc4: hdmi: Use local vc4_hdmi directly The function vc4_hdmi_connector_detect access its vc4_hdmi struct by dereferencing the pointer in the structure vc4_dev. This will cause some @@ -391017,10 +391017,10 @@ index 87b66f528065c..05a15407ea3a5 100644 2.18.4 -From ae201312ead8ed709031b3e9c913b3a4e1571183 Mon Sep 17 00:00:00 2001 +From 6e8de09ed40df92b4d671b1f405a3da74de1b013 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:45:46 +0100 -Subject: [PATCH 0657/1224] drm/vc4: hdmi: Add container_of macros for encoders +Subject: [PATCH 0657/1225] drm/vc4: hdmi: Add container_of macros for encoders and connectors Whenever the code needs to access the vc4_hdmi structure from a DRM @@ -391176,10 +391176,10 @@ index cdc9d90f62ac5..749a807cd1f3d 100644 2.18.4 -From f4eeda177c4e1774ec8b3b4460baec166e7a6a41 Mon Sep 17 00:00:00 2001 +From 130b7726145548ec4f259f4985b4dc425d049b13 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:47:53 +0100 -Subject: [PATCH 0658/1224] drm/vc4: hdmi: Pass vc4_hdmi to CEC code +Subject: [PATCH 0658/1225] drm/vc4: hdmi: Pass vc4_hdmi to CEC code Our CEC code also retrieves the associated vc4_hdmi by setting the vc4_dev pointer as its private data, and then dereferences its vc4_hdmi @@ -391289,10 +391289,10 @@ index 3f0ed00c62df8..ed18826dfc2f4 100644 2.18.4 -From 2b67fa2963b18d6c547eb4165b934d11922f3965 Mon Sep 17 00:00:00 2001 +From fbfde677642263397e6432d20a457189ef0acc7c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:49:11 +0100 -Subject: [PATCH 0659/1224] drm/vc4: hdmi: Remove vc4_dev hdmi pointer +Subject: [PATCH 0659/1225] drm/vc4: hdmi: Remove vc4_dev hdmi pointer Now that we don't have any users anymore, we can kill that pointer. @@ -391364,10 +391364,10 @@ index ed18826dfc2f4..08933446b358f 100644 2.18.4 -From 5bcc93563fca2dd14dd85e65d6f3f1da68cae637 Mon Sep 17 00:00:00 2001 +From 2b2b4243bd9e12f6500f894742ac4f5917416ade Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:57:16 +0100 -Subject: [PATCH 0660/1224] drm/vc4: hdmi: Remove vc4_hdmi_connector +Subject: [PATCH 0660/1225] drm/vc4: hdmi: Remove vc4_hdmi_connector The vc4_hdmi_connector was only used to switch between drm_connector to drm_encoder. However, we can now use vc4_hdmi to do the switch, so that @@ -391513,10 +391513,10 @@ index 749a807cd1f3d..88794136d2e4a 100644 2.18.4 -From c7cad0f2f6f6d05eabf4de250772f26140b51920 Mon Sep 17 00:00:00 2001 +From 1e9b09c5662195f27d3922761dbcb194bfd9e59b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Dec 2019 11:30:54 +0100 -Subject: [PATCH 0661/1224] drm/vc4: hdmi: Introduce resource init and variant +Subject: [PATCH 0661/1225] drm/vc4: hdmi: Introduce resource init and variant The HDMI controllers found in the BCM2711 has a pretty different clock and registers areas than found in the older BCM283x SoCs. @@ -391672,10 +391672,10 @@ index 88794136d2e4a..4cd712779ad33 100644 2.18.4 -From 4164c8a9017100888051dea868d1e477c87be945 Mon Sep 17 00:00:00 2001 +From 0ec02b6a9be45260855a9447b9e5b0f9b9981d0f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Dec 2019 19:15:08 +0100 -Subject: [PATCH 0662/1224] drm/vc4: hdmi: Implement a register layout +Subject: [PATCH 0662/1225] drm/vc4: hdmi: Implement a register layout abstraction The HDMI controllers found in the BCM2711 have most of the registers @@ -392995,10 +392995,10 @@ index ca563d373d9da..78809866097c8 100644 2.18.4 -From 2d0a0710e6f29aee64c59fcb9ebe3cc8d0b29d67 Mon Sep 17 00:00:00 2001 +From cff60aab7678717109b935471ba5e022441945c5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 16:25:26 +0100 -Subject: [PATCH 0663/1224] drm/vc4: hdmi: Add reset callback +Subject: [PATCH 0663/1225] drm/vc4: hdmi: Add reset callback The BCM2711 and BCM283x HDMI controllers use a slightly different reset sequence, so let's add a callback to reset the controller. @@ -393069,10 +393069,10 @@ index f7d0ca9447d21..93695674c2d3f 100644 2.18.4 -From ded6f7d9037882caa49a519e259c27cd17e13bfa Mon Sep 17 00:00:00 2001 +From 634a6ee595d92a9a36a00d874d79fd2d950727d1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 16:53:33 +0100 -Subject: [PATCH 0664/1224] drm/vc4: hdmi: Add PHY init and disable function +Subject: [PATCH 0664/1225] drm/vc4: hdmi: Add PHY init and disable function The HDMI PHY in the BCM2711 HDMI controller is significantly more complicated to setup than in the older BCM283x SoCs. @@ -393210,10 +393210,10 @@ index 0000000000000..26d6ee08edcff 2.18.4 -From 5f534bec7433e760efe1e0caa94e03ca6cb319e4 Mon Sep 17 00:00:00 2001 +From 7381a193593cbff2115c6003417b9776bca944d6 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 17:22:24 +0100 -Subject: [PATCH 0665/1224] drm/vc4: hdmi: Add PHY RNG enable / disable +Subject: [PATCH 0665/1225] drm/vc4: hdmi: Add PHY RNG enable / disable function Let's continue the implementation of hooks for the parts that change in the @@ -393325,10 +393325,10 @@ index 26d6ee08edcff..8fdea621d8b13 100644 2.18.4 -From f2e21c5343f14c6cfbdc1d3eed260b8709a23d75 Mon Sep 17 00:00:00 2001 +From 93623654650371f454f3297119bea5cdc05f2c37 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 18:41:53 +0100 -Subject: [PATCH 0666/1224] drm/vc4: hdmi: Add a CSC setup callback +Subject: [PATCH 0666/1225] drm/vc4: hdmi: Add a CSC setup callback Similarly to the previous patches, the CSC setup is slightly different in the BCM2711 than in the previous generations. Let's add a callback for it. @@ -393467,10 +393467,10 @@ index 9ae4d2c5a4f09..22669e07b22ee 100644 2.18.4 -From 1bd65afe0fdae16cbb735e576281431920f784f9 Mon Sep 17 00:00:00 2001 +From 8197fae7ab644a6f0985cd755e4a721a1340797a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 13:43:27 +0100 -Subject: [PATCH 0667/1224] drm/vc4: hdmi: Add a set_timings callback +Subject: [PATCH 0667/1225] drm/vc4: hdmi: Add a set_timings callback Similarly to the previous patches, the timings setup in the HDMI controller of the BCM2711 is slightly different, mostly because it supports higher @@ -393608,10 +393608,10 @@ index 22669e07b22ee..4a67d62aef538 100644 2.18.4 -From 8f24c5f83c3916f757254934344e3db76727b057 Mon Sep 17 00:00:00 2001 +From 7b8e7b89bb79ceccdd664fd1accd68c71f577da0 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 7 Jan 2020 13:14:07 +0100 -Subject: [PATCH 0668/1224] drm/vc4: hdmi: Add HDMI ID +Subject: [PATCH 0668/1225] drm/vc4: hdmi: Add HDMI ID Some operations will need us to have the raw ID of the HDMI controller in the BCM2711, such as the encoder type to register, the name of the @@ -393662,10 +393662,10 @@ index 4a67d62aef538..4d3117de383a1 100644 2.18.4 -From 199550fa10844af4bcf6225bb3d89c6a19df8fc3 Mon Sep 17 00:00:00 2001 +From fc1925a839d54c27a775b9078708d71ef44b9500 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 16 Jan 2020 14:27:56 +0100 -Subject: [PATCH 0669/1224] drm/vc4: hdmi: Deal with multiple debugfs files +Subject: [PATCH 0669/1225] drm/vc4: hdmi: Deal with multiple debugfs files The HDMI driver was registering a single debugfs file so far with the name hdmi_regs. @@ -393701,10 +393701,10 @@ index 434240cbfaa60..25672d88f8f33 100644 2.18.4 -From c0356fe9af48d78e6f5896b148481464688161ab Mon Sep 17 00:00:00 2001 +From b88f1f7d1f3a29908567228d12e857332606c51d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 16:21:45 +0100 -Subject: [PATCH 0670/1224] drm/vc4: hdmi: Add an audio support flag +Subject: [PATCH 0670/1225] drm/vc4: hdmi: Add an audio support flag The BCM2711 audio support doesn't work yet, so let's add a boolean to indicate whether or not it's supported, and only register a sound card if @@ -393756,10 +393756,10 @@ index 4d3117de383a1..f41116507156a 100644 2.18.4 -From 18a6582f5bc0509113e8f86cdaff2b38a0b5f446 Mon Sep 17 00:00:00 2001 +From d3997720180e400134fb64079e28e691792efe55 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 16:22:13 +0100 -Subject: [PATCH 0671/1224] drm/vc4: hdmi: Move CEC init to its own function +Subject: [PATCH 0671/1225] drm/vc4: hdmi: Move CEC init to its own function The CEC init code was put directly into the bind function, which was quite inconsistent with how the audio support was done, and would prevent us from @@ -393927,10 +393927,10 @@ index b51d3e997e0c3..3fadc534f41ae 100644 2.18.4 -From de703bb5e9e0759dd805dbf0a7e1dcb0222edb22 Mon Sep 17 00:00:00 2001 +From e3f80902eb8655f18651dfe19adf7ee38de021c1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 16:22:50 +0100 -Subject: [PATCH 0672/1224] drm/vc4: hdmi: Add CEC support flag +Subject: [PATCH 0672/1225] drm/vc4: hdmi: Add CEC support flag Similarly to the audio support, CEC support is not there yet for the BCM2711, so let's skip entirely the CEC initialization through a variant @@ -393982,10 +393982,10 @@ index f41116507156a..cbb1d3ab85d7d 100644 2.18.4 -From 36a096ff8f0e870a25757e748df486042096fc9b Mon Sep 17 00:00:00 2001 +From e338cf0a53afe543f687eea60d8f6ca628fd6c71 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 10 Feb 2020 15:15:47 +0100 -Subject: [PATCH 0673/1224] drm/vc4: hdmi: Remove unused CEC_CLOCK_DIV define +Subject: [PATCH 0673/1225] drm/vc4: hdmi: Remove unused CEC_CLOCK_DIV define The CEC_CLOCK_DIV define is not used anywhere in the driver, let's remove it. @@ -394011,10 +394011,10 @@ index 8d5848990e4a2..5a1a6e84b947f 100644 2.18.4 -From 01cb069beda6881a3e0f9b02f42669d476565249 Mon Sep 17 00:00:00 2001 +From f78be3606cd8b0fd519f46e6a72603a11c2997bf Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 12:31:09 +0100 -Subject: [PATCH 0674/1224] drm/vc4: hdmi: Rename drm_encoder pointer in +Subject: [PATCH 0674/1225] drm/vc4: hdmi: Rename drm_encoder pointer in mode_valid The mode_valid hook on the encoder uses a pointer to a drm_encoder called @@ -394043,10 +394043,10 @@ index 5a1a6e84b947f..f74200cc878d9 100644 2.18.4 -From 4993e6975af104b4e45825a2f2b84d18586f07f2 Mon Sep 17 00:00:00 2001 +From 9dce5198da02de7b7fc6f3b88fa6c67c0ebff487 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 10 Feb 2020 15:23:06 +0100 -Subject: [PATCH 0675/1224] drm/vc4: hdmi: Adjust HSM clock rate depending on +Subject: [PATCH 0675/1225] drm/vc4: hdmi: Adjust HSM clock rate depending on pixel rate The HSM clock needs to be setup at around 110% of the pixel rate. This @@ -394214,10 +394214,10 @@ index cbb1d3ab85d7d..ee9753255b68f 100644 2.18.4 -From d7018844c6bdd153826cda767fc5ba42aeca8d4a Mon Sep 17 00:00:00 2001 +From f3d91bdcb0be6424c5a9f10ba553f386f353d125 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 17 Dec 2019 11:48:37 +0100 -Subject: [PATCH 0676/1224] drm/vc4: hdmi: Support the BCM2711 HDMI controllers +Subject: [PATCH 0676/1225] drm/vc4: hdmi: Support the BCM2711 HDMI controllers Now that the driver is ready for it, let's bring in the HDMI controllers variants for the BCM2711. @@ -395357,10 +395357,10 @@ index 5f78da6e25c7b..ea948ffaa69bc 100644 2.18.4 -From 5d0156c2308caee6b0a2fe360963b26a4e217962 Mon Sep 17 00:00:00 2001 +From 3dd98d533c8929ca532c6e5cbbdf78f784dbfac3 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 16:45:24 +0100 -Subject: [PATCH 0677/1224] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI +Subject: [PATCH 0677/1225] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI controllers bindings The HDMI controllers found in the BCM2711 SoC need some adjustments to the @@ -395537,10 +395537,10 @@ index 52b3cdac0bdf0..a9d24e1cf684d 100644 2.18.4 -From c5bf524a9f010450e9a1f79b1b87f282be3ee6ce Mon Sep 17 00:00:00 2001 +From 24c34dcaea243a889161f19c74fe93b66296c833 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 12:26:40 +0100 -Subject: [PATCH 0678/1224] ARM: dts: bcm2711: Enable the display pipeline +Subject: [PATCH 0678/1225] ARM: dts: bcm2711: Enable the display pipeline Now that all the drivers have been adjusted for it, let's bring in the necessary device tree changes. @@ -395755,10 +395755,10 @@ index 7cf1a9748f006..10f14e897eb16 100644 2.18.4 -From 7639cbc7fbdb57b219dcac86270e627832d52fc5 Mon Sep 17 00:00:00 2001 +From 5226778c5d88a62f2ed76a757e8261d7af371b27 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 17:10:45 +0100 -Subject: [PATCH 0679/1224] [DOWNSTREAM] ARM: dts: rpi4: Disable KMS driver by +Subject: [PATCH 0679/1225] [DOWNSTREAM] ARM: dts: rpi4: Disable KMS driver by default Signed-off-by: Maxime Ripard @@ -395853,10 +395853,10 @@ index 207c15f37a23b..e8b1e9279c671 100644 2.18.4 -From f2887b4184134e620f28180d9b2706891e49e21f Mon Sep 17 00:00:00 2001 +From f622e17d29411180b5244bdffd7a67b4995ebe18 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 20 Sep 2019 17:20:01 +0100 -Subject: [PATCH 0680/1224] dtoverlays: Add Pi4 version of vc4-kms-v3d +Subject: [PATCH 0680/1225] dtoverlays: Add Pi4 version of vc4-kms-v3d The Pi4 version of the KMS drivers is a work in progress, some blocks need alternate configuration, and some blocks currently @@ -396105,10 +396105,10 @@ index 0000000000000..7d59a30a3662a 2.18.4 -From 64c35417a4ea4610fb95b0fd3c6e31c094006503 Mon Sep 17 00:00:00 2001 +From d3a57dcd8d0134759d9e4425aa964fc590e5fa46 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 27 Jan 2020 10:22:44 +0000 -Subject: [PATCH 0681/1224] drm: Checking of the pitch is only valid for linear +Subject: [PATCH 0681/1225] drm: Checking of the pitch is only valid for linear formats framebuffer_check was computing a minimum pitch value and ensuring @@ -396151,10 +396151,10 @@ index 57564318ceeac..fa54768fe4d26 100644 2.18.4 -From 0d5cfa93238899374b5edfca642538c063078353 Mon Sep 17 00:00:00 2001 +From 1a34ed7963a05197e86d2931e947d984271393b4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:25:41 +0000 -Subject: [PATCH 0682/1224] drm/vc4: Add support for DRM_FORMAT_P030 to vc4 +Subject: [PATCH 0682/1225] drm/vc4: Add support for DRM_FORMAT_P030 to vc4 planes This currently doesn't handle non-zero source rectangles correctly, @@ -396169,7 +396169,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 59 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 887ef481e7463..e01bea748c77b 100644 +index 54bdbeb46390d..f355ed9c3874c 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -33,6 +33,7 @@ static const struct hvs_format { @@ -396193,7 +396193,7 @@ index 887ef481e7463..e01bea748c77b 100644 }; static const struct hvs_format *vc4_get_hvs_format(u32 drm_format) -@@ -801,27 +808,33 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -809,27 +816,33 @@ static int vc4_plane_mode_set(struct drm_plane *plane, uint32_t param = fourcc_mod_broadcom_param(fb->modifier); u32 tile_w, tile, x_off, pix_per_tile; @@ -396245,7 +396245,7 @@ index 887ef481e7463..e01bea748c77b 100644 return -EINVAL; } -@@ -831,6 +844,13 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -839,6 +852,13 @@ static int vc4_plane_mode_set(struct drm_plane *plane, /* Adjust the base pointer to the first pixel to be scanned * out. @@ -396259,7 +396259,7 @@ index 887ef481e7463..e01bea748c77b 100644 */ for (i = 0; i < num_planes; i++) { vc4_state->offsets[i] += param * tile_w * tile; -@@ -943,8 +963,8 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -951,8 +971,8 @@ static int vc4_plane_mode_set(struct drm_plane *plane, vc4_dlist_write(vc4_state, VC4_SET_FIELD(state->alpha >> 4, SCALER5_CTL2_ALPHA) | @@ -396270,7 +396270,7 @@ index 887ef481e7463..e01bea748c77b 100644 (mix_plane_alpha ? SCALER5_CTL2_ALPHA_MIX : 0) | VC4_SET_FIELD(fb->format->has_alpha ? -@@ -992,7 +1012,8 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -1000,7 +1020,8 @@ static int vc4_plane_mode_set(struct drm_plane *plane, /* Pitch word 1/2 */ for (i = 1; i < num_planes; i++) { @@ -396280,7 +396280,7 @@ index 887ef481e7463..e01bea748c77b 100644 vc4_dlist_write(vc4_state, VC4_SET_FIELD(fb->pitches[i], SCALER_SRC_PITCH)); -@@ -1361,6 +1382,13 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, +@@ -1371,6 +1392,13 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, default: return false; } @@ -396294,7 +396294,7 @@ index 887ef481e7463..e01bea748c77b 100644 case DRM_FORMAT_RGBX1010102: case DRM_FORMAT_BGRX1010102: case DRM_FORMAT_RGBA1010102: -@@ -1393,8 +1421,11 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1403,8 +1431,11 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, struct drm_plane *plane = NULL; struct vc4_plane *vc4_plane; u32 formats[ARRAY_SIZE(hvs_formats)]; @@ -396306,7 +396306,7 @@ index 887ef481e7463..e01bea748c77b 100644 static const uint64_t modifiers[] = { DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED, DRM_FORMAT_MOD_BROADCOM_SAND128, -@@ -1409,13 +1440,17 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1419,13 +1450,17 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, if (!vc4_plane) return ERR_PTR(-ENOMEM); @@ -396331,10 +396331,10 @@ index 887ef481e7463..e01bea748c77b 100644 2.18.4 -From 06a1160cfd0262a244cd3ba3e967071d199b872d Mon Sep 17 00:00:00 2001 +From a83cb79c1a380ef81898e6da8e59a4c8e7254791 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Feb 2020 17:35:10 +0000 -Subject: [PATCH 0683/1224] Fixup P030 support +Subject: [PATCH 0683/1225] Fixup P030 support I got the logic wrong for enabling pixel formats, resulting in Pi0-3 only getting a single, invalid, format (P030 SAND). @@ -396347,10 +396347,10 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index e01bea748c77b..d0957d6181679 100644 +index f355ed9c3874c..3732b24a2a8a5 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1441,7 +1441,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1451,7 +1451,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, return ERR_PTR(-ENOMEM); for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) { @@ -396363,10 +396363,10 @@ index e01bea748c77b..d0957d6181679 100644 2.18.4 -From 364dab789fd09a68d2366890c8010974f65fce2b Mon Sep 17 00:00:00 2001 +From 7b2de886a2af9ee0c8f6003f130d944a11509d3a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 11 Feb 2020 15:36:59 +0000 -Subject: [PATCH 0684/1224] drm/vc4: The check for assigned HVS channels is not +Subject: [PATCH 0684/1225] drm/vc4: The check for assigned HVS channels is not applicable firmware_kms Channel assignments is only in full KMS, so skip the check @@ -396402,10 +396402,10 @@ index fdd1ed7540879..0dea148852d58 100644 2.18.4 -From 4393ffbc9e3a4f73fba87f51b4c6bcd3c70b47c5 Mon Sep 17 00:00:00 2001 +From 2ed6bf69f86a3482d89e2291bbfdd50fb22da994 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 17 Feb 2020 11:37:21 +0000 -Subject: [PATCH 0685/1224] dt: Update v3d to use firmware_clocks. +Subject: [PATCH 0685/1225] dt: Update v3d to use firmware_clocks. Use the updated DT clock-names property to map the v3d clock to the firmware_clocks driver, instead of the older clkdev API. @@ -396431,10 +396431,10 @@ index e8b1e9279c671..b113ca5bfbf6b 100644 2.18.4 -From b451ad1fb4bbf97341cdea277ac00cf5b250eeed Mon Sep 17 00:00:00 2001 +From 6a1e0191936b1085b448089f2deb4fb66e87cdfd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:01:04 +0000 -Subject: [PATCH 0686/1224] drm/vc4: Reset audio infoframe on encoder_enable if +Subject: [PATCH 0686/1225] drm/vc4: Reset audio infoframe on encoder_enable if previously streaming If the encoder is disabled and re-enabled (eg mode change) all infoframes @@ -396511,10 +396511,10 @@ index 7a43abbe0cfae..6a775ec7616fc 100644 2.18.4 -From 34dfe7da5b4e6af7f7dfecb9234e7e99ebdf49d0 Mon Sep 17 00:00:00 2001 +From 25df86878d1c6d7b42ee34cdb3ef5cb054226440 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:03:42 +0000 -Subject: [PATCH 0687/1224] drm/vc4: Set the b-frame marker to the match ALSA's +Subject: [PATCH 0687/1225] drm/vc4: Set the b-frame marker to the match ALSA's default. ALSA's iec958 plugin by default sets the block start preamble @@ -396548,10 +396548,10 @@ index 9c972433e894a..abf25910d8434 100644 2.18.4 -From 74f8c858b256892c99949e9869d38959953a84b7 Mon Sep 17 00:00:00 2001 +From f706a1f49eb466c262122ce99fe2861b1c2e0bfb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:07:19 +0000 -Subject: [PATCH 0688/1224] dts: Add reg-names for the HDMI registers on +Subject: [PATCH 0688/1225] dts: Add reg-names for the HDMI registers on bcm2835 Pi4 is requiring many more register configs in the HDMI @@ -396582,10 +396582,10 @@ index fe1ab40c7f224..e269e75f0f57d 100644 2.18.4 -From a5f44166f4310e76103f502ae129ed1696a4027b Mon Sep 17 00:00:00 2001 +From db79288f4424493e2f2f68a51688480d905bab36 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:08:39 +0000 -Subject: [PATCH 0689/1224] dt: Add HDMI audio dma values to bcm2711.dtsi +Subject: [PATCH 0689/1225] dt: Add HDMI audio dma values to bcm2711.dtsi Adds the relevant DMA settings for HDMI audio to work. @@ -396620,10 +396620,10 @@ index 10f14e897eb16..141d9403fe275 100644 2.18.4 -From 3ef6261fa5440c8fde77bacd2acb39368d77df9c Mon Sep 17 00:00:00 2001 +From 6de9686b041386efc316b6603c9aa9177439c907 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:11:41 +0000 -Subject: [PATCH 0690/1224] drm/vc4: Use reg-names to configure HDMI audio. +Subject: [PATCH 0690/1225] drm/vc4: Use reg-names to configure HDMI audio. HDMI audio configuration was using fixed index numbers to load in DT register settings. @@ -396661,10 +396661,10 @@ index abf25910d8434..6a5e06314caea 100644 2.18.4 -From 943ee0bac82166f95b9e16bc3edf843ef93e3712 Mon Sep 17 00:00:00 2001 +From 944329613c49c8ea3ea81abca974b195d829f100 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:16:14 +0000 -Subject: [PATCH 0691/1224] drm/vc4: Add audio initialisation for Pi4. +Subject: [PATCH 0691/1225] drm/vc4: Add audio initialisation for Pi4. The audio configuration has changed for Pi4, so support the configuration functions via the variant tables. @@ -396796,10 +396796,10 @@ index 6a775ec7616fc..9b80f9401d583 100644 2.18.4 -From cb5cedd3161074e4160973abf786ee783c8c1dc2 Mon Sep 17 00:00:00 2001 +From f9ea0d8e2958af2c774e98576080e1775ddf833c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:18:45 +0000 -Subject: [PATCH 0692/1224] drm/vc4: Enable audio on Pi4. +Subject: [PATCH 0692/1225] drm/vc4: Enable audio on Pi4. This could be a revert of "drm/vc4: hdmi: Add an audio support flag" as it is no longer needed. @@ -396833,10 +396833,10 @@ index 6757863e465d7..a5f0ee70625c2 100644 2.18.4 -From 463f11708cb377eec29553a9469b75121edb5189 Mon Sep 17 00:00:00 2001 +From fe46e3b2bff3544393076b3cd15a1f7dc6f81e32 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:22:40 +0000 -Subject: [PATCH 0693/1224] drm/vc4: Alter the HDMI state machine clock calc to +Subject: [PATCH 0693/1225] drm/vc4: Alter the HDMI state machine clock calc to allow for 1920x1200 Whilst the documentation for BCM2835 states that the HDMI state machine @@ -396885,10 +396885,10 @@ index a5f0ee70625c2..0e394d6b1200e 100644 2.18.4 -From 56c5443672a75d8d0d1bd57f520ee6974182b46c Mon Sep 17 00:00:00 2001 +From 423e2e732dca3be8a242efe54c0724532a1b113c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 26 Mar 2020 11:51:55 +0000 -Subject: [PATCH 0694/1224] dtoverlays: Remove comment about vc4-kms-v3d +Subject: [PATCH 0694/1225] dtoverlays: Remove comment about vc4-kms-v3d locking up X from README Using vc4-kms-v3d with X has worked for quite a while, and essentially @@ -396919,10 +396919,10 @@ index 03f6224d6f8d0..88aa213e693f7 100644 2.18.4 -From 9c32744601dc73995264bb69565cc280d3a658e4 Mon Sep 17 00:00:00 2001 +From 3a7a147e65f7b0c9cd4b091d87e6dbe38fce86b6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 26 Mar 2020 15:32:19 +0000 -Subject: [PATCH 0695/1224] drm/vc4: Kick the core clock up during a mode +Subject: [PATCH 0695/1225] drm/vc4: Kick the core clock up during a mode change Experimental commit to kick the core clock up during mode @@ -397029,10 +397029,10 @@ index 0dea148852d58..20b328d7e43ba 100644 2.18.4 -From 6fbe0b99ba7002a3746bbbb54749a6bd16b20ad8 Mon Sep 17 00:00:00 2001 +From 75a269c9967da19627af86175a1265998e82fcb2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 30 Mar 2020 12:52:26 +0100 -Subject: [PATCH 0696/1224] drm/vc4: Fixup for firmware KMS +Subject: [PATCH 0696/1225] drm/vc4: Fixup for firmware KMS Fix up "drm/vc4: Kick the core clock up during a mode change" for firmware KMS mode where we don't have the HVS or core clock @@ -397071,10 +397071,10 @@ index 20b328d7e43ba..7f857af77898e 100644 2.18.4 -From 14f8e75c6b0b426026966fb0a17723def6fb6a78 Mon Sep 17 00:00:00 2001 +From c1a13af8283b892587a1c43946e3fcbf5c568d71 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 30 Mar 2020 18:25:10 +0100 -Subject: [PATCH 0697/1224] drm/vc4: Fixup plane init within firmware-kms +Subject: [PATCH 0697/1225] drm/vc4: Fixup plane init within firmware-kms "drm/vc4: plane: Move additional planes creation to driver" moved overlay and cursor plane creation to a global function thata was @@ -397108,10 +397108,10 @@ index 67235aee35070..68f9db6c4c878 100644 2.18.4 -From 61b0ec4646e6c21af31d14ef1f98b4e2409bfdc3 Mon Sep 17 00:00:00 2001 +From 4f1b5efb1ed29fd605d21c5dcf23de84d44e551e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 31 Mar 2020 16:21:45 +0100 -Subject: [PATCH 0698/1224] drm/vc4-hdmi: Give the HDMI audio instances +Subject: [PATCH 0698/1225] drm/vc4-hdmi: Give the HDMI audio instances different names The debugfs usage within asoc gets confused if multiple interfaces @@ -397140,10 +397140,10 @@ index 0e394d6b1200e..6621eb3e01c6e 100644 2.18.4 -From d384c7aaaf56a38db75b2f2f9b5a3033f5c37a0b Mon Sep 17 00:00:00 2001 +From 31c7344c7843946ccba31ffe04ac47c31083ea1f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 31 Mar 2020 16:23:11 +0100 -Subject: [PATCH 0699/1224] i2c: brcmstb: The interrupt line is optional, so +Subject: [PATCH 0699/1225] i2c: brcmstb: The interrupt line is optional, so use platform_get_irq_optional If there is no interrupt defined then an error is logged due @@ -397157,7 +397157,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c -index 169a2836922d2..d4e0a0f6732ae 100644 +index d2cde8e2a3703..ba766d24219ef 100644 --- a/drivers/i2c/busses/i2c-brcmstb.c +++ b/drivers/i2c/busses/i2c-brcmstb.c @@ -647,20 +647,22 @@ static int brcmstb_i2c_probe(struct platform_device *pdev) @@ -397196,10 +397196,10 @@ index 169a2836922d2..d4e0a0f6732ae 100644 2.18.4 -From b93d5c6b2e892c3fa255f0c0a180820a925091d7 Mon Sep 17 00:00:00 2001 +From 792aae71d7d3624471228f53fd758ea6347e72c5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 31 Mar 2020 17:54:08 +0100 -Subject: [PATCH 0700/1224] dt: Drop I2C for Pi4 HDMI interfaces to 97.5kHz. +Subject: [PATCH 0700/1225] dt: Drop I2C for Pi4 HDMI interfaces to 97.5kHz. It was set to 390kHz, which is outside of the required spec for reading HDMI (max 100kHz). The i2c-brcmstb driver only supports @@ -397237,10 +397237,10 @@ index 5f3c9313d9a73..3ecff12736adc 100644 2.18.4 -From c0d317600bd2f903bfc923db592f1ffc82333c69 Mon Sep 17 00:00:00 2001 +From 6276a5c0233a38fca05669d525e92e25b32348f3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 27 Mar 2020 13:49:25 +0000 -Subject: [PATCH 0701/1224] overlays: Add missing rpi-poe parameters +Subject: [PATCH 0701/1225] overlays: Add missing rpi-poe parameters The rpi-poe fan overlay has gained two more fan speeds and adjusted the thresholds and hystereses. @@ -397282,10 +397282,10 @@ index 88aa213e693f7..5832c5f00230f 100644 2.18.4 -From 4888a6799dbcef7f3d89e97910ba72394480da9f Mon Sep 17 00:00:00 2001 +From c088e47e0509f311bc95b82cb9cb5ced59b25be1 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 2 Apr 2020 16:46:31 +0100 -Subject: [PATCH 0702/1224] vc4_hdmi_phy: Fix offset calculation +Subject: [PATCH 0702/1225] vc4_hdmi_phy: Fix offset calculation The original firmware code worked with float and did offset = ((vco_freq / fref * 2) * (1 << 22)); @@ -397318,10 +397318,10 @@ index a436fabbc1289..732d8a0e5a1cd 100644 2.18.4 -From f5f1834e602b69eaed45db601535f4ea7a059b88 Mon Sep 17 00:00:00 2001 +From 4113fe4327d551fd76cb09b4cb02ad305bcd00f7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Apr 2020 15:09:42 +0100 -Subject: [PATCH 0703/1224] overlays: Add overlay_map +Subject: [PATCH 0703/1225] overlays: Add overlay_map The overlay map permits platform-specific overlays, with deprecation and renaming. @@ -397428,10 +397428,10 @@ index 0000000000000..e9b04b954d55c 2.18.4 -From 6c89c98b9aab3555f63b32c9054dbe2e73dcd306 Mon Sep 17 00:00:00 2001 +From e28f92816e9747ccf648fac9de8ab13c15db5ffa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Apr 2020 17:24:15 +0100 -Subject: [PATCH 0704/1224] overlays: Formally rename/deprecate old overlays +Subject: [PATCH 0704/1225] overlays: Formally rename/deprecate old overlays Take advantage of the overlay_map to rename or deprecate some obsolete overlays. @@ -397685,10 +397685,10 @@ index 94c14267716eb..0000000000000 2.18.4 -From ee0f0ff34a9174b6ad3e1b5b9de6bde0da6d4274 Mon Sep 17 00:00:00 2001 +From c19d4f3021dcff61cb193a393777b3aba0eb9d5d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Apr 2020 15:51:56 +0100 -Subject: [PATCH 0705/1224] overlays: Add vc4-kms-v3d-pi4 to overlay_map +Subject: [PATCH 0705/1225] overlays: Add vc4-kms-v3d-pi4 to overlay_map Signed-off-by: Phil Elwell --- @@ -397717,10 +397717,10 @@ index 113098ea69083..c4f7f33fb5da5 100644 2.18.4 -From b276622c82e387a824d3e4a808f8ed3008d41ac2 Mon Sep 17 00:00:00 2001 +From ce1cd5ba3d9880ed056d12fa2511370f84d12cda Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Apr 2020 09:47:42 +0100 -Subject: [PATCH 0706/1224] Add upstream and upstream-pi4 to overlay_map +Subject: [PATCH 0706/1225] Add upstream and upstream-pi4 to overlay_map Because the upstream overlay applies vc4-kms-v3d, of which Pi 4 has its own version, there also needs to be a Pi 4 version - vc4-kms-v3d-pi4. @@ -397959,10 +397959,10 @@ index 0000000000000..2db343ef2237f 2.18.4 -From d2f4bd2affc8ae3b29630a3f7e3727bb517e9c08 Mon Sep 17 00:00:00 2001 +From 69b8dd12bf0e13a7ccee8c33f24d52e494533640 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 15:49:56 +0100 -Subject: [PATCH 0707/1224] clk-raspberrypi: Allow cpufreq driver to also +Subject: [PATCH 0707/1225] clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks For performance/power it is beneficial to adjust gpu clocks with arm clock. @@ -397990,10 +397990,10 @@ index 86b18f8cc98d8..eb1844148af96 100644 2.18.4 -From ddc6358d2c3f0f415a60ba14c08912b3423e602f Mon Sep 17 00:00:00 2001 +From 6f3f4368eac5cf9a7437dcaa83acd2e4ff265395 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 09:48:29 +0100 -Subject: [PATCH 0708/1224] configs: FS_ENCRYPTION replaces EXT4_ENCRYPTION +Subject: [PATCH 0708/1225] configs: FS_ENCRYPTION replaces EXT4_ENCRYPTION The filesystem-specific encryption options have been replaced by a generic FS_ENCRYPTION option. @@ -398090,10 +398090,10 @@ index b40477e1553be..544c16a75b344 100644 2.18.4 -From 88ecf677027b5700b310388f1b051180cd6e92f7 Mon Sep 17 00:00:00 2001 +From 328cc9ee7e8aca2c206394857d36e283cc81c622 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Wed, 8 Apr 2020 20:00:30 +1000 -Subject: [PATCH 0709/1224] Add support for the AudioInjector.net Isolated +Subject: [PATCH 0709/1225] Add support for the AudioInjector.net Isolated sound card This patch adds support for the Audio Injector Isolated sound card. @@ -398536,10 +398536,10 @@ index 0000000000000..652464658fef9 2.18.4 -From 66aa5a812a2607ad863370945af8b08fcc0c2416 Mon Sep 17 00:00:00 2001 +From 12a9c870edf6e02f9d13cea5c21d806f4b473309 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 11:59:39 +0100 -Subject: [PATCH 0710/1224] overlays: Fix dtc warnings in i2c-gpio +Subject: [PATCH 0710/1225] overlays: Fix dtc warnings in i2c-gpio Better late than never. @@ -398566,10 +398566,10 @@ index 39e7bc5fa9d88..e94053b55610a 100644 2.18.4 -From f355cfbb86f870b674e8f1a3478bc7db02294805 Mon Sep 17 00:00:00 2001 +From 1a5ba1219a3ff4625f3e145af8a3782cab6fe833 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 15:23:56 +0100 -Subject: [PATCH 0711/1224] kbuild: Disable gcc plugins +Subject: [PATCH 0711/1225] 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 @@ -398600,10 +398600,10 @@ index d3caefe53eab9..6ee109e5d266d 100755 2.18.4 -From f4ff5aab721c265cbe8decff5558903a7444e7b7 Mon Sep 17 00:00:00 2001 +From 354a7efdcb338a3862f2d0f138932aa704d4760a Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Wed, 8 Apr 2020 09:31:39 +0200 -Subject: [PATCH 0712/1224] configs: add MA120X0P codec +Subject: [PATCH 0712/1225] configs: add MA120X0P codec Signed-off-by: AMuszkat --- @@ -398678,10 +398678,10 @@ index a24cbb4837b8f..34aa78d5d814d 100644 2.18.4 -From 16402e4c77bb07a832e2e22c323e8459d91933a0 Mon Sep 17 00:00:00 2001 +From d6829d16f640c4274de2735caede6cf96305ceae Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Wed, 8 Apr 2020 10:04:49 +0200 -Subject: [PATCH 0713/1224] ASoC: ma120x0p: Add 96KHz rate support +Subject: [PATCH 0713/1225] ASoC: ma120x0p: Add 96KHz rate support Add 96KHz rate support to MA120X0P codec and make enable and mute gpio pins optional. @@ -398726,10 +398726,10 @@ index 39c74b17e0077..e1591b6aff431 100644 2.18.4 -From 92f0ba7168a9c8ad7c66dfbbb4292586b5470060 Mon Sep 17 00:00:00 2001 +From 3a9b6bf3c2c16fce1f91d778073d043910547200 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 Nov 2019 10:56:11 +0100 -Subject: [PATCH 0714/1224] arm64: mm: reserve CMA and crashkernel in +Subject: [PATCH 0714/1225] arm64: mm: reserve CMA and crashkernel in ZONE_DMA32 commit bff3b04460a80f425442fe8e5c6ee8c3ebef611f upstream. @@ -398777,10 +398777,10 @@ index d5733f2d35159..c16d223c0eb4c 100644 2.18.4 -From 1213a766689ef699153feb530353f52a3a8368b9 Mon Sep 17 00:00:00 2001 +From 086f84b91dab224130fff8cea8b168db4664cf38 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 3 Dec 2019 12:10:13 +0000 -Subject: [PATCH 0715/1224] arm64: mm: Fix initialisation of DMA zones on +Subject: [PATCH 0715/1225] arm64: mm: Fix initialisation of DMA zones on non-NUMA systems commit 93b90414c33f59b7960bc8d607da0ce83377e021 upstream. @@ -398888,10 +398888,10 @@ index c16d223c0eb4c..53037b6b6708c 100644 2.18.4 -From d69494288ab880c1d10ca9c05d33d3630dbf1e2e Mon Sep 17 00:00:00 2001 +From 9e70b9514f545743f3a9bdd4a239436bd0e55f7e Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 10 Jan 2020 18:29:35 +0100 -Subject: [PATCH 0716/1224] ARM: dts: bcm283x: Unify CMA configuration +Subject: [PATCH 0716/1225] ARM: dts: bcm283x: Unify CMA configuration commit c5a1e5375d19bd4001c59dc5d482ac5b1ba51cbf upstream. @@ -398991,10 +398991,10 @@ index 202a61f574c73..adb59ca3df6c6 100644 2.18.4 -From 07bdf19d0fc0098c40e11f21fc017fe64ed99c85 Mon Sep 17 00:00:00 2001 +From 1d9782941a49357a318de7d56676ffd70342c97b Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 10 Jan 2020 18:19:33 +0100 -Subject: [PATCH 0717/1224] dma-contiguous: CMA: give precedence to cmdline +Subject: [PATCH 0717/1225] dma-contiguous: CMA: give precedence to cmdline commit 8c8c5a4994a306c217fd061cbfc5903399fd4c1c upstream. @@ -399046,10 +399046,10 @@ index 69cfb4345388c..8477bf549dc91 100644 2.18.4 -From 536f3c3a9b01378845a375c0dca0dbe4a67975ed Mon Sep 17 00:00:00 2001 +From 34e6172d85532060dba92aa8278c75d2119c1cbf Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 2 Apr 2020 19:22:46 +0200 -Subject: [PATCH 0718/1224] ARM: dts: Use upstream CMA configuration +Subject: [PATCH 0718/1225] ARM: dts: Use upstream CMA configuration Now that the kernel command line has precedence over the device tree, we can use the upstream CMA setup without breaking backward @@ -399088,10 +399088,10 @@ index 83a8431d9e5fd..996112381eefb 100644 2.18.4 -From f06bdc3e1a309ff230ea74534872d07bfa6e59ec Mon Sep 17 00:00:00 2001 +From 1939dd8e0430cb5fa0eea59991468a5abaf70006 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 2 Apr 2020 19:54:33 +0200 -Subject: [PATCH 0719/1224] ARM: dts: overlays: Unify overlay CMA handling +Subject: [PATCH 0719/1225] ARM: dts: overlays: Unify overlay CMA handling Now that we don't have to abuse the kernel command line to change CMA's size we can clean-up and centralize CMA usage in overlays. @@ -399980,10 +399980,10 @@ index 7d59a30a3662a..134ad9ecbd4ab 100644 2.18.4 -From 146a2806048883bb6064de1ba602d40d308494f1 Mon Sep 17 00:00:00 2001 +From 7ec2c72ccfe170bdb5a4659fcadd5f3eabc4bdd4 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 19 Mar 2020 20:00:13 +0100 -Subject: [PATCH 0720/1224] ARM: dts: bcm283x: Fix vc4's firmware bus DMA +Subject: [PATCH 0720/1225] ARM: dts: bcm283x: Fix vc4's firmware bus DMA limitations The bus is virtual and devices have to inherit their DMA constraints @@ -400014,10 +400014,10 @@ index 394c8a71b13be..fd2c766e0f710 100644 2.18.4 -From f1c715ff75d976778d894f5fec86c72b7f35170e Mon Sep 17 00:00:00 2001 +From 14a0e9bd7b0b999abd7f8a570d903f5b43bc00d3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Apr 2020 15:25:02 +0100 -Subject: [PATCH 0721/1224] ARM: dts: bcm2711: Restrict CMA to first 768MB +Subject: [PATCH 0721/1225] ARM: dts: bcm2711: Restrict CMA to first 768MB The downstream 32-bit 2711 kernel configuration enables HIGHMEM for access to more physical RAM. The HIGHMEM zone starts at 0x30000000 @@ -400053,10 +400053,10 @@ index b113ca5bfbf6b..f27cb47448b11 100644 2.18.4 -From fcaf4bf0a855c646743fc45479ae0a31280c3982 Mon Sep 17 00:00:00 2001 +From 8503a4e77e568762389a6836f85fdd82d12eef62 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Feb 2020 12:00:42 +0000 -Subject: [PATCH 0722/1224] configs: Restore CONFIG_GPIO_SYSFS +Subject: [PATCH 0722/1225] configs: Restore CONFIG_GPIO_SYSFS Signed-off-by: Phil Elwell --- @@ -400118,10 +400118,10 @@ index 818e84acbf539..dac95c7348288 100644 2.18.4 -From 8b726015f443e198f866931e7bb3021f4546a511 Mon Sep 17 00:00:00 2001 +From f878f32913bb91cd3193166fd2da46d1c25c5723 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 12:51:56 +0000 -Subject: [PATCH 0723/1224] ARM: dts: Extend SCB bus address range +Subject: [PATCH 0723/1225] ARM: dts: Extend SCB bus address range Signed-off-by: Phil Elwell --- @@ -400147,10 +400147,10 @@ index f27cb47448b11..4bc44b2ad211f 100644 2.18.4 -From 62319a51a5aab61414ca751e838edccc70567a4b Mon Sep 17 00:00:00 2001 +From 1f4155e660b3da2b9452274b45e82ecac24c7654 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Dec 2019 18:02:08 +0000 -Subject: [PATCH 0724/1224] dts: bcm2711: Move emmc2 to its own "bus" +Subject: [PATCH 0724/1225] dts: bcm2711: Move emmc2 to its own "bus" Moving the EMMC2 controller under a dedicated bus allows the firmware to patch the dma-ranges property for different memory sizes without @@ -400205,10 +400205,10 @@ index 996112381eefb..34251ec1b531d 100644 2.18.4 -From 5b32195df56e13aa4ac0148b7b21533922940ab7 Mon Sep 17 00:00:00 2001 +From f287d66197a70a4531307a7b80e51ae22f2f67ae Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 10 Apr 2020 19:24:40 -0600 -Subject: [PATCH 0725/1224] drm/vc4: hdmi: Silence pixel clock error on +Subject: [PATCH 0725/1225] drm/vc4: hdmi: Silence pixel clock error on -EPROBE_DEFER If the vc4 hdmi driver loads before the pixel clock is available we @@ -400240,11 +400240,11 @@ index 6621eb3e01c6e..2ebaea7e2a7bf 100644 2.18.4 -From 1008fb6b9498960c6e17e37f78f4e0b8740b6953 Mon Sep 17 00:00:00 2001 +From a8c78fbb934f02bb8205e6d5d16fe6a28bd1c039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?= Date: Wed, 15 Apr 2020 11:48:29 +0200 -Subject: [PATCH 0726/1224] Fixes a problem with clock settings of HiFiBerry +Subject: [PATCH 0726/1225] Fixes a problem with clock settings of HiFiBerry DAC+ADC PRO (#3545) This patch fixes a problem of the re-calculation of @@ -400288,10 +400288,10 @@ index 2883c3ce9488b..ffa76014e7df6 100644 2.18.4 -From 0681e4c1075b5998b98d9f5d78d518f71200eb09 Mon Sep 17 00:00:00 2001 +From 4aa61b30f6cc91994bf893e3bad5bfb3214d1ada Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 7 Apr 2020 17:21:55 +0200 -Subject: [PATCH 0727/1224] Documentation: media: Update sub-device API intro +Subject: [PATCH 0727/1225] Documentation: media: Update sub-device API intro Update the V4L2 sub-device userspace API introduction to provide more details on why complex devices might want to register devnodes for the @@ -400328,10 +400328,10 @@ index 29e07e23f8885..41ccb3e5c7075 100644 2.18.4 -From 2946d82ce95d351f2754c76411729b7e43336aa3 Mon Sep 17 00:00:00 2001 +From 3f89861f0653cc64735373662749c90bfe4ee75f Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 7 Apr 2020 17:21:56 +0200 -Subject: [PATCH 0728/1224] Documentation: media: Document read-only subdevice +Subject: [PATCH 0728/1225] Documentation: media: Document read-only subdevice Document a new kAPI function to register subdev device nodes in read only mode and for each affected ioctl report how access is restricted. @@ -400565,10 +400565,10 @@ index fc73d27e6d747..feba9f807135e 100644 2.18.4 -From 5fa61b81d3374f2c7d4a20dfd2f08bd0de8c7854 Mon Sep 17 00:00:00 2001 +From d4cf996fddcb65f1474f3e0ba26261660a2bde08 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 7 Apr 2020 17:21:57 +0200 -Subject: [PATCH 0729/1224] media: v4l2-dev: Add +Subject: [PATCH 0729/1225] media: v4l2-dev: Add v4l2_device_register_ro_subdev_node() Add to the V4L2 core a function to register device nodes for video @@ -400783,10 +400783,10 @@ index a0e93f0ef62a1..841d23e3bbcf0 100644 2.18.4 -From 4921478c94cd84b9e24a90177f359553c543f9ee Mon Sep 17 00:00:00 2001 +From 8992f77cd6f001401931d21aa52625df0837a7ca Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:39:49 +0100 -Subject: [PATCH 0730/1224] media: bcm2835-unicam: Driver for CCP2/CSI2 camera +Subject: [PATCH 0730/1225] media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface Add driver for the Unicam camera receiver block on @@ -403514,10 +403514,10 @@ index 0000000000000..ae059a171d0fe 2.18.4 -From f2996e7bcb1b03fba78cded3f676d1e4bc1c3203 Mon Sep 17 00:00:00 2001 +From 4e4b0a80ba7e687e7ec591377bd4e75584681869 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:46:29 +0100 -Subject: [PATCH 0731/1224] defconfig: Add bcm2835-unicam to platform +Subject: [PATCH 0731/1225] defconfig: Add bcm2835-unicam to platform defconfigs. This commit enables the bcm2835-unicam driver in the following @@ -403574,10 +403574,10 @@ index 8eddf1eec9b7a..543948a9499d7 100644 2.18.4 -From 4b46971ed4349ab72cdc53562cc39831b6303891 Mon Sep 17 00:00:00 2001 +From 002d4db5a58e115d7ec27dc740a05091c62b2773 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:46:29 +0100 -Subject: [PATCH 0732/1224] media: uapi: v4l2-core: Add sensor ancillary data +Subject: [PATCH 0732/1225] media: uapi: v4l2-core: Add sensor ancillary data V4L2 foucc type. Add V4L2_META_FMT_SENSOR_DATA format 4CC. @@ -403645,7 +403645,7 @@ index 0000000000000..4a67e204d08a3 +and cannot be modified with a call to :c:type:`VIDIOC_SUBDEV_S_FMT`. + diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 360200ed4f083..8878b9abd0346 100644 +index 1e37b3591b898..fb279eeced455 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1332,6 +1332,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -403672,10 +403672,10 @@ index 5d28d8ef6c0cc..d8320844d188c 100644 2.18.4 -From 85e3d31b3b745d843161cd8d8c66cc83d43c0c90 Mon Sep 17 00:00:00 2001 +From 7b84246bf5fd01e5785efaf1662bf9caced88f35 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Jan 2020 14:06:47 +0000 -Subject: [PATCH 0733/1224] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media +Subject: [PATCH 0733/1225] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media bus format This patch adds MEDIA_BUS_FMT_SENSOR_DATA used by the bcm2835-unicam @@ -403744,10 +403744,10 @@ index 16c1fa2d89a42..4b5e2a71dfec3 100644 2.18.4 -From c6911931cbc7268a10c5714e0324a59ac77a32a7 Mon Sep 17 00:00:00 2001 +From b5c5aa458d1e1bf5e7f55335045a44d987a9f299 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 7 Apr 2020 10:42:14 +0100 -Subject: [PATCH 0734/1224] media: bcm2835-unicam: Add support for mulitple +Subject: [PATCH 0734/1225] media: bcm2835-unicam: Add support for mulitple device nodes. Move device node specific state out of the device state structure and @@ -404833,10 +404833,10 @@ index 8c1b220e6d8c9..c19f96ce9d29d 100644 2.18.4 -From dd9fcc1e09641c1673887fead8f94a74991af995 Mon Sep 17 00:00:00 2001 +From 4ce281662a3c7fff69b207487215b1139aab8ba5 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 16 Apr 2020 11:35:41 +0100 -Subject: [PATCH 0735/1224] media: bcm2835-unicam: Add embedded data node. +Subject: [PATCH 0735/1225] 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 @@ -406007,10 +406007,10 @@ index c19f96ce9d29d..27752969c2755 100644 2.18.4 -From abfd7c7ffa28a55d49fefcf8227c837619182ddd Mon Sep 17 00:00:00 2001 +From 5b4b3a1073d2def33352c29a820a9a91ad14b40d Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 2 Apr 2020 16:08:51 +0100 -Subject: [PATCH 0736/1224] media: bcm2835-unicam: Use dummy buffer if none +Subject: [PATCH 0736/1225] media: bcm2835-unicam: Use dummy buffer if none have been queued If no buffer has been queued by a userland application, we use an @@ -406321,10 +406321,10 @@ index 27752969c2755..62248db04bfaf 100644 2.18.4 -From 7dbb7ebc7260f7b12b60b5fb7667331d7fefbfee Mon Sep 17 00:00:00 2001 +From 3bd75f97fce24e1e19208646134261b57f1da205 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Apr 2020 10:46:19 +0100 -Subject: [PATCH 0737/1224] spi: Force CS_HIGH if GPIO descriptors are used +Subject: [PATCH 0737/1225] 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 @@ -406375,10 +406375,10 @@ index e1205d72be523..5f6a95c4da6cb 100644 2.18.4 -From fa64839c0a0f7733cf37319e78016cccc4eb3def Mon Sep 17 00:00:00 2001 +From a8e482d0787b5ec8dd632e0c4b639de942ef7997 Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 10 Mar 2020 14:17:07 +0100 -Subject: [PATCH 0738/1224] media: i2c: imx219: Fix power sequence +Subject: [PATCH 0738/1225] media: i2c: imx219: Fix power sequence Commit ca45448a56659c6df6e0436188e97f6cc65dea8a upstream. @@ -406436,10 +406436,10 @@ index f1effb5a5f66a..16010ca1781aa 100644 2.18.4 -From 485a91d641617943e446d097176e10b8337bb1bb Mon Sep 17 00:00:00 2001 +From 9690322baaca5dc55eb7ccef42f55e0ae7d28b5c Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 10 Mar 2020 14:17:08 +0100 -Subject: [PATCH 0739/1224] media: i2c: imx219: Add support for RAW8 bit bayer +Subject: [PATCH 0739/1225] media: i2c: imx219: Add support for RAW8 bit bayer format Commit 22da1d56e982151e0bdfafe9de6fe94098a51356 upstream. @@ -406761,10 +406761,10 @@ index 16010ca1781aa..3207487b4c103 100644 2.18.4 -From e7a1bdbcd34db7c7f16c449efa57e5a72f24086c Mon Sep 17 00:00:00 2001 +From f3789f2da49a977ddefb31d7bb7f27f7517f920b Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 10 Mar 2020 14:17:09 +0100 -Subject: [PATCH 0740/1224] media: i2c: imx219: Add support for cropped 640x480 +Subject: [PATCH 0740/1225] media: i2c: imx219: Add support for cropped 640x480 resolution Commit 25130b8ad409d5532f3763bcf891af74f550a70d upstream. @@ -406885,10 +406885,10 @@ index 3207487b4c103..cb03bdec1f9c8 100644 2.18.4 -From e09298c4ef991519cbfe9c1091ef6c775c1044cb Mon Sep 17 00:00:00 2001 +From 38bf8281fdf0c1df5e98e69086b7f65f73818962 Mon Sep 17 00:00:00 2001 From: Dafna Hirschfeld Date: Tue, 31 Mar 2020 20:06:30 +0200 -Subject: [PATCH 0741/1224] media: i2c: imx219: Fix a bug in +Subject: [PATCH 0741/1225] media: i2c: imx219: Fix a bug in imx219_enum_frame_size https://patchwork.linuxtv.org/patch/62740/ @@ -406925,10 +406925,10 @@ index cb03bdec1f9c8..86e0564bfb4fd 100644 2.18.4 -From f9ccb24c3b699f637dd7bb35c717add815c5062d Mon Sep 17 00:00:00 2001 +From a0e84af15154c397f2923b481392bf745c36bcd5 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 24 Mar 2020 23:13:02 +0200 -Subject: [PATCH 0742/1224] media: bcm2835-unicam: Disable event-related ioctls +Subject: [PATCH 0742/1225] media: bcm2835-unicam: Disable event-related ioctls on metadata node The unicam driver supports both the SOURCE_CHANGE and CTRL events. Both @@ -406962,10 +406962,10 @@ index 62248db04bfaf..4840aa6c96c4c 100644 2.18.4 -From de311d12352530282d384b0da7fc61ceedbff08f Mon Sep 17 00:00:00 2001 +From 385b599c9a7188955610ea55a48178f80a743fba Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 24 Mar 2020 23:13:02 +0200 -Subject: [PATCH 0743/1224] media: bcm2835-unicam: Add support for the +Subject: [PATCH 0743/1225] media: bcm2835-unicam: Add support for the FRAME_SYNC event The FRAME_SYNC event is useful for userspace image processing algorithms @@ -407023,10 +407023,10 @@ index 4840aa6c96c4c..2ddac7382fb9e 100644 2.18.4 -From abc5585c1db1f9f3e485f1f0d6d3a9faa9c93add Mon Sep 17 00:00:00 2001 +From 0dfe88296139a53213d9043a4373f39e86e7b8bc Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 17 Apr 2020 16:24:21 +0100 -Subject: [PATCH 0744/1224] configs: Enable CONFIG_ARM_BCM2835_CPUFREQ +Subject: [PATCH 0744/1225] configs: Enable CONFIG_ARM_BCM2835_CPUFREQ We actually use the 64-bit 2711 kernel on Pi3 too. It still uses the downstream cpufreq driver in DT. @@ -407053,10 +407053,10 @@ index dac95c7348288..14398af7f5589 100644 2.18.4 -From 4f09e12a235c0ca1330dcd2897324c542e83a1e8 Mon Sep 17 00:00:00 2001 +From ad5b5d5d36e982dc607feb759def4fcdd2c43a0c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Apr 2020 16:20:55 +0100 -Subject: [PATCH 0745/1224] Revert "firmware: raspberrypi: register clk device" +Subject: [PATCH 0745/1225] Revert "firmware: raspberrypi: register clk device" This reverts commit 91f2cf4a6b2131016b1ae9c9500245f0572112c7. @@ -407117,10 +407117,10 @@ index 4f3ab14d275a2..dc11a1968e99c 100644 2.18.4 -From bfaaf20bdedc49fd6328ff883d16f3235e09dbac Mon Sep 17 00:00:00 2001 +From 3c4fc2a94b3187053a73871d4fd9754281fc3635 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 12 Mar 2020 14:09:38 +0000 -Subject: [PATCH 0746/1224] media: imx219: Advertise embedded data node on +Subject: [PATCH 0746/1225] media: imx219: Advertise embedded data node on media pad 1 This commit updates the imx219 driver to adverise support for embedded @@ -407458,10 +407458,10 @@ index 86e0564bfb4fd..017ae503cc09e 100644 2.18.4 -From ed9a4c077de594f337757241057fe2f0b35738ea Mon Sep 17 00:00:00 2001 +From 2064a73c880666fa91fb5516b1eb1ad49cc6a901 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 11:25:18 +0100 -Subject: [PATCH 0747/1224] dts: bcm2711: EMMC2 can address the whole first GB +Subject: [PATCH 0747/1225] dts: bcm2711: EMMC2 can address the whole first GB Although 0xfc000000 looks like an inaccessible RAM address (due to the peripheral mappings), with RAM mapped at 0xc0000000 (as it is on the @@ -407495,10 +407495,10 @@ index 34251ec1b531d..b3a00baba9628 100644 2.18.4 -From 2853ee6b792d2ce94a94608983c8af0c0d24fbcd Mon Sep 17 00:00:00 2001 +From aed8af03002716ea91cb62bdb6b51974f18955ce Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 22:18:52 +0100 -Subject: [PATCH 0748/1224] driver: char: rpivid: Remove legacy name support +Subject: [PATCH 0748/1225] driver: char: rpivid: Remove legacy name support Signed-off-by: Phil Elwell --- @@ -407554,10 +407554,10 @@ index fbf3d4f3fe0cb..5f4c91924ec16 100644 2.18.4 -From 8ac6eb3e73feaf1ebb90af7ef00b13c83dd80622 Mon Sep 17 00:00:00 2001 +From 810fa5098ae6ec9fd4bf52eb2a0204c0a0c8ab98 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Apr 2020 11:30:23 +0100 -Subject: [PATCH 0749/1224] driver: char: rpivid: Don't map more than wanted +Subject: [PATCH 0749/1225] 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. @@ -407611,10 +407611,10 @@ index 5f4c91924ec16..9f38083f4cb65 100644 2.18.4 -From 355ff3607dea7dd07c3ba1f3b353e55640b3a993 Mon Sep 17 00:00:00 2001 +From f51daeb4e67579974db97991639328a667dbee2c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 12:43:22 +0100 -Subject: [PATCH 0750/1224] defconfig: Enable I2C_MUX_PINCTRL in all Pi configs +Subject: [PATCH 0750/1225] defconfig: Enable I2C_MUX_PINCTRL in all Pi configs To be used to switch between the camera/display pins, and the HAT pins for i2c-0. @@ -407697,10 +407697,10 @@ index 34aa78d5d814d..3a39acd6d0abe 100644 2.18.4 -From fab45fee083feaae5c7bbb6650d2d12d60d65739 Mon Sep 17 00:00:00 2001 +From d2f329b3b542802fd0d8c2178f0cb02ada5d62e5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 12:46:13 +0100 -Subject: [PATCH 0751/1224] dt: Implement an I2C pinctrl mux for BSC0. +Subject: [PATCH 0751/1225] dt: Implement an I2C pinctrl mux for BSC0. BSC0 serves either the HAT EEPROM pins on the 40pin connector, or the display and camera on a board specific pairing of either @@ -408169,10 +408169,10 @@ index adb59ca3df6c6..4426f9e6ba92c 100644 2.18.4 -From 70442d8efad103a49fe2271785f2656e507b6c04 Mon Sep 17 00:00:00 2001 +From df87fb450adc4daf51e5168e5f5bdf38f93cf324 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 15:04:14 +0100 -Subject: [PATCH 0752/1224] dtoverlays: Update CSI overlays to use i2c_csi_dsi +Subject: [PATCH 0752/1225] dtoverlays: Update CSI overlays to use i2c_csi_dsi Update all overlays that were using i2c_vc for talking to CSI source devices to use the new i2c_csi_dsi node via i2c_mux_pinctrl. @@ -408610,10 +408610,10 @@ index 2a1a3a80de493..f8c059827234d 100644 2.18.4 -From dff2aa5ac5f3328cd15c9311c6457fb72f6c4fee Mon Sep 17 00:00:00 2001 +From dc8661491018657dab42cf8a7d0166ee8a8042ba Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 17:26:13 +0100 -Subject: [PATCH 0753/1224] dt: Update all mainline bcm283x dt files for i2c0 +Subject: [PATCH 0753/1225] dt: Update all mainline bcm283x dt files for i2c0 pinctrl mux BSC0 (aka i2c0) can me muxed via pinctrl to GPIOs 0&1, 28&29, or @@ -408843,10 +408843,10 @@ index 588d9411ceb61..dde209ade51b9 100644 2.18.4 -From 87997329027f536fb23a3a3c39e06e92e15557f9 Mon Sep 17 00:00:00 2001 +From d3e16a522e07e6bd1dba3b434cb85e6b9a81f71f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Apr 2020 17:34:27 +0100 -Subject: [PATCH 0754/1224] ARM: dts: Create bcm2708-rpi-b-rev1.dts +Subject: [PATCH 0754/1225] ARM: dts: Create bcm2708-rpi-b-rev1.dts The first revision of the Pi Model B used I2C0 to address the camera and I2C0 was available for user applications on the 26-pin header. @@ -409036,10 +409036,10 @@ index 2af64cd43729b..e3d90b4262f1f 100644 2.18.4 -From e260d801dafc72b17fc6a0d7d0218ff68ae12b6b Mon Sep 17 00:00:00 2001 +From 34ac7069f81de9275bd2fa6e18bd29188ad8e84f Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Wed, 22 Apr 2020 13:40:47 +0300 -Subject: [PATCH 0755/1224] dts: bcm2711: set #size-cells = <2> +Subject: [PATCH 0755/1225] dts: bcm2711: set #size-cells = <2> There already is one 4 GiB range, and one more will appear when high peripheral mode is enabled. @@ -409161,10 +409161,10 @@ index b34a65ff63163..41698e7f5e243 100644 2.18.4 -From 3eaeaae52d65686506c81f746ce4f80574376317 Mon Sep 17 00:00:00 2001 +From 8e521bbb3473626252ef2bbaf8582ce1f9de2f04 Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Wed, 22 Apr 2020 16:34:59 +0300 -Subject: [PATCH 0756/1224] dts: bcm2711: add "High Peripheral" mode overlay +Subject: [PATCH 0756/1225] dts: bcm2711: add "High Peripheral" mode overlay The following addresses change: @@ -409316,10 +409316,10 @@ index a20c0e079cc86..1287964c15bf1 100644 2.18.4 -From 502089322de346fab30d2750b00b755b9b99d3a8 Mon Sep 17 00:00:00 2001 +From e2c4c4eda00fe1389f2eed1b46d6e1dfcb902a09 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 13:41:10 +0100 -Subject: [PATCH 0757/1224] Revert "spi: spidev: Fix CS polarity if GPIO +Subject: [PATCH 0757/1225] Revert "spi: spidev: Fix CS polarity if GPIO descriptors are used" This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28. @@ -409354,10 +409354,10 @@ index 736af270d7a10..d41630b23968e 100644 2.18.4 -From 54b30ee355e7990c7b6ccaf92aad3f24a9a9b442 Mon Sep 17 00:00:00 2001 +From c7459c70df2b0f1ac96717f553406f8933505777 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 13:30:49 +0100 -Subject: [PATCH 0758/1224] spi: use_gpio_descriptor fixup moved to spi_setup +Subject: [PATCH 0758/1225] spi: use_gpio_descriptor fixup moved to spi_setup Commits [1] and [2] including code that forces SPI_CS_HIGH for SPI controllers that use GPIO descriptors, the SPI_CS_HIGH flag being @@ -409415,10 +409415,10 @@ index 5f6a95c4da6cb..b067ba232e39c 100644 2.18.4 -From 17548a42632bf68ac011d712b7e6a04c59146fae Mon Sep 17 00:00:00 2001 +From 8f8bd0737bf92facc326ba559dde4b4fbe633e95 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Apr 2020 15:17:06 +0100 -Subject: [PATCH 0759/1224] overlays: rpivid-v4l2 also needs size-cells = 2 +Subject: [PATCH 0759/1225] overlays: rpivid-v4l2 also needs size-cells = 2 Fixes: "dts: bcm2711: set #size-cells = <2>" @@ -409451,10 +409451,10 @@ index e6ece0570e90d..cd8d96bb57153 100644 2.18.4 -From bc6e487aafd74396d6989eb23db3e3ca1aa2d77f Mon Sep 17 00:00:00 2001 +From 1e0650b5c0b07cfb0d4cf6c65146befef1305f31 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Apr 2020 16:26:03 +0100 -Subject: [PATCH 0760/1224] media: bcm2835-unicam: Re-fetch mbus code from +Subject: [PATCH 0760/1225] 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 @@ -409506,10 +409506,10 @@ index 2ddac7382fb9e..2e022c5e1cfd1 100644 2.18.4 -From f683e0ecc2204772bb171f7c03659280d50d4a1c Mon Sep 17 00:00:00 2001 +From b456d0a65c06695923e62cbb728245de2d8d9be6 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:18:15 +0100 -Subject: [PATCH 0761/1224] uapi: bcm2835-isp: Add bcm2835-isp uapi header file +Subject: [PATCH 0761/1225] 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. @@ -409850,10 +409850,10 @@ index 0000000000000..e7afc367fd76c 2.18.4 -From 8e0491d7739df7b3fa048ebda03fd0a974e9dab1 Mon Sep 17 00:00:00 2001 +From 70b3aff565d8f5d600fa5a13dc8d9a4400eb25c0 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:20:26 +0100 -Subject: [PATCH 0762/1224] media: uapi: v4l2-core: Add ISP statistics output +Subject: [PATCH 0762/1225] media: uapi: v4l2-core: Add ISP statistics output V4L2 fourcc type Add V4L2_META_FMT_BCM2835_ISP_STATS V4L2 format type. @@ -409930,7 +409930,7 @@ index 0000000000000..f974774c82527 + bcm2835_isp_stats_focus bcm2835_isp_stats + diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 8878b9abd0346..31d3f50a50408 100644 +index fb279eeced455..27370a6cd75f2 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1333,6 +1333,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -409957,10 +409957,10 @@ index d8320844d188c..10e146cd092aa 100644 2.18.4 -From a65ef79a6c155755f62d71936cb2e7812a4766f5 Mon Sep 17 00:00:00 2001 +From 04ee8e845493a43f45a23cead942d254c9a6ef35 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Apr 2020 15:06:19 +0100 -Subject: [PATCH 0763/1224] media: uapi: v4l-ctrls: Add CID base for the +Subject: [PATCH 0763/1225] media: uapi: v4l-ctrls: Add CID base for the bcm2835-isp driver We are reserving controls for the new bcm2835-isp driver. @@ -410137,10 +410137,10 @@ index d21ac75456263..660574b1b4e7a 100644 2.18.4 -From 3375d5fb25ab3555be31b5a954bbbe77b755cf40 Mon Sep 17 00:00:00 2001 +From 2bcfba4dc20b575396cf6718ccd82891ec783133 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:12:24 +0100 -Subject: [PATCH 0764/1224] staging: mmal-vchiq: Fix formatting errors in +Subject: [PATCH 0764/1225] staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h No functional changes in this commit. @@ -410261,10 +410261,10 @@ index d3d7828d1e56c..27bafc5f01d2b 100644 2.18.4 -From 3aa180d6e9f609c0ec9324c6dfd3ee2ef75560fd Mon Sep 17 00:00:00 2001 +From efeca678058d70e22272745e804b09b196c9c1a4 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:17:37 +0100 -Subject: [PATCH 0765/1224] staging: vc04_services: ISP: Add a more complex ISP +Subject: [PATCH 0765/1225] staging: vc04_services: ISP: Add a more complex ISP processing component Driver for the BCM2835 ISP hardware block. This driver uses the MMAL @@ -412545,10 +412545,10 @@ index 27bafc5f01d2b..9c752db455658 100644 2.18.4 -From 769a9bfc30ca8b62208f8e9b98c73b2b7603404a Mon Sep 17 00:00:00 2001 +From 5e0f56075ecdb0a5902a0f35c90601c0756b5492 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 22 Apr 2020 08:32:32 +0100 -Subject: [PATCH 0766/1224] staging: vchiq: Load bcm2835_isp driver from vchiq +Subject: [PATCH 0766/1225] 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. @@ -412590,10 +412590,10 @@ index a3fcb1830995c..d01c2d4243104 100644 2.18.4 -From afbe3e60ee7a9f4f49f9f85f29849558a5ce503d Mon Sep 17 00:00:00 2001 +From b715cc59a936d7640cb88ade954be7b9b1603a52 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 20 Jan 2020 12:58:06 +0000 -Subject: [PATCH 0767/1224] configs: Add VIDEO_ISP_BCM2835 to all Pi defconfigs +Subject: [PATCH 0767/1225] configs: Add VIDEO_ISP_BCM2835 to all Pi defconfigs This commit enables the bcm2835-isp driver in the following defconfigs: @@ -412676,10 +412676,10 @@ index 3a39acd6d0abe..bb3b687406ab0 100644 2.18.4 -From 56249145406ca0dcf71de3409e1f5a8b4c841137 Mon Sep 17 00:00:00 2001 +From 38d8a0fbc9ce21094704c00188e8b6b63ba579d2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Apr 2020 17:35:07 +0100 -Subject: [PATCH 0768/1224] vc4_hvs: Mark core clock as optional +Subject: [PATCH 0768/1225] vc4_hvs: Mark core clock as optional This isn't required on Pi3, so don't treat as an error @@ -412705,10 +412705,10 @@ index 59198019aa1d9..d76521be2c0d0 100644 2.18.4 -From 4eb3679fa90e0ff1739b9b33e90d03fa07af1d09 Mon Sep 17 00:00:00 2001 +From 4ffe94ad0747fd3dea34a078aeb483e771a81230 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Apr 2020 19:07:50 +0100 -Subject: [PATCH 0769/1224] vc4_hdmi: BCM2835 requires a fixed hsm clock for +Subject: [PATCH 0769/1225] vc4_hdmi: BCM2835 requires a fixed hsm clock for CEC to work Signed-off-by: popcornmix @@ -412806,10 +412806,10 @@ index 9b80f9401d583..95bed29531b9d 100644 2.18.4 -From 2d7644ad478abc5112c8c6e11bb3eddd196e8834 Mon Sep 17 00:00:00 2001 +From c1f60c5fa800365373b25c4821035e845732484f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 29 Apr 2020 13:41:20 +0100 -Subject: [PATCH 0770/1224] configs: Enable CONFIG_DRM_VC4_HDMI_CEC +Subject: [PATCH 0770/1225] configs: Enable CONFIG_DRM_VC4_HDMI_CEC Signed-off-by: popcornmix --- @@ -412845,10 +412845,10 @@ index bb3b687406ab0..f6c12a7a04bee 100644 2.18.4 -From 5940f2585d207b6a1f96ce7270ec2d4f6b1616b2 Mon Sep 17 00:00:00 2001 +From 687c87f0a7f18ba1c46b2422d89fa6c24662dff9 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Wed, 29 Apr 2020 11:50:38 +0200 -Subject: [PATCH 0771/1224] media: i2c: imx219: Implement get_selection +Subject: [PATCH 0771/1225] media: i2c: imx219: Implement get_selection Implement the get_selection pad operation for the IMX219 sensor driver. The supported targets report the sensor's native size, the crop default @@ -413032,10 +413032,10 @@ index 017ae503cc09e..988ebf6dd8950 100644 2.18.4 -From 2f8ed2089f3ad4f8be5af3f27dcd8ca4842d1102 Mon Sep 17 00:00:00 2001 +From 76acf72aa4a0a6295764942cc4e8b04845650a64 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 11:46:07 +0100 -Subject: [PATCH 0772/1224] media: i2c: ov5647: Add support for g_selection to +Subject: [PATCH 0772/1225] 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 @@ -413244,10 +413244,10 @@ index 66b3ee5cc1909..e7c7e3ab4b383 100644 2.18.4 -From bbb826a7ffd68a587ae93d9dbe0426c340e1790b Mon Sep 17 00:00:00 2001 +From 46f06c2cbe15b3e4250f32058b68cfadcd86755d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 11:50:52 +0100 -Subject: [PATCH 0773/1224] media: i2c: ov5467: Fixup error path to release +Subject: [PATCH 0773/1225] media: i2c: ov5467: Fixup error path to release mutex "87f3ab9 media: ov5647: Add basic support for multiple sensor modes." @@ -413280,10 +413280,10 @@ index e7c7e3ab4b383..09d68b0b4a13e 100644 2.18.4 -From d4e175b439cc3b090b98b34c1c08c8496fc4cdc1 Mon Sep 17 00:00:00 2001 +From b85fd897acd1e8d1f077e4917f0ec79a4ef14b7a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 12:25:13 +0100 -Subject: [PATCH 0774/1224] media: i2c: ov5647: Support V4L2_CID_PIXEL_RATE +Subject: [PATCH 0774/1225] media: i2c: ov5647: Support V4L2_CID_PIXEL_RATE Clients need to know the pixel rate in order to compute exposure and frame rate values. @@ -413417,10 +413417,10 @@ index 09d68b0b4a13e..02d72feb837ef 100644 2.18.4 -From 1b46554643e26dbac21eb669ccf737ee70ba1e41 Mon Sep 17 00:00:00 2001 +From fa533281ff4f0d2a61269bca249f82b399fe5c6d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 17:25:56 +0100 -Subject: [PATCH 0775/1224] media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS +Subject: [PATCH 0775/1225] media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS flag The ov5647 subdev can generate control events, therefore set @@ -413566,10 +413566,10 @@ index 02d72feb837ef..c012e0b3d68bd 100644 2.18.4 -From b4787e77e987c39cacdd9b97001e8e848e4e671a Mon Sep 17 00:00:00 2001 +From f3605b690453bea6f179208043f5bcc42e5ef043 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 21:39:58 +0100 -Subject: [PATCH 0776/1224] media: i2c: ov5647: Add support for V4L2_CID_VBLANK +Subject: [PATCH 0776/1225] media: i2c: ov5647: Add support for V4L2_CID_VBLANK Adds vblank control to allow for frame rate control. @@ -413777,10 +413777,10 @@ index c012e0b3d68bd..445a0ce186ece 100644 2.18.4 -From f6ec21142370b8cdb36a5de67791bbf32f0ec826 Mon Sep 17 00:00:00 2001 +From 48d225e9ddab8eae098c2708acc11bc6a6b9556e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 21:47:25 +0100 -Subject: [PATCH 0777/1224] media: i2c: ov5647: Neither analogue gain nor +Subject: [PATCH 0777/1225] media: i2c: ov5647: Neither analogue gain nor exposure need EXECUTE_ON_WRITE The controls for analogue gain and exposure were defined with @@ -413841,10 +413841,10 @@ index 445a0ce186ece..49247711221c9 100644 2.18.4 -From 6095c66c241339144daee232dd178ed20d94a4e0 Mon Sep 17 00:00:00 2001 +From 1f3e30d0470b44a6455af3296d7edb68fddf1349 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 22:11:01 +0100 -Subject: [PATCH 0778/1224] media: i2c: ov5647: Use member names in mode tables +Subject: [PATCH 0778/1225] 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. @@ -413958,10 +413958,10 @@ index 49247711221c9..da4ef30d8f328 100644 2.18.4 -From e6067c4a24016bd89489251acaf9e886a2aeafba Mon Sep 17 00:00:00 2001 +From bf27eb27dd5960f5063666953e97b2c3354497dc Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 Apr 2020 11:03:00 +0100 -Subject: [PATCH 0779/1224] media: i2c: ov5647: Advertise the correct exposure +Subject: [PATCH 0779/1225] media: i2c: ov5647: Advertise the correct exposure range Exposure is clipped by the VTS of the mode, so needs to be updated as @@ -414083,10 +414083,10 @@ index da4ef30d8f328..6d84d2785f740 100644 2.18.4 -From 01cacb1dcc76a349e6c7328c1b661dae3fc76ff5 Mon Sep 17 00:00:00 2001 +From 944fb9d258490334b757dc07dba9ec402c17f73b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Apr 2020 11:01:21 +0100 -Subject: [PATCH 0780/1224] media: i2c: imx219: Declare that the driver can +Subject: [PATCH 0780/1225] media: i2c: imx219: Declare that the driver can create events The flag V4L2_SUBDEV_FL_HAS_EVENTS is required if the subdev can @@ -414116,10 +414116,10 @@ index 988ebf6dd8950..b84fc19e9ff75 100644 2.18.4 -From 434a40078ee656dd9eb21ff1b4c0cf596f68f1cb Mon Sep 17 00:00:00 2001 +From baff3c00a24686d27631accdd59e52fa963c18f7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 16:45:02 +0100 -Subject: [PATCH 0781/1224] media: bcm2835-unicam: Add support for +Subject: [PATCH 0781/1225] media: bcm2835-unicam: Add support for VIDIOC_[S|G]_SELECTION Sensors are now reflecting cropping and scaling parameters through @@ -414204,10 +414204,10 @@ index 2e022c5e1cfd1..f94a790ca3153 100644 2.18.4 -From d1d395ccd6a400a4d0e898fab12a0b9427c07ac0 Mon Sep 17 00:00:00 2001 +From 0bd7074f5bb68c196974b7412b85239b6f106dc5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 22:05:09 +0100 -Subject: [PATCH 0782/1224] media: bcm2835-unicam: Do not stop streaming in +Subject: [PATCH 0782/1225] media: bcm2835-unicam: Do not stop streaming in unicam_release unicam_release calls _vb2_fop_release, which will call stop_streaming @@ -414238,10 +414238,10 @@ index f94a790ca3153..e7c0e91cb841c 100644 2.18.4 -From 9319e632d285f1313822704dcd530ba41bdaff86 Mon Sep 17 00:00:00 2001 +From 415598dac569d6483fc3378fea89b11c56a76590 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 Apr 2020 09:52:50 +0100 -Subject: [PATCH 0783/1224] media: bcm2835-unicam: Fix reference counting in +Subject: [PATCH 0783/1225] media: bcm2835-unicam: Fix reference counting in unicam_open The reference counting of node->open was only incremented after @@ -414282,10 +414282,10 @@ index e7c0e91cb841c..5b5585f6770c9 100644 2.18.4 -From 9bbdb80a27a87193ff3caf50ebeaa01ab4e5177f Mon Sep 17 00:00:00 2001 +From 4625f764feaa22e3fc7ddb821425e6d2c41f4f99 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 1 May 2020 14:15:24 +0100 -Subject: [PATCH 0784/1224] staging: vc04_services: ISP: Add enum_framesizes +Subject: [PATCH 0784/1225] staging: vc04_services: ISP: Add enum_framesizes ioctl This is used to enumerate available frame sizes on all nodes @@ -414623,10 +414623,10 @@ index ded2be584f95f..9d8ccb403480e 100644 2.18.4 -From 91d04b8b1a815bb4d046eddb89802f09c59f1fef Mon Sep 17 00:00:00 2001 +From aaa04d5e977e1360139e67bac29ed841d573e686 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 1 May 2020 14:58:23 +0100 -Subject: [PATCH 0785/1224] SQUASH: spi: Demote SPI_CS_HIGH warning to +Subject: [PATCH 0785/1225] SQUASH: spi: Demote SPI_CS_HIGH warning to KERN_DEBUG This warning is unavoidable from a client's perspective and @@ -414658,10 +414658,10 @@ index b067ba232e39c..464d28ebc9572 100644 2.18.4 -From 9fef2b606db236268094770a8e020c860004f8cf Mon Sep 17 00:00:00 2001 +From a6dbcf39426c072018dfb4e5fb82e4f5af2b7e77 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Apr 2019 13:33:47 +0100 -Subject: [PATCH 0786/1224] bcm2835-dma: Add proper 40-bit DMA support +Subject: [PATCH 0786/1225] 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. @@ -415464,10 +415464,10 @@ index 1e5d6f1bed4ec..53346d7eb66c4 100644 2.18.4 -From 7f3726652f796d47c3c841dcc60a3e53fae840c0 Mon Sep 17 00:00:00 2001 +From f87bd48fdc2ce6990147fd733c76b25cd9b33674 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Apr 2020 12:43:05 +0100 -Subject: [PATCH 0787/1224] ARM: dts: bcm2711: Allow 40-bit DMA for SPI +Subject: [PATCH 0787/1225] ARM: dts: bcm2711: Allow 40-bit DMA for SPI Add the spi_dma4 DT parameter to enable use of the 40-bit DMA channels to drive SPI. Note that there are only 3-4 40-bit channels available, @@ -415512,10 +415512,10 @@ index ece3d3143643b..505f37235473c 100644 2.18.4 -From e92e1a1aa179cfc5210672a4819ea88ff3f10ecb Mon Sep 17 00:00:00 2001 +From 820a366c037e6ea68b60e3d82386450b5cc422c5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 1 May 2020 17:56:13 +0100 -Subject: [PATCH 0788/1224] overlays: Make the i2c-gpio overlay safe again +Subject: [PATCH 0788/1225] 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 @@ -415550,10 +415550,10 @@ index e94053b55610a..39e7bc5fa9d88 100644 2.18.4 -From 1d1a67a4e5b36198bc60e1c81674d301d82b0811 Mon Sep 17 00:00:00 2001 +From 0def0267b7f0032cc394806a26f0d4248595b433 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 1 May 2020 17:49:08 +0100 -Subject: [PATCH 0789/1224] staging: vc04_services: isp: Remove duplicated +Subject: [PATCH 0789/1225] staging: vc04_services: isp: Remove duplicated initialisation With the codec code from which this was derived, the driver had to @@ -415618,10 +415618,10 @@ index 6c4405ab4dc58..edb1a27328de3 100644 2.18.4 -From 513ae625a6f604377a0b81de0d884ecfd156018a Mon Sep 17 00:00:00 2001 +From 9e55ebfe3aa5577313b8fef14676e6336e7dd524 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 1 May 2020 16:54:20 +0100 -Subject: [PATCH 0790/1224] staging: vc04_services: isp: Make all references to +Subject: [PATCH 0790/1225] staging: vc04_services: isp: Make all references to bcm2835_isp_fmt const The array of potential formats and their configuration should be const. @@ -415774,10 +415774,10 @@ index 9d8ccb403480e..af3bde152bb24 100644 2.18.4 -From ce75f620718c6f3d94250662a020d17bddc03306 Mon Sep 17 00:00:00 2001 +From 3c0712c767cadfdcdff0d3a97bc877c18df2e283 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 2 May 2020 13:43:06 +0100 -Subject: [PATCH 0791/1224] overlays: gpio-keys: Avoid open-drain warnings +Subject: [PATCH 0791/1225] overlays: gpio-keys: Avoid open-drain warnings The i2c-gpio driver expects to use a GPIO in open-drain mode. Failure to configure it in that way causes alarming warnings in the kernel log. @@ -415809,10 +415809,10 @@ index 39e7bc5fa9d88..def139db8bcb5 100644 2.18.4 -From 7a67018767736da9a1f867e077eb0bb86a36488e Mon Sep 17 00:00:00 2001 +From 2a7122f1c8c6eaa60fa608c9aa42b324bda674d8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 4 May 2020 11:06:04 +0100 -Subject: [PATCH 0792/1224] configs: Add missing PPS configs +Subject: [PATCH 0792/1225] configs: Add missing PPS configs The arm64 bcm2711_defconfig was inexplicably missing three PPS config options. Add them, along with another missing option from @@ -415856,10 +415856,10 @@ index f6c12a7a04bee..751f6efda9f19 100644 2.18.4 -From 1f7d1efa7d20dc56fd9ff28a88e982289c2f2dae Mon Sep 17 00:00:00 2001 +From 88b3f0470c3b46ead11e9b3eb4c2c0abfa827089 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 4 May 2020 13:38:39 +0100 -Subject: [PATCH 0793/1224] configs: Add missing TOUCHSCREEN_RASPBERRYPI_FW=m +Subject: [PATCH 0793/1225] configs: Add missing TOUCHSCREEN_RASPBERRYPI_FW=m The 32- and 64-bit bcm2711 defconfigs are missing support for the official Raspberry Pi touchscreen. @@ -415902,10 +415902,10 @@ index d626405a9199b..7c362f4355c55 100644 2.18.4 -From 90f255f05abc573305c72d2e82ba0ea385ce5867 Mon Sep 17 00:00:00 2001 +From aabb8376a859a5d34ea3905c0ae05f80d78d4722 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 6 Apr 2020 17:07:31 +0100 -Subject: [PATCH 0794/1224] vc4_hdmi_phy: Fix typo in phy_get_cp_current +Subject: [PATCH 0794/1225] vc4_hdmi_phy: Fix typo in phy_get_cp_current This is stored in a 6-bit register field which causes a WARN @@ -415931,10 +415931,10 @@ index 732d8a0e5a1cd..0e242f87db9e5 100644 2.18.4 -From b7e5a3310bfd36ae6936fb221934e6591760515c Mon Sep 17 00:00:00 2001 +From 5468c17f49185c4c13cfdf47d703d55750b11707 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 4 May 2020 15:13:24 +0100 -Subject: [PATCH 0795/1224] overlays: Make use of intra-overlay fragments +Subject: [PATCH 0795/1225] overlays: Make use of intra-overlay fragments The firmware and runtime overlay support has recently been updated to correctly process fragments that target other fragments within the @@ -416031,10 +416031,10 @@ index b380d925f0a51..4fc571c2db334 100644 2.18.4 -From 229149e1c31842d3e887bdbd68d801bb3b33608b Mon Sep 17 00:00:00 2001 +From b1c8692d25c227dd89c19050c3e10bd4206102a5 Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:28:14 +0200 -Subject: [PATCH 0796/1224] media: i2c: tc358743: Fix fallthrough warning +Subject: [PATCH 0796/1225] media: i2c: tc358743: Fix fallthrough warning Signed-off-by: Jacko Dirks --- @@ -416057,10 +416057,10 @@ index 01e255aede504..73caf8609a7e1 100644 2.18.4 -From 8dbeb99db9b7eddd9df656d28e2e65ebe1083018 Mon Sep 17 00:00:00 2001 +From 5e048532b802132c725021934b45a3acb7584847 Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:33:31 +0200 -Subject: [PATCH 0797/1224] media: bcm2835: unicam: Fix uninitialized warning +Subject: [PATCH 0797/1225] media: bcm2835: unicam: Fix uninitialized warning Signed-off-by: Jacko Dirks --- @@ -416084,10 +416084,10 @@ index 5b5585f6770c9..6fd1b0939a07a 100644 2.18.4 -From 30e532fa314334e194888815675ea6a42891871f Mon Sep 17 00:00:00 2001 +From 7f2fbd7ad0ab5b8e36babf22a39d07dde2ddde14 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 19:45:41 +0100 -Subject: [PATCH 0798/1224] video: bcm2708_fb: Disable FB if no displays found +Subject: [PATCH 0798/1225] 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 @@ -416124,10 +416124,10 @@ index 8234207b1914b..d035fa59c269d 100644 2.18.4 -From 35cb16f8853f949d043f59f6fcefa6fb5f9b5b4e Mon Sep 17 00:00:00 2001 +From eab30a89647b7f50d6d4b5f2e447b7a3872b2f7c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 May 2020 14:25:20 +0100 -Subject: [PATCH 0799/1224] overlays: sc16is752-spi1: Add xtal parameter +Subject: [PATCH 0799/1225] overlays: sc16is752-spi1: Add xtal parameter The other sc16is75x overlays have an xtal parameter to allow a different crystal frequency to be specified, but sc16is752-spi1 @@ -416170,10 +416170,10 @@ index 4e33b14afc784..131d3ab43d3a5 100644 2.18.4 -From 34f87dccd324f006a18312e2dd6c05f3bae4d875 Mon Sep 17 00:00:00 2001 +From 84efbcabc2508c8129e8ac22a22bd2c731e4d7b4 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 0800/1224] vc4_hdmi: Fix register offset when sending longer +Subject: [PATCH 0800/1225] vc4_hdmi: Fix register offset when sending longer CEC messages Signed-off-by: Dom Cobley @@ -416218,10 +416218,10 @@ index 2919549b227f6..7b5421d248710 100644 2.18.4 -From 28b1a6d837652419feaa607addc8599c9a9a7cdc Mon Sep 17 00:00:00 2001 +From 3b9c732692509dd7dcecdb14618713260299c549 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 0801/1224] vc4_hdmi: Fix up CEC registers +Subject: [PATCH 0801/1225] vc4_hdmi: Fix up CEC registers Fix an incorrect register address, add a missing one and reorder into address order @@ -416267,10 +416267,10 @@ index ea948ffaa69bc..a0fa082a017c8 100644 2.18.4 -From 9a4167ea134ff5a92fd221bb85a073225a5f8d11 Mon Sep 17 00:00:00 2001 +From f158b90f586d81fcc22be83c5ee7ebc0b24d510f Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 0802/1224] vc4_hdmi_regs: Add Intr2 register block +Subject: [PATCH 0802/1225] vc4_hdmi_regs: Add Intr2 register block Signed-off-by: Dom Cobley --- @@ -416430,10 +416430,10 @@ index a0fa082a017c8..7311a8c0f1e50 100644 2.18.4 -From de8385ba0b1482475c575c37ed66f4d520d89b73 Mon Sep 17 00:00:00 2001 +From 89766056960620c9a22f3dbcbb9edad362517434 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 0803/1224] vc4_hdmi_regs: Make interrupt mask variant specific +Subject: [PATCH 0803/1225] vc4_hdmi_regs: Make interrupt mask variant specific Signed-off-by: Dom Cobley --- @@ -416541,10 +416541,10 @@ index 78809866097c8..4d017572a5c28 100644 2.18.4 -From 6caedb3be6dd33641d686f26b4bff76d58ff1d29 Mon Sep 17 00:00:00 2001 +From fd221754bfdcf3ea789f191f57c00eb36a3e67f2 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 0804/1224] vc4_hdmi: Make irq shared +Subject: [PATCH 0804/1225] vc4_hdmi: Make irq shared Signed-off-by: Dom Cobley --- @@ -416569,10 +416569,10 @@ index 9f6b260a72386..7b9d98fe2e3eb 100644 2.18.4 -From cc27458e89bf8aff0aec3ff0f95d1a5b3b3d04cf Mon Sep 17 00:00:00 2001 +From 72b8daf8b7f47994b4180190728387f59395da03 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 0805/1224] vc4_hdmi: Adjust CEC ref clock based on its input +Subject: [PATCH 0805/1225] vc4_hdmi: Adjust CEC ref clock based on its input clock 2711 uses a fixed 27MHz input, earlier models use the HSM clock @@ -416666,10 +416666,10 @@ index 7765b9cf885b3..dbf96a3b01ee5 100644 2.18.4 -From b5c3db446423a8b994607e380dc28d94f5df419f Mon Sep 17 00:00:00 2001 +From c31cb2c7422f3f36838762df7eb42e2df37cd6eb Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:09 +0100 -Subject: [PATCH 0806/1224] vc4_hdmi: Remove cec_available flag as always +Subject: [PATCH 0806/1225] vc4_hdmi: Remove cec_available flag as always supported Signed-off-by: Dom Cobley @@ -416718,10 +416718,10 @@ index dbf96a3b01ee5..60f7bf99e06ef 100644 2.18.4 -From 471b8499c493062aba942f6d4f5663da99985572 Mon Sep 17 00:00:00 2001 +From 476c1aa637df15a57efb7d074cbc2a727f7f4ef1 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:09 +0100 -Subject: [PATCH 0807/1224] config: Enable CONFIG_DRM_VC4_HDMI_CEC +Subject: [PATCH 0807/1225] config: Enable CONFIG_DRM_VC4_HDMI_CEC Signed-off-by: Dom Cobley --- @@ -416757,10 +416757,10 @@ index 7c362f4355c55..35afa6b6ffd61 100644 2.18.4 -From 7b18d014993412d07b0e1b8e7c26245c40c6b3c0 Mon Sep 17 00:00:00 2001 +From 669bed369b88133006f8c30a7e9a8737877b592c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 May 2020 11:55:45 +0100 -Subject: [PATCH 0808/1224] overlays: tc358743: Use intra-overlay fragments +Subject: [PATCH 0808/1225] overlays: tc358743: Use intra-overlay fragments The tc358743 overlay was written using a workaround to a problem with fragments that target other fragments, but this had the unfortunate @@ -416818,10 +416818,10 @@ index f8c059827234d..b317e088b37e2 100644 2.18.4 -From 13149f0f574b3a64911224abb119b6a182e69c1a Mon Sep 17 00:00:00 2001 +From 6f48f13c494cf2d424588a3ef3c006c71f48a62e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 May 2020 15:12:21 +0100 -Subject: [PATCH 0809/1224] overlays: Move "fixed-clock" nodes to the root +Subject: [PATCH 0809/1225] overlays: Move "fixed-clock" nodes to the root Apart from some special cases, device objects are only created for nodes if they are children of a bus or the root node. "fixed-clock" @@ -417172,10 +417172,10 @@ index b317e088b37e2..2ea99cd9e1a1e 100644 2.18.4 -From dcb79f4b3b1b94bda5ce8993e38c5a6da0feb378 Mon Sep 17 00:00:00 2001 +From 20f8302e147f80f733b1199621c2fb6b92c42240 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 May 2020 08:32:42 +0100 -Subject: [PATCH 0810/1224] raspberrypi: dts: Switch to discrete ALSA devices +Subject: [PATCH 0810/1225] raspberrypi: dts: Switch to discrete ALSA devices Add the command line options required to enable audio over discrete ALSA devices. @@ -417272,10 +417272,10 @@ index 86dd3093e7098..05220fa0202b3 100644 2.18.4 -From 6afa97383d884d88eacd829014258beae1ad43e3 Mon Sep 17 00:00:00 2001 +From 2c6d54540e5a21b9aadde8f04c80f39e59c0a4bc Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:50:54 +0100 -Subject: [PATCH 0811/1224] dt-bindings: media: i2c: Add IMX477 CMOS sensor +Subject: [PATCH 0811/1225] dt-bindings: media: i2c: Add IMX477 CMOS sensor binding Add YAML device tree binding for IMX477 CMOS image sensor. @@ -417409,10 +417409,10 @@ index 0000000000000..0994e13e67f68 2.18.4 -From 8002eca5f1798cae5bc6b8b971121bf803bbb453 Mon Sep 17 00:00:00 2001 +From 851ac26d6038d0a3c940133eb53fc48f52518dcd Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:50:04 +0100 -Subject: [PATCH 0812/1224] dtoverlays: Add IMX477 sensor overlay +Subject: [PATCH 0812/1225] dtoverlays: Add IMX477 sensor overlay Add an overlay for the Sony IMX477 CMOS sensor device. Also update overlay README and Makefile. @@ -417576,10 +417576,10 @@ index 0000000000000..1dd6f92b4dfe7 2.18.4 -From 975d847b4c46a4060aa47a8b845641288e44528f Mon Sep 17 00:00:00 2001 +From 9245df8d51ede22b9a5dcf3f96af65a815948e22 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 8 May 2020 10:00:12 +0100 -Subject: [PATCH 0813/1224] media: i2c: Add driver for Sony IMX477 sensor +Subject: [PATCH 0813/1225] 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 @@ -419855,10 +419855,10 @@ index 0000000000000..ec56b0cfd57b3 2.18.4 -From b4906c0ed9e1381c3dc42c8ffe2569a4ad0a3886 Mon Sep 17 00:00:00 2001 +From f7642ac3442e1b77b2221c0d8f2a97c9b27f8af2 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 8 May 2020 09:41:17 +0100 -Subject: [PATCH 0814/1224] media: i2c: imx477: Add support for adaptive frame +Subject: [PATCH 0814/1225] media: i2c: imx477: Add support for adaptive frame control Use V4L2_CID_EXPOSURE_AUTO_PRIORITY to control if the driver should @@ -420043,10 +420043,10 @@ index ec56b0cfd57b3..bd0e2c291a321 100644 2.18.4 -From ebc2fcf2452738851a340cd447fe442f98eeaaf8 Mon Sep 17 00:00:00 2001 +From 44a3d0cf626ff5dc06a431b8375caf18369ca0f5 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:36:25 +0100 -Subject: [PATCH 0815/1224] configs: Add imx477 sensor driver to all Raspberry +Subject: [PATCH 0815/1225] configs: Add imx477 sensor driver to all Raspberry Pi defconfigs This commit enables the imx477 sensor driver in the following @@ -420130,10 +420130,10 @@ index 751f6efda9f19..efb1b60cbbb62 100644 2.18.4 -From 13186dca5acc19a330f5cd49c1c0dc66d917328d Mon Sep 17 00:00:00 2001 +From 50e0ac1a6dc8285bed6606d471bb5cc79e6e7164 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Tue, 26 Nov 2019 15:25:16 +0100 -Subject: [PATCH 0816/1224] udmabuf: Remove deleted map/unmap handlers. +Subject: [PATCH 0816/1225] udmabuf: Remove deleted map/unmap handlers. Commit 19d32ace8b6acebc45da1ea748000ac79ccc7721 upstream. @@ -420188,10 +420188,10 @@ index 9635897458a09..9de539c1def47 100644 2.18.4 -From d3d8cae29bb4ada6654ce6c193e17ec2c8848fb3 Mon Sep 17 00:00:00 2001 +From f64b12bfb429aae7c2d3bb5f14187ed67f29e713 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:24 -0800 -Subject: [PATCH 0817/1224] udmabuf: use cache_sgt_mapping option +Subject: [PATCH 0817/1225] udmabuf: use cache_sgt_mapping option Commit bc7a71da43b48333f84c6534ab43d240e34cf9eb uptream. @@ -420229,10 +420229,10 @@ index 9de539c1def47..be15eb6b05865 100644 2.18.4 -From eef4930a84c5b84aad048b87ba6a4b6496d559ef Mon Sep 17 00:00:00 2001 +From 4a79f8980a7f0448ced4103a2f73f810533aeffd Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:25 -0800 -Subject: [PATCH 0818/1224] udmabuf: add a pointer to the miscdevice in dma-buf +Subject: [PATCH 0818/1225] udmabuf: add a pointer to the miscdevice in dma-buf private data Commit c1bbed668997268c9edccdc9db1bd1487d9e20b0 upstream. @@ -420302,10 +420302,10 @@ index be15eb6b05865..f0bf3ba7441e7 100644 2.18.4 -From 69d033d725987837a672b4a0cfeb7d035d8f304e Mon Sep 17 00:00:00 2001 +From af872edb036e9dae0f9aa3280444c4fc6bfc456c Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:26 -0800 -Subject: [PATCH 0819/1224] udmabuf: separate out creating/destroying +Subject: [PATCH 0819/1225] udmabuf: separate out creating/destroying scatter-table Commit 17a7ce203490459cff14fb1c8f9a15d65fd1c544 upstream. @@ -420379,10 +420379,10 @@ index f0bf3ba7441e7..0a610e09ae237 100644 2.18.4 -From e0c4bf1f7b3b2a46a70d52b885a2b649e09e1cc3 Mon Sep 17 00:00:00 2001 +From af51deec03f00aa9b1f9bd795a9e223d4ddc3dda Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:27 -0800 -Subject: [PATCH 0820/1224] udmabuf: implement begin_cpu_access/end_cpu_access +Subject: [PATCH 0820/1225] udmabuf: implement begin_cpu_access/end_cpu_access hooks Commit 284562e1f34874e267d4f499362c3816f8f6bc3f upstream. @@ -420475,10 +420475,10 @@ index 0a610e09ae237..61b0a2cff874a 100644 2.18.4 -From 6fbe83aea167485b3c90a49958d7a4a0ff13d346 Mon Sep 17 00:00:00 2001 +From 6cbf896d091ed1b876ef01c17bd9f269e5514e7e Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Tue, 17 Dec 2019 15:02:28 -0800 -Subject: [PATCH 0821/1224] udmabuf: fix dma-buf cpu access +Subject: [PATCH 0821/1225] udmabuf: fix dma-buf cpu access Commit 1ffe09590121fbb3786d6c860acdd200f7ab095c upstream. @@ -420541,10 +420541,10 @@ index 61b0a2cff874a..acb26c627d27b 100644 2.18.4 -From 3462ae5e927eaea785d4081681409f5587826cbf Mon Sep 17 00:00:00 2001 +From f8648810e763628be24b02098775f5d9be9e0f70 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Tue, 3 Dec 2019 17:26:37 +0000 -Subject: [PATCH 0822/1224] dma-buf: Add dma-buf heaps framework +Subject: [PATCH 0822/1225] dma-buf: Add dma-buf heaps framework Commit c02a81fba74fe3488ad6b08bfb5a1329005418f8 upstream. This framework allows a unified userspace interface for dma-buf @@ -421085,10 +421085,10 @@ index 0000000000000..73e7f66c1cae1 2.18.4 -From 51174cfa58fa0cb5ea6a9c23a9447831c54abe90 Mon Sep 17 00:00:00 2001 +From 1a058e1453a9507442f0f2edad41601a54869e21 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:38 +0000 -Subject: [PATCH 0823/1224] dma-buf: heaps: Add heap helpers +Subject: [PATCH 0823/1225] dma-buf: heaps: Add heap helpers Commit 5248eb12fea890a03b4cdc3ef546d6319d4d9b73 upstream. @@ -421494,10 +421494,10 @@ index 0000000000000..805d2df88024f 2.18.4 -From 9c17428afc9bcffd34a397b34edc35ed4c9bf690 Mon Sep 17 00:00:00 2001 +From 5b7c338876f027781c9eb786505e6bf1cddb8aaf Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:39 +0000 -Subject: [PATCH 0824/1224] dma-buf: heaps: Add system heap to dmabuf heaps +Subject: [PATCH 0824/1225] dma-buf: heaps: Add system heap to dmabuf heaps Commit efa04fefebbd724ffda7f49e42d057a7217c45b0 upstream. @@ -421708,10 +421708,10 @@ index 0000000000000..1aa01e98c5958 2.18.4 -From 22a88e31cfef1d7a5aff4f8058157cae37e78698 Mon Sep 17 00:00:00 2001 +From 905835f9d6b6522548b9b867efbf636b6a72864b Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:40 +0000 -Subject: [PATCH 0825/1224] dma-buf: heaps: Add CMA heap to dmabuf heaps +Subject: [PATCH 0825/1225] dma-buf: heaps: Add CMA heap to dmabuf heaps Commit b61614ec318aae0c77ecd2816878d851dd61d9a6 upstream. @@ -421970,10 +421970,10 @@ index 0000000000000..626cf7fd033af 2.18.4 -From 2b8ba88b6ac0a6599359c1e681ed8a79cb592e2e Mon Sep 17 00:00:00 2001 +From febba7c992c1d6faff3a1c0a76349515ee102680 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:41 +0000 -Subject: [PATCH 0826/1224] kselftests: Add dma-heap test +Subject: [PATCH 0826/1225] kselftests: Add dma-heap test Commit a8779927fd86c91f5400bfcbccfa018a667d8350 upstream. @@ -422433,10 +422433,10 @@ index 0000000000000..3e53ad331bdce 2.18.4 -From 80d0bcc199422f3617f1ad70f6081e055b6ab54d Mon Sep 17 00:00:00 2001 +From 022d8568916bbd4b7dc176d1d8585a74cd716ca3 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Mon, 16 Dec 2019 08:34:04 -0500 -Subject: [PATCH 0827/1224] dma-buf: heaps: Use _IOCTL_ for userspace IOCTL +Subject: [PATCH 0827/1225] dma-buf: heaps: Use _IOCTL_ for userspace IOCTL identifier Commit b3b4346544b571c96d46be615b9db69a601ce4c8 upstream. @@ -422512,10 +422512,10 @@ index 3e53ad331bdce..cd5e1f602ac9d 100644 2.18.4 -From a864d147f5722c19660372a128b04a35461637ec Mon Sep 17 00:00:00 2001 +From aa76694bfe1018afb7cc8a6b259434a253d56399 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Mon, 16 Dec 2019 08:34:05 -0500 -Subject: [PATCH 0828/1224] dma-buf: heaps: Remove redundant heap identifier +Subject: [PATCH 0828/1225] dma-buf: heaps: Remove redundant heap identifier from system heap name The heaps are already in a directory of heaps, adding _heap to a heap @@ -422546,10 +422546,10 @@ index 1aa01e98c5958..0bf688e3c023a 100644 2.18.4 -From 582ba3042b950e08ae6d2cdef9c93dcde9b43070 Mon Sep 17 00:00:00 2001 +From 392c80917c1473ca675f1b9be37d92babce3983a Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Mon, 16 Dec 2019 16:10:59 +0000 -Subject: [PATCH 0829/1224] dma-buf: fix resource leak on -ENOTTY error return +Subject: [PATCH 0829/1225] dma-buf: fix resource leak on -ENOTTY error return path Commit f9d3b2c600075d1f79efcd5cdb1718c2f554c0f9 upstream. @@ -422586,10 +422586,10 @@ index a247214961149..1886aee461315 100644 2.18.4 -From a42620597a2551504da9840ac0addd323521feb7 Mon Sep 17 00:00:00 2001 +From caac2f57b0d2d86836390b1b8b662143f9d79c6f Mon Sep 17 00:00:00 2001 From: zhong jiang Date: Wed, 18 Dec 2019 00:38:22 +0530 -Subject: [PATCH 0830/1224] dma-heap: Make the symbol 'dma_heap_ioctl_cmds' +Subject: [PATCH 0830/1225] dma-heap: Make the symbol 'dma_heap_ioctl_cmds' static Commit 7d411afe8444060454a53b1f9b70ee78b3e75ef1 upstream. @@ -422626,10 +422626,10 @@ index 1886aee461315..afd22c9dbdcfa 100644 2.18.4 -From 16132514ef8876d705722b0b9ea652b23eaf7733 Mon Sep 17 00:00:00 2001 +From 87b09cf1dd67adda10bddd71d3c79f439c56c484 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 May 2020 20:44:12 +0100 -Subject: [PATCH 0831/1224] defconfig: Add CMA and system dma-heaps to the +Subject: [PATCH 0831/1225] defconfig: Add CMA and system dma-heaps to the config The CMA dma-heap allocator can be used in place of vcsm-cma @@ -422718,10 +422718,10 @@ index efb1b60cbbb62..1f037a5bd4ef1 100644 2.18.4 -From 37ccdf84e2a420149dab931396a99923cd19122a Mon Sep 17 00:00:00 2001 +From f5ec712e6be5a39035403d625b070ab7c9433285 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 May 2020 17:02:26 +0100 -Subject: [PATCH 0832/1224] ARM: dts: Enable firmware-clocks on all Pis +Subject: [PATCH 0832/1225] ARM: dts: Enable firmware-clocks on all Pis Signed-off-by: Phil Elwell --- @@ -422749,10 +422749,10 @@ index bf90fd585364c..d2f5ea1f31f8e 100644 2.18.4 -From 949be101118e480b43c75d6ae85e66eff44119e2 Mon Sep 17 00:00:00 2001 +From a3d843bc894bfce80cbace5949214612b79c9755 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 May 2020 17:17:45 +0100 -Subject: [PATCH 0833/1224] configs: Include the firmware-clocks driver +Subject: [PATCH 0833/1225] configs: Include the firmware-clocks driver Signed-off-by: Phil Elwell --- @@ -422801,10 +422801,10 @@ index 1f037a5bd4ef1..f546bc80c8b17 100644 2.18.4 -From 4f3b813262ff3701829a464db8d3e640c8b05253 Mon Sep 17 00:00:00 2001 +From 6733a02d2bfc93674863ce14e355d08cc76a2721 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 May 2020 17:18:28 +0100 -Subject: [PATCH 0834/1224] configs: Use the upstream cpufreq driver +Subject: [PATCH 0834/1225] configs: Use the upstream cpufreq driver Switch to the upstream cpufreq driver on non-BCM2835 Pis. @@ -422859,10 +422859,10 @@ index f546bc80c8b17..05a9f0ef9508d 100644 2.18.4 -From 539ba114022ff44c81baae6a1fce0e5668559343 Mon Sep 17 00:00:00 2001 +From 2fabff4badf7c037ac17001def9a97eb1b9d0a74 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 May 2020 18:28:27 +0100 -Subject: [PATCH 0835/1224] media: bcm2835-unicam: Always service interrupts +Subject: [PATCH 0835/1225] 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 @@ -422916,10 +422916,10 @@ index 6fd1b0939a07a..aadc2ab6ec911 100644 2.18.4 -From 67adffd3270c6c7f72c1d2b5ce386bd430365c60 Mon Sep 17 00:00:00 2001 +From e693d3aca939cb1ce936c224e85ffffc53df913e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 May 2020 20:10:15 +0100 -Subject: [PATCH 0836/1224] sc16is7xx: Fix for hardware flow control +Subject: [PATCH 0836/1225] sc16is7xx: Fix for hardware flow control The SC16IS7XX hardware flow control is mishandled by the driver in a number of ways: @@ -422992,10 +422992,10 @@ index fe486498530da..7eda5b1eb1d9b 100644 2.18.4 -From b0f5f08ad0449f5385d5d523bbb283077499189d Mon Sep 17 00:00:00 2001 +From b86b910bce01bfe2343bc024023fd10290a85f61 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 14 May 2020 14:44:15 +0100 -Subject: [PATCH 0837/1224] drm/vc4: Fix VIC usage with Broadcast RGB +Subject: [PATCH 0837/1225] drm/vc4: Fix VIC usage with Broadcast RGB Adding the Broadcast RGB range selection broke the VIC field of the AVI infoframes on HDMI, zeroing them for all @@ -423056,10 +423056,10 @@ index 6701cd3a0249a..25a1f066e62c5 100644 2.18.4 -From 5ead3e79f9950e691c1470823f19e8c90e64c043 Mon Sep 17 00:00:00 2001 +From aff258af7b24d3cceef249b8c2b103476e0032df Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:42:10 +0100 -Subject: [PATCH 0838/1224] staging: vc04_services: mmal-vchiq: Update +Subject: [PATCH 0838/1225] staging: vc04_services: mmal-vchiq: Update parameters list Adds in a couple of new MMAL parameter defines. @@ -423090,10 +423090,10 @@ index 9c752db455658..5b596b5c057f8 100644 2.18.4 -From a87ac23016a0f91a53a027398e6b8d9e72004b1d Mon Sep 17 00:00:00 2001 +From 3fc25d0fafbf1a8dd0cf80e3e729c0ac21ebaca2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:43:08 +0100 -Subject: [PATCH 0839/1224] staging:vc04_services: bcm2835-codec: Request +Subject: [PATCH 0839/1225] staging:vc04_services: bcm2835-codec: Request headers with I-frame V4L2 wishes to have the codec header bytes in the same buffer as the @@ -423125,10 +423125,10 @@ index 50395795c3dba..3c819e2515137 100644 2.18.4 -From 080168b9c1fa35a6620f4f1960adffbbbaaded5c Mon Sep 17 00:00:00 2001 +From 70bdf6d4e74f20e334e9b8cd0fdd0f727e28678c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:47:13 +0100 -Subject: [PATCH 0840/1224] staging:vc04_services: bcm2835-codec: Avoid +Subject: [PATCH 0840/1225] staging:vc04_services: bcm2835-codec: Avoid fragmenting buffers The firmware by default is quite happy to fragment encoded @@ -423163,10 +423163,10 @@ index 3c819e2515137..1c7fbba6c9c85 100644 2.18.4 -From 78721ea5b0b9f8c40283f02fe0a0b7ee14a5c27f Mon Sep 17 00:00:00 2001 +From 91fb50d0edb968cb246475285bd080e6f2834761 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:48:59 +0100 -Subject: [PATCH 0841/1224] staging:vc04_services: bcm2835-camera: Request +Subject: [PATCH 0841/1225] staging:vc04_services: bcm2835-camera: Request headers with I-frame V4L2 wishes to have the codec header bytes in the same buffer as the @@ -423199,10 +423199,10 @@ index e69ec072c2c77..b7214741fa613 100644 2.18.4 -From 5834e5787f52fb50292c0c77900ccc7191df00ad Mon Sep 17 00:00:00 2001 +From 2d5797870c25e74cb3238115f660c8cf440d2544 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 15 May 2020 17:18:20 +0100 -Subject: [PATCH 0842/1224] configs: Restore missing NF_TABLES settings +Subject: [PATCH 0842/1225] configs: Restore missing NF_TABLES settings The arm bcm2711_defconfig and the arm64 bcmrpi3_defconfig have been missing their NF_TABLES settings. Restore them. @@ -423363,10 +423363,10 @@ index 05a9f0ef9508d..da5a47b18b19e 100644 2.18.4 -From 427115404351a9543bb871c49721b2ebf74d8ae1 Mon Sep 17 00:00:00 2001 +From 0459f6e9b5c3c8e94a5ebcb5425b9dfecb6e0c23 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 18 May 2020 09:46:48 +0100 -Subject: [PATCH 0843/1224] overlays: Fix audio parameter of vc4-kms-v3d +Subject: [PATCH 0843/1225] overlays: Fix audio parameter of vc4-kms-v3d The CMA handling change broke the audio parameter - the fragment numbering has changed - so fix it. @@ -423394,10 +423394,10 @@ index b40aa1d8f432b..caa64bfb95a72 100644 2.18.4 -From afce85ddd86d11f3f86d74b9f4c4a5d970199521 Mon Sep 17 00:00:00 2001 +From 9684ee6727c69e59560c179d5a0f5eb7e1a1f63b Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Tue, 19 May 2020 13:56:17 +0200 -Subject: [PATCH 0844/1224] Switch to snd_soc_dai_set_bclk_ratio Replaces +Subject: [PATCH 0844/1225] Switch to snd_soc_dai_set_bclk_ratio Replaces obsolete function snd_soc_dai_set_tdm_slot Signed-off-by: Joerg Schambacher @@ -423438,10 +423438,10 @@ index ffa76014e7df6..a7fab4d951b6e 100644 2.18.4 -From e3b3fa1e79f97e847c80d9bdfa412238fdb7bdcc Mon Sep 17 00:00:00 2001 +From eb7c776c967821c0f5742b954359e49cf486f82c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 11:46:47 +0100 -Subject: [PATCH 0845/1224] media: bcm2835-unicam: Retain packing information +Subject: [PATCH 0845/1225] media: bcm2835-unicam: Retain packing information on G_FMT The change to retrieve the pixel format always on g_fmt didn't @@ -423492,10 +423492,10 @@ index aadc2ab6ec911..c4e7d21771937 100644 2.18.4 -From 5772e97680e33292185522d30ac0e96de46b5a2f Mon Sep 17 00:00:00 2001 +From 4667c4ef8904d027a6ae512448d7e8379e32d41b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 May 2020 15:47:02 +0100 -Subject: [PATCH 0846/1224] zswap: Uncross module parameter setting functions +Subject: [PATCH 0846/1225] zswap: Uncross module parameter setting functions The "compressor" and "zpool" parameters of the zswap module each has a custom setter function that calls __zswap_param_set with specific @@ -423535,10 +423535,10 @@ index 46a322316e52c..b0fc8d9ffe1fb 100644 2.18.4 -From fa3128e045672665bd2f029c637bff82045a4dff Mon Sep 17 00:00:00 2001 +From fa5aa96d6f4bd3241acd83d8f8dd90d5b0e34dbd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 15:23:32 +0100 -Subject: [PATCH 0847/1224] zswap: Defer zswap initialisation +Subject: [PATCH 0847/1225] 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 @@ -423656,10 +423656,10 @@ index b0fc8d9ffe1fb..a347f8df45c18 100644 2.18.4 -From b72dff2d84821db60b99f6dfc46fc188d189536a Mon Sep 17 00:00:00 2001 +From f3f96a397448291fbef4c496acaae32c096f2962 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 15:25:06 +0100 -Subject: [PATCH 0848/1224] configs: Add ZSWAP=y, ZBUD=m, Z3FOLD=m +Subject: [PATCH 0848/1225] configs: Add ZSWAP=y, ZBUD=m, Z3FOLD=m Signed-off-by: Phil Elwell --- @@ -423744,10 +423744,10 @@ index da5a47b18b19e..4b232432e240e 100644 2.18.4 -From ae2baef13672ba40b9942647b5c1964f1c0dd20b Mon Sep 17 00:00:00 2001 +From 1a78564963ead2bcc0c118884bbce6e0ba0648c1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 14:54:28 +0100 -Subject: [PATCH 0849/1224] drm/vc4: Adopt the dma configuration from the HVS +Subject: [PATCH 0849/1225] 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 @@ -423804,10 +423804,10 @@ index 68f9db6c4c878..82fd80547bb11 100644 2.18.4 -From 73aa9266bff29434c3a5926e3296e9dcc6594819 Mon Sep 17 00:00:00 2001 +From 75a9123bb82c88954fc4b62ef612ed3b6e8166d1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 16:20:30 +0100 -Subject: [PATCH 0850/1224] drm/vc4: Add FKMS as an acceptable node for dma +Subject: [PATCH 0850/1225] drm/vc4: Add FKMS as an acceptable node for dma ranges. Under FKMS, the firmware (via FKMS) also requires the VideoCore cache @@ -423837,10 +423837,10 @@ index 82fd80547bb11..2e1b2e51aff04 100644 2.18.4 -From d96782fc8cbf29ef9578baf7a92dd5877a3cece2 Mon Sep 17 00:00:00 2001 +From f8011483ff8397dff5e34b4a93f6c7a493b974a2 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 16:56:33 +0100 -Subject: [PATCH 0851/1224] media: i2c: imx477: Return correct result on sensor +Subject: [PATCH 0851/1225] media: i2c: imx477: Return correct result on sensor id verification The test should return -EIO if the register read id does not match @@ -423868,10 +423868,10 @@ index bd0e2c291a321..e42a8633087d4 100644 2.18.4 -From f59b7da1a0124e3ba477fa4beb1c0880980d4e57 Mon Sep 17 00:00:00 2001 +From 67ef07810ade6656bbe4b721f0dd3ad4f7f741df Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 May 2020 16:36:33 +0100 -Subject: [PATCH 0852/1224] staging: vchiq_arm: Clean up 40-bit DMA support +Subject: [PATCH 0852/1225] 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- @@ -424030,10 +424030,10 @@ index d01c2d4243104..d55f038637fc4 100644 2.18.4 -From 8626b17ba455f25ee7c529525bc2d76c8490d022 Mon Sep 17 00:00:00 2001 +From f122f32c27b8eeb008cb2ed214d4d7567294ac0d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 May 2020 16:36:57 +0100 -Subject: [PATCH 0853/1224] ARM: dts: Update for new VCHIQ BCM2711 DMA support +Subject: [PATCH 0853/1225] ARM: dts: Update for new VCHIQ BCM2711 DMA support Now that the enhanced BCM2711 DMA controller is located by compatible string and used directly for generating bulk transfer addresses, @@ -424103,10 +424103,10 @@ index 2c55c78bd7cb3..46bcfd586f173 100644 2.18.4 -From c7728e5bf35f426f7c332275bd4645760a40e7c4 Mon Sep 17 00:00:00 2001 +From 5342b9681f567a85804f4e26dd10fc891100ce9f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 25 May 2020 21:52:40 +0100 -Subject: [PATCH 0854/1224] Revert "zswap: Uncross module parameter setting +Subject: [PATCH 0854/1225] Revert "zswap: Uncross module parameter setting functions" This reverts commit e5e8a2214dff0c43580afc5dc22d496f667c3bbf. @@ -424138,10 +424138,10 @@ index a347f8df45c18..232f4565e7957 100644 2.18.4 -From beb9a2a1ff7fd7a844d8e1bc658613f4acc6e7a4 Mon Sep 17 00:00:00 2001 +From 425d4a896f34d2dcfb254bde7f46abe83b7b0029 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 28 May 2020 11:09:48 +0100 -Subject: [PATCH 0855/1224] media: bcm2835-unicam: change minimum number of +Subject: [PATCH 0855/1225] 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 @@ -424172,10 +424172,10 @@ index c4e7d21771937..47b2d3a03fbfa 100644 2.18.4 -From b4a411b30d443d66c9ada20c05a731ccbad30c52 Mon Sep 17 00:00:00 2001 +From bf87c871f2935d94420f9784e472339996612543 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:15 +0100 -Subject: [PATCH 0856/1224] dt-bindings: Add Broadcom AVS RO thermal +Subject: [PATCH 0856/1225] dt-bindings: Add Broadcom AVS RO thermal Commit ee31ff373da6602e7a4e60fe11322b41ac38eb22 upstream. @@ -424249,10 +424249,10 @@ index 0000000000000..98e7b57bfa13a 2.18.4 -From a7c5f40e5e2e1c85e17bdbe85db00de2bd80e607 Mon Sep 17 00:00:00 2001 +From 8add1a9ce9cbb2f278309dbb7a5f710ec50ce39e Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:16 +0100 -Subject: [PATCH 0857/1224] thermal: Add BCM2711 thermal driver +Subject: [PATCH 0857/1225] thermal: Add BCM2711 thermal driver Commit 59b781352dc4cb9ae27a8ddae0cda979d29d8af7 upstream. @@ -424433,10 +424433,10 @@ index 0000000000000..67c2a737bc9d9 2.18.4 -From c1786d9d446a6c587b8724cc8fe2bbad38a39813 Mon Sep 17 00:00:00 2001 +From 03e5e476ca3e8b66406805295fb7274d0e873d3b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:17 +0100 -Subject: [PATCH 0858/1224] ARM: dts: bcm2711: Enable thermal +Subject: [PATCH 0858/1225] ARM: dts: bcm2711: Enable thermal Commit a1d6989bf12b01cd9198e2c31a96678ac9c47415 upstream. @@ -424488,10 +424488,10 @@ index 96ef133391d1c..20114a723cf94 100644 2.18.4 -From 6d86df23fe354e26b1dbde817e3c9a27f31e51eb Mon Sep 17 00:00:00 2001 +From 8d72557e1324b58fa65a8f9d4637fe03c8f3988b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:18 +0100 -Subject: [PATCH 0859/1224] ARM: configs: Build BCM2711 thermal as module +Subject: [PATCH 0859/1225] ARM: configs: Build BCM2711 thermal as module Commit 1a90e73248c4d0add6583bd88bb5e082c3e090bc upstream. @@ -424537,10 +424537,10 @@ index c9a867ac32d48..4486777c7f86e 100644 2.18.4 -From 9e29803263638717e6e82fde0099664ba36240db Mon Sep 17 00:00:00 2001 +From 2f462398fce4103707fd4d53b867d333ca842f0d Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2020 17:24:24 +0800 -Subject: [PATCH 0860/1224] Revert "thermal: brcmstb_thermal: Correct SoC name" +Subject: [PATCH 0860/1225] Revert "thermal: brcmstb_thermal: Correct SoC name" This reverts commit 6642a4f0769be5732fd372a5637fc1b01d62f93a. @@ -424588,10 +424588,10 @@ index 08f71fec51520..7a7c6ad7b8a04 100644 2.18.4 -From 247993420d0ea6159817ac5e0ca73d78c57e631d Mon Sep 17 00:00:00 2001 +From 1ffba4290759bceb5b8dc4f3288d1c50da6228d3 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2020 17:24:28 +0800 -Subject: [PATCH 0861/1224] Revert "thermal: brcmstb_thermal: Add BCM2838 +Subject: [PATCH 0861/1225] Revert "thermal: brcmstb_thermal: Add BCM2838 support" This reverts commit 9d62448adc918a94fba091d475d0e6f1648c36f4. @@ -424748,10 +424748,10 @@ index 7a7c6ad7b8a04..680f1a0706065 100644 2.18.4 -From cfb27b9abfa0b265567e537e1ffaebc22f123518 Mon Sep 17 00:00:00 2001 +From 9a1983ccac82d04d3c8b4a92da1a090806e334b5 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2020 17:39:30 +0800 -Subject: [PATCH 0862/1224] ARM: dts: bcm2711-rpi: Remove downstream thermal +Subject: [PATCH 0862/1225] ARM: dts: bcm2711-rpi: Remove downstream thermal sensor node Signed-off-by: Chen-Yu Tsai @@ -424795,10 +424795,10 @@ index 46bcfd586f173..05e51a05bf56c 100644 2.18.4 -From 841feeec2dd87ad0943b4b3892b35df341fb0354 Mon Sep 17 00:00:00 2001 +From 8a1f89118da75af49985008f2366bf21b0628825 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Fri, 15 May 2020 15:38:12 +0800 -Subject: [PATCH 0863/1224] configs: Switch to upstream thermal sensor for RPi +Subject: [PATCH 0863/1225] configs: Switch to upstream thermal sensor for RPi 4 - BCM2711_THERMAL Signed-off-by: Chen-Yu Tsai @@ -424851,10 +424851,10 @@ index 05d721c25d2d6..09d3180c9fd97 100644 2.18.4 -From 4b8b556bb5554234b2a53bc0e11182aab138f7fd Mon Sep 17 00:00:00 2001 +From fd022cca52b654939e00ebe555ef421fce4101b2 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Fri, 15 May 2020 15:56:14 +0800 -Subject: [PATCH 0864/1224] configs: Build HWMON core into kernel +Subject: [PATCH 0864/1225] configs: Build HWMON core into kernel To expose thermal regions as hwmon devices, the HWMON core has to be built-in, so that THERMAL_HWMON can be enabled. @@ -424932,10 +424932,10 @@ index 4b232432e240e..585a975caf2a9 100644 2.18.4 -From ab789c1f657d46b57bda137f7fcaeb0daaefc606 Mon Sep 17 00:00:00 2001 +From 20e4b5af6698212ba6b40b83dc46b39dbb016a49 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 May 2020 09:46:12 +0100 -Subject: [PATCH 0865/1224] brcmfmac: BCM43436 needs dedicated firmware +Subject: [PATCH 0865/1225] brcmfmac: BCM43436 needs dedicated firmware Signed-off-by: Phil Elwell --- @@ -424968,10 +424968,10 @@ index 0c9f5b5791e93..bc858aaaddf99 100644 2.18.4 -From 5620f1c3c973b276592cf122b0dcd64cacf72f36 Mon Sep 17 00:00:00 2001 +From e9f625fb5b584b80093631ee3c460ef8924f8b1c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 May 2020 14:41:13 +0100 -Subject: [PATCH 0866/1224] overlays: i2c-rtc: Fix trickle-resistor-ohms param +Subject: [PATCH 0866/1225] overlays: i2c-rtc: Fix trickle-resistor-ohms param The abx80x implementation of the trickle-resistor-ohms parameter is missing the ":0" indicating that the target is an integer/cell value. @@ -425000,10 +425000,10 @@ index 5df390b52a7bb..24c86974b0dbd 100644 2.18.4 -From 7c6b14123ea169bc8b53af3a0d9f204c2e64f5e5 Mon Sep 17 00:00:00 2001 +From 07e86785c4c50d90f2b76557c8dacef7b96d2445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 30 Apr 2020 19:40:07 +0200 -Subject: [PATCH 0867/1224] overlays: gpio-shutdown: Add information for SysV +Subject: [PATCH 0867/1225] overlays: gpio-shutdown: Add information for SysV init / inittab KeyboardSignal and kb::kbrequest can be used to call /sbin/shutdown @@ -425057,10 +425057,10 @@ index 0a9c9ec6cc8d0..2afd499b2808c 100644 2.18.4 -From 31eeca1fc158b0ec79aff5c5bc8639aa56aa212b Mon Sep 17 00:00:00 2001 +From 8e0b6b7e022ab961622bab51c5dd794bcfb05a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 30 Apr 2020 19:41:10 +0200 -Subject: [PATCH 0868/1224] overlays: gpio-shutdown: Add information for +Subject: [PATCH 0868/1225] overlays: gpio-shutdown: Add information for Raspberry Pi 1 Model B rev 1 Raspberry Pi 1 Model B rev 1 uses GPIO1 for power-up instead of GPIO3. @@ -425127,10 +425127,10 @@ index db07ba67781d7..0a27595143ec1 100644 2.18.4 -From 400749ed0469034037ade1217270d565397f762c Mon Sep 17 00:00:00 2001 +From 02a641253271208178835f1cf57b21dc851b6961 Mon Sep 17 00:00:00 2001 From: bjorn Date: Thu, 7 May 2020 05:11:43 +0200 -Subject: [PATCH 0869/1224] overlays: Add spi0 overlay to support sc16is752 +Subject: [PATCH 0869/1225] overlays: Add spi0 overlay to support sc16is752 Signed-off-by: Bjorn --- @@ -425225,10 +425225,10 @@ index 0000000000000..ccce7ad599bc1 2.18.4 -From ef7d364d3d8457c560b0fff3ddcabcdd1e15bed1 Mon Sep 17 00:00:00 2001 +From c9c150042bdd87bc7e328ed5313eda09d78da7a1 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 24 Nov 2019 16:40:48 -0600 -Subject: [PATCH 0870/1224] net: rtl8192cu: fix gcc misleading whitespace +Subject: [PATCH 0870/1225] net: rtl8192cu: fix gcc misleading whitespace warning This fixes a gcc warning about misleading whitespace. @@ -425274,10 +425274,10 @@ index 8fa8ed51b721c..bdd9c73cba3fc 100755 2.18.4 -From fee958551f67620712d804e61c28eee3fad0062e Mon Sep 17 00:00:00 2001 +From a56f385ac692dc854a89349749b341b008811a08 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 May 2020 16:55:12 +0100 -Subject: [PATCH 0871/1224] overlays: i2c-rtc-gpio: Fix trickle-resistor-ohms +Subject: [PATCH 0871/1225] overlays: i2c-rtc-gpio: Fix trickle-resistor-ohms param The abx80x implementation of the trickle-resistor-ohms parameter is @@ -425307,10 +425307,10 @@ index 44df77459520b..125bd77fff0a5 100644 2.18.4 -From 4a981599071e96fbfddaedd0c7754a61f9574cfc Mon Sep 17 00:00:00 2001 +From 5ae74f5ce486b66c0893231c39e9c1860b55a102 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Fri, 29 May 2020 14:36:56 +0100 -Subject: [PATCH 0872/1224] media: bcm2835-isp: fix bytes per line calculations +Subject: [PATCH 0872/1225] media: bcm2835-isp: fix bytes per line calculations for some image formats The bytes per line numbers calculated by get_bytesperline was not @@ -425395,10 +425395,10 @@ index af3bde152bb24..40ca0f6e9c979 100644 2.18.4 -From cecb739470867f64f822a48ce479abee80d9958f Mon Sep 17 00:00:00 2001 +From c24c479afe87e44a0d7989ecab0c7ef9e3bfac78 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 1 Jun 2020 07:02:00 -0400 -Subject: [PATCH 0873/1224] Add Micro Crystal RV-1805 to i2c-rtc overlays +Subject: [PATCH 0873/1225] Add Micro Crystal RV-1805 to i2c-rtc overlays While the RV-1805 is supported by the rtc-abx80x driver via auto-detection, in order for it to be initialized properly @@ -425572,10 +425572,10 @@ index 24c86974b0dbd..df59d93cd759b 100644 2.18.4 -From 6b3248ff3e0c6bd12f01309e32ce54fe24600f0f Mon Sep 17 00:00:00 2001 +From 333ee708fc47a662a6f5ba57ac133f8ee9ed78db Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 2 Jun 2020 10:06:05 +0100 -Subject: [PATCH 0874/1224] configs: Add SND_SOC_MAX98357A=m +Subject: [PATCH 0874/1225] configs: Add SND_SOC_MAX98357A=m Enable the MAX98357A driver. @@ -425662,10 +425662,10 @@ index 585a975caf2a9..c82e163a095c3 100644 2.18.4 -From 463702091e8da394e2589b70e09131b54ce68b90 Mon Sep 17 00:00:00 2001 +From 3f8ef0313dfbd619b106924173fef1043918c03d Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 2 Jun 2020 19:31:49 +0100 -Subject: [PATCH 0875/1224] vc4: Set driver_name for card +Subject: [PATCH 0875/1225] vc4: Set driver_name for card Allows use of the same alsa conf file for hdmi1 @@ -425690,10 +425690,10 @@ index 093f424ad5b46..4ba7add2737f7 100644 2.18.4 -From 32ecf707acb7e4d5a7fc84a624bba0cc1b5e1fcf Mon Sep 17 00:00:00 2001 +From b6c4b17c1d2154f3731580db6b351b1bf575e87c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Jun 2020 17:23:36 +0100 -Subject: [PATCH 0876/1224] staging: vchiq_arm: Use g_dma_dev for dma_unmap_sg +Subject: [PATCH 0876/1225] staging: vchiq_arm: Use g_dma_dev for dma_unmap_sg Commit "staging: vchiq_arm: Clean up 40-bit DMA support" failed to change one of the calls to dma_unmap_sg to pass in g_dma_dev (rather @@ -425723,10 +425723,10 @@ index d6a6ca9e06ec6..b396fed96f3fb 100644 2.18.4 -From f4366a9c24cc03887541df4661c2b84d09b4bba7 Mon Sep 17 00:00:00 2001 +From 61ada64e01ab982b50224c7952f4c322d83d06dd Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 3 Jun 2020 12:20:19 +0100 -Subject: [PATCH 0877/1224] vc4: cec: Restore cec physical address on reconnect +Subject: [PATCH 0877/1225] vc4: cec: Restore cec physical address on reconnect Currently we call cec_phys_addr_invalidate on a hotplug deassert. That may be due to a TV power cycling, or an AVR being switched @@ -425785,10 +425785,10 @@ index 4ba7add2737f7..5aa5236e576da 100644 2.18.4 -From 490e2bd65f6a8b91f43367a76692c45c86d386ae Mon Sep 17 00:00:00 2001 +From 1b56b9ee9dd5912688e4a3ba2d08dc23190ca847 Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Fri, 5 Jun 2020 09:22:49 +0000 -Subject: [PATCH 0878/1224] snd_bcm2835: disable HDMI audio when vc4 is used +Subject: [PATCH 0878/1225] snd_bcm2835: disable HDMI audio when vc4 is used (#3640) Things don't work too well when both the vc4 driver and the firmware @@ -425871,7 +425871,7 @@ index 134ad9ecbd4ab..935e9469e318a 100644 }; }; diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index 2f465dba54bfc..a53c39d1bbaa6 100644 +index f926784c622de..31968fec297f5 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -381,7 +381,9 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev) @@ -425889,10 +425889,10 @@ index 2f465dba54bfc..a53c39d1bbaa6 100644 2.18.4 -From ad8e7d6058fafbd387b54a703d839bed4f5d5c6b Mon Sep 17 00:00:00 2001 +From 3d3bfbd9dcee697235cbf97bc0fed79da4cae74d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jun 2020 16:06:59 +0100 -Subject: [PATCH 0879/1224] Revert "overlays: gpio-keys: Avoid open-drain +Subject: [PATCH 0879/1225] Revert "overlays: gpio-keys: Avoid open-drain warnings" This reverts commit 907e08e6e70dd557a1f5cd03ef28492ffebffb08. @@ -425917,10 +425917,10 @@ index def139db8bcb5..39e7bc5fa9d88 100644 2.18.4 -From 42915a3f695a39a2f566a2ce33fce7af27ccdf14 Mon Sep 17 00:00:00 2001 +From f4e396430eefbea754d9f71bfc94faad499e67e5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jun 2020 16:07:07 +0100 -Subject: [PATCH 0880/1224] overlays: i2c-gpio: Avoid open-drain warnings +Subject: [PATCH 0880/1225] overlays: i2c-gpio: Avoid open-drain warnings The i2c-gpio driver expects to use a GPIO in open-drain mode. Failure to configure it in that way causes alarming warnings in the kernel log. @@ -426020,10 +426020,10 @@ index 23813369093a7..227e3c0fa1cd2 100644 2.18.4 -From d65c2ad03176f2d8d08945ad0f8648276f123b0a Mon Sep 17 00:00:00 2001 +From ce2653c4842f113f4bc880c767e58ebb472b7cb3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jun 2020 16:18:52 +0100 -Subject: [PATCH 0881/1224] overlays: Update upstream overlays after +Subject: [PATCH 0881/1225] overlays: Update upstream overlays after vc4-kms-v3d change Signed-off-by: Phil Elwell @@ -426070,10 +426070,10 @@ index 428aa5dcc38f0..30130f09fbc66 100644 2.18.4 -From ff4d3f1d02f214184feb7964227f5db0e7716386 Mon Sep 17 00:00:00 2001 +From d3f060a3a6a255ba694942a78dcb433dd7b0a5c5 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:35:35 +0200 -Subject: [PATCH 0882/1224] w1_therm: adding code comments and code reordering +Subject: [PATCH 0882/1225] w1_therm: adding code comments and code reordering commit 92b8d2724464bc1d2e735a84c0da5741dce33485 upstream. @@ -426656,10 +426656,10 @@ index e028e00927991..1234916daaa8f 100644 2.18.4 -From 79ca31e822b6740d44b3c0ae1b017e17a92d0134 Mon Sep 17 00:00:00 2001 +From d068daeb8e00a91f60ab0a26dc7e0c1327dea230 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:36:10 +0200 -Subject: [PATCH 0883/1224] w1_therm: fix reset_select_slave during discovery +Subject: [PATCH 0883/1225] w1_therm: fix reset_select_slave during discovery commit c8ad65f6fbfdcb9b620674ef456020eef2bfeb36 upstream. @@ -426811,10 +426811,10 @@ index 1234916daaa8f..aa5678369c0b6 100644 2.18.4 -From 625c2bef572e96cd6a5f902ba328efa67aa0cd47 Mon Sep 17 00:00:00 2001 +From f13f5489e8a9e9da10eb2358559513ac95c9a239 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:36:50 +0200 -Subject: [PATCH 0884/1224] w1_therm: adding ext_power sysfs entry +Subject: [PATCH 0884/1225] w1_therm: adding ext_power sysfs entry commit b7bb6ca17a90f47c2fe2848531b5bbaf27a65ba7 upstream. @@ -427113,10 +427113,10 @@ index aa5678369c0b6..932a0738b52ad 100644 2.18.4 -From 067ff548bd8c8aacebee8a79364def2e0682ea7f Mon Sep 17 00:00:00 2001 +From 0bff0b430c05f32675108291ad7e643429bea167 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:37:08 +0200 -Subject: [PATCH 0885/1224] w1_therm: adding resolution sysfs entry +Subject: [PATCH 0885/1225] w1_therm: adding resolution sysfs entry commit 308bdb94de0c1abe7eac5193f58638b8aeaddf4b upstream. @@ -427834,10 +427834,10 @@ index 932a0738b52ad..7ab8a141ce6e4 100644 2.18.4 -From ee6e87ba0d44a1e29c970cf3d86bc71b36a8c00c Mon Sep 17 00:00:00 2001 +From d3963e4d368eac3b157e8f421fd248897797dde9 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:37:25 +0200 -Subject: [PATCH 0886/1224] w1_therm: adding eeprom sysfs entry +Subject: [PATCH 0886/1225] w1_therm: adding eeprom sysfs entry commit 45d457a4cf24455eefd076a01a3d86414fc2ff1e upstream. @@ -428214,10 +428214,10 @@ index 7ab8a141ce6e4..1ba07b0833fac 100644 2.18.4 -From 0bdb7e352b85011fd3ee1cdeacb7c96eda559c72 Mon Sep 17 00:00:00 2001 +From 6706b9f22c5f06082b7432c78a3a5cc3dcddce82 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:37:42 +0200 -Subject: [PATCH 0887/1224] w1_therm: optimizing temperature read timings +Subject: [PATCH 0887/1225] w1_therm: optimizing temperature read timings commit 67b392f7b8edfa6f427fecd98722acab34c1c99f upstream. @@ -428750,10 +428750,10 @@ index 1ba07b0833fac..5a81ce2a4e742 100644 2.18.4 -From ad7fe2fc822fcb095ee267a593f748b4735ea2cd Mon Sep 17 00:00:00 2001 +From f5507077ec47130abc715fc9a9f487f8e93b00bd Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:38:01 +0200 -Subject: [PATCH 0888/1224] w1_therm: adding alarm sysfs entry +Subject: [PATCH 0888/1225] w1_therm: adding alarm sysfs entry commit e2c94d6f572079511945e64537eb1218643f2e68 upstream. @@ -429077,10 +429077,10 @@ index 5a81ce2a4e742..825536196e610 100644 2.18.4 -From 869ed1774dfba5457d322a4e483eaf2b4292542c Mon Sep 17 00:00:00 2001 +From d066f3e0a70b161f93f389dd2f836e3fa25e3724 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:38:20 +0200 -Subject: [PATCH 0889/1224] w1_therm: adding bulk read support to trigger +Subject: [PATCH 0889/1225] w1_therm: adding bulk read support to trigger multiple conversion on bus commit 57c76221d5af648c8355a55c09b050c5d8d38189 upstream. @@ -429674,10 +429674,10 @@ index 825536196e610..cc4b88056b338 100644 2.18.4 -From 025cdcd8b0775ec1867d1c64e3387cb1aa0fe9a1 Mon Sep 17 00:00:00 2001 +From 9d572aac9b362b9996b69675ba0decf6a7be0bab Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 20 May 2020 15:00:19 +0300 -Subject: [PATCH 0890/1224] w1_therm: Free the correct variable +Subject: [PATCH 0890/1225] w1_therm: Free the correct variable commit e420637b81f78d0fbacf539bdb1b341eba602aea upstream. @@ -429721,10 +429721,10 @@ index cc4b88056b338..a6c85e4866719 100644 2.18.4 -From c9ab44d95b8cc611f2c989541a0b23e39035fa9c Mon Sep 17 00:00:00 2001 +From 7e41ec451b25413f8bfd89b9f955f4f4143290b5 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Tue, 19 May 2020 16:45:53 +0100 -Subject: [PATCH 0891/1224] w1_therm: remove redundant assignments to variable +Subject: [PATCH 0891/1225] w1_therm: remove redundant assignments to variable ret commit f37d13d52c0560bd2bac40b22466af538e61a5ce upstream. @@ -429785,10 +429785,10 @@ index a6c85e4866719..c1b4eda167193 100644 2.18.4 -From a914beb4d189a51f42d629ef0718f7ceb3282940 Mon Sep 17 00:00:00 2001 +From d0170b8456418c2685421ffae80ceb83ea2f6762 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 May 2020 19:20:20 +0200 -Subject: [PATCH 0892/1224] PCI: brcmstb: Assert fundamental reset on +Subject: [PATCH 0892/1225] PCI: brcmstb: Assert fundamental reset on initialization commit 22e21e51ce755399fd42055a3f668ee4af370881 upstream. @@ -429824,10 +429824,10 @@ index 3a10e678c7f47..9e452c366b263 100644 2.18.4 -From 64772c15b1d6a52ae7b807a37bb865c4210e17dc Mon Sep 17 00:00:00 2001 +From acabfa7f18d0ed88beac09c25e85a444b9fc17d8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 10 Jun 2020 16:28:56 +0200 -Subject: [PATCH 0893/1224] clk: rpi: Adjust DT binding to match upstream +Subject: [PATCH 0893/1225] clk: rpi: Adjust DT binding to match upstream Signed-off-by: Maxime Ripard --- @@ -430039,10 +430039,10 @@ index eb1844148af96..c4929416b6d5c 100644 2.18.4 -From 59fd6765177bb06131e546c3319bd0a534d00e5d Mon Sep 17 00:00:00 2001 +From f413cd4ebc779efdf547a3a8bbf777c12b242725 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 26 May 2020 14:23:04 +0200 -Subject: [PATCH 0894/1224] clk: bcm: rpi: Add an enum for the firmware clocks +Subject: [PATCH 0894/1225] clk: bcm: rpi: Add an enum for the firmware clocks While the firmware allows us to discover the available clocks, we need to discriminate those clocks to only register the ones meaningful to Linux. @@ -430125,10 +430125,10 @@ index c4929416b6d5c..c21d8c7de439e 100644 2.18.4 -From 1859246d57ccb72ebc9f14c55baac1114f5142f4 Mon Sep 17 00:00:00 2001 +From ee6adcdccca1dbb2a7111fde3e298b1f5c40a0b8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 27 May 2020 11:13:52 +0200 -Subject: [PATCH 0895/1224] clk: bcm: rpi: Use CCF boundaries instead of +Subject: [PATCH 0895/1225] clk: bcm: rpi: Use CCF boundaries instead of rolling our own The raspberrypi firmware clock driver has a min_rate / max_rate clamping by @@ -430265,10 +430265,10 @@ index c21d8c7de439e..70574c937b68f 100644 2.18.4 -From 28cb66bf39cc11f730f596d9e1dc4beae63efc32 Mon Sep 17 00:00:00 2001 +From e4ed2cb38fbb1b244e254a41b187b130c5c72692 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 26 May 2020 14:30:31 +0200 -Subject: [PATCH 0896/1224] clk: bcm: rpi: Give firmware clocks a name +Subject: [PATCH 0896/1225] clk: bcm: rpi: Give firmware clocks a name We've registered the firmware clocks using their ID as name, but it's much more convenient to register them using their proper name. Since the @@ -430323,10 +430323,10 @@ index 70574c937b68f..4f7fe01c1b3b0 100644 2.18.4 -From eaa0478f69ff601eb9f86ee3f38b2698dd9dc394 Mon Sep 17 00:00:00 2001 +From f3aacfab63b1c03e112205fa68f3ae2dfb4072a5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 26 May 2020 15:27:35 +0200 -Subject: [PATCH 0897/1224] clk: bcm: rpi: Remove the quirks for the CPU clock +Subject: [PATCH 0897/1225] clk: bcm: rpi: Remove the quirks for the CPU clock The CPU clock has had so far a bunch of quirks to expose the clock tree properly, but since we reverted to exposing them through the MMIO driver, @@ -430536,10 +430536,10 @@ index 4f7fe01c1b3b0..c87e3ee58e4ba 100644 2.18.4 -From 9b36cb02b26676f3fe9363703a8dd90fb4cccfef Mon Sep 17 00:00:00 2001 +From 7f626e2c18be7f33b029e3641158a2ab13459803 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 10 Jun 2020 16:18:17 +0200 -Subject: [PATCH 0898/1224] clk: rpi: Only register a few firmware clocks +Subject: [PATCH 0898/1225] clk: rpi: Only register a few firmware clocks Signed-off-by: Maxime Ripard --- @@ -430586,10 +430586,10 @@ index c87e3ee58e4ba..642622fb77ea4 100644 2.18.4 -From 3f982241896d1bc6defd8928d7417e8d062f61ea Mon Sep 17 00:00:00 2001 +From 0a304152a609db45b3b1ea9589ba1a0b237d3a70 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 10 Jun 2020 16:29:08 +0200 -Subject: [PATCH 0899/1224] clk: rpi: Fix compatible indentation +Subject: [PATCH 0899/1225] clk: rpi: Fix compatible indentation Signed-off-by: Maxime Ripard --- @@ -430615,10 +430615,10 @@ index 642622fb77ea4..cb87980b468e5 100644 2.18.4 -From b0f7255fa8ffce44e9f0f89ec8cee4c8d29e7178 Mon Sep 17 00:00:00 2001 +From 2b814db332a5135c10a674f829d4f009a9c7f80d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 16:34:00 +0100 -Subject: [PATCH 0900/1224] SQUASH: dts: Fix firmware clocks support +Subject: [PATCH 0900/1225] SQUASH: dts: Fix firmware clocks support Commit [1] touched a lot of files and still missed some platforms. In particular, Pi 2 was left with no clock scaling. Simplify the @@ -430817,10 +430817,10 @@ index 73e1290616e4f..925cb37c22f06 100644 2.18.4 -From 4c255fee385ddd23c09221d0ce16bbe81699f356 Mon Sep 17 00:00:00 2001 +From 2a01b9c40f9f5859f636bab7c729349670d62040 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 2 Jun 2020 17:19:51 +0100 -Subject: [PATCH 0901/1224] ARM: dts: Add bcm2711-rpi-cm4.dts +Subject: [PATCH 0901/1225] ARM: dts: Add bcm2711-rpi-cm4.dts Add initial DTS file for Compute Module 4. @@ -431459,10 +431459,10 @@ index 3c38fbe718863..073d7dadcc95a 100644 2.18.4 -From 281972743de0c56d8dafa7e48b377cf3d0aa8f4e Mon Sep 17 00:00:00 2001 +From 760f3f091a14a8413587baef364d1e45704c5a72 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 09:57:03 +0100 -Subject: [PATCH 0902/1224] PCI: brcmstb: Add DT property to control L1SS +Subject: [PATCH 0902/1225] 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. @@ -431544,10 +431544,10 @@ index 9e452c366b263..1e0a94778856a 100644 2.18.4 -From a8448ebe43421e79a9c190903cd4cfb81c919bd7 Mon Sep 17 00:00:00 2001 +From 5919f88963866802ff2707dca23ce0737a38aa80 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 11:22:38 +0100 -Subject: [PATCH 0903/1224] ARM: dts: Set brcm,enable-l1ss for CM4 +Subject: [PATCH 0903/1225] ARM: dts: Set brcm,enable-l1ss for CM4 Enable the PCIE L1SS on Compute Module 4. It's possible that this is also the right thing to do for Pi 4, but it has been working as is @@ -431577,10 +431577,10 @@ index f616d3f23f14b..2ea54b92fbcab 100644 2.18.4 -From 705466e7bcbb19e0363a47a786a5e4fff7ae6009 Mon Sep 17 00:00:00 2001 +From aebbc406b7f02821a4a280c45bc2015e4d100ca2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 16 Jun 2020 10:23:42 +0100 -Subject: [PATCH 0904/1224] Revert "spi: spi-bcm2835: Re-enable HW CS" +Subject: [PATCH 0904/1225] Revert "spi: spi-bcm2835: Re-enable HW CS" This reverts commit 49b9bd89784e3fa29f143ebf1ac8f125be47b708. @@ -431665,10 +431665,10 @@ index 7ac3563f458b1..7b5216461bc4b 100644 2.18.4 -From 4beed2cc388f943252ad068da242edf90bc0746d Mon Sep 17 00:00:00 2001 +From 5a763f372999dd8239f67266559e62d3379c95cb Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:24:31 +0200 -Subject: [PATCH 0905/1224] media: irs1125: Using i2c_transfer for ic2 reads +Subject: [PATCH 0905/1225] 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. @@ -431736,10 +431736,10 @@ index 25e1dd5a08efa..6680afea58947 100644 2.18.4 -From 0cf7ecbe691666e0b89606f035ececbe5f4f47c2 Mon Sep 17 00:00:00 2001 +From 67048ba011638186f66777478df617737abe69d1 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:27:42 +0200 -Subject: [PATCH 0906/1224] media: irs1125: Refactoring and debug messages +Subject: [PATCH 0906/1225] media: irs1125: Refactoring and debug messages Changed some variable names to comply with checkpatch --strict mode. Debug messages added. @@ -431865,10 +431865,10 @@ index 6680afea58947..289f0c25b1414 100644 2.18.4 -From dbf4138cb119589ca3098dd40a92b576f6f18663 Mon Sep 17 00:00:00 2001 +From ba42f4ae090d2e98756e87085ce4ff4afbc78d48 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:31:36 +0200 -Subject: [PATCH 0907/1224] media: irs1125: Atomic access to imager +Subject: [PATCH 0907/1225] media: irs1125: Atomic access to imager reconfiguration Instead of changing the exposure and framerate settings for all sequences, @@ -432254,10 +432254,10 @@ index dccaca23aa76a..96d676123d5ed 100644 2.18.4 -From add4f87cf329796075dfd41b1cd3c586e10d16c1 Mon Sep 17 00:00:00 2001 +From 5ae6d26fd4a48b64d5b78e04007c2ef11f6caf47 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:33:56 +0200 -Subject: [PATCH 0908/1224] media: irs1125: Keep HW in sync after imager reset +Subject: [PATCH 0908/1225] 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 @@ -432441,10 +432441,10 @@ index d59e05004a037..30c3d26403865 100644 2.18.4 -From 06e436c0d5c991df8c1f01e1690de143a51ef702 Mon Sep 17 00:00:00 2001 +From 2a56bd53ace87c713c02add1bd56bd2c04b26330 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sat, 20 Jun 2020 15:40:00 +0300 -Subject: [PATCH 0909/1224] staging: bcm2835-audio: Add missing MODULE_ALIAS +Subject: [PATCH 0909/1225] 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 @@ -432465,7 +432465,7 @@ Signed-off-by: Maxim Mikityanskiy 1 file changed, 1 insertion(+) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index a53c39d1bbaa6..b9716f3e264c6 100644 +index 31968fec297f5..a0cba3823e5ef 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -438,3 +438,4 @@ module_platform_driver(bcm2835_alsa_driver); @@ -432477,10 +432477,10 @@ index a53c39d1bbaa6..b9716f3e264c6 100644 2.18.4 -From 4099b10ff0d4897ee3fbb575dc6840bbb963864b Mon Sep 17 00:00:00 2001 +From ee885613284fec7284b34974b5a77935e5f38aa1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 26 Jun 2020 11:51:05 +0100 -Subject: [PATCH 0910/1224] brcmfmac: Prefer a ccode from OTP over nvram file +Subject: [PATCH 0910/1225] 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. @@ -432614,10 +432614,10 @@ index 3aed4c4b887aa..a926c466706f0 100644 2.18.4 -From f262abc6cc656bf35d315a350695416fc7a1be73 Mon Sep 17 00:00:00 2001 +From 4fe191d4479dcb6be352166dcf5f7d705d264356 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:36 +0200 -Subject: [PATCH 0911/1224] media: v4l2-subdev: Introduce [get|set]_mbus_config +Subject: [PATCH 0911/1225] media: v4l2-subdev: Introduce [get|set]_mbus_config pad ops Upstream https://patchwork.linuxtv.org/patch/64669/ @@ -432683,10 +432683,10 @@ index 71f1f2f0da536..ab736577b882f 100644 2.18.4 -From f24b127e60234b30b2f3e9133c428aedfab39b58 Mon Sep 17 00:00:00 2001 +From f1d54ffb50a2b42fcbeaee26b247da8436523e6a Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:37 +0200 -Subject: [PATCH 0912/1224] media: i2c: Use the new get_mbus_config pad op +Subject: [PATCH 0912/1225] media: i2c: Use the new get_mbus_config pad op Upstream https://patchwork.linuxtv.org/patch/64669/ @@ -432936,10 +432936,10 @@ index edad49cebcdf6..8ffff67ce2b7c 100644 2.18.4 -From 4fcd300f2139ee32293bcbec550f36c2a350377f Mon Sep 17 00:00:00 2001 +From b547bbce6a7ff05928e1c12cd08ce0cc9316eca3 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:38 +0200 -Subject: [PATCH 0913/1224] media: i2c: ov6650: Use new [get|set]_mbus_config +Subject: [PATCH 0913/1225] media: i2c: ov6650: Use new [get|set]_mbus_config ops Upstream https://patchwork.linuxtv.org/patch/64674/ @@ -433076,10 +433076,10 @@ index af482620f94a6..704064728f55b 100644 2.18.4 -From 70d1c8084836b962d2c08721a6a830c8003dfd7c Mon Sep 17 00:00:00 2001 +From 538decc5094f2ebf24c07eabe5f381058139ea68 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:39 +0200 -Subject: [PATCH 0914/1224] media: pxa_camera: Use the new set_mbus_config op +Subject: [PATCH 0914/1225] media: pxa_camera: Use the new set_mbus_config op Upstream https://patchwork.linuxtv.org/patch/64671/ @@ -433120,7 +433120,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 51 insertions(+), 138 deletions(-) diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c -index 8d47ea0c33f84..1200d9991b181 100644 +index 6e04e3ec61bac..b99bdfe8402c1 100644 --- a/drivers/media/platform/pxa_camera.c +++ b/drivers/media/platform/pxa_camera.c @@ -605,42 +605,6 @@ static const struct pxa_mbus_pixelfmt *pxa_mbus_get_fmtdesc( @@ -433198,7 +433198,7 @@ index 8d47ea0c33f84..1200d9991b181 100644 static void pxa_camera_setup_cicr(struct pxa_camera_dev *pcdev, unsigned long flags, __u32 pixfmt) { -@@ -1598,99 +1537,78 @@ static int pxa_camera_init_videobuf2(struct pxa_camera_dev *pcdev) +@@ -1601,99 +1540,78 @@ static int pxa_camera_init_videobuf2(struct pxa_camera_dev *pcdev) */ static int pxa_camera_set_bus_param(struct pxa_camera_dev *pcdev) { @@ -433349,7 +433349,7 @@ index 8d47ea0c33f84..1200d9991b181 100644 } static const struct pxa_mbus_pixelfmt pxa_camera_formats[] = { -@@ -1738,11 +1656,6 @@ static int pxa_camera_get_formats(struct v4l2_device *v4l2_dev, +@@ -1741,11 +1659,6 @@ static int pxa_camera_get_formats(struct v4l2_device *v4l2_dev, return 0; } @@ -433365,10 +433365,10 @@ index 8d47ea0c33f84..1200d9991b181 100644 2.18.4 -From 055f5661b04609be1f6468181e8c2871f1a8d0ed Mon Sep 17 00:00:00 2001 +From 85593725fd66b476c2f95de0d02bee1f7ec4548e Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:40 +0200 -Subject: [PATCH 0915/1224] media: v4l2-subdev: Remove [s|g]_mbus_config video +Subject: [PATCH 0915/1225] media: v4l2-subdev: Remove [s|g]_mbus_config video ops Upstream https://patchwork.linuxtv.org/patch/64670/ @@ -433414,10 +433414,10 @@ index ab736577b882f..d5225239f3165 100644 2.18.4 -From 727b7b3fa1faefaf26d285369505d5a071770655 Mon Sep 17 00:00:00 2001 +From 3c99fa226c6d2a3eec2ef3ec12e755d371a87e83 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:41 +0200 -Subject: [PATCH 0916/1224] staging: media: imx: Update TODO entry +Subject: [PATCH 0916/1225] staging: media: imx: Update TODO entry Upstream https://patchwork.linuxtv.org/patch/64672/ @@ -433448,10 +433448,10 @@ index 6f29b5ca5324c..64c6ba5945ca3 100644 2.18.4 -From 76fac623615ca880e5869ce15617caa121de0978 Mon Sep 17 00:00:00 2001 +From c3b6c2183a5eddebaa3c95548339f4a3be4b5eda Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:42 +0200 -Subject: [PATCH 0917/1224] media: i2c: adv748x: Adjust TXA data lanes number +Subject: [PATCH 0917/1225] media: i2c: adv748x: Adjust TXA data lanes number MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -433579,10 +433579,10 @@ index fccb388ce179f..1061f425ece59 100644 2.18.4 -From f86a248c0f4ec0a6cee096fba96beeac2df1f36b Mon Sep 17 00:00:00 2001 +From 471d4a1c47d2006c8c3f184851907ee7ac5375ca Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:43 +0200 -Subject: [PATCH 0918/1224] media: i2c: adv748x: Implement get_mbus_config +Subject: [PATCH 0918/1225] media: i2c: adv748x: Implement get_mbus_config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -433648,10 +433648,10 @@ index 2091cda509356..99bb63d05eef1 100644 2.18.4 -From 051677cb0201348f3e201cb9198c87adc434f97e Mon Sep 17 00:00:00 2001 +From 3a4fa4a8519db5b192f184cd9cdf83ae5293e1fd Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:44 +0200 -Subject: [PATCH 0919/1224] media: rcar-csi2: Negotiate data lanes number +Subject: [PATCH 0919/1225] media: rcar-csi2: Negotiate data lanes number Upstream https://patchwork.linuxtv.org/patch/64675/ @@ -433813,10 +433813,10 @@ index d27eccfa57cae..7a1f397d4fc37 100644 2.18.4 -From c268f7384fcdd08f8a5ca0d41e3665750eb8dcee Mon Sep 17 00:00:00 2001 +From f0a37726ea54c3675a4ad6a2d8241e1b2fab4788 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 10:05:57 +0100 -Subject: [PATCH 0920/1224] drivers: media: Remove the downstream version of +Subject: [PATCH 0920/1225] drivers: media: Remove the downstream version of bcm2835-unicam About to be replaced by the upstream version. @@ -437004,10 +437004,10 @@ index ae059a171d0fe..0000000000000 2.18.4 -From ffe0f68b5b41513b970f1edd6e9174e439492f7d Mon Sep 17 00:00:00 2001 +From 3f4d125ab1fc9953136c48a991d0621d4d079d7c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 10:35:24 +0100 -Subject: [PATCH 0921/1224] include: media: Add vfl_devnode_type of +Subject: [PATCH 0921/1225] include: media: Add vfl_devnode_type of VFL_TYPE_VIDEO Upsstream are renaming VFL_TYPE_GRABBER to VFL_TYPE_VIDEO. @@ -437035,10 +437035,10 @@ index 8f2befe9c905e..4cc362a79c7c7 100644 2.18.4 -From e2b513be8c68155b93c23f98cf4caf35286b58fd Mon Sep 17 00:00:00 2001 +From 664989c011bbd3dc7a1d6e67b03266fca486dd82 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 4 May 2020 12:25:41 +0300 -Subject: [PATCH 0922/1224] media: bcm2835-unicam: Driver for CCP2/CSI2 camera +Subject: [PATCH 0922/1225] media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface Add a driver for the Unicam camera receiver block on BCM283x processors. @@ -440203,10 +440203,10 @@ index 0000000000000..ae059a171d0fe 2.18.4 -From c54ea4bcf0b56809cbbb7efd48741dd161cb4f56 Mon Sep 17 00:00:00 2001 +From 680ea9142488dd05937acaa6a65f0adc60636300 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 14:32:51 +0100 -Subject: [PATCH 0923/1224] media: bcm2835-unicam: Add support for +Subject: [PATCH 0923/1225] 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 @@ -440265,10 +440265,10 @@ index 2e9387cbc1e05..9adfb2d217af1 100644 2.18.4 -From b7b1be8b463b7c4b5a6a0b77771e9b4be43dc6d4 Mon Sep 17 00:00:00 2001 +From cd88a7fccc972c87e1eb9a2636c0ef89aefd1430 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 May 2020 18:28:27 +0100 -Subject: [PATCH 0924/1224] media: bcm2835-unicam: Always service interrupts +Subject: [PATCH 0924/1225] 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 @@ -440322,10 +440322,10 @@ index 9adfb2d217af1..9c0b9375572d1 100644 2.18.4 -From c4c0696cdee347a712e0b1273630d4905f4d216a Mon Sep 17 00:00:00 2001 +From 3660fa14df77628ebece16e6e799db0fc1958142 Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:33:31 +0200 -Subject: [PATCH 0925/1224] media: bcm2835: unicam: Fix uninitialized warning +Subject: [PATCH 0925/1225] media: bcm2835: unicam: Fix uninitialized warning Signed-off-by: Jacko Dirks --- @@ -440349,10 +440349,10 @@ index 9c0b9375572d1..7906c2813a700 100644 2.18.4 -From 0b31e31e7331acea15026153894c812ff0f47ac9 Mon Sep 17 00:00:00 2001 +From 3e913c6708e5576e58eed42ef3f9cb15fbf0b54b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 15:14:05 +0100 -Subject: [PATCH 0926/1224] media: bcm2835-unicam: Fixup review comments from +Subject: [PATCH 0926/1225] media: bcm2835-unicam: Fixup review comments from Hans. Updates the driver based on the upstream review comments from @@ -440599,10 +440599,10 @@ index 7906c2813a700..94e08ae92c1f6 100644 2.18.4 -From ba7872adcb7e898f781a03e5dd6624f8d795119e Mon Sep 17 00:00:00 2001 +From aade5af3d061673ee7043353202fe278a337d460 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 11:46:47 +0100 -Subject: [PATCH 0927/1224] media: bcm2835-unicam: Retain packing information +Subject: [PATCH 0927/1225] media: bcm2835-unicam: Retain packing information on G_FMT The change to retrieve the pixel format always on g_fmt didn't @@ -440653,10 +440653,10 @@ index 94e08ae92c1f6..96c0b9fea9423 100644 2.18.4 -From d090f244ae12e31816095aca850669854361c6ab Mon Sep 17 00:00:00 2001 +From 35855f1690f991c885cc386e1e102feab7143edf Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 28 May 2020 11:09:48 +0100 -Subject: [PATCH 0928/1224] media: bcm2835-unicam: change minimum number of +Subject: [PATCH 0928/1225] 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 @@ -440687,10 +440687,10 @@ index 96c0b9fea9423..f2cd2083bbd42 100644 2.18.4 -From 872ef7c4fa913769035655c47353a9ca239ec403 Mon Sep 17 00:00:00 2001 +From d2954d511b987b0d882a47912c277880f1950f9d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 15:41:42 +0100 -Subject: [PATCH 0929/1224] dt/dtoverlays: Fix up base DT and overlays for +Subject: [PATCH 0929/1225] dt/dtoverlays: Fix up base DT and overlays for updated Unicam driver The upstreamed Unicam driver uses a dt property to denote how many @@ -440853,10 +440853,10 @@ index 2ea99cd9e1a1e..a1f8af36d2e74 100644 2.18.4 -From a697eb62f2662cf6b8c043b7e751545ad5b31594 Mon Sep 17 00:00:00 2001 +From 8d3f006dc2b80349bd6d802984ce904070e76a7c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Jun 2020 15:53:44 +0100 -Subject: [PATCH 0930/1224] media: bcm2835-unicam: Avoid gcc warning over {0} +Subject: [PATCH 0930/1225] media: bcm2835-unicam: Avoid gcc warning over {0} on endpoint Older gcc versions object to = { 0 } initialisation if the first @@ -440886,10 +440886,10 @@ index f2cd2083bbd42..f70167d271fe6 100644 2.18.4 -From 997f35860618d4454b847702f096074ca513a597 Mon Sep 17 00:00:00 2001 +From 80a9416a5659dd6852b03c32d24f6c77f8e54ca0 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 4 Oct 2019 13:05:24 -0300 -Subject: [PATCH 0931/1224] media: dt-bindings: media: i2c: Add IMX290 CMOS +Subject: [PATCH 0931/1225] media: dt-bindings: media: i2c: Add IMX290 CMOS sensor binding Commit 8a97a4676f8b1badcd9cfbed2b081342847bb1b1 upstream. @@ -440993,10 +440993,10 @@ index d744087f13a70..1543a5147d221 100644 2.18.4 -From e8d3f6ca451f5a568eba9fc1a524a8a051a16d8f Mon Sep 17 00:00:00 2001 +From 37f44f71dd578b81b004b2408bd6f0f3134a584d Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 4 Oct 2019 13:05:25 -0300 -Subject: [PATCH 0932/1224] media: i2c: Add IMX290 CMOS image sensor driver +Subject: [PATCH 0932/1225] media: i2c: Add IMX290 CMOS image sensor driver Commit 828dbc299278065b634e913d2700d254a3224853 upstream. @@ -441943,10 +441943,10 @@ index 0000000000000..f7678e5a5d879 2.18.4 -From 6751583c84147bac6edb44e5b7c2bc011da298f8 Mon Sep 17 00:00:00 2001 +From 4c4ca0a873f7119e03b0162b10cdc07c79df151f Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:46 +0200 -Subject: [PATCH 0933/1224] media: i2c: imx290: set the format before +Subject: [PATCH 0933/1225] media: i2c: imx290: set the format before VIDIOC_SUBDEV_G_FMT is called Commit d46cfdc86c30d5ec768924f0b1e2683c8d20b671 upstream. @@ -441999,10 +441999,10 @@ index f7678e5a5d879..2d8c38ffe2f07 100644 2.18.4 -From c25cfba04e7bc7040d83c696fd71c4dd9dc3c191 Mon Sep 17 00:00:00 2001 +From 3c17f099ead584a5a5a31512f21ad4f8b2c267bc Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:47 +0200 -Subject: [PATCH 0934/1224] media: i2c: imx290: fix the order of the args in +Subject: [PATCH 0934/1225] media: i2c: imx290: fix the order of the args in SET_RUNTIME_PM_OPS() Commit 8d2d1bedb1b9af3e0c039a4444858da7b6da71f8 upstream. @@ -442035,10 +442035,10 @@ index 2d8c38ffe2f07..d0322f9a88562 100644 2.18.4 -From 38daad2e6fd3e37ac9b067bf72d8deb897da28de Mon Sep 17 00:00:00 2001 +From 83b28d7277a3d3e6ef1a76bd5bf4cd299a1dc870 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:48 +0200 -Subject: [PATCH 0935/1224] media: i2c: imx290: fix reset GPIO pin handling +Subject: [PATCH 0935/1225] media: i2c: imx290: fix reset GPIO pin handling Commit 3909a92d7df622b41b9ceeeea694e641cad7667b upstream. @@ -442102,10 +442102,10 @@ index d0322f9a88562..7b1de1f0c8b74 100644 2.18.4 -From bf93abaaff79d636dc2a3b01792676c8a03c61d3 Mon Sep 17 00:00:00 2001 +From bb1136659a5cebf52530f08fb7d83545a2017196 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:49 +0200 -Subject: [PATCH 0936/1224] media: i2c: imx290: Add support for 2 data lanes +Subject: [PATCH 0936/1225] media: i2c: imx290: Add support for 2 data lanes Commit 97589ad61c730e0f486635c6c19fa25ab8e8f29d upstream. @@ -442422,10 +442422,10 @@ index 7b1de1f0c8b74..ffb393962ffc5 100644 2.18.4 -From 400f813f574e974102af121300f0ae554de71acc Mon Sep 17 00:00:00 2001 +From b507f8a3855c8293e3bebc901eb410a1852e1f94 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:50 +0200 -Subject: [PATCH 0937/1224] media: i2c: imx290: Add configurable link frequency +Subject: [PATCH 0937/1225] media: i2c: imx290: Add configurable link frequency and pixel rate Commit 98e0500eadb772e1be32d8e369fcc3b7bcac93ed upstream. @@ -442734,10 +442734,10 @@ index ffb393962ffc5..152b65cb7cbc1 100644 2.18.4 -From a557fd935d5bf65ededc9ff93ab363c29c7dc0bc Mon Sep 17 00:00:00 2001 +From 70ef71da35bbcc78fa1e544e4c2c5cb627b4bf35 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:51 +0200 -Subject: [PATCH 0938/1224] media: i2c: imx290: Add support for test pattern +Subject: [PATCH 0938/1225] media: i2c: imx290: Add support for test pattern generation Commit a58df1f9e4885eaf3d0663574a217e513821a9f0 upstream. @@ -442850,10 +442850,10 @@ index 152b65cb7cbc1..67725a5aabd36 100644 2.18.4 -From 8da32382e0d22937065ac7627358dfc89f0ad4c5 Mon Sep 17 00:00:00 2001 +From 38e0c52cc6a013e2d869eb183f09893d18876973 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:52 +0200 -Subject: [PATCH 0939/1224] media: i2c: imx290: Add RAW12 mode support +Subject: [PATCH 0939/1225] media: i2c: imx290: Add RAW12 mode support Commit c566ac01ceaa02450acc155201772c0623530e76 upstream. @@ -442965,10 +442965,10 @@ index 67725a5aabd36..c654a9a8fb081 100644 2.18.4 -From a48f3ceefd86f921a51acd649300e135b5a101ce Mon Sep 17 00:00:00 2001 +From 3d1790369f9f24d1d93928cea83d4b45bb9fa2e2 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:53 +0200 -Subject: [PATCH 0940/1224] media: i2c: imx290: Add support to enumerate all +Subject: [PATCH 0940/1225] media: i2c: imx290: Add support to enumerate all frame sizes Commit 3b867fb641d884b714fba390ae866714ba475f29 upstream. @@ -443029,10 +443029,10 @@ index c654a9a8fb081..fd147fac5ef2e 100644 2.18.4 -From 48ec2295a590d233c43f3fae2d9840ebc4a0eea2 Mon Sep 17 00:00:00 2001 +From d26ab0e91b51fa49ba90630c42bfd7811e4c7abb Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:54 +0200 -Subject: [PATCH 0941/1224] media: i2c: imx290: Move the settle time delay out +Subject: [PATCH 0941/1225] media: i2c: imx290: Move the settle time delay out of loop Commit 6544af9b04b4484867c234ba0be1b5008e4a14ee upstream. @@ -443072,10 +443072,10 @@ index fd147fac5ef2e..02001c1b0dfcf 100644 2.18.4 -From fe81cba249b9ffc09f47e4a3a9bbaf9819c59ad5 Mon Sep 17 00:00:00 2001 +From e1d217036e8a5051ba9ebb6f71e0ae97acdb047d Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:55 +0200 -Subject: [PATCH 0942/1224] media: i2c: imx290: set bus_type before calling +Subject: [PATCH 0942/1225] media: i2c: imx290: set bus_type before calling v4l2_fwnode_endpoint_alloc_parse() Commit a270675875829b6d46eb9e38960fd6019555ebb8 upstream. @@ -443215,10 +443215,10 @@ index 02001c1b0dfcf..9c97830164e97 100644 2.18.4 -From df6e1404d86ca004140f11b6b35b4128903056a4 Mon Sep 17 00:00:00 2001 +From 9e96af150b075df76a2755dfcb0ca97233f00554 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 08:28:51 +0100 -Subject: [PATCH 0943/1224] media: i2c: imx290: Add support for 74.25MHz clock +Subject: [PATCH 0943/1225] 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. @@ -443485,10 +443485,10 @@ index 9c97830164e97..656716fea44b3 100644 2.18.4 -From 850555c62c025d5d81a887674aea5c65bc207595 Mon Sep 17 00:00:00 2001 +From 5d2818839ea644fa5de109b97727f54d72233a08 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 13:41:43 +0100 -Subject: [PATCH 0944/1224] media: i2c: imx290: Correct range for V4L2_CID_GAIN +Subject: [PATCH 0944/1225] 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 @@ -443517,10 +443517,10 @@ index 656716fea44b3..e7eecbea9bb07 100644 2.18.4 -From d2c062cf0340339316e6f8c4e407e4eb390e3512 Mon Sep 17 00:00:00 2001 +From 63a41728e8d4f3d1736a949c9b23cd50dcd7f9ef Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 14:36:40 +0100 -Subject: [PATCH 0945/1224] media: i2c: imx290: Convert HMAX setting into +Subject: [PATCH 0945/1225] media: i2c: imx290: Convert HMAX setting into V4L2_CID_HBLANK Userspace needs to know HBLANK if it is to work out exposure times @@ -443682,10 +443682,10 @@ index e7eecbea9bb07..876ad590102be 100644 2.18.4 -From 590ea5594e35fd21f0095d3c6dc56103bb822cc3 Mon Sep 17 00:00:00 2001 +From 2bfb1b433c5cf7c4fbc43d4c357df500f0db395d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:09:12 +0100 -Subject: [PATCH 0946/1224] media: i2c: imx290: Add support for V4L2_CID_VBLANK +Subject: [PATCH 0946/1225] 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, @@ -443829,10 +443829,10 @@ index 876ad590102be..ea0559e8dcc95 100644 2.18.4 -From 2f8770e52aebf17bf72c9c046bfc7686229b9e3c Mon Sep 17 00:00:00 2001 +From bb87a287dca59b101c0ed98981bb5ec0c57eec6f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:19:13 +0100 -Subject: [PATCH 0947/1224] media: i2c: imx290: Add exposure control to the +Subject: [PATCH 0947/1225] media: i2c: imx290: Add exposure control to the driver. Adds support for V4L2_CID_EXPOSURE so that userspace can control @@ -443928,10 +443928,10 @@ index ea0559e8dcc95..df1ad9ac509fa 100644 2.18.4 -From 7301de67a9cbd546f1993129c23a4335cff35432 Mon Sep 17 00:00:00 2001 +From 94eb08b6422ebdcbeffca5ad6e5f7dc268e11597 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:34:16 +0100 -Subject: [PATCH 0948/1224] media: i2c: imx290: Add H and V flip controls +Subject: [PATCH 0948/1225] 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. @@ -444017,10 +444017,10 @@ index df1ad9ac509fa..246c4b1495983 100644 2.18.4 -From b895805acd30047e83cb57e6be8855f06bd96eb5 Mon Sep 17 00:00:00 2001 +From 51775da0a9443e17c9812a464b6eea2f0d23e886 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 16:52:14 +0100 -Subject: [PATCH 0949/1224] media: dt-bindings: media: i2c: Add mono version to +Subject: [PATCH 0949/1225] media: dt-bindings: media: i2c: Add mono version to IMX290 bindings The IMX290 module is available as either monochrome or colour and @@ -444059,10 +444059,10 @@ index a3cc21410f7c6..294e63650d9e3 100644 2.18.4 -From f05644aefce2c73d08212b12deb3b5c37705ed41 Mon Sep 17 00:00:00 2001 +From ab7879abcb953bf8548e10c30cac7bd9a9cd1054 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:03:11 +0100 -Subject: [PATCH 0950/1224] media : i2c: imx290: Add support for the mono +Subject: [PATCH 0950/1225] media : i2c: imx290: Add support for the mono sensor variant. The IMX290 module is available as either mono or colour (Bayer). @@ -444250,10 +444250,10 @@ index 246c4b1495983..a6c5d9ce709f6 100644 2.18.4 -From ee19457a54c6cf5be46dfa9b18f390629c31fce1 Mon Sep 17 00:00:00 2001 +From 8be9313fa2a1dca427ef826f571f9121e505cff6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Jun 2020 18:11:49 +0100 -Subject: [PATCH 0951/1224] media: i2c: imx290: Switch set_hmax to use +Subject: [PATCH 0951/1225] media: i2c: imx290: Switch set_hmax to use imx290_write_buffered_reg imx290_set_hmax was using two independent writes to set up hmax, @@ -444299,10 +444299,10 @@ index a6c5d9ce709f6..9431c2b917ed5 100644 2.18.4 -From 9fc26b4c11f4c2da6384ead4c4dd9d6974631af5 Mon Sep 17 00:00:00 2001 +From 8ad937cf9b519db70216042030baa0f298cb4827 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 13:35:17 +0100 -Subject: [PATCH 0952/1224] dtoverlays: Add an overlay for the Sony IMX290 +Subject: [PATCH 0952/1225] dtoverlays: Add an overlay for the Sony IMX290 image sensor Adds an overlay to configure the IMX290 image sensor. @@ -444549,10 +444549,10 @@ index 0000000000000..8f1dadb13f6a9 2.18.4 -From cedd0ef23119893edb6fe899ed5aa971382028be Mon Sep 17 00:00:00 2001 +From f25a065c8e8deaa5c2a9e3589295ff69302818fd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 18:12:17 +0100 -Subject: [PATCH 0953/1224] defconfig: Add Sony IMX290 image sensor driver to +Subject: [PATCH 0953/1225] defconfig: Add Sony IMX290 image sensor driver to all Pi defconfigs Adds the mainline IMX290 sensor driver (with extra features) to @@ -444631,10 +444631,10 @@ index c82e163a095c3..55bf3bbbcb746 100644 2.18.4 -From 32c1dc8e71dd788f05d3911212f663efc08cee52 Mon Sep 17 00:00:00 2001 +From 9d3f0fefa0c10906b9e4a1ad5b21f3bb8601c432 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 23 Jun 2020 18:37:01 +0100 -Subject: [PATCH 0954/1224] vc4_hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET +Subject: [PATCH 0954/1225] vc4_hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET Symptom is random switching of speakers when using multichannel. @@ -444675,10 +444675,10 @@ index 5aa5236e576da..994bcb027172d 100644 2.18.4 -From c6c8ba2d0a54094d33d5fa5dd9a355293106ac06 Mon Sep 17 00:00:00 2001 +From 55063d0df7871acb1d3c47b5c1383a7ad4d0a9ba Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 15:56:47 +0100 -Subject: [PATCH 0955/1224] staging: vc04_services: isp: Fixup g/s_selection +Subject: [PATCH 0955/1225] staging: vc04_services: isp: Fixup g/s_selection implementation Add V4L2_SEL_TGT_CROP_DEFAULT and V4L2_SEL_TGT_CROP_BOUND targets. @@ -444810,10 +444810,10 @@ index bc86354ac4c6c..83471996a84d6 100644 2.18.4 -From 340418529355b5850d372f47d1f308337fffd2ae Mon Sep 17 00:00:00 2001 +From 666b198df39b21e3cee2e2f386409f9dfd22fd02 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 15:57:08 +0100 -Subject: [PATCH 0956/1224] staging: vc04_services: isp: Reorder operations +Subject: [PATCH 0956/1225] staging: vc04_services: isp: Reorder operations during device probe Register the video node at the end of the probe, swapping order with @@ -444908,10 +444908,10 @@ index 83471996a84d6..815cf50cd07a5 100644 2.18.4 -From 5282b480eb88df3a13d274a8d414533cae9e89a1 Mon Sep 17 00:00:00 2001 +From a473c1bb28641a548c2bde84d52c038af9bb0973 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 15:57:23 +0100 -Subject: [PATCH 0957/1224] uapi: bcm2835-isp: Fixups for bcm2835-isp uapi +Subject: [PATCH 0957/1225] uapi: bcm2835-isp: Fixups for bcm2835-isp uapi structures Rename pad_[] to padding[]. @@ -444948,10 +444948,10 @@ index e7afc367fd76c..bb16dcbcb40f5 100644 2.18.4 -From 8eb77189726b89721c60ff3e07c7d1d05532f5d2 Mon Sep 17 00:00:00 2001 +From 1516fcf95f6f081f479884848267c002b34d1d7e Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sun, 21 Jun 2020 18:06:31 +0300 -Subject: [PATCH 0958/1224] config: Set CONFIG_SERIAL_DEV_CTRL_TTYPORT=y in +Subject: [PATCH 0958/1225] config: Set CONFIG_SERIAL_DEV_CTRL_TTYPORT=y in Raspberry Pi defconfigs The next patch adds a device tree overlay for Bluetooth. The Bluetooth @@ -445056,10 +445056,10 @@ index 55bf3bbbcb746..bf65e65615895 100644 2.18.4 -From 66938ca8c0fdabe58fad961e06c1eabd0a47593a Mon Sep 17 00:00:00 2001 +From dca23051b9a3265947e687343a757c892c3f725f Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sat, 27 Jun 2020 13:08:26 +0300 -Subject: [PATCH 0959/1224] ARM: dts: Add Bluetooth nodes for Raspberry Pi +Subject: [PATCH 0959/1225] ARM: dts: Add Bluetooth nodes for Raspberry Pi Add device tree nodes for Bluetooth on supported Raspberry Pi boards. It's disabled by default and can be enabled by `krnbt=on` dtparam. It's @@ -445363,10 +445363,10 @@ index 30d3d8549da0a..44d8e10ef735c 100644 2.18.4 -From 0ca82024c94556e726fc12083140e00e165ce566 Mon Sep 17 00:00:00 2001 +From 9c0f534ee14f4001f25bff620a73ff2097214f99 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 30 Jun 2020 18:04:13 +0100 -Subject: [PATCH 0960/1224] drm/vc4: Allow interlaced HDMI modes from FKMS. +Subject: [PATCH 0960/1225] drm/vc4: Allow interlaced HDMI modes from FKMS. Having checked the firmware handling for interlaced modes, it appears to be possible to support interlaced modes on @@ -445406,10 +445406,10 @@ index 25a1f066e62c5..ab794eec6afef 100644 2.18.4 -From e55183a885d4c12b85bf900f1c3ace4cd894236b Mon Sep 17 00:00:00 2001 +From 8b86488ec4aeaaee6e2ea487dd77886ea5aa0e5d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 2 Jul 2020 13:53:20 +0100 -Subject: [PATCH 0961/1224] serial: 8250: bcm2835aux - defer if clock is zero +Subject: [PATCH 0961/1225] serial: 8250: bcm2835aux - defer if clock is zero See: https://github.com/raspberrypi/linux/issues/3700 @@ -445440,10 +445440,10 @@ index 33da68341c3a7..8102ad9d04ead 100644 2.18.4 -From b6ca658e949ef135877b49e01919ec774f10f5e5 Mon Sep 17 00:00:00 2001 +From 57354a1a1c604efc28ce60a8537e1156045def73 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 24 Feb 2020 18:52:20 +0100 -Subject: [PATCH 0962/1224] media: v4l: Add 14-bit raw bayer pixel formats +Subject: [PATCH 0962/1225] media: v4l: Add 14-bit raw bayer pixel formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -445571,7 +445571,7 @@ index 0000000000000..3420d4d1825e4 + - R\ :sub:`33low` + - R\ :sub:`33high` diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 31d3f50a50408..fddc53668cf39 100644 +index 27370a6cd75f2..9dd866f420c59 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1298,6 +1298,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -445604,10 +445604,10 @@ index 10e146cd092aa..20bbc3e601189 100644 2.18.4 -From 32eab2a50572783c97fa51c0b88f5fc37618432a Mon Sep 17 00:00:00 2001 +From 8f53b52619938e77f17c8197d10d4d9adf61afda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= Date: Mon, 24 Feb 2020 18:52:21 +0100 -Subject: [PATCH 0963/1224] media: v4l: Add 14-bit raw greyscale pixel format +Subject: [PATCH 0963/1225] media: v4l: Add 14-bit raw greyscale pixel format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -445721,7 +445721,7 @@ index 962f5c367ebcd..d3017026ec7b2 100644 pixfmt-y10p pixfmt-y16 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index fddc53668cf39..6296f6cc87c48 100644 +index 9dd866f420c59..5848b22cdf976 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1212,6 +1212,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -445748,10 +445748,10 @@ index 20bbc3e601189..a4fd05446c627 100644 2.18.4 -From 1c73bdecd2f32ea9b6465aa73939185960c2537a Mon Sep 17 00:00:00 2001 +From df46cbd5851fbea3819dfa163d8cc337f4592201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= Date: Mon, 24 Feb 2020 18:52:22 +0100 -Subject: [PATCH 0964/1224] media: v4l: Add 1X14 14-bit greyscale media bus +Subject: [PATCH 0964/1225] media: v4l: Add 1X14 14-bit greyscale media bus code definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -445844,10 +445844,10 @@ index 4b5e2a71dfec3..3c2848e91c1b2 100644 2.18.4 -From 82f4e10c5bce37cd8213674ad3b9ac23f2de0c1f Mon Sep 17 00:00:00 2001 +From 9053ca22a0c55e3a3378571b61defbb5422b67ff Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 May 2020 16:59:03 +0100 -Subject: [PATCH 0965/1224] media: Add a pixel format for MIPI packed 12bit +Subject: [PATCH 0965/1225] media: Add a pixel format for MIPI packed 12bit luma only. This is the format used by monochrome 12bit image sensors. @@ -445925,7 +445925,7 @@ index d3017026ec7b2..37f0dabf71747 100644 pixfmt-y10b pixfmt-y10p diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 6296f6cc87c48..c76d836b6e0d2 100644 +index 5848b22cdf976..1a4c428c038b8 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1217,6 +1217,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -445952,10 +445952,10 @@ index a4fd05446c627..cd055346095bc 100644 2.18.4 -From decab8359f8c776f6bed769ad3cc172483dc4fee Mon Sep 17 00:00:00 2001 +From aa84e565fa2749a20f552c49c7dc9eb4c30c9767 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:51:03 +0100 -Subject: [PATCH 0966/1224] media: Add a pixel format for MIPI packed 14bit +Subject: [PATCH 0966/1225] media: Add a pixel format for MIPI packed 14bit luma only. This is the format used by monochrome 14bit image sensors. @@ -446042,7 +446042,7 @@ index 37f0dabf71747..04315eb60c64a 100644 pixfmt-y10p pixfmt-y16 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index c76d836b6e0d2..1deb1919cdcdf 100644 +index 1a4c428c038b8..32b28235d32be 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1218,6 +1218,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -446069,10 +446069,10 @@ index cd055346095bc..8020c483ea3cb 100644 2.18.4 -From 4a94b06661caacf32f9fa56304f205a1403031b5 Mon Sep 17 00:00:00 2001 +From 94db7b5adf592f744021f649457dff9628f97627 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:09:04 +0100 -Subject: [PATCH 0967/1224] staging: vc04_services: isp: Add support for 14bit +Subject: [PATCH 0967/1225] staging: vc04_services: isp: Add support for 14bit Bayer The only thing missing was a set of defines, therefore add them in. @@ -446152,10 +446152,10 @@ index 8d904fcce3889..4288d50a7e6b6 100644 2.18.4 -From 3f5061478fb5f3b4e15f5b32fb5287c3868b9b50 Mon Sep 17 00:00:00 2001 +From a77129a365ba159604f267c4d824dc191fc24d40 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:11:14 +0100 -Subject: [PATCH 0968/1224] staging: vc04_services: isp: Add monochrome image +Subject: [PATCH 0968/1225] staging: vc04_services: isp: Add monochrome image formats Adds support for monochrome image formats in the various @@ -446252,10 +446252,10 @@ index 4288d50a7e6b6..8eb6334ee0557 100644 2.18.4 -From d85feabe5ab7c03633bc4199bb0c57148dc5c722 Mon Sep 17 00:00:00 2001 +From 801f0c7f48b5d48d9b35779955edbf7cc9fb6915 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:24:34 +0100 -Subject: [PATCH 0969/1224] staging: vc04_services: isp: Increase the number of +Subject: [PATCH 0969/1225] staging: vc04_services: isp: Increase the number of supported formats expected The ISP now supports 47 different input formats, therefore increase the @@ -446287,10 +446287,10 @@ index 815cf50cd07a5..424e7e6da1d6f 100644 2.18.4 -From c04e3b04a940bdc4df5fefb0ac73f22193b5efc9 Mon Sep 17 00:00:00 2001 +From 2e52457d4a70118ebd0b94962b971b3349174470 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:40:56 +0100 -Subject: [PATCH 0970/1224] staging: vc04_services: codec: Increase the number +Subject: [PATCH 0970/1225] staging: vc04_services: codec: Increase the number of supported formats expected The ISP now supports 47 different input formats, therefore increase the @@ -446322,10 +446322,10 @@ index 1c7fbba6c9c85..2391d589f1702 100644 2.18.4 -From f230e96d814c03f9213ce6b082130259bf9313b9 Mon Sep 17 00:00:00 2001 +From 86f71970e1736f7829dcbcec30e9283d7af0d466 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:38:12 +0100 -Subject: [PATCH 0971/1224] staging: vc04_services: codec: Add support for mono +Subject: [PATCH 0971/1225] staging: vc04_services: codec: Add support for mono formats The firmware ISP component now allows for processing of mono @@ -446392,10 +446392,10 @@ index 2391d589f1702..b9415f3cdb76f 100644 2.18.4 -From c5646b4e1c2ab8f8f55561f6106d549d3a3ac737 Mon Sep 17 00:00:00 2001 +From 4d825b170a5f749307a758a9ada7d3a4d71a4ca9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:50:12 +0100 -Subject: [PATCH 0972/1224] staging: vc04_services: codec: Add support for +Subject: [PATCH 0972/1225] staging: vc04_services: codec: Add support for 14bit Bayer formats Now that the 14bit Bayer formats have been defined within @@ -446455,10 +446455,10 @@ index b9415f3cdb76f..3fe81979aaa16 100644 2.18.4 -From 1bd0ec4658cca576ef04e904df819e759059acfe Mon Sep 17 00:00:00 2001 +From de773b1719fa5db2c62f49d6be8b12eb0990136e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:53:32 +0100 -Subject: [PATCH 0973/1224] media: bcm2835-unicam: Add support for 12bit mono +Subject: [PATCH 0973/1225] media: bcm2835-unicam: Add support for 12bit mono packed format Now that V4L2_PIX_FMT_Y12P is defined, allow passing raw 12bit @@ -446486,10 +446486,10 @@ index f70167d271fe6..104f4d0f9f057 100644 2.18.4 -From fb2fc0a14c8cd90221e99cb1600de8c208cea5a7 Mon Sep 17 00:00:00 2001 +From d6d5b4ebc873b08dfc3d793260a8f9e0c12207e2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 18:03:47 +0100 -Subject: [PATCH 0974/1224] media: bcm2835-unicam: Add support for 14bit mono +Subject: [PATCH 0974/1225] media: bcm2835-unicam: Add support for 14bit mono sources Now that V4L2_PIX_FMT_Y14 and V4L2_PIX_FMT_Y14P are defined, @@ -446521,10 +446521,10 @@ index 104f4d0f9f057..799bea3d4f41b 100644 2.18.4 -From 9821d359dcb585d43d1a6facebd210fb235172f5 Mon Sep 17 00:00:00 2001 +From 7c18803883c288bc9f7ad8122014eaf74cb0736b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:57:57 +0100 -Subject: [PATCH 0975/1224] media: bcm2835-unicam: Add support for unpacked +Subject: [PATCH 0975/1225] media: bcm2835-unicam: Add support for unpacked 14bit Bayer formats Now that the 14bit non-packed Bayer formats are defined, add them @@ -446569,10 +446569,10 @@ index 799bea3d4f41b..3b082587dd14d 100644 2.18.4 -From de3bb526217f61ac513393bd6b1d79be320e758f Mon Sep 17 00:00:00 2001 +From 3a0d1da1e55e225197413a60d70d4ac713d05e04 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 2 Jul 2020 15:21:05 +0100 -Subject: [PATCH 0976/1224] overlays: Fix miniuart-bt "krnbt" parameter +Subject: [PATCH 0976/1225] overlays: Fix miniuart-bt "krnbt" parameter Although superficially appealing, an overlay parameter that targets a label in the base DTB is not currently supported. Instead it is @@ -446607,10 +446607,10 @@ index 44d8e10ef735c..da49f14a09401 100644 2.18.4 -From 7e5760d720484e02e4bb3f255d136c9e6b2431d8 Mon Sep 17 00:00:00 2001 +From 396165a4fc87605a6db68dae539ed07a025b6a5f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 14:11:55 +0100 -Subject: [PATCH 0977/1224] drm/vc4: Make FKMS max refresh rate a module +Subject: [PATCH 0977/1225] drm/vc4: Make FKMS max refresh rate a module parameter Some people want to use the high refresh rate modes for 1080p100 @@ -446668,10 +446668,10 @@ index ab794eec6afef..a173ca430db4d 100644 2.18.4 -From fb0a7cb9f9315c2ac505fb0dff957dca01136baf Mon Sep 17 00:00:00 2001 +From ffcb47033393b2b86fc74af2b1b3361a5b88cd41 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 16:06:55 +0100 -Subject: [PATCH 0978/1224] drm/vc4: FKMS Block modes with odd horizontal +Subject: [PATCH 0978/1225] drm/vc4: FKMS Block modes with odd horizontal timing values on Pi4 Pi4 HDMI pipeline is 2 pixels/clock and can not produce timings @@ -446748,10 +446748,10 @@ index a173ca430db4d..ff726486c7855 100644 2.18.4 -From 61fb91b7c638652f36c4de751e417d5003f1f0ed Mon Sep 17 00:00:00 2001 +From c2f5192ef782b635ef4b2f081603989ec969945a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 16:05:37 +0100 -Subject: [PATCH 0979/1224] dt: Use rpi-firmware-kms-2711 on 2711 platforms +Subject: [PATCH 0979/1225] dt: Use rpi-firmware-kms-2711 on 2711 platforms Signed-off-by: Dave Stevenson --- @@ -446793,10 +446793,10 @@ index c42fa2aa5ef23..ce3edc2cda7d4 100644 2.18.4 -From 5d41ec57af75df9daaef8efbd35b6a31ed603c7d Mon Sep 17 00:00:00 2001 +From 1edfc4a0b39fc91ec1346d38141472fff525567d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 16:13:33 +0100 -Subject: [PATCH 0980/1224] drm/vc4: FKMS: Put includes in alphabetical order, +Subject: [PATCH 0980/1225] drm/vc4: FKMS: Put includes in alphabetical order, and use <> instead of "" Reorder the includes, and use the system include paths rather than @@ -446856,10 +446856,10 @@ index ff726486c7855..ec5c223033c8d 100644 2.18.4 -From a091e2890218dc36639b8deca88d91da8ac00631 Mon Sep 17 00:00:00 2001 +From e161f28e722d036c8784a1c868eb61ba2e686010 Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Tue, 4 Feb 2020 15:50:41 +0100 -Subject: [PATCH 0981/1224] irqchip/bcm2835: Quiesce IRQs left enabled by +Subject: [PATCH 0981/1225] irqchip/bcm2835: Quiesce IRQs left enabled by bootloader [ Upstream commit bd59b343a9c902c522f006e6d71080f4893bbf42 ] @@ -446967,10 +446967,10 @@ index 40c1b38d5db5c..be181d4aeccae 100644 2.18.4 -From 6f2fa3bb0eb37787b2bef9b19b75e3d0cc017f44 Mon Sep 17 00:00:00 2001 +From 619171b33778ea95a19e97b6cb7e3da23b8a56c6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 18:28:10 +0100 -Subject: [PATCH 0982/1224] dtoverlays: Fixup imx219 and imx477 overlays due to +Subject: [PATCH 0982/1225] dtoverlays: Fixup imx219 and imx477 overlays due to parsing failures imx219 overlay failed to detect as CSI2 as it was missing any @@ -447017,10 +447017,10 @@ index bd187713939e1..73d4f79d54e6f 100644 2.18.4 -From 2f263a4441de1d8c00417c1b1a2aeb46fb1c141a Mon Sep 17 00:00:00 2001 +From c16407b452a336e6348544396dcf6c5c047d6917 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 4 Jul 2020 22:19:26 +0100 -Subject: [PATCH 0983/1224] overlays: rpi-ft5406: Fix boolean parameters +Subject: [PATCH 0983/1225] overlays: rpi-ft5406: Fix boolean parameters An improvement in the automated testing of overlays revealed these invalid boolean parameter declarations. @@ -447050,10 +447050,10 @@ index 4dcb490f04b6f..8483c4f4b2eb2 100644 2.18.4 -From 03827d137bf71820d8035b6b0286fc681086d2d4 Mon Sep 17 00:00:00 2001 +From 6dc70b2a4db75b245c5e91dab6d163599a557f33 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jul 2020 20:04:53 +0100 -Subject: [PATCH 0984/1224] configs: Regenerate Pi defconfigs +Subject: [PATCH 0984/1225] configs: Regenerate Pi defconfigs Signed-off-by: Phil Elwell --- @@ -447128,10 +447128,10 @@ index bf65e65615895..99ed08604d569 100644 2.18.4 -From bff4129156a40e7c07d1bdcbf6f1f285c86dca91 Mon Sep 17 00:00:00 2001 +From d456888bbdf3be3d394ed7a1d2dff06742e05c1c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jul 2020 17:53:47 +0100 -Subject: [PATCH 0985/1224] ARM: dts: Copy kernel BT changes to CM4 +Subject: [PATCH 0985/1225] ARM: dts: Copy kernel BT changes to CM4 Signed-off-by: Phil Elwell --- @@ -447163,10 +447163,10 @@ index ce3edc2cda7d4..d5d62245f73c3 100644 2.18.4 -From b9229de38febf4f4a5dbcb08b775ca7d2c1b10cc Mon Sep 17 00:00:00 2001 +From e07bea0b97d3dde8df039b6a0ebad31674a05ee3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 Jul 2020 09:01:54 +0100 -Subject: [PATCH 0986/1224] ARM: dts: Make bcm2711 dts more like 5.7 +Subject: [PATCH 0986/1225] ARM: dts: Make bcm2711 dts more like 5.7 The multiple declarations of pixelvalve2 were causing problems for the DT checkers. Aligning the dts files closer to the later kernel versions @@ -447871,10 +447871,10 @@ index 4b98dba51e59b..4f87bb4fd3d1e 100644 2.18.4 -From b48ae2e37223ffda9b53a15bc6bcde4150e76dcb Mon Sep 17 00:00:00 2001 +From 750c2d43de652b3dd6032f8f03448a646ee31733 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Jul 2020 20:28:27 +0100 -Subject: [PATCH 0987/1224] bcm2835-dma: Add NO_WAIT_RESP flag +Subject: [PATCH 0987/1225] 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. @@ -447931,10 +447931,10 @@ index 53346d7eb66c4..9fec52489421a 100644 2.18.4 -From 292208dc9fa99d63ffbd7cd0ef0c5c5cc2fdf555 Mon Sep 17 00:00:00 2001 +From 65060780a656e3bea40d39544ec8a6c73130bf45 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 Jul 2020 14:08:55 +0100 -Subject: [PATCH 0988/1224] ARM: dts: Restore the old 2711 scb ranges property +Subject: [PATCH 0988/1225] ARM: dts: Restore the old 2711 scb ranges property The back-ported value breaks PCIe. @@ -447961,10 +447961,10 @@ index e8c6a0dfc9f70..4a3659d21997b 100644 2.18.4 -From b3669bda6524d53c585d01b9fe12fd383dd25ecd Mon Sep 17 00:00:00 2001 +From c477f2eee760219b8dc4532dc04e8acba888fe2e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 Jul 2020 14:22:25 +0100 -Subject: [PATCH 0989/1224] configs: Enable CONFIG_BLK_DEV_NVME=m +Subject: [PATCH 0989/1225] configs: Enable CONFIG_BLK_DEV_NVME=m Enable support for NVME SSDs. @@ -448002,10 +448002,10 @@ index 9656ca9f53167..656068a1bbb8c 100644 2.18.4 -From d30006902db25fadedcf76a022cbe38ab7ac2a3a Mon Sep 17 00:00:00 2001 +From ae075f5ded0cacb7da8d4124e56c9c69ffbccc98 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Fri, 17 May 2019 18:23:03 +0800 -Subject: [PATCH 0990/1224] media: i2c: add ov9281 driver. +Subject: [PATCH 0990/1225] media: i2c: add ov9281 driver. Change-Id: I7b77250bbc56d2f861450cf77271ad15f9b88ab1 Signed-off-by: Zefa Chen @@ -449231,10 +449231,10 @@ index 0000000000000..4a6324a3e5da2 2.18.4 -From 52b5a1ba5fb07b16762b6ef3a7615d7888d2a415 Mon Sep 17 00:00:00 2001 +From 8d26a64a5e72bf594a643f9867d4b7f532a31cf8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 15:47:09 +0100 -Subject: [PATCH 0991/1224] media: i2c: ov9281: fix mclk issue when probe +Subject: [PATCH 0991/1225] media: i2c: ov9281: fix mclk issue when probe multiple camera. Takes the ov9281 part only from the Rockchip's patch. @@ -449297,10 +449297,10 @@ index 4a6324a3e5da2..0d6759942f793 100644 2.18.4 -From ac2dde3e7e17b8804189ace1cedcf22a819871f2 Mon Sep 17 00:00:00 2001 +From 984651fb42a32dcba75e2cfc9e0e45feb45baaf0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 15:51:50 +0100 -Subject: [PATCH 0992/1224] media: i2c: ov9281: add enum_frame_interval +Subject: [PATCH 0992/1225] 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 @@ -449400,10 +449400,10 @@ index 0d6759942f793..273aa904683cd 100644 2.18.4 -From 0c6bec78c25603e434e80fed4d152e9c4f6bd657 Mon Sep 17 00:00:00 2001 +From bca217fa2e02cdace92b91de5a9527a53e2040a4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 16:12:33 +0100 -Subject: [PATCH 0993/1224] media: i2c: ov9281: Fixup for recent kernel +Subject: [PATCH 0993/1225] 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 @@ -450097,10 +450097,10 @@ index 273aa904683cd..7b9bea476cfb4 100644 2.18.4 -From fc2312f615fbf30d362a78df283ad30fce8f013a Mon Sep 17 00:00:00 2001 +From df57bad8aa44db3dcb3395112a1d0926ef0791aa Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 17:51:32 +0100 -Subject: [PATCH 0994/1224] media: i2c: ov9281: Read chip ID via 2 reads +Subject: [PATCH 0994/1225] 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 @@ -450145,10 +450145,10 @@ index 7b9bea476cfb4..bb8efc3d3cba8 100644 2.18.4 -From 65a251233e713c1c523a26e1e0ae4ce2d0b2762c Mon Sep 17 00:00:00 2001 +From c4776637f68ec936f84068d5df488e4e43fef977 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 17:32:21 +0100 -Subject: [PATCH 0995/1224] dtoverlay: Add overlay for Omnivision OV9281 image +Subject: [PATCH 0995/1225] dtoverlay: Add overlay for Omnivision OV9281 image sensor Adds an overlay for the OV9281 mono imaging sensor using 2 CSI-2 @@ -450313,10 +450313,10 @@ index 0000000000000..4411c9d965646 2.18.4 -From b199bc0ef97d21f36c3f3183a139235a3847324e Mon Sep 17 00:00:00 2001 +From 7ee23592a511b13bdf0bf78209a1881a25193057 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 18:45:01 +0100 -Subject: [PATCH 0996/1224] defconfigs: Add OV9281 to all the Pi defconfigs +Subject: [PATCH 0996/1225] defconfigs: Add OV9281 to all the Pi defconfigs Adds the driver for use by the dtoverlay. @@ -450393,10 +450393,10 @@ index 99ed08604d569..e238f963d1724 100644 2.18.4 -From 0d8bd88965cc261f526175a3dbb4b7ee155d5f5b Mon Sep 17 00:00:00 2001 +From 1e10f1eb01bf668a0d21a3d4723e3165e7579098 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 6 Oct 2019 17:28:19 +0200 -Subject: [PATCH 0997/1224] Bluetooth: hci_bcm: Fix RTS handling during startup +Subject: [PATCH 0997/1225] Bluetooth: hci_bcm: Fix RTS handling during startup commit 3347a80965b38f096b1d6f995c00c9c9e53d4b8b upstream. @@ -450432,10 +450432,10 @@ index 94ed734c1d7eb..f204ae626c693 100644 2.18.4 -From 20f26d19a56a7b8f632214c981b4808fd1714e42 Mon Sep 17 00:00:00 2001 +From 3309f579322a488045fdfe92aa60aa35b8395d19 Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Fri, 25 Oct 2019 14:54:26 -0700 -Subject: [PATCH 0998/1224] Bluetooth: hci_bcm: Add compatible string for +Subject: [PATCH 0998/1225] Bluetooth: hci_bcm: Add compatible string for BCM43540 commit d462af20dbfa1b9b1a831412f32d9d6757b82459 upstream. @@ -450466,10 +450466,10 @@ index f204ae626c693..31943895b22e6 100644 2.18.4 -From bde5c5f58b4f57aa4ab387173b9500e8a7e09eeb Mon Sep 17 00:00:00 2001 +From de1bee68115b57f4a8d46a0aa4df7114bd1f5367 Mon Sep 17 00:00:00 2001 From: Mohammad Rasim Date: Wed, 20 Nov 2019 14:02:35 +0300 -Subject: [PATCH 0999/1224] Bluetooth: btbcm: Add entry for BCM4335A0 UART +Subject: [PATCH 0999/1225] Bluetooth: btbcm: Add entry for BCM4335A0 UART bluetooth commit 1199ab4c9e1d4cdfbabd70b4aadbc8e72c691f65 upstream. @@ -450532,10 +450532,10 @@ index 31943895b22e6..d5b6467b0e9f3 100644 2.18.4 -From 6076d2b1cbd9540a61712b4de1edb78267181e70 Mon Sep 17 00:00:00 2001 +From b72469e7ed4fe1829263f5eb9605edc006f0b0d9 Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Tue, 26 Nov 2019 08:17:29 +0100 -Subject: [PATCH 1000/1224] Bluetooth: hci_bcm: Disallow set_baudrate for +Subject: [PATCH 1000/1225] Bluetooth: hci_bcm: Disallow set_baudrate for BCM4354 commit 5d6f391073d5c1c903ac12be72c66b96b2ae93f4 upstream. @@ -450653,10 +450653,10 @@ index d5b6467b0e9f3..84a32c58712ef 100644 2.18.4 -From 2f85bdb28c95f98133850e595c4da49b48a7bbd6 Mon Sep 17 00:00:00 2001 +From 628b81a6df82e624524876566a0d471404affb7c Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Tue, 26 Nov 2019 08:17:30 +0100 -Subject: [PATCH 1001/1224] Bluetooth: btbcm: Support pcm configuration +Subject: [PATCH 1001/1225] Bluetooth: btbcm: Support pcm configuration commit 528379902337102b0264fe5343eafb3d6c59fa45 upstream. @@ -450785,10 +450785,10 @@ index d204be8a84bfe..3c7dd07658374 100644 2.18.4 -From 57d85877f97bd29b85a1539eed51b2e30a8d9dcc Mon Sep 17 00:00:00 2001 +From 1ffd7547f7e2dc6486285d3ae362b404a21058c8 Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Tue, 26 Nov 2019 08:17:32 +0100 -Subject: [PATCH 1002/1224] Bluetooth: hci_bcm: Support pcm params in dts +Subject: [PATCH 1002/1225] Bluetooth: hci_bcm: Support pcm params in dts commit eb762b94111b646b4f116ebfdbfcadbad14e12b3 upstream. @@ -450865,10 +450865,10 @@ index 84a32c58712ef..4f21b60a8a20f 100644 2.18.4 -From e96c37dc032b09583d612735894d64653950b254 Mon Sep 17 00:00:00 2001 +From 540905404ccd0568aa24055463a3396fd28f82da Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 1 Jan 2020 15:01:34 +0100 -Subject: [PATCH 1003/1224] Bluetooth: hci_bcm: Drive RTS only for BCM43438 +Subject: [PATCH 1003/1225] Bluetooth: hci_bcm: Drive RTS only for BCM43438 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -450963,10 +450963,10 @@ index 4f21b60a8a20f..de05b14282890 100644 2.18.4 -From 1df8914f3a87aee1b5ef0d05e74688384fce839a Mon Sep 17 00:00:00 2001 +From d5d46e9676eeeb34fab27a649b8f05e81aa17c66 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Tue, 7 Jul 2020 15:09:06 +0200 -Subject: [PATCH 1004/1224] Enhances the DAC+ driver to control the optional +Subject: [PATCH 1004/1225] Enhances the DAC+ driver to control the optional headphone amplifier Probes on the I2C bus for TPA6130A2, if successful, it sets DT-parameter @@ -451105,10 +451105,10 @@ index 4cde60a5b6f6a..286a62c3ff487 100644 2.18.4 -From 58a8f22daf1bfd4434b5a392b803927d614c9856 Mon Sep 17 00:00:00 2001 +From 0b21af024812ac36d10320cce2349c06c84b0bfa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Jul 2020 17:33:06 +0100 -Subject: [PATCH 1005/1224] ARM: dts: hifiberry-dacplus headphone amp support +Subject: [PATCH 1005/1225] ARM: dts: hifiberry-dacplus headphone amp support Signed-off-by: Phil Elwell --- @@ -451135,10 +451135,10 @@ index 2ca3d886ebb7a..ff19015ba6561 100644 2.18.4 -From 89bd97a470e99b96aeaa8f358c1f3dc36f7b9adb Mon Sep 17 00:00:00 2001 +From 4bb241a76be5036f8c6deb27cc585c8102aeaf7e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 10:31:53 +0100 -Subject: [PATCH 1006/1224] media: i2c: imx290: Explicitly set v&h blank on +Subject: [PATCH 1006/1225] media: i2c: imx290: Explicitly set v&h blank on mode change __v4l2_ctrl_modify_range only updates the current value should @@ -451187,10 +451187,10 @@ index 9431c2b917ed5..0aa3940c577ea 100644 2.18.4 -From 170107c0f8360ee2e200fd5390b32eee27e2bb51 Mon Sep 17 00:00:00 2001 +From 1f611ba40cce296769daadeb97dcb0a9cc8edc21 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 11:23:48 +0100 -Subject: [PATCH 1007/1224] media: i2c: imx290: Add support for g_selection to +Subject: [PATCH 1007/1225] media: i2c: imx290: Add support for g_selection to report cropping Userspace needs to know the cropping arrangements for each mode, @@ -451349,10 +451349,10 @@ index 0aa3940c577ea..5b7083b7050e9 100644 2.18.4 -From 07cb26557346ae392081657cce3c85f78d36eb9b Mon Sep 17 00:00:00 2001 +From ccab8626f2e138e684df5f9b773d90049906523f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 11:51:26 +0100 -Subject: [PATCH 1008/1224] media: i2c: imx290: Set the colorspace fields in +Subject: [PATCH 1008/1225] media: i2c: imx290: Set the colorspace fields in the format The colorspace fields were left untouched in imx290_set_fmt @@ -451386,10 +451386,10 @@ index 5b7083b7050e9..0057e0b989123 100644 2.18.4 -From 5f29b4c08f06eb04326ae5745e8c340e6010e4ad Mon Sep 17 00:00:00 2001 +From d40e73da3a8ee3d1fe6a22ceb7fe54fd25786d86 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 14:23:40 +0100 -Subject: [PATCH 1009/1224] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE +Subject: [PATCH 1009/1225] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE in the caps v4l2-compliance throws a failure if the device doesn't advertise @@ -451420,10 +451420,10 @@ index 3b082587dd14d..6b7780ec8ec6c 100644 2.18.4 -From eac95d0b493f1b3c24d0c9b0c2385de3be4251a4 Mon Sep 17 00:00:00 2001 +From fb88fc659f48c74279f5ad02020ccc1746d02e26 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 14:52:43 +0100 -Subject: [PATCH 1010/1224] media: bcm2835-unicam: Ensure type is VIDEO_CAPTURE +Subject: [PATCH 1010/1225] 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 @@ -451462,10 +451462,10 @@ index 6b7780ec8ec6c..c2b9d89f0ae52 100644 2.18.4 -From 47d91a28fbcf0f952e2aabd74743da75c2f2d1b1 Mon Sep 17 00:00:00 2001 +From 611314d9abce160770c19f0875e689189853ef44 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Jul 2020 14:34:34 +0100 -Subject: [PATCH 1011/1224] configs: Add CAN_EMS_USB=m +Subject: [PATCH 1011/1225] configs: Add CAN_EMS_USB=m See: https://github.com/raspberrypi/linux/issues/3716 @@ -451542,10 +451542,10 @@ index e238f963d1724..c028ffce473a6 100644 2.18.4 -From cb23e9f033e3920cebc2cc01024c719c4928dded Mon Sep 17 00:00:00 2001 +From e7fc4f3933a3f4cf84344aae27e0a3837033d324 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 16:12:05 +0100 -Subject: [PATCH 1012/1224] dtoverlays: Create an overlay for the Omnivision +Subject: [PATCH 1012/1225] dtoverlays: Create an overlay for the Omnivision OV7251 sensor Adds an overlay for the OV7251 VGA global shutter sensor. @@ -451710,10 +451710,10 @@ index 0000000000000..f04eafd4adf99 2.18.4 -From 90ed09df956512a270931cdecd86500f20034cb4 Mon Sep 17 00:00:00 2001 +From 7ecf4a7ec907b013a2e21b1691c890894b65d5f7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 16:14:36 +0100 -Subject: [PATCH 1013/1224] defconfigs: Add the Omnivision OV7251 sensor driver +Subject: [PATCH 1013/1225] defconfigs: Add the Omnivision OV7251 sensor driver to the defconfigs Signed-off-by: Dave Stevenson @@ -451789,10 +451789,10 @@ index c028ffce473a6..1d42667e3c11f 100644 2.18.4 -From 17b5cb462a1000a98facf14e3cc92b741055c7f5 Mon Sep 17 00:00:00 2001 +From 7ce1b502db6fb931bd2e4b98a10c02bc973468b2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 10 Mar 2020 22:21:15 +0000 -Subject: [PATCH 1014/1224] vc4_hdmi: Set HDMI_MAI_FMT +Subject: [PATCH 1014/1225] vc4_hdmi: Set HDMI_MAI_FMT The hardware uses this for generating the right audio data island packets when using formats other than PCM @@ -451921,10 +451921,10 @@ index 4d017572a5c28..a388a9265afc4 100644 2.18.4 -From 5761945575a34d3e95d01181f6b277ca49ed705f Mon Sep 17 00:00:00 2001 +From 2bd91a19059c2c8f74eb78ef7dcd92e746ce2277 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 17 Mar 2020 12:12:22 +0100 -Subject: [PATCH 1015/1224] drm/vc4: add iec958 controls to vc4_hdmi +Subject: [PATCH 1015/1225] 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 @@ -452048,10 +452048,10 @@ index 60f7bf99e06ef..5914de41705c4 100644 2.18.4 -From 0e33959b0ec62abcfe9cbb11271187610b99ca3f Mon Sep 17 00:00:00 2001 +From 19b60eb0a9c52123afabd6588ecfbb83bee695b3 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 19 Mar 2020 20:00:35 +0100 -Subject: [PATCH 1016/1224] drm/vc4: move setup from hw_params to prepare +Subject: [PATCH 1016/1225] 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 @@ -452110,10 +452110,10 @@ index 913dbcc7a7dd9..d6961466e2eb4 100644 2.18.4 -From ea0a25d78ac1fd2e042231571194779263c0819b Mon Sep 17 00:00:00 2001 +From 26f036c7d0c97448080945582757bc9188ee67c4 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Fri, 10 Jul 2020 11:51:16 +0100 -Subject: [PATCH 1017/1224] drm/vc4: enable HBR MAI format on HBR streams +Subject: [PATCH 1017/1225] drm/vc4: enable HBR MAI format on HBR streams Signed-off-by: Matthias Reichl --- @@ -452141,10 +452141,10 @@ index d6961466e2eb4..3108e0a1eacdc 100644 2.18.4 -From 1fbaff2ee0d22f0846385470ef02419396d1a943 Mon Sep 17 00:00:00 2001 +From b83f0db09c295a42f38ce3f46478723839f36c31 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 25 Jun 2020 18:48:40 +0100 -Subject: [PATCH 1018/1224] vc4_hdmi: Remove firmware logic for MAI threshold +Subject: [PATCH 1018/1225] vc4_hdmi: Remove firmware logic for MAI threshold setting This was a workaround for bugs in hardware on earlier Pi models @@ -452194,10 +452194,10 @@ index 3108e0a1eacdc..19a243c9d805d 100644 2.18.4 -From 290215cbb504704ecfde36dddfbc42f2eb7d3ad6 Mon Sep 17 00:00:00 2001 +From 2c091424a8b90e0bfb926e5d60a6b93d58d1e5bd Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 30 Jun 2020 11:23:49 +0100 -Subject: [PATCH 1019/1224] vc_hdmi: Set VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE +Subject: [PATCH 1019/1225] 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 @@ -452224,10 +452224,10 @@ index 19a243c9d805d..5e74a6ca0c992 100644 2.18.4 -From 4354bc8b39ae856903fadbcae35f0bbae8d5c2df Mon Sep 17 00:00:00 2001 +From d502866abbabbc5ee4920ffe7668023fb7d5291a Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 2 Jul 2020 19:36:08 +0100 -Subject: [PATCH 1020/1224] dts: Enable NO_WAIT_RESP for hdmi audio dma +Subject: [PATCH 1020/1225] dts: Enable NO_WAIT_RESP for hdmi audio dma Without this set, DVP_CFG_MAI0_CTL indicates occasional DLATE errors when configured to 8 channel 192kHz @@ -452277,10 +452277,10 @@ index e269e75f0f57d..e39577e90cc15 100644 2.18.4 -From 703cab8c6d437252f58c13b34519a8087a2708d8 Mon Sep 17 00:00:00 2001 +From 6f888a0354536c227a7e01ea3e4d44ac71bf33c3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 10 Jul 2020 16:57:43 +0100 -Subject: [PATCH 1021/1224] SQUASH: dts: Further simplify firmware clocks +Subject: [PATCH 1021/1225] SQUASH: dts: Further simplify firmware clocks All Pi platforms will use the firmware clocks driver, so declare it in the most common place - bcm2835-rpi.dtsi. @@ -452358,10 +452358,10 @@ index 52b47038ca822..c4c858b984c6b 100644 2.18.4 -From c84916d5386a6731591f914fcfed3a6b49be6562 Mon Sep 17 00:00:00 2001 +From 10a0f0817e9ed6d9e43baf04decceb12d0801c2c Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 11 May 2020 13:02:22 +0100 -Subject: [PATCH 1022/1224] media: bcm2835: unicam: Set VPU min clock freq to +Subject: [PATCH 1022/1225] media: bcm2835: unicam: Set VPU min clock freq to 250Mhz. When streaming with Unicam, the VPU must have a clock frequency of at @@ -452520,10 +452520,10 @@ index c2b9d89f0ae52..57c3c5f5db56f 100644 2.18.4 -From 8e1a57a6fb71f8a9890c9ece3e159bf178d0fd51 Mon Sep 17 00:00:00 2001 +From 1504fb3032052c79f0836b7e95301e42ff7d261f Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 11 May 2020 13:06:27 +0100 -Subject: [PATCH 1023/1224] dt-bindings: bcm2835-unicam: Update documentation +Subject: [PATCH 1023/1225] dt-bindings: bcm2835-unicam: Update documentation with new clock params Update the documentation to reflect the new "VPU" clock needed @@ -452564,10 +452564,10 @@ index 7714fb374b34d..164d0377dcd24 100644 2.18.4 -From d303602ea88bf074f51c04ea02b127123eca6ccc Mon Sep 17 00:00:00 2001 +From 416eb8a0ca6af1f6e85d6b7d6806e02034113934 Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Tue, 14 Jul 2020 17:51:03 +0200 -Subject: [PATCH 1024/1224] correct SND_SOC_DAILINK_DEFS +Subject: [PATCH 1024/1225] correct SND_SOC_DAILINK_DEFS Signed-off-by: AMuszkat --- @@ -452591,10 +452591,10 @@ index 41965c71c9120..db43239d29c95 100644 2.18.4 -From e390a0c56359f83556bff3cdee766c230a8a19ab Mon Sep 17 00:00:00 2001 +From 795b8b8be0b10252328bd171fe1bccfc92847f1d Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:44 +0200 -Subject: [PATCH 1025/1224] media: dt-bindings: video-interfaces: Document +Subject: [PATCH 1025/1225] media: dt-bindings: video-interfaces: Document 'orientation' property Add the 'orientation' device property, used to specify the device mounting @@ -452640,10 +452640,10 @@ index f884ada0bffc8..b1ff492c7da7a 100644 2.18.4 -From 22cdcaa3bd4d63ce86a90aa9bdc0fa2fa28f9b2d Mon Sep 17 00:00:00 2001 +From 591a845099a38c62f80ddbe028989c0054510265 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:45 +0200 -Subject: [PATCH 1026/1224] media: dt-bindings: video-interface: Replace +Subject: [PATCH 1026/1225] media: dt-bindings: video-interface: Replace 'rotation' description Replace the 'rotation' property description by providing a definition @@ -453036,10 +453036,10 @@ index b1ff492c7da7a..3920f25a91235 100644 2.18.4 -From 0e6df3971a82eeae6db161baa283da2589636b53 Mon Sep 17 00:00:00 2001 +From f10ad1436cbf2ee9d7e2e6a05094d40a83794709 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:46 +0200 -Subject: [PATCH 1027/1224] media: v4l2-ctrl: Document +Subject: [PATCH 1027/1225] media: v4l2-ctrl: Document V4L2_CID_CAMERA_ORIENTATION Add documentation for the V4L2_CID_CAMERA_ORIENTATION camera @@ -453103,10 +453103,10 @@ index 51c1d5c9eb002..c65a2b66232e1 100644 2.18.4 -From e5a18976d83fb07f8e39be54bffb78f850dd6a81 Mon Sep 17 00:00:00 2001 +From 25f11748dbea8c76d40561bba6375579d0639725 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:47 +0200 -Subject: [PATCH 1028/1224] media: v4l2-ctrl: Document +Subject: [PATCH 1028/1225] media: v4l2-ctrl: Document V4L2_CID_CAMERA_SENSOR_ROTATION Add documentation for the V4L2_CID_CAMERA_SENSOR_ROTATION camera @@ -453260,10 +453260,10 @@ index c65a2b66232e1..e64c1b2c01e84 100644 2.18.4 -From 2ae8b73ed27c83742e56b823a8c974d78d3fffcc Mon Sep 17 00:00:00 2001 +From 924f49799267ce4e1e169107437232e868222e3b Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:48 +0200 -Subject: [PATCH 1029/1224] media: v4l2-ctrls: Add camera orientation and +Subject: [PATCH 1029/1225] media: v4l2-ctrls: Add camera orientation and rotation Add support for the newly defined V4L2_CID_CAMERA_ORIENTATION @@ -453284,7 +453284,7 @@ Signed-off-by: Laurent Pinchart 2 files changed, 20 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 4f15335636550..6a8eb39eec813 100644 +index b733ada15e551..302ed58ce6dce 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -577,6 +577,12 @@ const char * const *v4l2_ctrl_get_menu(u32 id) @@ -453357,10 +453357,10 @@ index 660574b1b4e7a..b6173d8c38f18 100644 2.18.4 -From 7bbfcb949a5403e5a9bef03bf04068652cf555ee Mon Sep 17 00:00:00 2001 +From dfceff6df78d5aa8e25aee5aa895914ec352422b Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:49 +0200 -Subject: [PATCH 1030/1224] media: v4l2-fwnode: Add helper to parse device +Subject: [PATCH 1030/1225] media: v4l2-fwnode: Add helper to parse device properties Add an helper function to parse common device properties in the same @@ -453503,10 +453503,10 @@ index f6a7bcd131977..7bb8da2092f69 100644 2.18.4 -From 54ccaad4a31604930334b0f5272107aaeefaf166 Mon Sep 17 00:00:00 2001 +From 2a2689645559767de2515fd8caf4b4be946821d4 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:52 +0200 -Subject: [PATCH 1031/1224] media: v4l2-ctrls: Add helper to register +Subject: [PATCH 1031/1225] media: v4l2-ctrls: Add helper to register properties Add an helper function to v4l2-ctrls to register controls associated @@ -453525,7 +453525,7 @@ Signed-off-by: Laurent Pinchart 2 files changed, 66 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 6a8eb39eec813..e0cac7f3d9608 100644 +index 302ed58ce6dce..20814e721eb94 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -17,6 +17,7 @@ @@ -453536,7 +453536,7 @@ index 6a8eb39eec813..e0cac7f3d9608 100644 #define dprintk(vdev, fmt, arg...) do { \ if (!WARN_ON(!(vdev)) && ((vdev)->dev_debug & V4L2_DEV_DEBUG_CTRL)) \ -@@ -4577,3 +4578,42 @@ __poll_t v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait) +@@ -4578,3 +4579,42 @@ __poll_t v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait) return 0; } EXPORT_SYMBOL(v4l2_ctrl_poll); @@ -453625,10 +453625,10 @@ index 65575e9b5a2b1..162859aa21389 100644 2.18.4 -From 19fd04970a2700c566e88705ca79d89a883c5e2e Mon Sep 17 00:00:00 2001 +From 437efcfd89f5ad64edf68c198502101e534f97d4 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 01:45:08 +0300 -Subject: [PATCH 1032/1224] media: i2c: ov5647: Parse and register properties +Subject: [PATCH 1032/1225] media: i2c: ov5647: Parse and register properties Parse device properties and register controls for them using the V4L2 fwnode properties helpers. @@ -453680,10 +453680,10 @@ index 6d84d2785f740..86a821a172b3d 100644 2.18.4 -From 63acac7bc9d2986da111d8ed59752536a1460f75 Mon Sep 17 00:00:00 2001 +From 95d1f013f927678ce7c80a28075a5b5e4c0476e8 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:55 +0200 -Subject: [PATCH 1033/1224] media: i2c: imx219: Parse and register properties +Subject: [PATCH 1033/1225] media: i2c: imx219: Parse and register properties Parse device properties and register controls for them using the newly introduced helpers. @@ -453737,10 +453737,10 @@ index b84fc19e9ff75..812323107f36c 100644 2.18.4 -From cff1e1c419b6e501cb80907a540f850de9cc909f Mon Sep 17 00:00:00 2001 +From ad6f02bb29e6ec1e5285332c8c2cada131ef6a43 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 01:45:08 +0300 -Subject: [PATCH 1034/1224] media: i2c: imx477: Parse and register properties +Subject: [PATCH 1034/1225] media: i2c: imx477: Parse and register properties Parse device properties and register controls for them using the V4L2 fwnode properties helpers. @@ -453788,10 +453788,10 @@ index e42a8633087d4..3fbb173fa0796 100644 2.18.4 -From 5c7e909149335aa4f839b5ed813f098dc7305059 Mon Sep 17 00:00:00 2001 +From 8419e77a185e29ca62b77ff5733a21a86aa468dd Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 03:04:38 +0300 -Subject: [PATCH 1035/1224] dt/dtoverlays: ov5647: Add parameter to set camera +Subject: [PATCH 1035/1225] dt/dtoverlays: ov5647: Add parameter to set camera module rotation Add a rotation DT overlay parameter to allow specifying the camera @@ -453845,10 +453845,10 @@ index 5eba3cb9fb91d..fd1e7a457f697 100644 2.18.4 -From 9d402622203dcbb926712199af2d74ff3ee143a8 Mon Sep 17 00:00:00 2001 +From a4a166b64fa5521611f456662490f4e633b41155 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 03:04:38 +0300 -Subject: [PATCH 1036/1224] dt/dtoverlays: imx219: Add parameter to set camera +Subject: [PATCH 1036/1225] dt/dtoverlays: imx219: Add parameter to set camera module rotation Add a rotation DT overlay parameter to allow specifying the camera @@ -453903,10 +453903,10 @@ index 3c2d3fac93d21..dce07b335c4e8 100644 2.18.4 -From 079128c4909bbf13714d82d162fbe54872ca463e Mon Sep 17 00:00:00 2001 +From c9c417618836436da79b64ebce9c87b420abcc90 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 03:04:38 +0300 -Subject: [PATCH 1037/1224] dt/dtoverlays: imx477: Add parameter to set camera +Subject: [PATCH 1037/1225] dt/dtoverlays: imx477: Add parameter to set camera module rotation Add a rotation DT overlay parameter to allow specifying the camera @@ -453961,10 +453961,10 @@ index 73d4f79d54e6f..1a97eaaf4c826 100644 2.18.4 -From 85dfb2a6c95fd286edaa44070fe4513a948fbfc1 Mon Sep 17 00:00:00 2001 +From 0ef88825517175c5cfe8fa8b6d798dbf2efe3339 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 16 Jul 2020 12:02:47 +0100 -Subject: [PATCH 1038/1224] drm/vc4: Add DRM_MODE_FLAG_DBLCLK support to +Subject: [PATCH 1038/1225] drm/vc4: Add DRM_MODE_FLAG_DBLCLK support to vc4-fkms 480i and several other modes use DRM_MODE_FLAG_DBLCLK and pixel @@ -454021,10 +454021,10 @@ index ec5c223033c8d..31982bda0062d 100644 2.18.4 -From 048a090bfbb05479b75aad042454a7204cb01e98 Mon Sep 17 00:00:00 2001 +From 1b90562528e8bb083e8192707bcf0ebe0b4b3304 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Jul 2020 10:33:19 +0100 -Subject: [PATCH 1039/1224] leds: Add the actpwr trigger +Subject: [PATCH 1039/1225] 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 @@ -454268,10 +454268,10 @@ index 0000000000000..4e89fb314e2c9 2.18.4 -From c2774ee2356d50f5d777b64006b6a859efa56e05 Mon Sep 17 00:00:00 2001 +From 272312eeb2e86adf6e441069bc0cc785983b4e23 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2020 13:18:11 +0100 -Subject: [PATCH 1040/1224] configs: Enable LEDS_TRIGGER_ACTPWR +Subject: [PATCH 1040/1225] configs: Enable LEDS_TRIGGER_ACTPWR Make the combined mmc0 activity & power trigger available to use. @@ -454348,10 +454348,10 @@ index 1d42667e3c11f..c7e5eeacb27c4 100644 2.18.4 -From af57be351af4ccfaa04dbb11f0a92ae6fc50ed7d Mon Sep 17 00:00:00 2001 +From b347f931c04241829d48a87912ee9546828d8133 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 16 Jul 2020 18:19:58 +0100 -Subject: [PATCH 1041/1224] ARM: dts: Select the actpwr LED trigger on Zeroes +Subject: [PATCH 1041/1225] ARM: dts: Select the actpwr LED trigger on Zeroes The new "actpwr" LED trigger guarantees that the combined PWR and ACT LED is on for at least half of every second. Under heavy SD card @@ -454397,10 +454397,10 @@ index c2f58e84eb323..5655eb4769ea9 100644 2.18.4 -From 4da73623464ae3be2ced71b6c20d77d269f948a8 Mon Sep 17 00:00:00 2001 +From 6b525420f92ac34c09a1fc0a6a3e3792eab111e9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 May 2020 22:05:29 +0100 -Subject: [PATCH 1042/1224] staging: vc04_services: isp: Rework lens shading to +Subject: [PATCH 1042/1225] staging: vc04_services: isp: Rework lens shading to take a dmabuf This removes the need for the client to use vcsm at all. @@ -454492,10 +454492,10 @@ index bb16dcbcb40f5..cf8c0437f1597 100644 2.18.4 -From d243c920200f48c56d7097c48f54aa9fe45bad45 Mon Sep 17 00:00:00 2001 +From 7935a6818619a907b7b8e6d666ce97512d7c6d43 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Fri, 17 Jul 2020 09:17:36 +1000 -Subject: [PATCH 1043/1224] Mute bug fix for the Audioinjector.net isolated +Subject: [PATCH 1043/1225] Mute bug fix for the Audioinjector.net isolated soundcard. --- @@ -454562,10 +454562,10 @@ index 652464658fef9..27e1316e387df 100644 2.18.4 -From 96063582467a792bf48d3eef688a45a549f6e992 Mon Sep 17 00:00:00 2001 +From 1d61a3a1addd24e5c7e4c65bbb36d52ca0cf681c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Jul 2020 17:56:17 +0100 -Subject: [PATCH 1044/1224] configs: Add MAXIM_THERMOCOUPLE=m +Subject: [PATCH 1044/1225] configs: Add MAXIM_THERMOCOUPLE=m See: https://github.com/raspberrypi/linux/issues/3732 @@ -454642,10 +454642,10 @@ index c7e5eeacb27c4..04128417383a9 100644 2.18.4 -From 3a7d910f1183e32ebca6e30bc83b764ae6174a0b Mon Sep 17 00:00:00 2001 +From d21e21aa7e114fea26a53016ec28605838313d92 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 20 Apr 2020 18:00:38 +0100 -Subject: [PATCH 1045/1224] vc4: Report channel mapping back to userspace +Subject: [PATCH 1045/1225] 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 @@ -455154,10 +455154,10 @@ index 5914de41705c4..e866979a6df59 100644 2.18.4 -From 536d1490774998a3ed4070ec898da7dcbc11fd7e Mon Sep 17 00:00:00 2001 +From bace81b3e35655055362a294c0fe4d6af9b98c51 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Jul 2020 09:35:46 +0100 -Subject: [PATCH 1046/1224] SQUASH: leds: actpwr - delete unused variable +Subject: [PATCH 1046/1225] SQUASH: leds: actpwr - delete unused variable Signed-off-by: Phil Elwell --- @@ -455180,10 +455180,10 @@ index 4e89fb314e2c9..1a52107ceb03b 100644 2.18.4 -From dc631263ef3697fdd9a1e54606c023203db59f64 Mon Sep 17 00:00:00 2001 +From fb56a265f6b12a1c9d3500525284f2be58fc0a81 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Jul 2020 17:34:09 +0100 -Subject: [PATCH 1047/1224] staging: vchiq_arm: children inherit DMA config +Subject: [PATCH 1047/1225] 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 @@ -455222,10 +455222,10 @@ index d55f038637fc4..4edfca26410ed 100644 2.18.4 -From 3e3e037f092705a366c371ff8cb435002f82ea05 Mon Sep 17 00:00:00 2001 +From 063dbe7e67e3767459f9e4f105e34faac180fd7e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 Jul 2020 17:45:24 +0100 -Subject: [PATCH 1048/1224] ARM: dts: 2711 DMA can address 36 bits +Subject: [PATCH 1048/1225] ARM: dts: 2711 DMA can address 36 bits Kernels prior to 5.7 only see the first entry in dma-ranges, so make it cover the full addressable range. @@ -455253,10 +455253,10 @@ index 444a3d74e8f2d..c2c63bbef338d 100644 2.18.4 -From 49b316d286614c7540172f90c9d5a9c2e5f03ddf Mon Sep 17 00:00:00 2001 +From bf9dc6ec2c887b72d1bb4e7796680c5954b9a36a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 Jul 2020 17:59:31 +0100 -Subject: [PATCH 1049/1224] bcm2835-dma: Advertise the full DMA range +Subject: [PATCH 1049/1225] bcm2835-dma: Advertise the full DMA range Unless the DMA mask is set wider than 32 bits, DMA mapping will use a bounce buffer. @@ -455336,10 +455336,10 @@ index 9fec52489421a..5a9b18edc2b73 100644 2.18.4 -From 9ba761c5c5f67bd7b1f07ff6ccd7ef7779e7d008 Mon Sep 17 00:00:00 2001 +From 02135e550b732288c1f6c2a60c4cfd320d063e3c Mon Sep 17 00:00:00 2001 From: iamdavidcz Date: Thu, 23 Jul 2020 23:10:22 +0200 -Subject: [PATCH 1050/1224] add CONFIG_CRYPTO_USER_API_HASH=m +Subject: [PATCH 1050/1225] add CONFIG_CRYPTO_USER_API_HASH=m --- arch/arm/configs/bcm2709_defconfig | 1 + @@ -455413,10 +455413,10 @@ index 04128417383a9..05459f731972a 100644 2.18.4 -From 9ff443f8b9d456b21f1ff0390e04841f78bfa549 Mon Sep 17 00:00:00 2001 +From 4a062baf54000e764661fcacf2c6a93e87415b90 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Jul 2020 14:56:16 +0100 -Subject: [PATCH 1051/1224] configs: Adding remaining crypto API modules +Subject: [PATCH 1051/1225] configs: Adding remaining crypto API modules Now that CONFIG_CRYPTO_USER_API_HASH=m is enabled, adding CONFIG_CRYPTO_USER_API_RNG=m and CONFIG_CRYPTO_USER_API_AEAD=m should @@ -455502,10 +455502,10 @@ index 05459f731972a..11f3ff5d60f8e 100644 2.18.4 -From 8afa6114bda34615ec7b85058ebeea381176c375 Mon Sep 17 00:00:00 2001 +From bc3203a9e80220022150ef1c3c5198fb9c6ac02f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Jul 2020 15:34:19 +0100 -Subject: [PATCH 1052/1224] configs: Restore missing cgroups to BCM2835-7 +Subject: [PATCH 1052/1225] configs: Restore missing cgroups to BCM2835-7 See: https://github.com/raspberrypi/linux/issues/3644 @@ -455559,10 +455559,10 @@ index 11f3ff5d60f8e..feca764ecd749 100644 2.18.4 -From 37d13cf40aa6ecb28f55845798c1f3f047989508 Mon Sep 17 00:00:00 2001 +From eca41e94b6ee341f99a4e9f31015419d8840d473 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Jul 2020 11:20:07 +0100 -Subject: [PATCH 1053/1224] ARM: dts: Add UART skip-init properties for U-boot +Subject: [PATCH 1053/1225] ARM: dts: Add UART skip-init properties for U-boot U-boot can get stuck trying to initialise UARTs that aren't mapped to the pin header. There is no reason for U-boot not to rely on the @@ -455600,10 +455600,10 @@ index e3d90b4262f1f..68a7e1c09db1d 100644 2.18.4 -From 42ada7f96ec4d5e794987a83dcc118b2732e4bc7 Mon Sep 17 00:00:00 2001 +From c1902d1062408a74070cef22e35a17b95790ea99 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 28 Jul 2020 13:01:42 +0100 -Subject: [PATCH 1054/1224] drm/vc4: Remove UIF from the list of modifiers +Subject: [PATCH 1054/1225] drm/vc4: Remove UIF from the list of modifiers returned by format_mod_supported FKMS was listing UIF in the supported modifiers from format_mod_supported @@ -455635,10 +455635,10 @@ index 31982bda0062d..7802020cc3c0e 100644 2.18.4 -From 529e756261b162ef3012c2082dd2eef848f9b85f Mon Sep 17 00:00:00 2001 +From 1fd4b41ec8e3eb905a31c0791c20356727f86f1f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jul 2020 13:47:55 +0100 -Subject: [PATCH 1055/1224] ARM: proc-v7: Force misalignment of early stmia +Subject: [PATCH 1055/1225] 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 @@ -455701,10 +455701,10 @@ index c4e8006a1a8cd..d5d63b9fbe225 100644 2.18.4 -From bae35f59427700c13243ad56b68deccad0018f68 Mon Sep 17 00:00:00 2001 +From cc73747d63a12ab634c00c6e88df27c5dab4b90c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jul 2020 15:13:09 +0100 -Subject: [PATCH 1056/1224] overlays: Fix sc16is75x overlays w.r.t. serdev +Subject: [PATCH 1056/1225] overlays: Fix sc16is75x overlays w.r.t. serdev Enabling serdev support in rpi-5.4.y had the unintended consequence of making any UART device node with a subnode look like a "serdev" node, @@ -455895,10 +455895,10 @@ index ffdea106434a2..730c6e8cd6142 100644 2.18.4 -From 265defbac45be49830fcf899520f260cdd329ccc Mon Sep 17 00:00:00 2001 +From 8a5fe6d101e8e26700230eecb2a933b28d05ea54 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jul 2020 18:06:24 +0100 -Subject: [PATCH 1057/1224] overlays: Delete spi0-hw-cs +Subject: [PATCH 1057/1225] overlays: Delete spi0-hw-cs The spi0-hw-cs overlay is unnecessary (and actually harmful) with the current kernels. Delete it, leaving a note in the README and a @@ -455995,10 +455995,10 @@ index 168a0dc80ad1a..0000000000000 2.18.4 -From d03b98d8afd3a216e170390b2d21eaa53efa8f35 Mon Sep 17 00:00:00 2001 +From 2d9b521c28b3fc24b51413040f83d372b5be05ed Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Tue, 22 Oct 2019 10:36:24 +0200 -Subject: [PATCH 1058/1224] backlight: gpio: Explicitly set the direction of +Subject: [PATCH 1058/1225] backlight: gpio: Explicitly set the direction of the GPIO commit 706dc68102bc7421a9e6573d149ab6d769d71cc7 upstream. @@ -456089,10 +456089,10 @@ index 18e053e4716c4..40e94eb7a7b39 100644 2.18.4 -From 90aa6f4694068cdb9f4c5476bd0345723df0633f Mon Sep 17 00:00:00 2001 +From af7ba95426c77425e37ffc1be30292331fefdb44 Mon Sep 17 00:00:00 2001 From: Dougie Lawson Date: Mon, 27 Jul 2020 23:52:40 +0100 -Subject: [PATCH 1059/1224] overlays: Add maxtherm overlay for MAX6675/31855 +Subject: [PATCH 1059/1225] overlays: Add maxtherm overlay for MAX6675/31855 Add an overlay - maxtherm - to support the MAX6675 and MAX31855 family of thermocouples. @@ -456338,10 +456338,10 @@ index 0000000000000..34d5727069ece 2.18.4 -From 6338f41976b204a8adeeea2e1f4f9fa4447a33da Mon Sep 17 00:00:00 2001 +From a2bfbb7061b3a88c9afa69244cdf324bd96a3d8e Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Sun, 2 Aug 2020 18:19:43 +0000 -Subject: [PATCH 1060/1224] configs: add CONFIG_SENSORS_IIO_HWMON=m +Subject: [PATCH 1060/1225] configs: add CONFIG_SENSORS_IIO_HWMON=m The hwmon module for the ads1015 was removed from the kernel in favor of the IIO version. This patch adds the bridge driver @@ -456421,10 +456421,10 @@ index feca764ecd749..497a14e0a6aa4 100644 2.18.4 -From 399cc34149f477fe10fdc04d12015252ef4d5412 Mon Sep 17 00:00:00 2001 +From 51d1c041dcc1e95b976da348494fbc4776b936a0 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Sun, 2 Aug 2020 18:25:07 +0000 -Subject: [PATCH 1061/1224] dtoverlays: Add the iio_hwmon driver to correct ADC +Subject: [PATCH 1061/1225] dtoverlays: Add the iio_hwmon driver to correct ADC issues The Linux kernel maintainers removed the hwmon driver for the @@ -456467,10 +456467,10 @@ index 08bfce0edb239..d18187d7f3437 100644 2.18.4 -From a86a33982f57d65f0e97a8b6463979777c677dab Mon Sep 17 00:00:00 2001 +From 885936b82f4cec5ff88d090c7fd03b45ec2a4aa9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2020 14:03:44 +0200 -Subject: [PATCH 1062/1224] Revert "ath9k: Fix general protection fault in +Subject: [PATCH 1062/1225] Revert "ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb" This reverts commit b5c8896bc14f54e5c4dd5a6e42879f125b8abd2d which is @@ -456658,10 +456658,10 @@ index 5985aa15ca931..a94e7e1c86e98 100644 2.18.4 -From 2d438448973ccbdd22ace7ee73b795285979cdb9 Mon Sep 17 00:00:00 2001 +From d2cd7dd33b3e111038112d1d5febb4c935f12989 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 7 Aug 2020 13:55:18 +0100 -Subject: [PATCH 1063/1224] dts: bcm2711: Disable DVP by default +Subject: [PATCH 1063/1225] dts: bcm2711: Disable DVP by default The HDMI DVP should be disabled by default as is the case for other display related drivers. This changes resolves an issue when using @@ -456710,10 +456710,10 @@ index 935e9469e318a..3c662cea4e1f0 100644 2.18.4 -From e7912710ab178b8b978d77f01ce6b27703376d6b Mon Sep 17 00:00:00 2001 +From 6b3034c25b38ea906938b9cb38a3c87fa52b028f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Aug 2020 17:34:27 +0100 -Subject: [PATCH 1064/1224] config: Add USB gadget support to bcm2711 config +Subject: [PATCH 1064/1225] config: Add USB gadget support to bcm2711 config Signed-off-by: Phil Elwell --- @@ -456769,10 +456769,10 @@ index 0855074345211..7ea2b663bdc06 100644 2.18.4 -From afb93c53d20301bfa6cafa0f0c86607dad4355cf Mon Sep 17 00:00:00 2001 +From e292675c38f2d356f9a612d31f219fe22748cd19 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Aug 2020 17:35:48 +0100 -Subject: [PATCH 1065/1224] ARM: dts: Add required USB power domain for XCHI +Subject: [PATCH 1065/1225] ARM: dts: Add required USB power domain for XCHI The firmware setting otg_mode=1 can be used to enable the onboard XHCI controller in host mode, but that requires that the USB power domain @@ -456799,10 +456799,10 @@ index 0d804cc824e0c..b624ab54ad059 100644 2.18.4 -From d4fd96d2ed4f4593d0bac422123efe10132b10bb Mon Sep 17 00:00:00 2001 +From 687532837443a42a4d348b364dfee3238b467c58 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Aug 2020 10:15:52 +0100 -Subject: [PATCH 1066/1224] overlays: Regenerate upstream-pi4 +Subject: [PATCH 1066/1225] overlays: Regenerate upstream-pi4 The recent modification to vc4-kms-v3d-pi4 also results in a change to the Pi 4 version of the upstream overlay. @@ -456833,10 +456833,10 @@ index 30130f09fbc66..d88bbcfc36d10 100644 2.18.4 -From 777cd2500a67e13e9c2af959d12dba8b441ac0e8 Mon Sep 17 00:00:00 2001 +From a1db74f9c5c6d95acc03d3a42c8894bb5ff7cc27 Mon Sep 17 00:00:00 2001 From: Qiujun Huang Date: Sat, 4 Apr 2020 12:18:38 +0800 -Subject: [PATCH 1067/1224] ath9k: Fix general protection fault in +Subject: [PATCH 1067/1225] ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -457058,10 +457058,10 @@ index a94e7e1c86e98..5985aa15ca931 100644 2.18.4 -From 4de40f362a71c07f5eab0be5ce0494975fb266a6 Mon Sep 17 00:00:00 2001 +From 6aaf33d22ddd96bda9f8c730ae43044635699e78 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Jul 2020 16:42:57 +0100 -Subject: [PATCH 1068/1224] drm/vc4: Increase the number of planes per crtc in +Subject: [PATCH 1068/1225] drm/vc4: Increase the number of planes per crtc in FKMS. The number assigned was arbitrary as one primary, one overlay, @@ -457169,10 +457169,10 @@ index 7802020cc3c0e..bafdd12652899 100644 2.18.4 -From fa48b5b3b16a6daa0ac036d9a6821d960561fa91 Mon Sep 17 00:00:00 2001 +From b49ca34ac48b2ec528705f6ff1cc89a52ff6a490 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 18:29:56 +0100 -Subject: [PATCH 1069/1224] drm/vc4: Set the possible crtcs mask correctly for +Subject: [PATCH 1069/1225] drm/vc4: Set the possible crtcs mask correctly for planes with FKMS The driver was assigning all planes to crtcs when actually they're @@ -457215,10 +457215,10 @@ index bafdd12652899..0063d78a1b4a4 100644 2.18.4 -From 2cd54abf2b8e924264573e9fe995f431b3769106 Mon Sep 17 00:00:00 2001 +From 1e62b78c91bbe667631bee7ff4a9dea37bb951fd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 16:58:18 +0100 -Subject: [PATCH 1070/1224] staging: vc04_services: codec: Fix incorrect buffer +Subject: [PATCH 1070/1225] staging: vc04_services: codec: Fix incorrect buffer cleanup The allocated input and output buffers are initialised in @@ -457273,10 +457273,10 @@ index 3fe81979aaa16..b6c5a66b4b4aa 100644 2.18.4 -From 03df6b3d64d4aa029ed6b63a91581ad853a67ba3 Mon Sep 17 00:00:00 2001 +From b38f2057e16d452d407156f54432258b350fc0d9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 17:01:27 +0100 -Subject: [PATCH 1071/1224] staging: vc04_service: codec: Allow start_streaming +Subject: [PATCH 1071/1225] staging: vc04_service: codec: Allow start_streaming to update the buffernum start_streaming passes a count of how many buffers have been queued @@ -457349,10 +457349,10 @@ index b6c5a66b4b4aa..427048c0ea31d 100644 2.18.4 -From ef077f4af05471149cffb8e399bcbc0cb757e036 Mon Sep 17 00:00:00 2001 +From a78e21ee0b957a13d40e1ad5d65d5b7da483edc9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 17:04:53 +0100 -Subject: [PATCH 1072/1224] staging: vc04_services: codec: Fix component +Subject: [PATCH 1072/1225] staging: vc04_services: codec: Fix component enable/disable start_streaming enabled the VPU component if ctx->component_enabled @@ -457393,10 +457393,10 @@ index 427048c0ea31d..14c47e2ea9955 100644 2.18.4 -From f4f998f07b2ba4efc40d5ac132102a46afa944be Mon Sep 17 00:00:00 2001 +From 4d45bb465166d8fd6218147af7af072e40d2c4e0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 14 Aug 2020 17:29:29 +0100 -Subject: [PATCH 1073/1224] configs: Add USB_GADGET=m to bcmrpi3_defconfig +Subject: [PATCH 1073/1225] configs: Add USB_GADGET=m to bcmrpi3_defconfig See: https://github.com/raspberrypi/linux/issues/3796 @@ -457421,10 +457421,10 @@ index 497a14e0a6aa4..65432c8552026 100644 2.18.4 -From de421511aa448d9c2e854c4edfc5caf19d4c5a23 Mon Sep 17 00:00:00 2001 +From bef0a66d9293f3e5d6daf4074f4cc51ddd5ff1f9 Mon Sep 17 00:00:00 2001 From: Andreas Watterott <1488433+awatterott@users.noreply.github.com> Date: Mon, 17 Aug 2020 21:17:09 +0200 -Subject: [PATCH 1074/1224] update rpi-display-overlay.dts pins for 5.4 +Subject: [PATCH 1074/1225] update rpi-display-overlay.dts pins for 5.4 --- arch/arm/boot/dts/overlays/rpi-display-overlay.dts | 6 +++--- @@ -457459,10 +457459,10 @@ index a5eed07d6a4b4..de87432ff2bea 100644 2.18.4 -From 463ba7c808fbc2cbad99a510737bf82dc42a1595 Mon Sep 17 00:00:00 2001 +From 33976f6d37766d0a0077d30ada7f7dc7d40807cb Mon Sep 17 00:00:00 2001 From: "Ziqian SUN (Zamir)" Date: Sat, 11 Apr 2020 09:34:27 +0800 -Subject: [PATCH 1075/1224] Bluetooth: btrtl: Add support for RTL8761B +Subject: [PATCH 1075/1225] Bluetooth: btrtl: Add support for RTL8761B commit 04896832c94aae4842100cafb8d3a73e1bed3a45 upstream. @@ -457542,10 +457542,10 @@ index 0dfaf90a31b06..6cfdef7fc4b18 100644 2.18.4 -From 63d956136d5d748cb1bfa18203473999039621bb Mon Sep 17 00:00:00 2001 +From 1ae21007a7ebfb57b1ccd5ffb720545eff1d8a62 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 17 Aug 2020 18:11:47 +0100 -Subject: [PATCH 1076/1224] dtoverlays: Add overlay for the PCA953x family of +Subject: [PATCH 1076/1225] dtoverlays: Add overlay for the PCA953x family of GPIO expanders Adds an overlay for configuring all the GPIO expanders supported @@ -457868,10 +457868,10 @@ index 0000000000000..8b6ee44665cee 2.18.4 -From 2ad5b60dca014981a2fffa6272837c25e460333b Mon Sep 17 00:00:00 2001 +From 8c92ed7d84858b927b74b4a3e8432f0d48d8aa40 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 15 May 2020 16:28:32 +0100 -Subject: [PATCH 1077/1224] rtc: rv3028: Write BSM and TCE/TCR to EEPROM +Subject: [PATCH 1077/1225] rtc: rv3028: Write BSM and TCE/TCR to EEPROM Periodically the RV3028 refreshes registers from the EEPROM. When this happens, some settings that have only been committed to registers are @@ -457994,10 +457994,10 @@ index 8b2446909a1bb..e02ae4b1cbc2a 100644 2.18.4 -From 4d3e89d218259638bb4516383a031a21a5a688b9 Mon Sep 17 00:00:00 2001 +From 86f3d1db95be91192154026ed77af3bcf53ded42 Mon Sep 17 00:00:00 2001 From: Einar Vading Date: Fri, 14 Aug 2020 22:14:41 +0200 -Subject: [PATCH 1078/1224] rtc: rv3028: Refresh RAM on EEPROM write +Subject: [PATCH 1078/1225] rtc: rv3028: Refresh RAM on EEPROM write The active RV3028 settings are in RAM so after modifying the settings in EEPROM the RAM should be refreshed so that they take effect. @@ -458092,10 +458092,10 @@ index e02ae4b1cbc2a..99d10d7ead2f4 100644 2.18.4 -From 32c8b9dca22bab20e3e6ee4094309c3f7041c258 Mon Sep 17 00:00:00 2001 +From 3efa48345177ad55bfae83a0d443bb2b95b95cbe Mon Sep 17 00:00:00 2001 From: Thomas Preston Date: Thu, 13 Aug 2020 01:38:35 +0100 -Subject: [PATCH 1079/1224] dt/overlays: Add PiFace Digital Device Tree Overlay +Subject: [PATCH 1079/1225] dt/overlays: Add PiFace Digital Device Tree Overlay The PiFace Digital is a convenient breakout board for the Microchip mcp23s17 SPI GPIO port expander. @@ -458302,10 +458302,10 @@ index 0000000000000..532a858683d6f 2.18.4 -From cd0165b128f6ad5ef3183a474db478d9c9612bae Mon Sep 17 00:00:00 2001 +From 0265698d6be4947ef36242279c5b348786678b7f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 18 Aug 2020 13:16:39 +0100 -Subject: [PATCH 1080/1224] configs: Add CONFIG_UEVENT_HELPER=y +Subject: [PATCH 1080/1225] configs: Add CONFIG_UEVENT_HELPER=y See: https://github.com/raspberrypi/linux/issues/3785 @@ -458382,10 +458382,10 @@ index 65432c8552026..9c6ada12bebf3 100644 2.18.4 -From 18a8b502a66b8cdf17f702540256931dfba0ddb2 Mon Sep 17 00:00:00 2001 +From 1c66510e134d3bc523102486cfb287a4aefd9857 Mon Sep 17 00:00:00 2001 From: RICCIARDI-Adrien Date: Thu, 20 Aug 2020 10:18:35 +0200 -Subject: [PATCH 1081/1224] overlays: Updated MCP3008 compatible strings. +Subject: [PATCH 1081/1225] overlays: Updated MCP3008 compatible strings. Used recommended ones from Documentation/devicetree/bindings/iio/adc/mcp320x.txt. --- @@ -458472,10 +458472,10 @@ index 0b7d9f75546ef..957fdb9310af4 100755 2.18.4 -From adbdb18433968a7b87529a4c793e41a1c9a68b7d Mon Sep 17 00:00:00 2001 +From 4779786d441baa19c49e5adf25de4119677c3c6a Mon Sep 17 00:00:00 2001 From: Ramin Moussavi Date: Sat, 25 Jul 2020 22:31:49 +0200 -Subject: [PATCH 1082/1224] RESET_CONTROLLER needs to be activated to compile +Subject: [PATCH 1082/1225] RESET_CONTROLLER needs to be activated to compile Broadcom BCM2835 clock support --- @@ -458498,10 +458498,10 @@ index 03bbd80404514..2d32eeca01538 100644 2.18.4 -From bfe9da3cc864b64ce99ce97940e508ad5a50c5f8 Mon Sep 17 00:00:00 2001 +From a86700facf5a1664a65587d6be1b9c663ef52d53 Mon Sep 17 00:00:00 2001 From: Andrei Koshkosh Date: Sun, 29 Sep 2019 05:04:05 -0300 -Subject: [PATCH 1083/1224] media: dvbsky: use a single mutex and state buffers +Subject: [PATCH 1083/1225] media: dvbsky: use a single mutex and state buffers for all R/W ops commit cecf0bbbcb6f035a5ca2197f3e11ec2b7fb3da83 upstream. @@ -458568,10 +458568,10 @@ index dc380c0c95369..199ba6a8201f8 100644 2.18.4 -From c4029430b0b914c3e62be8cc8948356a3745dc2a Mon Sep 17 00:00:00 2001 +From 6871f3df86314b94452a1206ee4bd067ca14843f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 24 Aug 2020 17:11:34 +0100 -Subject: [PATCH 1084/1224] ARM: dts: bcm2711: Enable support for DDR52 eMMC +Subject: [PATCH 1084/1225] ARM: dts: bcm2711: Enable support for DDR52 eMMC See: https://github.com/raspberrypi/linux/issues/3802 @@ -458596,10 +458596,10 @@ index b624ab54ad059..0556c73e332aa 100644 2.18.4 -From 2081fb92b9e3f7d4833ea4caf68e0f314bc95881 Mon Sep 17 00:00:00 2001 +From 90bc097ad15ca39497c371a14a04152a1d38698c Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Mon, 24 Aug 2020 17:14:29 +0900 -Subject: [PATCH 1085/1224] staging: vc04_services: ISP: Fix dmabuf error check +Subject: [PATCH 1085/1225] staging: vc04_services: ISP: Fix dmabuf error check in S_CTRL In bcm2835_isp_s_ctrl, the error check for dma_buf_get() is incorrect, @@ -458627,10 +458627,10 @@ index db38649124b77..f3703f2a01438 100644 2.18.4 -From 33dde5f77aa3be48d56e31642f3cc9b673545233 Mon Sep 17 00:00:00 2001 +From 7d303b3108c703d4018562fcd21bac5ded3ac490 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 24 Aug 2020 18:28:52 +0100 -Subject: [PATCH 1086/1224] ARM: dts: bcm2708.dtsi: Don't delete the cpus node +Subject: [PATCH 1086/1225] ARM: dts: bcm2708.dtsi: Don't delete the cpus node The cpus node was originally deleted to match the then downstream version of the BCM2835 DTS files, but doing so doesn't seem to make @@ -458659,10 +458659,10 @@ index a32ff21613eda..36ec4989403f5 100644 2.18.4 -From b1999dc0dd152cc50dd22932ad7973e7e850a90a Mon Sep 17 00:00:00 2001 +From 02ff5aabeea53727da3395b8c6ff8f774f2eb8cd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 11:06:20 +0100 -Subject: [PATCH 1087/1224] ARM: dts: bcm2711: Add mmc_ddr_1_8v where possible +Subject: [PATCH 1087/1225] ARM: dts: bcm2711: Add mmc_ddr_1_8v where possible Advertise mmc_ddr_1_8v on platforms that support 1.8V SD/MMC DDR52. @@ -458704,10 +458704,10 @@ index d4ea928e30ce6..823aeeca393de 100644 2.18.4 -From c8ce0f20bf42669d9991e3126b651343e0c4e6c4 Mon Sep 17 00:00:00 2001 +From c2f81fda0b1e2a06d61bd6d15777033e0804d0a6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 14:06:34 +0100 -Subject: [PATCH 1088/1224] configs: Add I2C_HID=m +Subject: [PATCH 1088/1225] configs: Add I2C_HID=m Enable support for I2C HID devices. @@ -458786,10 +458786,10 @@ index 9c6ada12bebf3..f278668e178d7 100644 2.18.4 -From af77531f0839f3a6b56f5375e09319166b24e077 Mon Sep 17 00:00:00 2001 +From 6ffd6750c719dce76ed41a999c27502b4fbadeb1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 14:19:51 +0100 -Subject: [PATCH 1089/1224] Revert "ARM: dts: bcm2711: Add mmc_ddr_1_8v where +Subject: [PATCH 1089/1225] Revert "ARM: dts: bcm2711: Add mmc_ddr_1_8v where possible" The commit being reverted has been seen to prevent booting with an eMMC @@ -458833,10 +458833,10 @@ index 823aeeca393de..d4ea928e30ce6 100644 2.18.4 -From 7ed47dfb0666d613f196358ca8a086fcf83c4319 Mon Sep 17 00:00:00 2001 +From aaac1895ee32d14d4ccf1df040a53b241d9e6734 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 17:08:17 +0100 -Subject: [PATCH 1090/1224] configs: Add CONFIG_SPS30=m +Subject: [PATCH 1090/1225] configs: Add CONFIG_SPS30=m Enable the driver for the Sensirion SPS30 particulate matter sensor. The i2c-sensor overlay already has support for the device, but it does @@ -458917,10 +458917,10 @@ index f278668e178d7..a69ed1899039c 100644 2.18.4 -From 882eef7ce4b11d7d197f155ad2030d97188848e9 Mon Sep 17 00:00:00 2001 +From 01d116cd3199b139dd4baf05d6578c2fd0b330ae Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 24 Aug 2020 17:30:06 +0100 -Subject: [PATCH 1091/1224] Revert "raspberrypi-cpufreq: Only report integer +Subject: [PATCH 1091/1225] Revert "raspberrypi-cpufreq: Only report integer pll divisor frequencies" This reverts commit f44019c198fdfea0c880f5e64641b8a43c13e829. @@ -458964,10 +458964,10 @@ index 8bcfab2749a8d..2bc7d9734272a 100644 2.18.4 -From 8a60efcfe7bd0651c9fcac91c834c9d9ff8e36c8 Mon Sep 17 00:00:00 2001 +From a224acd1dcb90c49f716661f0d3aa90248798fec Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 25 Aug 2020 11:26:04 +0100 -Subject: [PATCH 1092/1224] configs: Enable upstream cpufreq driver for pi0/pi1 +Subject: [PATCH 1092/1225] configs: Enable upstream cpufreq driver for pi0/pi1 Signed-off-by: popcornmix --- @@ -458992,10 +458992,10 @@ index 9789478cc4d17..d681885c1d2b8 100644 2.18.4 -From 6a6a938eb1693f6ed21da3ddd04cdb985f2681fe Mon Sep 17 00:00:00 2001 +From 5f7327aaabbfe58d88123cde2912a270e12e5469 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Aug 2020 17:57:18 +0100 -Subject: [PATCH 1093/1224] ARM: dts: bcm2835: Use the L2 non-allocating alias +Subject: [PATCH 1093/1225] ARM: dts: bcm2835: Use the L2 non-allocating alias The /soc/dma-ranges property on BCM2835 currently results in DMA addresses in the range 0x40000000-0x5fffffff. This will allocate in the @@ -459028,10 +459028,10 @@ index 53bf4579cc224..b94d5ec3f332c 100644 2.18.4 -From b4a74fb973c7ef2e35005bd8c82486e20b8e696e Mon Sep 17 00:00:00 2001 +From 4daa3a7f67b4b3203cb806aa32df557ab2d866f2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 27 Aug 2020 16:30:26 +0100 -Subject: [PATCH 1094/1224] media: bcm2835-unicam: Drop WARN on uing direct +Subject: [PATCH 1094/1225] media: bcm2835-unicam: Drop WARN on uing direct cache alias Pi 0&1 pass all ARM accesses through the VPU L2 cache, therefore @@ -459068,10 +459068,10 @@ index 57c3c5f5db56f..6501fb205e205 100644 2.18.4 -From bd338f5ade1965e0394a0a2b3728ddc72b90e3ca Mon Sep 17 00:00:00 2001 +From 8d4cb330eb9a4e7786f7f22a3e7859cb5e467751 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 Jul 2020 12:40:50 +0100 -Subject: [PATCH 1095/1224] media: i2c: tc358743: Only allow supported pixel +Subject: [PATCH 1095/1225] media: i2c: tc358743: Only allow supported pixel fmts in set_fmt Fix commit "media: tc358743: Return an appropriate colorspace from @@ -459104,10 +459104,10 @@ index b3b8d6e15ea2b..eef6ab823c6cb 100644 2.18.4 -From 3453fe9da402465d284e89538a6d487629173ecb Mon Sep 17 00:00:00 2001 +From 1f3b3d9391f70848d65fac6e8198b2f516639921 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 18:29:10 +0100 -Subject: [PATCH 1096/1224] media: i2c: ov9281: Add support for 8 bit readout +Subject: [PATCH 1096/1225] 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. @@ -459298,10 +459298,10 @@ index bb8efc3d3cba8..9610c24ceff18 100644 2.18.4 -From 920581d4df0ac2b4cb48c4391c82ff43b9b21483 Mon Sep 17 00:00:00 2001 +From 3ee53c94f557c0c37ab0f4d0e8890e48cee4f687 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Aug 2020 12:55:41 +0100 -Subject: [PATCH 1097/1224] overlays: Add spi0-1cs and spi0-2cs +Subject: [PATCH 1097/1225] overlays: Add spi0-1cs and spi0-2cs The spi0-1cs overlay allows the SPI0 interface to be run with a single CS line, which can be useful if GPIOs are in short supply. The no_miso @@ -459464,10 +459464,10 @@ index ff41439a483af..df6519537c3a8 100644 2.18.4 -From 53bf5060e42daa446e11f4a243cc2720b4abee5e Mon Sep 17 00:00:00 2001 +From 6d2e1ea0f0089c97249cb0e4eeac17247f82b472 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Aug 2020 22:04:05 +0100 -Subject: [PATCH 1098/1224] overlays: Fix error in README +Subject: [PATCH 1098/1225] overlays: Fix error in README spi0-cs has been renamed spi0-2cs, not spi0-1cs. @@ -459493,10 +459493,10 @@ index a0adf476eafae..e2d90595c3c04 100644 2.18.4 -From be9b1713192d9fe84e7c18a569109df9def2c170 Mon Sep 17 00:00:00 2001 +From c28c6af9c95b2b06a0221177ea37f907fbd485b1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 15:46:28 +0100 -Subject: [PATCH 1099/1224] configs: Make the evdev module a built-in +Subject: [PATCH 1099/1225] configs: Make the evdev module a built-in The evdev module is required to use a keyboard (although not a mouse, it appears). This means that if a kernel is unable to load modules the @@ -459583,10 +459583,10 @@ index a69ed1899039c..93c935bc9fb64 100644 2.18.4 -From 4cd6592247d73e7d3f1c8aec1897c40531dede8c Mon Sep 17 00:00:00 2001 +From 368611dcfb5665c98f72557e379ffddf1300d777 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 17:31:31 +0100 -Subject: [PATCH 1100/1224] configs: Include AppArmor support +Subject: [PATCH 1100/1225] configs: Include AppArmor support AppArmor security has been a long-requested feature. This commit adds the config settings necessary to allow it to be enabled at boot @@ -459795,10 +459795,10 @@ index 93c935bc9fb64..e5696e1c86c20 100644 2.18.4 -From cc5d1877c1e428e375dbb50172a935fb491d50a0 Mon Sep 17 00:00:00 2001 +From 2d5f6eeff71ea1bf526fb1b33b0a62a8bae5d834 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 2 Sep 2020 08:39:57 +0100 -Subject: [PATCH 1101/1224] overlays: Minor README correction +Subject: [PATCH 1101/1225] overlays: Minor README correction Signed-off-by: Phil Elwell --- @@ -459822,10 +459822,10 @@ index e2d90595c3c04..9662d297ac6fd 100644 2.18.4 -From a5f759fd1be9c3de6e059defe97fd1e2542d4660 Mon Sep 17 00:00:00 2001 +From 1d9688186f27f84e2e02a5b404f1c76fa4ce3c8d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 18:15:27 +0100 -Subject: [PATCH 1102/1224] staging/fbtft: Add support for display variants +Subject: [PATCH 1102/1225] 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 @@ -460036,10 +460036,10 @@ index 9b6bdb62093d7..c5703cd5ec7d8 100644 2.18.4 -From d4066ca8530f8d1e001d94e78a762114b892a2c4 Mon Sep 17 00:00:00 2001 +From af1d9d3c2d6f8e69e96529e18b4743f519e37282 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 3 Sep 2020 17:36:00 +0100 -Subject: [PATCH 1103/1224] overlays: Add adafruit18 and sainsmart18 overlays +Subject: [PATCH 1103/1225] overlays: Add adafruit18 and sainsmart18 overlays Add support for three ST7735R-based displays - adafruit18, adafruit18_green and sainsmart18. @@ -460219,10 +460219,10 @@ index 0000000000000..38bbe2cfc207a 2.18.4 -From 3cf9324e23127933047784a814910ddfdf9ce8c5 Mon Sep 17 00:00:00 2001 +From 7fb133977e4dba5be63d8753d6c0990b212ae52f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 4 Sep 2020 09:04:29 +0100 -Subject: [PATCH 1104/1224] ARM: dts: Limit BT modem baud rate on 3B +Subject: [PATCH 1104/1225] ARM: dts: Limit BT modem baud rate on 3B The 3B doesn't have the flow control signals connected to the BT modem, which limits the maximum usable baud rate to below 1 Mbaud. Use @@ -460253,10 +460253,10 @@ index e833915a7854d..7dc3ef47e78fd 100644 2.18.4 -From bb43b681e5cd28cf448b93abc7c8365e9d034c93 Mon Sep 17 00:00:00 2001 +From ccc30ddb12a75e173c1d751dcef9dde6616c36fb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Sep 2020 13:47:20 +0100 -Subject: [PATCH 1105/1224] configs: Enable CHACHA20POLY1305=m +Subject: [PATCH 1105/1225] configs: Enable CHACHA20POLY1305=m Enable the CHACHA20 cipher, a high-performance AES alternative, and the POLY1305 authentication algorithm. Together they make up RFC-7539. @@ -460338,10 +460338,10 @@ index e5696e1c86c20..a32bad78a0a34 100644 2.18.4 -From 1fa230c6fee1a1ae00434a80bae8ddc084e9d095 Mon Sep 17 00:00:00 2001 +From 92c8ac3b5451d4c43db4ad661fbaeb0d7fb237a7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 3 Sep 2020 14:59:40 +0100 -Subject: [PATCH 1106/1224] overlays: Update i2c0 overlay to disable the +Subject: [PATCH 1106/1225] overlays: Update i2c0 overlay to disable the i2c0mux. The i2c0 overlay was assigning pinctrl settings to node i2c0, @@ -460416,10 +460416,10 @@ index 6b1f9ec6c8782..7c6771f84d8ed 100644 2.18.4 -From d72f0336ae89e562710ba26e3a99415f1ebc5e08 Mon Sep 17 00:00:00 2001 +From 780c8ca606347c66e52eac512e96eb45d2a28cb7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 3 Sep 2020 15:12:50 +0100 -Subject: [PATCH 1107/1224] dt: Remove duplicate assignment for i2c0 pinctrl +Subject: [PATCH 1107/1225] dt: Remove duplicate assignment for i2c0 pinctrl config The include file bcm283x-rpi-i2c0mux_0_XX.dtsi was setting @@ -460595,10 +460595,10 @@ index 88f7fe53b97f2..f972979281f52 100644 2.18.4 -From ecc1319abbb744cd7f679e917189f6706c7c07c0 Mon Sep 17 00:00:00 2001 +From 16aecfc74f67af2b766ffa6b64dc9e487ba5f7f4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 27 Aug 2020 18:57:26 +0100 -Subject: [PATCH 1108/1224] overlays: Add option for composite to +Subject: [PATCH 1108/1225] overlays: Add option for composite to vc4-kms-v3d-pi4. Composite is an alternative to HDMI/DPI/DSI on Pi4 as it @@ -460671,10 +460671,10 @@ index 3c662cea4e1f0..f721f12d729d0 100644 2.18.4 -From dc57f0afc49972f4080592566fcf2aac14c21063 Mon Sep 17 00:00:00 2001 +From 51f84d195e9ef8cb44bcbf4c7a6955425191a54b Mon Sep 17 00:00:00 2001 From: lsellens Date: Mon, 14 Sep 2020 22:35:39 -0500 -Subject: [PATCH 1109/1224] minor typo in directions +Subject: [PATCH 1109/1225] minor typo in directions --- arch/arm/boot/dts/overlays/gpio-fan-overlay.dts | 2 +- @@ -460697,10 +460697,10 @@ index 0b14981b4824e..77a7bbb41e3bd 100644 2.18.4 -From b3c26a22ef2fc6a3b286622699b80119c82f97d1 Mon Sep 17 00:00:00 2001 +From e1ef9d637780a33e87db5cae19a98a3e9a6b77d8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 14 Sep 2020 15:49:38 +0100 -Subject: [PATCH 1110/1224] overlays: Regenerate upstream-pi4 overlay +Subject: [PATCH 1110/1225] overlays: Regenerate upstream-pi4 overlay Signed-off-by: Phil Elwell --- @@ -460734,10 +460734,10 @@ index d88bbcfc36d10..5673f61b79518 100644 2.18.4 -From dbb6533dfb89b57b64a25f0d6b94f4033bd3626f Mon Sep 17 00:00:00 2001 +From e99a654fecb36d8ba0748673883f6b5079e03c0d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 14 Sep 2020 15:48:16 +0100 -Subject: [PATCH 1111/1224] overlays: Add parameters to adafruit18, sainsmart18 +Subject: [PATCH 1111/1225] overlays: Add parameters to adafruit18, sainsmart18 Also fix polarity of the reset GPIO. @@ -460838,10 +460838,10 @@ index 38bbe2cfc207a..ce2f942ba3162 100644 2.18.4 -From b0481bb4c194dad6bc23055dfe8e50265d12513a Mon Sep 17 00:00:00 2001 +From 9b76595326a9d0a5a00d11554410e85929a2d0e2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 21 Sep 2020 14:02:44 +0100 -Subject: [PATCH 1112/1224] rpivid_h265: Fix width/height typo +Subject: [PATCH 1112/1225] rpivid_h265: Fix width/height typo Signed-off-by: popcornmix --- @@ -460865,10 +460865,10 @@ index 47d4de42c5844..b677910e237c6 100644 2.18.4 -From 269121b3dd610c46120a54a61d9dde31a26e093c Mon Sep 17 00:00:00 2001 +From 6af94de9b62ae2839409c4755c40d98f1444a504 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 21 Sep 2020 22:00:10 +0100 -Subject: [PATCH 1113/1224] overlays: Add extra CMA sizes (up to 512M) +Subject: [PATCH 1113/1225] overlays: Add extra CMA sizes (up to 512M) Signed-off-by: Phil Elwell --- @@ -460951,10 +460951,10 @@ index 4fbdf161672e3..1d87c599f909d 100644 2.18.4 -From e799405797b1648d1ce399ba283a200d7cffebcd Mon Sep 17 00:00:00 2001 +From f8b84bbad085803b6d864fcdcce11260adbd50e7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 21 Sep 2020 22:09:40 +0100 -Subject: [PATCH 1114/1224] overlays: Add note to BCM2711 overlays +Subject: [PATCH 1114/1225] overlays: Add note to BCM2711 overlays Signed-off-by: Phil Elwell --- @@ -461107,10 +461107,10 @@ index afd40f84a342d..5118f477cc13e 100644 2.18.4 -From 009287cf09056091744765f6de19a4df149d6f3a Mon Sep 17 00:00:00 2001 +From 86083a82e66ede3e1043fb3d4abbe8c7635fb089 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 21 Sep 2020 20:45:46 +0100 -Subject: [PATCH 1115/1224] overlays: adafruit18,sainsmart18: default bgr to +Subject: [PATCH 1115/1225] overlays: adafruit18,sainsmart18: default bgr to off Signed-off-by: Phil Elwell @@ -461170,10 +461170,10 @@ index ce2f942ba3162..c51f1c030a557 100644 2.18.4 -From 180eea7050de840961126f9b2b2cff157b4793fc Mon Sep 17 00:00:00 2001 +From df56a1d0bb32fe31efb60b01cd055d1c273d0290 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 25 Sep 2020 17:50:14 +0100 -Subject: [PATCH 1116/1224] configs: Remove I2C_BRCMSTB from the kernel +Subject: [PATCH 1116/1225] configs: Remove I2C_BRCMSTB from the kernel Make it a module on 2711-based platforms, otherwise delete it altogether, @@ -461251,10 +461251,10 @@ index a32bad78a0a34..7f159969011eb 100644 2.18.4 -From 8f4c2e9582d7eb25cc5ddd68c46ebefdc03df38c Mon Sep 17 00:00:00 2001 +From 21a983aaa7616f4e0c72daf6df12ecafc7b4423b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 25 Sep 2020 15:07:23 +0100 -Subject: [PATCH 1117/1224] net: bcmgenet: Reset RBUF on first open +Subject: [PATCH 1117/1225] 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 @@ -461327,10 +461327,10 @@ index aba145a144b46..d17f2a229ab9f 100644 2.18.4 -From 0bb303603d4a69d218ebb56bea1d04bcb1d99fca Mon Sep 17 00:00:00 2001 +From 884b5ef004af32fbadd285dbe19bacfbe1da7ec0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 29 Sep 2020 15:03:34 +0100 -Subject: [PATCH 1118/1224] ASoC: cs42xx8: Only define cs42xx8_of_match once +Subject: [PATCH 1118/1225] ASoC: cs42xx8: Only define cs42xx8_of_match once cs42xx8.c exports cs42xx8_of_match, so there's no need to redefine it in cs42xx8-i2c.c - doing so breaks linking when loadable module @@ -461376,10 +461376,10 @@ index a4586ea4acf6e..b8b15b886c224 100644 2.18.4 -From 281e54d5734b67d2f384d0ca36ce4ea4d6f5a921 Mon Sep 17 00:00:00 2001 +From b2cb4c036f1f52832382b5c7ce98ab57e8fd4e85 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:28:37 +0100 -Subject: [PATCH 1119/1224] configs: Regenerate the defconfigs +Subject: [PATCH 1119/1225] configs: Regenerate the defconfigs Signed-off-by: Phil Elwell --- @@ -461431,10 +461431,10 @@ index 7f159969011eb..c838461038e6d 100644 2.18.4 -From 3f8c07eb65d4bd38653c41c0da0ea91c3fbc8c73 Mon Sep 17 00:00:00 2001 +From 182eec036f983b6dd906e6aa62c35ac47040db92 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 30 Sep 2020 12:12:32 +0100 -Subject: [PATCH 1120/1224] staging: bcm2835-codec: Use a define the completion +Subject: [PATCH 1120/1225] staging: bcm2835-codec: Use a define the completion timeout Hiding a use of "HZ" as a timeout is a little nasty. @@ -461472,10 +461472,10 @@ index 14c47e2ea9955..f3dfc7fda8849 100644 2.18.4 -From bc1bea8bce1fa8c4c7bcd7baf917f61ae0845982 Mon Sep 17 00:00:00 2001 +From 423b8f2a14d39443f80da0fb47ec6e8818a4b28e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 30 Sep 2020 12:13:44 +0100 -Subject: [PATCH 1121/1224] staging: bcm2835-codec: Correct buffer number +Subject: [PATCH 1121/1225] staging: bcm2835-codec: Correct buffer number change on start streaming "cac8c90 staging: vc04_service: codec: Allow start_streaming to update @@ -461508,10 +461508,10 @@ index f3dfc7fda8849..b1e00e65ce186 100644 2.18.4 -From 8d17ab86cb8a183e64173941e8f82d949a300c22 Mon Sep 17 00:00:00 2001 +From 069338ffdebb418fdc4e24f4330533de3e1f0817 Mon Sep 17 00:00:00 2001 From: Adrian Carpenter Date: Wed, 14 Aug 2019 15:33:36 +0100 -Subject: [PATCH 1122/1224] usb/dwc2: Set correct state on gadget disconnect +Subject: [PATCH 1122/1225] usb/dwc2: Set correct state on gadget disconnect When operating as a USB device, when the device is disconnected the suspend interrupt is called rather than the disconnect interrupt, this results in the state remaining as "configured". This change changes the state to "not attached" instead when the suspend interrupt is called. --- @@ -461545,10 +461545,10 @@ index 6272b4ae4740f..11c8893fbc1ab 100644 2.18.4 -From 4665e0d5164be90feed2a64cc6ae2c81f64925a5 Mon Sep 17 00:00:00 2001 +From 3032917568f52fa2fb1e533378ca102e7a66b7bf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 19:23:43 +0100 -Subject: [PATCH 1123/1224] USB: gadget: f_hid: avoid crashes and log spam +Subject: [PATCH 1123/1225] 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. @@ -461607,10 +461607,10 @@ index f3816a5c861ee..00fae22e941a9 100644 2.18.4 -From 61a3166ed274c0441dc34bd75d8c86f14b92013d Mon Sep 17 00:00:00 2001 +From ce98cfa52ab084d1b57d9e37ccd7b43e38b562e5 Mon Sep 17 00:00:00 2001 From: newbloke82 <39644602+newbloke82@users.noreply.github.com> Date: Thu, 1 Oct 2020 19:16:35 +0200 -Subject: [PATCH 1124/1224] Update hy28b-overlay.dts +Subject: [PATCH 1124/1225] Update hy28b-overlay.dts My hy28b TFT stopped working on upgrade to 5.4 kernel. I had a whitescreen but no obvious errors when using 'sudo vcdbg log msg' or 'dmesg'. Both /dev/fb0 and /dev/fb1 were present. Followed this article on waveshare32b that 'reset_gpios needed to be 0 0 1 instead of 0 0 0' (https://forum.armbian.com/topic/13233-any-clues-for-the-creation-of-a-dtoverlay-for-fbtft-on-54y/). I applied a similar change to this dts file and compiled a new dtbo: 'dtc -O dtb -o hy28b.dtbo hy28b-overlay.dts'. Fixed my issue - may help others? I got from the 5.4 upgrade thread that other tft users are having issues with small tfts... https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769&p=1706597&hilit=gpio#p1706597 --- @@ -461634,10 +461634,10 @@ index 2e5e20f327a3c..9edd0848d5550 100644 2.18.4 -From 2ef9685f9e2391eabba6905c2c10f3aac1d6ffa9 Mon Sep 17 00:00:00 2001 +From 1f114e12159393c25b36ea023bfc5cfa667b14ec Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 2 Oct 2020 10:06:49 +0100 -Subject: [PATCH 1125/1224] overlays: Update display GPIO declarations +Subject: [PATCH 1125/1225] overlays: Update display GPIO declarations The 5.4 kernel changes the way a number of display drivers use GPIOs. That change has exposed flaws/broken a number of display overlays, so @@ -461830,10 +461830,10 @@ index 254ac2e0a2144..a102b09e3ab56 100644 2.18.4 -From 4d903975742d572f0a4dd974899b711b2d5a2029 Mon Sep 17 00:00:00 2001 +From cf91d3989f67848ed0796dfff6ca402fc50cdbf7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Oct 2020 15:41:15 +0100 -Subject: [PATCH 1126/1224] SQUASH: USB: gadget: f_hid: remove more spam +Subject: [PATCH 1126/1225] SQUASH: USB: gadget: f_hid: remove more spam Tidying up the previous patch to this file dropped the deletion of a particularly noisy error message. Restore its removal. @@ -461862,10 +461862,10 @@ index 00fae22e941a9..4670ad21402db 100644 2.18.4 -From 47139e49b2dc3679ea51d62fe544e7f5efe8d342 Mon Sep 17 00:00:00 2001 +From 72772d47d18fb508af3fc678efffc10ac3b243cf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Oct 2020 16:08:18 +0100 -Subject: [PATCH 1127/1224] configs: Add CONFIG_RTC_DRV_SD3078=m +Subject: [PATCH 1127/1225] configs: Add CONFIG_RTC_DRV_SD3078=m Enable the driver module for the SD3078 RTC. @@ -461944,10 +461944,10 @@ index c838461038e6d..ee15660f83061 100644 2.18.4 -From a9cf4e96d4be8879fbe55f5927179540c7198bda Mon Sep 17 00:00:00 2001 +From 9303e09d908e315b974911ce192b9e82922f8c17 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Oct 2020 16:10:26 +0100 -Subject: [PATCH 1128/1224] overlays: Add sd3078 to the i2c-rtc overlay +Subject: [PATCH 1128/1225] overlays: Add sd3078 to the i2c-rtc overlay Add support for the SD3078 RTC to the i2c-rtc overlay. @@ -462010,10 +462010,10 @@ index df59d93cd759b..735ca303e4fa7 100644 2.18.4 -From 2ffaf5cc575017d53ba89bc915c06db7ff1d506a Mon Sep 17 00:00:00 2001 +From f9a88fa85f4487a64ac8178c666b57e824190141 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Oct 2020 17:16:39 +0100 -Subject: [PATCH 1129/1224] configs: Restore SND_PCM_OSS=m +Subject: [PATCH 1129/1225] configs: Restore SND_PCM_OSS=m A kconfig change way back in 4.13 caused SND_PCM_OSS to be dropped from our defconfigs. Restore it as a potential workaround for a supposed @@ -462099,10 +462099,10 @@ index ee15660f83061..32fbcba060987 100644 2.18.4 -From 4c301a66b43de4342992553588d2145e0fad6f0a Mon Sep 17 00:00:00 2001 +From cdaabc628c0a67b9af4d6d53b844a34fb138a782 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 6 Oct 2020 11:44:16 +0100 -Subject: [PATCH 1130/1224] Revert "usb/dwc2: Set correct state on gadget +Subject: [PATCH 1130/1225] Revert "usb/dwc2: Set correct state on gadget disconnect" This reverts commit c3974850cc10de2596893eaec2f5c456e9ded6a0. @@ -462141,10 +462141,10 @@ index 11c8893fbc1ab..6272b4ae4740f 100644 2.18.4 -From d7029dd54aacb352f6c51ab403bdb3040366bb40 Mon Sep 17 00:00:00 2001 +From 3f75a7652282f7518d425788d940c0b87ecf3c02 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 7 Oct 2020 13:14:19 +0100 -Subject: [PATCH 1131/1224] configs: Add MEMCG_SWAP support initially disabled +Subject: [PATCH 1131/1225] configs: Add MEMCG_SWAP support initially disabled Add support for memcg swap accounting, but leave it disabled by default. Add "swapaccount=1" to the kernel command line to enable it. @@ -462229,10 +462229,10 @@ index 32fbcba060987..6d9c9978ccb7e 100644 2.18.4 -From eba2de41d9d337df7cf079679c515c792efd5698 Mon Sep 17 00:00:00 2001 +From 8eef5cfb0a22e0c9d0d4a5358094cbc80277e2db Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 7 Oct 2020 15:09:29 +0100 -Subject: [PATCH 1132/1224] dwc_otg: initialise sched_frame for periodic QHs +Subject: [PATCH 1132/1225] 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 @@ -462268,10 +462268,10 @@ index 2823dc9af63f1..4503af692aefe 100644 2.18.4 -From 1a5af720c3ac4e654449ccec36a5faefc9f1d5be Mon Sep 17 00:00:00 2001 +From 1b81f07b62e18a3e077472c160d441e83f0859da Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 8 Oct 2020 12:06:58 +0100 -Subject: [PATCH 1133/1224] arm64: configs: Enable Unicam support +Subject: [PATCH 1133/1225] arm64: configs: Enable Unicam support Enable the unicam module on 64 bit kernel builds. @@ -462309,10 +462309,10 @@ index 6d9c9978ccb7e..fceaba1e6630e 100644 2.18.4 -From 039d6c0f32cb9ae6f464f9f811e3db0127a1118c Mon Sep 17 00:00:00 2001 +From 63b6147b2225aecd47dff4e80ba224e0d702661c Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 8 Oct 2020 12:07:16 +0100 -Subject: [PATCH 1134/1224] arm64: configs: Enable V4L2 test module support +Subject: [PATCH 1134/1225] arm64: configs: Enable V4L2 test module support Enable the v4l2 test modules on 64 bit kernel builds. @@ -462358,10 +462358,10 @@ index fceaba1e6630e..a4db167942854 100644 2.18.4 -From 24c4081c9718c047bc040a5a4f8e157725375e39 Mon Sep 17 00:00:00 2001 +From 42d0c8fcb6185745487b36af65d76a85bcb81c99 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Oct 2020 15:35:14 +0100 -Subject: [PATCH 1135/1224] staging: bcm2835-camera: Replace deprecated +Subject: [PATCH 1135/1225] staging: bcm2835-camera: Replace deprecated V4L2_PIX_FMT_BGR32 V4L2_PIX_FMT_BGR32 is deprecated as it is ambiguous over where @@ -462394,10 +462394,10 @@ index b7214741fa613..da14f1fb86640 100644 2.18.4 -From ed9c141cd6c4ac0bd2e597ead34c8f7cc235e977 Mon Sep 17 00:00:00 2001 +From 5cbdbeb9fdbafab553a5a48c79fbeffe494d821d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Oct 2020 16:06:59 +0100 -Subject: [PATCH 1136/1224] staging: bcm2835-codec: Replace deprecated +Subject: [PATCH 1136/1225] staging: bcm2835-codec: Replace deprecated V4L2_PIX_FMT_BGR32 V4L2_PIX_FMT_BGR32 is deprecated as it is ambiguous over where @@ -462427,10 +462427,10 @@ index b1e00e65ce186..eefe8e101f96a 100644 2.18.4 -From 76106ad1d91cac654140fa6d1093e25beb1f3003 Mon Sep 17 00:00:00 2001 +From 5e400d15175ccb611daa0de81a811b2aef05c16c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 12 Oct 2020 14:36:35 +0100 -Subject: [PATCH 1137/1224] ARM: bcm2711-rpi.dts: Unlock DMA channels 9 & 10 +Subject: [PATCH 1137/1225] ARM: bcm2711-rpi.dts: Unlock DMA channels 9 & 10 The downstream-specific override of the 32-bit DMA mask needlessly disables channels 9 and 10 - the VPU doesn't use them. This override @@ -462466,10 +462466,10 @@ index 0556c73e332aa..0c586d9ea6f8d 100644 2.18.4 -From a389efca7a13d8faac3340cf531df51e19cdae11 Mon Sep 17 00:00:00 2001 +From 90345c6a2f9a84b768fd00f7cf800d89584c13cb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:00:54 +0100 -Subject: [PATCH 1138/1224] gpio: Add gpio-fsm driver +Subject: [PATCH 1138/1225] 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 @@ -463662,10 +463662,10 @@ index 0000000000000..eb40cfdc71dfe 2.18.4 -From eee0365dc812f3299aa53423a07f30113a0e7816 Mon Sep 17 00:00:00 2001 +From 08612ae7c44c1994397ca1f238eb40df9a04a043 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:18:45 +0100 -Subject: [PATCH 1139/1224] configs: Add CONFIG_GPIO_FSM=m +Subject: [PATCH 1139/1225] configs: Add CONFIG_GPIO_FSM=m Enable the gpio-fsm module. @@ -463742,10 +463742,10 @@ index a4db167942854..54579a7451765 100644 2.18.4 -From 99e0db4a3b67acf671f81e2851852e3db54b0513 Mon Sep 17 00:00:00 2001 +From 5529dc31371520ba9d53214f725d01945db913d4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:08:08 +0100 -Subject: [PATCH 1140/1224] overlays: Add fsm-demo overlay +Subject: [PATCH 1140/1225] overlays: Add fsm-demo overlay fsm-demo demonstrates the usage of the gpio-fsm driver. It is designed to be used with a set of "traffic light" LEDs on GPIOs @@ -463904,10 +463904,10 @@ index 0000000000000..9e06e388e4d32 2.18.4 -From 9b05c1971ab7262d8830e5d8b95497ce8c862ec6 Mon Sep 17 00:00:00 2001 +From b23b78d89799b8853b084727086fcdb4c93024b8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:17:48 +0100 -Subject: [PATCH 1141/1224] overlays: Add ghost-amp overlay +Subject: [PATCH 1141/1225] overlays: Add ghost-amp overlay Add an overlay for the Ghost amplifier. @@ -464078,10 +464078,10 @@ index 0000000000000..afc9f034b5fcb 2.18.4 -From 63cf5f88f029e182e02b984c2842dc36c413fc03 Mon Sep 17 00:00:00 2001 +From abb4c404d6f5bcae7f82f4ba725d7b72112a64e3 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Thu, 6 Aug 2020 11:17:13 -0700 -Subject: [PATCH 1142/1224] Bluetooth: Disable High Speed by default +Subject: [PATCH 1142/1225] Bluetooth: Disable High Speed by default commit b176dd0ef6afcb3bca24f41d78b0d0b731ec2d08 upstream. @@ -464110,10 +464110,10 @@ index 3803135c88ff4..340f169f6d547 100644 2.18.4 -From 8f4c239915af15e69c0aed2cf230473c71ea425b Mon Sep 17 00:00:00 2001 +From 5313b4712d3954b1695c793662f2ecc650328eae Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Fri, 16 Oct 2020 15:17:07 +0200 -Subject: [PATCH 1143/1224] Fixes a problem when module probes before i2c +Subject: [PATCH 1143/1225] Fixes a problem when module probes before i2c module is available The driver crashed while a NULL pointer returned by i2c_get_adapter() @@ -464162,10 +464162,10 @@ index 286a62c3ff487..2f1b1ef4191a5 100644 2.18.4 -From 2c24e2ffd112395c323ce14153d26599a10c79ae Mon Sep 17 00:00:00 2001 +From 4683bcca4d00c35304d6f29c00ad453dcb5a6ec1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 15 Oct 2020 11:59:02 +0100 -Subject: [PATCH 1144/1224] uapi: Update V4L2_CID_USER_BCM2835_ISP_BASE due to +Subject: [PATCH 1144/1225] uapi: Update V4L2_CID_USER_BCM2835_ISP_BASE due to upstream change Commit "4e52889 media: atmel: atmel-isc-base: expose white @@ -464209,10 +464209,10 @@ index b6173d8c38f18..9afecc81b883b 100644 2.18.4 -From 5521c7aecbd7a25940f26e69d56ddec3fe7719ec Mon Sep 17 00:00:00 2001 +From 239afab2078296fa0c5f449bb7d55a85fc92c788 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Oct 2020 18:33:02 +0100 -Subject: [PATCH 1145/1224] dtoverlays: Correct CSI2 settings for ov9281 +Subject: [PATCH 1145/1225] dtoverlays: Correct CSI2 settings for ov9281 OV9281 appears to drop the clock to LP mode between frames, but the overlay didn't define this at both ends of the CSI2 link. @@ -464251,10 +464251,10 @@ index 4411c9d965646..40b298d3dd86d 100644 2.18.4 -From 70251b0e1d80b012753b81a721d4b113a3c12e2a Mon Sep 17 00:00:00 2001 +From 6fe426a2e2e9ca97674afedf9d4cc58181b4f5de Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 23 Oct 2020 15:45:11 +0100 -Subject: [PATCH 1146/1224] dts: Add CM4 to arm64 dt files +Subject: [PATCH 1146/1225] dts: Add CM4 to arm64 dt files Signed-off-by: Dave Stevenson --- @@ -464288,10 +464288,10 @@ index 0000000000000..8064a58155f1b 2.18.4 -From b36708055a41cbbae3182a3ad89ccbfd03952aa6 Mon Sep 17 00:00:00 2001 +From 3552ae894e88d5120180c165af4ddd3ee52c578d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 15:01:21 +0000 -Subject: [PATCH 1147/1224] dts: Tidy the Raspberry Pi Makefile entries +Subject: [PATCH 1147/1225] dts: Tidy the Raspberry Pi Makefile entries Signed-off-by: Phil Elwell --- @@ -464339,10 +464339,10 @@ index 1e861e2bf2e0e..996e670a60183 100644 2.18.4 -From f8f421c6c5e3fdfa9952c50b8efdbdc3b691d033 Mon Sep 17 00:00:00 2001 +From 7dad7e5cda79fc150f0eb12a3efc41ac5591cf04 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:23:22 +0000 -Subject: [PATCH 1148/1224] staging: bcm2835-audio: Add disable-headphones flag +Subject: [PATCH 1148/1225] 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. @@ -464353,7 +464353,7 @@ Signed-off-by: Phil Elwell 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index b9716f3e264c6..092ccbfd52430 100644 +index a0cba3823e5ef..ccda115ab9e04 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -381,11 +381,16 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev) @@ -464379,10 +464379,10 @@ index b9716f3e264c6..092ccbfd52430 100644 2.18.4 -From 55a5c34323d56d33f9991e3215796ee28161be84 Mon Sep 17 00:00:00 2001 +From 9c9fd81668e22841a1ddd4f800832df30395c67a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:18:50 +0000 -Subject: [PATCH 1149/1224] ARM: dts: Disable headphone audio on Zeroes, CM4 +Subject: [PATCH 1149/1225] ARM: dts: Disable headphone audio on Zeroes, CM4 Signed-off-by: Phil Elwell --- @@ -464431,10 +464431,10 @@ index d4ea928e30ce6..3ff0be02cb34c 100644 2.18.4 -From a380aee5261a2922eb551d6d3abc6a2dfaeb1e0e Mon Sep 17 00:00:00 2001 +From 5040d87d10a86493595a2f904aba2a86f162daa3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:21:23 +0000 -Subject: [PATCH 1150/1224] overlays: Enable headphone audio in audremap +Subject: [PATCH 1150/1225] overlays: Enable headphone audio in audremap Signed-off-by: Phil Elwell --- @@ -464463,10 +464463,10 @@ index d624bb3a3feaf..7324890ead869 100644 2.18.4 -From cedcc8103a6d449f95d86971abaf4b2b494ea6e2 Mon Sep 17 00:00:00 2001 +From 4d9d221714a7119e33ddfbefd293bafbad2f4940 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 26 Oct 2020 16:38:21 +0000 -Subject: [PATCH 1151/1224] rpisense-fb: Set pseudo_pallete to prevent crash on +Subject: [PATCH 1151/1225] rpisense-fb: Set pseudo_pallete to prevent crash on fbcon takeover Signed-off-by: Serge Schneider @@ -464499,10 +464499,10 @@ index 26432a5a0b4b4..325977def5311 100644 2.18.4 -From 47e8ebd4ced26f5c575f387d40df4ee061f45ae7 Mon Sep 17 00:00:00 2001 +From 245c5abfa8f11c74b0a9cf9efd3ebed5ae13f437 Mon Sep 17 00:00:00 2001 From: David Knell Date: Wed, 28 Oct 2020 14:18:42 +0000 -Subject: [PATCH 1152/1224] PiFi-40 defconfigs +Subject: [PATCH 1152/1225] PiFi-40 defconfigs Signed-off-by: David Knell --- @@ -464577,10 +464577,10 @@ index 54579a7451765..a91f46b4a45c7 100644 2.18.4 -From f3e9cb928ad02d41345a8c88d5d9e578b83a4de9 Mon Sep 17 00:00:00 2001 +From e1d78543e885fb77ea50cc3c4d07e4962cb5722d Mon Sep 17 00:00:00 2001 From: David Knell Date: Wed, 28 Oct 2020 14:20:56 +0000 -Subject: [PATCH 1153/1224] PiFi-40 Devicetree files +Subject: [PATCH 1153/1225] PiFi-40 Devicetree files Signed-off-by: David Knell --- @@ -464679,10 +464679,10 @@ index 0000000000000..51a20e54977fe 2.18.4 -From 786104a49839b5b43009fd0945fd24cc0b532405 Mon Sep 17 00:00:00 2001 +From e67d2107e9d97da29cffefc6f85cf7fcf74b2cf4 Mon Sep 17 00:00:00 2001 From: David Knell Date: Wed, 28 Oct 2020 14:21:37 +0000 -Subject: [PATCH 1154/1224] PiFi-40 driver, Makefile and Kconfig +Subject: [PATCH 1154/1225] PiFi-40 driver, Makefile and Kconfig Signed-off-by: David Knell --- @@ -465021,10 +465021,10 @@ index 0000000000000..dbb9dd0dbe949 2.18.4 -From 097d25a5ab11b552bdefffe4a8a40a2fb7447f77 Mon Sep 17 00:00:00 2001 +From 817df5837c0f0fb1dd7efcd49a7baa68f8f3d8b8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 09:59:49 +0000 -Subject: [PATCH 1155/1224] dwc_otg: Minimise header and fix build warnings +Subject: [PATCH 1155/1225] 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. @@ -465778,10 +465778,10 @@ index e55ea9c74be46..76e94b4ebb43a 100644 2.18.4 -From c2d1108a1ca3bf7526ee40ab69df7f4f99a6fc59 Mon Sep 17 00:00:00 2001 +From 71a8322364b914fa6ee86166b64d4551022de2bc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:10:04 +0000 -Subject: [PATCH 1156/1224] gpio-fsm: Fix a build warning +Subject: [PATCH 1156/1225] gpio-fsm: Fix a build warning Signed-off-by: Phil Elwell --- @@ -465806,10 +465806,10 @@ index eb8b4d58d2d0a..2cab50e513152 100644 2.18.4 -From 42389c16b70b01d0e280c1063143b56aabddc224 Mon Sep 17 00:00:00 2001 +From b237df4c8b3c1260de84b525592e82701283c278 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:10:40 +0000 -Subject: [PATCH 1157/1224] rpivid_h625: Fix build warnings +Subject: [PATCH 1157/1225] rpivid_h625: Fix build warnings Signed-off-by: Phil Elwell --- @@ -465880,10 +465880,10 @@ index b677910e237c6..fc3caed581873 100644 2.18.4 -From b47fe81455e235b811208ab241397edd4fcc5151 Mon Sep 17 00:00:00 2001 +From f25623f00264033d6e2890212b1c019605f7b160 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:11:56 +0000 -Subject: [PATCH 1158/1224] dwc_otg: Fix more build warnings +Subject: [PATCH 1158/1225] dwc_otg: Fix more build warnings Signed-off-by: Phil Elwell --- @@ -466041,10 +466041,10 @@ index d3097ef3728ca..9d49b2b332276 100644 2.18.4 -From 5f9e85c7e98b3337a6fe34a0b810640b36b34f79 Mon Sep 17 00:00:00 2001 +From 616c5efe4ecbec208e78e1520f1cd2f34bbb7133 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:12:22 +0000 -Subject: [PATCH 1159/1224] bcm2708_fb: Fix a build warning +Subject: [PATCH 1159/1225] bcm2708_fb: Fix a build warning Signed-off-by: Phil Elwell --- @@ -466069,10 +466069,10 @@ index d035fa59c269d..9a3d3d23c17ed 100644 2.18.4 -From 84d46b97e23d1cfee3248e87cb27bf7353abbfef Mon Sep 17 00:00:00 2001 +From 7a9b17a6bdb2cddd2e503be204fa0b60b1ba0c96 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 27 Oct 2020 12:24:14 +0000 -Subject: [PATCH 1160/1224] bcm2835-pcm: Fix up multichannel pcm audio +Subject: [PATCH 1160/1225] bcm2835-pcm: Fix up multichannel pcm audio Fixes: a9c1660ff5f02d048c5f31abf1fd1108ccf9ef87 Signed-off-by: Dom Cobley @@ -466081,7 +466081,7 @@ Signed-off-by: Dom Cobley 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c -index e4603ba742e45..b409e84901ece 100644 +index db889f6da395b..cc56c5166c07f 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c @@ -14,14 +14,14 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_hw = { @@ -466130,10 +466130,10 @@ index e4603ba742e45..b409e84901ece 100644 2.18.4 -From 4894ca4d5a9f2f5908950741848f98b778559e6d Mon Sep 17 00:00:00 2001 +From 79c698c2cc9706e49aa801ad4bdd91696333de16 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 22 Oct 2020 15:30:55 +0100 -Subject: [PATCH 1161/1224] watchdog: bcm2835: Ignore params after the +Subject: [PATCH 1161/1225] watchdog: bcm2835: Ignore params after the partition number Use sscanf to extract the partition number and ignore extra parameters @@ -466165,10 +466165,10 @@ index 62937e6f83ca1..de25e3682f037 100644 2.18.4 -From 381943c1c23a493f8fd3c378fbb6a64c298413c8 Mon Sep 17 00:00:00 2001 +From 8f1997e356445f1c1a4f2c294ec625d69cb2fe4f Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 20 Oct 2020 11:55:37 +0100 -Subject: [PATCH 1162/1224] firmware: raspberrypi: Add support for tryonce +Subject: [PATCH 1162/1225] firmware: raspberrypi: Add support for tryonce reboot flag Define a new mailbox (SET_REBOOT_FLAGS) which may be used to @@ -466245,10 +466245,10 @@ index 3335c2a2993c2..7e0d1f186f29a 100644 2.18.4 -From c43425ac973c5e817e0e9958bd3f453d896c09f1 Mon Sep 17 00:00:00 2001 +From 05fd097358dca0bdbc69d1b7dc7873ee35bec065 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:00:41 +0100 -Subject: [PATCH 1163/1224] phy: broadcom: split out the BCM54213PE from the +Subject: [PATCH 1163/1225] phy: broadcom: split out the BCM54213PE from the BCM54210E IDs The last nibble is a revision ID, and the 54213pe is a later rev @@ -466323,10 +466323,10 @@ index 6db2d9a6e5031..bfb37218f435c 100644 2.18.4 -From 8be7db908115feb8a3a8c5e8ad4f55af23bc055d Mon Sep 17 00:00:00 2001 +From 8559028536e8655d6af5719881a93e57c2f75086 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 29 Oct 2020 14:10:56 +0000 -Subject: [PATCH 1164/1224] phy: broadcom: Add bcm54213pe configuration +Subject: [PATCH 1164/1225] phy: broadcom: Add bcm54213pe configuration Signed-off-by: Phil Elwell --- @@ -466364,10 +466364,10 @@ index 49de844e03a3d..5a1ba06163cce 100644 2.18.4 -From d7b7d3a98ea241dd257f0c321f2cca80ffd38468 Mon Sep 17 00:00:00 2001 +From c7e383789add21bbed1aad7637f7a911702a17fe Mon Sep 17 00:00:00 2001 From: Sudeep Date: Fri, 23 Oct 2020 15:47:17 +0530 -Subject: [PATCH 1165/1224] Allo boss2 driver +Subject: [PATCH 1165/1225] Allo boss2 driver Signed-off-by: Sudeep --- @@ -467560,10 +467560,10 @@ index 0000000000000..5ad7f16964aa8 2.18.4 -From 72c9fa3e15dc2efa21a4ad05a805e850e4ef3c17 Mon Sep 17 00:00:00 2001 +From 2fb010126e457d85f34ac6af2dbdf190f18bd634 Mon Sep 17 00:00:00 2001 From: Sudeep Date: Fri, 23 Oct 2020 15:51:15 +0530 -Subject: [PATCH 1166/1224] Add allo boss2 overlay +Subject: [PATCH 1166/1225] Add allo boss2 overlay Signed-off-by: Sudeep --- @@ -467669,10 +467669,10 @@ index 0000000000000..a6adfb495eb90 2.18.4 -From 3882306064a455b17ec21f46e91c0713a11ba29e Mon Sep 17 00:00:00 2001 +From 65bc23f1befe33da2f66d8b0e45ea2f8f98943a8 Mon Sep 17 00:00:00 2001 From: Sudeep Date: Fri, 23 Oct 2020 15:52:38 +0530 -Subject: [PATCH 1167/1224] Add allo boss2 config +Subject: [PATCH 1167/1225] Add allo boss2 config Signed-off-by: Sudeep --- @@ -467747,10 +467747,10 @@ index a91f46b4a45c7..3d43b416bce45 100644 2.18.4 -From a5fdbd08f037c0b29b021560354925d0768f083a Mon Sep 17 00:00:00 2001 +From ac40c59c9e347aeb9c50b9c476fea4d5c8e14f1a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Nov 2020 10:13:48 +0000 -Subject: [PATCH 1168/1224] Revert "mailbox: avoid timer start from callback" +Subject: [PATCH 1168/1225] Revert "mailbox: avoid timer start from callback" This reverts commit 6dc15642c8b830d384fd3e6c9ea63144202b8932. @@ -467813,10 +467813,10 @@ index 3e7d4b20ab34f..0b821a5b2db84 100644 2.18.4 -From 2fe1ab3354583796e9a91aa394d29b05f04d5f60 Mon Sep 17 00:00:00 2001 +From 5b006eb15961ccd271e4b06b01c1a706dc3e0cdc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2020 14:21:33 +0100 -Subject: [PATCH 1169/1224] ARM: dts: Add bcm2711-rpi-400.dts +Subject: [PATCH 1169/1225] ARM: dts: Add bcm2711-rpi-400.dts Signed-off-by: Phil Elwell --- @@ -468454,10 +468454,10 @@ index 0000000000000..90c2b5a195d48 2.18.4 -From 30ee2ab16032bd1cac8c5ae6307465744e13eb53 Mon Sep 17 00:00:00 2001 +From 049d27583dea8fe85b879418d2d84d2d14b84b89 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 4 Nov 2020 11:25:02 +0000 -Subject: [PATCH 1170/1224] overlays: Deprecate and delete the sdtweak overlay +Subject: [PATCH 1170/1225] 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. @@ -468527,10 +468527,10 @@ index 38157d2f9bf3b..0000000000000 2.18.4 -From 8c2c57c6ad324d3c33281c96c09280d86195b763 Mon Sep 17 00:00:00 2001 +From 212d097c8d205c3699338052e533c7d3fc48c37f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Nov 2020 09:54:33 +0000 -Subject: [PATCH 1171/1224] overlays: Complete the sdtweak excision +Subject: [PATCH 1171/1225] overlays: Complete the sdtweak excision Signed-off-by: Phil Elwell --- @@ -468592,10 +468592,10 @@ index 2192cdfb27aad..dd33a27178b5a 100644 2.18.4 -From c46f6baaef17ed4f9abde1e0954dce67bc0b2c8a Mon Sep 17 00:00:00 2001 +From 115ab752b441778dde3f21a93818c9bc8c906593 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Nov 2020 11:39:35 +0000 -Subject: [PATCH 1172/1224] ARM: dts: bcm27xx: Remove enable_headphones setting +Subject: [PATCH 1172/1225] 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 @@ -468722,10 +468722,10 @@ index 3ff0be02cb34c..a969000c0b899 100644 2.18.4 -From e4d7ffd6670f3a98f34f6ab3cdb2a06ea9d3e882 Mon Sep 17 00:00:00 2001 +From 79f28fe8fb8939a864d3eaaa722dd8743300dc21 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 4 Nov 2020 18:54:20 +0000 -Subject: [PATCH 1173/1224] staging: vcsm-cma: Fix memory leak from not +Subject: [PATCH 1173/1225] staging: vcsm-cma: Fix memory leak from not detaching dmabuf When importing there was a missing call to detach the buffer, @@ -468805,10 +468805,10 @@ index 8cbe2b3522c65..03685cb5c80f6 100644 2.18.4 -From 6cd8e0d5ba760a914c1319eea21c6c5620847552 Mon Sep 17 00:00:00 2001 +From 16238e6da0aaac1115cf92058fb9261a25c70cd3 Mon Sep 17 00:00:00 2001 From: paul-1 <6473457+paul-1@users.noreply.github.com> Date: Wed, 4 Nov 2020 19:11:37 -0500 -Subject: [PATCH 1174/1224] Update Allo Piano Dac Driver for 5.4.y kernels +Subject: [PATCH 1174/1225] Update Allo Piano Dac Driver for 5.4.y kernels Add unique names to the individual dac coded drivers Remove some of the codec controls that are not used. @@ -469057,10 +469057,10 @@ index e910d4a4546dc..d323f24e7d9a3 100644 2.18.4 -From 847322f35e4caba0746897581564c5599146de12 Mon Sep 17 00:00:00 2001 +From 93852a15e820941135b6c2fa05851f47c07198dd 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 1175/1224] Overlay: Update Allo Piano Plus dac driver for +Subject: [PATCH 1175/1225] Overlay: Update Allo Piano Plus dac driver for 5.4.y kernels. Create unique names for the two instances of the codec driver. @@ -469093,10 +469093,10 @@ index 374c553db062e..d47a35def4f76 100644 2.18.4 -From fb3a7f3c9e5b0ffb1eb349df7824514687215de9 Mon Sep 17 00:00:00 2001 +From 89aaa9bbe5700b43562266d9290d2ed002767336 Mon Sep 17 00:00:00 2001 From: paul-1 <6473457+paul-1@users.noreply.github.com> Date: Sat, 7 Nov 2020 12:01:44 -0500 -Subject: [PATCH 1176/1224] Update volume controls in Allo Piano Dac Plus +Subject: [PATCH 1176/1225] Update volume controls in Allo Piano Dac Plus Put control scaling back to 255. Clean up what master/sub volume controls set in codec. @@ -469240,10 +469240,10 @@ index d323f24e7d9a3..245c3fc477364 100644 2.18.4 -From fd03f652dcc5d8363eca07e1612bad80b8c505fd Mon Sep 17 00:00:00 2001 +From 08513c55fa67b640ced3c7be53f8b9d915954c9c Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 16 Sep 2020 00:35:22 +0200 -Subject: [PATCH 1177/1224] can: rx-offload: can_rx_offload_add_manual(): add +Subject: [PATCH 1177/1225] can: rx-offload: can_rx_offload_add_manual(): add new initialization function This patch adds a new initialization function: @@ -469302,10 +469302,10 @@ index 01219f2902bf7..eac8f11413f09 100644 2.18.4 -From fb94233fc6a2662f59ba95c5bc07073f388fd47f Mon Sep 17 00:00:00 2001 +From d16c2c80c69bcf0d78a4d20fb683a7474fe6e8ca Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Fri, 18 Sep 2020 19:25:31 +0200 -Subject: [PATCH 1178/1224] dt-binding: can: mcp25xxfd: document device tree +Subject: [PATCH 1178/1225] dt-binding: can: mcp25xxfd: document device tree bindings This patch adds the device-tree binding documentation for the Microchip @@ -469410,10 +469410,10 @@ index 0000000000000..aa2cad14d6d77 2.18.4 -From 1c8fb045c3fdb9142e2ee23db8168325792faec4 Mon Sep 17 00:00:00 2001 +From d8244d5850ab15d166f85febba7b59e80f38ef9b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 18 Sep 2020 19:25:32 +0200 -Subject: [PATCH 1179/1224] can: mcp25xxfd: add regmap infrastructure +Subject: [PATCH 1179/1225] can: mcp25xxfd: add regmap infrastructure This patch adds the regmap infrastructure for the Microchip MCP25xxFD SPI CAN controller family. The actual driver is added in the next commit. @@ -470997,10 +470997,10 @@ index 0000000000000..3bc799204cb01 2.18.4 -From c5277ccc5fe940ae0494dc9f195fc52ce50c5b3a Mon Sep 17 00:00:00 2001 +From 3a3dcf57716e46550f007aef36e90d8483122f83 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 18 Sep 2020 19:25:33 +0200 -Subject: [PATCH 1180/1224] can: mcp25xxfd: add driver for Microchip MCP25xxFD +Subject: [PATCH 1180/1225] can: mcp25xxfd: add driver for Microchip MCP25xxFD SPI CAN This patch adds support for the Microchip MCP25xxFD SPI CAN controller family. @@ -473948,10 +473948,10 @@ index 0000000000000..eed20e132ddba 2.18.4 -From 70df74adf4e620ff1bb7bc29f66631da6023124d Mon Sep 17 00:00:00 2001 +From f8fd25e1d0b0034d76b035a53219b935d484a8b1 Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Fri, 18 Sep 2020 19:25:34 +0200 -Subject: [PATCH 1181/1224] can: mcp25xxfd: add listen-only mode +Subject: [PATCH 1181/1225] can: mcp25xxfd: add listen-only mode This commit enables listen-only mode, which works internally like CANFD mode. @@ -474023,10 +474023,10 @@ index eed20e132ddba..fd736fc133968 100644 2.18.4 -From 1a8d3a88b77d77b00f03a02ec9a64fa99efb8c55 Mon Sep 17 00:00:00 2001 +From 103c7ff0ca36e8bfc10bb1101ea151d97984c99e Mon Sep 17 00:00:00 2001 From: Thomas Kopp Date: Fri, 25 Sep 2020 08:56:06 +0200 -Subject: [PATCH 1182/1224] can: mcp25xxfd: mcp25xxfd_handle_eccif(): add ECC +Subject: [PATCH 1182/1225] can: mcp25xxfd: mcp25xxfd_handle_eccif(): add ECC related errata and update log messages This patch adds a reference to the recent released MCP2517FD and MCP2518FD @@ -474091,10 +474091,10 @@ index fd736fc133968..cad6f139bcf61 100644 2.18.4 -From c928e6108aa18eea0dff5490f8a21b17acae2603 Mon Sep 17 00:00:00 2001 +From 88b40d9795221d4fcbeededae5658499100d3410 Mon Sep 17 00:00:00 2001 From: Thomas Kopp Date: Fri, 25 Sep 2020 08:56:06 +0200 -Subject: [PATCH 1183/1224] can: mcp25xxfd: mcp25xxfd_probe(): add SPI clk +Subject: [PATCH 1183/1225] can: mcp25xxfd: mcp25xxfd_probe(): add SPI clk limit related errata information This patch adds a reference to the recent released MCP2517FD and MCP2518FD @@ -474154,10 +474154,10 @@ index cad6f139bcf61..310bc93c69f80 100644 2.18.4 -From eaf54a369e570e998f5d2e1ec0d81cd284169342 Mon Sep 17 00:00:00 2001 +From 8d30a282f5ea5b826a17eb73a0af8c77e2c0de48 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 23 Sep 2020 14:27:52 +0300 -Subject: [PATCH 1184/1224] can: mcp25xxfd: mcp25xxfd_ring_free(): fix memory +Subject: [PATCH 1184/1225] can: mcp25xxfd: mcp25xxfd_ring_free(): fix memory leak during cleanup This loop doesn't free the first element of the array. The "i > 0" has @@ -474190,10 +474190,10 @@ index 310bc93c69f80..edcf9e2872844 100644 2.18.4 -From fc7097b771b370dc21e04764ba18fa9efeff7d53 Mon Sep 17 00:00:00 2001 +From 6ddeb06f477c53078ea5eef82f4d49330d85b628 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 23 Sep 2020 13:44:36 +0200 -Subject: [PATCH 1185/1224] can: mcp25xxfd: mcp25xxfd_irq(): add missing +Subject: [PATCH 1185/1225] can: mcp25xxfd: mcp25xxfd_irq(): add missing initialization of variable set_normal mode This patch fixes the following warning: @@ -474231,10 +474231,10 @@ index edcf9e2872844..7fb654edfc9ff 100644 2.18.4 -From 6f63a5b352bd834eaef9e3da7f465b8011bb022a Mon Sep 17 00:00:00 2001 +From 49b1c371d0be5a279d0b47a65909d1a1673233a0 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Wed, 23 Sep 2020 14:53:01 +0200 -Subject: [PATCH 1186/1224] dt-binding: can: mcp25xxfd: documentation fixes +Subject: [PATCH 1186/1225] dt-binding: can: mcp25xxfd: documentation fixes Apply following fixes: - Use 'interrupts'. (interrupts-extended will automagically be supported @@ -474296,10 +474296,10 @@ index aa2cad14d6d77..5beb00a614bfb 100644 2.18.4 -From 30ba74d9115c3e6464dddd583e70fd19b15a1361 Mon Sep 17 00:00:00 2001 +From 60dd5916b7791be07bc0ef0886f5eee50b13111b Mon Sep 17 00:00:00 2001 From: Thomas Kopp Date: Wed, 30 Sep 2020 11:14:23 +0200 -Subject: [PATCH 1187/1224] dt-binding: can: mcp251xfd: narrow down wildcards +Subject: [PATCH 1187/1225] dt-binding: can: mcp251xfd: narrow down wildcards in device tree bindings to "microchip,mcp251xfd" The wildcard should be narrowed down to prevent existing and future devices @@ -474369,10 +474369,10 @@ index 5beb00a614bfb..2a884c1fe0e01 100644 2.18.4 -From 84d7779c1c1842ca8ae76b76b6277bfe2f8ebee1 Mon Sep 17 00:00:00 2001 +From f3e76080d20c99df9741d8019c9fb79ac70743fb Mon Sep 17 00:00:00 2001 From: Thomas Kopp Date: Wed, 30 Sep 2020 11:14:22 +0200 -Subject: [PATCH 1188/1224] can: mcp25xxfd: narrow down wildcards in device +Subject: [PATCH 1188/1225] can: mcp25xxfd: narrow down wildcards in device tree bindings to "microchip,mcp251xfd" The wildcard should be narrowed down to prevent existing and future devices @@ -474477,10 +474477,10 @@ index 3bc799204cb01..b1b5d7fd33ea7 100644 2.18.4 -From 689d07f9497e73e74e096309442a3c2d5e198bb2 Mon Sep 17 00:00:00 2001 +From 9e2e7e748eb33167bf2e23f0bf1c829de3c064e1 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 30 Sep 2020 10:49:00 +0200 -Subject: [PATCH 1189/1224] can: mcp251xfd: rename driver files and subdir to +Subject: [PATCH 1189/1225] can: mcp251xfd: rename driver files and subdir to mcp251xfd In [1] Geert noted that the autodetect compatible for the mcp25xxfd driver, @@ -474626,10 +474626,10 @@ index 4e17f592e22ee..0000000000000 2.18.4 -From bde35d91f6a13ad74d9ea8f04887b6f993503555 Mon Sep 17 00:00:00 2001 +From 6da4352e6d3c630e2428da8f02f16ee64fba2ce9 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 30 Sep 2020 10:49:00 +0200 -Subject: [PATCH 1190/1224] can: mcp251xfd: rename all user facing strings to +Subject: [PATCH 1190/1225] can: mcp251xfd: rename all user facing strings to mcp251xfd In [1] Geert noted that the autodetect compatible for the mcp25xxfd driver, @@ -474721,10 +474721,10 @@ index a1561d6e2326e..147af29e67593 100644 2.18.4 -From 6f4548ec53de479d560f04d21deadfed255eed54 Mon Sep 17 00:00:00 2001 +From 99649ab11e67a3f9247dc56c136156e3088f9d39 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 30 Sep 2020 10:49:00 +0200 -Subject: [PATCH 1191/1224] can: mcp251xfd: rename all remaining occurrence to +Subject: [PATCH 1191/1225] can: mcp251xfd: rename all remaining occurrence to mcp251xfd In [1] Geert noted that the autodetect compatible for the mcp25xxfd driver, @@ -479848,10 +479848,10 @@ index b1b5d7fd33ea7..fa1246e399806 100644 2.18.4 -From 4585c059947b9e6a08f06395078df9cfa79679e6 Mon Sep 17 00:00:00 2001 +From 69bb918ecc0863eb0953fb9a7808f4fc6b9f79dd Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 15 Oct 2020 21:16:37 +0200 -Subject: [PATCH 1192/1224] can: mcp251xfd: mcp251xfd_regmap_crc_read(): +Subject: [PATCH 1192/1225] can: mcp251xfd: mcp251xfd_regmap_crc_read(): increase severity of CRC read error messages During debugging it turned out that some people have setups where the SPI @@ -479905,10 +479905,10 @@ index ba25902dd78c7..c9ffc5ea2b25c 100644 2.18.4 -From b76b0f5f87a2449f1679728aadc42769be1ba5d9 Mon Sep 17 00:00:00 2001 +From f3755c706c626c472e5c1c29e7513f11765f7f98 Mon Sep 17 00:00:00 2001 From: kernel test robot Date: Mon, 19 Oct 2020 20:08:05 +0800 -Subject: [PATCH 1193/1224] can: mcp251xfd: mcp251xfd_regmap_nocrc_read(): fix +Subject: [PATCH 1193/1225] can: mcp251xfd: mcp251xfd_regmap_nocrc_read(): fix semicolon.cocci warnings drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c:176:2-3: Unneeded semicolon @@ -479944,10 +479944,10 @@ index c9ffc5ea2b25c..314f868b34658 100644 2.18.4 -From 6f137230edfe4ce18086e2a510f430bec1e18f7e Mon Sep 17 00:00:00 2001 +From 6bda29a59bd289821d93bc0865a9ac04f9009ed6 Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Mon, 19 Oct 2020 10:24:12 -0700 -Subject: [PATCH 1194/1224] can: mcp251xfd: remove unneeded break +Subject: [PATCH 1194/1225] can: mcp251xfd: remove unneeded break A break is not needed if it is preceded by a return. @@ -480013,10 +480013,10 @@ index dffa5d81a7c76..ac3025ccd9d5f 100644 2.18.4 -From ff46e19441ed88789d2290f2b3ebdc11587fce6b Mon Sep 17 00:00:00 2001 +From e44def89f63e94d2cf9b69b5008fae329ed0cf18 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 15 Nov 2019 00:54:07 +0100 -Subject: [PATCH 1195/1224] mcp251xfd: add overlay +Subject: [PATCH 1195/1225] mcp251xfd: add overlay Signed-off-by: Marc Kleine-Budde --- @@ -480307,10 +480307,10 @@ index 0000000000000..65c861bbd3401 2.18.4 -From a7bc2f7b823deb55ff9f730a1bd5310df595f71e Mon Sep 17 00:00:00 2001 +From 3bdbfb26e7e5345924ad378248a54ed7da80d5f9 Mon Sep 17 00:00:00 2001 From: Patrick Menschel Date: Wed, 28 Oct 2020 20:35:35 +0100 -Subject: [PATCH 1196/1224] Add mcp251xfd driver as module to RPI build +Subject: [PATCH 1196/1225] Add mcp251xfd driver as module to RPI build configuration This Patch adds MCP251XFD=m Kconfig flag to the 32 bit RPI defconfig files: @@ -480397,10 +480397,10 @@ index 3d43b416bce45..3c2980cc8f35d 100644 2.18.4 -From 2654e16c4316c621fbc232978859b46826656ad4 Mon Sep 17 00:00:00 2001 +From c3e30e945a52f9f84055620e674b5804878c6948 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 5 Aug 2020 12:57:21 +0200 -Subject: [PATCH 1197/1224] media: i2c: imx219: Selection compliance fixes +Subject: [PATCH 1197/1225] media: i2c: imx219: 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 @@ -480483,10 +480483,10 @@ index 812323107f36c..fbbee1b08a8ce 100644 2.18.4 -From 9a84bedcfff02bb750f84431154a30dd44d70034 Mon Sep 17 00:00:00 2001 +From 0ca401255a251c963d7788473a83a459d2ead766 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 2 Dec 2020 15:22:23 +0000 -Subject: [PATCH 1198/1224] media: bcm2835-unicam: Correctly handle error +Subject: [PATCH 1198/1225] media: bcm2835-unicam: Correctly handle error propagation for stream on On a failure in start_streaming(), the error code would not propagate to @@ -480516,10 +480516,10 @@ index 6501fb205e205..c13a0a20fd126 100644 2.18.4 -From 3e8948b327720866060e22ed83ee482ef3459b72 Mon Sep 17 00:00:00 2001 +From 0ae4670c5660149955475e0b5ad1c286b8c197af Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 2 Dec 2020 15:26:09 +0000 -Subject: [PATCH 1199/1224] media: bcm2835-unicam: Return early from +Subject: [PATCH 1199/1225] media: bcm2835-unicam: Return early from stop_streaming() if stopped clk_disable_unprepare() is called unconditionally in stop_streaming(). @@ -480586,10 +480586,10 @@ index c13a0a20fd126..60309de02369d 100644 2.18.4 -From 388f571a648ef8f3a683493c2802ded20955eaf9 Mon Sep 17 00:00:00 2001 +From d3960357a71c352a1cb549ccc03d99bde03c21c6 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 2 Dec 2020 16:48:41 +0000 -Subject: [PATCH 1200/1224] media: bcm2835-unicam: Clear clock state when +Subject: [PATCH 1200/1225] media: bcm2835-unicam: Clear clock state when stopping streaming Commit 65e08c465020d4c5b51afb452efc2246d80fd66f failed to clear the @@ -480617,10 +480617,10 @@ index 60309de02369d..a8b3f5433f041 100644 2.18.4 -From 7875626f66b5d4d743d142a4c3bf223ad4e90387 Mon Sep 17 00:00:00 2001 +From 8c4b51c97bea6212c4ad766ede362f48910460b3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 09:35:57 +0000 -Subject: [PATCH 1201/1224] ARM: dts: CM4 audio pins are not connected +Subject: [PATCH 1201/1225] ARM: dts: CM4 audio pins are not connected Signed-off-by: Phil Elwell --- @@ -480644,10 +480644,10 @@ index a969000c0b899..fc3f062fd820d 100644 2.18.4 -From b17bdf61203c5f11cdd216b10100c0b7672736f5 Mon Sep 17 00:00:00 2001 +From cdbc6617f4fa944ff0faae4c7bc901e63671b9aa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 08:33:19 +0000 -Subject: [PATCH 1202/1224] configs: Add RTC_DRV_PCF85063=m +Subject: [PATCH 1202/1225] configs: Add RTC_DRV_PCF85063=m Include the driver module for the PCF85063 and PCF85063A RTC devices. @@ -480724,10 +480724,10 @@ index 3c2980cc8f35d..599472e99d39a 100644 2.18.4 -From ebced79079a68116a081b81089414ca4e558c17e Mon Sep 17 00:00:00 2001 +From 3ae2e4c557ab3a26bdae5b33667055f6a0891127 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 08:49:53 +0000 -Subject: [PATCH 1203/1224] overlays: Add PCF85063 and PCF85063A to i2c-rtc +Subject: [PATCH 1203/1225] overlays: Add PCF85063 and PCF85063A to i2c-rtc Add support for the PCF85063 and PCF85063A RTC devices to the i2c-rtc overlay. @@ -481071,10 +481071,10 @@ index 735ca303e4fa7..759f532d5be15 100644 2.18.4 -From b75d7b166a7bf7067f4cbb3b317141c7a74b53b8 Mon Sep 17 00:00:00 2001 +From 60b9c29b32d77429c304008deb32745a1a914ded Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 17:18:39 +0000 -Subject: [PATCH 1204/1224] overlays: Fix cut-and-paste error in README +Subject: [PATCH 1204/1225] overlays: Fix cut-and-paste error in README Signed-off-by: Phil Elwell --- @@ -481101,10 +481101,10 @@ index cc380d8049c1c..b393c9651d08c 100644 2.18.4 -From f1d7adb475c07e0edce69f1f0710941e33832ee9 Mon Sep 17 00:00:00 2001 +From c14a4d70d1b8cc04f5af15717a79bdd37f3b0be6 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 9 Dec 2020 11:30:12 +0000 -Subject: [PATCH 1205/1224] media: i2c: imx477: Selection compliance fixes +Subject: [PATCH 1205/1225] 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 @@ -481187,10 +481187,10 @@ index 3fbb173fa0796..f68e7718b09c5 100644 2.18.4 -From efbba6764f516e7a267e0a56d55cff92a90f99ae Mon Sep 17 00:00:00 2001 +From da7546b0dfe87e4b1ad40425241b4bbb50b9086b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Dec 2020 16:38:37 +0000 -Subject: [PATCH 1206/1224] net: lan78xx: Ack pending PHY ints when resetting +Subject: [PATCH 1206/1225] 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 @@ -481225,10 +481225,10 @@ index f72ab25e7d06c..fc14099fc4b2a 100644 2.18.4 -From 5a9dcbca19bac373bb49ef64a1bcb9ee30f341c3 Mon Sep 17 00:00:00 2001 +From 81579546dd4e17df13188653ea0db9ce811b811d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Dec 2020 17:02:17 +0000 -Subject: [PATCH 1207/1224] overlays: mpu6050: Add 'addr' parameter +Subject: [PATCH 1207/1225] 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 @@ -481269,10 +481269,10 @@ index 3109d90562aee..1b4c065356874 100644 2.18.4 -From 2317964338fca1201434ad03d3039b1841d9ead1 Mon Sep 17 00:00:00 2001 +From a3270bd910c7ac85af84d6de8e7e456881980aa2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 16 Dec 2020 09:28:17 +0000 -Subject: [PATCH 1208/1224] overlays: Add missing addresses to ads1015/ads1115 +Subject: [PATCH 1208/1225] 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 @@ -481318,10 +481318,10 @@ index 4fc571c2db334..e44ced704ee2d 100644 2.18.4 -From 6758de44ec177858f1d908446316174bd509f199 Mon Sep 17 00:00:00 2001 +From 022f988d789bb3574fb8f6fc1f877dbbf7f84ba0 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Mon, 26 Oct 2020 14:03:35 +0000 -Subject: [PATCH 1209/1224] xhci: quirks: add link TRB quirk for VL805 +Subject: [PATCH 1209/1225] 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 @@ -481353,7 +481353,7 @@ index 73600f6b2c1b8..64c66dcaca430 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 32939242ec170..d7f719ae76587 100644 +index 0f575ef59e756..2d97de1a8f4d9 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -624,6 +624,16 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, @@ -481374,25 +481374,25 @@ index 32939242ec170..d7f719ae76587 100644 state->new_deq_ptr = new_deq; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 1bd165cbd74f0..77594e7c8bb2e 100644 +index a3e6983f846c5..3208ec60e4a57 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1874,6 +1874,7 @@ struct xhci_hcd { - #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) - #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) +@@ -1876,6 +1876,7 @@ struct xhci_hcd { #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36) -+#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(37) + #define XHCI_SKIP_PHY_INIT BIT_ULL(37) #define XHCI_DISABLE_SPARSE BIT_ULL(38) ++#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(39) unsigned int num_active_eps; + unsigned int limit_active_eps; -- 2.18.4 -From 9f808e206681589f2fa8278a000f1844aa399e50 Mon Sep 17 00:00:00 2001 +From 818224d2129a06dbac76eaec17a915a68c88623b Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Tue, 22 Dec 2020 14:27:46 +0900 -Subject: [PATCH 1210/1224] media: i2c: ov5647: Selection compliance fixes +Subject: [PATCH 1210/1225] 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 @@ -481483,10 +481483,10 @@ index 86a821a172b3d..40d0d45a2481f 100644 2.18.4 -From e214df6bc1b422869cb26f8bd71639124a83e72c Mon Sep 17 00:00:00 2001 +From 749052c23d016abe35c47782d795e65585f5587c Mon Sep 17 00:00:00 2001 From: menschel Date: Wed, 30 Dec 2020 21:55:34 +0100 -Subject: [PATCH 1211/1224] Add overlay for Seeed Studio CAN BUS FD HAT (#4034) +Subject: [PATCH 1211/1225] 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. @@ -481711,10 +481711,10 @@ index 0000000000000..e843d0b197450 2.18.4 -From 018a42bfceae0f37d9884b7f3d3f324c16d909fa Mon Sep 17 00:00:00 2001 +From 5b35468892f86ef7f53172beaf416974e26b336c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Dec 2020 20:00:38 +0000 -Subject: [PATCH 1212/1224] overlays: Rebuild "upstream" with latest ovmerge +Subject: [PATCH 1212/1225] overlays: Rebuild "upstream" with latest ovmerge The latest ovmerge drops disabled fragments, causing the "upstream" overlay to change. @@ -481892,10 +481892,10 @@ index 5673f61b79518..1681c3060b629 100644 2.18.4 -From dd57fcadfe40e15b66c214e6aa43efedc4f59809 Mon Sep 17 00:00:00 2001 +From 23042a7335c37d470d62b1a486c940fdae4b66d9 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 2 Jan 2021 21:08:59 +0100 -Subject: [PATCH 1213/1224] overlays: give Seeed Studio CAN BUS FD HAT a -v2 +Subject: [PATCH 1213/1225] 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 @@ -481950,10 +481950,10 @@ rename to arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts 2.18.4 -From 2e1ffcb5147cb1de7126554b29565e3a6372e99b Mon Sep 17 00:00:00 2001 +From 0349511479290befe9b4021b9a90241222616ba3 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 2 Jan 2021 21:38:58 +0100 -Subject: [PATCH 1214/1224] overlays: Add overlay for Seeed Studio CAN BUS FD +Subject: [PATCH 1214/1225] 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 @@ -482153,10 +482153,10 @@ index 0000000000000..210d027a073ee 2.18.4 -From 09bd92b8ab86234f57ae95aea49937e0d474a0fb Mon Sep 17 00:00:00 2001 +From a7cf41bac6ecee42ea0f9e9568a75b37996246f2 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Sat, 2 Jan 2021 02:34:03 +0000 -Subject: [PATCH 1215/1224] overlays: add wm8960-soundcard overlay +Subject: [PATCH 1215/1225] overlays: add wm8960-soundcard overlay add overlay for waveshare wm8960 simple-audio-card @@ -482293,10 +482293,10 @@ index 0000000000000..289fa4dacdf1f 2.18.4 -From 8f453a2a733ca80ee789a7eeed799fe713221e98 Mon Sep 17 00:00:00 2001 +From 26b61706802c90fee9d6ea5d17f96624372e9fd5 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Sat, 26 Dec 2020 03:13:14 +0000 -Subject: [PATCH 1216/1224] overlays: add spi override to merus-amp overlay +Subject: [PATCH 1216/1225] overlays: add spi override to merus-amp overlay adds an override to the merus-amp overlay to turn the spi bus off @@ -482345,10 +482345,10 @@ index 4501fbdc253da..bbffd7d263249 100644 2.18.4 -From 33ac1c9d8fd342049014e3546729ee1fdd41b110 Mon Sep 17 00:00:00 2001 +From d18ef7a652480ceadc4c4a117d12f756fc32282b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 9 Jan 2021 17:03:32 +0100 -Subject: [PATCH 1217/1224] overlays: seeed-can-fd-hat: clarify how to identify +Subject: [PATCH 1217/1225] 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 @@ -482396,10 +482396,10 @@ index 53ef924a44011..5252b1e67326a 100644 2.18.4 -From 629304142c371269c48c8a9ad8cb2e0b2fdb960c Mon Sep 17 00:00:00 2001 +From 87d43c035b663636ab4f2160cf01e0d87bd6ca6b Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 14 Jan 2021 09:18:42 +0000 -Subject: [PATCH 1218/1224] uapi: bcm2835-isp: Add colour denoise configuration +Subject: [PATCH 1218/1225] uapi: bcm2835-isp: Add colour denoise configuration Add a configuration structure for colour denoise to the bcm2835_isp driver. @@ -482458,10 +482458,10 @@ index cf8c0437f1597..c50e3ca815657 100644 2.18.4 -From 1e0303f6083414270081a556a9849b39c1852d07 Mon Sep 17 00:00:00 2001 +From d5b3a479ee258c11e701192f7733219ede33eca6 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 14 Jan 2021 09:20:52 +0000 -Subject: [PATCH 1219/1224] staging: vc04_services: ISP: Add colour denoise +Subject: [PATCH 1219/1225] staging: vc04_services: ISP: Add colour denoise control Add colour denoise control to the bcm2835 driver through a new v4l2 @@ -482543,10 +482543,10 @@ index 5b596b5c057f8..bcc55483561d8 100644 2.18.4 -From 322c7d1ce0dfb094dea4521a0ce0bee63fae682d Mon Sep 17 00:00:00 2001 +From 871e36b4b0bf70a46bcb15d3cc598a1e629b77cd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Jan 2021 10:34:11 +0000 -Subject: [PATCH 1220/1224] kbuild: Silence unavoidable dtc overlay warnings +Subject: [PATCH 1220/1225] 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 @@ -482580,85 +482580,10 @@ index bdec9e50358db..1968ce27299ec 100644 2.18.4 -From 7a58cc81402a0c36af0150ae23cc13dc44918ef5 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard -Date: Fri, 29 Jan 2021 15:29:04 +0100 -Subject: [PATCH 1221/1224] drm/vc4: hvs: Fix buffer overflow with the dlist - handling - -Commit 0a038c1c29a7 ("drm/vc4: Move LBM creation out of -vc4_plane_mode_set()") changed the LBM allocation logic from first -allocating the LBM memory for the plane to running mode_set, -adding a gap in the LBM, and then running the dlist allocation filling -that gap. - -The gap was introduced by incrementing the dlist array index, but was -never checking whether or not we were over the array length, leading -eventually to memory corruptions if we ever crossed this limit. - -vc4_dlist_write had that logic though, and was reallocating a larger -dlist array when reaching the end of the buffer. Let's share the logic -between both functions. - -Cc: Boris Brezillon -Cc: Eric Anholt -Fixes: 0a038c1c29a7 ("drm/vc4: Move LBM creation out of vc4_plane_mode_set()") -Signed-off-by: Maxime Ripard ---- - drivers/gpu/drm/vc4/vc4_plane.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index d0957d6181679..3732b24a2a8a5 100644 ---- a/drivers/gpu/drm/vc4/vc4_plane.c -+++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -228,7 +228,7 @@ static void vc4_plane_reset(struct drm_plane *plane) - __drm_atomic_helper_plane_reset(plane, &vc4_state->base); - } - --static void vc4_dlist_write(struct vc4_plane_state *vc4_state, u32 val) -+static void vc4_dlist_counter_increment(struct vc4_plane_state *vc4_state) - { - if (vc4_state->dlist_count == vc4_state->dlist_size) { - u32 new_size = max(4u, vc4_state->dlist_count * 2); -@@ -243,7 +243,15 @@ static void vc4_dlist_write(struct vc4_plane_state *vc4_state, u32 val) - vc4_state->dlist_size = new_size; - } - -- vc4_state->dlist[vc4_state->dlist_count++] = val; -+ vc4_state->dlist_count++; -+} -+ -+static void vc4_dlist_write(struct vc4_plane_state *vc4_state, u32 val) -+{ -+ unsigned int idx = vc4_state->dlist_count; -+ -+ vc4_dlist_counter_increment(vc4_state); -+ vc4_state->dlist[idx] = val; - } - - /* Returns the scl0/scl1 field based on whether the dimensions need to -@@ -1050,8 +1058,10 @@ static int vc4_plane_mode_set(struct drm_plane *plane, - * be set when calling vc4_plane_allocate_lbm(). - */ - if (vc4_state->y_scaling[0] != VC4_SCALING_NONE || -- vc4_state->y_scaling[1] != VC4_SCALING_NONE) -- vc4_state->lbm_offset = vc4_state->dlist_count++; -+ vc4_state->y_scaling[1] != VC4_SCALING_NONE) { -+ vc4_state->lbm_offset = vc4_state->dlist_count; -+ vc4_dlist_counter_increment(vc4_state); -+ } - - if (num_planes > 1) { - /* Emit Cb/Cr as channel 0 and Y as channel --- -2.18.4 - - -From 01c4964e6b6c278bd5b41123fe67940524ac70a7 Mon Sep 17 00:00:00 2001 +From 01c324ae6ce17127893199658febe01c3d36e295 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Fri, 29 Jan 2021 08:26:44 +0100 -Subject: [PATCH 1222/1224] Adds the DT-overlays to support Hifiberry AMP100 +Subject: [PATCH 1221/1225] Adds the DT-overlays to support Hifiberry AMP100 Adds new DT-overlay to control AMP100. @@ -482798,10 +482723,10 @@ index 0000000000000..ebdef55d61109 2.18.4 -From a7fe930a62b605faaef06a8e2a2f44a8bf2b5c2a Mon Sep 17 00:00:00 2001 +From 8722e0ef9d1f7a14c55f068b0a9251eca2192779 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Fri, 29 Jan 2021 16:16:39 +0100 -Subject: [PATCH 1223/1224] Enhances the Hifiberry DAC+ driver for Hifiberry +Subject: [PATCH 1222/1225] Enhances the Hifiberry DAC+ driver for Hifiberry AMP100 support Adds the necessary GPIO handling and ALSA mixer extensions. @@ -483042,10 +482967,10 @@ index 2f1b1ef4191a5..66a4198a1a304 100644 2.18.4 -From 62127de969392cd4f86e56f384784302033652de Mon Sep 17 00:00:00 2001 +From 80884cfb96e96380e755c7e70f482129452690b8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 3 Feb 2021 16:23:43 +0000 -Subject: [PATCH 1224/1224] ARM: dts: Declare Pi400 and CM4 have no audio pins +Subject: [PATCH 1223/1225] 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 @@ -483090,3 +483015,177 @@ index fc3f062fd820d..49f6ba6c4792b 100644 -- 2.18.4 + +From a70fc80270e4a89be7732d840f11e70d9d173f0f Mon Sep 17 00:00:00 2001 +From: Joerg Schambacher +Date: Mon, 1 Feb 2021 16:53:46 +0100 +Subject: [PATCH 1224/1225] Hifiberry DAC+ADC Pro fix for the PLL when changing + sample rates + +Adds 2 msecs delay when switching between oscillators to allow +correct PLL settling. +Thanks to Clive Messer for the support! + +Signed-off-by: Joerg Schambacher +--- + sound/soc/bcm/hifiberry_dacplusadcpro.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c +index a7fab4d951b6e..f42bc0ce3f888 100644 +--- a/sound/soc/bcm/hifiberry_dacplusadcpro.c ++++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c +@@ -190,6 +190,7 @@ static void snd_rpi_hifiberry_dacplusadcpro_select_clk( + PCM512x_GPIO_CONTROL_1, 0x24, 0x04); + break; + } ++ usleep_range(2000, 2100); + } + + static void snd_rpi_hifiberry_dacplusadcpro_clk_gpio(struct snd_soc_component *component) +@@ -207,13 +208,6 @@ static bool snd_rpi_hifiberry_dacplusadcpro_is_sclk(struct snd_soc_component *co + return (!(sck & 0x40)); + } + +-static bool snd_rpi_hifiberry_dacplusadcpro_is_sclk_sleep( +- struct snd_soc_component *component) +-{ +- msleep(2); +- return snd_rpi_hifiberry_dacplusadcpro_is_sclk(component); +-} +- + static bool snd_rpi_hifiberry_dacplusadcpro_is_pro_card(struct snd_soc_component *component) + { + bool isClk44EN, isClk48En, isNoClk; +@@ -221,13 +215,13 @@ static bool snd_rpi_hifiberry_dacplusadcpro_is_pro_card(struct snd_soc_component + snd_rpi_hifiberry_dacplusadcpro_clk_gpio(component); + + snd_rpi_hifiberry_dacplusadcpro_select_clk(component, HIFIBERRY_DACPRO_CLK44EN); +- isClk44EN = snd_rpi_hifiberry_dacplusadcpro_is_sclk_sleep(component); ++ isClk44EN = snd_rpi_hifiberry_dacplusadcpro_is_sclk(component); + + snd_rpi_hifiberry_dacplusadcpro_select_clk(component, HIFIBERRY_DACPRO_NOCLOCK); +- isNoClk = snd_rpi_hifiberry_dacplusadcpro_is_sclk_sleep(component); ++ isNoClk = snd_rpi_hifiberry_dacplusadcpro_is_sclk(component); + + snd_rpi_hifiberry_dacplusadcpro_select_clk(component, HIFIBERRY_DACPRO_CLK48EN); +- isClk48En = snd_rpi_hifiberry_dacplusadcpro_is_sclk_sleep(component); ++ isClk48En = snd_rpi_hifiberry_dacplusadcpro_is_sclk(component); + + return (isClk44EN && isClk48En && !isNoClk); + } +-- +2.18.4 + + +From a0bcf37551c9f338bd4efa160c31b98a1063a412 Mon Sep 17 00:00:00 2001 +From: Joerg Schambacher +Date: Wed, 24 Feb 2021 17:34:05 +0100 +Subject: [PATCH 1225/1225] Hifiberry-DAC+:Avoids loading of headphone controls + if not defined in DT-overlay + +This fix keeps the driver from loading the headphone controls in case they are +not defined in the selected device tree overlay. This avoids problems if a +device uses the same I2C bus address as the headphone amp. The driver issues a +warning in that case. + +Adds the missing embedded newlines in some printk/info statements. + +Signed-off-by: Joerg Schambacher +--- + sound/soc/bcm/hifiberry_dacplus.c | 53 +++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 24 deletions(-) + +diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c +index 66a4198a1a304..c94f233130919 100644 +--- a/sound/soc/bcm/hifiberry_dacplus.c ++++ b/sound/soc/bcm/hifiberry_dacplus.c +@@ -406,29 +406,34 @@ static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev) + if (ret < 0) + return ret; + if (ret) { +- card->aux_dev = hifiberry_dacplus_aux_devs; +- card->num_aux_devs = +- ARRAY_SIZE(hifiberry_dacplus_aux_devs); + tpa_node = of_find_compatible_node(NULL, NULL, "ti,tpa6130a2"); + tpa_prop = of_find_property(tpa_node, "status", &len); +- +- if (strcmp((char *)tpa_prop->value, "okay")) { +- /* and activate headphone using change_sets */ +- dev_info(&pdev->dev, "activating headphone amplifier"); +- of_changeset_init(&ocs); +- ret = of_changeset_update_property(&ocs, tpa_node, +- &tpa_enable_prop); +- if (ret) { +- dev_err(&pdev->dev, +- "cannot activate headphone amplifier\n"); +- return -ENODEV; +- } +- ret = of_changeset_apply(&ocs); +- if (ret) { +- dev_err(&pdev->dev, +- "cannot activate headphone amplifier\n"); +- return -ENODEV; ++ if (tpa_prop) { ++ card->aux_dev = hifiberry_dacplus_aux_devs; ++ card->num_aux_devs = ++ ARRAY_SIZE(hifiberry_dacplus_aux_devs); ++ if (strcmp((char *)tpa_prop->value, "okay")) { ++ /* and activate headphone using change_sets */ ++ dev_info(&pdev->dev, ++ "activating headphone amplifier\n"); ++ of_changeset_init(&ocs); ++ ret = of_changeset_update_property(&ocs, ++ tpa_node, &tpa_enable_prop); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "cannot activate headphone amplifier\n"); ++ return -ENODEV; ++ } ++ ret = of_changeset_apply(&ocs); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "cannot activate headphone amplifier\n"); ++ return -ENODEV; ++ } + } ++ } else { ++ dev_warn(&pdev->dev, ++ "I2C-device (at 0x60) detected! Wrong overlay?\n"); + } + } + +@@ -464,7 +469,7 @@ static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev) + snd_mute_gpio = devm_gpiod_get_optional(&pdev->dev, + "mute", GPIOD_OUT_HIGH); + if (IS_ERR(snd_mute_gpio)) { +- dev_err(&pdev->dev, "Can't allocate GPIO (HW-MUTE)"); ++ dev_err(&pdev->dev, "Can't allocate GPIO (HW-MUTE)\n"); + return PTR_ERR(snd_mute_gpio); + } + +@@ -483,7 +488,7 @@ static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev) + snd_reset_gpio = devm_gpiod_get_optional(&pdev->dev, + "reset", GPIOD_OUT_HIGH); + if (IS_ERR(snd_reset_gpio)) { +- dev_err(&pdev->dev, "Can't allocate GPIO (HW-RESET)"); ++ dev_err(&pdev->dev, "Can't allocate GPIO (HW-RESET)\n"); + return PTR_ERR(snd_reset_gpio); + } + +@@ -496,10 +501,10 @@ static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev) + "snd_soc_register_card() failed: %d\n", ret); + if (!ret) { + if (snd_mute_gpio) +- dev_info(&pdev->dev, "GPIO%i for HW-MUTE selected", ++ dev_info(&pdev->dev, "GPIO%i for HW-MUTE selected\n", + gpio_chip_hwgpio(snd_mute_gpio)); + if (snd_reset_gpio) +- dev_info(&pdev->dev, "GPIO%i for HW-RESET selected", ++ dev_info(&pdev->dev, "GPIO%i for HW-RESET selected\n", + gpio_chip_hwgpio(snd_reset_gpio)); + } + return ret; +-- +2.18.4 + diff --git a/SOURCES/wireguard.patch b/SOURCES/wireguard.patch index f9c5ec8..51d1285 100644 --- a/SOURCES/wireguard.patch +++ b/SOURCES/wireguard.patch @@ -1,7 +1,7 @@ -From b197871d28940a799b029951e35297a0e7d8ce39 Mon Sep 17 00:00:00 2001 +From f837c5a87b4c001536ae910db0e47660834aa702 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:07 +0100 -Subject: [PATCH 001/115] crypto: lib - tidy up lib/crypto Kconfig and Makefile +Subject: [PATCH 001/124] crypto: lib - tidy up lib/crypto Kconfig and Makefile commit 746b2e024c67aa605ac12d135cd7085a49cf9dc4 upstream. @@ -121,10 +121,10 @@ index cbe0b6a6450d7..63de4cb3fcf82 100644 2.18.4 -From bce5bec8ca8ba0568969300cb8e50c95ea2769e4 Mon Sep 17 00:00:00 2001 +From 486db26fac0ce2d62b933679bdfaea488725cf00 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:08 +0100 -Subject: [PATCH 002/115] crypto: chacha - move existing library code into +Subject: [PATCH 002/124] crypto: chacha - move existing library code into lib/crypto commit 5fb8ef25803ef33e2eb60b626435828b937bed75 upstream. @@ -648,10 +648,10 @@ index 0000000000000..dabc3accae051 2.18.4 -From 8fb7fcb51aad5548a3bb80f7a3618b518b4c0ff8 Mon Sep 17 00:00:00 2001 +From 4d1398dc616f6c321d8f5fd80ee520b948685f58 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:09 +0100 -Subject: [PATCH 003/115] crypto: x86/chacha - depend on generic chacha library +Subject: [PATCH 003/124] crypto: x86/chacha - depend on generic chacha library instead of crypto driver commit 28e8d89b1ce8d2e7badfb5f69971dd635acb8863 upstream. @@ -849,10 +849,10 @@ index f29bf10c04627..564a3f7b40b85 100644 2.18.4 -From 0545790d2026a92f2f3fb0a8e8a73afbd1a5b023 Mon Sep 17 00:00:00 2001 +From 2986afd33faf5ab5b79f158a050afd8afcafc252 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:10 +0100 -Subject: [PATCH 004/115] crypto: x86/chacha - expose SIMD ChaCha routine as +Subject: [PATCH 004/124] crypto: x86/chacha - expose SIMD ChaCha routine as library function commit 84e03fa39fbe95a5567d43bff458c6d3b3a23ad1 upstream. @@ -1065,10 +1065,10 @@ index 5c662f8fecac0..2676f4fbd4c16 100644 2.18.4 -From 451975d1273dce5cebbe79a81a92049e74f3956b Mon Sep 17 00:00:00 2001 +From d5db614975ab83de25ecf2d37b53c621e3687db6 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:11 +0100 -Subject: [PATCH 005/115] crypto: arm64/chacha - depend on generic chacha +Subject: [PATCH 005/124] crypto: arm64/chacha - depend on generic chacha library instead of crypto driver commit c77da4867cbb7841177275dbb250f5c09679fae4 upstream. @@ -1202,10 +1202,10 @@ index d4cc61bfe79df..cae2cb92eca86 100644 2.18.4 -From 85937c6024274450f352e1cb2a070dd9028df852 Mon Sep 17 00:00:00 2001 +From 3733d4076464737c8262cf695486b6e5ff8ea926 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:12 +0100 -Subject: [PATCH 006/115] crypto: arm64/chacha - expose arm64 ChaCha routine as +Subject: [PATCH 006/124] crypto: arm64/chacha - expose arm64 ChaCha routine as library function commit b3aad5bad26a01a4bd8c49a5c5f52aec665f3b7c upstream. @@ -1348,10 +1348,10 @@ index cae2cb92eca86..46cd4297761c1 100644 2.18.4 -From eb371adf803efd33c050d4e672775b8ac773c793 Mon Sep 17 00:00:00 2001 +From 66bc54650635d91f3fa14e5046004253ee274d21 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:13 +0100 -Subject: [PATCH 007/115] crypto: arm/chacha - import Eric Biggers's scalar +Subject: [PATCH 007/124] crypto: arm/chacha - import Eric Biggers's scalar accelerated ChaCha code commit 29621d099f9c642b22a69dc8e7e20c108473a392 upstream. @@ -1835,10 +1835,10 @@ index 0000000000000..2140319b64a05 2.18.4 -From 6bb971b9ec7e023f65d1bc0edab7c8e2d1af5fe8 Mon Sep 17 00:00:00 2001 +From 3dc93d21cdf1ae9d93ed11e4ffd891b0d466a42d Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:14 +0100 -Subject: [PATCH 008/115] crypto: arm/chacha - remove dependency on generic +Subject: [PATCH 008/124] crypto: arm/chacha - remove dependency on generic ChaCha driver commit b36d8c09e710c71f6a9690b6586fea2d1c9e1e27 upstream. @@ -2544,10 +2544,10 @@ index 46cd4297761c1..b08029d7bde62 100644 2.18.4 -From 6a86c01ffd4830e820184fa9ed8173e7ddfc7939 Mon Sep 17 00:00:00 2001 +From 869e52c525ba428ecef3322eb2f76011f0bf9429 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:15 +0100 -Subject: [PATCH 009/115] crypto: arm/chacha - expose ARM ChaCha routine as +Subject: [PATCH 009/124] crypto: arm/chacha - expose ARM ChaCha routine as library function commit a44a3430d71bad4ee56788a59fff099b291ea54c upstream. @@ -2660,10 +2660,10 @@ index eb40efb3eb342..3f0c057aa0502 100644 2.18.4 -From 1ee79278a7d7a348e72b31c99a8cfe31bb47bbba Mon Sep 17 00:00:00 2001 +From c8827e8fc886dcba8e1bef86d33e8230e143f23c Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:16 +0100 -Subject: [PATCH 010/115] crypto: mips/chacha - import 32r2 ChaCha code from +Subject: [PATCH 010/124] crypto: mips/chacha - import 32r2 ChaCha code from Zinc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -3119,10 +3119,10 @@ index 0000000000000..a81e02db95e73 2.18.4 -From ec942e9965be966bf4571bcd63570f1dcd707119 Mon Sep 17 00:00:00 2001 +From c4b698186d10ae6fa8665f330380734b3ab0959d Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:17 +0100 -Subject: [PATCH 011/115] crypto: mips/chacha - wire up accelerated 32r2 code +Subject: [PATCH 011/124] crypto: mips/chacha - wire up accelerated 32r2 code from Zinc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -3694,10 +3694,10 @@ index 649dc564f242b..6b5e14cee4753 100644 2.18.4 -From 2801a189f7b496039db36d72d5f73dbb56a42797 Mon Sep 17 00:00:00 2001 +From 42ae586cf61580fe22fc4fc56593d9643698eb37 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:18 +0100 -Subject: [PATCH 012/115] crypto: chacha - unexport chacha_generic routines +Subject: [PATCH 012/124] crypto: chacha - unexport chacha_generic routines commit 22cf705360707ced15f9fe5423938f313c7df536 upstream. @@ -3817,10 +3817,10 @@ index c0e40b2454311..aa5d4a16aac5d 100644 2.18.4 -From a40d0635d0d17f992f25940e9cac320d5208073a Mon Sep 17 00:00:00 2001 +From 99f8d161e589d95cefb4abb791933f2737b24752 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:19 +0100 -Subject: [PATCH 013/115] crypto: poly1305 - move core routines into a separate +Subject: [PATCH 013/124] crypto: poly1305 - move core routines into a separate library commit 48ea8c6ebc96bc0990e12ee1c43d0832c23576bb upstream. @@ -4493,10 +4493,10 @@ index 0000000000000..f019a57dbc1b9 2.18.4 -From 0d420ee8db8b9ee1f978049b59bcb7d03154d2e4 Mon Sep 17 00:00:00 2001 +From 47470cabcc6502b9c0c85667149ec005d0c02727 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:20 +0100 -Subject: [PATCH 014/115] crypto: x86/poly1305 - unify Poly1305 state struct +Subject: [PATCH 014/124] crypto: x86/poly1305 - unify Poly1305 state struct with generic code commit ad8f5b88383ea685f2b8df2a12ee3e08089a1287 upstream. @@ -4756,10 +4756,10 @@ index f5a4319c2a1f3..36b5886cb50ca 100644 2.18.4 -From cffafae217a5e94e450cc39c0baf595dbec32d4c Mon Sep 17 00:00:00 2001 +From 8291efef993737beb5330cf8d422d9a96e48f90f Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:21 +0100 -Subject: [PATCH 015/115] crypto: poly1305 - expose init/update/final library +Subject: [PATCH 015/124] crypto: poly1305 - expose init/update/final library interface commit a1d93064094cc5e24d64e35cf093e7191d0c9344 upstream. @@ -4993,10 +4993,10 @@ index f019a57dbc1b9..32ec293c65ae7 100644 2.18.4 -From 71176ba2390b8b777e3704c82fd7e894b6e9f4a8 Mon Sep 17 00:00:00 2001 +From 5cfe536772b118c3d0b0b641ade09f7c28702cf0 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:22 +0100 -Subject: [PATCH 016/115] crypto: x86/poly1305 - depend on generic library not +Subject: [PATCH 016/124] crypto: x86/poly1305 - depend on generic library not generic shash commit 1b2c6a5120489d41c8ea3b8dacd0b4586289b158 upstream. @@ -5222,10 +5222,10 @@ index 04fa269e5534b..479b0cab2a1ad 100644 2.18.4 -From 86de1a707edadb5219cbd156162933e3addf9d6e Mon Sep 17 00:00:00 2001 +From 2f8ebf1715067c70601ec62750dff68888c8c9bf Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:23 +0100 -Subject: [PATCH 017/115] crypto: x86/poly1305 - expose existing driver as +Subject: [PATCH 017/124] crypto: x86/poly1305 - expose existing driver as poly1305 library commit f0e89bcfbb894e5844cd1bbf6b3cf7c63cb0f5ac upstream. @@ -5396,10 +5396,10 @@ index a731ea36bd5c7..181754615f734 100644 2.18.4 -From 5f07f88b171ef95ba2befa12b0a11ddbc2c7e5b9 Mon Sep 17 00:00:00 2001 +From 0092ab396571a017764b48f1a6712ff3d4b8e807 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:24 +0100 -Subject: [PATCH 018/115] crypto: arm64/poly1305 - incorporate +Subject: [PATCH 018/124] crypto: arm64/poly1305 - incorporate OpenSSL/CRYPTOGAMS NEON implementation commit f569ca16475155013525686d0f73bc379c67e635 upstream. @@ -7498,10 +7498,10 @@ index 181754615f734..9923445e82251 100644 2.18.4 -From ddfe74f7a6399d21f7255d5cd125f353762b20e8 Mon Sep 17 00:00:00 2001 +From 345b8fd17611a5ff6766173aedee074d4cdd39c0 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:25 +0100 -Subject: [PATCH 019/115] crypto: arm/poly1305 - incorporate OpenSSL/CRYPTOGAMS +Subject: [PATCH 019/124] crypto: arm/poly1305 - incorporate OpenSSL/CRYPTOGAMS NEON implementation commit a6b803b3ddc793d6db0c16f12fc12d30d20fa9cc upstream. @@ -10293,10 +10293,10 @@ index 9923445e82251..9bd15b227e78e 100644 2.18.4 -From c8af86e6cecbfdfad9086427f0d5c5ef2b5b97f4 Mon Sep 17 00:00:00 2001 +From 2348b97a26987fbf36690d4d7ca3058e38379811 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:26 +0100 -Subject: [PATCH 020/115] crypto: mips/poly1305 - incorporate +Subject: [PATCH 020/124] crypto: mips/poly1305 - incorporate OpenSSL/CRYPTOGAMS optimized implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -11872,10 +11872,10 @@ index 9bd15b227e78e..d15ec53829861 100644 2.18.4 -From 2e91e770953810b21ea65021345a36403ce4f168 Mon Sep 17 00:00:00 2001 +From 10a9cc350b21ce53ebf1947174df3e3e874fdf6f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:28 +0100 -Subject: [PATCH 021/115] crypto: blake2s - generic C library implementation +Subject: [PATCH 021/124] crypto: blake2s - generic C library implementation and selftest commit 66d7fb94e4ffe5acc589e0b2b4710aecc1f07a28 upstream. @@ -12992,10 +12992,10 @@ index 0000000000000..41025a30c524c 2.18.4 -From 239fea475b647d30a4176d28736f5c6c4b3fda7f Mon Sep 17 00:00:00 2001 +From 2c9be16c41086f9711514bba2b168afeb9b9ca32 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:29 +0100 -Subject: [PATCH 022/115] crypto: testmgr - add test cases for Blake2s +Subject: [PATCH 022/124] crypto: testmgr - add test cases for Blake2s commit 17e1df67023a5c9ccaeb5de8bf5b88f63127ecf7 upstream. @@ -13322,10 +13322,10 @@ index ef7d21f39d4a9..102fcad549665 100644 2.18.4 -From 89c49ee948f065cc5050666bd4a55203607bda70 Mon Sep 17 00:00:00 2001 +From 743713032edbf3bf915e94d5ed9bdd6200315082 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:30 +0100 -Subject: [PATCH 023/115] crypto: blake2s - implement generic shash driver +Subject: [PATCH 023/124] crypto: blake2s - implement generic shash driver commit 7f9b0880925f1f9d7d59504ea0892d2ae9cfc233 upstream. @@ -13580,10 +13580,10 @@ index 941693effc7d2..74ff77032e526 100644 2.18.4 -From 09f81cbc867616e252332ff2c4ec84024dc7f832 Mon Sep 17 00:00:00 2001 +From 47b565ca50ef44abf472f7c1215122add1848566 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:31 +0100 -Subject: [PATCH 024/115] crypto: blake2s - x86_64 SIMD implementation +Subject: [PATCH 024/124] crypto: blake2s - x86_64 SIMD implementation commit ed0356eda153f6a95649e11feb7b07083caf9e20 upstream. @@ -14151,10 +14151,10 @@ index 81c8a4059afcf..8fd3954bf64c5 100644 2.18.4 -From 0d751552c61cd6e4b186d92b630b9d119c828cbe Mon Sep 17 00:00:00 2001 +From d2eb2dcca95981dab0429adcad504a6200ec3c79 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:32 +0100 -Subject: [PATCH 025/115] crypto: curve25519 - generic C library +Subject: [PATCH 025/124] crypto: curve25519 - generic C library implementations commit 0ed42a6f431e930b2e8fae21955406e09fe75d70 upstream. @@ -16021,10 +16021,10 @@ index 0000000000000..0106bebe69008 2.18.4 -From a40eeb82471e0ef3ebaf65329704f571c044a95b Mon Sep 17 00:00:00 2001 +From 113295e01877ba4524b22338f84665baa2f3f514 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:33 +0100 -Subject: [PATCH 026/115] crypto: curve25519 - add kpp selftest +Subject: [PATCH 026/124] crypto: curve25519 - add kpp selftest commit f613457a7af085728297bef71233c37faf3c01b1 upstream. @@ -17297,10 +17297,10 @@ index 102fcad549665..5d132ae996b4a 100644 2.18.4 -From 65f2f0623cff1e3160affdcfb726b784ead866d8 Mon Sep 17 00:00:00 2001 +From f6e91a9e2e4043cf94357163bacdcdebf36c82b4 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:34 +0100 -Subject: [PATCH 027/115] crypto: curve25519 - implement generic KPP driver +Subject: [PATCH 027/124] crypto: curve25519 - implement generic KPP driver commit ee772cb641135739c1530647391d5a04c39db192 upstream. @@ -17444,10 +17444,10 @@ index 0000000000000..bd88fd571393d 2.18.4 -From 4277abf75253a08ebc0ea9638cf413fa8949d243 Mon Sep 17 00:00:00 2001 +From a9c096766c049ea2699d216bc425875d63d83dc6 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:35 +0100 -Subject: [PATCH 028/115] crypto: lib/curve25519 - work around Clang stack +Subject: [PATCH 028/124] crypto: lib/curve25519 - work around Clang stack spilling issue commit 660bb8e1f833ea63185fe80fde847e3e42f18e3b upstream. @@ -17525,10 +17525,10 @@ index 1c455207341d3..2fde0ec33dbd0 100644 2.18.4 -From 8cde457048ca90996bb4c61871fa365620654050 Mon Sep 17 00:00:00 2001 +From 7734a4c33e8bde8cfb004406db17663b1eecfce2 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:36 +0100 -Subject: [PATCH 029/115] crypto: curve25519 - x86_64 library and KPP +Subject: [PATCH 029/124] crypto: curve25519 - x86_64 library and KPP implementations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -20073,10 +20073,10 @@ index a3fc859830c1e..b8b738bcc3120 100644 2.18.4 -From 0ac330f3e7a1b6da6001ce7271180d9615df308e Mon Sep 17 00:00:00 2001 +From 1091501f32d5f28d52dbb95a51c2bc649fed3174 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:37 +0100 -Subject: [PATCH 030/115] crypto: arm/curve25519 - import Bernstein and +Subject: [PATCH 030/124] crypto: arm/curve25519 - import Bernstein and Schwabe's Curve25519 ARM implementation commit f0fb006b604f98e2309a30f34ef455ac734f7c1c upstream. @@ -22215,10 +22215,10 @@ index 0000000000000..f33b85fef3823 2.18.4 -From ca5550b1462848bd20f90039977f3ae87f632945 Mon Sep 17 00:00:00 2001 +From edccee320f62aca101d12b96b718ba24544da005 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:38 +0100 -Subject: [PATCH 031/115] crypto: arm/curve25519 - wire up NEON implementation +Subject: [PATCH 031/124] crypto: arm/curve25519 - wire up NEON implementation commit d8f1308a025fc7e00414194ed742d5f05a21e13c upstream. @@ -23286,10 +23286,10 @@ index 0000000000000..2e9e12d2f642a 2.18.4 -From 82eeda8cb54b3f3011e49c86be311814770b8745 Mon Sep 17 00:00:00 2001 +From ef108824294502bb5f580c18bd9436600e40f66c Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:39 +0100 -Subject: [PATCH 032/115] crypto: chacha20poly1305 - import construction and +Subject: [PATCH 032/124] crypto: chacha20poly1305 - import construction and selftest from Zinc commit ed20078b7e3331e82828be357147af6a3282e4ce upstream. @@ -30980,10 +30980,10 @@ index 0000000000000..c12ddbe9eb92a 2.18.4 -From a3dd68c75fa2e267ebc0e2619cfa3bc2924474d3 Mon Sep 17 00:00:00 2001 +From 72cffc6045b0175214aa5e4dfc0f5b2c9e090daf Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:40 +0100 -Subject: [PATCH 033/115] crypto: lib/chacha20poly1305 - reimplement +Subject: [PATCH 033/124] crypto: lib/chacha20poly1305 - reimplement crypt_from_sg() routine commit d95312a3ccc0cd544d374be2fc45aeaa803e5fd9 upstream. @@ -31285,10 +31285,10 @@ index c12ddbe9eb92a..821e5cc9b14eb 100644 2.18.4 -From ae6edeabca36ddc9a7dcad0798b70b469cafcbb0 Mon Sep 17 00:00:00 2001 +From cca92a35ad8eba8e260236418efc9f4ab8e6d2fd Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 17 Nov 2019 23:21:29 -0800 -Subject: [PATCH 034/115] crypto: chacha_generic - remove unnecessary setkey() +Subject: [PATCH 034/124] crypto: chacha_generic - remove unnecessary setkey() functions commit 2043323a799a660bc84bbee404cf7a2617ec6157 upstream. @@ -31359,10 +31359,10 @@ index c1b1473183938..8beea79ab1178 100644 2.18.4 -From 89f5ca0475e73f4752d3a6795c1949ed2a76d29e Mon Sep 17 00:00:00 2001 +From f89aff92754c9ace0d91bd99b84c75307db915fc Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 17 Nov 2019 23:21:58 -0800 -Subject: [PATCH 035/115] crypto: x86/chacha - only unregister algorithms if +Subject: [PATCH 035/124] crypto: x86/chacha - only unregister algorithms if registered commit b62755aed3a3f5ca9edd2718339ccea3b6bbbe57 upstream. @@ -31397,10 +31397,10 @@ index b391e13a9e415..a94e30b6f9413 100644 2.18.4 -From 1c70211beccb66b1b506cc8006c147a9d59bd7f2 Mon Sep 17 00:00:00 2001 +From 5eb742c619e60b30997e914c3208fea2f7dae232 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 17 Nov 2019 23:22:16 -0800 -Subject: [PATCH 036/115] crypto: lib/chacha20poly1305 - use chacha20_crypt() +Subject: [PATCH 036/124] crypto: lib/chacha20poly1305 - use chacha20_crypt() commit 413808b71e6204b0cc1eeaa77960f7c3cd381d33 upstream. @@ -31486,10 +31486,10 @@ index 821e5cc9b14eb..6d83cafebc69c 100644 2.18.4 -From 2882dd79df72546111aaecd936be7e5b40507d32 Mon Sep 17 00:00:00 2001 +From 75a98dd69b85921932935966062555b06b687800 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 25 Nov 2019 11:31:12 +0100 -Subject: [PATCH 037/115] crypto: arch - conditionalize crypto api in arch glue +Subject: [PATCH 037/124] crypto: arch - conditionalize crypto api in arch glue for lib code commit 8394bfec51e0e565556101bcc4e2fe7551104cd8 upstream. @@ -31787,10 +31787,10 @@ index 370cd88068ec1..0cc4537e6617c 100644 2.18.4 -From 74b89ee28db1d76c44ea3f1e9ef5839a803de29d Mon Sep 17 00:00:00 2001 +From cc6f8c60d6936f78b9212bdc1f0bff61343b8152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valdis=20Kl=C4=93tnieks?= Date: Thu, 5 Dec 2019 20:58:36 -0500 -Subject: [PATCH 038/115] crypto: chacha - fix warning message in header file +Subject: [PATCH 038/124] crypto: chacha - fix warning message in header file commit 579d705cd64e44f3fcda1a6cfd5f37468a5ddf63 upstream. @@ -31828,10 +31828,10 @@ index aa5d4a16aac5d..b085dc1ac1516 100644 2.18.4 -From 4b798e161c3f1a846a48ea91b27f3cb18100220a Mon Sep 17 00:00:00 2001 +From 138ca9bd09bcd8ce0a013f3a75e9de260a6e6d64 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 11 Dec 2019 10:26:39 +0100 -Subject: [PATCH 039/115] crypto: arm/curve25519 - add arch-specific key +Subject: [PATCH 039/124] crypto: arm/curve25519 - add arch-specific key generation function commit 84faa307249b341f6ad8de3e1869d77a65e26669 upstream. @@ -31872,10 +31872,10 @@ index f3f42cf3b8937..776ae07e04697 100644 2.18.4 -From c8c17cad23f8635d751ec0aad621fdf7ded5d6d1 Mon Sep 17 00:00:00 2001 +From 8ff5eaefb8eac9888d0a6a0d980c28cc5b53310f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 16 Dec 2019 19:53:26 +0100 -Subject: [PATCH 040/115] crypto: lib/curve25519 - re-add selftests +Subject: [PATCH 040/124] crypto: lib/curve25519 - re-add selftests commit aa127963f1cab2b93c74c9b128a84610203fb674 upstream. @@ -33270,10 +33270,10 @@ index 0106bebe69008..c03ccdb994340 100644 2.18.4 -From 78834bc0be45631e091ada3cdad050267aa962cd Mon Sep 17 00:00:00 2001 +From 998a2390cbacd4218ce639458e68b0ad077e7657 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 5 Jan 2020 22:40:46 -0500 -Subject: [PATCH 041/115] crypto: poly1305 - add new 32 and 64-bit generic +Subject: [PATCH 041/124] crypto: poly1305 - add new 32 and 64-bit generic versions commit 1c08a104360f3e18f4ee6346c21cc3923efb952e upstream. @@ -34465,10 +34465,10 @@ index 32ec293c65ae7..9d2d14df0fee5 100644 2.18.4 -From 58127c498379d26e9fceea96c1808c88338c874e Mon Sep 17 00:00:00 2001 +From 1514821265506dac2578cfc1f22f9dde3d899cf2 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 5 Jan 2020 22:40:47 -0500 -Subject: [PATCH 042/115] crypto: x86/poly1305 - import unmodified cryptogams +Subject: [PATCH 042/124] crypto: x86/poly1305 - import unmodified cryptogams implementation commit 0896ca2a0cb6127e8a129f1f2a680d49b6b0f65c upstream. @@ -38655,10 +38655,10 @@ index 0000000000000..342ad7f18aa71 2.18.4 -From 1de7e70cdad987e708e276ed6c584f17f44a445a Mon Sep 17 00:00:00 2001 +From e0a371560fd5181e32e24ecc42a66392e7c50e60 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 5 Jan 2020 22:40:48 -0500 -Subject: [PATCH 043/115] crypto: x86/poly1305 - wire up faster implementations +Subject: [PATCH 043/124] crypto: x86/poly1305 - wire up faster implementations for kernel commit d7d7b853566254648df59f7ea27ea05952a6cfa8 upstream. @@ -41592,10 +41592,10 @@ index 0b2c4fce26d95..14c032de276e6 100644 2.18.4 -From 9d88649f8ef5028453ecde65a843e711b0945eec Mon Sep 17 00:00:00 2001 +From 4b0829367ac6d33721304193f23c3892cffed108 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 5 Jan 2020 22:40:49 -0500 -Subject: [PATCH 044/115] crypto: {arm,arm64,mips}/poly1305 - remove redundant +Subject: [PATCH 044/124] crypto: {arm,arm64,mips}/poly1305 - remove redundant non-reduction from emit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -41773,10 +41773,10 @@ index b37d29cf5d0a8..fc881b46d9111 100644 2.18.4 -From 57a90de716992b58c20baa24628e902cce26e4fd Mon Sep 17 00:00:00 2001 +From b2f7f81574ddd4b2dcbc25919649bc6fa9682c10 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 8 Jan 2020 12:37:35 +0800 -Subject: [PATCH 045/115] crypto: curve25519 - Fix selftest build error +Subject: [PATCH 045/124] crypto: curve25519 - Fix selftest build error commit a8bdf2c42ee4d1ee42af1f3601f85de94e70a421 upstream. @@ -41886,10 +41886,10 @@ index c03ccdb994340..288a62cd29b22 100644 2.18.4 -From 209d764b1645563f12dc852cd5124d158aa7f2ed Mon Sep 17 00:00:00 2001 +From 3c3b7530f886f252e4a5135e9fb4e168d3bc06fc Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 16 Jan 2020 18:23:55 +0100 -Subject: [PATCH 046/115] crypto: x86/poly1305 - fix .gitignore typo +Subject: [PATCH 046/124] crypto: x86/poly1305 - fix .gitignore typo commit 1f6868995326cc82102049e349d8dbd116bdb656 upstream. @@ -41915,10 +41915,10 @@ index c406ea6571fac..30be0400a4392 100644 2.18.4 -From aa5d3f33ed4293ebe39f4a00f334df6cf058a97c Mon Sep 17 00:00:00 2001 +From 24c3f89e6a2dba65e02f6dc713ed1ea792c7e4bc Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 16 Jan 2020 21:26:34 +0100 -Subject: [PATCH 047/115] crypto: chacha20poly1305 - add back missing test +Subject: [PATCH 047/124] crypto: chacha20poly1305 - add back missing test vectors and test chunking commit 72c7943792c9e7788ddd182337bcf8f650cf56f5 upstream. @@ -43779,10 +43779,10 @@ index 465de46dbdef2..c391a91364e9d 100644 2.18.4 -From b9130d65de27aa574c43d36309566d2d661f562e Mon Sep 17 00:00:00 2001 +From d153b7c88cdc9ec38f697ca2e38dea285bcdceac Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 17 Jan 2020 11:42:22 +0100 -Subject: [PATCH 048/115] crypto: x86/poly1305 - emit does base conversion +Subject: [PATCH 048/124] crypto: x86/poly1305 - emit does base conversion itself commit f9e7fe32a792726186301423ff63a465d63386e1 upstream. @@ -43822,10 +43822,10 @@ index 657363588e0c8..79bb58737d528 100644 2.18.4 -From e4912683de95e6badfefdfcab00e5728580acfe3 Mon Sep 17 00:00:00 2001 +From af38a277273dd3fa1b45647bd1d18c642d6f6698 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 17 Jan 2020 17:43:18 +0100 -Subject: [PATCH 049/115] crypto: arm/chacha - fix build failured when kernel +Subject: [PATCH 049/124] crypto: arm/chacha - fix build failured when kernel mode NEON is disabled commit 0bc81767c5bd9d005fae1099fb39eb3688370cb1 upstream. @@ -43886,10 +43886,10 @@ index 7bdf8823066d0..893692ed12b76 100644 2.18.4 -From c0906d8f3e64011cbde6687f67dfd224a7a01055 Mon Sep 17 00:00:00 2001 +From 8d96035b613c0fe1b0ae270bfd8512b2b133ef4d Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 17 Jan 2020 12:01:36 +0100 -Subject: [PATCH 050/115] crypto: Kconfig - allow tests to be disabled when +Subject: [PATCH 050/124] crypto: Kconfig - allow tests to be disabled when manager is disabled commit 2343d1529aff8b552589f622c23932035ed7a05d upstream. @@ -43932,10 +43932,10 @@ index b8b738bcc3120..8fcf630471dcf 100644 2.18.4 -From 44e282e3975c6fd03529c5524c2dd7ef7cb87a69 Mon Sep 17 00:00:00 2001 +From cf0d4a4876f6649420a87d0cec615b14af0c85b5 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 6 Feb 2020 12:42:01 +0100 -Subject: [PATCH 051/115] crypto: chacha20poly1305 - prevent integer overflow +Subject: [PATCH 051/124] crypto: chacha20poly1305 - prevent integer overflow on large input commit c9cc0517bba9f0213f1e55172feceb99e5512daf upstream. @@ -43978,10 +43978,10 @@ index 6d83cafebc69c..ad0699ce702f9 100644 2.18.4 -From 783a2c65af5ba9746c9aa98116fff07cbadb4b45 Mon Sep 17 00:00:00 2001 +From 38bb5c7c289c7312e9d1019d53ff0a78a11c6452 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 1 Mar 2020 22:52:35 +0800 -Subject: [PATCH 052/115] crypto: x86/curve25519 - support assemblers with no +Subject: [PATCH 052/124] crypto: x86/curve25519 - support assemblers with no adx support commit 1579f1bc3b753d17a44de3457d5c6f4a5b14c752 upstream. @@ -44003,10 +44003,10 @@ Signed-off-by: Jason A. Donenfeld 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile -index 94df0868804bc..513a55562d750 100644 +index 8ca3cf7c5ec97..03c7ec1dc83f0 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile -@@ -194,9 +194,10 @@ avx2_instr :=$(call as-instr,vpbroadcastb %xmm0$(comma)%ymm1,-DCONFIG_AS_AVX2=1) +@@ -197,9 +197,10 @@ avx2_instr :=$(call as-instr,vpbroadcastb %xmm0$(comma)%ymm1,-DCONFIG_AS_AVX2=1) avx512_instr :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,-DCONFIG_AS_AVX512=1) sha1_ni_instr :=$(call as-instr,sha1msg1 %xmm0$(comma)%xmm1,-DCONFIG_AS_SHA1_NI=1) sha256_ni_instr :=$(call as-instr,sha256msg1 %xmm0$(comma)%xmm1,-DCONFIG_AS_SHA256_NI=1) @@ -44072,10 +44072,10 @@ index 4e6dc840b1592..9ecb3c1f0f15d 100644 2.18.4 -From 445cdda06d2d6cf0aeb6ff3c96c18d1970bbb622 Mon Sep 17 00:00:00 2001 +From 865fde1df114cb6121f0af4af38261f5a0d824ce Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 18 Mar 2020 20:27:32 -0600 -Subject: [PATCH 053/115] crypto: arm64/chacha - correctly walk through blocks +Subject: [PATCH 053/124] crypto: arm64/chacha - correctly walk through blocks commit c8cfcb78c65877313cda7bcbace624d3dbd1f3b3 upstream. @@ -44148,10 +44148,10 @@ index c391a91364e9d..fa43deda2660d 100644 2.18.4 -From 79a9b936012f72abf2e10ba16fc449f2a0905eef Mon Sep 17 00:00:00 2001 +From 0600853de17c8b222156fb878666b5c384a422bb Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 20 Jan 2020 18:18:15 +0100 -Subject: [PATCH 054/115] crypto: x86/curve25519 - replace with formally +Subject: [PATCH 054/124] crypto: x86/curve25519 - replace with formally verified implementation commit 07b586fe06625b0b610dc3d3a969c51913d143d4 upstream. @@ -47905,10 +47905,10 @@ index eec7d2d242396..e4e58b8e9afe4 100644 2.18.4 -From 816354525a1157f6243e1e992dffa6bed19db5d5 Mon Sep 17 00:00:00 2001 +From 33e7ca090c0d17f2894b44a168d49f4e51ba1b30 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 1 Mar 2020 16:06:56 +0800 -Subject: [PATCH 055/115] crypto: x86/curve25519 - leave r12 as spare register +Subject: [PATCH 055/124] crypto: x86/curve25519 - leave r12 as spare register commit dc7fc3a53ae158263196b1892b672aedf67796c5 upstream. @@ -48287,10 +48287,10 @@ index e4e58b8e9afe4..8a17621f7d3a3 100644 2.18.4 -From 37c87cbf1de4258cadb0417f95c8e37eda4c06ac Mon Sep 17 00:00:00 2001 +From b6f9158fd02f157a6ebdea1b6d0da528d3cdb90d Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 19 Mar 2020 11:56:17 -0600 -Subject: [PATCH 056/115] crypto: arm[64]/poly1305 - add artifact to .gitignore +Subject: [PATCH 056/124] crypto: arm[64]/poly1305 - add artifact to .gitignore files commit 6e4e00d8b68ca7eb30d08afb740033e0d36abe55 upstream. @@ -48331,10 +48331,10 @@ index 879df8781ed56..e403b1343328d 100644 2.18.4 -From 47b920bf9d66a9e52905251430a3612c43fe16d5 Mon Sep 17 00:00:00 2001 +From f822009c12b208ef9a7024274d17064cee17d1e9 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 23 Apr 2020 15:54:04 -0600 -Subject: [PATCH 057/115] crypto: arch/lib - limit simd usage to 4k chunks +Subject: [PATCH 057/124] crypto: arch/lib - limit simd usage to 4k chunks commit 706024a52c614b478b63f7728d202532ce6591a9 upstream. @@ -48592,10 +48592,10 @@ index 79bb58737d528..61b2bc8b69861 100644 2.18.4 -From 487339cfa7eef7b7be65777ac82ba738108d4288 Mon Sep 17 00:00:00 2001 +From 4a0052127f0109bf05f8c233a68caff836851548 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 8 Jul 2020 12:41:13 +1000 -Subject: [PATCH 058/115] crypto: lib/chacha20poly1305 - Add missing function +Subject: [PATCH 058/124] crypto: lib/chacha20poly1305 - Add missing function declaration commit 06cc2afbbdf9a9e8df3e2f8db724997dd6e1b4ac upstream. @@ -48638,10 +48638,10 @@ index ad0699ce702f9..431e042803327 100644 2.18.4 -From c331c0664a83c27565d6fa1b6d8d9f40f6ff5d7f Mon Sep 17 00:00:00 2001 +From 74bf0ebb74242f61b71ab70a5d11b14b3b67baa4 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 8 Jul 2020 12:11:18 +0300 -Subject: [PATCH 059/115] crypto: x86/chacha-sse3 - use unaligned loads for +Subject: [PATCH 059/124] crypto: x86/chacha-sse3 - use unaligned loads for state array commit e79a31715193686e92dadb4caedfbb1f5de3659c upstream. @@ -48796,10 +48796,10 @@ index 2676f4fbd4c16..3a1c72fdb7cf5 100644 2.18.4 -From 57637608dd8f1939dac22e52e325bbf2f12a7c47 Mon Sep 17 00:00:00 2001 +From 12edfd666753a2587de59e2a5284bd84340969f7 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 23 Jul 2020 17:50:48 +1000 -Subject: [PATCH 060/115] crypto: x86/curve25519 - Remove unused carry +Subject: [PATCH 060/124] crypto: x86/curve25519 - Remove unused carry variables commit 054a5540fb8f7268e2c79e9deab4242db15c8cba upstream. @@ -48849,10 +48849,10 @@ index 8a17621f7d3a3..8acbb6584a370 100644 2.18.4 -From 3b768a37972cfa1441f0a4a4018e068f814bdaae Mon Sep 17 00:00:00 2001 +From eb45a16164b3d0089254b65bfe9ffb746db3d5dd Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 24 Aug 2020 11:09:53 -0300 -Subject: [PATCH 061/115] crypto: arm/curve25519 - include +Subject: [PATCH 061/124] crypto: arm/curve25519 - include commit 6779d0e6b0fe193ab3010ea201782ca6f75a3862 upstream. @@ -48892,10 +48892,10 @@ index 776ae07e04697..31eb75b6002fb 100644 2.18.4 -From 0d2293356e77e411eb0018c97876730ca3230be8 Mon Sep 17 00:00:00 2001 +From 80a12d0385f827f969593a230d81a22d579b570f Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Tue, 25 Aug 2020 11:23:00 +1000 -Subject: [PATCH 062/115] crypto: arm/poly1305 - Add prototype for +Subject: [PATCH 062/124] crypto: arm/poly1305 - Add prototype for poly1305_blocks_neon commit 51982ea02aef972132eb35c583d3e4c5b83166e5 upstream. @@ -48932,10 +48932,10 @@ index 13cfef4ae22e3..3023c1acfa194 100644 2.18.4 -From 7c4160370b416193dafaee369d8225f212217c6c Mon Sep 17 00:00:00 2001 +From e1ac9711ecfd2a32558fed950bd78121dd820c50 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Thu, 27 Aug 2020 19:30:58 +0200 -Subject: [PATCH 063/115] crypto: curve25519-x86_64 - Use XORL r32,32 +Subject: [PATCH 063/124] crypto: curve25519-x86_64 - Use XORL r32,32 commit db719539fd3889836900bf912755aa30a5985e9a upstream. @@ -49199,10 +49199,10 @@ index 8acbb6584a370..a9edb6f8a0ba6 100644 2.18.4 -From 3683d0494205583fd48a4e1e66b1171c50e1ce4d Mon Sep 17 00:00:00 2001 +From d935e644f116acda8d7587b156b69b88c82d02c9 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Thu, 27 Aug 2020 19:38:31 +0200 -Subject: [PATCH 064/115] crypto: poly1305-x86_64 - Use XORL r32,32 +Subject: [PATCH 064/124] crypto: poly1305-x86_64 - Use XORL r32,32 commit 7dfd1e01b3dfc13431b1b25720cf2692a7e111ef upstream. @@ -49264,10 +49264,10 @@ index 80061bea6b16a..5b593990501d3 100644 2.18.4 -From d178f243b50c4d96ca2e837e24fc6a4eae120f06 Mon Sep 17 00:00:00 2001 +From 050beea218e4924963b5dc066620aa6e4d763f48 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 24 Sep 2020 13:29:04 +1000 -Subject: [PATCH 065/115] crypto: x86/poly1305 - Remove assignments with no +Subject: [PATCH 065/124] crypto: x86/poly1305 - Remove assignments with no effect commit 4a0c1de64bf9d9027a6f19adfba89fc27893db23 upstream. @@ -49300,10 +49300,10 @@ index 61b2bc8b69861..7de5046fe5832 100644 2.18.4 -From 03b3e2d25b02791303c5025c620b8a9c04f2fe8b Mon Sep 17 00:00:00 2001 +From ee088bff793df6e9a62a9e0bd80b138dc583ee63 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 23 Oct 2020 15:27:48 -0700 -Subject: [PATCH 066/115] crypto: x86/poly1305 - add back a needed assignment +Subject: [PATCH 066/124] crypto: x86/poly1305 - add back a needed assignment commit c3a98c3ad5c0dc60a1ac66bf91147a3f39cac96b upstream. @@ -49339,10 +49339,10 @@ index 7de5046fe5832..b69e362730d02 100644 2.18.4 -From 527d549345d69bce58e7664d454cb65588a257f3 Mon Sep 17 00:00:00 2001 +From 523adc158011314e131f6f31379a4a91933c423f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 2 Nov 2020 14:48:15 +0100 -Subject: [PATCH 067/115] crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires +Subject: [PATCH 067/124] crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires the manager commit 6569e3097f1c4a490bdf2b23d326855e04942dfd upstream. @@ -49378,10 +49378,10 @@ index 8fcf630471dcf..fd5a8724ed385 100644 2.18.4 -From ace7208e3bb70742cd2717770424234424cabf93 Mon Sep 17 00:00:00 2001 +From f18ccdfbe79e8501a36e89939dcfd6312033b744 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Tue, 3 Nov 2020 17:28:09 +0100 -Subject: [PATCH 068/115] crypto: arm/chacha-neon - optimize for non-block size +Subject: [PATCH 068/124] crypto: arm/chacha-neon - optimize for non-block size multiples commit 86cd97ec4b943af35562a74688bc4e909b32c3d1 upstream. @@ -49658,10 +49658,10 @@ index eb22926d49127..13d12f672656b 100644 2.18.4 -From c3c512ae16575c9a768cbe0c678812cea27cacc0 Mon Sep 17 00:00:00 2001 +From 687cd321ca27a865f9b353b5f9186a3373c6ac4c Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 6 Nov 2020 17:39:38 +0100 -Subject: [PATCH 069/115] crypto: arm64/chacha - simplify tail block handling +Subject: [PATCH 069/124] crypto: arm64/chacha - simplify tail block handling commit c4fc6328d6c67690a7e6e03f43a5a976a13120ef upstream. @@ -49988,170 +49988,98 @@ index 706c4e10e9e29..50d9dd173be79 100644 2.18.4 -From d08426b3c0fc045f9794e7e3f2adb1d909dbd165 Mon Sep 17 00:00:00 2001 +From 973aa27a4460512f93a0a5de7446b1e90c639e1c Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" -Date: Tue, 11 Feb 2020 20:47:05 +0100 -Subject: [PATCH 070/115] icmp: introduce helper for nat'd source address in - network device context +Date: Fri, 15 Jan 2021 20:30:12 +0100 +Subject: [PATCH 070/124] crypto: lib/chacha20poly1305 - define empty module + exit function -commit 0b41713b606694257b90d61ba7e2712d8457648b upstream. +commit ac88c322d0f2917d41d13553c69e9d7f043c8b6f upstream. -This introduces a helper function to be called only by network drivers -that wraps calls to icmp[v6]_send in a conntrack transformation, in case -NAT has been used. We don't want to pollute the non-driver path, though, -so we introduce this as a helper to be called by places that actually -make use of this, as suggested by Florian. +With no mod_exit function, users are unable to unload the module after +use. I'm not aware of any reason why module unloading should be +prohibited for this one, so this commit simply adds an empty exit +function. +Reported-and-tested-by: John Donnelly +Acked-by: Ard Biesheuvel Signed-off-by: Jason A. Donenfeld -Cc: Florian Westphal -Signed-off-by: David S. Miller +Signed-off-by: Herbert Xu Signed-off-by: Jason A. Donenfeld --- - include/linux/icmpv6.h | 10 ++++++++++ - include/net/icmp.h | 6 ++++++ - net/ipv4/icmp.c | 33 +++++++++++++++++++++++++++++++++ - net/ipv6/ip6_icmp.c | 34 ++++++++++++++++++++++++++++++++++ - 4 files changed, 83 insertions(+) - -diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h -index a8f8889761378..024b7a4cd98e2 100644 ---- a/include/linux/icmpv6.h -+++ b/include/linux/icmpv6.h -@@ -22,12 +22,22 @@ extern int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn); - int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type, - unsigned int data_len); - -+#if IS_ENABLED(CONFIG_NF_NAT) -+void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info); -+#else -+#define icmpv6_ndo_send icmpv6_send -+#endif -+ - #else - - static inline void icmpv6_send(struct sk_buff *skb, - u8 type, u8 code, __u32 info) - { -+} - -+static inline void icmpv6_ndo_send(struct sk_buff *skb, -+ u8 type, u8 code, __u32 info) -+{ - } - #endif - -diff --git a/include/net/icmp.h b/include/net/icmp.h -index 5d4bfdba9adf0..9ac2d2672a938 100644 ---- a/include/net/icmp.h -+++ b/include/net/icmp.h -@@ -43,6 +43,12 @@ static inline void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 - __icmp_send(skb_in, type, code, info, &IPCB(skb_in)->opt); - } - -+#if IS_ENABLED(CONFIG_NF_NAT) -+void icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info); -+#else -+#define icmp_ndo_send icmp_send -+#endif -+ - int icmp_rcv(struct sk_buff *skb); - int icmp_err(struct sk_buff *skb, u32 info); - int icmp_init(void); -diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c -index d00533aea1f05..5b7717da168db 100644 ---- a/net/ipv4/icmp.c -+++ b/net/ipv4/icmp.c -@@ -750,6 +750,39 @@ out:; + lib/crypto/chacha20poly1305.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c +index 431e042803327..1fec56e5dd511 100644 +--- a/lib/crypto/chacha20poly1305.c ++++ b/lib/crypto/chacha20poly1305.c +@@ -364,7 +364,12 @@ static int __init mod_init(void) + return 0; } - EXPORT_SYMBOL(__icmp_send); -+#if IS_ENABLED(CONFIG_NF_NAT) -+#include -+void icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info) ++static void __exit mod_exit(void) +{ -+ struct sk_buff *cloned_skb = NULL; -+ enum ip_conntrack_info ctinfo; -+ struct nf_conn *ct; -+ __be32 orig_ip; -+ -+ ct = nf_ct_get(skb_in, &ctinfo); -+ if (!ct || !(ct->status & IPS_SRC_NAT)) { -+ icmp_send(skb_in, type, code, info); -+ return; -+ } -+ -+ if (skb_shared(skb_in)) -+ skb_in = cloned_skb = skb_clone(skb_in, GFP_ATOMIC); -+ -+ if (unlikely(!skb_in || skb_network_header(skb_in) < skb_in->head || -+ (skb_network_header(skb_in) + sizeof(struct iphdr)) > -+ skb_tail_pointer(skb_in) || skb_ensure_writable(skb_in, -+ skb_network_offset(skb_in) + sizeof(struct iphdr)))) -+ goto out; -+ -+ orig_ip = ip_hdr(skb_in)->saddr; -+ ip_hdr(skb_in)->saddr = ct->tuplehash[0].tuple.src.u3.ip; -+ icmp_send(skb_in, type, code, info); -+ ip_hdr(skb_in)->saddr = orig_ip; -+out: -+ consume_skb(cloned_skb); +} -+EXPORT_SYMBOL(icmp_ndo_send); -+#endif - - static void icmp_socket_deliver(struct sk_buff *skb, u32 info) - { -diff --git a/net/ipv6/ip6_icmp.c b/net/ipv6/ip6_icmp.c -index 02045494c24cc..e0086758b6ee3 100644 ---- a/net/ipv6/ip6_icmp.c -+++ b/net/ipv6/ip6_icmp.c -@@ -45,4 +45,38 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) - rcu_read_unlock(); - } - EXPORT_SYMBOL(icmpv6_send); + -+#if IS_ENABLED(CONFIG_NF_NAT) -+#include -+void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info) -+{ -+ struct sk_buff *cloned_skb = NULL; -+ enum ip_conntrack_info ctinfo; -+ struct in6_addr orig_ip; -+ struct nf_conn *ct; -+ -+ ct = nf_ct_get(skb_in, &ctinfo); -+ if (!ct || !(ct->status & IPS_SRC_NAT)) { -+ icmpv6_send(skb_in, type, code, info); -+ return; -+ } -+ -+ if (skb_shared(skb_in)) -+ skb_in = cloned_skb = skb_clone(skb_in, GFP_ATOMIC); -+ -+ if (unlikely(!skb_in || skb_network_header(skb_in) < skb_in->head || -+ (skb_network_header(skb_in) + sizeof(struct ipv6hdr)) > -+ skb_tail_pointer(skb_in) || skb_ensure_writable(skb_in, -+ skb_network_offset(skb_in) + sizeof(struct ipv6hdr)))) -+ goto out; -+ -+ orig_ip = ipv6_hdr(skb_in)->saddr; -+ ipv6_hdr(skb_in)->saddr = ct->tuplehash[0].tuple.src.u3.in6; -+ icmpv6_send(skb_in, type, code, info); -+ ipv6_hdr(skb_in)->saddr = orig_ip; -+out: -+ consume_skb(cloned_skb); -+} -+EXPORT_SYMBOL(icmpv6_ndo_send); -+#endif - #endif + module_init(mod_init); ++module_exit(mod_exit); + MODULE_LICENSE("GPL v2"); + MODULE_DESCRIPTION("ChaCha20Poly1305 AEAD construction"); + MODULE_AUTHOR("Jason A. Donenfeld "); -- 2.18.4 -From 39f2f7f90703df3f272dd8d2bd88fbe1542eb512 Mon Sep 17 00:00:00 2001 +From 8f8e54f37e8172cece9914470b0493f255d38857 Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Sun, 13 Dec 2020 15:39:29 +0100 +Subject: [PATCH 071/124] crypto: arm/chacha-neon - add missing counter + increment + +commit fd16931a2f518a32753920ff20895e5cf04c8ff1 upstream. + +Commit 86cd97ec4b943af3 ("crypto: arm/chacha-neon - optimize for non-block +size multiples") refactored the chacha block handling in the glue code in +a way that may result in the counter increment to be omitted when calling +chacha_block_xor_neon() to process a full block. This violates the skcipher +API, which requires that the output IV is suitable for handling more input +as long as the preceding input has been presented in round multiples of the +block size. Also, the same code is exposed via the chacha library interface +whose callers may actually rely on this increment to occur even for final +blocks that are smaller than the chacha block size. + +So increment the counter after calling chacha_block_xor_neon(). + +Fixes: 86cd97ec4b943af3 ("crypto: arm/chacha-neon - optimize for non-block size multiples") +Reported-by: Eric Biggers +Signed-off-by: Ard Biesheuvel +Signed-off-by: Herbert Xu +Signed-off-by: Jason A. Donenfeld +--- + arch/arm/crypto/chacha-glue.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c +index f603184dc0f58..a408f4bcfd625 100644 +--- a/arch/arm/crypto/chacha-glue.c ++++ b/arch/arm/crypto/chacha-glue.c +@@ -60,6 +60,7 @@ static void chacha_doneon(u32 *state, u8 *dst, const u8 *src, + chacha_block_xor_neon(state, d, s, nrounds); + if (d != dst) + memcpy(dst, buf, bytes); ++ state[12]++; + } + } + +-- +2.18.4 + + +From c7211888d3d667d5ab18286bba218419460cd543 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 9 Dec 2019 00:27:34 +0100 -Subject: [PATCH 071/115] net: WireGuard secure network tunnel +Subject: [PATCH 072/124] net: WireGuard secure network tunnel commit e7096c131e5161fa3b8e52a650d7719d2857adfd upstream. @@ -50265,7 +50193,8 @@ Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller [Jason: ported to 5.4 by doing the following: - wg_get_device_start uses genl_family_attrbuf - - trival skb_redirect_reset change from 2c64605b590e is folded in] + - trival skb_redirect_reset change from 2c64605b590e is folded in + - skb_list_walk_safe was already backported prior] Signed-off-by: Jason A. Donenfeld --- MAINTAINERS | 8 + @@ -50277,7 +50206,7 @@ Signed-off-by: Jason A. Donenfeld drivers/net/wireguard/cookie.c | 236 ++++++ drivers/net/wireguard/cookie.h | 59 ++ drivers/net/wireguard/device.c | 458 ++++++++++ - drivers/net/wireguard/device.h | 73 ++ + drivers/net/wireguard/device.h | 65 ++ drivers/net/wireguard/main.c | 64 ++ drivers/net/wireguard/messages.h | 128 +++ drivers/net/wireguard/netlink.c | 648 +++++++++++++++ @@ -50304,7 +50233,7 @@ Signed-off-by: Jason A. Donenfeld drivers/net/wireguard/version.h | 1 + include/uapi/linux/wireguard.h | 196 +++++ tools/testing/selftests/wireguard/netns.sh | 537 ++++++++++++ - 36 files changed, 7761 insertions(+) + 36 files changed, 7753 insertions(+) create mode 100644 drivers/net/wireguard/Makefile create mode 100644 drivers/net/wireguard/allowedips.c create mode 100644 drivers/net/wireguard/allowedips.h @@ -51671,10 +51600,10 @@ index 0000000000000..16b19824b9ad0 +} diff --git a/drivers/net/wireguard/device.h b/drivers/net/wireguard/device.h new file mode 100644 -index 0000000000000..c91f3051c5c78 +index 0000000000000..b15a8be9d8169 --- /dev/null +++ b/drivers/net/wireguard/device.h -@@ -0,0 +1,73 @@ +@@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2015-2019 Jason A. Donenfeld . All Rights Reserved. @@ -51739,14 +51668,6 @@ index 0000000000000..c91f3051c5c78 +int wg_device_init(void); +void wg_device_uninit(void); + -+/* Later after the dust settles, this can be moved into include/linux/skbuff.h, -+ * where virtually all code that deals with GSO segs can benefit, around ~30 -+ * drivers as of writing. -+ */ -+#define skb_list_walk_safe(first, skb, next) \ -+ for (skb = first, next = skb->next; skb; \ -+ skb = next, next = skb ? skb->next : NULL) -+ +#endif /* _WG_DEVICE_H */ diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c new file mode 100644 @@ -58335,10 +58256,10 @@ index 0000000000000..e7310d9390f7e 2.18.4 -From b1a7d1d40af85d1e0376bfd6d731601c5e1c395a Mon Sep 17 00:00:00 2001 +From 9ba5b1f9cc591fbbe725045f93de149c66e347ec Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 15 Dec 2019 22:08:00 +0100 -Subject: [PATCH 072/115] wireguard: selftests: import harness makefile for +Subject: [PATCH 073/124] wireguard: selftests: import harness makefile for test suite commit 65d88d04114bca7d85faebd5fed61069cb2b632c upstream. @@ -59472,10 +59393,10 @@ index 0000000000000..9cca30206014d 2.18.4 -From 8dc975a7427f7038811800fef712fd713aae7a61 Mon Sep 17 00:00:00 2001 +From f70e1a6c29e243adda7b1f5da28c10eb39d167f3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 15 Dec 2019 22:08:01 +0100 -Subject: [PATCH 073/115] wireguard: Kconfig: select parent dependency for +Subject: [PATCH 074/124] wireguard: Kconfig: select parent dependency for crypto commit d7c68a38bb4f9b7c1a2e4a772872c752ee5c44a6 upstream. @@ -59509,10 +59430,10 @@ index 16ad145e22c91..57f1ba924f4ec 100644 2.18.4 -From 585480d0587e45e1e266a071224e05ec33bfc115 Mon Sep 17 00:00:00 2001 +From 99693926e0ba394e2cd6e0b2816f722e10713979 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Sun, 15 Dec 2019 22:08:02 +0100 -Subject: [PATCH 074/115] wireguard: global: fix spelling mistakes in comments +Subject: [PATCH 075/124] wireguard: global: fix spelling mistakes in comments commit a2ec8b5706944d228181c8b91d815f41d6dd8e7b upstream. @@ -59583,10 +59504,10 @@ index dd8a47c4ad11f..ae88be14c9478 100644 2.18.4 -From 06066ce74329f8b71dab647b3793da9baf7ee235 Mon Sep 17 00:00:00 2001 +From 047cec8e8a87e67fafe1264b333d0982510d6a26 Mon Sep 17 00:00:00 2001 From: YueHaibing Date: Sun, 15 Dec 2019 22:08:03 +0100 -Subject: [PATCH 075/115] wireguard: main: remove unused include +Subject: [PATCH 076/124] wireguard: main: remove unused include commit 43967b6ff91e53bcce5ae08c16a0588a475b53a1 upstream. @@ -59618,10 +59539,10 @@ index 10c0a40f6a9e5..7a7d5f1a80fc7 100644 2.18.4 -From dd22819ca61b35927811636f161b46dca950a3fa Mon Sep 17 00:00:00 2001 +From 58b3a9e8b9cee3239cd06ef175298547273a4295 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Sun, 15 Dec 2019 22:08:04 +0100 -Subject: [PATCH 076/115] wireguard: allowedips: use kfree_rcu() instead of +Subject: [PATCH 077/124] wireguard: allowedips: use kfree_rcu() instead of call_rcu() commit d89ee7d5c73af15c1c6f12b016cdf469742b5726 upstream. @@ -59666,10 +59587,10 @@ index 72667d5399c34..121d9ea0f1358 100644 2.18.4 -From 6e7cae5376e453f49a50cf28e2136b40d515520f Mon Sep 17 00:00:00 2001 +From 8d8c7a1f402c98e771c36b235238411395674250 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 2 Jan 2020 17:47:49 +0100 -Subject: [PATCH 077/115] wireguard: selftests: remove ancient kernel +Subject: [PATCH 078/124] wireguard: selftests: remove ancient kernel compatibility code commit 9a69a4c8802adf642bc4a13d471b5a86b44ed434 upstream. @@ -60053,10 +59974,10 @@ index 9cca30206014d..af9323a0b6e09 100644 2.18.4 -From fd376f084fcdb55820e412bb59b3057089c5d240 Mon Sep 17 00:00:00 2001 +From 67d324d88510f1680ff57f141e194031b1a8f541 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 2 Jan 2020 17:47:50 +0100 -Subject: [PATCH 078/115] wireguard: queueing: do not account for pfmemalloc +Subject: [PATCH 079/124] wireguard: queueing: do not account for pfmemalloc when clearing skb header commit 04d2ea92a18417619182cbb79063f154892b0150 upstream. @@ -60098,10 +60019,10 @@ index 58fdd630b246c..e62c714a548ee 100644 2.18.4 -From b4d022a01246cfc45f3a851582fe4e3a7bc05399 Mon Sep 17 00:00:00 2001 +From dce70ef9a067ea0a0a7d39f299a10a1d83ae4d72 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 2 Jan 2020 17:47:51 +0100 -Subject: [PATCH 079/115] wireguard: socket: mark skbs as not on list when +Subject: [PATCH 080/124] wireguard: socket: mark skbs as not on list when receiving via gro commit 736775d06bac60d7a353e405398b48b2bd8b1e54 upstream. @@ -60138,10 +60059,10 @@ index c46256d0d81c1..262f3b5c819d5 100644 2.18.4 -From 98f74bef92c9a71e0b13fa71019c7cf4d9edb33d Mon Sep 17 00:00:00 2001 +From 93ac00668d7422ef05f04eb7a87e12b8b905184d Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 4 Feb 2020 22:17:25 +0100 -Subject: [PATCH 080/115] wireguard: allowedips: fix use-after-free in +Subject: [PATCH 081/124] wireguard: allowedips: fix use-after-free in root_remove_peer_lists commit 9981159fc3b677b357f84e069a11de5a5ec8a2a8 upstream. @@ -60308,10 +60229,10 @@ index 121d9ea0f1358..3725e9cd85f4f 100644 2.18.4 -From 9f8727b2a89423083a3d0a9d2a05613e5702f2c3 Mon Sep 17 00:00:00 2001 +From ea5089abc5550726239bc5f36aa77e1322b3066f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 4 Feb 2020 22:17:26 +0100 -Subject: [PATCH 081/115] wireguard: noise: reject peers with low order public +Subject: [PATCH 082/124] wireguard: noise: reject peers with low order public keys commit ec31c2676a10e064878927b243fada8c2fb0c03c upstream. @@ -60550,10 +60471,10 @@ index d71c8db68a8ce..919d9d866446a 100644 2.18.4 -From 63c65ef93ff74fe306f16513a29ae71ddb5039f6 Mon Sep 17 00:00:00 2001 +From 9c83a9b35c80b73a7ba02b5de86b3fdfa34dc542 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 4 Feb 2020 22:17:27 +0100 -Subject: [PATCH 082/115] wireguard: selftests: ensure non-addition of peers +Subject: [PATCH 083/124] wireguard: selftests: ensure non-addition of peers with failed precomputation commit f9398acba6a4ae9cb98bfe4d56414d376eff8d57 upstream. @@ -60590,10 +60511,10 @@ index d5c85c7494f2e..b03647d1bbf6c 100755 2.18.4 -From 1fcd6b9256a02f1cab771dad818fc2b96d5260b0 Mon Sep 17 00:00:00 2001 +From 28265c2e0e86660f46b8c87c8bc5cf2b6d804e39 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 4 Feb 2020 22:17:29 +0100 -Subject: [PATCH 083/115] wireguard: selftests: tie socket waiting to target +Subject: [PATCH 084/124] wireguard: selftests: tie socket waiting to target pid commit 88f404a9b1d75388225b1c67b6dd327cb2182777 upstream. @@ -60674,10 +60595,10 @@ index b03647d1bbf6c..f5ab1cda8bb55 100755 2.18.4 -From 91973a963eefb5a01dc58ad39556b7b2bdbd1fc6 Mon Sep 17 00:00:00 2001 +From 257fc449457fcb57f90fd5fd830fa7a764748a92 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 11 Feb 2020 20:47:08 +0100 -Subject: [PATCH 084/115] wireguard: device: use icmp_ndo_send helper +Subject: [PATCH 085/124] wireguard: device: use icmp_ndo_send helper commit a12d7f3cbdc72c7625881c8dc2660fc2c979fdf2 upstream. @@ -60746,10 +60667,10 @@ index f5ab1cda8bb55..138d46b3f3306 100755 2.18.4 -From fd3733b4a7d72a7010acbea75ff2998f1f0176cc Mon Sep 17 00:00:00 2001 +From d4425a26a465b9ee5eed488576756173e054ce55 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 14 Feb 2020 23:57:20 +0100 -Subject: [PATCH 085/115] wireguard: selftests: reduce complexity and fix make +Subject: [PATCH 086/124] wireguard: selftests: reduce complexity and fix make races commit 04ddf1208f03e1dbc39a4619c40eba640051b950 upstream. @@ -60856,10 +60777,10 @@ index f10aa3590adc4..28d477683e8ab 100644 2.18.4 -From 58a6e7b509abdf6f12213d1d25c79f03a60723dc Mon Sep 17 00:00:00 2001 +From 23edd1fd792c68d1e7d65af258ebbb5b29a057a3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 14 Feb 2020 23:57:21 +0100 -Subject: [PATCH 086/115] wireguard: receive: reset last_under_load to zero +Subject: [PATCH 087/124] wireguard: receive: reset last_under_load to zero commit 2a8a4df36462aa85b0db87b7c5ea145ba67e34a8 upstream. @@ -60900,10 +60821,10 @@ index 9c6bab9c981f4..4a153894cee25 100644 2.18.4 -From 15e63b5f5a1d129aeb5a2c485826e276e5b1f82d Mon Sep 17 00:00:00 2001 +From 8be835018687cbcbf5a0fa806280d2dcc170cb84 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 14 Feb 2020 23:57:22 +0100 -Subject: [PATCH 087/115] wireguard: send: account for mtu=0 devices +Subject: [PATCH 088/124] wireguard: send: account for mtu=0 devices commit 175f1ca9a9ed8689d2028da1a7c624bb4fb4ff7e upstream. @@ -61003,10 +60924,10 @@ index c132605634460..7348c10cbae3d 100644 2.18.4 -From 0e1149c0ddd63ffa1e1dd5698f5f185df5047295 Mon Sep 17 00:00:00 2001 +From b36598dacf234f86db04159062b3c2ca7bfe0064 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 14 Feb 2020 23:57:23 +0100 -Subject: [PATCH 088/115] wireguard: socket: remove extra call to +Subject: [PATCH 089/124] wireguard: socket: remove extra call to synchronize_net commit 1fbc33b0a7feb6ca72bf7dc8a05d81485ee8ee2e upstream. @@ -61042,10 +60963,10 @@ index 262f3b5c819d5..b0d6541582d31 100644 2.18.4 -From 9b5ab1284d6ca4040320e85c7e38edafad633aae Mon Sep 17 00:00:00 2001 +From f8faaa48a28d93ede6a6a3c45e87ae52f4048e4c Mon Sep 17 00:00:00 2001 From: YueHaibing Date: Wed, 18 Mar 2020 18:30:43 -0600 -Subject: [PATCH 089/115] wireguard: selftests: remove duplicated include +Subject: [PATCH 090/124] wireguard: selftests: remove duplicated include commit 166391159c5deb84795d2ff46e95f276177fa5fb upstream. @@ -61076,10 +60997,10 @@ index 90bc9813cadcd..c9698120ac9d8 100644 2.18.4 -From 835cf5da1ed821bc7add3f7a83de43785bd76393 Mon Sep 17 00:00:00 2001 +From 4d4c041de7586df2bf093545fb580b6451b077d4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 18 Mar 2020 18:30:45 -0600 -Subject: [PATCH 090/115] wireguard: queueing: account for skb->protocol==0 +Subject: [PATCH 091/124] wireguard: queueing: account for skb->protocol==0 commit a5588604af448664e796daf3c1d5a4523c60667b upstream. @@ -61186,10 +61107,10 @@ index 4a153894cee25..243ed7172dd27 100644 2.18.4 -From ba8c8c7deda3d34c1e87a7c5d57c3df7dd090426 Mon Sep 17 00:00:00 2001 +From db9c9dd5a6d4104ee525eea52b0f51a9729398df Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 18 Mar 2020 18:30:46 -0600 -Subject: [PATCH 091/115] wireguard: receive: remove dead code from default +Subject: [PATCH 092/124] wireguard: receive: remove dead code from default packet type case commit 2b8765c52db24c0fbcc81bac9b5e8390f2c7d3c8 upstream. @@ -61227,10 +61148,10 @@ index 243ed7172dd27..da3b782ab7d31 100644 2.18.4 -From 8add8fff243ce9509db0e4cafed3134d326d966e Mon Sep 17 00:00:00 2001 +From 0da5b8c1525e4fbf15cd78fa171d73161f7c9ab1 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 18 Mar 2020 18:30:47 -0600 -Subject: [PATCH 092/115] wireguard: noise: error out precomputed DH during +Subject: [PATCH 093/124] wireguard: noise: error out precomputed DH during handshake rather than config commit 11a7686aa99c7fe4b3f80f6dcccd54129817984d upstream. @@ -61465,10 +61386,10 @@ index 138d46b3f3306..936e1ca9410ec 100755 2.18.4 -From bf4d1401c6da622c07cd83e0ebdb80cd822826c3 Mon Sep 17 00:00:00 2001 +From 263d41df64cf57a71456e3e75916ce73f8f4561b Mon Sep 17 00:00:00 2001 From: Sultan Alsawaf Date: Wed, 29 Apr 2020 14:59:20 -0600 -Subject: [PATCH 093/115] wireguard: send: remove errant newline from +Subject: [PATCH 094/124] wireguard: send: remove errant newline from packet_encrypt_worker commit d6833e42786e050e7522d6a91a9361e54085897d upstream. @@ -61500,10 +61421,10 @@ index 7348c10cbae3d..3e030d614df5f 100644 2.18.4 -From 0af14f05e0409c9c654872128d3bd38db881a9dc Mon Sep 17 00:00:00 2001 +From fc4615677434ed6c18f3340258512a1f7ea62a0c Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 29 Apr 2020 14:59:21 -0600 -Subject: [PATCH 094/115] wireguard: queueing: cleanup ptr_ring in error path +Subject: [PATCH 095/124] wireguard: queueing: cleanup ptr_ring in error path of packet_queue_init commit 130c58606171326c81841a49cc913cd354113dd9 upstream. @@ -61541,10 +61462,10 @@ index 5c964fcb994ec..71b8e80b58e12 100644 2.18.4 -From 4876e7f6852def2ce21465e276dc0b41970519cf Mon Sep 17 00:00:00 2001 +From 15d509fd1173d5101becbf6654a8a188492a7e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 29 Apr 2020 14:59:22 -0600 -Subject: [PATCH 095/115] wireguard: receive: use tunnel helpers for +Subject: [PATCH 096/124] wireguard: receive: use tunnel helpers for decapsulating ECN markings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -61597,10 +61518,10 @@ index da3b782ab7d31..267f202f19314 100644 2.18.4 -From 20c723b26247f0b52316021a834a507fbed7413f Mon Sep 17 00:00:00 2001 +From b85452edb946440774b25fac96dbdc7035a37494 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:02 -0600 -Subject: [PATCH 096/115] wireguard: selftests: use normal kernel stack size on +Subject: [PATCH 097/124] wireguard: selftests: use normal kernel stack size on ppc64 commit a0fd7cc87a018df1a17f9d3f0bd994c1f22c6b34 upstream. @@ -61632,10 +61553,10 @@ index 990c510a9cfa5..f52f1e2bc7f64 100644 2.18.4 -From 30922f6bb8e31e980d5e112304649de435757819 Mon Sep 17 00:00:00 2001 +From c293020965048a6331777fea5b46c5aa956b27a9 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:03 -0600 -Subject: [PATCH 097/115] wireguard: socket: remove errant restriction on +Subject: [PATCH 098/124] wireguard: socket: remove errant restriction on looping to self commit b673e24aad36981f327a6570412ffa7754de8911 upstream. @@ -61802,10 +61723,10 @@ index 936e1ca9410ec..17a1f53ceba01 100755 2.18.4 -From 13059d9ab6aacc2835ce37a7e0be71da26fa8615 Mon Sep 17 00:00:00 2001 +From e97fec897d66616d772d8943aab2250efe6b3d2e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:04 -0600 -Subject: [PATCH 098/115] wireguard: send/receive: cond_resched() when +Subject: [PATCH 099/124] wireguard: send/receive: cond_resched() when processing worker ringbuffers commit 4005f5c3c9d006157ba716594e0d70c88a235c5e upstream. @@ -61868,10 +61789,10 @@ index 3e030d614df5f..dc3079e17c7fc 100644 2.18.4 -From 10c20143d8ae47a6afbe2c4b50d74928267c4e7c Mon Sep 17 00:00:00 2001 +From 4c198489509519c8882c0e6f4f0e00b7cd9c89cb Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:05 -0600 -Subject: [PATCH 099/115] wireguard: selftests: initalize ipv6 members to NULL +Subject: [PATCH 100/124] wireguard: selftests: initalize ipv6 members to NULL to squelch clang warning commit 4fed818ef54b08d4b29200e416cce65546ad5312 upstream. @@ -61925,10 +61846,10 @@ index bcd6462e45401..007cd4457c5f6 100644 2.18.4 -From 56b4e8a94219a5ddb5c379a315785dfd04c8aaf4 Mon Sep 17 00:00:00 2001 +From 411743d6edf826122de2ee4b9351fd336c4b30e8 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:06 -0600 -Subject: [PATCH 100/115] wireguard: send/receive: use explicit unlikely branch +Subject: [PATCH 101/124] wireguard: send/receive: use explicit unlikely branch instead of implicit coalescing commit 243f2148937adc72bcaaa590d482d599c936efde upstream. @@ -62021,10 +61942,10 @@ index dc3079e17c7fc..6687db6998035 100644 2.18.4 -From 88d56a14ac2ba38ae63931921d00a218e5df57ba Mon Sep 17 00:00:00 2001 +From da23a9d541678b0070011db76eeb5719e3c9629e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 May 2020 22:49:27 -0600 -Subject: [PATCH 101/115] wireguard: selftests: use newer iproute2 for gcc-10 +Subject: [PATCH 102/124] wireguard: selftests: use newer iproute2 for gcc-10 commit ee3c1aa3f34b7842c1557cfe5d8c3f7b8c692de8 upstream. @@ -62058,10 +61979,10 @@ index 28d477683e8ab..2dab4f57516dc 100644 2.18.4 -From 6a5a86046d080b05bf9b7f6522451c3862bf8b51 Mon Sep 17 00:00:00 2001 +From 0b4c25a6078fefb236ff7f1bb00f8b0964ef80f8 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 May 2020 22:49:28 -0600 -Subject: [PATCH 102/115] wireguard: noise: read preshared key while taking +Subject: [PATCH 103/124] wireguard: noise: read preshared key while taking lock commit bc67d371256f5c47d824e2eec51e46c8d62d022e upstream. @@ -62126,10 +62047,10 @@ index 708dc61c974f7..07eb438a6deee 100644 2.18.4 -From 7b2b427ec4f4a0543122a3b5ae2b8ffcc17651a8 Mon Sep 17 00:00:00 2001 +From 927d2a806c92e276c7fe83b8b0a5dd1e8e89c2a0 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 May 2020 22:49:29 -0600 -Subject: [PATCH 103/115] wireguard: queueing: preserve flow hash across packet +Subject: [PATCH 104/124] wireguard: queueing: preserve flow hash across packet scrubbing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -62254,10 +62175,10 @@ index 6687db6998035..2f5119ff93d8f 100644 2.18.4 -From 38d02be9e01adc98e3e86b49fc1a5c0d56a73510 Mon Sep 17 00:00:00 2001 +From 4dba24ab2575031dd5b15dfda08481f59d18d017 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 May 2020 22:49:30 -0600 -Subject: [PATCH 104/115] wireguard: noise: separate receive counter from send +Subject: [PATCH 105/124] wireguard: noise: separate receive counter from send counter commit a9e90d9931f3a474f04bab782ccd9d77904941e9 upstream. @@ -62599,10 +62520,10 @@ index 2f5119ff93d8f..f74b9341ab0fe 100644 2.18.4 -From f6351f448c77e1588d85dae86c42f4f87ff40986 Mon Sep 17 00:00:00 2001 +From 9ea9e1d08e6533e936db42f5409dd06a39776532 Mon Sep 17 00:00:00 2001 From: Frank Werner-Krippendorf Date: Tue, 23 Jun 2020 03:59:44 -0600 -Subject: [PATCH 105/115] wireguard: noise: do not assign initiation time in if +Subject: [PATCH 106/124] wireguard: noise: do not assign initiation time in if condition commit 558b353c9c2a717509f291c066c6bd8f5f5e21be upstream. @@ -62638,10 +62559,10 @@ index 626433690abb3..201a22681945f 100644 2.18.4 -From 3e9fd6a6a7152497d8cb3fb7e2af0a6872e3fcab Mon Sep 17 00:00:00 2001 +From 1faa4948b0f226d850f1768a6d60a60d505538f0 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 23 Jun 2020 03:59:45 -0600 -Subject: [PATCH 106/115] wireguard: device: avoid circular netns references +Subject: [PATCH 107/124] wireguard: device: avoid circular netns references commit 900575aa33a3eaaef802b31de187a85c4a4b4bd0 upstream. @@ -62806,7 +62727,7 @@ index 3ac3f8570ca1b..a8f151b1b5fab 100644 unregister_pm_notifier(&pm_notifier); #endif diff --git a/drivers/net/wireguard/device.h b/drivers/net/wireguard/device.h -index c91f3051c5c78..3e01b4c1a60eb 100644 +index b15a8be9d8169..4d0144e169478 100644 --- a/drivers/net/wireguard/device.h +++ b/drivers/net/wireguard/device.h @@ -40,7 +40,7 @@ struct wg_device { @@ -62948,10 +62869,10 @@ index 17a1f53ceba01..d77f4829f1e07 100755 2.18.4 -From c610930f666bf70111be96306a961534e88d96a3 Mon Sep 17 00:00:00 2001 +From 58866518bbb42f948f1da51cc4a0443fe84b2f3b Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 24 Jun 2020 16:06:03 -0600 -Subject: [PATCH 107/115] wireguard: receive: account for napi_gro_receive +Subject: [PATCH 108/124] wireguard: receive: account for napi_gro_receive never returning GRO_DROP commit df08126e3833e9dca19e2407db5f5860a7c194fb upstream. @@ -62996,10 +62917,10 @@ index 91438144e4f7a..9b2ab6fc91cdd 100644 2.18.4 -From e4ce95508d0975af13acb0ebe9ad0cdb64136852 Mon Sep 17 00:00:00 2001 +From c5b1a54d82cc2bede70d730cf992bea39e17df77 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 29 Jun 2020 19:06:18 -0600 -Subject: [PATCH 108/115] net: ip_tunnel: add header_ops for layer 3 devices +Subject: [PATCH 109/124] net: ip_tunnel: add header_ops for layer 3 devices commit 2606aff916854b61234bf85001be9777bab2d5f8 upstream. @@ -63062,10 +62983,10 @@ index 1452a97914a0d..cfe21c3ddfc24 100644 2.18.4 -From 2d9a30f41f6e2cb5d94b654f234eefb65db32b6d Mon Sep 17 00:00:00 2001 +From f0414c8f4df62e90c3b0233255881871e666883a Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 29 Jun 2020 19:06:20 -0600 -Subject: [PATCH 109/115] wireguard: implement header_ops->parse_protocol for +Subject: [PATCH 110/124] wireguard: implement header_ops->parse_protocol for AF_PACKET commit 01a4967c71c004f8ecad4ab57021348636502fa9 upstream. @@ -63105,10 +63026,10 @@ index a8f151b1b5fab..c9f65e96ccb04 100644 2.18.4 -From fb8a80f749b420706a45b3554f852506e38de557 Mon Sep 17 00:00:00 2001 +From 843c46e876e7a60f1c996cf4ca86cc9bea82d5b3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 29 Jun 2020 19:06:21 -0600 -Subject: [PATCH 110/115] wireguard: queueing: make use of +Subject: [PATCH 111/124] wireguard: queueing: make use of ip_tunnel_parse_protocol commit 1a574074ae7d1d745c16f7710655f38a53174c27 upstream. @@ -63182,10 +63103,10 @@ index 9b2ab6fc91cdd..2c9551ea6dc73 100644 2.18.4 -From dbd344b57d163cd9978e382cede26bdda32b9b4a Mon Sep 17 00:00:00 2001 +From dbd95b2ce81cd5b358ab33c156f6b57f5bb02ba8 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 18 Aug 2020 10:17:31 +0200 -Subject: [PATCH 111/115] netlink: consistently use NLA_POLICY_EXACT_LEN() +Subject: [PATCH 112/124] netlink: consistently use NLA_POLICY_EXACT_LEN() commit 8140860c817f3e9f78bcd1e420b9777ddcbaa629 upstream. @@ -63237,10 +63158,10 @@ index 9756239416fde..2a14f564033a4 100644 2.18.4 -From f9709ed12e3d82b6e842f8419e646bfdd96d399a Mon Sep 17 00:00:00 2001 +From 210db96a332445b6831498b4f43ba1b2b1dd3667 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 18 Aug 2020 10:17:32 +0200 -Subject: [PATCH 112/115] netlink: consistently use NLA_POLICY_MIN_LEN() +Subject: [PATCH 113/124] netlink: consistently use NLA_POLICY_MIN_LEN() commit bc0435855041d7fff0b83dd992fc4be34aa11afb upstream. @@ -63282,10 +63203,10 @@ index 2a14f564033a4..1c69eb8735d53 100644 2.18.4 -From 70d652fcdfed63b718add26c1a9ba2701e284bb1 Mon Sep 17 00:00:00 2001 +From 301c5d69a417d6a8482e771bb2cfb56a7997003b Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 9 Sep 2020 13:58:14 +0200 -Subject: [PATCH 113/115] wireguard: noise: take lock when removing handshake +Subject: [PATCH 114/124] wireguard: noise: take lock when removing handshake entry from table commit 9179ba31367bcf481c3c79b5f028c94faad9f30a upstream. @@ -63415,10 +63336,10 @@ index 201a22681945f..27cb5045bed2d 100644 2.18.4 -From db4ade5b7260adf3619652d8b62fe43a6c73e123 Mon Sep 17 00:00:00 2001 +From 9ffb33ae39c34bca04c8f517a19f4453de856bab Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 9 Sep 2020 13:58:15 +0200 -Subject: [PATCH 114/115] wireguard: peerlookup: take lock before checking hash +Subject: [PATCH 115/124] wireguard: peerlookup: take lock before checking hash in replace operation commit 6147f7b1e90ff09bd52afc8b9206a7fcd133daf7 upstream. @@ -63483,10 +63404,10 @@ index e4deb331476b3..f2783aa7a88f1 100644 2.18.4 -From 3f0fd35bef6cd99bbc1537e497171e52c73e5d28 Mon Sep 17 00:00:00 2001 +From 184287bfd7d04d414bd2fa9f2247de401c50dca4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 29 Oct 2020 03:56:05 +0100 -Subject: [PATCH 115/115] wireguard: selftests: check that route_me_harder +Subject: [PATCH 116/124] wireguard: selftests: check that route_me_harder packets use the right sk commit af8afcf1fdd5f365f70e2386c2d8c7a1abd853d7 upstream. @@ -63546,3 +63467,971 @@ index af9323a0b6e09..9864d106e8189 100644 -- 2.18.4 + +From 595e6620ab913513312f8f43b6143ab18f170c79 Mon Sep 17 00:00:00 2001 +From: Antonio Quartulli +Date: Mon, 22 Feb 2021 17:25:43 +0100 +Subject: [PATCH 117/124] wireguard: avoid double unlikely() notation when + using IS_ERR() + +commit 30ac4e2f54ec067b7b9ca0db27e75681581378d6 upstream. + +The definition of IS_ERR() already applies the unlikely() notation +when checking the error status of the passed pointer. For this +reason there is no need to have the same notation outside of +IS_ERR() itself. + +Clean up code by removing redundant notation. + +Signed-off-by: Antonio Quartulli +Signed-off-by: Jason A. Donenfeld +Signed-off-by: Jakub Kicinski +Signed-off-by: Jason A. Donenfeld +--- + drivers/net/wireguard/device.c | 2 +- + drivers/net/wireguard/socket.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c +index c9f65e96ccb04..46ecec72f2143 100644 +--- a/drivers/net/wireguard/device.c ++++ b/drivers/net/wireguard/device.c +@@ -157,7 +157,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) + } else { + struct sk_buff *segs = skb_gso_segment(skb, 0); + +- if (unlikely(IS_ERR(segs))) { ++ if (IS_ERR(segs)) { + ret = PTR_ERR(segs); + goto err_peer; + } +diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c +index c33e2c81635fa..e9c35130846c7 100644 +--- a/drivers/net/wireguard/socket.c ++++ b/drivers/net/wireguard/socket.c +@@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, + ip_rt_put(rt); + rt = ip_route_output_flow(sock_net(sock), &fl, sock); + } +- if (unlikely(IS_ERR(rt))) { ++ if (IS_ERR(rt)) { + ret = PTR_ERR(rt); + net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", + wg->dev->name, &endpoint->addr, ret); +@@ -138,7 +138,7 @@ static int send6(struct wg_device *wg, struct sk_buff *skb, + } + dst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(sock), sock, &fl, + NULL); +- if (unlikely(IS_ERR(dst))) { ++ if (IS_ERR(dst)) { + ret = PTR_ERR(dst); + net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", + wg->dev->name, &endpoint->addr, ret); +-- +2.18.4 + + +From 340ac0965ca42f879f6c59ad3d7e14ecdead688e Mon Sep 17 00:00:00 2001 +From: Jann Horn +Date: Mon, 22 Feb 2021 17:25:44 +0100 +Subject: [PATCH 118/124] wireguard: socket: remove bogus __be32 annotation + +commit 7f57bd8dc22de35ddd895294aa554003e4f19a72 upstream. + +The endpoint->src_if4 has nothing to do with fixed-endian numbers; remove +the bogus annotation. + +This was introduced in +https://git.zx2c4.com/wireguard-monolithic-historical/commit?id=14e7d0a499a676ec55176c0de2f9fcbd34074a82 +in the historical WireGuard repo because the old code used to +zero-initialize multiple members as follows: + + endpoint->src4.s_addr = endpoint->src_if4 = fl.saddr = 0; + +Because fl.saddr is fixed-endian and an assignment returns a value with the +type of its left operand, this meant that sparse detected an assignment +between values of different endianness. + +Since then, this assignment was already split up into separate statements; +just the cast survived. + +Signed-off-by: Jann Horn +Signed-off-by: Jason A. Donenfeld +Signed-off-by: Jakub Kicinski +Signed-off-by: Jason A. Donenfeld +--- + drivers/net/wireguard/socket.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c +index e9c35130846c7..e8eceeb0b62a8 100644 +--- a/drivers/net/wireguard/socket.c ++++ b/drivers/net/wireguard/socket.c +@@ -53,7 +53,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, + if (unlikely(!inet_confirm_addr(sock_net(sock), NULL, 0, + fl.saddr, RT_SCOPE_HOST))) { + endpoint->src4.s_addr = 0; +- *(__force __be32 *)&endpoint->src_if4 = 0; ++ endpoint->src_if4 = 0; + fl.saddr = 0; + if (cache) + dst_cache_reset(cache); +@@ -63,7 +63,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, + PTR_ERR(rt) == -EINVAL) || (!IS_ERR(rt) && + rt->dst.dev->ifindex != endpoint->src_if4)))) { + endpoint->src4.s_addr = 0; +- *(__force __be32 *)&endpoint->src_if4 = 0; ++ endpoint->src_if4 = 0; + fl.saddr = 0; + if (cache) + dst_cache_reset(cache); +-- +2.18.4 + + +From 40eb448970b81d5d299331433fc1d27b09abeb95 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Mon, 22 Feb 2021 17:25:45 +0100 +Subject: [PATCH 119/124] wireguard: selftests: test multiple parallel streams + +commit d5a49aa6c3e264a93a7d08485d66e346be0969dd upstream. + +In order to test ndo_start_xmit being called in parallel, explicitly add +separate tests, which should all run on different cores. This should +help tease out bugs associated with queueing up packets from different +cores in parallel. Currently, it hasn't found those types of bugs, but +given future planned work, this is a useful regression to avoid. + +Fixes: e7096c131e51 ("net: WireGuard secure network tunnel") +Signed-off-by: Jason A. Donenfeld +Signed-off-by: Jakub Kicinski +Signed-off-by: Jason A. Donenfeld +--- + tools/testing/selftests/wireguard/netns.sh | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh +index 74c69b75f6f5a..7ed7cd95e58fe 100755 +--- a/tools/testing/selftests/wireguard/netns.sh ++++ b/tools/testing/selftests/wireguard/netns.sh +@@ -39,7 +39,7 @@ ip0() { pretty 0 "ip $*"; ip -n $netns0 "$@"; } + ip1() { pretty 1 "ip $*"; ip -n $netns1 "$@"; } + ip2() { pretty 2 "ip $*"; ip -n $netns2 "$@"; } + sleep() { read -t "$1" -N 1 || true; } +-waitiperf() { pretty "${1//*-}" "wait for iperf:5201 pid $2"; while [[ $(ss -N "$1" -tlpH 'sport = 5201') != *\"iperf3\",pid=$2,fd=* ]]; do sleep 0.1; done; } ++waitiperf() { pretty "${1//*-}" "wait for iperf:${3:-5201} pid $2"; while [[ $(ss -N "$1" -tlpH "sport = ${3:-5201}") != *\"iperf3\",pid=$2,fd=* ]]; do sleep 0.1; done; } + waitncatudp() { pretty "${1//*-}" "wait for udp:1111 pid $2"; while [[ $(ss -N "$1" -ulpH 'sport = 1111') != *\"ncat\",pid=$2,fd=* ]]; do sleep 0.1; done; } + waitiface() { pretty "${1//*-}" "wait for $2 to come up"; ip netns exec "$1" bash -c "while [[ \$(< \"/sys/class/net/$2/operstate\") != up ]]; do read -t .1 -N 0 || true; done;"; } + +@@ -141,6 +141,19 @@ tests() { + n2 iperf3 -s -1 -B fd00::2 & + waitiperf $netns2 $! + n1 iperf3 -Z -t 3 -b 0 -u -c fd00::2 ++ ++ # TCP over IPv4, in parallel ++ for max in 4 5 50; do ++ local pids=( ) ++ for ((i=0; i < max; ++i)) do ++ n2 iperf3 -p $(( 5200 + i )) -s -1 -B 192.168.241.2 & ++ pids+=( $! ); waitiperf $netns2 $! $(( 5200 + i )) ++ done ++ for ((i=0; i < max; ++i)) do ++ n1 iperf3 -Z -t 3 -p $(( 5200 + i )) -c 192.168.241.2 & ++ done ++ wait "${pids[@]}" ++ done + } + + [[ $(ip1 link show dev wg0) =~ mtu\ ([0-9]+) ]] && orig_mtu="${BASH_REMATCH[1]}" +-- +2.18.4 + + +From 1a39a55b7fd51fbedc82104881ae27c45b71721d Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Mon, 22 Feb 2021 17:25:46 +0100 +Subject: [PATCH 120/124] wireguard: peer: put frequently used members above + cache lines + +commit 5a0598695634a6bb4126818902dd9140cd9df8b6 upstream. + +The is_dead boolean is checked for every single packet, while the +internal_id member is used basically only for pr_debug messages. So it +makes sense to hoist up is_dead into some space formerly unused by a +struct hole, while demoting internal_api to below the lowest struct +cache line. + +Signed-off-by: Jason A. Donenfeld +Signed-off-by: Jakub Kicinski +Signed-off-by: Jason A. Donenfeld +--- + drivers/net/wireguard/peer.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireguard/peer.h b/drivers/net/wireguard/peer.h +index 23af409229972..aaff8de6e34b8 100644 +--- a/drivers/net/wireguard/peer.h ++++ b/drivers/net/wireguard/peer.h +@@ -39,6 +39,7 @@ struct wg_peer { + struct crypt_queue tx_queue, rx_queue; + struct sk_buff_head staged_packet_queue; + int serial_work_cpu; ++ bool is_dead; + struct noise_keypairs keypairs; + struct endpoint endpoint; + struct dst_cache endpoint_cache; +@@ -61,9 +62,8 @@ struct wg_peer { + struct rcu_head rcu; + struct list_head peer_list; + struct list_head allowedips_list; +- u64 internal_id; + struct napi_struct napi; +- bool is_dead; ++ u64 internal_id; + }; + + struct wg_peer *wg_peer_create(struct wg_device *wg, +-- +2.18.4 + + +From a4c1e2162a7dfdf4d44768a34d8c76ad0bf957dd Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Mon, 22 Feb 2021 17:25:47 +0100 +Subject: [PATCH 121/124] wireguard: device: do not generate ICMP for non-IP + packets + +commit 99fff5264e7ab06f45b0ad60243475be0a8d0559 upstream. + +If skb->protocol doesn't match the actual skb->data header, it's +probably not a good idea to pass it off to icmp{,v6}_ndo_send, which is +expecting to reply to a valid IP packet. So this commit has that early +mismatch case jump to a later error label. + +Fixes: e7096c131e51 ("net: WireGuard secure network tunnel") +Signed-off-by: Jason A. Donenfeld +Signed-off-by: Jakub Kicinski +Signed-off-by: Jason A. Donenfeld +--- + drivers/net/wireguard/device.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c +index 46ecec72f2143..5aeef63c4393d 100644 +--- a/drivers/net/wireguard/device.c ++++ b/drivers/net/wireguard/device.c +@@ -138,7 +138,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) + else if (skb->protocol == htons(ETH_P_IPV6)) + net_dbg_ratelimited("%s: No peer has allowed IPs matching %pI6\n", + dev->name, &ipv6_hdr(skb)->daddr); +- goto err; ++ goto err_icmp; + } + + family = READ_ONCE(peer->endpoint.addr.sa_family); +@@ -201,12 +201,13 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) + + err_peer: + wg_peer_put(peer); +-err: +- ++dev->stats.tx_errors; ++err_icmp: + if (skb->protocol == htons(ETH_P_IP)) + icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0); + else if (skb->protocol == htons(ETH_P_IPV6)) + icmpv6_ndo_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_ADDR_UNREACH, 0); ++err: ++ ++dev->stats.tx_errors; + kfree_skb(skb); + return ret; + } +-- +2.18.4 + + +From 6f1d61b5efc7701727d9a325317bcc345e14a8cd Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Mon, 22 Feb 2021 17:25:48 +0100 +Subject: [PATCH 122/124] wireguard: queueing: get rid of per-peer ring buffers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +commit 8b5553ace83cced775eefd0f3f18b5c6214ccf7a upstream. + +Having two ring buffers per-peer means that every peer results in two +massive ring allocations. On an 8-core x86_64 machine, this commit +reduces the per-peer allocation from 18,688 bytes to 1,856 bytes, which +is an 90% reduction. Ninety percent! With some single-machine +deployments approaching 500,000 peers, we're talking about a reduction +from 7 gigs of memory down to 700 megs of memory. + +In order to get rid of these per-peer allocations, this commit switches +to using a list-based queueing approach. Currently GSO fragments are +chained together using the skb->next pointer (the skb_list_* singly +linked list approach), so we form the per-peer queue around the unused +skb->prev pointer (which sort of makes sense because the links are +pointing backwards). Use of skb_queue_* is not possible here, because +that is based on doubly linked lists and spinlocks. Multiple cores can +write into the queue at any given time, because its writes occur in the +start_xmit path or in the udp_recv path. But reads happen in a single +workqueue item per-peer, amounting to a multi-producer, single-consumer +paradigm. + +The MPSC queue is implemented locklessly and never blocks. However, it +is not linearizable (though it is serializable), with a very tight and +unlikely race on writes, which, when hit (some tiny fraction of the +0.15% of partial adds on a fully loaded 16-core x86_64 system), causes +the queue reader to terminate early. However, because every packet sent +queues up the same workqueue item after it is fully added, the worker +resumes again, and stopping early isn't actually a problem, since at +that point the packet wouldn't have yet been added to the encryption +queue. These properties allow us to avoid disabling interrupts or +spinning. The design is based on Dmitry Vyukov's algorithm [1]. + +Performance-wise, ordinarily list-based queues aren't preferable to +ringbuffers, because of cache misses when following pointers around. +However, we *already* have to follow the adjacent pointers when working +through fragments, so there shouldn't actually be any change there. A +potential downside is that dequeueing is a bit more complicated, but the +ptr_ring structure used prior had a spinlock when dequeueing, so all and +all the difference appears to be a wash. + +Actually, from profiling, the biggest performance hit, by far, of this +commit winds up being atomic_add_unless(count, 1, max) and atomic_ +dec(count), which account for the majority of CPU time, according to +perf. In that sense, the previous ring buffer was superior in that it +could check if it was full by head==tail, which the list-based approach +cannot do. + +But all and all, this enables us to get massive memory savings, allowing +WireGuard to scale for real world deployments, without taking much of a +performance hit. + +[1] http://www.1024cores.net/home/lock-free-algorithms/queues/intrusive-mpsc-node-based-queue + +Reviewed-by: Dmitry Vyukov +Reviewed-by: Toke Høiland-Jørgensen +Fixes: e7096c131e51 ("net: WireGuard secure network tunnel") +Signed-off-by: Jason A. Donenfeld +Signed-off-by: Jakub Kicinski +Signed-off-by: Jason A. Donenfeld +--- + drivers/net/wireguard/device.c | 12 ++--- + drivers/net/wireguard/device.h | 15 +++--- + drivers/net/wireguard/peer.c | 28 ++++------- + drivers/net/wireguard/peer.h | 4 +- + drivers/net/wireguard/queueing.c | 86 +++++++++++++++++++++++++------- + drivers/net/wireguard/queueing.h | 45 ++++++++++++----- + drivers/net/wireguard/receive.c | 16 +++--- + drivers/net/wireguard/send.c | 31 ++++-------- + 8 files changed, 144 insertions(+), 93 deletions(-) + +diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c +index 5aeef63c4393d..8c7d97f96d567 100644 +--- a/drivers/net/wireguard/device.c ++++ b/drivers/net/wireguard/device.c +@@ -235,8 +235,8 @@ static void wg_destruct(struct net_device *dev) + destroy_workqueue(wg->handshake_receive_wq); + destroy_workqueue(wg->handshake_send_wq); + destroy_workqueue(wg->packet_crypt_wq); +- wg_packet_queue_free(&wg->decrypt_queue, true); +- wg_packet_queue_free(&wg->encrypt_queue, true); ++ wg_packet_queue_free(&wg->decrypt_queue); ++ wg_packet_queue_free(&wg->encrypt_queue); + rcu_barrier(); /* Wait for all the peers to be actually freed. */ + wg_ratelimiter_uninit(); + memzero_explicit(&wg->static_identity, sizeof(wg->static_identity)); +@@ -338,12 +338,12 @@ static int wg_newlink(struct net *src_net, struct net_device *dev, + goto err_destroy_handshake_send; + + ret = wg_packet_queue_init(&wg->encrypt_queue, wg_packet_encrypt_worker, +- true, MAX_QUEUED_PACKETS); ++ MAX_QUEUED_PACKETS); + if (ret < 0) + goto err_destroy_packet_crypt; + + ret = wg_packet_queue_init(&wg->decrypt_queue, wg_packet_decrypt_worker, +- true, MAX_QUEUED_PACKETS); ++ MAX_QUEUED_PACKETS); + if (ret < 0) + goto err_free_encrypt_queue; + +@@ -368,9 +368,9 @@ static int wg_newlink(struct net *src_net, struct net_device *dev, + err_uninit_ratelimiter: + wg_ratelimiter_uninit(); + err_free_decrypt_queue: +- wg_packet_queue_free(&wg->decrypt_queue, true); ++ wg_packet_queue_free(&wg->decrypt_queue); + err_free_encrypt_queue: +- wg_packet_queue_free(&wg->encrypt_queue, true); ++ wg_packet_queue_free(&wg->encrypt_queue); + err_destroy_packet_crypt: + destroy_workqueue(wg->packet_crypt_wq); + err_destroy_handshake_send: +diff --git a/drivers/net/wireguard/device.h b/drivers/net/wireguard/device.h +index 4d0144e169478..854bc3d97150e 100644 +--- a/drivers/net/wireguard/device.h ++++ b/drivers/net/wireguard/device.h +@@ -27,13 +27,14 @@ struct multicore_worker { + + struct crypt_queue { + struct ptr_ring ring; +- union { +- struct { +- struct multicore_worker __percpu *worker; +- int last_cpu; +- }; +- struct work_struct work; +- }; ++ struct multicore_worker __percpu *worker; ++ int last_cpu; ++}; ++ ++struct prev_queue { ++ struct sk_buff *head, *tail, *peeked; ++ struct { struct sk_buff *next, *prev; } empty; // Match first 2 members of struct sk_buff. ++ atomic_t count; + }; + + struct wg_device { +diff --git a/drivers/net/wireguard/peer.c b/drivers/net/wireguard/peer.c +index 1d634bd3038f0..91310cb053403 100644 +--- a/drivers/net/wireguard/peer.c ++++ b/drivers/net/wireguard/peer.c +@@ -32,27 +32,22 @@ struct wg_peer *wg_peer_create(struct wg_device *wg, + peer = kzalloc(sizeof(*peer), GFP_KERNEL); + if (unlikely(!peer)) + return ERR_PTR(ret); +- peer->device = wg; ++ if (dst_cache_init(&peer->endpoint_cache, GFP_KERNEL)) ++ goto err; + ++ peer->device = wg; + wg_noise_handshake_init(&peer->handshake, &wg->static_identity, + public_key, preshared_key, peer); +- if (dst_cache_init(&peer->endpoint_cache, GFP_KERNEL)) +- goto err_1; +- if (wg_packet_queue_init(&peer->tx_queue, wg_packet_tx_worker, false, +- MAX_QUEUED_PACKETS)) +- goto err_2; +- if (wg_packet_queue_init(&peer->rx_queue, NULL, false, +- MAX_QUEUED_PACKETS)) +- goto err_3; +- + peer->internal_id = atomic64_inc_return(&peer_counter); + peer->serial_work_cpu = nr_cpumask_bits; + wg_cookie_init(&peer->latest_cookie); + wg_timers_init(peer); + wg_cookie_checker_precompute_peer_keys(peer); + spin_lock_init(&peer->keypairs.keypair_update_lock); +- INIT_WORK(&peer->transmit_handshake_work, +- wg_packet_handshake_send_worker); ++ INIT_WORK(&peer->transmit_handshake_work, wg_packet_handshake_send_worker); ++ INIT_WORK(&peer->transmit_packet_work, wg_packet_tx_worker); ++ wg_prev_queue_init(&peer->tx_queue); ++ wg_prev_queue_init(&peer->rx_queue); + rwlock_init(&peer->endpoint_lock); + kref_init(&peer->refcount); + skb_queue_head_init(&peer->staged_packet_queue); +@@ -68,11 +63,7 @@ struct wg_peer *wg_peer_create(struct wg_device *wg, + pr_debug("%s: Peer %llu created\n", wg->dev->name, peer->internal_id); + return peer; + +-err_3: +- wg_packet_queue_free(&peer->tx_queue, false); +-err_2: +- dst_cache_destroy(&peer->endpoint_cache); +-err_1: ++err: + kfree(peer); + return ERR_PTR(ret); + } +@@ -197,8 +188,7 @@ static void rcu_release(struct rcu_head *rcu) + struct wg_peer *peer = container_of(rcu, struct wg_peer, rcu); + + dst_cache_destroy(&peer->endpoint_cache); +- wg_packet_queue_free(&peer->rx_queue, false); +- wg_packet_queue_free(&peer->tx_queue, false); ++ WARN_ON(wg_prev_queue_peek(&peer->tx_queue) || wg_prev_queue_peek(&peer->rx_queue)); + + /* The final zeroing takes care of clearing any remaining handshake key + * material and other potentially sensitive information. +diff --git a/drivers/net/wireguard/peer.h b/drivers/net/wireguard/peer.h +index aaff8de6e34b8..8d53b687a1d16 100644 +--- a/drivers/net/wireguard/peer.h ++++ b/drivers/net/wireguard/peer.h +@@ -36,7 +36,7 @@ struct endpoint { + + struct wg_peer { + struct wg_device *device; +- struct crypt_queue tx_queue, rx_queue; ++ struct prev_queue tx_queue, rx_queue; + struct sk_buff_head staged_packet_queue; + int serial_work_cpu; + bool is_dead; +@@ -46,7 +46,7 @@ struct wg_peer { + rwlock_t endpoint_lock; + struct noise_handshake handshake; + atomic64_t last_sent_handshake; +- struct work_struct transmit_handshake_work, clear_peer_work; ++ struct work_struct transmit_handshake_work, clear_peer_work, transmit_packet_work; + struct cookie latest_cookie; + struct hlist_node pubkey_hash; + u64 rx_bytes, tx_bytes; +diff --git a/drivers/net/wireguard/queueing.c b/drivers/net/wireguard/queueing.c +index 71b8e80b58e12..48e7b982a3073 100644 +--- a/drivers/net/wireguard/queueing.c ++++ b/drivers/net/wireguard/queueing.c +@@ -9,8 +9,7 @@ struct multicore_worker __percpu * + wg_packet_percpu_multicore_worker_alloc(work_func_t function, void *ptr) + { + int cpu; +- struct multicore_worker __percpu *worker = +- alloc_percpu(struct multicore_worker); ++ struct multicore_worker __percpu *worker = alloc_percpu(struct multicore_worker); + + if (!worker) + return NULL; +@@ -23,7 +22,7 @@ wg_packet_percpu_multicore_worker_alloc(work_func_t function, void *ptr) + } + + int wg_packet_queue_init(struct crypt_queue *queue, work_func_t function, +- bool multicore, unsigned int len) ++ unsigned int len) + { + int ret; + +@@ -31,25 +30,78 @@ int wg_packet_queue_init(struct crypt_queue *queue, work_func_t function, + ret = ptr_ring_init(&queue->ring, len, GFP_KERNEL); + if (ret) + return ret; +- if (function) { +- if (multicore) { +- queue->worker = wg_packet_percpu_multicore_worker_alloc( +- function, queue); +- if (!queue->worker) { +- ptr_ring_cleanup(&queue->ring, NULL); +- return -ENOMEM; +- } +- } else { +- INIT_WORK(&queue->work, function); +- } ++ queue->worker = wg_packet_percpu_multicore_worker_alloc(function, queue); ++ if (!queue->worker) { ++ ptr_ring_cleanup(&queue->ring, NULL); ++ return -ENOMEM; + } + return 0; + } + +-void wg_packet_queue_free(struct crypt_queue *queue, bool multicore) ++void wg_packet_queue_free(struct crypt_queue *queue) + { +- if (multicore) +- free_percpu(queue->worker); ++ free_percpu(queue->worker); + WARN_ON(!__ptr_ring_empty(&queue->ring)); + ptr_ring_cleanup(&queue->ring, NULL); + } ++ ++#define NEXT(skb) ((skb)->prev) ++#define STUB(queue) ((struct sk_buff *)&queue->empty) ++ ++void wg_prev_queue_init(struct prev_queue *queue) ++{ ++ NEXT(STUB(queue)) = NULL; ++ queue->head = queue->tail = STUB(queue); ++ queue->peeked = NULL; ++ atomic_set(&queue->count, 0); ++ BUILD_BUG_ON( ++ offsetof(struct sk_buff, next) != offsetof(struct prev_queue, empty.next) - ++ offsetof(struct prev_queue, empty) || ++ offsetof(struct sk_buff, prev) != offsetof(struct prev_queue, empty.prev) - ++ offsetof(struct prev_queue, empty)); ++} ++ ++static void __wg_prev_queue_enqueue(struct prev_queue *queue, struct sk_buff *skb) ++{ ++ WRITE_ONCE(NEXT(skb), NULL); ++ WRITE_ONCE(NEXT(xchg_release(&queue->head, skb)), skb); ++} ++ ++bool wg_prev_queue_enqueue(struct prev_queue *queue, struct sk_buff *skb) ++{ ++ if (!atomic_add_unless(&queue->count, 1, MAX_QUEUED_PACKETS)) ++ return false; ++ __wg_prev_queue_enqueue(queue, skb); ++ return true; ++} ++ ++struct sk_buff *wg_prev_queue_dequeue(struct prev_queue *queue) ++{ ++ struct sk_buff *tail = queue->tail, *next = smp_load_acquire(&NEXT(tail)); ++ ++ if (tail == STUB(queue)) { ++ if (!next) ++ return NULL; ++ queue->tail = next; ++ tail = next; ++ next = smp_load_acquire(&NEXT(next)); ++ } ++ if (next) { ++ queue->tail = next; ++ atomic_dec(&queue->count); ++ return tail; ++ } ++ if (tail != READ_ONCE(queue->head)) ++ return NULL; ++ __wg_prev_queue_enqueue(queue, STUB(queue)); ++ next = smp_load_acquire(&NEXT(tail)); ++ if (next) { ++ queue->tail = next; ++ atomic_dec(&queue->count); ++ return tail; ++ } ++ return NULL; ++} ++ ++#undef NEXT ++#undef STUB +diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h +index dfb674e030764..4ef2944a68bc9 100644 +--- a/drivers/net/wireguard/queueing.h ++++ b/drivers/net/wireguard/queueing.h +@@ -17,12 +17,13 @@ struct wg_device; + struct wg_peer; + struct multicore_worker; + struct crypt_queue; ++struct prev_queue; + struct sk_buff; + + /* queueing.c APIs: */ + int wg_packet_queue_init(struct crypt_queue *queue, work_func_t function, +- bool multicore, unsigned int len); +-void wg_packet_queue_free(struct crypt_queue *queue, bool multicore); ++ unsigned int len); ++void wg_packet_queue_free(struct crypt_queue *queue); + struct multicore_worker __percpu * + wg_packet_percpu_multicore_worker_alloc(work_func_t function, void *ptr); + +@@ -135,8 +136,31 @@ static inline int wg_cpumask_next_online(int *next) + return cpu; + } + ++void wg_prev_queue_init(struct prev_queue *queue); ++ ++/* Multi producer */ ++bool wg_prev_queue_enqueue(struct prev_queue *queue, struct sk_buff *skb); ++ ++/* Single consumer */ ++struct sk_buff *wg_prev_queue_dequeue(struct prev_queue *queue); ++ ++/* Single consumer */ ++static inline struct sk_buff *wg_prev_queue_peek(struct prev_queue *queue) ++{ ++ if (queue->peeked) ++ return queue->peeked; ++ queue->peeked = wg_prev_queue_dequeue(queue); ++ return queue->peeked; ++} ++ ++/* Single consumer */ ++static inline void wg_prev_queue_drop_peeked(struct prev_queue *queue) ++{ ++ queue->peeked = NULL; ++} ++ + static inline int wg_queue_enqueue_per_device_and_peer( +- struct crypt_queue *device_queue, struct crypt_queue *peer_queue, ++ struct crypt_queue *device_queue, struct prev_queue *peer_queue, + struct sk_buff *skb, struct workqueue_struct *wq, int *next_cpu) + { + int cpu; +@@ -145,8 +169,9 @@ static inline int wg_queue_enqueue_per_device_and_peer( + /* We first queue this up for the peer ingestion, but the consumer + * will wait for the state to change to CRYPTED or DEAD before. + */ +- if (unlikely(ptr_ring_produce_bh(&peer_queue->ring, skb))) ++ if (unlikely(!wg_prev_queue_enqueue(peer_queue, skb))) + return -ENOSPC; ++ + /* Then we queue it up in the device queue, which consumes the + * packet as soon as it can. + */ +@@ -157,9 +182,7 @@ static inline int wg_queue_enqueue_per_device_and_peer( + return 0; + } + +-static inline void wg_queue_enqueue_per_peer(struct crypt_queue *queue, +- struct sk_buff *skb, +- enum packet_state state) ++static inline void wg_queue_enqueue_per_peer_tx(struct sk_buff *skb, enum packet_state state) + { + /* We take a reference, because as soon as we call atomic_set, the + * peer can be freed from below us. +@@ -167,14 +190,12 @@ static inline void wg_queue_enqueue_per_peer(struct crypt_queue *queue, + struct wg_peer *peer = wg_peer_get(PACKET_PEER(skb)); + + atomic_set_release(&PACKET_CB(skb)->state, state); +- queue_work_on(wg_cpumask_choose_online(&peer->serial_work_cpu, +- peer->internal_id), +- peer->device->packet_crypt_wq, &queue->work); ++ queue_work_on(wg_cpumask_choose_online(&peer->serial_work_cpu, peer->internal_id), ++ peer->device->packet_crypt_wq, &peer->transmit_packet_work); + wg_peer_put(peer); + } + +-static inline void wg_queue_enqueue_per_peer_napi(struct sk_buff *skb, +- enum packet_state state) ++static inline void wg_queue_enqueue_per_peer_rx(struct sk_buff *skb, enum packet_state state) + { + /* We take a reference, because as soon as we call atomic_set, the + * peer can be freed from below us. +diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c +index 2c9551ea6dc73..7dc84bcca2613 100644 +--- a/drivers/net/wireguard/receive.c ++++ b/drivers/net/wireguard/receive.c +@@ -444,7 +444,6 @@ static void wg_packet_consume_data_done(struct wg_peer *peer, + int wg_packet_rx_poll(struct napi_struct *napi, int budget) + { + struct wg_peer *peer = container_of(napi, struct wg_peer, napi); +- struct crypt_queue *queue = &peer->rx_queue; + struct noise_keypair *keypair; + struct endpoint endpoint; + enum packet_state state; +@@ -455,11 +454,10 @@ int wg_packet_rx_poll(struct napi_struct *napi, int budget) + if (unlikely(budget <= 0)) + return 0; + +- while ((skb = __ptr_ring_peek(&queue->ring)) != NULL && ++ while ((skb = wg_prev_queue_peek(&peer->rx_queue)) != NULL && + (state = atomic_read_acquire(&PACKET_CB(skb)->state)) != + PACKET_STATE_UNCRYPTED) { +- __ptr_ring_discard_one(&queue->ring); +- peer = PACKET_PEER(skb); ++ wg_prev_queue_drop_peeked(&peer->rx_queue); + keypair = PACKET_CB(skb)->keypair; + free = true; + +@@ -508,7 +506,7 @@ void wg_packet_decrypt_worker(struct work_struct *work) + enum packet_state state = + likely(decrypt_packet(skb, PACKET_CB(skb)->keypair)) ? + PACKET_STATE_CRYPTED : PACKET_STATE_DEAD; +- wg_queue_enqueue_per_peer_napi(skb, state); ++ wg_queue_enqueue_per_peer_rx(skb, state); + if (need_resched()) + cond_resched(); + } +@@ -531,12 +529,10 @@ static void wg_packet_consume_data(struct wg_device *wg, struct sk_buff *skb) + if (unlikely(READ_ONCE(peer->is_dead))) + goto err; + +- ret = wg_queue_enqueue_per_device_and_peer(&wg->decrypt_queue, +- &peer->rx_queue, skb, +- wg->packet_crypt_wq, +- &wg->decrypt_queue.last_cpu); ++ ret = wg_queue_enqueue_per_device_and_peer(&wg->decrypt_queue, &peer->rx_queue, skb, ++ wg->packet_crypt_wq, &wg->decrypt_queue.last_cpu); + if (unlikely(ret == -EPIPE)) +- wg_queue_enqueue_per_peer_napi(skb, PACKET_STATE_DEAD); ++ wg_queue_enqueue_per_peer_rx(skb, PACKET_STATE_DEAD); + if (likely(!ret || ret == -EPIPE)) { + rcu_read_unlock_bh(); + return; +diff --git a/drivers/net/wireguard/send.c b/drivers/net/wireguard/send.c +index f74b9341ab0fe..5368f7c35b4bf 100644 +--- a/drivers/net/wireguard/send.c ++++ b/drivers/net/wireguard/send.c +@@ -239,8 +239,7 @@ void wg_packet_send_keepalive(struct wg_peer *peer) + wg_packet_send_staged_packets(peer); + } + +-static void wg_packet_create_data_done(struct sk_buff *first, +- struct wg_peer *peer) ++static void wg_packet_create_data_done(struct wg_peer *peer, struct sk_buff *first) + { + struct sk_buff *skb, *next; + bool is_keepalive, data_sent = false; +@@ -262,22 +261,19 @@ static void wg_packet_create_data_done(struct sk_buff *first, + + void wg_packet_tx_worker(struct work_struct *work) + { +- struct crypt_queue *queue = container_of(work, struct crypt_queue, +- work); ++ struct wg_peer *peer = container_of(work, struct wg_peer, transmit_packet_work); + struct noise_keypair *keypair; + enum packet_state state; + struct sk_buff *first; +- struct wg_peer *peer; + +- while ((first = __ptr_ring_peek(&queue->ring)) != NULL && ++ while ((first = wg_prev_queue_peek(&peer->tx_queue)) != NULL && + (state = atomic_read_acquire(&PACKET_CB(first)->state)) != + PACKET_STATE_UNCRYPTED) { +- __ptr_ring_discard_one(&queue->ring); +- peer = PACKET_PEER(first); ++ wg_prev_queue_drop_peeked(&peer->tx_queue); + keypair = PACKET_CB(first)->keypair; + + if (likely(state == PACKET_STATE_CRYPTED)) +- wg_packet_create_data_done(first, peer); ++ wg_packet_create_data_done(peer, first); + else + kfree_skb_list(first); + +@@ -306,16 +302,14 @@ void wg_packet_encrypt_worker(struct work_struct *work) + break; + } + } +- wg_queue_enqueue_per_peer(&PACKET_PEER(first)->tx_queue, first, +- state); ++ wg_queue_enqueue_per_peer_tx(first, state); + if (need_resched()) + cond_resched(); + } + } + +-static void wg_packet_create_data(struct sk_buff *first) ++static void wg_packet_create_data(struct wg_peer *peer, struct sk_buff *first) + { +- struct wg_peer *peer = PACKET_PEER(first); + struct wg_device *wg = peer->device; + int ret = -EINVAL; + +@@ -323,13 +317,10 @@ static void wg_packet_create_data(struct sk_buff *first) + if (unlikely(READ_ONCE(peer->is_dead))) + goto err; + +- ret = wg_queue_enqueue_per_device_and_peer(&wg->encrypt_queue, +- &peer->tx_queue, first, +- wg->packet_crypt_wq, +- &wg->encrypt_queue.last_cpu); ++ ret = wg_queue_enqueue_per_device_and_peer(&wg->encrypt_queue, &peer->tx_queue, first, ++ wg->packet_crypt_wq, &wg->encrypt_queue.last_cpu); + if (unlikely(ret == -EPIPE)) +- wg_queue_enqueue_per_peer(&peer->tx_queue, first, +- PACKET_STATE_DEAD); ++ wg_queue_enqueue_per_peer_tx(first, PACKET_STATE_DEAD); + err: + rcu_read_unlock_bh(); + if (likely(!ret || ret == -EPIPE)) +@@ -393,7 +384,7 @@ void wg_packet_send_staged_packets(struct wg_peer *peer) + packets.prev->next = NULL; + wg_peer_get(keypair->entry.peer); + PACKET_CB(packets.next)->keypair = keypair; +- wg_packet_create_data(packets.next); ++ wg_packet_create_data(peer, packets.next); + return; + + out_invalid: +-- +2.18.4 + + +From 2a5a32fa1712f51413963214ac8bf0426ce32b4c Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Mon, 22 Feb 2021 17:25:49 +0100 +Subject: [PATCH 123/124] wireguard: kconfig: use arm chacha even with no neon + +commit bce2473927af8de12ad131a743f55d69d358c0b9 upstream. + +The condition here was incorrect: a non-neon fallback implementation is +available on arm32 when NEON is not supported. + +Reported-by: Ilya Lipnitskiy +Fixes: e7096c131e51 ("net: WireGuard secure network tunnel") +Signed-off-by: Jason A. Donenfeld +Signed-off-by: Jakub Kicinski +Signed-off-by: Jason A. Donenfeld +--- + drivers/net/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig +index 57f1ba924f4ec..4e09901dac5c9 100644 +--- a/drivers/net/Kconfig ++++ b/drivers/net/Kconfig +@@ -87,7 +87,7 @@ config WIREGUARD + select CRYPTO_CURVE25519_X86 if X86 && 64BIT + select ARM_CRYPTO if ARM + select ARM64_CRYPTO if ARM64 +- select CRYPTO_CHACHA20_NEON if (ARM || ARM64) && KERNEL_MODE_NEON ++ select CRYPTO_CHACHA20_NEON if ARM || (ARM64 && KERNEL_MODE_NEON) + select CRYPTO_POLY1305_NEON if ARM64 && KERNEL_MODE_NEON + select CRYPTO_POLY1305_ARM if ARM + select CRYPTO_CURVE25519_NEON if ARM && KERNEL_MODE_NEON +-- +2.18.4 + + +From e2c63b986d747340fae6072915d5bc59a0111931 Mon Sep 17 00:00:00 2001 +From: "Maciej W. Rozycki" +Date: Thu, 11 Mar 2021 21:50:47 -0700 +Subject: [PATCH 124/124] crypto: mips/poly1305 - enable for all MIPS + processors + +commit 6c810cf20feef0d4338e9b424ab7f2644a8b353e upstream. + +The MIPS Poly1305 implementation is generic MIPS code written such as to +support down to the original MIPS I and MIPS III ISA for the 32-bit and +64-bit variant respectively. Lift the current limitation then to enable +code for MIPSr1 ISA or newer processors only and have it available for +all MIPS processors. + +Signed-off-by: Maciej W. Rozycki +Fixes: a11d055e7a64 ("crypto: mips/poly1305 - incorporate OpenSSL/CRYPTOGAMS optimized implementation") +Cc: stable@vger.kernel.org # v5.5+ +Acked-by: Jason A. Donenfeld +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Jason A. Donenfeld +--- + arch/mips/crypto/Makefile | 4 ++-- + crypto/Kconfig | 2 +- + drivers/net/Kconfig | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/mips/crypto/Makefile b/arch/mips/crypto/Makefile +index 8e1deaf00e0c0..5e4105cccf9fa 100644 +--- a/arch/mips/crypto/Makefile ++++ b/arch/mips/crypto/Makefile +@@ -12,8 +12,8 @@ AFLAGS_chacha-core.o += -O2 # needed to fill branch delay slots + obj-$(CONFIG_CRYPTO_POLY1305_MIPS) += poly1305-mips.o + poly1305-mips-y := poly1305-core.o poly1305-glue.o + +-perlasm-flavour-$(CONFIG_CPU_MIPS32) := o32 +-perlasm-flavour-$(CONFIG_CPU_MIPS64) := 64 ++perlasm-flavour-$(CONFIG_32BIT) := o32 ++perlasm-flavour-$(CONFIG_64BIT) := 64 + + quiet_cmd_perlasm = PERLASM $@ + cmd_perlasm = $(PERL) $(<) $(perlasm-flavour-y) $(@) +diff --git a/crypto/Kconfig b/crypto/Kconfig +index fd5a8724ed385..dff09d1ccf84a 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -740,7 +740,7 @@ config CRYPTO_POLY1305_X86_64 + + config CRYPTO_POLY1305_MIPS + tristate "Poly1305 authenticator algorithm (MIPS optimized)" +- depends on CPU_MIPS32 || (CPU_MIPS64 && 64BIT) ++ depends on MIPS + select CRYPTO_ARCH_HAVE_LIB_POLY1305 + + config CRYPTO_MD4 +diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig +index 4e09901dac5c9..575b6c28a391e 100644 +--- a/drivers/net/Kconfig ++++ b/drivers/net/Kconfig +@@ -92,7 +92,7 @@ config WIREGUARD + select CRYPTO_POLY1305_ARM if ARM + select CRYPTO_CURVE25519_NEON if ARM && KERNEL_MODE_NEON + select CRYPTO_CHACHA_MIPS if CPU_MIPS32_R2 +- select CRYPTO_POLY1305_MIPS if CPU_MIPS32 || (CPU_MIPS64 && 64BIT) ++ select CRYPTO_POLY1305_MIPS if MIPS + help + WireGuard is a secure, fast, and easy to use replacement for IPSec + that uses modern cryptography and clever networking tricks. It's +-- +2.18.4 + diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 59f3e1f..c4da684 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,4 +1,4 @@ -%global commit_firmware_long 7d91570f20378afc9414107dccdad70705a8a342 +%global commit_firmware_long 0591568b29a724de406aa737fc8e13f68c423f3f %global commit_linux_long 61e5a224f7ae0752fc28aea296436f2a0992ba9a ExclusiveArch: aarch64 armv7hl @@ -32,7 +32,7 @@ ExclusiveArch: aarch64 armv7hl %define extra_version 1 %define kversion 5.4 -%define kfullversion %{kversion}.96 +%define kfullversion %{kversion}.105 Name: raspberrypi2 Version: %{kfullversion} @@ -284,6 +284,9 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README %doc /boot/LICENCE.broadcom %changelog +* Sat Mar 13 2021 Pablo Greco - 5.4.105 +- Update to version v5.4.105 + * Sun Feb 7 2021 Pablo Greco - 5.4.96 - Update to version v5.4.96