diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index 301d04b..00c9db1 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,3 +1,3 @@ 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd SOURCES/linux-5.4.tar.xz -46059c341c3c1d5f96962bcfa4a32e68fbb61b9c SOURCES/a490197f0672d948860b2b807884ae65eabc4d4f.tar.gz -a30b67644a937079ba12ee45025cba3f6606144d SOURCES/patch-5.4.65.xz +be269d3a672fdaea40a9d0b2f39fbe4ea686cdc4 SOURCES/b0f9870274333af93ecc5e779619bf51c092364d.tar.gz +8d06345619804d1c13016d22d28606af24d052b2 SOURCES/patch-5.4.72.xz diff --git a/SOURCES/rpi-5.4.x.patch b/SOURCES/rpi-5.4.x.patch index b21df22..f53ee99 100644 --- a/SOURCES/rpi-5.4.x.patch +++ b/SOURCES/rpi-5.4.x.patch @@ -1,7 +1,7 @@ -From 50eee351dd07bbc9104a163ddb0be1e873095ecf Mon Sep 17 00:00:00 2001 +From d562de11863e3d470f7d506ee706a83e1a9a6103 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Thu, 21 Sep 2017 09:55:42 -0500 -Subject: [PATCH 0001/1113] arm: partially revert +Subject: [PATCH 0001/1148] arm: partially revert 702b94bff3c50542a6e4ab9a4f4cef093262fe65 * Re-expose some dmi APIs for use in VCSM @@ -106,13 +106,13 @@ index e21249548e9f..33e4a9b8f1ba 100644 EXPORT_SYMBOL(cpu_cache); #endif -- -2.18.2 +2.18.4 -From a80373b1331b6311a9686139a87a94e4ce88acce Mon Sep 17 00:00:00 2001 +From 99577bd99a9e9e7bcdea9fa45312081ee2ba8dd9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 29 Oct 2018 14:45:45 +0000 -Subject: [PATCH 0002/1113] Revert "rtc: pcf8523: properly handle oscillator +Subject: [PATCH 0002/1148] Revert "rtc: pcf8523: properly handle oscillator stop bit" This reverts commit ede44c908d44b166a5b6bd7caacd105c2ff5a70f. @@ -168,13 +168,13 @@ index 2f435e533b10..c85abf77ab50 100644 regs[2] = bin2bcd(tm->tm_min); regs[3] = bin2bcd(tm->tm_hour); -- -2.18.2 +2.18.4 -From 9f1d7adfc398d1f2a323c066cdf6fc4049856b9b Mon Sep 17 00:00:00 2001 +From a26521b1d2bd5581ee47810d42498221dcd5a3df Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Thu, 19 Feb 2015 18:47:12 +0000 -Subject: [PATCH 0003/1113] smsx95xx: fix crimes against truesize +Subject: [PATCH 0003/1148] 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. @@ -221,13 +221,13 @@ index bb4ccbda031a..dedebce4b2d9 100644 usbnet_skb_return(dev, ax_skb); } -- -2.18.2 +2.18.4 -From 2a73635b466c5e06d57b4bddd07d77f5b53d5e33 Mon Sep 17 00:00:00 2001 +From b25119d234ee011b972e893a86f013351eae1372 Mon Sep 17 00:00:00 2001 From: Sam Nazarko Date: Fri, 1 Apr 2016 17:27:21 +0100 -Subject: [PATCH 0004/1113] smsc95xx: Experimental: Enable turbo_mode and +Subject: [PATCH 0004/1148] smsc95xx: Experimental: Enable turbo_mode and packetsize=2560 by default See: http://forum.kodi.tv/showthread.php?tid=285288 @@ -270,13 +270,13 @@ index dedebce4b2d9..c5ebcb114309 100644 netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n", -- -2.18.2 +2.18.4 -From 40f8d65f1680153f26f40f299e24d95de09aaf4f Mon Sep 17 00:00:00 2001 +From 978138ed2f41dfc557ea7dbdd5c3b777a3640515 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 26 Mar 2013 17:26:38 +0000 -Subject: [PATCH 0005/1113] Allow mac address to be set in smsc95xx +Subject: [PATCH 0005/1148] Allow mac address to be set in smsc95xx Signed-off-by: popcornmix --- @@ -372,13 +372,13 @@ index c5ebcb114309..510f4d410f69 100644 eth_hw_addr_random(dev->net); netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n"); -- -2.18.2 +2.18.4 -From 5d0e1965650c92d7b1efc4cc60860d9cdc1a0a2e Mon Sep 17 00:00:00 2001 +From 33da235d59f0af76f5e4c3ae70894dd1011b9a27 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 13 Mar 2015 12:43:36 +0000 -Subject: [PATCH 0006/1113] Protect __release_resource against resources +Subject: [PATCH 0006/1148] Protect __release_resource against resources without parents Without this patch, removing a device tree overlay can crash here. @@ -406,13 +406,13 @@ index 841737bbda9e..6877c789c5f6 100644 for (;;) { tmp = *p; -- -2.18.2 +2.18.4 -From b3d59049263178659ea9d0e3cf9a61bb1367a566 Mon Sep 17 00:00:00 2001 +From e9c2f31e350c11ec56839bafae52508524278585 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 4 Dec 2015 17:41:50 +0000 -Subject: [PATCH 0007/1113] irq-bcm2836: Prevent spurious interrupts, and trap +Subject: [PATCH 0007/1148] irq-bcm2836: Prevent spurious interrupts, and trap them early The old arch-specific IRQ macros included a dsb to ensure the @@ -439,13 +439,13 @@ index 2038693f074c..597d36ba601e 100644 #endif } else if (stat) { -- -2.18.2 +2.18.4 -From 9e3f404206b3554d1d840c150ae2921512b26287 Mon Sep 17 00:00:00 2001 +From d99617440373a493bdcd4c01d8478312923e3e02 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:33:30 +0000 -Subject: [PATCH 0008/1113] irq-bcm2836: Avoid "Invalid trigger warning" +Subject: [PATCH 0008/1148] irq-bcm2836: Avoid "Invalid trigger warning" Initialise the level for each IRQ to avoid a warning from the arm arch timer code. @@ -469,13 +469,13 @@ index 597d36ba601e..c006a8ac10d5 100644 return 0; } -- -2.18.2 +2.18.4 -From 02afd148b7e4d7c655944bfe28040462dc71e630 Mon Sep 17 00:00:00 2001 +From c03745bcb2ca46ed37854d0697f838f79815c46f 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/1113] irqchip: bcm2835: Add FIQ support +Subject: [PATCH 0009/1148] irqchip: bcm2835: Add FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -604,13 +604,13 @@ index 418245d31921..64472b25d0b4 100644 } -- -2.18.2 +2.18.4 -From 8b8f2119ad19bb89cd64981fc0bc1e1e9e3615bd Mon Sep 17 00:00:00 2001 +From 1205c452b41ba98ff9f296b72b0213124ff28684 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/1113] irqchip: irq-bcm2835: Add 2836 FIQ support +Subject: [PATCH 0010/1148] irqchip: irq-bcm2835: Add 2836 FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -709,13 +709,13 @@ index 64472b25d0b4..2fccc5cfe9f3 100644 for (b = 0; b < NR_BANKS; b++) { for (i = 0; i < bank_irqs[b]; i++) { -- -2.18.2 +2.18.4 -From b0c7a9abb7b6c5c5bb941775fd45c43ce14cf54b Mon Sep 17 00:00:00 2001 +From 8e33b25bce806c2826012d57494c375550b5dab0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 10:26:09 +0100 -Subject: [PATCH 0011/1113] spi: spidev: Completely disable the spidev warning +Subject: [PATCH 0011/1148] 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. @@ -739,13 +739,13 @@ index be503a0e6ef7..736af270d7a1 100644 "%pOF: buggy DT: spidev listed directly in DT\n", spi->dev.of_node); -- -2.18.2 +2.18.4 -From 2920f508b3680b5bd51bcd959a8d4906b31be44c Mon Sep 17 00:00:00 2001 +From 252e8c92adcb64d9b54e8d0f61c54e68c7517182 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/1113] dmaengine: bcm2835: Load driver early and support +Subject: [PATCH 0012/1148] dmaengine: bcm2835: Load driver early and support legacy API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -848,13 +848,13 @@ index e4c593f48575..6860131b02d9 100644 MODULE_ALIAS("platform:bcm2835-dma"); MODULE_DESCRIPTION("BCM2835 DMA engine driver"); -- -2.18.2 +2.18.4 -From 6037088a0edbefbbcfc973a0d732fc2472ca38b2 Mon Sep 17 00:00:00 2001 +From 6608217c24a092d321d4427de4102c3ea9fbca97 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 25 Jan 2016 17:25:12 +0000 -Subject: [PATCH 0013/1113] firmware: Updated mailbox header +Subject: [PATCH 0013/1148] firmware: Updated mailbox header --- include/soc/bcm2835/raspberrypi-firmware.h | 3 +++ @@ -881,13 +881,13 @@ index 7800e12ee042..3f357c05788e 100644 #endif /* __SOC_RASPBERRY_FIRMWARE_H__ */ -- -2.18.2 +2.18.4 -From ae8fc7b87f4693bb8c077aa6babd8ffb8ef7afaf Mon Sep 17 00:00:00 2001 +From b1bd9fa444b5d9a565c156876f4f50cfce81edc2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 15 Jun 2016 16:48:41 +0100 -Subject: [PATCH 0014/1113] rtc: Add SPI alias for pcf2123 driver +Subject: [PATCH 0014/1148] rtc: Add SPI alias for pcf2123 driver Without this alias, Device Tree won't cause the driver to be loaded. @@ -907,13 +907,13 @@ index c3691fa4210e..ead1fd376d2d 100644 MODULE_LICENSE("GPL"); +MODULE_ALIAS("spi:rtc-pcf2123"); -- -2.18.2 +2.18.4 -From e5d8e99fa0104a0be64eb780d18ec11df1169d34 Mon Sep 17 00:00:00 2001 +From 6a1ca295ba0229c60a2d6e80693b80a228c43c17 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/1113] watchdog: bcm2835: Support setting reboot partition +Subject: [PATCH 0015/1148] watchdog: bcm2835: Support setting reboot partition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -1015,13 +1015,13 @@ index dec6ca019bea..62937e6f83ca 100644 static int bcm2835_wdt_probe(struct platform_device *pdev) -- -2.18.2 +2.18.4 -From 8bd7a470f5050e0ccf592417c961391280872b24 Mon Sep 17 00:00:00 2001 +From 33ad90696eaf23c8341cf67a67e986dfc78b58c2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 Apr 2016 19:40:12 +0100 -Subject: [PATCH 0016/1113] reboot: Use power off rather than busy spinning +Subject: [PATCH 0016/1148] reboot: Use power off rather than busy spinning when halt is requested --- @@ -1044,13 +1044,13 @@ index bb18ed0539f4..a8595ab97e5b 100644 /* -- -2.18.2 +2.18.4 -From 9f760664c90e412e160029e4fc11596498eaec05 Mon Sep 17 00:00:00 2001 +From 0941f4b817a26661f3a8acaf149abd6d8785464a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Nov 2016 13:02:52 +0000 -Subject: [PATCH 0017/1113] bcm: Make RASPBERRYPI_POWER depend on PM +Subject: [PATCH 0017/1148] bcm: Make RASPBERRYPI_POWER depend on PM --- drivers/soc/bcm/Kconfig | 1 + @@ -1069,13 +1069,13 @@ index 648e32693b7e..f204562996e2 100644 help This enables support for the RPi power domains which can be enabled -- -2.18.2 +2.18.4 -From 7778eaa7231ce2012cf292306bda9a61ab775c90 Mon Sep 17 00:00:00 2001 +From 67f55546db3adba9ee40038c3106c0c7778003d4 Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Fri, 2 Sep 2016 16:45:27 +0100 -Subject: [PATCH 0018/1113] Register the clocks early during the boot process, +Subject: [PATCH 0018/1148] 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. @@ -1120,13 +1120,13 @@ index 45420b514149..519cc8791d89 100644 MODULE_AUTHOR("Eric Anholt "); MODULE_DESCRIPTION("BCM2835 clock driver"); -- -2.18.2 +2.18.4 -From cd4f698cafe8fc285c05908097ca8a474338543e Mon Sep 17 00:00:00 2001 +From 2ddfcb75333a2986ca71a56c20d9518704d8f286 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 6 Dec 2016 17:05:39 +0000 -Subject: [PATCH 0019/1113] bcm2835-rng: Avoid initialising if already enabled +Subject: [PATCH 0019/1148] bcm2835-rng: Avoid initialising if already enabled Avoids the 0x40000 cycles of warmup again if firmware has already used it --- @@ -1151,13 +1151,13 @@ index f759790c3cdb..1b85ebcbca80 100644 return ret; } -- -2.18.2 +2.18.4 -From 0fc5920f69a0715c2d5be7f9806c477db5bde36b Mon Sep 17 00:00:00 2001 +From fc7163b44dfba221d73b1a97b2e2ef345076be4e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 0020/1113] clk-bcm2835: Mark used PLLs and dividers CRITICAL +Subject: [PATCH 0020/1148] 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 @@ -1185,13 +1185,13 @@ index 519cc8791d89..028ee18e5dfe 100644 divider->data = data; -- -2.18.2 +2.18.4 -From 8e0fdc73884507d95c406b6cb5b38cb8d29a0678 Mon Sep 17 00:00:00 2001 +From c071778c1b95a12a09572d45a11f7f085416789c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 0021/1113] clk-bcm2835: Add claim-clocks property +Subject: [PATCH 0021/1148] 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, @@ -1293,13 +1293,13 @@ index 028ee18e5dfe..e9fd48c0ba21 100644 sizeof(cprman_parent_names)); of_clk_parent_fill(dev->of_node, cprman->real_parent_names, -- -2.18.2 +2.18.4 -From b14af86eedebf6f11e4ad68e79702d6ece4e3c3e Mon Sep 17 00:00:00 2001 +From c6d1ae1947f27a60a4e04cbc6c67950be4144685 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Mar 2017 09:06:18 +0000 -Subject: [PATCH 0022/1113] clk-bcm2835: Read max core clock from firmware +Subject: [PATCH 0022/1148] 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 @@ -1414,13 +1414,13 @@ index e9fd48c0ba21..0c83c356faf1 100644 for (i = 0; !of_property_read_u32_index(pdev->dev.of_node, "claim-clocks", -- -2.18.2 +2.18.4 -From 6c6dbfbf17789c70f6b9e7dc892cce7916088573 Mon Sep 17 00:00:00 2001 +From 3393416c8f4283bbb1b81af0c8a14ed22e0db549 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 9 May 2016 17:28:18 -0700 -Subject: [PATCH 0023/1113] clk: bcm2835: Mark GPIO clocks enabled at boot as +Subject: [PATCH 0023/1148] clk: bcm2835: Mark GPIO clocks enabled at boot as critical. These divide off of PLLD_PER and are used for the ethernet and wifi @@ -1458,13 +1458,13 @@ index 0c83c356faf1..868ada45db28 100644 * Pass the CLK_SET_RATE_PARENT flag if we are allowed to propagate * rate changes on at least of the parents. -- -2.18.2 +2.18.4 -From c7fe3e99f71e4f7ce910842920a5afd32f9dfe04 Mon Sep 17 00:00:00 2001 +From 45d2e9add5cd9fd27d101a54647dc3d45ab6e992 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:36:44 +0000 -Subject: [PATCH 0024/1113] sound: Demote deferral errors to INFO level +Subject: [PATCH 0024/1148] 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. @@ -1499,13 +1499,13 @@ index 9df20768a8f2..0b9f9a06bdb5 100644 goto _err_defer; } -- -2.18.2 +2.18.4 -From e3d56718eab4447edce4018cd6468e61d1c320b1 Mon Sep 17 00:00:00 2001 +From cf3ff9bceb3ae8e207393ad0a7b0d969d6e6a29e Mon Sep 17 00:00:00 2001 From: Claggy3 Date: Sat, 11 Feb 2017 14:00:30 +0000 -Subject: [PATCH 0025/1113] Update vfpmodule.c +Subject: [PATCH 0025/1148] 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 @@ -1642,13 +1642,13 @@ index 8c9e7f9f0277..f0ceb1975964 100644 /* * Save the userland NEON/VFP state. Under UP, -- -2.18.2 +2.18.4 -From 52d31d4850de99d3200db9b3cd9c0865e77dcd9d Mon Sep 17 00:00:00 2001 +From 8a268b378dc29c5062a3ec8c0d7102356a3762ae 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/1113] i2c: bcm2835: Add debug support +Subject: [PATCH 0026/1148] i2c: bcm2835: Add debug support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -1837,13 +1837,13 @@ index 5ab901ad615d..beb67afa6a3c 100644 if (i2c_dev->msg_err & BCM2835_I2C_S_ERR) return -EREMOTEIO; -- -2.18.2 +2.18.4 -From 3712c220be2dff11eda6d6c3273aa0315818efdb Mon Sep 17 00:00:00 2001 +From 0a67c8833520f651544f7f6ffce248e243dce5db Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 18 Dec 2014 16:07:15 -0800 -Subject: [PATCH 0027/1113] mm: Remove the PFN busy warning +Subject: [PATCH 0027/1148] mm: Remove the PFN busy warning See commit dae803e165a11bc88ca8dbc07a11077caf97bbcb -- the warning is expected sometimes when using CMA. However, that commit still spams @@ -1855,10 +1855,10 @@ Signed-off-by: Eric Anholt 1 file changed, 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 67a9943aa595..33ed74494578 100644 +index aff0bb4629bd..d8125f338fe1 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -8486,8 +8486,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, +@@ -8489,8 +8489,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, /* Make sure the range is really isolated. */ if (test_pages_isolated(outer_start, end, false)) { @@ -1868,13 +1868,13 @@ index 67a9943aa595..33ed74494578 100644 goto done; } -- -2.18.2 +2.18.4 -From 529f79b154d79e9a224d92d118ebc879a08ade41 Mon Sep 17 00:00:00 2001 +From d66a47c19208e8c1cdd152f1fd56f4ea830ba5cc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 23 Mar 2017 10:06:56 +0000 -Subject: [PATCH 0028/1113] ASoC: Add prompt for ICS43432 codec +Subject: [PATCH 0028/1148] 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 @@ -1899,13 +1899,13 @@ index 229cc89f8c5a..080a2cec3fa8 100644 config SND_SOC_INNO_RK3036 tristate "Inno codec driver for RK3036 SoC" -- -2.18.2 +2.18.4 -From f8267eb436ff872585b6c0fe0a9c564d3ce584c1 Mon Sep 17 00:00:00 2001 +From 87beaa1645f9591469c30a1018a744a313c218a9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Jan 2018 16:52:45 +0000 -Subject: [PATCH 0029/1113] irqchip: irq-bcm2836: Remove regmap and syscon use +Subject: [PATCH 0029/1148] 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 @@ -2019,13 +2019,13 @@ index c006a8ac10d5..49642bcd0b75 100644 intc.domain = irq_domain_add_linear(node, LAST_IRQ + 1, -- -2.18.2 +2.18.4 -From 050f71c1a6fee58e18a33d7102d2164e7800d597 Mon Sep 17 00:00:00 2001 +From 1696559fad778d61a4b400544543fc93cc1ff1fb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 17 Oct 2017 15:04:29 +0100 -Subject: [PATCH 0030/1113] lan78xx: Enable LEDs and auto-negotiation +Subject: [PATCH 0030/1148] 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 @@ -2073,13 +2073,13 @@ index 71cc5b63d8ce..ba42568316f1 100644 ret = lan78xx_read_reg(dev, MAC_TX, &buf); -- -2.18.2 +2.18.4 -From 9cfc446ea4031b3dd137ad3059705446bc6df6bb Mon Sep 17 00:00:00 2001 +From dc7dc5bbe65caeb69d6f6cb5b76ac366e48026f4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Feb 2016 17:26:48 +0000 -Subject: [PATCH 0031/1113] amba_pl011: Don't use DT aliases for numbering +Subject: [PATCH 0031/1148] 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 @@ -2108,13 +2108,13 @@ index a8a538b34b53..ce77f5c4ca4c 100644 uap->old_cr = 0; uap->port.dev = dev; -- -2.18.2 +2.18.4 -From 1761f5d5f995874e7be916d20023da23abbf4406 Mon Sep 17 00:00:00 2001 +From 2c317ae2dcd6638db1e251113339c2743d094e5d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Mar 2017 16:07:39 +0000 -Subject: [PATCH 0032/1113] amba_pl011: Round input clock up +Subject: [PATCH 0032/1148] 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 @@ -2200,13 +2200,13 @@ index ce77f5c4ca4c..1ceddb9182ec 100644 /* unregisters the driver also if no more ports are left */ static void pl011_unregister_port(struct uart_amba_port *uap) -- -2.18.2 +2.18.4 -From c0f46ce61236a34983c454b3459a8df922e72fcc Mon Sep 17 00:00:00 2001 +From 9e2df6c06de23e01e0c4fa7d33ee57c5eda59f42 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 0033/1113] amba_pl011: Insert mb() for correct FIFO handling +Subject: [PATCH 0033/1148] 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 @@ -2233,13 +2233,13 @@ index 1ceddb9182ec..6ce039571057 100644 return true; -- -2.18.2 +2.18.4 -From 0fbb825aafd65db0111f27c307dcb2fbe4b77b86 Mon Sep 17 00:00:00 2001 +From 128b1a16bdaeae4b466aa6e9f97f0fbcb259aac6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 0034/1113] amba_pl011: Add cts-event-workaround DT property +Subject: [PATCH 0034/1148] 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 @@ -2291,13 +2291,13 @@ index 6ce039571057..fb728d006503 100644 uap->vendor = vendor; uap->fifosize = vendor->get_fifosize(dev); -- -2.18.2 +2.18.4 -From 03d88f3f1e02400127e817ad0effd8c2f23a8ca5 Mon Sep 17 00:00:00 2001 +From 4c370c878d008903cb343efbe42a91a84c801ebe Mon Sep 17 00:00:00 2001 From: notro Date: Thu, 10 Jul 2014 13:59:47 +0200 -Subject: [PATCH 0035/1113] pinctrl-bcm2835: Set base to 0 give expected gpio +Subject: [PATCH 0035/1148] pinctrl-bcm2835: Set base to 0 give expected gpio numbering Signed-off-by: Noralf Tronnes @@ -2319,13 +2319,13 @@ index 0de1a3a96984..76fad11f2ad8 100644 .can_sleep = false, }; -- -2.18.2 +2.18.4 -From 2210436314486b448a0d5f8bb922fa47fbd7c789 Mon Sep 17 00:00:00 2001 +From 0efec1a40c8baa8292ad002b05769ffed80d04bd Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 12 May 2013 12:24:19 +0100 -Subject: [PATCH 0036/1113] Main bcm2708/bcm2709 linux port +Subject: [PATCH 0036/1148] Main bcm2708/bcm2709 linux port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -2481,13 +2481,13 @@ index 39761d190545..9766d8b50778 100644 MODULE_AUTHOR("Lubomir Rintel "); MODULE_DESCRIPTION("BCM2835 mailbox IPC driver"); -- -2.18.2 +2.18.4 -From bc42ad2ec5831fb0361609c8cda1e5a2178f6072 Mon Sep 17 00:00:00 2001 +From 51b85c1f7e803d9c83f3ff950aca6218220fd1ff Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 1 May 2013 19:46:17 +0100 -Subject: [PATCH 0037/1113] Add dwc_otg driver +Subject: [PATCH 0037/1148] Add dwc_otg driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -3546,10 +3546,10 @@ index 4d3de33885ff..70780b66d093 100644 usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_OVER_CURRENT); diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c -index a1ac2f0723b0..266c69dc34ab 100644 +index 041c68ea329f..61d9e2a1a4e5 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c -@@ -2000,6 +2000,85 @@ int usb_set_configuration(struct usb_device *dev, int configuration) +@@ -1993,6 +1993,85 @@ int usb_set_configuration(struct usb_device *dev, int configuration) if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) cp->string = usb_cache_string(dev, cp->desc.iConfiguration); @@ -64182,13 +64182,13 @@ index 000000000000..cdc9963176e5 +test_main(); +0; -- -2.18.2 +2.18.4 -From 8ff6fe686ef2b521f6f54356c0314bd12eefd5e4 Mon Sep 17 00:00:00 2001 +From 08f028506b97765c6b0f8bd95f0a108f7e1f03df Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 17:06:34 +0100 -Subject: [PATCH 0038/1113] bcm2708 framebuffer driver +Subject: [PATCH 0038/1148] bcm2708 framebuffer driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -67764,13 +67764,13 @@ index 3f357c05788e..a5f3fff6773e 100644 RPI_FIRMWARE_FRAMEBUFFER_SET_OVERSCAN = 0x0004800a, RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE = 0x0004800b, -- -2.18.2 +2.18.4 -From 2605210d75099fa70ae6e61cfe937eebdf348193 Mon Sep 17 00:00:00 2001 +From 9f3b1449e2c5afd834a27c8c67f86a1b9af0a425 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 14 Mar 2019 13:27:54 +0000 -Subject: [PATCH 0039/1113] Pulled in the multi frame buffer support from the +Subject: [PATCH 0039/1148] Pulled in the multi frame buffer support from the Pi3 repo --- @@ -68613,13 +68613,13 @@ index a5f3fff6773e..25fca695f903 100644 int rpi_firmware_property(struct rpi_firmware *fw, u32 tag, void *data, size_t len); -- -2.18.2 +2.18.4 -From 9878f9ea651e92e15aa2fb0a27a62476e4555c8f Mon Sep 17 00:00:00 2001 +From a001368b1b8b3e2195d92a37cd761f9c46fcecc9 Mon Sep 17 00:00:00 2001 From: Siarhei Siamashka Date: Mon, 17 Jun 2013 13:32:11 +0300 -Subject: [PATCH 0040/1113] fbdev: add FBIOCOPYAREA ioctl +Subject: [PATCH 0040/1148] fbdev: add FBIOCOPYAREA ioctl Based on the patch authored by Ali Gholami Rudi at https://lkml.org/lkml/2009/7/13/153 @@ -68950,13 +68950,13 @@ index b6aac7ee1f67..212b7d5cb94c 100644 __u32 dx; /* screen-relative */ __u32 dy; -- -2.18.2 +2.18.4 -From e816695c4b7de05948a5f153b7fa481e44600d89 Mon Sep 17 00:00:00 2001 +From 0bb0ab67b5925a049a9c540c4df24edd14790399 Mon Sep 17 00:00:00 2001 From: Harm Hanemaaijer Date: Thu, 20 Jun 2013 20:21:39 +0200 -Subject: [PATCH 0041/1113] Speed up console framebuffer imageblit function +Subject: [PATCH 0041/1148] 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 @@ -69165,13 +69165,13 @@ index a2bb276a8b24..436494fba15a 100644 start_index, pitch_index); } else -- -2.18.2 +2.18.4 -From 6438f711d9ded9f72bcc2e027c70c310a560f159 Mon Sep 17 00:00:00 2001 +From 7fb5989767c1c81ccfae302924f8c15b58a74bba Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Fri, 22 Nov 2013 14:22:53 +0100 -Subject: [PATCH 0042/1113] dmaengine: Add support for BCM2708 +Subject: [PATCH 0042/1148] dmaengine: Add support for BCM2708 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -69819,13 +69819,13 @@ index 000000000000..6ca874d332a8 + +#endif /* _PLAT_BCM2708_DMA_H */ -- -2.18.2 +2.18.4 -From 06ef4e562600a256cd007e513383bce33d65732c Mon Sep 17 00:00:00 2001 +From a80b844f22e59e670e17e5cc6780b741142d139e Mon Sep 17 00:00:00 2001 From: gellert Date: Fri, 15 Aug 2014 16:35:06 +0100 -Subject: [PATCH 0043/1113] MMC: added alternative MMC driver +Subject: [PATCH 0043/1148] MMC: added alternative MMC driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -71795,7 +71795,7 @@ index 000000000000..ba30cc4b2653 +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Gellert Weisz"); diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h -index e459b38ef33c..e61a69450498 100644 +index cf3780a6ccc4..dc3fedec75d7 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -270,6 +270,8 @@ struct mmc_card { @@ -71808,13 +71808,13 @@ index e459b38ef33c..e61a69450498 100644 unsigned int erase_size; /* erase size in sectors */ -- -2.18.2 +2.18.4 -From d56fac7a7316d40811e802b4c6b0cf1169c21eda Mon Sep 17 00:00:00 2001 +From 8bf130139a3256ba9adf6cacd63e5efbf9968278 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 25 Mar 2015 17:49:47 +0000 -Subject: [PATCH 0044/1113] Adding bcm2835-sdhost driver, and an overlay to +Subject: [PATCH 0044/1148] Adding bcm2835-sdhost driver, and an overlay to enable it BCM2835 has two SD card interfaces. This driver uses the other one. @@ -74301,13 +74301,13 @@ index 000000000000..ba2dd8345fd4 +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Phil Elwell"); -- -2.18.2 +2.18.4 -From 21a08a545f36cfe6433de6688a8a3b6a6cce4618 Mon Sep 17 00:00:00 2001 +From db9304c282b70a55a08a4b2e4d3248164874027e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 28 Oct 2016 15:36:43 +0100 -Subject: [PATCH 0045/1113] vc_mem: Add vc_mem driver for querying firmware +Subject: [PATCH 0045/1148] vc_mem: Add vc_mem driver for querying firmware memory addresses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -74823,13 +74823,13 @@ index 000000000000..3c7079237496 + +#endif /* _VC_MEM_H */ -- -2.18.2 +2.18.4 -From 40fceef8672a62dda58e01d654ff4f7ec2e94a7d Mon Sep 17 00:00:00 2001 +From 95d38798130b142ea60d1e829c9eb8a87fc16125 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 22 Jul 2014 15:41:04 +0100 -Subject: [PATCH 0046/1113] vcsm: VideoCore shared memory service for BCM2835 +Subject: [PATCH 0046/1148] vcsm: VideoCore shared memory service for BCM2835 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -79836,13 +79836,13 @@ index 000000000000..2395ff08c5ce + +#endif /* __VMCS_SM_IOCTL_H__INCLUDED__ */ -- -2.18.2 +2.18.4 -From d953828261e5ae95a2fc3d4f3f03c5262ecfc43e Mon Sep 17 00:00:00 2001 +From a0a6327c4dfc6bced1b7e987b6ea20e651d1ee87 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Fri, 21 Aug 2015 23:14:48 +0100 -Subject: [PATCH 0047/1113] Add /dev/gpiomem device for rootless user GPIO +Subject: [PATCH 0047/1148] Add /dev/gpiomem device for rootless user GPIO access Signed-off-by: Luke Wren @@ -80151,13 +80151,13 @@ index 000000000000..f5e7f1ba8fb6 +MODULE_DESCRIPTION("gpiomem driver for accessing GPIO from userspace"); +MODULE_AUTHOR("Luke Wren "); -- -2.18.2 +2.18.4 -From 244d1d2158bcc75999763270696505ddf288607a Mon Sep 17 00:00:00 2001 +From 952c41b6c1bd02d88d8eb1fa8cb518ec214e53e2 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Sat, 5 Sep 2015 01:14:45 +0100 -Subject: [PATCH 0048/1113] Add SMI driver +Subject: [PATCH 0048/1148] Add SMI driver Signed-off-by: Luke Wren @@ -82089,13 +82089,13 @@ index 000000000000..ee3a75edfc03 + +#endif /* BCM2835_SMI_H */ -- -2.18.2 +2.18.4 -From 41bb4e1c0e1d0311cf899c2ca7167de21919a94f Mon Sep 17 00:00:00 2001 +From b20e267babf18daebe54af096f6cec89de262308 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 3 Jul 2013 00:49:20 +0100 -Subject: [PATCH 0049/1113] Add cpufreq driver +Subject: [PATCH 0049/1148] Add cpufreq driver Signed-off-by: popcornmix @@ -82360,13 +82360,13 @@ index 000000000000..66184acdae49 +module_init(bcm2835_cpufreq_module_init); +module_exit(bcm2835_cpufreq_module_exit); -- -2.18.2 +2.18.4 -From aeef1e3edfbd7da2aa9563bd667ebf2caed55918 Mon Sep 17 00:00:00 2001 +From 91cd558ea014e339d825877e42447436941432f5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 15:44:08 +0100 -Subject: [PATCH 0050/1113] Add Chris Boot's i2c driver +Subject: [PATCH 0050/1148] Add Chris Boot's i2c driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -83031,13 +83031,13 @@ index 000000000000..962f2e5c7455 +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -- -2.18.2 +2.18.4 -From 43f54a59156c4db055aa8e0dbf67a00edefdf618 Mon Sep 17 00:00:00 2001 +From b276713930cd4b91a42fe614729430d0893de566 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/1113] char: broadcom: Add vcio module +Subject: [PATCH 0051/1148] char: broadcom: Add vcio module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -83297,13 +83297,13 @@ index 000000000000..d2598663a2b5 +MODULE_DESCRIPTION("Mailbox userspace access"); +MODULE_LICENSE("GPL"); -- -2.18.2 +2.18.4 -From 221f55df1c1924d7fcebfabc2b744e273c1cc2da Mon Sep 17 00:00:00 2001 +From 379bfcd9d44b46e07e228adc6f813bdb67c03e64 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/1113] firmware: bcm2835: Support ARCH_BCM270x +Subject: [PATCH 0052/1148] firmware: bcm2835: Support ARCH_BCM270x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -83386,13 +83386,13 @@ index da26a584dca0..7162f6d6649c 100644 MODULE_AUTHOR("Eric Anholt "); MODULE_DESCRIPTION("Raspberry Pi firmware driver"); -- -2.18.2 +2.18.4 -From 00dffcd7ab288e4dcbc46f283fb53e2b47ac7eff Mon Sep 17 00:00:00 2001 +From 1d8e2c098ea8561b978cdcc77fa072785703c727 Mon Sep 17 00:00:00 2001 From: notro Date: Wed, 9 Jul 2014 14:46:08 +0200 -Subject: [PATCH 0053/1113] BCM2708: Add core Device Tree support +Subject: [PATCH 0053/1148] BCM2708: Add core Device Tree support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -105999,13 +105999,13 @@ index a6d0044328b1..bdec9e50358d 100644 # Bzip2 -- -2.18.2 +2.18.4 -From 853543aa11fef9c55e337ff067a9be3f035f6cdb Mon Sep 17 00:00:00 2001 +From b475400d48406a506315f70918719b1e5a0efc23 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Feb 2015 13:50:57 +0000 -Subject: [PATCH 0054/1113] BCM270x_DT: Add pwr_led, and the required "input" +Subject: [PATCH 0054/1148] BCM270x_DT: Add pwr_led, and the required "input" trigger The "input" trigger makes the associated GPIO an input. This is to support @@ -106183,13 +106183,13 @@ index efb309dba914..f94aa00431fb 100644 /* set_brightness_work / blink_timer flags, atomic, private. */ unsigned long work_flags; -- -2.18.2 +2.18.4 -From c7cf25c3ef0394a817480f4455aa71214d2e8576 Mon Sep 17 00:00:00 2001 +From ccc1fc5493fbbe0a514f1b87a9eb595279b0fe2c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 3 Jul 2013 00:54:08 +0100 -Subject: [PATCH 0055/1113] Added Device IDs for August DVB-T 205 +Subject: [PATCH 0055/1148] Added Device IDs for August DVB-T 205 --- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 ++++ @@ -106211,13 +106211,13 @@ index 1a36bda28542..9b1cb1908782 100644 &rtl28xxu_props, "Leadtek WinFast DTV Dongle mini", NULL) }, { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A, -- -2.18.2 +2.18.4 -From 362b33b946275ae8783fee9da4a0c8279199bdfa Mon Sep 17 00:00:00 2001 +From d5317d91147db99836a7bee103ff1a641c4a06ac Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 28 Nov 2016 16:50:04 +0000 -Subject: [PATCH 0056/1113] Improve __copy_to_user and __copy_from_user +Subject: [PATCH 0056/1148] Improve __copy_to_user and __copy_from_user performance Provide a __copy_from_user that uses memcpy. On BCM2708, use @@ -107797,13 +107797,13 @@ index 34fb06d1b477..5742092f8c09 100644 bool "Broadcom BCM63xx DSL SoC" depends on ARCH_MULTI_V7 -- -2.18.2 +2.18.4 -From 2eacba37825091cb615612c1947e05cf5c47451d Mon Sep 17 00:00:00 2001 +From 553665504343d102af3695dbbc413ff7486414db Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 25 Jun 2015 12:16:11 +0100 -Subject: [PATCH 0057/1113] gpio-poweroff: Allow it to work on Raspberry Pi +Subject: [PATCH 0057/1148] 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 @@ -107838,13 +107838,13 @@ index 6a4bbb506551..beb1df358c8d 100644 "%s: pm_power_off function already registered", __func__); -- -2.18.2 +2.18.4 -From 1cfc885d1eda4a517e28ecec1a6adff66bc7b196 Mon Sep 17 00:00:00 2001 +From 79883457735d3f03b6d0336038f8d501e16a73d1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 14:32:47 +0100 -Subject: [PATCH 0058/1113] mfd: Add Raspberry Pi Sense HAT core driver +Subject: [PATCH 0058/1148] mfd: Add Raspberry Pi Sense HAT core driver mfd: Add rpi_sense_core of compatible string --- @@ -108722,13 +108722,13 @@ index 000000000000..56196dc2af10 + +#endif -- -2.18.2 +2.18.4 -From a9d364354db7fa73d86c0911432685e9ece4c75d Mon Sep 17 00:00:00 2001 +From d31805b5a0691ffa75f1407272d0f5ca690dd0c1 Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Mon, 25 Jan 2016 15:48:59 +0000 -Subject: [PATCH 0059/1113] ASoC: Add support for Rpi-DAC +Subject: [PATCH 0059/1148] ASoC: Add support for Rpi-DAC --- sound/soc/codecs/Kconfig | 5 +++ @@ -108856,13 +108856,13 @@ index 000000000000..36b5b6c26655 +MODULE_AUTHOR("Florian Meier "); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 31d92eea3ffc754608988968b968ca154aba16c1 Mon Sep 17 00:00:00 2001 +From b97d4e9ad5131994e480b259073317e36030342a Mon Sep 17 00:00:00 2001 From: Gordon Garrity Date: Sat, 8 Mar 2014 16:56:57 +0000 -Subject: [PATCH 0060/1113] Add IQaudIO Sound Card support for Raspberry Pi +Subject: [PATCH 0060/1148] Add IQaudIO Sound Card support for Raspberry Pi Set a limit of 0dB on Digital Volume Control @@ -109161,13 +109161,13 @@ index 000000000000..b98232038616 +MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From baf8138407213b7bd8d5b8b44535e529490348ae Mon Sep 17 00:00:00 2001 +From 5601d7e620d20d2dce8916dcd1a62d298e96ff71 Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Mon, 4 Aug 2014 10:06:56 +0200 -Subject: [PATCH 0061/1113] Added support for HiFiBerry DAC+ +Subject: [PATCH 0061/1148] 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. @@ -109791,13 +109791,13 @@ index 000000000000..fdf6e950abd8 +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 0bde3e11051ef7bc3d3bf7349ae737d76f74b90d Mon Sep 17 00:00:00 2001 +From 8477ae63ea907f6e3a6d5143e360a822e5983d69 Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Mon, 4 Aug 2014 11:09:58 +0200 -Subject: [PATCH 0062/1113] Added driver for HiFiBerry Amp amplifier add-on +Subject: [PATCH 0062/1148] Added driver for HiFiBerry Amp amplifier add-on board The driver contains a low-level hardware driver for the TAS5713 and the @@ -110453,13 +110453,13 @@ index 000000000000..8f019e048987 + +#endif /* _TAS5713_H */ -- -2.18.2 +2.18.4 -From fd7cbba67df9783512fc541e531a080dd7896876 Mon Sep 17 00:00:00 2001 +From 3cbe56ca38cbf806051e6d8fc643752475b7a481 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 25 Mar 2015 09:26:17 +0100 -Subject: [PATCH 0063/1113] Add driver for rpi-proto +Subject: [PATCH 0063/1148] 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 @@ -110634,13 +110634,13 @@ index 000000000000..8f3c2ef170ff +MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)"); +MODULE_LICENSE("GPL"); -- -2.18.2 +2.18.4 -From f2d37b89edefc6564e6633c91905f82fede86376 Mon Sep 17 00:00:00 2001 +From c324bd901338221a4bfd5e695340aac9a0ca646a Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Thu, 7 Apr 2016 21:26:21 +0100 -Subject: [PATCH 0064/1113] Add Support for JustBoom Audio boards +Subject: [PATCH 0064/1148] Add Support for JustBoom Audio boards justboom-dac: Adjust for ALSA API change @@ -110820,13 +110820,13 @@ index 000000000000..62bd64cc0928 +MODULE_DESCRIPTION("ASoC Driver for JustBoom PI DAC HAT Sound Card"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 22210fd130898d7d1e3f44182074e4c15699f506 Mon Sep 17 00:00:00 2001 +From b7a339838fd78f6a3eaa84c3c439a911181b001e Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Mon, 16 May 2016 21:36:31 +1000 -Subject: [PATCH 0065/1113] New AudioInjector.net Pi soundcard with low jitter +Subject: [PATCH 0065/1148] 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. @@ -111040,13 +111040,13 @@ index 000000000000..21a46551a1c1 +MODULE_ALIAS("platform:audioinjector-pi-soundcard"); + -- -2.18.2 +2.18.4 -From 27eca4f289d0f14be2cca43a9265d44579dd8425 Mon Sep 17 00:00:00 2001 +From bd760520853a9cc91a6242e31544c8ed937b085c Mon Sep 17 00:00:00 2001 From: escalator2015 Date: Tue, 24 May 2016 16:20:09 +0100 -Subject: [PATCH 0066/1113] New driver for RRA DigiDAC1 soundcard using WM8741 +Subject: [PATCH 0066/1148] New driver for RRA DigiDAC1 soundcard using WM8741 + WM8804 ASoC: digidac1-soundcard: use modern dai_link style @@ -111485,13 +111485,13 @@ index 000000000000..5046f88c496b +MODULE_DESCRIPTION("ASoC Driver for RRA DigiDAC1"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 0446be9c44bbc920bceac59d4d8a8a564024dbf1 Mon Sep 17 00:00:00 2001 +From 433d7d7d89a7957a4f6f634b5cd821d5c9182fc5 Mon Sep 17 00:00:00 2001 From: DigitalDreamtime Date: Sat, 2 Jul 2016 16:26:19 +0100 -Subject: [PATCH 0067/1113] Add support for Dion Audio LOCO DAC-AMP HAT +Subject: [PATCH 0067/1148] Add support for Dion Audio LOCO DAC-AMP HAT Using dedicated machine driver and pcm5102a codec driver. @@ -111629,13 +111629,13 @@ index 000000000000..06af8363fb0a +MODULE_DESCRIPTION("ASoC Driver for DionAudio LOCO"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 22bb5cbe8b5ccc0c18a12d9420e1b13ee2e5097c Mon Sep 17 00:00:00 2001 +From 574f39911b03afcd13390b9e4afa474dcd12eae3 Mon Sep 17 00:00:00 2001 From: Clive Messer Date: Mon, 19 Sep 2016 14:01:04 +0100 -Subject: [PATCH 0068/1113] Allo Piano DAC boards: Initial 2 channel (stereo) +Subject: [PATCH 0068/1148] 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, @@ -111799,13 +111799,13 @@ index 000000000000..61640fb95431 +MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Piano DAC"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From d520603ec65f244b8f26f104c57e3f13b966dd6a Mon Sep 17 00:00:00 2001 +From fb343fc311184d1c576ec8eb1a172054810b2a22 Mon Sep 17 00:00:00 2001 From: Raashid Muhammed Date: Mon, 27 Mar 2017 12:35:00 +0530 -Subject: [PATCH 0069/1113] Add support for Allo Piano DAC 2.1 plus add-on +Subject: [PATCH 0069/1148] 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 @@ -112884,13 +112884,13 @@ index 000000000000..e910d4a4546d +MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Piano DAC Plus"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From b7b12c49bbfc9fd92715a4cc1c0fdc0bebf4e243 Mon Sep 17 00:00:00 2001 +From 059555ee985b5d6a036ebcccd02d7a0fbbcdf32d Mon Sep 17 00:00:00 2001 From: BabuSubashChandar Date: Tue, 28 Mar 2017 20:04:42 +0530 -Subject: [PATCH 0070/1113] Add support for Allo Boss DAC add-on board for +Subject: [PATCH 0070/1148] Add support for Allo Boss DAC add-on board for Raspberry Pi. (#1924) Signed-off-by: Baswaraj K @@ -113571,13 +113571,13 @@ index 000000000000..cd47413f870c +MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Boss DAC"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 2b255de6e5ff5a098b6526489b66b50ca001e7db Mon Sep 17 00:00:00 2001 +From 20e1e4e877d1db6dbb5c7615de6a0d80a26ecb71 Mon Sep 17 00:00:00 2001 From: gtrainavicius Date: Sun, 23 Oct 2016 12:06:53 +0300 -Subject: [PATCH 0071/1113] Support for Blokas Labs pisound board +Subject: [PATCH 0071/1148] Support for Blokas Labs pisound board Pisound dynamic overlay (#1760) @@ -115335,13 +115335,13 @@ index 000000000000..6af9921b55c7 +MODULE_DESCRIPTION("ASoC Driver for Pisound, https://blokas.io/pisound"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 64637185e3d2b3948ee4cdbe4374c7bcec4f1db2 Mon Sep 17 00:00:00 2001 +From 1de274df5829dd8d278a4a6daea07b3d5b5254d6 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 22 Jan 2017 12:49:37 +0100 -Subject: [PATCH 0072/1113] ASoC: Add driver for Cirrus Logic Audio Card +Subject: [PATCH 0072/1148] 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 @@ -116400,13 +116400,13 @@ index 000000000000..a0a460f787d1 +MODULE_DESCRIPTION("ASoC driver for Cirrus Logic Audio Card"); +MODULE_LICENSE("GPL"); -- -2.18.2 +2.18.4 -From a17e019584d6ecef31a054f6ee5fe943a127da69 Mon Sep 17 00:00:00 2001 +From 0d08aa2847e7f0db46c2bcb080f94561f345c2e4 Mon Sep 17 00:00:00 2001 From: Miquel Date: Fri, 24 Feb 2017 20:51:06 +0100 -Subject: [PATCH 0073/1113] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT +Subject: [PATCH 0073/1148] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT Signed-off-by: Miquel Blauw @@ -116551,13 +116551,13 @@ index 000000000000..ca48aef621b6 +MODULE_DESCRIPTION("ASoC Driver for DionAudio LOCO-V2"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 78aa91ca15fc25dffa3e17f6fddf61f79aadb10d Mon Sep 17 00:00:00 2001 +From 7613cc0c7b9f95136af616ac7efba7566f07d4ce Mon Sep 17 00:00:00 2001 From: Fe-Pi Date: Wed, 1 Mar 2017 04:42:43 -0700 -Subject: [PATCH 0074/1113] Add support for Fe-Pi audio sound card. (#1867) +Subject: [PATCH 0074/1148] 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. @@ -116734,13 +116734,13 @@ index 000000000000..a58a215820b7 +MODULE_DESCRIPTION("ASoC Driver for Fe-Pi Audio"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From a400cd161690addcb2fa0c03afc571cb3a951ce4 Mon Sep 17 00:00:00 2001 +From 38a7d88bf3108218d07a581695fc550eca87c9e8 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Wed, 8 Mar 2017 20:04:13 +1100 -Subject: [PATCH 0075/1113] Add support for the AudioInjector.net Octo sound +Subject: [PATCH 0075/1148] Add support for the AudioInjector.net Octo sound card AudioInjector Octo: sample rates, regulators, reset @@ -117181,13 +117181,13 @@ index 94b1adb088fd..203e3f368bd5 100644 int cs42xx8_probe(struct device *dev, struct regmap *regmap) { -- -2.18.2 +2.18.4 -From 4f24fd1b150a7852aa248489e0a36f054047df21 Mon Sep 17 00:00:00 2001 +From 29f6a4c45ba18e9835e074f62b0fddcae4256222 Mon Sep 17 00:00:00 2001 From: Peter Malkin Date: Mon, 27 Mar 2017 16:38:21 -0700 -Subject: [PATCH 0076/1113] Driver support for Google voiceHAT soundcard. +Subject: [PATCH 0076/1148] Driver support for Google voiceHAT soundcard. ASoC: googlevoicehat-codec: Use correct device when grabbing GPIO @@ -117442,13 +117442,13 @@ index 000000000000..871a25aa498e +MODULE_AUTHOR("Peter Malkin "); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 03836072f3abb725eee640c13b216fd109399951 Mon Sep 17 00:00:00 2001 +From a14057fb0101f879cd78c0a5cc75e21bfc2ab675 Mon Sep 17 00:00:00 2001 From: allocom Date: Thu, 19 Apr 2018 12:12:26 +0530 -Subject: [PATCH 0077/1113] Driver and overlay for Allo Katana DAC +Subject: [PATCH 0077/1148] Driver and overlay for Allo Katana DAC Allo Katana DAC: Updated default values @@ -117863,13 +117863,13 @@ index 000000000000..b0aebd40fe5e +MODULE_AUTHOR("Jaikumar "); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 859401286fbd3f0e1a56bff4b50ab40fe92b50ac Mon Sep 17 00:00:00 2001 +From 148f4e04f0289ff4076671e3d946ccde9b674c6c Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Wed, 27 Jun 2018 15:59:12 +0100 -Subject: [PATCH 0078/1113] ASoC: Add generic RPI driver for simple soundcards. +Subject: [PATCH 0078/1148] 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 @@ -118194,13 +118194,13 @@ index 000000000000..2023b0a18a2c +MODULE_DESCRIPTION("ASoC Raspberry Pi simple soundcard driver "); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 36501330a28023878e41d70459fe1df2263fadd3 Mon Sep 17 00:00:00 2001 +From 0e442e0392adc858bd7d18cf4b4fd982f82eb73d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Sep 2018 17:00:36 +0100 -Subject: [PATCH 0079/1113] ASoC: Add Kconfig and Makefile for sound/soc/bcm +Subject: [PATCH 0079/1148] ASoC: Add Kconfig and Makefile for sound/soc/bcm Signed-off-by: popcornmix --- @@ -118466,13 +118466,13 @@ index b81fa421ec27..522fc73571e4 100644 +obj-$(CONFIG_SND_RPI_SIMPLE_SOUNDCARD) += snd-soc-rpi-simple-soundcard.o +obj-$(CONFIG_SND_RPI_WM8804_SOUNDCARD) += snd-soc-rpi-wm8804-soundcard.o -- -2.18.2 +2.18.4 -From 2be6f7c9c8b90fedfc2018481fc221ef3034b3d5 Mon Sep 17 00:00:00 2001 +From a230c8a099de12031533ef230534511f4dfb2a53 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Sat, 21 Jul 2018 20:07:46 +0100 -Subject: [PATCH 0080/1113] ASoC: Create a generic Pi Hat WM8804 driver +Subject: [PATCH 0080/1148] 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. @@ -118943,13 +118943,13 @@ index 000000000000..b3c3c4ea1e75 +MODULE_DESCRIPTION("ASoC Raspberry Pi Hat generic digi driver for WM8804 based cards"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From aca27cd1c406b5765db14096885c5118fe050a91 Mon Sep 17 00:00:00 2001 +From 0501548ed7eedad9f64145ceeca408e526644d2f Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 21 Oct 2015 14:55:21 +0100 -Subject: [PATCH 0081/1113] rpi_display: add backlight driver and overlay +Subject: [PATCH 0081/1148] 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 @@ -119126,13 +119126,13 @@ index 000000000000..14a0d9b03739 +MODULE_DESCRIPTION("Raspberry Pi mailbox based Backlight Driver"); +MODULE_LICENSE("GPL"); -- -2.18.2 +2.18.4 -From 94144f76aecc077adc0f679e6bbd17967fbb44be Mon Sep 17 00:00:00 2001 +From 78dc975d00ae1f6dadc79870c7482e1a2c55d5f2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 23 Feb 2016 19:56:04 +0000 -Subject: [PATCH 0082/1113] bcm2835-virtgpio: Virtual GPIO driver +Subject: [PATCH 0082/1148] bcm2835-virtgpio: Virtual GPIO driver Add a virtual GPIO driver that uses the firmware mailbox interface to request that the VPU toggles LEDs. @@ -119393,13 +119393,13 @@ index 000000000000..49e28ad9760e +MODULE_DESCRIPTION("brcmvirt GPIO driver"); +MODULE_ALIAS("platform:brcmvirt-gpio"); -- -2.18.2 +2.18.4 -From eb9224ba080d7b77f34eff4c2901d5826ccb9bd1 Mon Sep 17 00:00:00 2001 +From 6c913ec9c6c55fa10a13241748676b92f4c77dfe Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Sep 2012 17:10:23 +0100 -Subject: [PATCH 0083/1113] net: Add non-mainline source for rtl8192cu wlan +Subject: [PATCH 0083/1148] net: Add non-mainline source for rtl8192cu wlan We are now syncing with version from: https://github.com/pvaret/rtl8192cu-fixes @@ -292558,13 +292558,13 @@ index 000000000000..24ab3720bef6 + +echo "get ip: $var1" -- -2.18.2 +2.18.4 -From 2dda06096383825830f3e86983ce4c76e6c16d85 Mon Sep 17 00:00:00 2001 +From 850f9c5e82f1a336cbec2207821041e3baddeca6 Mon Sep 17 00:00:00 2001 From: Pantelis Antoniou Date: Wed, 3 Dec 2014 13:23:28 +0200 -Subject: [PATCH 0084/1113] OF: DT-Overlay configfs interface +Subject: [PATCH 0084/1148] 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. @@ -292999,13 +292999,13 @@ index 000000000000..178f0629b0f0 +} +late_initcall(of_cfs_init); -- -2.18.2 +2.18.4 -From 5302eb182ff57fb9deb9749b1163e057ae5219d6 Mon Sep 17 00:00:00 2001 +From a9bee847e336a5fb053508bfc76629164109113f Mon Sep 17 00:00:00 2001 From: Cheong2K Date: Fri, 26 Feb 2016 18:20:10 +0800 -Subject: [PATCH 0085/1113] brcm: adds support for BCM43341 wifi +Subject: [PATCH 0085/1148] brcm: adds support for BCM43341 wifi brcmfmac: Disable power management @@ -293137,13 +293137,13 @@ index 38e6809f16c7..370301ac248b 100644 BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362), BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339), -- -2.18.2 +2.18.4 -From b8867cac454b9f15932c49ef37c35e3f9a32e4dc Mon Sep 17 00:00:00 2001 +From 6685539db878cf675ae02ce4d2202049f1f21ed9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 17 Dec 2015 13:37:07 +0000 -Subject: [PATCH 0086/1113] hci_h5: Don't send conf_req when ACTIVE +Subject: [PATCH 0086/1148] 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. @@ -293166,13 +293166,13 @@ index 5df0651b6cd5..06938e0ce8d3 100644 if (H5_HDR_LEN(hdr) > 2) h5->tx_win = (data[2] & 0x07); -- -2.18.2 +2.18.4 -From 29b667dab34dccde655725b0f2c44a22e9b850c2 Mon Sep 17 00:00:00 2001 +From 09c869a6580414609b21178034a3bf562ad5ba3d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 13 Apr 2015 17:16:29 +0100 -Subject: [PATCH 0087/1113] config: Add default configs +Subject: [PATCH 0087/1148] config: Add default configs --- arch/arm/configs/bcm2709_defconfig | 1444 +++++++++++++++++++++++++ @@ -300263,13 +300263,13 @@ index 000000000000..ca7668f549bc +CONFIG_KGDB_KDB=y +CONFIG_KDB_KEYBOARD=y -- -2.18.2 +2.18.4 -From ce746b538482f18d148f046e4ceb64fa4d1944d0 Mon Sep 17 00:00:00 2001 +From 0854150f5881cf731c051dc15999603bf6b6f960 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 14 Jan 2017 21:43:57 -0800 -Subject: [PATCH 0088/1113] ARM64: Round-Robin dispatch IRQs between CPUs. +Subject: [PATCH 0088/1148] 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 @@ -300343,13 +300343,13 @@ index 49642bcd0b75..d8ef8f7fee5b 100644 .name = "bcm2836-gpu", .irq_mask = bcm2836_arm_irqchip_mask_gpu_irq, -- -2.18.2 +2.18.4 -From fa31ecd40663b5f633a244128877e8838f1bae05 Mon Sep 17 00:00:00 2001 +From 8ad9c5a8979adc91fa8eb0256597a2f61006a601 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 11 Feb 2017 01:18:31 -0800 -Subject: [PATCH 0089/1113] ARM64: Force hardware emulation of deprecated +Subject: [PATCH 0089/1148] ARM64: Force hardware emulation of deprecated instructions. --- @@ -300377,13 +300377,13 @@ index bcb14d11232f..bfa3a069cbf1 100644 case INSN_OBSOLETE: insn->current_mode = INSN_UNDEF; -- -2.18.2 +2.18.4 -From 406242bc5b8293870d3d2440ac6e25fdf9f953ff Mon Sep 17 00:00:00 2001 +From 286ac025037c2943e4d96f0b5640221888fcdf2c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 10 Feb 2017 17:57:08 -0800 -Subject: [PATCH 0090/1113] build/arm64: Add rules for .dtbo files for dts +Subject: [PATCH 0090/1148] build/arm64: Add rules for .dtbo files for dts overlays We now create overlays as .dtbo files. @@ -300419,13 +300419,13 @@ index 96abe558aea8..05091ca6708b 100644 vdso_install: $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ -- -2.18.2 +2.18.4 -From 3f31999a55edc3f46c66b1a7961439fb7b37f5c6 Mon Sep 17 00:00:00 2001 +From 90b54141f44f206171d75f9af580bb2ec6c32fc0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Nov 2018 21:01:18 +0000 -Subject: [PATCH 0091/1113] Revert "build/arm64: Add rules for .dtbo files for +Subject: [PATCH 0091/1148] Revert "build/arm64: Add rules for .dtbo files for dts overlays" DT build rules are now in the common top-level Makefile. @@ -300461,13 +300461,13 @@ index 05091ca6708b..96abe558aea8 100644 vdso_install: $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ -- -2.18.2 +2.18.4 -From f03d9fee2a26218654941114b4da2fed59c485b1 Mon Sep 17 00:00:00 2001 +From 563a482b13d2cc85500985bcaaa7e29291bccaa1 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 25 Aug 2017 19:18:13 +0100 -Subject: [PATCH 0092/1113] cache: export clean and invalidate +Subject: [PATCH 0092/1148] cache: export clean and invalidate hack: cache: Fix linker error --- @@ -300522,13 +300522,13 @@ index 0ee8fc4b4672..8acb1857ff67 100644 sub r3, r2, #1 bic r0, r0, r3 -- -2.18.2 +2.18.4 -From 157f112e4a7aa13587236fcecdef441ba67b06c0 Mon Sep 17 00:00:00 2001 +From edda25ff8744174d15fb63708922a58d5f3ea9a3 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 14 Nov 2017 15:13:15 +0000 -Subject: [PATCH 0093/1113] AXI performance monitor driver (#2222) +Subject: [PATCH 0093/1148] AXI performance monitor driver (#2222) Uses the debugfs I/F to provide access to the AXI bus performance monitors. @@ -301221,13 +301221,13 @@ index 000000000000..5ae2bdaa88b4 +MODULE_LICENSE("GPL"); + -- -2.18.2 +2.18.4 -From 929fa69ac185914ead0de7e8230db1d0a8965cc0 Mon Sep 17 00:00:00 2001 +From 68d00064b05e36480f3225130a18507fea4e9aee Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Nov 2017 17:14:54 +0000 -Subject: [PATCH 0094/1113] cgroup: Disable cgroup "memory" by default +Subject: [PATCH 0094/1148] 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: @@ -301297,13 +301297,13 @@ index 35faf082a709..9f97b287891b 100644 static int __init enable_cgroup_debug(char *str) -- -2.18.2 +2.18.4 -From c6e7aab0a7d0291a605df59b9ea42c7b64b0f2e2 Mon Sep 17 00:00:00 2001 +From 04cc2b6a3e41c55837ab35112f7d7d3f6716c6d3 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/1113] ARM: bcm2835: Set Serial number and Revision +Subject: [PATCH 0095/1148] ARM: bcm2835: Set Serial number and Revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -301366,13 +301366,13 @@ index bfc556f76720..73ec2427fbcf 100644 .smp = smp_ops(bcm2836_smp_ops), MACHINE_END -- -2.18.2 +2.18.4 -From d84b73310d8116ec2d8d7bbc9f245f1034568300 Mon Sep 17 00:00:00 2001 +From 2244492f3cdda5031fd6af9532020a0b47d29450 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 16 Jul 2018 14:40:13 +0100 -Subject: [PATCH 0096/1113] dwc-otg: FIQ: Fix "bad mode in data abort handler" +Subject: [PATCH 0096/1148] 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 @@ -301488,13 +301488,13 @@ index 73ec2427fbcf..9b6c921106b5 100644 .dt_compat = bcm2835_compat, .smp = smp_ops(bcm2836_smp_ops), -- -2.18.2 +2.18.4 -From b1d2a8c8c70158a88507481e820c46f7422852d4 Mon Sep 17 00:00:00 2001 +From 54936f1f1ffdb62c7c091a52ce447f2244451ecb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Dec 2017 09:18:32 +0000 -Subject: [PATCH 0097/1113] ARM: Activate FIQs to avoid __irq_startup warnings +Subject: [PATCH 0097/1148] 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. @@ -301530,13 +301530,13 @@ index cd1234c103fc..a0f96e3b8898 100644 } -- -2.18.2 +2.18.4 -From 18b84f20ac4296170e1ed600c29a3d2cf12a52ba Mon Sep 17 00:00:00 2001 +From 0cceb3680a8858b99d0d274f7f3c144822a0fc75 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 22 Jan 2018 17:26:38 +0000 -Subject: [PATCH 0098/1113] serial: 8250: bcm2835aux - suppress EPROBE_DEFER +Subject: [PATCH 0098/1148] serial: 8250: bcm2835aux - suppress EPROBE_DEFER Signed-off-by: Phil Elwell --- @@ -301558,13 +301558,13 @@ index 4997c519ebb3..33da68341c3a 100644 } -- -2.18.2 +2.18.4 -From 21af33d0c4c9de6435013ba93b0a20df7f4e89bd Mon Sep 17 00:00:00 2001 +From f0d5cd5072f80b3b63403b4a93c3424acda5c9b8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 14 Sep 2016 09:16:19 +0100 -Subject: [PATCH 0099/1113] raspberrypi-firmware: Export the general +Subject: [PATCH 0099/1148] raspberrypi-firmware: Export the general transaction function. The vc4-firmware-kms module is going to be doing the MBOX FB call. @@ -301596,13 +301596,13 @@ index 7162f6d6649c..7947e65a22da 100644 /** * rpi_firmware_property_list - Submit firmware property list -- -2.18.2 +2.18.4 -From da3f87e06010d8df3febb18e2b723da640d78718 Mon Sep 17 00:00:00 2001 +From c4ca551a6be77b98fbf42b2b5fa53c6c3f627f52 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 14 Sep 2016 08:39:33 +0100 -Subject: [PATCH 0100/1113] drm/vc4: Add a mode for using the closed firmware +Subject: [PATCH 0100/1148] drm/vc4: Add a mode for using the closed firmware for display. Signed-off-by: Eric Anholt @@ -302373,13 +302373,13 @@ index 000000000000..78c343059355 + }, +}; -- -2.18.2 +2.18.4 -From 3ca67e43ec53f3de493df4da07c359a1bebdc187 Mon Sep 17 00:00:00 2001 +From 57b392cc56f69a45609d4b1ac47cfaff2289474a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 1 Feb 2017 17:09:18 -0800 -Subject: [PATCH 0101/1113] drm/vc4: Name the primary and cursor planes in +Subject: [PATCH 0101/1148] drm/vc4: Name the primary and cursor planes in fkms. This makes debugging nicer, compared to trying to remember what the @@ -302404,13 +302404,13 @@ index 78c343059355..d9a5551d01a2 100644 if (type == DRM_PLANE_TYPE_PRIMARY) { vc4_plane->fbinfo = -- -2.18.2 +2.18.4 -From 178ab46b131b14123c05d6d98cc081745623574e Mon Sep 17 00:00:00 2001 +From dfefc802937a3babfb7696dd69f99be558d1b86a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 1 Feb 2017 17:10:09 -0800 -Subject: [PATCH 0102/1113] drm/vc4: Add DRM_DEBUG_ATOMIC for the insides of +Subject: [PATCH 0102/1148] drm/vc4: Add DRM_DEBUG_ATOMIC for the insides of fkms. Trying to debug weston on fkms involved figuring out what calls I was @@ -302480,13 +302480,13 @@ index d9a5551d01a2..e372666af011 100644 RPI_FIRMWARE_SET_CURSOR_STATE, &packet_state, -- -2.18.2 +2.18.4 -From 9ec8e36cf7004121dc70a43b4d5d7b41c9d4b538 Mon Sep 17 00:00:00 2001 +From f8a0f9d65f1399067c4a1419588e0db381384e27 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 Feb 2017 09:42:18 -0800 -Subject: [PATCH 0103/1113] drm/vc4: Fix sending of page flip completion events +Subject: [PATCH 0103/1148] 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 @@ -302528,13 +302528,13 @@ index e372666af011..4d7b7f218cbb 100644 static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc) -- -2.18.2 +2.18.4 -From 1a8239e341f9f54db179c6ada13d7fd3b58ead79 Mon Sep 17 00:00:00 2001 +From cfbe406a9ea0f63616420ac07f3c23779c79b053 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 6 Jul 2017 11:45:48 -0700 -Subject: [PATCH 0104/1113] drm/vc4: Add support for setting DPMS in +Subject: [PATCH 0104/1148] drm/vc4: Add support for setting DPMS in firmwarekms. This ensures that the screen goes blank during DPMS (screensaver), @@ -302638,13 +302638,13 @@ index 4d7b7f218cbb..809437cf3215 100644 if (!vc4_encoder) return -ENOMEM; -- -2.18.2 +2.18.4 -From 09da0ead657eb492b718aa1743208f689b2db26f Mon Sep 17 00:00:00 2001 +From 13f6d53fd011c7abac70113dab9b2b11cbb85a4d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 7 Jun 2017 14:39:49 -0700 -Subject: [PATCH 0105/1113] drm/vc4: Add FB modifier support to firmwarekms. +Subject: [PATCH 0105/1148] drm/vc4: Add FB modifier support to firmwarekms. Signed-off-by: Eric Anholt (cherry picked from commit 11752d73488e08aaeb65fe8289a9c016acde26c2) @@ -302676,13 +302676,13 @@ index 809437cf3215..d5066f395b62 100644 * set to nonzero, the configured pitch gets overwritten with * the previous pitch. So, to get the configured pitch -- -2.18.2 +2.18.4 -From 1b9e7dd6d0e3c79cfbca316f2b8c0e4a4fcf5b6f Mon Sep 17 00:00:00 2001 +From 844b4c94a3987a77f0715e2422ecc91dd05dcbba Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 30 Jan 2018 14:21:02 -0800 -Subject: [PATCH 0106/1113] drm/vc4: Add missing enable/disable vblank handlers +Subject: [PATCH 0106/1148] drm/vc4: Add missing enable/disable vblank handlers in fkms. Fixes hang at boot in 4.14. @@ -302763,13 +302763,13 @@ index d5066f395b62..e3dfc20c404c 100644 static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { -- -2.18.2 +2.18.4 -From 1d91f1b519f810c1cb9c1d6267627e2c769a8b78 Mon Sep 17 00:00:00 2001 +From d53b7cf891ecdfaffe0dead00da008f1d4605dc0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Apr 2017 21:43:46 +0100 -Subject: [PATCH 0107/1113] vc4_fkms: Apply firmware overscan offset to +Subject: [PATCH 0107/1148] vc4_fkms: Apply firmware overscan offset to hardware cursor --- @@ -302826,13 +302826,13 @@ index e3dfc20c404c..7edb38953a6a 100644 return 0; -- -2.18.2 +2.18.4 -From 63707170ae6a9e965630afc1fa24ef405fd9a1ac Mon Sep 17 00:00:00 2001 +From 71f206d2a5e24f636e8bd605bfc4a5e22b38f82a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:01:02 +0000 -Subject: [PATCH 0108/1113] drm/vc4: Fix warning about vblank interrupts before +Subject: [PATCH 0108/1148] 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 @@ -302882,13 +302882,13 @@ index 7edb38953a6a..967a0bf5886b 100644 return 0; } -- -2.18.2 +2.18.4 -From f5ff45d70568315805b7e3a745854239968404f9 Mon Sep 17 00:00:00 2001 +From 51fceaa5f77108d7fa07b9c91ff006f03d9eca1e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:02:30 +0000 -Subject: [PATCH 0109/1113] drm/vc4: Skip SET_CURSOR_INFO when the cursor +Subject: [PATCH 0109/1148] drm/vc4: Skip SET_CURSOR_INFO when the cursor contents didn't change. Signed-off-by: Eric Anholt @@ -302945,13 +302945,13 @@ index 967a0bf5886b..462d9084ce53 100644 static void vc4_cursor_plane_atomic_disable(struct drm_plane *plane, -- -2.18.2 +2.18.4 -From 05d7d91ed1f2827c5b40ff2df8b5bbe068b82003 Mon Sep 17 00:00:00 2001 +From 3c65d7dd0a6cbf0183831708d614acdd523b57f7 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:22:03 +0000 -Subject: [PATCH 0110/1113] drm/vc4: Remove duplicate primary/cursor fields +Subject: [PATCH 0110/1148] drm/vc4: Remove duplicate primary/cursor fields from FKMS driver. The CRTC has those fields and we can just use them. @@ -303022,13 +303022,13 @@ index 462d9084ce53..60e9d8fa5511 100644 if (!vc4_encoder) return -ENOMEM; -- -2.18.2 +2.18.4 -From 19011108104f020a43f037c326f1ce367ce09b4d Mon Sep 17 00:00:00 2001 +From 36c552fdc280d2d25d8b7354eb256b1a6538e803 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 17 Jun 2018 13:22:07 +0100 -Subject: [PATCH 0111/1113] vc4_firmware_kms: fix build +Subject: [PATCH 0111/1148] vc4_firmware_kms: fix build --- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 8 ++++++-- @@ -303087,13 +303087,13 @@ index 60e9d8fa5511..1584f90face0 100644 platform_set_drvdata(pdev, NULL); -- -2.18.2 +2.18.4 -From 516747d5a7ef51455222601b4b163fc17bef0ec2 Mon Sep 17 00:00:00 2001 +From d5202382795bbe27e796c439284e47e12a00ceb5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Feb 2019 15:06:31 +0000 -Subject: [PATCH 0112/1113] gpu:vc4-fkms: Update driver to not use plane->crtc. +Subject: [PATCH 0112/1148] gpu:vc4-fkms: Update driver to not use plane->crtc. Following on from commit 2f958af7fc248 ("drm/vc4: Stop updating plane->fb/crtc") @@ -303129,13 +303129,13 @@ index 1584f90face0..347ad72682dc 100644 vc4_encoder = devm_kzalloc(dev, sizeof(*vc4_encoder), GFP_KERNEL); if (!vc4_encoder) -- -2.18.2 +2.18.4 -From ac67305c1dd8fe94736cd2a3f4212b9ee870569c Mon Sep 17 00:00:00 2001 +From 662259de84734fc96bd093b1ebdf4f21138085e0 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:53:18 +0000 -Subject: [PATCH 0113/1113] drm/vc4: Don't wait for vblank on fkms cursor +Subject: [PATCH 0113/1148] 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, @@ -303163,13 +303163,13 @@ index 78d4fb0499e3..75d3e8c6b650 100644 if (ret) return ret; -- -2.18.2 +2.18.4 -From 41747fbbb0964bcbc75c5f54137b3245cd05b3a4 Mon Sep 17 00:00:00 2001 +From 1eb7526cf18eb4b3ed4a2c5336d43289467ab4b0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 20 Feb 2018 10:07:27 +0000 -Subject: [PATCH 0114/1113] i2c-gpio: Also set bus numbers from reg property +Subject: [PATCH 0114/1148] 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 @@ -303204,13 +303204,13 @@ index a4a6825c8758..cfbcf3952ddc 100644 if (ret) return ret; -- -2.18.2 +2.18.4 -From d2dd8811e3fe6c92bdbefb3510e7438a9a36c4df Mon Sep 17 00:00:00 2001 +From 9e5a162734f9e17ddcfe27b8e14dc094271e450b Mon Sep 17 00:00:00 2001 From: hdoverobinson Date: Tue, 13 Mar 2018 06:58:39 -0400 -Subject: [PATCH 0115/1113] added capture_clear option to pps-gpio via +Subject: [PATCH 0115/1148] added capture_clear option to pps-gpio via dtoverlay (#2433) --- @@ -303231,13 +303231,13 @@ index e0de1df2ede0..ee7d8f4e7f2e 100644 } -- -2.18.2 +2.18.4 -From eb98f6b3c330760c0c245ebcf6afb24d89174c5b Mon Sep 17 00:00:00 2001 +From da9b9692aec894aab915cc133755dc5606d4549e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Mar 2018 12:01:00 +0000 -Subject: [PATCH 0116/1113] lan78xx: Read initial EEE status from DT +Subject: [PATCH 0116/1148] lan78xx: Read initial EEE status from DT Add two new DT properties: * microchip,eee-enabled - a boolean to enable EEE @@ -303277,13 +303277,13 @@ index ba42568316f1..e266ca2191ed 100644 if (dev->urb_intr) { ret = usb_submit_urb(dev->urb_intr, GFP_KERNEL); -- -2.18.2 +2.18.4 -From 216ff4c677bc6ab474bf954aa62aeb54ccc1ff2e Mon Sep 17 00:00:00 2001 +From 1e98c73e6b55b97b690f35658137cc36f6e70c05 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 14 Jul 2014 22:02:09 +0100 -Subject: [PATCH 0117/1113] hid: Reduce default mouse polling interval to 60Hz +Subject: [PATCH 0117/1148] hid: Reduce default mouse polling interval to 60Hz Reduces overhead when using X --- @@ -303315,13 +303315,13 @@ index 17a638f15082..ce8ef6930795 100644 break; case HID_GD_JOYSTICK: -- -2.18.2 +2.18.4 -From f3ab9bb16c3a820ed3ddd9d8ad22d85a6c3f59b0 Mon Sep 17 00:00:00 2001 +From 2d90ba79d547b4c5d6424b16218a771aaa6f984d Mon Sep 17 00:00:00 2001 From: Nick Bulleid Date: Thu, 10 May 2018 21:57:02 +0100 -Subject: [PATCH 0118/1113] Add ability to export gpio used by gpio-poweroff +Subject: [PATCH 0118/1148] Add ability to export gpio used by gpio-poweroff Signed-off-by: Nick Bulleid @@ -303380,13 +303380,13 @@ index beb1df358c8d..608d78f0514a 100644 } -- -2.18.2 +2.18.4 -From 33a9bc13b70a6bff83caa1e11334754aea456c50 Mon Sep 17 00:00:00 2001 +From a325ffd5f107174c2309c51e598004409e4118ed Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 12 May 2018 21:35:43 +0100 -Subject: [PATCH 0119/1113] firmware/raspberrypi: Notify firmware of a reboot +Subject: [PATCH 0119/1148] firmware/raspberrypi: Notify firmware of a reboot Register for reboot notifications, sending RPI_FIRMWARE_NOTIFY_REBOOT over the mailbox interface on reception. @@ -303470,13 +303470,13 @@ index 7947e65a22da..9ad10f7e019b 100644 module_exit(rpi_firmware_exit); -- -2.18.2 +2.18.4 -From b6c0cab99388b0028d94b6d9f3ac44164375d140 Mon Sep 17 00:00:00 2001 +From ba0f7e25bf85d0090583ff9b74b73ab876f22ad3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 11:21:04 +0100 -Subject: [PATCH 0120/1113] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time +Subject: [PATCH 0120/1148] 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 @@ -303542,13 +303542,13 @@ index 93878d725f26..40c1b38d5db5 100644 return 0; -- -2.18.2 +2.18.4 -From 6ddac36622c8ac94511d250318a94331de9ef7ab Mon Sep 17 00:00:00 2001 +From 402988ad3b82ebfc1fcc6e913964bc3392900163 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 15:07:26 +0100 -Subject: [PATCH 0121/1113] of: configfs: Use of_overlay_fdt_apply API call +Subject: [PATCH 0121/1148] 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 @@ -303662,13 +303662,13 @@ index 178f0629b0f0..ac04301dabe1 100644 config_item_init_type_name(&overlay->item, name, &cfs_overlay_type); return &overlay->item; -- -2.18.2 +2.18.4 -From f9081dfd5f62dc4d4e41fd03df1c113ac4106fd7 Mon Sep 17 00:00:00 2001 +From 687ab9a43af18dc2d6ec349837a02001626f4b42 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Jun 2018 15:21:10 +0100 -Subject: [PATCH 0122/1113] net: lan78xx: Disable TCP Segmentation Offload +Subject: [PATCH 0122/1148] net: lan78xx: Disable TCP Segmentation Offload (TSO) TSO seems to be having issues when packets are dropped and the @@ -303725,13 +303725,13 @@ index e266ca2191ed..3b904c55a21a 100644 if (DEFAULT_VLAN_RX_OFFLOAD) dev->net->features |= NETIF_F_HW_VLAN_CTAG_RX; -- -2.18.2 +2.18.4 -From 8a1d8aba2b413e1a627adddfc5c8dec0ee9a84e8 Mon Sep 17 00:00:00 2001 +From 9929ec6cb514f4504c875c315a01f801d8b9ee2f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 Jun 2018 12:20:01 +0100 -Subject: [PATCH 0123/1113] brcmfmac: Re-enable firmware roaming support +Subject: [PATCH 0123/1148] 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 @@ -303760,13 +303760,13 @@ index 5c2a03d629e4..dec25e415619 100644 MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine"); -- -2.18.2 +2.18.4 -From 7835af24acd88cc339d68be8751de173819d16c9 Mon Sep 17 00:00:00 2001 +From fdf448d58ae4dc0d6bd12e09f9c3970633cdbe65 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Apr 2018 14:46:11 +0100 -Subject: [PATCH 0124/1113] lan78xx: Move enabling of EEE into PHY init code +Subject: [PATCH 0124/1148] 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 @@ -303830,13 +303830,13 @@ index 3b904c55a21a..3bf87542c2ec 100644 if (dev->urb_intr) { ret = usb_submit_urb(dev->urb_intr, GFP_KERNEL); -- -2.18.2 +2.18.4 -From 4e621141c5ba68e6eae70aebc6be78cd0847cb92 Mon Sep 17 00:00:00 2001 +From a00743cd1bd35d58a9e289df2f18ceea0a62ca46 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 9 Jul 2018 12:54:25 +0100 -Subject: [PATCH 0125/1113] Add rpi-poe-fan driver +Subject: [PATCH 0125/1148] Add rpi-poe-fan driver Signed-off-by: Serge Schneider @@ -304424,13 +304424,13 @@ index 000000000000..3effaf2eb86d +MODULE_DESCRIPTION("Raspberry Pi PoE HAT fan driver"); +MODULE_LICENSE("GPL"); -- -2.18.2 +2.18.4 -From 59459948db51b008ca34a61a3619c143489b6e40 Mon Sep 17 00:00:00 2001 +From 8a5050c1607c660f0acdbc9767d504c102b11f5d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 17 Sep 2018 17:31:18 +0100 -Subject: [PATCH 0126/1113] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 +Subject: [PATCH 0126/1148] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT --- @@ -304450,13 +304450,13 @@ index bcc49cb47de6..2068f4b9fc37 100644 help Choose if you would like to have SPI interface support for Sony CXD2880. -- -2.18.2 +2.18.4 -From 43d1772ec6fef2d03d36e7a167e6138029a16f3a Mon Sep 17 00:00:00 2001 +From a8c865d36364f78dac9b128c3679259c97c0bfd7 Mon Sep 17 00:00:00 2001 From: detule Date: Tue, 2 Oct 2018 04:10:08 -0400 -Subject: [PATCH 0127/1113] vchiq_2835_arm: Implement a DMA pool for small bulk +Subject: [PATCH 0127/1148] vchiq_2835_arm: Implement a DMA pool for small bulk transfers (#2699) During a bulk transfer we request a DMA allocation to hold the @@ -304580,13 +304580,13 @@ index 8dc730cfe7a6..dc13c7df8c1c 100644 DMA_TO_DEVICE : DMA_FROM_DEVICE; pagelistinfo->num_pages = num_pages; -- -2.18.2 +2.18.4 -From c12b75c5ff4df436cffeab1d69c272eec5ddfa07 Mon Sep 17 00:00:00 2001 +From c2f61a2ad2c466b06775b4b8785e6b222292daca Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 6 Oct 2018 16:46:18 +0200 -Subject: [PATCH 0128/1113] hwmon: raspberrypi: Prevent voltage low warnings +Subject: [PATCH 0128/1148] hwmon: raspberrypi: Prevent voltage low warnings from filling log Although the correct fix for low voltage warnings is to @@ -304661,13 +304661,13 @@ index d3a64a35f7a9..db3b03438dd0 100644 sysfs_notify(&data->hwmon_dev->kobj, NULL, "in0_lcrit_alarm"); } -- -2.18.2 +2.18.4 -From 384ee4fd23acbf1d78905a58cc3ba3bf7aef27e7 Mon Sep 17 00:00:00 2001 +From e427d0e998812df53d60e7f8ddeab0ee0903d143 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 13:31:21 +0200 -Subject: [PATCH 0129/1113] firmware: raspberrypi: Add backward compatible +Subject: [PATCH 0129/1148] firmware: raspberrypi: Add backward compatible get_throttled Avoid a hard userspace ABI change by adding a compatible get_throttled @@ -304746,13 +304746,13 @@ index 9ad10f7e019b..e834e300bb6f 100644 static void rpi_register_clk_driver(struct device *dev) -- -2.18.2 +2.18.4 -From f596a370a78d68f41759fa17b79bb62bc5a39b8b Mon Sep 17 00:00:00 2001 +From 375177048cd93c80e9fdd194c4294517cbea0c33 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 6 Nov 2018 12:57:48 +0000 -Subject: [PATCH 0130/1113] sc16is7xx: Don't spin if no data received +Subject: [PATCH 0130/1148] sc16is7xx: Don't spin if no data received See: https://github.com/raspberrypi/linux/issues/2676 @@ -304775,13 +304775,13 @@ index 7d3ae31cc720..fe486498530d 100644 case SC16IS7XX_IIR_THRI_SRC: sc16is7xx_handle_tx(port); -- -2.18.2 +2.18.4 -From 49efd48e7997f6fb23e7a3d27a27679e5f788f41 Mon Sep 17 00:00:00 2001 +From cb093d595de33beda967fe4ca7b2cab73f3d8040 Mon Sep 17 00:00:00 2001 From: Ram Chandrasekar Date: Mon, 7 May 2018 11:54:08 -0600 -Subject: [PATCH 0131/1113] drivers: thermal: step_wise: add support for +Subject: [PATCH 0131/1148] drivers: thermal: step_wise: add support for hysteresis Step wise governor increases the mitigation level when the temperature @@ -304875,13 +304875,13 @@ index 6e051cbd824f..7d30b8d928ab 100644 dev_dbg(&instance->cdev->device, "old_target=%d, target=%d\n", old_target, (int)instance->target); -- -2.18.2 +2.18.4 -From 0916749932b3786c6850c979d909abcafa73f34e Mon Sep 17 00:00:00 2001 +From 7500a403192635039aed7413f090bc88245902fb Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 2 Oct 2018 11:14:15 +0100 -Subject: [PATCH 0132/1113] drivers: thermal: step_wise: avoid throttling at +Subject: [PATCH 0132/1148] drivers: thermal: step_wise: avoid throttling at hysteresis temperature after dropping below it Signed-off-by: Serge Schneider @@ -304903,13 +304903,13 @@ index 7d30b8d928ab..c481ed33810c 100644 trace_thermal_zone_trip(tz, trip, trip_type); } -- -2.18.2 +2.18.4 -From b20d934e41e23c973ab68fadc5466d56c8674411 Mon Sep 17 00:00:00 2001 +From 24b838439656812faf61671f5132542743bc3063 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Fri, 2 Nov 2018 11:55:49 +0000 -Subject: [PATCH 0133/1113] Update issue templates (#2736) +Subject: [PATCH 0133/1148] Update issue templates (#2736) --- .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++++++++++ @@ -304957,13 +304957,13 @@ index 000000000000..09bdc4a96838 +**Additional context** +Add any other relevant context for the problem. -- -2.18.2 +2.18.4 -From abe0edcf39a3e0c815751f958c474e0bb28a4564 Mon Sep 17 00:00:00 2001 +From 2fae135ea3e54e787c88e0e5ec73f5ceec0d197d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 24 Apr 2018 14:42:27 +0100 -Subject: [PATCH 0134/1113] gpiolib: Don't prevent IRQ usage of output GPIOs +Subject: [PATCH 0134/1148] 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 @@ -305013,13 +305013,13 @@ index abdf448b11a3..1e6bc8ecb5dc 100644 "%s: tried to flag a GPIO set as output for IRQ\n", __func__); -- -2.18.2 +2.18.4 -From 3b953ab877fc6e8c4cc1d9a54bfbfbf96384d8e9 Mon Sep 17 00:00:00 2001 +From 64d22b887451d091dfd9889ee187b709fb79512a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Nov 2018 19:46:58 +0000 -Subject: [PATCH 0135/1113] net: lan78xx: Support auto-downshift to 100Mb/s +Subject: [PATCH 0135/1148] 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 @@ -305114,13 +305114,13 @@ index 517288da19fd..626c450d71f4 100644 #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG (0x806A) #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG_ZD_DLY_EN_ (0x2000) -- -2.18.2 +2.18.4 -From 6e18c5a7a87eaf1b5f46b9a57d82ef2759ee6b60 Mon Sep 17 00:00:00 2001 +From ac6b0e044f47eb93cb63b2f34e2c21c00b6e663b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 14:21:04 +0000 -Subject: [PATCH 0136/1113] staging: bcm2835-camera: Ensure H264 header bytes +Subject: [PATCH 0136/1148] staging: bcm2835-camera: Ensure H264 header bytes get a sensible timestamp H264 header come from VC with 0 timestamps, which means they get a @@ -305212,13 +305212,13 @@ index b5fce38de038..dcb1b8e1f4e0 100644 struct vchiq_mmal_port *port; /* port being used for capture */ /* camera port being used for capture */ -- -2.18.2 +2.18.4 -From 68e92790c0bb504ef112dbf7aa51615c9049196f Mon Sep 17 00:00:00 2001 +From 7691bf1aeca5ac5037e8dd26088caf7825ae89c8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 10 Jan 2019 17:58:06 +0000 -Subject: [PATCH 0137/1113] firmware: raspberrypi: Report the fw variant during +Subject: [PATCH 0137/1148] firmware: raspberrypi: Report the fw variant during probe The driver already reported the firmware build date during probe. @@ -305331,13 +305331,13 @@ index 25fca695f903..9c6027fc25da 100644 RPI_FIRMWARE_SET_CURSOR_INFO = 0x00008010, RPI_FIRMWARE_SET_CURSOR_STATE = 0x00008011, -- -2.18.2 +2.18.4 -From 7adf2c1e464552a3f57687e9e3222514f7c70449 Mon Sep 17 00:00:00 2001 +From 5726bc9aac63437f07d474a5c6390f3b6a9fc278 Mon Sep 17 00:00:00 2001 From: Joshua Emele Date: Wed, 7 Nov 2018 16:07:40 -0800 -Subject: [PATCH 0138/1113] lan78xx: Debounce link events to minimize poll +Subject: [PATCH 0138/1148] lan78xx: Debounce link events to minimize poll storm The bInterval is set to 4 (i.e. 8 microframes => 1ms) and the only bit @@ -305383,13 +305383,13 @@ index 3bf87542c2ec..3ce3c651d158 100644 buf = kmalloc(maxp, GFP_KERNEL); if (buf) { -- -2.18.2 +2.18.4 -From e86bc719bde20c564142c90967bc880c5467ef04 Mon Sep 17 00:00:00 2001 +From 40bdc4578b5810b7822b509880b663b664bbef73 Mon Sep 17 00:00:00 2001 From: b-ak Date: Thu, 3 Jan 2019 00:01:08 +0530 -Subject: [PATCH 0139/1113] ASoC: Add support for AudioSense-Pi add-on +Subject: [PATCH 0139/1148] ASoC: Add support for AudioSense-Pi add-on soundcard AudioSense-Pi is a RPi HAT based on a TI's TLV320AIC32x4 stereo codec @@ -305721,13 +305721,13 @@ index 000000000000..d247ee8e6127 +MODULE_ALIAS("platform:audiosense-pi"); + -- -2.18.2 +2.18.4 -From 8e9dc0eabe064df9b4b490c55f63a63e75614a9d Mon Sep 17 00:00:00 2001 +From 03db767e20e214d791ca6500628aadd36240e6ff Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Jan 2019 12:39:50 +0000 -Subject: [PATCH 0140/1113] spi: spi-bcm2835: Re-enable HW CS +Subject: [PATCH 0140/1148] spi: spi-bcm2835: Re-enable HW CS Signed-off-by: Phil Elwell --- @@ -305807,13 +305807,13 @@ index c88f5d99c906..0eb748631f20 100644 ctlr->handle_err = bcm2835_spi_handle_err; ctlr->prepare_message = bcm2835_spi_prepare_message; -- -2.18.2 +2.18.4 -From d78fc9380b3be7478e7593866f2137ed4701cada Mon Sep 17 00:00:00 2001 +From 2af516f282bee5e47d358f764c07e2a1f9bedc98 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Jan 2019 12:41:15 +0000 -Subject: [PATCH 0141/1113] spi: spi-bcm2835: Disable forced software CS +Subject: [PATCH 0141/1148] spi: spi-bcm2835: Disable forced software CS With GPIO CS used by the DTBs, allow hardware CS to be selected by an overlay. @@ -305872,13 +305872,13 @@ index 0eb748631f20..e5c5146e1d95 100644 } -- -2.18.2 +2.18.4 -From ebce1a89046f722a2e465bf8534e0729654d086e Mon Sep 17 00:00:00 2001 +From 7abaf4c68825b0c94505a26a5fba65d3009b0fc3 Mon Sep 17 00:00:00 2001 From: HiFiBerry Date: Mon, 8 Oct 2018 18:10:12 +0200 -Subject: [PATCH 0142/1113] Added driver for the HiFiBerry DAC+ ADC (#2694) +Subject: [PATCH 0142/1148] Added driver for the HiFiBerry DAC+ ADC (#2694) Signed-off-by: Daniel Matuschek @@ -306347,13 +306347,13 @@ index 000000000000..ab454f2ecb17 +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ADC"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From bda988523c664d7cd871c3a2f0d13886a77e9c88 Mon Sep 17 00:00:00 2001 +From 2577a3d229c8e44bc63ce8b2924cd1fa47c1f623 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 7 Feb 2019 18:16:25 +0000 -Subject: [PATCH 0143/1113] configs: Enable the AD193x codecs +Subject: [PATCH 0143/1148] configs: Enable the AD193x codecs See: https://github.com/raspberrypi/linux/issues/2850 @@ -306381,13 +306381,13 @@ index 26f2b5b3e968..eea92595d5e1 100644 config SND_SOC_AD1980 -- -2.18.2 +2.18.4 -From 1512f3e26d705eb27d28bd993511bbaeeb926084 Mon Sep 17 00:00:00 2001 +From d2984639645ab723e20405f0c6188eb7ee6b447e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 Mar 2019 09:51:22 +0000 -Subject: [PATCH 0144/1113] lan78xx: EEE support is now a PHY property +Subject: [PATCH 0144/1148] 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. @@ -306413,13 +306413,13 @@ index 3ce3c651d158..8a197006eb6e 100644 struct ethtool_eee edata; memset(&edata, 0, sizeof(edata)); -- -2.18.2 +2.18.4 -From e7832835d9fb2f1e6109b8f6df15430063aad47d Mon Sep 17 00:00:00 2001 +From 18c5328bca9f59874a97e89ae653936125478152 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 Mar 2019 16:28:09 +0000 -Subject: [PATCH 0145/1113] Revert "staging: vchiq: delete vchiq_killable.h" +Subject: [PATCH 0145/1148] Revert "staging: vchiq: delete vchiq_killable.h" This reverts commit 2da56630b1cc422f58408033102b8f91ae97bc91. --- @@ -306554,13 +306554,13 @@ index 5e6d3035dc05..7b38afd4739d 100644 static inline int is_pow2(int i) { -- -2.18.2 +2.18.4 -From de7aefcdc9a293a30c20725c3352b2c00fb7a0c3 Mon Sep 17 00:00:00 2001 +From 7b6c31583a7a892adc3e60b320d75717b1304c4a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 15 Mar 2019 21:11:10 +0000 -Subject: [PATCH 0146/1113] Revert "staging: bcm2835-audio: Drop DT dependency" +Subject: [PATCH 0146/1148] Revert "staging: bcm2835-audio: Drop DT dependency" This reverts commit b7491a9fca2dc2535b9dc922550a37c5baae9d3d. --- @@ -306656,13 +306656,13 @@ index cf5f80f5ca6b..86b921030db7 100644 MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:bcm2835_audio"); -- -2.18.2 +2.18.4 -From 42f56eece23d9c12bbcbdcef11b72d1630b7eaeb Mon Sep 17 00:00:00 2001 +From 2bd9945e1fe324562e1fb9446da7243c33c038f4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 28 Jan 2019 14:40:16 +0000 -Subject: [PATCH 0147/1113] gpu: vc4_firmware_kms: Fix up 64 bit compile +Subject: [PATCH 0147/1148] gpu: vc4_firmware_kms: Fix up 64 bit compile warnings. Resolve two build warnings with regard using incorrectly @@ -306728,13 +306728,13 @@ index 347ad72682dc..85e273665836 100644 ret = rpi_firmware_property(vc4->firmware, -- -2.18.2 +2.18.4 -From 06328088efacf6ba606638713df95938981a4050 Mon Sep 17 00:00:00 2001 +From 58f8e28e0314b34e11792a9b106c45017af710b5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 20 Jul 2018 22:03:41 +0100 -Subject: [PATCH 0148/1113] bcm2835-dma: Add support for per-channel flags +Subject: [PATCH 0148/1148] 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 @@ -306782,13 +306782,13 @@ index 6860131b02d9..1e5d6f1bed4e 100644 d = c->desc; -- -2.18.2 +2.18.4 -From b1b0f74ea9f835adc11c949600c5b73b9b56115e Mon Sep 17 00:00:00 2001 +From 3126bea6640d10184f564eaca3d6d09da049eee4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Feb 2019 15:18:25 +0000 -Subject: [PATCH 0149/1113] drm: vc4: Programming the CTM is conditional on +Subject: [PATCH 0149/1148] drm: vc4: Programming the CTM is conditional on running full KMS vc4_ctm_commit writes to HVS registers, so this is only applicable @@ -306814,13 +306814,13 @@ index 75d3e8c6b650..57124fe94247 100644 drm_atomic_helper_commit_planes(dev, state, 0); -- -2.18.2 +2.18.4 -From 24cf5826296def9959df9fee45cbe40fd076882a Mon Sep 17 00:00:00 2001 +From 67c7446ae3b0899b347f9bd51a28f00c528ad988 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 29 Mar 2019 10:53:14 +0000 -Subject: [PATCH 0150/1113] rtc: rv3028: Add backup switchover mode support +Subject: [PATCH 0150/1148] rtc: rv3028: Add backup switchover mode support Signed-off-by: Phil Howard --- @@ -306870,13 +306870,13 @@ index bbdfebd70644..8b2446909a1b 100644 if (!device_property_read_u32(&client->dev, "trickle-resistor-ohms", &ohms)) { -- -2.18.2 +2.18.4 -From 5884ad7585835d1d16b6fee14c40254ecf03787d Mon Sep 17 00:00:00 2001 +From 34e06f2e427ab5adb06a5c2dec1d76e69b40de4f Mon Sep 17 00:00:00 2001 From: FERHAT Nicolas Date: Fri, 5 Apr 2019 13:06:42 +0100 -Subject: [PATCH 0151/1113] Audiophonics I-Sabre 9038Q2M DAC driver +Subject: [PATCH 0151/1148] Audiophonics I-Sabre 9038Q2M DAC driver Signed-off-by: Audiophonics @@ -307586,13 +307586,13 @@ index 000000000000..9cac5a2446b9 + +#endif /* _SND_SOC_ISABRECODEC */ -- -2.18.2 +2.18.4 -From 1e22686335cee7e193f4e371e96a7e2d279ef084 Mon Sep 17 00:00:00 2001 +From 0cda878e32033a4a28bec15fb1c4f258fea75798 Mon Sep 17 00:00:00 2001 From: P33M Date: Thu, 2 May 2019 11:53:45 +0100 -Subject: [PATCH 0152/1113] lan78xx: use default alignment for rx buffers +Subject: [PATCH 0152/1148] 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 @@ -307615,13 +307615,13 @@ index 8a197006eb6e..f72ab25e7d06 100644 usb_free_urb(urb); return -ENOMEM; -- -2.18.2 +2.18.4 -From 6198bad0eab478f5d7c3618d6de466cfde6c204e Mon Sep 17 00:00:00 2001 +From 8c1610578739a2ab5a43f6935aa24f958d35beff Mon Sep 17 00:00:00 2001 From: IQaudIO Date: Mon, 13 May 2019 21:53:05 +0100 -Subject: [PATCH 0153/1113] Added IQaudIO Pi-Codec board support (#2969) +Subject: [PATCH 0153/1148] Added IQaudIO Pi-Codec board support (#2969) Add support for the IQaudIO Pi-Codec board. @@ -307958,13 +307958,13 @@ index 000000000000..83f2dba1f5d6 +MODULE_DESCRIPTION("ASoC Driver for IQaudIO CODEC"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 0224db488ba6f5097d3fd31b8da7c069258e811e Mon Sep 17 00:00:00 2001 +From f880466afb95a7d5b62ffcd682f19b908a12eecc Mon Sep 17 00:00:00 2001 From: Klaus Schulz Date: Thu, 16 May 2019 13:35:32 +0200 -Subject: [PATCH 0154/1113] sound: pcm512x-codec: Adding 352.8kHz samplerate +Subject: [PATCH 0154/1148] sound: pcm512x-codec: Adding 352.8kHz samplerate support --- @@ -307985,13 +307985,13 @@ index 4cbef9affffd..604b405c81ac 100644 static const struct snd_pcm_hw_constraint_list constraints_slave = { -- -2.18.2 +2.18.4 -From 6390c0c27c0f763d5106208e67f4aab4e4a9226f Mon Sep 17 00:00:00 2001 +From 08fd47699cdc80231ec3a2ea56ed810a6ad05a38 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:55:37 +0000 -Subject: [PATCH 0155/1113] media: ov5647: Add set_fmt and get_fmt calls. +Subject: [PATCH 0155/1148] media: ov5647: Add set_fmt and get_fmt calls. There's no way to query the subdevice for the supported resolutions. @@ -308038,13 +308038,13 @@ index e7d2e5b4ad4b..3e587eb0a30e 100644 static const struct v4l2_subdev_ops ov5647_subdev_ops = { -- -2.18.2 +2.18.4 -From 683fa19f86bd981250168ea2eca2fd4201abff22 Mon Sep 17 00:00:00 2001 +From a427e5bd7bcd2554ec147e944b2d437bc822a36d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:55:59 +0000 -Subject: [PATCH 0156/1113] [media] Documentation: DT: add device tree for PWDN +Subject: [PATCH 0156/1148] [media] Documentation: DT: add device tree for PWDN control Add optional GPIO pwdn to connect to the PWDN line on the sensor. @@ -308077,13 +308077,13 @@ index 22e44945b661..70f06c24f470 100644 camera_1: endpoint { remote-endpoint = <&csi1_ep1>; -- -2.18.2 +2.18.4 -From 05198b815f36157dd7949c19553df419a65f13a0 Mon Sep 17 00:00:00 2001 +From a91809be57d97b081dc87fb9b492b8fe416bbca0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:33 +0000 -Subject: [PATCH 0157/1113] media: ov5647: Add support for PWDN GPIO. +Subject: [PATCH 0157/1148] media: ov5647: Add support for PWDN GPIO. Add support for an optional GPIO connected to PWDN on the sensor. @@ -308175,13 +308175,13 @@ index 3e587eb0a30e..c39e3d20e3ef 100644 goto error; -- -2.18.2 +2.18.4 -From d39c772b1b34eff6810719402fa5b14ca1537fa1 Mon Sep 17 00:00:00 2001 +From 530aff1517b0a93e816585f58110d228bd1b2dea Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:47 +0000 -Subject: [PATCH 0158/1113] media: ov5647: Add support for non-continuous clock +Subject: [PATCH 0158/1148] media: ov5647: Add support for non-continuous clock mode The driver was only supporting continuous clock mode @@ -308260,13 +308260,13 @@ index c39e3d20e3ef..8a1a515388e0 100644 dev_err(dev, "DT parsing error: %d\n", ret); return ret; -- -2.18.2 +2.18.4 -From 6bfba48da3537c2a2bdb9f2f655e90b70d8c55fe Mon Sep 17 00:00:00 2001 +From 1ae6dd1583961bd70dd4113fd3aa3a43cc049716 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:59 +0000 -Subject: [PATCH 0159/1113] media: tc358743: Increase FIFO level to 374. +Subject: [PATCH 0159/1148] 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 @@ -308297,13 +308297,13 @@ index dbbab75f135e..1d5a10e8c176 100644 * The PLL input clock is obtained by dividing refclk by pll_prd. * It must be between 6 MHz and 40 MHz, lower frequency is better. -- -2.18.2 +2.18.4 -From 562df4a746141486b07c4b807ede01ae7089461a Mon Sep 17 00:00:00 2001 +From e6ca711b1ac353b8d2c59ef8d1956f6b7301fa7d Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 21 Sep 2017 17:30:24 +0200 -Subject: [PATCH 0160/1113] media: tc358743: fix connected/active CSI-2 lane +Subject: [PATCH 0160/1148] media: tc358743: fix connected/active CSI-2 lane reporting g_mbus_config was supposed to indicate all supported lane numbers, not @@ -308379,13 +308379,13 @@ index 45f88f0248c4..9159a7008e3e 100644 /** * enum v4l2_mbus_type - media bus type -- -2.18.2 +2.18.4 -From ab3b8be1723548a4532c1e167510c46af869a50c Mon Sep 17 00:00:00 2001 +From 63e9486ecbc860e4f63fbcb3294989f4c3ad91b2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:21 +0000 -Subject: [PATCH 0161/1113] media: tc358743: Add support for 972Mbit/s link +Subject: [PATCH 0161/1148] media: tc358743: Add support for 972Mbit/s link freq. Adds register setups for running the CSI lanes at 972Mbit/s, @@ -308465,13 +308465,13 @@ index 82e94a59b852..2d7792bcd5ea 100644 state->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); -- -2.18.2 +2.18.4 -From 5a6406c95803cf73bd343c189ecb86fe254da614 Mon Sep 17 00:00:00 2001 +From 447486738a09673abd3a310d0a090eaa78676426 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:34 +0000 -Subject: [PATCH 0162/1113] media: tc358743: Check I2C succeeded during probe. +Subject: [PATCH 0162/1148] 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. @@ -308569,13 +308569,13 @@ index 2d7792bcd5ea..ba5104e7cbd6 100644 client->addr << 1); return -ENODEV; -- -2.18.2 +2.18.4 -From f0ae9ecd0849e68cd26c7cb2b9349afc5ec536ea Mon Sep 17 00:00:00 2001 +From ff1ee791596a68d76ffcfb5106d258020692da71 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:46 +0000 -Subject: [PATCH 0163/1113] media: adv7180: Default to the first valid input +Subject: [PATCH 0163/1148] media: adv7180: Default to the first valid input The hardware default is differential CVBS on AIN1 & 2, which isn't very useful. @@ -308620,13 +308620,13 @@ index e780969cc2f2..43229fccf83a 100644 mutex_unlock(&state->mutex); -- -2.18.2 +2.18.4 -From 5364a09a1eb768499ee3fb6ac4610ed3d75a128f Mon Sep 17 00:00:00 2001 +From 4c9ec28e3fd2c5025c1122e30340ab7961b941f9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:56 +0000 -Subject: [PATCH 0164/1113] media: adv7180: Add YPrPb support for ADV7282M +Subject: [PATCH 0164/1148] 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 @@ -308650,13 +308650,13 @@ index 43229fccf83a..8e3cf751a5a1 100644 BIT(ADV7182_INPUT_DIFF_CVBS_AIN3_AIN4) | BIT(ADV7182_INPUT_DIFF_CVBS_AIN7_AIN8), -- -2.18.2 +2.18.4 -From f6aa75029f9d78bf290abae89195169ff69965ec Mon Sep 17 00:00:00 2001 +From d88222675e4818800a198f12a3c61cb931ebcbc5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:58:08 +0000 -Subject: [PATCH 0165/1113] media: videodev2: Add helper defines for printing +Subject: [PATCH 0165/1148] media: videodev2: Add helper defines for printing FOURCCs New helper defines that allow printing of a FOURCC using @@ -308684,13 +308684,13 @@ index 530638dffd93..3c05779e2687 100644 * E N U M S */ -- -2.18.2 +2.18.4 -From 7ce8f92e2050b859972d68fe12943e2dc68ff631 Mon Sep 17 00:00:00 2001 +From 25c9daffb415aa5e4f572e81ae3d01e42a7c70d4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:06 +0000 -Subject: [PATCH 0166/1113] dt-bindings: Document BCM283x CSI2/CCP2 receiver +Subject: [PATCH 0166/1148] dt-bindings: Document BCM283x CSI2/CCP2 receiver Document the DT bindings for the CSI2/CCP2 receiver peripheral (known as Unicam) on BCM283x SoCs. @@ -308794,13 +308794,13 @@ index 000000000000..7714fb374b34 + }; + }; -- -2.18.2 +2.18.4 -From 6503f75cbbcb5fac9b83f77f3f372223f92119a5 Mon Sep 17 00:00:00 2001 +From 98880445750bd2bc1161dc84c1772bdf444bed27 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:40 +0000 -Subject: [PATCH 0167/1113] MAINTAINERS: Add entry for BCM2835 Unicam driver +Subject: [PATCH 0167/1148] MAINTAINERS: Add entry for BCM2835 Unicam driver Adds entry for the new BCM2835 Unicam (CSI-2 receiver) driver @@ -308828,13 +308828,13 @@ index 1407008df749..b7685777a806 100644 M: Hauke Mehrtens M: Rafał Miłecki -- -2.18.2 +2.18.4 -From 6ea3024e5159ac8ec935b6952cee29e9ee83513f Mon Sep 17 00:00:00 2001 +From cfaf75bee34b956e9db6cb24369bf3a2e89a4a97 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 22 Nov 2018 17:31:06 +0000 -Subject: [PATCH 0168/1113] media: tc358743: Return an appropriate colorspace +Subject: [PATCH 0168/1148] media: tc358743: Return an appropriate colorspace from tc358743_set_fmt When calling tc358743_set_fmt, the code was calling tc358743_get_fmt @@ -308932,13 +308932,13 @@ index ba5104e7cbd6..ad9f7e833243 100644 return 0; -- -2.18.2 +2.18.4 -From 5fe72145a53250aa49c60755c2db4cc2b3f59edd Mon Sep 17 00:00:00 2001 +From 0f2dae1c63733326bb87eb3cc6e2500c847fac1a Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 20:51:23 +0200 -Subject: [PATCH 0169/1113] staging: vchiq_arm: Fix platform device +Subject: [PATCH 0169/1148] staging: vchiq_arm: Fix platform device unregistration In error case platform_device_register_data would return an ERR_PTR @@ -308965,13 +308965,13 @@ index d927c67012b0..006566ae2775 100644 device_destroy(vchiq_class, vchiq_devid); cdev_del(&vchiq_cdev); -- -2.18.2 +2.18.4 -From 86e9501e042a15a6b9dda6f0fbbe0b1540d0f4ad Mon Sep 17 00:00:00 2001 +From 9ad7f772168d199c823673b0261f6ac88552b5da Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 15:48:54 +0000 -Subject: [PATCH 0170/1113] staging: bcm2835-camera: Fix logical continuation +Subject: [PATCH 0170/1148] staging: bcm2835-camera: Fix logical continuation splits Fix checkpatch errors for "Logical continuations should be @@ -308998,13 +308998,13 @@ index e5f651f78441..d220b2051891 100644 bool overlay_enabled = !!dev->component[COMP_PREVIEW]->enabled; -- -2.18.2 +2.18.4 -From 00f2e654252b7e72a0138412be3612dc6f1c3ef1 Mon Sep 17 00:00:00 2001 +From 8fb89074aa6bf5cda1eead1ddf2ca795d8533e71 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 24 Jul 2018 12:08:29 +0100 -Subject: [PATCH 0171/1113] staging: bcm2835-camera: Ensure timestamps never go +Subject: [PATCH 0171/1148] staging: bcm2835-camera: Ensure timestamps never go backwards. There is an awkward situation with H264 header bytes. Currently @@ -309042,13 +309042,13 @@ index d220b2051891..74b7db3204ec 100644 } else { if (dev->capture.last_timestamp) { -- -2.18.2 +2.18.4 -From 5da4c74dcb595990ae89b53347e450b9af6e2535 Mon Sep 17 00:00:00 2001 +From 690855ebb0cdc352cf1c7c3edb478f818cf2fccd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:30:37 +0100 -Subject: [PATCH 0172/1113] staging: vc04_services: Split vchiq-mmal into a +Subject: [PATCH 0172/1148] staging: vc04_services: Split vchiq-mmal into a module In preparation for adding a video codec V4L2 module which also @@ -309356,13 +309356,13 @@ similarity index 100% rename from drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h rename to drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -- -2.18.2 +2.18.4 -From 804314b3f6dde6b6396c7175b986b3deb6f5fc61 Mon Sep 17 00:00:00 2001 +From f75a33d2ab1fefd2d55256d694dad3118cd16976 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:51:13 +0100 -Subject: [PATCH 0173/1113] staging: mmal-vchiq: Allocate and free components +Subject: [PATCH 0173/1148] staging: mmal-vchiq: Allocate and free components as required The existing code assumed that there would only ever be 4 components, @@ -309471,13 +309471,13 @@ index 47897e81ec58..4e34728d87e5 100644 u32 handle; /* VideoCore handle for component */ u32 inputs; /* Number of input ports */ -- -2.18.2 +2.18.4 -From 628d23c290d0b37d05fb2b405485a669c4fe55f3 Mon Sep 17 00:00:00 2001 +From 88d981e291ff02d103bbded33796dbe3b6f53686 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 16:20:46 +0000 -Subject: [PATCH 0174/1113] staging: mmal-vchiq: Avoid use of bool in +Subject: [PATCH 0174/1148] staging: mmal-vchiq: Avoid use of bool in structures Fixes up a checkpatch error "Avoid using bool structure members @@ -309502,13 +309502,13 @@ index f619697b09a1..38db20d42e42 100644 mutex_unlock(&instance->vchiq_mutex); -- -2.18.2 +2.18.4 -From e2cbdd224a8591b31a0311f5a1f06b6ee14e6a06 Mon Sep 17 00:00:00 2001 +From bad3645504a929d45b619cdce5614b1be223ee05 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:57:09 +0100 -Subject: [PATCH 0175/1113] staging: mmal-vchiq: Make timeout a defined +Subject: [PATCH 0175/1148] staging: mmal-vchiq: Make timeout a defined parameter The timeout period for VPU communications is a useful thing @@ -309547,13 +309547,13 @@ index 38db20d42e42..9aeb5ac08683 100644 pr_err("timed out waiting for sync completion\n"); ret = -ETIME; -- -2.18.2 +2.18.4 -From 75b3de37abe8d5a7012710f19d4cb4b29bbd74ae Mon Sep 17 00:00:00 2001 +From 4d1096bb985042b535203e53a44096de37d46ed5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 17:33:37 +0100 -Subject: [PATCH 0176/1113] staging: mmal-vchiq: Make a mmal_buf struct for +Subject: [PATCH 0176/1148] staging: mmal-vchiq: Make a mmal_buf struct for passing parameters The callback from vchi_mmal to the client was growing lots of extra @@ -309837,13 +309837,13 @@ index 4e34728d87e5..cca7289761c2 100644 struct vchiq_mmal_port { u32 enabled:1; -- -2.18.2 +2.18.4 -From f6ed44a2023e1ce3b09a6724cc059e82e5451f93 Mon Sep 17 00:00:00 2001 +From 5616793e5367ebfb0dcc1dea1bf50f7534c61745 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:15:38 +0100 -Subject: [PATCH 0177/1113] staging: mmal-vchiq: Add support for event +Subject: [PATCH 0177/1148] staging: mmal-vchiq: Add support for event callbacks. (Preparation for the codec driver). @@ -310206,13 +310206,13 @@ index cca7289761c2..eeef5ee9467a 100644 struct vchiq_mmal_component { -- -2.18.2 +2.18.4 -From 512a4944bfce545fe57794ad3b80f82c6ee505a8 Mon Sep 17 00:00:00 2001 +From ed3923bfffb219cddae4b4361f448126fd0b97e2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:26:02 +0100 -Subject: [PATCH 0178/1113] staging: vc04_services: Support sending data to +Subject: [PATCH 0178/1148] staging: vc04_services: Support sending data to MMAL ports Add the ability to send data to ports. This only supports @@ -310254,13 +310254,13 @@ index f66d28ed7c84..a75e9fd8cbe1 100644 /* clear buffer type sepecific data */ memset(&m.u.buffer_from_host.buffer_header_type_specific, 0, -- -2.18.2 +2.18.4 -From f0a657ec511d59589a8618fb39a37ef4511d0bf3 Mon Sep 17 00:00:00 2001 +From a49dcda6543ba1bb0f41a35a2f9a8d347c80fc70 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 16:57:40 +0100 -Subject: [PATCH 0179/1113] staging: vc04_services: Fixup vchiq-mmal include +Subject: [PATCH 0179/1148] staging: vc04_services: Fixup vchiq-mmal include ordering There were dependencies on including the headers in the correct @@ -310298,13 +310298,13 @@ index eeef5ee9467a..7a490f29737a 100644 #define MAX_PORT_COUNT 4 -- -2.18.2 +2.18.4 -From 3bcf8c87f42be8cdfcfe785201875b9a730c389f Mon Sep 17 00:00:00 2001 +From 2822ccad3828779665bb121ca816e3576a5909d9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 10:27:11 +0100 -Subject: [PATCH 0180/1113] staging: vc04_services: Add new vc-sm-cma driver +Subject: [PATCH 0180/1148] staging: vc04_services: Add new vc-sm-cma driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -313515,13 +313515,13 @@ index 000000000000..107460ad1be3 + +#endif /* __VC_SM_CMA_IOCTL_H */ -- -2.18.2 +2.18.4 -From 7aed5e4375ae39c06724059c1114bd38db82744d Mon Sep 17 00:00:00 2001 +From 28dab6591a1964c4e612b3b2596c598de1b4497f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 16:07:55 +0100 -Subject: [PATCH 0181/1113] staging: vc04_services: Use vc-sm-cma to support +Subject: [PATCH 0181/1148] 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 @@ -313704,13 +313704,13 @@ index 7a490f29737a..ae6c69ba16ee 100644 u32 type; /* port type, cached to use on port info set */ u32 index; /* port index, cached to use on port info set */ -- -2.18.2 +2.18.4 -From 623cf73dd2b4fafee73886e8821466b6d2f6e3d5 Mon Sep 17 00:00:00 2001 +From 6a6492fe2d7577fe3208f4fd3d18c577728b9242 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 17:57:45 +0000 -Subject: [PATCH 0182/1113] media: videobuf2: Allow exporting of a struct +Subject: [PATCH 0182/1148] media: videobuf2: Allow exporting of a struct dmabuf videobuf2 only allowed exporting a dmabuf as a file descriptor, @@ -313796,13 +313796,13 @@ index 640aabe69450..d86d888247a1 100644 * vb2_core_expbuf() - Export a buffer as a file descriptor. * @q: pointer to &struct vb2_queue with videobuf2 queue. -- -2.18.2 +2.18.4 -From 5db2a24be30a09e3d0de58cfe6bdb2d33c275d70 Mon Sep 17 00:00:00 2001 +From 8d8a652fc69041a23e0067fa336391f9311177af Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 14:53:49 +0100 -Subject: [PATCH 0183/1113] staging: vc04_services: Add a V4L2 M2M codec driver +Subject: [PATCH 0183/1148] 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 @@ -316283,13 +316283,13 @@ index 000000000000..4e4e4fb69ade +MODULE_VERSION("0.0.1"); +MODULE_ALIAS("platform:bcm2835-codec"); -- -2.18.2 +2.18.4 -From 60b29c9ff47a009d0db5f650a76972bd25ae2ba5 Mon Sep 17 00:00:00 2001 +From 6e3119eb70e0712226cb1c58c492f96d7ade13a1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 22 Jan 2019 12:04:09 +0000 -Subject: [PATCH 0184/1113] staging: mmal-vchiq: Fix client_component for 64 +Subject: [PATCH 0184/1148] staging: mmal-vchiq: Fix client_component for 64 bit kernel The MMAL client_component field is used with the event @@ -316359,13 +316359,13 @@ index ae6c69ba16ee..247521fbcc1d 100644 int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance); -- -2.18.2 +2.18.4 -From 1eab2d4ba30ab1a7cc854135b3377b20fbdeed97 Mon Sep 17 00:00:00 2001 +From d581ccb832c303fa58a1e3cdbddb3cb90f259d5d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 15:09:28 +0000 -Subject: [PATCH 0185/1113] clk: clk-bcm2835: Use %zd when printing size_t +Subject: [PATCH 0185/1148] 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". @@ -316389,13 +316389,13 @@ index 868ada45db28..74f30f1ed798 100644 return 0; } -- -2.18.2 +2.18.4 -From 6cf704ad958d0dd65d5f1f454b6347cee2762581 Mon Sep 17 00:00:00 2001 +From 3b090a99f82e4690fb397d5e3b10eb49340fce83 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Sep 2018 11:08:51 +0100 -Subject: [PATCH 0186/1113] media: ov5647: Use gpiod_set_value_cansleep +Subject: [PATCH 0186/1148] 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 @@ -316449,13 +316449,13 @@ index 8a1a515388e0..07550377be2e 100644 if (ret < 0) goto error; -- -2.18.2 +2.18.4 -From 1fe7ac2cace97aa7e02387b689c6d9299012b599 Mon Sep 17 00:00:00 2001 +From a64c0bb86a6dfe522c3354ff20ffa154589a23e0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 16:40:01 +0000 -Subject: [PATCH 0187/1113] staging: bcm2835-codec: variable vb2 may be used +Subject: [PATCH 0187/1148] staging: bcm2835-codec: variable vb2 may be used uninitialised In op_buffer_cb, the failure path checked whether there was @@ -316492,13 +316492,13 @@ index 4e4e4fb69ade..4ef16379f216 100644 __func__, mmal_buf->length, mmal_buf->mmal_flags, vb2->vb2_buf.index); -- -2.18.2 +2.18.4 -From 94cd62cb60b3d9d605238a208b96c894869a96bf Mon Sep 17 00:00:00 2001 +From f225f0c14780eeb9d1730b79c459c7749a345506 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 16:36:19 +0000 -Subject: [PATCH 0188/1113] staging: bcm2835-codec: Fix potentially +Subject: [PATCH 0188/1148] staging: bcm2835-codec: Fix potentially uninitialised vars src_m2m_buf and dst_m2m_buf were printed in log messages @@ -316523,13 +316523,13 @@ index 4ef16379f216..c26760faae2d 100644 int ret; -- -2.18.2 +2.18.4 -From 8735f2dc891b344ae2f73c12f8af8e6ce65939ea Mon Sep 17 00:00:00 2001 +From c1b426a72705f313e0eacbe47b917db98ea9a36e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:33:29 +0000 -Subject: [PATCH 0189/1113] staging: mmal_vchiq: Add in the Bayer encoding +Subject: [PATCH 0189/1148] staging: mmal_vchiq: Add in the Bayer encoding formats The list of formats was copied before Bayer support was added. @@ -316580,13 +316580,13 @@ index 2be9941a1f30..44ba91aa6d47 100644 */ #define MMAL_ENCODING_EGL_IMAGE MMAL_FOURCC('E', 'G', 'L', 'I') -- -2.18.2 +2.18.4 -From f9a6e6e2d728eb3feb06eb525e86965f25d9c5e0 Mon Sep 17 00:00:00 2001 +From 66a77b89432ddd7c3fbf285a41ac63320cd4221a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:36:56 +0000 -Subject: [PATCH 0190/1113] staging: mmal-vchiq: Always return the param size +Subject: [PATCH 0190/1148] staging: mmal-vchiq: Always return the param size from param_get mmal-vchiq is a reimplementation of the userland library for MMAL. @@ -316624,13 +316624,13 @@ index 9416cbeae3a3..59a4d2414069 100644 pr_debug("%s:result:%d component:0x%x port:%d parameter:%d\n", __func__, ret, port->component->handle, port->handle, parameter_id); -- -2.18.2 +2.18.4 -From 5b5df84eb75691e8f13e577d521d8ed678921c0e Mon Sep 17 00:00:00 2001 +From db2b147c4cffe4b6814faf4435b1ed998e5c1174 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:51:03 +0000 -Subject: [PATCH 0191/1113] staging: mmal-vchiq: If the VPU returns an error, +Subject: [PATCH 0191/1148] 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. @@ -316659,13 +316659,13 @@ index 59a4d2414069..cfc861d0a214 100644 * whilst *value_size doesn't. */ -- -2.18.2 +2.18.4 -From 35f9ad8da9413c13235a3a713db680e732689fd8 Mon Sep 17 00:00:00 2001 +From 040157f11bd42cbaf2d3f53d4978cb78925a479b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 13:44:00 +0000 -Subject: [PATCH 0192/1113] staging: bcm2835_codec: Query supported formats +Subject: [PATCH 0192/1148] staging: bcm2835_codec: Query supported formats from the component The driver was previously working with hard coded tables of @@ -317392,13 +317392,13 @@ index c26760faae2d..7b8de26ca43b 100644 return 0; } -- -2.18.2 +2.18.4 -From 7dce71993b7057d1abf80d2205afac0ddf65e7b8 Mon Sep 17 00:00:00 2001 +From 62480ce9043f5c475bcbc09b118835501ee3054a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 14:07:52 +0000 -Subject: [PATCH 0193/1113] staging: bcm2835_codec: Add support for the ISP as +Subject: [PATCH 0193/1148] staging: bcm2835_codec: Add support for the ISP as an M2M device The MMAL ISP component can also use this same V4L2 wrapper to @@ -317782,13 +317782,13 @@ index 7b8de26ca43b..f9fd5e8ac914 100644 bcm2835_codec_destroy(drv->decode); -- -2.18.2 +2.18.4 -From 4a76b878bbc56f50b1618083f83c219e73ec04cd Mon Sep 17 00:00:00 2001 +From 07c05c278d0de8840b414db4ce73474e46e5e533 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 Feb 2019 11:36:14 +0000 -Subject: [PATCH 0194/1113] staging: bcm2835_codec: Add an option for ignoring +Subject: [PATCH 0194/1148] staging: bcm2835_codec: Add an option for ignoring Bayer formats. This is a workaround for GStreamer currently not identifying Bayer @@ -317967,13 +317967,13 @@ index f9fd5e8ac914..5141034835ca 100644 } return NULL; -- -2.18.2 +2.18.4 -From ec78eb784c1772834d544fdb535851cbe263a9a5 Mon Sep 17 00:00:00 2001 +From 62b617d21d70a5d249406f918fbc2d104cfe519d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 Feb 2019 11:38:45 +0000 -Subject: [PATCH 0195/1113] staging: bcm2835_codec: Fix handling of +Subject: [PATCH 0195/1148] staging: bcm2835_codec: Fix handling of VB2_MEMORY_DMABUF buffers If the queue is configured as VB2_MEMORY_DMABUF then vb2_core_expbuf @@ -318163,13 +318163,13 @@ index 247521fbcc1d..0a75c96f6d58 100644 struct mmal_buffer *buf); int mmal_vchi_buffer_cleanup(struct mmal_buffer *buf); -- -2.18.2 +2.18.4 -From d6c4bcbb1e53204441a775fa508cf3dee925ba53 Mon Sep 17 00:00:00 2001 +From df2d47a0834afaecff794659262ac4e561ba47d0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 18 Feb 2019 15:52:29 +0000 -Subject: [PATCH 0196/1113] staging: mmal-vchiq: Update mmal_parameters.h with +Subject: [PATCH 0196/1148] staging: mmal-vchiq: Update mmal_parameters.h with recently defined params mmal_parameters.h hasn't been updated to reflect additions made @@ -318225,13 +318225,13 @@ index 80a99128f5f3..926392d754c7 100644 /** Valid mirror modes */ -- -2.18.2 +2.18.4 -From 74bca2f19db43540cba7d213c80becb5aa1e72d0 Mon Sep 17 00:00:00 2001 +From 9c8f46371e366d8b7207667fa3bceffb3acffe28 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 18 Feb 2019 15:56:42 +0000 -Subject: [PATCH 0197/1113] staging: bcm2835_codec: Include timing info in SPS +Subject: [PATCH 0197/1148] staging: bcm2835_codec: Include timing info in SPS headers Inserting timing information into the VUI block of the SPS is @@ -318275,13 +318275,13 @@ index 67d42bf6251b..eb5c07bc73d0 100644 if (ctx->q_data[V4L2_M2M_DST].sizeimage < ctx->component->output[0].minimum_buffer.size) -- -2.18.2 +2.18.4 -From 319d5ae547a22bc6b4ac4b95af201d5ab4e84ee7 Mon Sep 17 00:00:00 2001 +From 87fb1808938d9000bbff0f3c1c8ae09be7b23ec5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Mar 2019 17:55:09 +0000 -Subject: [PATCH 0198/1113] staging: bcm2835-codec: NULL component handle on +Subject: [PATCH 0198/1148] staging: bcm2835-codec: NULL component handle on queue_setup failure queue_setup tries creating the relevant MMAL component and configures @@ -318340,13 +318340,13 @@ index eb5c07bc73d0..ad555ceb8f63 100644 return ret; } -- -2.18.2 +2.18.4 -From bc2aeba0b019d9e3841fb6fe8792e6ca3b16d808 Mon Sep 17 00:00:00 2001 +From e4219e66cee247b6961e132a62b9aa17960c88cf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 11:26:00 +0000 -Subject: [PATCH 0199/1113] staging: bcm2835_codec: Clean up logging on +Subject: [PATCH 0199/1148] staging: bcm2835_codec: Clean up logging on unloading the driver The log line was missing a closing \n, so wasn't added to the @@ -318395,13 +318395,13 @@ index ad555ceb8f63..837fbec5ab4f 100644 video_unregister_device(&dev->vfd); v4l2_device_unregister(&dev->v4l2_dev); -- -2.18.2 +2.18.4 -From b22e69b0095250a1cda174611de4dace04c05345 Mon Sep 17 00:00:00 2001 +From 90d241f9971dc6c95ecd2b3af33694f1d3200edb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 20 Mar 2019 10:06:51 +0000 -Subject: [PATCH 0200/1113] staging: bcm2835-codec: Refactor default resolution +Subject: [PATCH 0200/1148] staging: bcm2835-codec: Refactor default resolution code The default resolution code was different for each role @@ -318555,13 +318555,13 @@ index 837fbec5ab4f..4b67c9ea73e1 100644 ctx->colorspace = V4L2_COLORSPACE_REC709; ctx->bitrate = 10 * 1000 * 1000; -- -2.18.2 +2.18.4 -From 220ade11ad49c2dd112c760147f4dd980787204f Mon Sep 17 00:00:00 2001 +From e88efdca0ce4302d5b00073a50c7ba207345bd66 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 14:30:24 +0100 -Subject: [PATCH 0201/1113] staging: bcm2835-codec: Correct port width calc for +Subject: [PATCH 0201/1148] staging: bcm2835-codec: Correct port width calc for truncation The calculation converting from V4L2 bytesperline to MMAL @@ -318590,13 +318590,13 @@ index 4b67c9ea73e1..97b1f2b953ec 100644 port->es.video.crop.width = q_data->crop_width; port->es.video.crop.height = q_data->crop_height; -- -2.18.2 +2.18.4 -From 617a388c7eb08a6a379dcf19a7115cb8b614e08f Mon Sep 17 00:00:00 2001 +From e8b1314f95ce03b336ba8113eee3dea098a8a0bb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 14:32:21 +0100 -Subject: [PATCH 0202/1113] staging: bcm2835-codec: Remove height padding for +Subject: [PATCH 0202/1148] staging: bcm2835-codec: Remove height padding for ISP role The ISP has no need for heights to be a multiple of macroblock @@ -318657,13 +318657,13 @@ index 97b1f2b953ec..22588f78287e 100644 static int vidioc_s_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f, -- -2.18.2 +2.18.4 -From b7dfe31c37a8952400a8397cfcf09ece5933c09c Mon Sep 17 00:00:00 2001 +From 7eeb525432706e589f2aaab49db764d63216026c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 May 2019 13:27:23 +0100 -Subject: [PATCH 0203/1113] staging: mmal-vchiq: Free the event context for +Subject: [PATCH 0203/1148] staging: mmal-vchiq: Free the event context for control ports vchiq_mmal_component_init calls init_event_context for the @@ -318691,13 +318691,13 @@ index 2018c28daf68..4d9d7beb9144 100644 return ret; -- -2.18.2 +2.18.4 -From 9e58121df876b1642eb87bf3706aadf5b98224af Mon Sep 17 00:00:00 2001 +From 68a396a76d61deeca09321d6bb0b852e76cfec0e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 15:50:01 +0100 -Subject: [PATCH 0204/1113] staging: mmal-vchiq: Fix memory leak in error path +Subject: [PATCH 0204/1148] staging: mmal-vchiq: Fix memory leak in error path On error, vchiq_mmal_component_init could leave the event context allocated for ports. @@ -318773,13 +318773,13 @@ index 4d9d7beb9144..61a3593cdcfc 100644 mutex_unlock(&instance->vchiq_mutex); -- -2.18.2 +2.18.4 -From 0453e25c4136a7fec4433913fe54cadf6369cbce Mon Sep 17 00:00:00 2001 +From 414f3185857eb635024d850a0e30aefdb4167492 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 22 May 2019 09:05:40 +0200 -Subject: [PATCH 0205/1113] Bluetooth: Check key sizes only when Secure Simple +Subject: [PATCH 0205/1148] Bluetooth: Check key sizes only when Secure Simple Pairing is enabled The encryption is only mandatory to be enforced when both sides are using @@ -318798,11 +318798,11 @@ Cc: stable@vger.kernel.org 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c -index 87691404d0c6..5c8a800d7d6f 100644 +index ee57fa20bac3..c58c4d577f29 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c -@@ -1285,8 +1285,13 @@ int hci_conn_check_link_mode(struct hci_conn *conn) - return 0; +@@ -1302,8 +1302,13 @@ int hci_conn_check_link_mode(struct hci_conn *conn) + return 0; } - if (hci_conn_ssp_enabled(conn) && @@ -318818,13 +318818,13 @@ index 87691404d0c6..5c8a800d7d6f 100644 return 1; -- -2.18.2 +2.18.4 -From b84f373134518b3a9eecc3178a8de89c7e8e1353 Mon Sep 17 00:00:00 2001 +From be5a46565dd5222409c04b35c937cdd152004eec Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2019 14:11:58 +0100 -Subject: [PATCH 0206/1113] staging: bcm2835-codec: Convert V4L2 nsec +Subject: [PATCH 0206/1148] staging: bcm2835-codec: Convert V4L2 nsec timestamps to MMAL usec V4L2 uses nsecs, whilst MMAL uses usecs, but the code wasn't converting @@ -318870,13 +318870,13 @@ index 22588f78287e..5c7fc39cd921 100644 } -- -2.18.2 +2.18.4 -From eb5e1f322a3d5e3cb73b23a1952bfd7d4c4489d6 Mon Sep 17 00:00:00 2001 +From beeb9ef81a0cb16f9aa4df0b9ff83a1d1e666438 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2019 14:13:11 +0100 -Subject: [PATCH 0207/1113] staging: bcm2835-codec: Add support for setting +Subject: [PATCH 0207/1148] staging: bcm2835-codec: Add support for setting S_PARM and G_PARM Video encode can use the frame rate for rate control calculations, @@ -318994,13 +318994,13 @@ index 5c7fc39cd921..708f76b7aa92 100644 break; default: -- -2.18.2 +2.18.4 -From b724ede5448ed25ee4be2987de97cf89151c7aa2 Mon Sep 17 00:00:00 2001 +From 021a17fccbc1033ae2ad5445c5fcc8b361ab133f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Jun 2019 17:15:05 +0100 -Subject: [PATCH 0208/1113] w1: w1-gpio: Make GPIO an output for strong pullup +Subject: [PATCH 0208/1148] 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 @@ -319027,13 +319027,13 @@ index d4632aace402..4832cd8c2596 100644 /* * This will simply set the line as input since we are doing -- -2.18.2 +2.18.4 -From 7c985505c7ea5f47ffcf41a31226d02e1fed5ecb Mon Sep 17 00:00:00 2001 +From 85ef66939bbd474454cd553386465e22a5b21fa1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 Feb 2019 08:49:39 +0000 -Subject: [PATCH 0209/1113] arm: bcm2835: Fix FIQ early ioremap +Subject: [PATCH 0209/1148] arm: bcm2835: Fix FIQ early ioremap The ioremapping creates mappings within the vmalloc area. The equivalent early function, create_mapping, now checks that the @@ -319106,13 +319106,13 @@ index 9b6c921106b5..9bd9842da59f 100644 /* Now search for bcm2708-usb node in device tree */ of_scan_flat_dt(bcm2835_map_usb, &p2b_offset); -- -2.18.2 +2.18.4 -From 70bd78d4cfe5f5aca2790b3cbed986c6823511e4 Mon Sep 17 00:00:00 2001 +From 92f318947e684259a7304f0c2bac71239c272f65 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 14 Mar 2019 10:16:02 +0000 -Subject: [PATCH 0210/1113] Fix copy_from_user if BCM2835_FAST_MEMCPY=n +Subject: [PATCH 0210/1148] 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 @@ -319151,13 +319151,13 @@ index 296c2985ac17..ab150e8281f3 100644 } -- -2.18.2 +2.18.4 -From c87d314151fbef82b638f90e4f5c04aca3468784 Mon Sep 17 00:00:00 2001 +From 4c3ef122d45045ffd1de5173890567f488c2f3f3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0211/1113] PCI: brcmstb: Add Broadcom STB PCIe host controller +Subject: [PATCH 0211/1148] PCI: brcmstb: Add Broadcom STB PCIe host controller driver This commit adds the basic Broadcom STB PCIe controller. Missing is @@ -320352,13 +320352,13 @@ index 000000000000..d92290679067 + +#endif /* __MEMORY_API_H */ -- -2.18.2 +2.18.4 -From 3839a55a2b171cc8ced74d2d74da39a162f12889 Mon Sep 17 00:00:00 2001 +From a9cb137a2fab3ece6cb594ab3b47899280f8fc3e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0212/1113] PCI: brcmstb: Add dma-range mapping for inbound +Subject: [PATCH 0212/1148] PCI: brcmstb: Add dma-range mapping for inbound traffic The Broadcom STB PCIe host controller is intimately related to the @@ -320927,13 +320927,13 @@ index babef9191e88..27bcf83c99d7 100644 pcie->reg_offsets = data->offsets; pcie->reg_field_info = data->reg_field_info; -- -2.18.2 +2.18.4 -From 2e21b3525dff9aca48fcf953429bfa3127205d4f Mon Sep 17 00:00:00 2001 +From 3b7c58b6f301daa9f9f957f98baf735f0fb7c0f4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0213/1113] PCI: brcmstb: Add MSI capability +Subject: [PATCH 0213/1148] 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 @@ -321476,13 +321476,13 @@ index 27bcf83c99d7..b028d4be81a2 100644 _brcm_pcie_remove(pcie); return ret; -- -2.18.2 +2.18.4 -From 8251de2669492bb53f167f4cd5ada761b26b5932 Mon Sep 17 00:00:00 2001 +From 8ea51b34e6f34832fc5bd854bf36a18ca242a488 Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 15 Jan 2018 18:28:39 -0500 -Subject: [PATCH 0214/1113] dt-bindings: pci: Add DT docs for Brcmstb PCIe +Subject: [PATCH 0214/1148] dt-bindings: pci: Add DT docs for Brcmstb PCIe device The DT bindings description of the Brcmstb PCIe device is described. This @@ -321561,13 +321561,13 @@ index 000000000000..a1a9ad5e70ca + linux,pci-domain = <0>; + }; -- -2.18.2 +2.18.4 -From fd00eeba3e3cb278c8a4cba924ec1e976ca5b109 Mon Sep 17 00:00:00 2001 +From c8ed0765e4d43ac395c04cfed17486c7aeedcb16 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0215/1113] pcie-brcmstb: Changes for BCM2711 +Subject: [PATCH 0215/1148] pcie-brcmstb: Changes for BCM2711 The initial brcmstb PCIe driver - originally taken from the V3(?) patch set - has been modified significantly for the BCM2711. @@ -323010,13 +323010,13 @@ index 000000000000..254783d1065f +EXPORT_SYMBOL_GPL(brcmstb_memory_memc_size); + -- -2.18.2 +2.18.4 -From a32c01c88fac52ce7b9972bd8f9a15d6171b44c9 Mon Sep 17 00:00:00 2001 +From c4f453f209a52a0f5a4c2cfac416c90dc27000d2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 May 2019 15:47:42 +0100 -Subject: [PATCH 0216/1113] arm: bcm2835: DMA can only address 1GB +Subject: [PATCH 0216/1148] 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. @@ -323041,13 +323041,13 @@ index 9bd9842da59f..7d59a9364175 100644 .init_machine = bcm2835_init, .dt_compat = bcm2835_compat, -- -2.18.2 +2.18.4 -From 2a5437bcec234038bddc36facb56fdbdf60d1311 Mon Sep 17 00:00:00 2001 +From 5ebe017112dbc581fe66d38c8be086ce3ad32705 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Sep 2018 16:24:05 +0100 -Subject: [PATCH 0217/1113] mmc: sdhci: Mask "spurious" interrupts +Subject: [PATCH 0217/1148] mmc: sdhci: Mask "spurious" interrupts Add a filter for "spurious" Transfer Complete interrupts, attempting to make it as specific as possible: @@ -323076,13 +323076,13 @@ index 136f9737713d..07af68d5afa0 100644 sdhci_cmd_irq(host, intmask & SDHCI_INT_CMD_MASK, &intmask); -- -2.18.2 +2.18.4 -From f16e84cb1abb1ec18ccf5f7e53e8a6708b0005a0 Mon Sep 17 00:00:00 2001 +From 98a764f3c001203361df96949f189b01968200cc Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 4 May 2019 17:06:15 +0200 -Subject: [PATCH 0218/1113] hwrng: iproc-rng200: Add BCM2838 support +Subject: [PATCH 0218/1148] 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. @@ -323242,13 +323242,13 @@ index 92be1c0ab99f..f971a4cb8951 100644 }; MODULE_DEVICE_TABLE(of, iproc_rng200_of_match); -- -2.18.2 +2.18.4 -From 1f6000f9ae24f6cac232f18d2a43f062eb0eea35 Mon Sep 17 00:00:00 2001 +From ee68a4b1efdff08cee5710950268139c9fcc91b8 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 18 May 2019 12:26:11 +0200 -Subject: [PATCH 0219/1113] thermal: brcmstb_thermal: Add BCM2838 support +Subject: [PATCH 0219/1148] 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 ). @@ -323402,13 +323402,13 @@ index 680f1a070606..7a7c6ad7b8a0 100644 ret = PTR_ERR(thermal); dev_err(&pdev->dev, "could not register sensor: %d\n", ret); -- -2.18.2 +2.18.4 -From 398207234d66bad89f7bf82580d041123172a94e Mon Sep 17 00:00:00 2001 +From 55843f68c7b4a44668d5afebaaaed2b2c43d1b86 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 1 Nov 2018 17:31:37 +0000 -Subject: [PATCH 0220/1113] vchiq: Add 36-bit address support +Subject: [PATCH 0220/1148] 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 @@ -323608,13 +323608,13 @@ index b424323e9613..5448918f0f36 100644 }; -- -2.18.2 +2.18.4 -From 950658d06a81aa3dd987a9d17704152413832b62 Mon Sep 17 00:00:00 2001 +From fb33af8ea86bf92db4ee2e1938a9d983e3837dcd Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 30 Apr 2019 19:15:30 +0100 -Subject: [PATCH 0221/1113] bcm2835-pcm.c: Support multichannel audio +Subject: [PATCH 0221/1148] bcm2835-pcm.c: Support multichannel audio --- .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 17 +++++++++-------- @@ -323660,13 +323660,13 @@ index 826016c3431a..e4603ba742e4 100644 .periods_max = 128, }; -- -2.18.2 +2.18.4 -From 1669871937368607e6ff48189f0b72d91184f2f1 Mon Sep 17 00:00:00 2001 +From 9b356398e60e795a7c4a34fcf767adc603d6435b Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 12 Sep 2018 14:44:53 +0100 -Subject: [PATCH 0222/1113] bcmgenet: constrain max DMA burst length +Subject: [PATCH 0222/1148] bcmgenet: constrain max DMA burst length --- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +- @@ -323686,13 +323686,13 @@ index 5b7c2f9241d0..e59f53c582ca 100644 /* misc. configuration */ #define CLEAR_ALL_HFB 0xFF -- -2.18.2 +2.18.4 -From 679338ad5db415d3c4e74d048f331c03e21d4aca Mon Sep 17 00:00:00 2001 +From ee9a0aed388b0a9090234f8985d449697f164805 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 27 Mar 2019 13:45:46 +0000 -Subject: [PATCH 0223/1113] bcmgenet: Better coalescing parameter defaults +Subject: [PATCH 0223/1148] bcmgenet: Better coalescing parameter defaults Set defaults for TX and RX packet coalescing to be equivalent to: @@ -323735,13 +323735,13 @@ index 03f82786c0b9..88315e542214 100644 /* libphy will determine the link state */ netif_carrier_off(dev); -- -2.18.2 +2.18.4 -From e6cb9fc5274993dcd0606f33dfe75fb1d78231af Mon Sep 17 00:00:00 2001 +From ea4bbd1c60bffc4074fc380622f1817c2421ea03 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:17:59 +0100 -Subject: [PATCH 0224/1113] net: genet: enable link energy detect powerdown for +Subject: [PATCH 0224/1148] net: genet: enable link energy detect powerdown for external PHYs There are several warts surrounding bcmgenet_mii_probe() as this @@ -323772,13 +323772,13 @@ index dbe18cdf6c1b..3ba733295718 100644 /* Initialize link state variables that bcmgenet_mii_setup() uses */ priv->old_link = -1; -- -2.18.2 +2.18.4 -From 387eae02e5fa86c74f6efeb4fd3e13cd459ccfc0 Mon Sep 17 00:00:00 2001 +From 10cbedbdde169aaf628e04d8fda3fb3d0cf4f0ab Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:00:41 +0100 -Subject: [PATCH 0225/1113] phy: broadcom: split out the BCM54213PE from the +Subject: [PATCH 0225/1148] phy: broadcom: split out the BCM54213PE from the BCM54210E IDs The last nibble is a revision ID, and the 54213pe is a later rev @@ -323850,13 +323850,13 @@ index 6db2d9a6e503..bfb37218f435 100644 #define PHY_ID_BCM5461 0x002060c0 #define PHY_ID_BCM54612E 0x03625e60 -- -2.18.2 +2.18.4 -From 7d97b88dcf4d992ac6c212c395829b8dbb95fafb Mon Sep 17 00:00:00 2001 +From 49cc07e43893deb932615e78fb6c04e21feb3f09 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Fri, 17 May 2019 13:31:21 +0100 -Subject: [PATCH 0226/1113] phy: bcm54213pe: configure the LED outputs to be +Subject: [PATCH 0226/1148] phy: bcm54213pe: configure the LED outputs to be more user-friendly The default state was both LEDs indicating link speed. @@ -323922,13 +323922,13 @@ index bfb37218f435..d7ebafbb3221 100644 #define BCM54XX_SHD_APD 0x0a #define BCM_APD_CLR_MASK 0xFE9F /* clear bits 5, 6 & 8 */ -- -2.18.2 +2.18.4 -From 7e14ca0e755755c6586b75b4a7ae06ca42ff7775 Mon Sep 17 00:00:00 2001 +From 12bfb9627a3679d41d44e9b1c0585aeb6a188274 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 22 Mar 2019 09:47:14 +0000 -Subject: [PATCH 0227/1113] usb: xhci: Disable the XHCI 5 second timeout +Subject: [PATCH 0227/1148] 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 @@ -323957,13 +323957,13 @@ index bad154f446f8..0c8d87cada30 100644 return ret; -- -2.18.2 +2.18.4 -From 09953f17339287df73879e1d5d6471913d341880 Mon Sep 17 00:00:00 2001 +From 0ff86655375c32bec62c2b7555ce6ebc383724ee Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 23 May 2019 15:08:30 +0100 -Subject: [PATCH 0228/1113] usb: xhci: Show that the VIA VL805 supports LPM +Subject: [PATCH 0228/1148] usb: xhci: Show that the VIA VL805 supports LPM Signed-off-by: Phil Elwell --- @@ -323986,13 +323986,13 @@ index bbd616324faa..24003b1fcd26 100644 pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) xhci->quirks |= XHCI_BROKEN_STREAMS; -- -2.18.2 +2.18.4 -From f70641cdc17e952710158386f85ef30bfc0100eb Mon Sep 17 00:00:00 2001 +From db59992dc3ecccd7f2856a2517360d797dd210f2 Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Mon, 13 May 2019 11:05:27 +0000 -Subject: [PATCH 0229/1113] spi: bcm2835: enable shared interrupt support +Subject: [PATCH 0229/1148] spi: bcm2835: enable shared interrupt support Add shared interrupt support for this driver. @@ -324027,13 +324027,13 @@ index e5c5146e1d95..c2e7a2dbbcc7 100644 if (err) { dev_err(&pdev->dev, "could not request IRQ: %d\n", err); -- -2.18.2 +2.18.4 -From ad11a643e202a2bf5f5fb06ddd0beda9a1fec87e Mon Sep 17 00:00:00 2001 +From 100582929b995671d129d99fd60600905ce1888e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 23 Jan 2019 16:11:50 +0000 -Subject: [PATCH 0230/1113] clk-bcm2835: Don't wait for pllh lock +Subject: [PATCH 0230/1148] clk-bcm2835: Don't wait for pllh lock Signed-off-by: Phil Elwell --- @@ -324071,13 +324071,13 @@ index 74f30f1ed798..d68892b536c6 100644 cprman_write(cprman, data->a2w_ctrl_reg, -- -2.18.2 +2.18.4 -From 0f015b2753578f745d2de3a0f339b940e4db0c98 Mon Sep 17 00:00:00 2001 +From f3bfa6b076deab43e7446634f7749d81b570ea8c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 11 Jan 2019 17:31:07 -0800 -Subject: [PATCH 0231/1113] soc: bcm: bcm2835-pm: Add support for 2711. +Subject: [PATCH 0231/1148] 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 @@ -324183,13 +324183,13 @@ index ed37dc40e82a..b2d157091e12 100644 #endif /* BCM2835_MFD_PM_H */ -- -2.18.2 +2.18.4 -From 2b083456220295921994d0b7ec7fbf988e30b801 Mon Sep 17 00:00:00 2001 +From ddb85300cecd52e7842fad1d5bbf5fb45a9853a1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Sep 2018 11:50:25 +0100 -Subject: [PATCH 0232/1113] config: Permit LPAE and PCIE_BRCMSTB on BCM2835 +Subject: [PATCH 0232/1148] config: Permit LPAE and PCIE_BRCMSTB on BCM2835 --- arch/arm/mach-bcm/Kconfig | 4 ++++ @@ -324235,13 +324235,13 @@ index e57bbd0ec9a7..650b3b56153c 100644 help Adds support for Broadcom Settop Box PCIe host controller. -- -2.18.2 +2.18.4 -From 9cad5de85285b60353e34c5021b6981194180bc1 Mon Sep 17 00:00:00 2001 +From 04b43ec09f42b914b57cc121d27986bfaac2f0f6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:11:05 -0700 -Subject: [PATCH 0233/1113] clk: bcm2835: Add support for setting leaf clock +Subject: [PATCH 0233/1148] 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 @@ -324294,13 +324294,13 @@ index d68892b536c6..aded6d01d941 100644 /* If the clock wasn't actually enabled at boot, it's not * critical. -- -2.18.2 +2.18.4 -From 277b7bb0caf4c7c4a73433279256745a092ae807 Mon Sep 17 00:00:00 2001 +From 9a80a670f34d2937d15638939e91fd8871c3c582 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:24:04 -0700 -Subject: [PATCH 0234/1113] clk: bcm2835: Allow reparenting leaf clocks while +Subject: [PATCH 0234/1148] clk: bcm2835: Allow reparenting leaf clocks while they're running. This falls under the same "we can reprogram glitch-free as long as we @@ -324371,13 +324371,13 @@ index aded6d01d941..43dd58f5468c 100644 /* If the clock wasn't actually enabled at boot, it's not * critical. -- -2.18.2 +2.18.4 -From 916c9f3d4afaa91223cee7c8f2ac3401d4fb4ec3 Mon Sep 17 00:00:00 2001 +From 181709952fbd4cac974f49f0bedb085104f4057a Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 10:55:00 +0100 -Subject: [PATCH 0235/1113] usb: add plumbing for updating interrupt endpoint +Subject: [PATCH 0235/1148] usb: add plumbing for updating interrupt endpoint interval state xHCI caches device and endpoint data after the interface is configured, @@ -324423,7 +324423,7 @@ index d0f45600b669..4d6cff941445 100644 * endpoint state is gone from hardware. usb_hcd_flush_endpoint() must * have been called previously. Use for set_configuration, set_interface, diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c -index 266c69dc34ab..5c52dd5a7785 100644 +index 61d9e2a1a4e5..9940558a0c03 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -1120,6 +1120,21 @@ static void remove_intf_ep_devs(struct usb_interface *intf) @@ -324487,13 +324487,13 @@ index 712b2a603645..879b59e4f013 100644 struct usb_host_endpoint *ep); extern void usb_hcd_reset_endpoint(struct usb_device *udev, -- -2.18.2 +2.18.4 -From 5a13a1da69cfc0fff0b459aaec02be3d54f3447a Mon Sep 17 00:00:00 2001 +From 1de13aa6a53bdbb3cef5cc4fed59f5296903940c Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:33:39 +0100 -Subject: [PATCH 0236/1113] xhci: implement xhci_fixup_endpoint for interval +Subject: [PATCH 0236/1148] xhci: implement xhci_fixup_endpoint for interval adjustments Must be called in a non-atomic context, after the endpoint @@ -324622,13 +324622,13 @@ index 0c8d87cada30..fad5206fd307 100644 .enable_device = xhci_enable_device, .update_hub_device = xhci_update_hub_device, -- -2.18.2 +2.18.4 -From a2b8ed29124ddba630927d459cadd7a9bc57395c Mon Sep 17 00:00:00 2001 +From ecd4b70742ca98897323fc275bfb89b8f6b7b40e Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:42:03 +0100 -Subject: [PATCH 0237/1113] usbhid: call usb_fixup_endpoint after mangling +Subject: [PATCH 0237/1148] usbhid: call usb_fixup_endpoint after mangling intervals Lets the mousepoll override mechanism work with xhci. @@ -324651,13 +324651,13 @@ index ce8ef6930795..4b73a15fdfae 100644 ret = -ENOMEM; if (usb_endpoint_dir_in(endpoint)) { -- -2.18.2 +2.18.4 -From d7f34e550e8534733e78dcf62148c14a09f15305 Mon Sep 17 00:00:00 2001 +From f0460332fd7e206be26274f3065fdc0773023aa2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 11 Jun 2019 17:38:28 +0100 -Subject: [PATCH 0238/1113] arm: bcm2835: Add bcm2838 compatible string. +Subject: [PATCH 0238/1148] arm: bcm2835: Add bcm2838 compatible string. Signed-off-by: Phil Elwell --- @@ -324677,13 +324677,13 @@ index 7d59a9364175..282a023027fc 100644 NULL }; -- -2.18.2 +2.18.4 -From 0c4f1a72088702b8ed6759e827486e46b025a1a8 Mon Sep 17 00:00:00 2001 +From 8f2175573b0d841c6f89836cabc6b6dfd4696789 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 4 Mar 2019 11:59:34 -0800 -Subject: [PATCH 0239/1113] drm/vc4: Fix oops at boot with firmwarekms on 4.19. +Subject: [PATCH 0239/1148] drm/vc4: Fix oops at boot with firmwarekms on 4.19. Signed-off-by: Eric Anholt --- @@ -324705,13 +324705,13 @@ index 57124fe94247..92aafec3d57a 100644 HVS_WRITE(SCALER_OLEDCOEF2, VC4_SET_FIELD(vc4_ctm_s31_32_to_s0_9(ctm->matrix[0]), -- -2.18.2 +2.18.4 -From 77392015d6064f3d792a51751ba3331241a606c9 Mon Sep 17 00:00:00 2001 +From 620992ab325e0d35e243e61aa0028f364280e5fb Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 4 Oct 2018 17:22:43 -0700 -Subject: [PATCH 0240/1113] drm/v3d: Add support for 2711. +Subject: [PATCH 0240/1148] drm/v3d: Add support for 2711. Signed-off-by: Eric Anholt --- @@ -324731,13 +324731,13 @@ index 3506ae2723ae..cb60018f799e 100644 }; MODULE_DEVICE_TABLE(of, v3d_of_match); -- -2.18.2 +2.18.4 -From 8786cbe442c0996b891712a19fdda6b494e9b11d Mon Sep 17 00:00:00 2001 +From 89b886047bea42d3726199793d877bb8deabce06 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 12:35:43 -0800 -Subject: [PATCH 0241/1113] drm/v3d: Skip MMU flush if the device is currently +Subject: [PATCH 0241/1148] 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 @@ -324789,13 +324789,13 @@ index 395e81d97163..6cc67cab320e 100644 } -- -2.18.2 +2.18.4 -From f8f227e6160157d2ee53e69249592607ac69e299 Mon Sep 17 00:00:00 2001 +From 3abb85260a965745072276a3e8cefcdb6de89959 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 14:47:57 -0800 -Subject: [PATCH 0242/1113] drm/v3d: Hook up the runtime PM ops. +Subject: [PATCH 0242/1148] 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 @@ -324829,13 +324829,13 @@ index cb60018f799e..d225152e7e36 100644 }; -- -2.18.2 +2.18.4 -From d717929df315d35749ca771662da28f6873f7a6d Mon Sep 17 00:00:00 2001 +From 216d7e18e710e18fc94a6582a2bf5ebbb17d8d3d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 28 Mar 2019 11:58:51 -0700 -Subject: [PATCH 0243/1113] drm/vc4: Fix synchronization firmwarekms against GL +Subject: [PATCH 0243/1148] drm/vc4: Fix synchronization firmwarekms against GL rendering. We would present the framebuffer immediately without waiting for @@ -324879,13 +324879,13 @@ index 85e273665836..ee0e6afa211b 100644 .atomic_check = vc4_plane_atomic_check, .atomic_update = vc4_cursor_plane_atomic_update, -- -2.18.2 +2.18.4 -From d9bb2ca410a99c400971166eaf271d0a5b0696f6 Mon Sep 17 00:00:00 2001 +From ed5c4d694a09282bfd88bb845bee0e62466f2a79 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 18 Mar 2019 16:38:32 -0700 -Subject: [PATCH 0244/1113] drm/vc4: Expose the format modifiers for firmware +Subject: [PATCH 0244/1148] drm/vc4: Expose the format modifiers for firmware kms. This should technically not expose VC4_T_TILED on pi4. However, if we @@ -324965,13 +324965,13 @@ index ee0e6afa211b..93bf71f98313 100644 if (type == DRM_PLANE_TYPE_PRIMARY) { -- -2.18.2 +2.18.4 -From a4874f9f22b2e406c0a643e5d3e527c3652f247b Mon Sep 17 00:00:00 2001 +From 25e47644bd77e4f6c7e32530c321a59107356c76 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Apr 2019 13:29:00 -0700 -Subject: [PATCH 0245/1113] drm/vc4: Fix vblank timestamping for firmwarekms. +Subject: [PATCH 0245/1148] 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 @@ -325026,13 +325026,13 @@ index 93bf71f98313..eb5eb67b70f5 100644 if (!vc4_crtc) return -ENOMEM; -- -2.18.2 +2.18.4 -From 54acfaaebc626dd6669ba2eb7897489b7125e340 Mon Sep 17 00:00:00 2001 +From d2e2aa884ba8a61873a8c738c66165d985ecb896 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 26 Mar 2019 14:43:06 +0000 -Subject: [PATCH 0246/1113] gpu: vc4-fkms: Switch to the newer mailbox frame +Subject: [PATCH 0246/1148] gpu: vc4-fkms: Switch to the newer mailbox frame buffer API. The old mailbox FB API was ideally deprecated but still used by @@ -325211,13 +325211,13 @@ index eb5eb67b70f5..512036c82db0 100644 return plane; fail: -- -2.18.2 +2.18.4 -From fdfec7eeb4954e4360987a3a5f56c73769487f8e Mon Sep 17 00:00:00 2001 +From 1d10478808a79333a734d579ad6dbc9cb44b0735 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 27 Mar 2019 17:45:01 +0000 -Subject: [PATCH 0247/1113] drm: vc4: Add an overlay plane to vc4-firmware-kms +Subject: [PATCH 0247/1148] 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. @@ -326077,13 +326077,13 @@ index 9c6027fc25da..f0c15eefa3aa 100644 RPI_FIRMWARE_GET_DMA_CHANNELS = 0x00060001, }; -- -2.18.2 +2.18.4 -From dc00d237c026e1f78aee54b645d80fe933993439 Mon Sep 17 00:00:00 2001 +From b6e056f07b51ccfe407d74825d040ce49979a2c2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Apr 2019 15:20:05 +0100 -Subject: [PATCH 0248/1113] drm: vc4: Increase max screen size to 4096x4096. +Subject: [PATCH 0248/1148] drm: vc4: Increase max screen size to 4096x4096. We now should support 4k screens, therefore this limit needs to be increased. @@ -326109,13 +326109,13 @@ index cd3720969442..9e20e1ac77f8 100644 dev->mode_config.preferred_depth = 24; dev->mode_config.async_page_flip = true; -- -2.18.2 +2.18.4 -From 217ac84dacb5a2e1412f748e5ac00ba0ac6e473f Mon Sep 17 00:00:00 2001 +From ab369bd2201909373edf333af8c7f2f2865110e7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Apr 2019 17:15:45 +0100 -Subject: [PATCH 0249/1113] drm: vc4: Add support for multiple displays to fkms +Subject: [PATCH 0249/1148] 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 @@ -326397,13 +326397,13 @@ index 54bb885a86dc..d8e278a0b789 100644 platform_set_drvdata(pdev, NULL); } -- -2.18.2 +2.18.4 -From 19a33b11b17ddaa025f28d19019574558917212b Mon Sep 17 00:00:00 2001 +From e4ae8731f70ab0d39814859f8bd8341f70f0f885 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:21:56 +0100 -Subject: [PATCH 0250/1113] drm: vc4: Fix build warning +Subject: [PATCH 0250/1148] drm: vc4: Fix build warning Signed-off-by: Dave Stevenson --- @@ -326424,13 +326424,13 @@ index d8e278a0b789..b952f27e4168 100644 vc4_fkms_encoder_destroy(vc4_crtc->encoder); list_for_each_entry_safe(destroy_plane, temp, -- -2.18.2 +2.18.4 -From abfa703fe23f3b1c99c9a89af9fdd8ec0a188499 Mon Sep 17 00:00:00 2001 +From 43d9b23d76e2c064bb67163dedb9eeabb7fbc1f5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:23:15 +0100 -Subject: [PATCH 0251/1113] drm: vc4: Select display to blank during +Subject: [PATCH 0251/1148] drm: vc4: Select display to blank during initialisation Otherwise the rainbow splash screen remained in the display list @@ -326484,13 +326484,13 @@ index b952f27e4168..099124575435 100644 primary_plane = vc4_fkms_plane_init(drm, DRM_PLANE_TYPE_PRIMARY, display_ref, -- -2.18.2 +2.18.4 -From 2121ef3f05b06bf3dd027910c8b5af314982f7bb Mon Sep 17 00:00:00 2001 +From beaa5797d0b48d4cc22a3223d568c494a979e9da Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:24:20 +0100 -Subject: [PATCH 0252/1113] drm: vc4: Remove now unused structure. +Subject: [PATCH 0252/1148] drm: vc4: Remove now unused structure. Cleaning up structure that was unused after fbb59a2 drm: vc4: Add an overlay plane to vc4-firmware-kms @@ -326531,13 +326531,13 @@ index 099124575435..1155680fdfc6 100644 struct rpi_firmware_property_tag_header tag1; u32 display; -- -2.18.2 +2.18.4 -From 4b7d4c3785ff3ac7801334f4c350607db108e597 Mon Sep 17 00:00:00 2001 +From 645e8c8fd8284cfab1ee15d5a999b9356e3ad901 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 12:37:28 +0100 -Subject: [PATCH 0253/1113] drm: vc4: Query the display ID for each display in +Subject: [PATCH 0253/1148] drm: vc4: Query the display ID for each display in FKMS Replace the hard coded list of display IDs for a mailbox call @@ -326597,13 +326597,13 @@ index f0c15eefa3aa..10f5dc53fd34 100644 RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS = 0x00040013, RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_SETTINGS = 0x00040014, -- -2.18.2 +2.18.4 -From ae979a32ba03e835c1ef93b2cbeb87c5ca0cef4e Mon Sep 17 00:00:00 2001 +From 73c65752dd5b897dbdf001ceea134a3bfea410f7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 14:00:07 +0100 -Subject: [PATCH 0254/1113] drm/vc4: Set the display number when querying the +Subject: [PATCH 0254/1148] drm/vc4: Set the display number when querying the display resolution Without this the two displays got set to the same resolution. @@ -326706,13 +326706,13 @@ index 38b09f5ad2b2..b15c001621d8 100644 ret = PTR_ERR(vc4_crtc->connector); goto err_destroy_encoder; -- -2.18.2 +2.18.4 -From 47f827d01e3650c4e1b1de2b3567ea37d4c82ad0 Mon Sep 17 00:00:00 2001 +From 2ad4776811f766eb135e74ae7cf39aa7e46c8d81 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 18:14:44 +0100 -Subject: [PATCH 0255/1113] drm: vc4: Need to call drm_crtc_vblank_[on|off] +Subject: [PATCH 0255/1148] 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 @@ -326766,13 +326766,13 @@ index b15c001621d8..b86c9d98df4d 100644 static const struct drm_crtc_funcs vc4_crtc_funcs = { -- -2.18.2 +2.18.4 -From 2d8c3078433ff44ff433eee6fa4e1a2f2add02b4 Mon Sep 17 00:00:00 2001 +From 4eb043707e82a206b68585b3218b1c936a1065ba Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 17:19:51 +0100 -Subject: [PATCH 0256/1113] drm: vc4: Add support for H & V flips on each plane +Subject: [PATCH 0256/1148] drm: vc4: Add support for H & V flips on each plane for FKMS They are near zero cost options for the HVS, therefore they @@ -326858,13 +326858,13 @@ index b86c9d98df4d..bb98a8a71555 100644 /* * Default frame buffer setup is with FB on -127, and raspistill etc -- -2.18.2 +2.18.4 -From 8332a5dc9c7f851de2da30fc65e34d4289b09e5f Mon Sep 17 00:00:00 2001 +From 34742381f2782525f8fe191912967df7872cb7e9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:35:05 +0100 -Subject: [PATCH 0257/1113] drm: vc4: Remove unused vc4_fkms_cancel_page_flip +Subject: [PATCH 0257/1148] drm: vc4: Remove unused vc4_fkms_cancel_page_flip function "32a3dbe drm/vc4: Nuke preclose hook" removed vc4_cancel_page_flip, @@ -326922,13 +326922,13 @@ index bb98a8a71555..fe966ebb045a 100644 { .compatible = "raspberrypi,rpi-firmware-kms" }, {} -- -2.18.2 +2.18.4 -From 890c49bf9f48efe341ae1d6c266af95e1016cabd Mon Sep 17 00:00:00 2001 +From d591f41c0b630af9dc73d96526889acb9d973be8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:42:37 +0100 -Subject: [PATCH 0258/1113] drm: vc4: Iterate over all planes in +Subject: [PATCH 0258/1148] drm: vc4: Iterate over all planes in vc4_crtc_[dis|en]able Fixes a FIXME where the overlay plane wouldn't be restored. @@ -326985,13 +326985,13 @@ index fe966ebb045a..81afd7782f65 100644 static int vc4_crtc_atomic_check(struct drm_crtc *crtc, -- -2.18.2 +2.18.4 -From 5d97d7d9be7eb74f5833c8b1a62df5cdd7421fa1 Mon Sep 17 00:00:00 2001 +From 17ef872cba95b4995297db531ac6d33835eec6db Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:43:57 +0100 -Subject: [PATCH 0259/1113] drm: vc4: Bring fkms into line with kms in blocking +Subject: [PATCH 0259/1148] drm: vc4: Bring fkms into line with kms in blocking doublescan modes Implement vc4_crtc_mode_valid so that it blocks doublescan modes @@ -327038,13 +327038,13 @@ index 81afd7782f65..97ab24d0cbde 100644 static const struct of_device_id vc4_firmware_kms_dt_match[] = { -- -2.18.2 +2.18.4 -From 6f7910e757caffcca4c715f7c1db5ac995f8a15b Mon Sep 17 00:00:00 2001 +From 6be1fb3c270e7ece179aea8f5d6f821b688fe2d5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Apr 2019 18:45:00 +0100 -Subject: [PATCH 0260/1113] drm: vc4: Increase max_width/height to 7680. +Subject: [PATCH 0260/1148] 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 @@ -327071,13 +327071,13 @@ index 9e20e1ac77f8..8b4bec771a14 100644 dev->mode_config.preferred_depth = 24; dev->mode_config.async_page_flip = true; -- -2.18.2 +2.18.4 -From 5b07fd06deeae325915c3477a22ce4ec54fcfc2a Mon Sep 17 00:00:00 2001 +From 1067af97c4cbaf1832e4d0a77669af9edf039f0b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 18:23:41 +0100 -Subject: [PATCH 0261/1113] drm: vc4: FKMS reads the EDID from fw, and supports +Subject: [PATCH 0261/1148] drm: vc4: FKMS reads the EDID from fw, and supports mode setting This extends FKMS to read the EDID from the display, and support @@ -327636,13 +327636,13 @@ index 10f5dc53fd34..1a5dd091dfd9 100644 RPI_FIRMWARE_GET_COMMAND_LINE = 0x00050001, RPI_FIRMWARE_GET_DMA_CHANNELS = 0x00060001, -- -2.18.2 +2.18.4 -From 58b3d83eaa0985352167a88e69f0fc6dc49d03df Mon Sep 17 00:00:00 2001 +From 2ffcba6d7f3828d8c24c97bd25ba168b5331fa8d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 May 2019 13:58:03 +0100 -Subject: [PATCH 0262/1113] drm: vc4-firmware-kms: Remove incorrect overscan +Subject: [PATCH 0262/1148] drm: vc4-firmware-kms: Remove incorrect overscan support. The overscan support was required for the old mailbox API @@ -327697,13 +327697,13 @@ index e4b978ce85ef..71889e0e334a 100644 return 0; -- -2.18.2 +2.18.4 -From 7a1755686b19a56b209103c29087163cbbdaa44c Mon Sep 17 00:00:00 2001 +From e17181f337462f66a95231b922deef313c8c9e2f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 May 2019 12:13:34 +0100 -Subject: [PATCH 0263/1113] drm: vc4: Log flags in fkms mode set +Subject: [PATCH 0263/1148] 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. @@ -327734,13 +327734,13 @@ index 71889e0e334a..b18cb9d5e345 100644 mb.timings.video_id_code = frame.avi.video_code; -- -2.18.2 +2.18.4 -From d4bc3a4369170d0648c7e6fbb377391432bee4e0 Mon Sep 17 00:00:00 2001 +From 5255b2ba5a250650e0c7a943862246ac5044a8c6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 16 May 2019 17:49:42 +0100 -Subject: [PATCH 0264/1113] drm: vc4-firmware-kms: Fix DSI display support +Subject: [PATCH 0264/1148] drm: vc4-firmware-kms: Fix DSI display support The mode was incorrectly listed as interlaced, which was then rejected. @@ -327765,13 +327765,13 @@ index b18cb9d5e345..9fbdcd3538b3 100644 static int vc4_fkms_lcd_connector_get_modes(struct drm_connector *connector) -- -2.18.2 +2.18.4 -From 752c7c72825b175ce9f71447897dc62db741cc80 Mon Sep 17 00:00:00 2001 +From d9f4247ee9637e6253a69da224ca46e562a38d3d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 May 2019 11:50:00 +0100 -Subject: [PATCH 0265/1113] drm: vc4: Probe DPI/DSI timings from the firmware +Subject: [PATCH 0265/1148] 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. @@ -327911,13 +327911,13 @@ index 1a5dd091dfd9..ca1344c957ea 100644 RPI_FIRMWARE_GET_COMMAND_LINE = 0x00050001, -- -2.18.2 +2.18.4 -From 83eae63a942138319201b19ba0ef63e79dee1f67 Mon Sep 17 00:00:00 2001 +From 6ff4b5562a2304affbc9ea22d62c51c234657df4 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 28 May 2019 13:56:06 +0100 -Subject: [PATCH 0266/1113] drm: vc4: handle the case where there are no +Subject: [PATCH 0266/1148] drm: vc4: handle the case where there are no available displays It's reasonable for the firmware to return zero as the number of @@ -327984,13 +327984,13 @@ index 0b0a155bc3b5..04b929a6cb0f 100644 platform_set_drvdata(pdev, crtc_list); -- -2.18.2 +2.18.4 -From 07bd8a3ff48fd8eb747c9ca8b31d85bd1031187b Mon Sep 17 00:00:00 2001 +From 7b9565b3fa4a53fcebc7eb429792ed629a9b7ba2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 May 2019 17:59:01 +0100 -Subject: [PATCH 0267/1113] drm/vc4: Support the VEC in FKMS +Subject: [PATCH 0267/1148] drm/vc4: Support the VEC in FKMS Extends the DPI/DSI support to also report the VEC output which supports interlacing too. @@ -328052,13 +328052,13 @@ index 04b929a6cb0f..f1306752da3d 100644 drm_connector_attach_encoder(connector, encoder); -- -2.18.2 +2.18.4 -From 486a2ac0859d8fa983281ae2838c937effc752f6 Mon Sep 17 00:00:00 2001 +From a58456bef4e59995d69b39f7465bfba5e9f7cd16 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 May 2019 15:00:02 +0100 -Subject: [PATCH 0268/1113] drm: vc4: Fixup typo when setting HDMI aspect ratio +Subject: [PATCH 0268/1148] drm: vc4: Fixup typo when setting HDMI aspect ratio Assignment was to the wrong structure. @@ -328097,13 +328097,13 @@ index f1306752da3d..1081878ecfdd 100644 } -- -2.18.2 +2.18.4 -From 83b2200389601fc7bd4df805fcb9dc60cbd8d18d Mon Sep 17 00:00:00 2001 +From 39396eb5564fee138af6cb881ad8d994e9b7978b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 May 2019 15:44:11 +0100 -Subject: [PATCH 0269/1113] drm/vc4: Correct SAND support for FKMS. +Subject: [PATCH 0269/1148] 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 @@ -328143,13 +328143,13 @@ index 1081878ecfdd..3b9dc3e892bb 100644 }; int i; -- -2.18.2 +2.18.4 -From b7e5156beb03794e863f35e3d477f74d57a9ffa6 Mon Sep 17 00:00:00 2001 +From a8373a4c37137c7c2c8c00a3f87eb819fb50cba6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 May 2019 13:56:15 +0100 -Subject: [PATCH 0270/1113] drm/vc4: fkms to query the VPU for HDMI clock +Subject: [PATCH 0270/1148] drm/vc4: fkms to query the VPU for HDMI clock limits The VPU has configured clocks for 4k (or not) via config.txt, @@ -328288,13 +328288,13 @@ index ca1344c957ea..102c2e5dd2f2 100644 RPI_FIRMWARE_GET_COMMAND_LINE = 0x00050001, RPI_FIRMWARE_GET_DMA_CHANNELS = 0x00060001, -- -2.18.2 +2.18.4 -From c7025d4b1a01bec11f3745a3e5791b0f7f72944f Mon Sep 17 00:00:00 2001 +From ca6a86d92d90e74ec370f8df8ba6a4651021f04a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 May 2019 15:55:15 +0100 -Subject: [PATCH 0271/1113] drm/vc4: Max resolution of 7680 is conditional on +Subject: [PATCH 0271/1148] drm/vc4: Max resolution of 7680 is conditional on being Pi4 The max resolution had been increased from 2048 to 7680 for all @@ -328340,13 +328340,13 @@ index 8b4bec771a14..7e31e2ca726c 100644 dev->mode_config.preferred_depth = 24; dev->mode_config.async_page_flip = true; -- -2.18.2 +2.18.4 -From 8ca6a10b9a4588d74d398c9f387414f6f4a066a4 Mon Sep 17 00:00:00 2001 +From ed5cefb49161593854d3abea3fa4f1cf6f11f237 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 7 Jun 2019 11:31:21 +0100 -Subject: [PATCH 0272/1113] drm/vc4: Fix T-format modifiers in FKMS. +Subject: [PATCH 0272/1148] drm/vc4: Fix T-format modifiers in FKMS. The wrong vc_image formats were being checked for in the switch statement. Correct these. @@ -328374,13 +328374,13 @@ index cb2f24dece9f..339c8768f446 100644 break; case VC_IMAGE_RGB565: -- -2.18.2 +2.18.4 -From 174dee262bbe9170354027766dba5d420f7afff8 Mon Sep 17 00:00:00 2001 +From 312aab76434eb0d4464a984c31d976f0b26e88a4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 10 Jun 2019 16:32:51 +0100 -Subject: [PATCH 0273/1113] drm/vc4: Remove 340MHz clock limit from FKMS now +Subject: [PATCH 0273/1148] drm/vc4: Remove 340MHz clock limit from FKMS now scrambling issues resolved Firmware TMDS scrambling is now being correctly configured, so @@ -328409,13 +328409,13 @@ index 339c8768f446..fdbd1d1cf796 100644 } -- -2.18.2 +2.18.4 -From 198333487ad96b326bcf89101128dae87ebfd474 Mon Sep 17 00:00:00 2001 +From 829a69e4a380a0bbe62b4eb0e275a46f45d58fd5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 4 Jun 2019 12:14:30 +0100 -Subject: [PATCH 0274/1113] drm: vc4: Add status of which display is updated +Subject: [PATCH 0274/1148] drm: vc4: Add status of which display is updated through vblank Previously multiple displays were slaved off the same SMI @@ -328500,13 +328500,13 @@ index fdbd1d1cf796..8ca9cb202f5e 100644 return ret; -- -2.18.2 +2.18.4 -From ead54f9c64dde8fa17a30d0e431df384989b6b7d Mon Sep 17 00:00:00 2001 +From b52699948639fd9c7ca2a79b889e9b9b631d9912 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 12 Jun 2019 17:13:21 +0100 -Subject: [PATCH 0275/1113] drm/vc4: In FKMS look at the modifiers correctly +Subject: [PATCH 0275/1148] drm/vc4: In FKMS look at the modifiers correctly for SAND Incorrect masking was used in the switch for the modifier, @@ -328542,13 +328542,13 @@ index 8ca9cb202f5e..4fd2629e430a 100644 break; } -- -2.18.2 +2.18.4 -From 7c5bae93619f18a48c857777bbe1d4b6bf6a6e3d Mon Sep 17 00:00:00 2001 +From 74aa1fe5de967537e0da7af97536fd62f12c66eb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Jun 2019 21:37:45 +0100 -Subject: [PATCH 0276/1113] drm/vc4: Limit fkms to modes <= 85Hz +Subject: [PATCH 0276/1148] drm/vc4: Limit fkms to modes <= 85Hz Selecting 1080p100 and 120 has very limited gain, but don't want to block VGA85 and similar. @@ -328574,13 +328574,13 @@ index 4fd2629e430a..b97798c82371 100644 * firmware */ -- -2.18.2 +2.18.4 -From f5400b8f7fd445d2189a324c3360446b1e1e653b Mon Sep 17 00:00:00 2001 +From 85c8a773b32efb522197ed6285ea8548e6607d4f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 19 Jul 2019 14:29:28 +0100 -Subject: [PATCH 0277/1113] drm/vc4: Ignore HVS unless initialised +Subject: [PATCH 0277/1148] 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 @@ -328625,13 +328625,13 @@ index 7e31e2ca726c..1b921e114c03 100644 continue; -- -2.18.2 +2.18.4 -From 5191eeca7961d91da2557948cc4447f4518f05bc Mon Sep 17 00:00:00 2001 +From 2dfd324d2daa06d29e3e65db2352cbadead04dc4 Mon Sep 17 00:00:00 2001 From: Chris Miller Date: Wed, 26 Jun 2019 10:40:30 +0100 -Subject: [PATCH 0278/1113] drm: vc4_dsi: Fix DMA channel and memory leak in +Subject: [PATCH 0278/1148] drm: vc4_dsi: Fix DMA channel and memory leak in vc4 (#3012) Signed-off-by: Chris G Miller @@ -328766,13 +328766,13 @@ index c78fa8144776..3448b314d361 100644 vc4->dsi1 = NULL; } -- -2.18.2 +2.18.4 -From 265d6244e3c62c57e6e1f5ba0c61d27061241cc8 Mon Sep 17 00:00:00 2001 +From ed949dd1d59d6f838d6db822b7caddb27981c97a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Jun 2019 02:29:40 +0100 -Subject: [PATCH 0279/1113] drm/vc4: Add support for color encoding on YUV +Subject: [PATCH 0279/1148] drm/vc4: Add support for color encoding on YUV planes Adds signalling for BT601/709/2020, and limited/full range @@ -328885,13 +328885,13 @@ index 669a70fdb891..0bdffe5dd1e9 100644 + VC_IMAGE_YUVINFO_CSC_REC_2020 = 9, +}; -- -2.18.2 +2.18.4 -From 38bb9031cd832f53b0ca5e8e92ab735080ef0da7 Mon Sep 17 00:00:00 2001 +From 77366fb0b3b5f0c279410e2fedc42713c0878e55 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jul 2019 13:13:39 +0100 -Subject: [PATCH 0280/1113] tty: amba-pl011: Make TX optimisation conditional +Subject: [PATCH 0280/1148] 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 @@ -328976,13 +328976,13 @@ index fb728d006503..46ec9073a00b 100644 if (pass_counter-- == 0) break; -- -2.18.2 +2.18.4 -From 0baba8cd661cc3d3c8c291d54a5a5ded40784f8d Mon Sep 17 00:00:00 2001 +From 7cb7febf0fd39b42cbbeebab5e4b4b6833f564d2 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 11 Jul 2019 17:55:43 +0100 -Subject: [PATCH 0281/1113] xhci: add quirk for host controllers that don't +Subject: [PATCH 0281/1148] 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 @@ -329076,13 +329076,13 @@ index c656b41b57b5..8a202d9b856d 100644 unsigned int num_active_eps; unsigned int limit_active_eps; -- -2.18.2 +2.18.4 -From 9065cba9c6bfbe226ecc0ced72ed4ed105f7673c Mon Sep 17 00:00:00 2001 +From cf2f660242ef60bb1edca73f520592774318f676 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 15:38:35 +0100 -Subject: [PATCH 0282/1113] i2c: bcm2835: Set clock-stretch timeout to 35ms +Subject: [PATCH 0282/1148] 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 @@ -329129,13 +329129,13 @@ index beb67afa6a3c..9f4f4964a507 100644 } -- -2.18.2 +2.18.4 -From 490deb0e6443dceb32fc63fc793d0be01c78ac0b Mon Sep 17 00:00:00 2001 +From 551f685720c999848678f6d1dc43805c6c1159bc Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 16 Jul 2019 13:28:22 +0100 -Subject: [PATCH 0283/1113] arm64/mm: Limit the DMA zone for arm64 +Subject: [PATCH 0283/1148] arm64/mm: Limit the DMA zone for arm64 On RaspberryPi, only the first 1Gb can be used for DMA[1]. @@ -329160,13 +329160,13 @@ index 45c00a54909c..1b15656c96db 100644 #ifdef CONFIG_NUMA -- -2.18.2 +2.18.4 -From 326ba0e7b5614f4c6eb761a7139e6e4e1e139ca4 Mon Sep 17 00:00:00 2001 +From 00c1bc9619c636219209f0318caaeeb296f933f3 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 0284/1113] staging: vc04_services: fix compiling in separate +Subject: [PATCH 0284/1148] staging: vc04_services: fix compiling in separate directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -329194,13 +329194,13 @@ index 5820ec1f89ec..7fb908d824b2 100644 + -I$(srctree)/drivers/staging/vc04_services \ -D__VCCOREVER__=0x04000000 -- -2.18.2 +2.18.4 -From cc360f1d68f9bc701b7ff182588d5c6aa40e4e15 Mon Sep 17 00:00:00 2001 +From 9f2fa307a45db092be5c1824565d2793d036e096 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Apr 2019 13:33:47 +0100 -Subject: [PATCH 0285/1113] bcm2835-dma: Add proper 40-bit DMA support +Subject: [PATCH 0285/1148] 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 @@ -330150,13 +330150,13 @@ index 782725e3adad..746cfb405ad3 100644 if (IS_ERR(pcie->clk)) { dev_warn(&pdev->dev, "could not get clock\n"); -- -2.18.2 +2.18.4 -From b6202a1e858ebed466209ff5201fac9f9832bbde Mon Sep 17 00:00:00 2001 +From 2f5cf9902b838a41642b1587f3ce0a714b435830 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 6 Aug 2019 15:23:14 +0100 -Subject: [PATCH 0286/1113] clk-bcm2835: Avoid null pointer exception +Subject: [PATCH 0286/1148] clk-bcm2835: Avoid null pointer exception clk_desc_array[BCM2835_PLLB] doesn't exist so we dereference null when iterating @@ -330185,13 +330185,13 @@ index 43dd58f5468c..57f306e31883 100644 return false; -- -2.18.2 +2.18.4 -From f49f5998c35f18e4f143398014039311591df34b Mon Sep 17 00:00:00 2001 +From b3b0f6fde53077031766862387f343f8bbed33eb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 7 Aug 2019 17:19:33 +0100 -Subject: [PATCH 0287/1113] pcie-brcmstb: Don't set DMA ops for root complex +Subject: [PATCH 0287/1148] 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 @@ -330218,13 +330218,13 @@ index 746cfb405ad3..87fd40ae3140 100644 case BUS_NOTIFY_DEL_DEVICE: -- -2.18.2 +2.18.4 -From b3e60eae8aa1c034b09485ea8d2e7f409b6cb98e Mon Sep 17 00:00:00 2001 +From d73cae43998ebc71e7377e63302322a45c8050db Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 15 Aug 2019 08:39:08 +0100 -Subject: [PATCH 0288/1113] drm/vc4: Prevent load tracking from breaking FKMS +Subject: [PATCH 0288/1148] 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 @@ -330298,13 +330298,13 @@ index 862e89b8c478..ff96ba01144d 100644 .format_mod_supported = vc4_fkms_format_mod_supported, }; -- -2.18.2 +2.18.4 -From 59561d21f94a5fca67012425e9e1a980fb7ad959 Mon Sep 17 00:00:00 2001 +From a1b55d4a42d62c01372aa8ccd8037afba896f79e Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 22 Aug 2019 23:32:46 +0800 -Subject: [PATCH 0289/1113] rtl8192cu: Let it support to build in the non-src +Subject: [PATCH 0289/1148] rtl8192cu: Let it support to build in the non-src folder If we build the kernel with "-O=$non-src-folder", this driver will @@ -330329,13 +330329,13 @@ index c399011a3e37..ef6156c0f368 100644 CONFIG_AUTOCFG_CP = n -- -2.18.2 +2.18.4 -From 568492ec66190fb4be92f26c434b6d86b2f30221 Mon Sep 17 00:00:00 2001 +From 50db4e6c40b5efbf502abe0d55ebdb15837c1083 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 15:13:17 -0800 -Subject: [PATCH 0290/1113] drm/v3d: HACK: gut runtime pm for now. +Subject: [PATCH 0290/1148] 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 @@ -330446,13 +330446,13 @@ index d225152e7e36..15a5f92aa7b4 100644 ret = drm_dev_init(&v3d->drm, &v3d_drm_driver, dev); if (ret) -- -2.18.2 +2.18.4 -From 52def85659d7ed2787f73b331ccef5090eb4fa0e Mon Sep 17 00:00:00 2001 +From b84aebb1232cc88705331bbb684ec1d93a5d3a8c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 13:22:53 -0700 -Subject: [PATCH 0291/1113] drm/v3d: Clock V3D down when not in use. +Subject: [PATCH 0291/1148] 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. @@ -330617,13 +330617,13 @@ index 19c092d75266..28f8eb664a58 100644 * treat 0 as special, such as the occlusion query counters * where 0 means "disabled". -- -2.18.2 +2.18.4 -From 406af369f01a92dbef878a5a601db7810b0f5867 Mon Sep 17 00:00:00 2001 +From 6d2b244d72ee88c6f6d83405c9f318bd2b7c8478 Mon Sep 17 00:00:00 2001 From: Hermann Lauer Date: Thu, 8 Aug 2019 15:40:37 +0200 -Subject: [PATCH 0292/1113] According to 5713 pdf doc CLOCK_CTRL is a readonly +Subject: [PATCH 0292/1148] According to 5713 pdf doc CLOCK_CTRL is a readonly status register, and it behaves so. Remove useless setting --- @@ -330654,13 +330654,13 @@ index 9c1c92e57bbf..53acd2b355d6 100644 default: return false; -- -2.18.2 +2.18.4 -From 56a9f02646234ddc99bc0b8f26f5a0ec4efdf9b9 Mon Sep 17 00:00:00 2001 +From 7bbe88aa508364474c317c4707af7cfff097af7d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 28 Jun 2018 15:57:25 +0100 -Subject: [PATCH 0293/1113] staging: bcm2835_camera: Ensure all buffers are +Subject: [PATCH 0293/1148] staging: bcm2835_camera: Ensure all buffers are returned on disable With the recent change to match MMAL and V4L2 buffers there @@ -330687,13 +330687,13 @@ index 61a3593cdcfc..341594ab669f 100644 msg_context->u.bulk.port, msg_context->u.bulk.status, -- -2.18.2 +2.18.4 -From 587a57722c54169f96374af288f79edff14471e7 Mon Sep 17 00:00:00 2001 +From ff7cb19b63bf7ba07173d14f714fcaac6c63cccd Mon Sep 17 00:00:00 2001 From: yaroslavros Date: Wed, 14 Aug 2019 15:22:55 +0100 -Subject: [PATCH 0294/1113] Ported pcie-brcmstb bounce buffer implementation to +Subject: [PATCH 0294/1148] Ported pcie-brcmstb bounce buffer implementation to ARM64. (#3144) Ported pcie-brcmstb bounce buffer implementation to ARM64. @@ -331415,13 +331415,13 @@ index 87fd40ae3140..e8c8b355548a 100644 case BUS_NOTIFY_DEL_DEVICE: -- -2.18.2 +2.18.4 -From d8ce46dfabf4328af7a3308101e484f0f17548f8 Mon Sep 17 00:00:00 2001 +From afb2836aa05a88e69596e56af1cf15ffca6ab7c7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Jul 2019 17:44:53 +0100 -Subject: [PATCH 0295/1113] drm/vc4: Query firmware for custom HDMI mode +Subject: [PATCH 0295/1148] drm/vc4: Query firmware for custom HDMI mode Allow custom HDMI modes to be specified from config.txt, and these then override EDID parsing. @@ -331600,13 +331600,13 @@ index ff96ba01144d..3ea7974a4ed3 100644 if (!mode) { DRM_ERROR("Failed to create a new display mode\n"); -- -2.18.2 +2.18.4 -From 7bba81dd74970ff95ffa85b85eaca3e623e04778 Mon Sep 17 00:00:00 2001 +From f59fed66b69fadda93811eb44a9522bbf379cd88 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 15:12:05 +0100 -Subject: [PATCH 0296/1113] drm/vc4: Pass the drm vrefresh to the firmware on +Subject: [PATCH 0296/1148] drm/vc4: Pass the drm vrefresh to the firmware on mode set More for completeness than need, but use drm_mode_vrefresh @@ -331643,13 +331643,13 @@ index 3ea7974a4ed3..6bf51f45cadb 100644 if (mode->flags & DRM_MODE_FLAG_PHSYNC) mb.timings.flags |= TIMINGS_FLAGS_H_SYNC_POS; -- -2.18.2 +2.18.4 -From 0301994d226427790005f3426a695e6c2c11f747 Mon Sep 17 00:00:00 2001 +From 2e0296285a6cea22627dfbe989b428be414c27bd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 19 Jul 2019 15:35:13 +0100 -Subject: [PATCH 0297/1113] drm/vc4: Add support for margins to fkms +Subject: [PATCH 0297/1148] 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 @@ -331977,13 +331977,13 @@ index 6bf51f45cadb..5526b7dd52ee 100644 DRM_CONNECTOR_POLL_DISCONNECT); -- -2.18.2 +2.18.4 -From 34801197de9814e0020e19e29976d5aef19954d8 Mon Sep 17 00:00:00 2001 +From ec30053a4ab7412bbb960bc4761541653d558b6a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 19 Jul 2019 17:49:00 +0100 -Subject: [PATCH 0298/1113] drm/vc4: Ensure zpos is always initialised +Subject: [PATCH 0298/1148] 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 @@ -332009,13 +332009,13 @@ index 5526b7dd52ee..653c9f6d5ce5 100644 default_zpos = 0; break; -- -2.18.2 +2.18.4 -From a359b8fc3b2d45d70704d7fe1ec07790bdf9f67a Mon Sep 17 00:00:00 2001 +From 8b4e9b8a4719a5b7e894985d4d62058c14a8b2ae Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Tue, 23 Jul 2019 16:57:35 +0200 -Subject: [PATCH 0299/1113] adds the Hifiberry DAC+ADC PRO version +Subject: [PATCH 0299/1148] 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 @@ -332618,13 +332618,13 @@ index 000000000000..ed080b24eb49 +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ADC"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From deaf0b4a8cac21f917cc96b49bacab3874e9b4f8 Mon Sep 17 00:00:00 2001 +From 0169e52b270c11dc08085afde5acfc2dcde75885 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 31 Jul 2019 17:36:34 +0100 -Subject: [PATCH 0300/1113] drm/vc4: A present but empty dmas disables audio +Subject: [PATCH 0300/1148] 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 @@ -332638,7 +332638,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index d5f5ba410524..0c3d9d27e196 100644 +index 54435b72b761..d59fd8714c5d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1066,10 +1066,12 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi) @@ -332657,13 +332657,13 @@ index d5f5ba410524..0c3d9d27e196 100644 } -- -2.18.2 +2.18.4 -From 3c733d70a96a1641781d4a8496d9bc38ecaaf657 Mon Sep 17 00:00:00 2001 +From 68c63d2799a74a22b07256e0b3872740749fead2 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Mon, 29 Jul 2019 12:02:59 +0100 -Subject: [PATCH 0301/1113] Fixup FKMS interrupt handing for non-existent +Subject: [PATCH 0301/1148] Fixup FKMS interrupt handing for non-existent display If an errant interrupt flag was received from a non-existent display, @@ -332703,13 +332703,13 @@ index 653c9f6d5ce5..14d660add41c 100644 } -- -2.18.2 +2.18.4 -From 0be67bf516ee82b6aca9e9fcf7b0aa891deb050d Mon Sep 17 00:00:00 2001 +From 1dc45ee0710642541e55f757ec736aebab1e1ece Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 9 May 2019 14:30:37 +0100 -Subject: [PATCH 0302/1113] drivers: char: add chardev for mmap'ing the RPiVid +Subject: [PATCH 0302/1148] drivers: char: add chardev for mmap'ing the RPiVid control registers Based on the gpiomem driver, allow mapping of the decoder register @@ -333107,13 +333107,13 @@ index b2d157091e12..f70a810c55f7 100644 #endif /* BCM2835_MFD_PM_H */ -- -2.18.2 +2.18.4 -From 6727c49386f2e441c98c65c201f6eabd8997bcfc Mon Sep 17 00:00:00 2001 +From 95ea3fd84da4341de17c175aa2262d37c02bbfab Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 1 Aug 2019 16:41:20 +0100 -Subject: [PATCH 0303/1113] hid: usb: Add device quirks for Freeway Airmouse T3 +Subject: [PATCH 0303/1148] hid: usb: Add device quirks for Freeway Airmouse T3 and MX3 These wireless mouse/keyboard combo remote control devices specify @@ -333134,7 +333134,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 fbc93d8dda5e..5871ec6712d8 100644 +index e03a4d794240..242309130dea 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -223,6 +223,9 @@ @@ -333147,7 +333147,7 @@ index fbc93d8dda5e..5871ec6712d8 100644 #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1241,6 +1244,9 @@ +@@ -1244,6 +1247,9 @@ #define USB_VENDOR_ID_XAT 0x2505 #define USB_DEVICE_ID_XAT_CSR 0x0220 @@ -333158,7 +333158,7 @@ index fbc93d8dda5e..5871ec6712d8 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 8a739ec50cc0..da4c1541cfc0 100644 +index 0440e2f6e8a3..9af43ad92d87 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[] = { @@ -333169,7 +333169,7 @@ index 8a739ec50cc0..da4c1541cfc0 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 }, -@@ -183,6 +184,7 @@ static const struct hid_device_id hid_quirks[] = { +@@ -185,6 +186,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 }, @@ -333178,13 +333178,13 @@ index 8a739ec50cc0..da4c1541cfc0 100644 { 0 } }; -- -2.18.2 +2.18.4 -From d8b12f3055b7bcb532c10e00dd99c9d7da4adb11 Mon Sep 17 00:00:00 2001 +From c5d1054c427e78dcebcec30078900e0283b86e18 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 14 Jun 2019 10:12:07 +0100 -Subject: [PATCH 0304/1113] drm/vc4: Add "Broadcast RGB" connector property +Subject: [PATCH 0304/1148] 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 @@ -333486,13 +333486,13 @@ index 14d660add41c..bf882b38830a 100644 return connector; -- -2.18.2 +2.18.4 -From bc1027bafbcb2008d84cbbb4279f8afb0cd1dd5d Mon Sep 17 00:00:00 2001 +From 44aa8dfd034d9147f885eb9e74902de0f60e2f71 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jul 2019 11:09:26 +0100 -Subject: [PATCH 0305/1113] drm/vc4: fkms: Set default state margin at reset +Subject: [PATCH 0305/1148] 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 @@ -333526,13 +333526,13 @@ index bf882b38830a..fa8a538f5d66 100644 .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_get_property = vc4_connector_atomic_get_property, -- -2.18.2 +2.18.4 -From 5241b356867506696e9badd7d161870d3812c7d4 Mon Sep 17 00:00:00 2001 +From 7984a95626de9d6fecf03fdca625145e7065d875 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 18 Jul 2019 17:07:05 +0800 -Subject: [PATCH 0306/1113] staging: bcm2835-codec: switch to multi-planar API +Subject: [PATCH 0306/1148] 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 @@ -333879,13 +333879,13 @@ index 708f76b7aa92..0ecf3e5c59a8 100644 dst_vq->drv_priv = ctx; dst_vq->buf_struct_size = sizeof(struct m2m_mmal_buffer); -- -2.18.2 +2.18.4 -From 7a979360d2ec98c8d218696baa072be97da2b20b Mon Sep 17 00:00:00 2001 +From d5557f9836c0964badcc984f78ca51f1e2e22bc5 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Mon, 22 Jul 2019 22:13:30 +0800 -Subject: [PATCH 0307/1113] staging: bcm2835-codec: implement +Subject: [PATCH 0307/1148] staging: bcm2835-codec: implement V4L2_CID_MIN_BUFFERS_FOR_CAPTURE The stateful decoder specification shows an optional step for retrieving @@ -333931,13 +333931,13 @@ index 0ecf3e5c59a8..d515bc75d5cb 100644 ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx, &queue_init); -- -2.18.2 +2.18.4 -From 954d58fe52a38223fb0cacb125d28be3ec1911c0 Mon Sep 17 00:00:00 2001 +From aa89d871565ecbf3b63ef6df90d39ca62e74489d Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Mon, 22 Jul 2019 22:20:55 +0800 -Subject: [PATCH 0308/1113] staging: bcm2835-codec: set device_caps in struct +Subject: [PATCH 0308/1148] staging: bcm2835-codec: set device_caps in struct video_device Instead of filling in the struct v4l2_capability device_caps @@ -333977,13 +333977,13 @@ index d515bc75d5cb..47e79a0f0c3e 100644 switch (role) { case DECODE: -- -2.18.2 +2.18.4 -From a066ba96db20aa502812ea729ec2dd967585a423 Mon Sep 17 00:00:00 2001 +From ed8d1bb30d08a9b5c98975baa20f4fea80b8e3c1 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 16 Jul 2019 12:18:21 +0100 -Subject: [PATCH 0309/1113] Add HDMI1 facility to the driver. +Subject: [PATCH 0309/1148] 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 @@ -334070,13 +334070,13 @@ index ed0feb34b6c8..1a25cdad94dc 100644 }; -- -2.18.2 +2.18.4 -From 23f65b1e34f80cabe1f80198ef12bf76f89aca83 Mon Sep 17 00:00:00 2001 +From 062853c1e4d7d00a317716c8dcc773a6d18ab221 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jul 2019 17:27:44 +0100 -Subject: [PATCH 0310/1113] drm/vc4: Resolve the vblank warnings on mode +Subject: [PATCH 0310/1148] drm/vc4: Resolve the vblank warnings on mode switching The details over when and how a driver is to service the @@ -334176,13 +334176,13 @@ index fa8a538f5d66..d9779b993c39 100644 static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc) -- -2.18.2 +2.18.4 -From 1c818ce7fe7cf4c2606b166aadbe3e7443c9f9b7 Mon Sep 17 00:00:00 2001 +From 553e08eee56913c213996f87d1cc8f9f7619e8bd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jul 2019 17:34:29 +0100 -Subject: [PATCH 0311/1113] drm/vc4: Remove unused mode variable +Subject: [PATCH 0311/1148] 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, @@ -334209,13 +334209,13 @@ index d9779b993c39..8b1838919377 100644 mb->plane.vc_image_type = vc_fmt->vc_image; -- -2.18.2 +2.18.4 -From 314ad52e9098982241e0b987cf5f00d1a14c6a5f Mon Sep 17 00:00:00 2001 +From c61b2adb0bf13d5d73822f31a63ed110e02a24be Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 14:57:09 +0100 -Subject: [PATCH 0312/1113] staging:bcm2835-codec: Expand logging on format +Subject: [PATCH 0312/1148] staging:bcm2835-codec: Expand logging on format setting Adds some more useful logging during format changed events and @@ -334257,13 +334257,13 @@ index 47e79a0f0c3e..eadc0fab2fb9 100644 vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type); if (!vq) -- -2.18.2 +2.18.4 -From 011e8d0cc0a43f012432fa776ef626d18d09d677 Mon Sep 17 00:00:00 2001 +From 5495de61b283186192e2ba1146d7543ee0c594fa Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 14:58:35 +0100 -Subject: [PATCH 0313/1113] staging: bcm2835-codec: Correct bytesperline on +Subject: [PATCH 0313/1148] staging: bcm2835-codec: Correct bytesperline on format changed The handling of format changed events incorrectly set bytesperline @@ -334293,13 +334293,13 @@ index eadc0fab2fb9..24a8e7cc7de7 100644 q_data->sizeimage = format->buffer_size_min; if (format->es.video.color_space) -- -2.18.2 +2.18.4 -From 792ead5adaaf3bf6bf04419675aabbd649055dd2 Mon Sep 17 00:00:00 2001 +From f7b8d575890bfcdac7e35e90f07147b467f16d47 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 7 Aug 2019 11:31:08 +0100 -Subject: [PATCH 0314/1113] drm/vc4: Add missing NULL check to +Subject: [PATCH 0314/1148] drm/vc4: Add missing NULL check to vc4_crtc_consume_event vc4_crtc_consume_event wasn't checking crtc->state->event was @@ -334327,13 +334327,13 @@ index 8b1838919377..004a0bce94ac 100644 WARN_ON(drm_crtc_vblank_get(crtc) != 0); -- -2.18.2 +2.18.4 -From e9ab9797027f53c7583a7ca0de1a8ddb038edbcc Mon Sep 17 00:00:00 2001 +From 4f6bcf1832d5b0b9e14f5ee05bb9a0297bf836ba Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Aug 2019 08:51:43 +0100 -Subject: [PATCH 0315/1113] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail +Subject: [PATCH 0315/1148] 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 @@ -334384,13 +334384,13 @@ index 88315e542214..b9d7a088c336 100644 bcmgenet_umac_writel(priv, 0, UMAC_CMD); -- -2.18.2 +2.18.4 -From d28bd95b3a26d4abd78aa06278507e29f2baa191 Mon Sep 17 00:00:00 2001 +From 67221941aa1f2b50eae4b668b6a01a7dd7bcc8ac Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 13 Aug 2019 15:53:29 +0100 -Subject: [PATCH 0316/1113] xhci: Use more event ring segment table entries +Subject: [PATCH 0316/1148] 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 @@ -334452,13 +334452,13 @@ index 8a202d9b856d..2033bb868303 100644 #define ERST_SIZE 64 /* Initial number of event segment rings allocated */ -- -2.18.2 +2.18.4 -From e975f86d74cf9c3459d4e5b6cf131adf0c0889bb Mon Sep 17 00:00:00 2001 +From 14a873d2d11233fa92a97b637512e9e8fc431795 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 15 Aug 2019 12:02:34 +0100 -Subject: [PATCH 0317/1113] configs: arm64/bcm2711: Enable V3D +Subject: [PATCH 0317/1148] configs: arm64/bcm2711: Enable V3D Enable the V3D driver, which depends on BCM2835_POWER. @@ -334499,13 +334499,13 @@ index 9a5c44606337..b0e048697964 100644 depends on COMMON_CLK depends on MMU -- -2.18.2 +2.18.4 -From 66c99c7597740d010b74e8647e80ed5619f3e8d5 Mon Sep 17 00:00:00 2001 +From 4fe902568cf7acd3ae0ef698520eab8f359bde1f Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Thu, 22 Aug 2019 22:31:37 +0000 -Subject: [PATCH 0318/1113] staging: bcm2835-codec: add support for +Subject: [PATCH 0318/1148] staging: bcm2835-codec: add support for V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME fixes #3171 @@ -334560,13 +334560,13 @@ index 24a8e7cc7de7..1a384e70eb98 100644 rc = hdl->error; goto free_ctrl_handler; -- -2.18.2 +2.18.4 -From 631e3b0a6def6d2b05daca29d61942e2bb71fe74 Mon Sep 17 00:00:00 2001 +From 21e6657537853afefe6614e6b2b46921748c7fb3 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Fri, 23 Aug 2019 16:29:07 -0700 -Subject: [PATCH 0319/1113] staging: bcm2835-codec: remove unnecessary padding +Subject: [PATCH 0319/1148] staging: bcm2835-codec: remove unnecessary padding on encoder input The ISP and ENCODE roles have the same underlying hardware. Neither requires vertical alignment. @@ -334596,13 +334596,13 @@ index 1a384e70eb98..a82d7345389d 100644 } f->fmt.pix_mp.num_planes = 1; -- -2.18.2 +2.18.4 -From 347cd9924a4d71c3375173cb8690ae7f64ac95be Mon Sep 17 00:00:00 2001 +From fa963228e851645899dfa1cdcf84be7825d599c5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:16:56 +0100 -Subject: [PATCH 0320/1113] arch/arm: Add model string to cpuinfo +Subject: [PATCH 0320/1148] arch/arm: Add model string to cpuinfo Signed-off-by: Phil Elwell --- @@ -334638,13 +334638,13 @@ index d0a464e317ea..d658d022f6a7 100644 } -- -2.18.2 +2.18.4 -From 1ea25d57a7022ea176128664ce93898f388e0e59 Mon Sep 17 00:00:00 2001 +From 4707b8f48b8fadeddea1557094288a3e41fdd371 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:17:25 +0100 -Subject: [PATCH 0321/1113] arch/arm64: Add Revision, Serial, Model to cpuinfo +Subject: [PATCH 0321/1148] arch/arm64: Add Revision, Serial, Model to cpuinfo Signed-off-by: Phil Elwell --- @@ -334702,13 +334702,13 @@ index 05933c065732..86bbf8762dc9 100644 } -- -2.18.2 +2.18.4 -From 647d0480591c18cdb53a5d71fdbdab403f3a33e1 Mon Sep 17 00:00:00 2001 +From 623a72da4040abdd0ab7504bc9bdc8f9d5a8bec7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:34:30 +0100 -Subject: [PATCH 0322/1113] media: dt-bindings: Add binding for the Sony IMX219 +Subject: [PATCH 0322/1148] media: dt-bindings: Add binding for the Sony IMX219 sensor The IMX219 is an 8MPix CSI2 sensor, supporting 2 or 4 data lanes. @@ -334786,13 +334786,13 @@ index 000000000000..a02f1ce1e120 + }; + }; -- -2.18.2 +2.18.4 -From fdf410153429826557a5c1407f7aa7e98d4ce572 Mon Sep 17 00:00:00 2001 +From a242cd53f2fb1cbf258e18056936cc5bd304420a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:34:49 +0100 -Subject: [PATCH 0323/1113] media: i2c: Add driver for Sony IMX219 sensor +Subject: [PATCH 0323/1148] 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 @@ -335943,13 +335943,13 @@ index 000000000000..682397a48492 +MODULE_DESCRIPTION("Sony IMX219 sensor driver"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 1b5ad94e03d8ed7df616a3eb2505e83cca032ba2 Mon Sep 17 00:00:00 2001 +From 1cb767dbdd178ea52af55b4946149d95c95a5c96 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Sun, 28 Apr 2019 12:15:35 +0200 -Subject: [PATCH 0324/1113] staging: bcm2835-codec: Fix non-documentation +Subject: [PATCH 0324/1148] staging: bcm2835-codec: Fix non-documentation comment block The job_ready comment is incorrectly using the documentation prefix @@ -335976,13 +335976,13 @@ index a82d7345389d..4c69087328c0 100644 */ static int job_ready(void *priv) -- -2.18.2 +2.18.4 -From aae05d8e4a1e7b77265c92eea215e7b31edae7db Mon Sep 17 00:00:00 2001 +From 6c60ee307159c4459f9f8dbdffdf12e37dd0e6d7 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:42:39 +0000 -Subject: [PATCH 0325/1113] staging: bcm2835-codec: Fix declaration of roles +Subject: [PATCH 0325/1148] 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. @@ -336008,13 +336008,13 @@ index 4c69087328c0..1a00c8d25370 100644 "encode", "isp" -- -2.18.2 +2.18.4 -From 7e1eea1a78d0968bd05cd6990ed8d810cdbadd38 Mon Sep 17 00:00:00 2001 +From 6abaf06bc5b3a642a18de47d5b75033043b8f519 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:55:43 +0000 -Subject: [PATCH 0326/1113] staging: bcm2835-codec: Add role to device name +Subject: [PATCH 0326/1148] 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 @@ -336059,13 +336059,13 @@ index 1a00c8d25370..46b8dd782c46 100644 vfd->num); -- -2.18.2 +2.18.4 -From cc08c2d06a2c0c78270cb1a8c5966f2c5540cf3b Mon Sep 17 00:00:00 2001 +From c3a22c1c9418e8db92bbbbb0ced22f650affdbc4 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:35:26 +0000 -Subject: [PATCH 0327/1113] staging: bcm2835-codec: Pass driver context to +Subject: [PATCH 0327/1148] staging: bcm2835-codec: Pass driver context to create entities Pass the bcm2835_codec_driver driver context directly into the @@ -336126,13 +336126,13 @@ index 46b8dd782c46..a08a75d3ff88 100644 goto out; -- -2.18.2 +2.18.4 -From 447b51165cabeefaef5c31b218a54fb28a1ec4f7 Mon Sep 17 00:00:00 2001 +From 3e25162950d0debcf2ba0fb7260622821324073c Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 12:54:15 +0000 -Subject: [PATCH 0328/1113] staging: bcm2835-codec: add media controller +Subject: [PATCH 0328/1148] staging: bcm2835-codec: add media controller support Provide a single media device to contain all of the bcm2835_codec @@ -336298,13 +336298,13 @@ index a08a75d3ff88..fb99bfb5bc1d 100644 } -- -2.18.2 +2.18.4 -From 105cb82ac495ac5adb1e90c56bb804ac15449819 Mon Sep 17 00:00:00 2001 +From 38f84306c956e4cccffb5de51ec8a47fe2d0b6b3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:04:51 +0100 -Subject: [PATCH 0329/1113] v4l2: Add a Greyworld AWB mode. +Subject: [PATCH 0329/1148] 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) @@ -336340,13 +336340,13 @@ index a2669b79b294..616a7c64c4d2 100644 #define V4L2_CID_WIDE_DYNAMIC_RANGE (V4L2_CID_CAMERA_CLASS_BASE+21) -- -2.18.2 +2.18.4 -From c9430e0ddda945f3335b3275569067586c216ffa Mon Sep 17 00:00:00 2001 +From 3fe8ce79b9fd114f10e985fb9163986b1ab157ae Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:13:06 +0100 -Subject: [PATCH 0330/1113] staging: bcm2835-camera: Add greyworld AWB mode +Subject: [PATCH 0330/1148] 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. @@ -336396,13 +336396,13 @@ index 926392d754c7..d3d7828d1e56 100644 enum mmal_parameter_imagefx { -- -2.18.2 +2.18.4 -From fc967776b29fb6d4748d14dd7dcf57dd76a81ca0 Mon Sep 17 00:00:00 2001 +From c5dcdfecbac5456c7b6da6678112ed8ec3eca58d Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 11 Sep 2019 14:57:18 +0100 -Subject: [PATCH 0331/1113] drm/vc4: Fix for margins in composite/SDTV mode +Subject: [PATCH 0331/1148] drm/vc4: Fix for margins in composite/SDTV mode (#3223) Margins were incorrectly assumed to be setup in SDTV mode, but were @@ -336436,14 +336436,14 @@ index 004a0bce94ac..a487fcf1eaf3 100644 drm_connector_attach_tv_margin_properties(connector); -- -2.18.2 +2.18.4 -From 0483a1b28f9e5bd06789cfa0b1d1da0454dda889 Mon Sep 17 00:00:00 2001 +From 2da7d85546bbc4a553163d1aad5b97baeb2b0ae6 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 0332/1113] Add Hifiberry DAC+DSP soundcard driver (#3224) +Subject: [PATCH 0332/1148] 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. @@ -336689,13 +336689,13 @@ index 2023b0a18a2c..133b6d98f515 100644 .data = (void *) &drvdata_hifiberry_amp }, { .compatible = "hifiberry,hifiberry-dac", -- -2.18.2 +2.18.4 -From 00f343cc9fcf558e9bf424dfbe808aba51db5dde Mon Sep 17 00:00:00 2001 +From 2ba603e16aa30ecf789c1ada949008ce51d31a3e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 17:24:55 +0100 -Subject: [PATCH 0333/1113] staging: bcm2835-codec: Allow height of 1920. +Subject: [PATCH 0333/1148] 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 @@ -336722,13 +336722,13 @@ index fb99bfb5bc1d..19d046767dbb 100644 #define DEFAULT_WIDTH 640 #define DEFAULT_HEIGHT 480 -- -2.18.2 +2.18.4 -From 6cc989bb647a1a58c5fd912fada7d1158a81ae75 Mon Sep 17 00:00:00 2001 +From 6d5621ffa26915405c8a1f55fd3146a65f6950b7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 15:11:47 +0100 -Subject: [PATCH 0334/1113] staging: bcm2835-codec: Correct g/s_selection API +Subject: [PATCH 0334/1148] staging: bcm2835-codec: Correct g/s_selection API MPLANE support The g_selection and s_selection API is messed up and requires @@ -336835,13 +336835,13 @@ index 19d046767dbb..ce6364322266 100644 case DECODE: switch (s->target) { -- -2.18.2 +2.18.4 -From c02d3d89e0fa02fd485345e38e32fd1163d85b8e Mon Sep 17 00:00:00 2001 +From c615260b631013963859b4346be91f01e13771f0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Sep 2019 17:22:36 +0100 -Subject: [PATCH 0335/1113] drm/v3d: Delete pm_runtime support +Subject: [PATCH 0335/1148] drm/v3d: Delete pm_runtime support The pm_runtime was blocking changelist submission, so delete it as a temporary workaround. @@ -336905,13 +336905,13 @@ index 6cc67cab320e..5294dd884867 100644 } -- -2.18.2 +2.18.4 -From ff86e0face3cb4b1a08d19d6a74cfcbd2384f9bc Mon Sep 17 00:00:00 2001 +From 776675a41b272a116949176711dcd66ed35940ed Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 19 Sep 2019 13:39:15 +0100 -Subject: [PATCH 0336/1113] configs: Regenerate defconfigs +Subject: [PATCH 0336/1148] configs: Regenerate defconfigs Signed-off-by: Phil Elwell --- @@ -336931,13 +336931,13 @@ index 33686cf34ff9..4719d38c4b4e 100644 CONFIG_EXTCON=m CONFIG_EXTCON_ARIZONA=m -- -2.18.2 +2.18.4 -From d5cf37b095b9d1e08e1ed41cf369f0f8f1cff8aa Mon Sep 17 00:00:00 2001 +From 1ed688d9824435ac2bfdf87c197644ae8a5167ab Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Sep 2019 09:02:10 +0100 -Subject: [PATCH 0337/1113] dts: Add DTS for Pi 2B rev 1.2 with BCM2837 (#3235) +Subject: [PATCH 0337/1148] dts: Add DTS for Pi 2B rev 1.2 with BCM2837 (#3235) Signed-off-by: Phil Elwell --- @@ -336970,13 +336970,13 @@ index 000000000000..116cdbf94b9b + +#include "../../../../arm/boot/dts/bcm2710-rpi-2-b.dts" -- -2.18.2 +2.18.4 -From cdf290e6258a261d1c027fad4549684d8fb6c859 Mon Sep 17 00:00:00 2001 +From aa063f635174627797813b4de85f3288ddc958b5 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 3 Sep 2019 08:45:24 +0200 -Subject: [PATCH 0338/1113] drm/v3d: clean caches at the end of render jobs on +Subject: [PATCH 0338/1148] 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 @@ -337144,13 +337144,13 @@ index 58fbe48c91e9..b8c6f9d90942 100644 struct drm_v3d_get_param { -- -2.18.2 +2.18.4 -From 071261ca125da616de0102424e44a98dd5e83462 Mon Sep 17 00:00:00 2001 +From b4cd830d809824b754e5f4650fad9da9e5e350b2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 23 Sep 2019 09:26:41 +0100 -Subject: [PATCH 0339/1113] kbuild: Allow .dtbo overlays to be built piecemeal +Subject: [PATCH 0339/1148] 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: @@ -337172,7 +337172,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile -index 4cb68164b79e..fe75cf05e1ae 100644 +index 8db75cc76ed1..79843dd0993c 100644 --- a/Makefile +++ b/Makefile @@ -1264,6 +1264,9 @@ ifneq ($(dtstree),) @@ -337186,13 +337186,13 @@ index 4cb68164b79e..fe75cf05e1ae 100644 dtbs: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) -- -2.18.2 +2.18.4 -From 0b5cf36945a98263de3f22573ee2dd1b3afa82a9 Mon Sep 17 00:00:00 2001 +From 436d7966a76fda37443fb0f518f1e6af49010723 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 25 Sep 2019 09:49:58 +0100 -Subject: [PATCH 0340/1113] dma-direct: Temporary DMA fix on arm64 +Subject: [PATCH 0340/1148] dma-direct: Temporary DMA fix on arm64 See: https://github.com/raspberrypi/linux/issues/3251 @@ -337215,13 +337215,13 @@ index 0a093a675b63..d2b462835469 100644 min_mask = min_t(u64, min_mask, (max_pfn - 1) << PAGE_SHIFT); -- -2.18.2 +2.18.4 -From c0db54eade1c1382c77fcde789ab000ee62e1354 Mon Sep 17 00:00:00 2001 +From a26892b744c43e3bcefa7d79234ed190bca76afd Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 19 Sep 2019 20:45:30 +0200 -Subject: [PATCH 0341/1113] ARM: bcm: Switch board, clk and pinctrl to bcm2711 +Subject: [PATCH 0341/1148] ARM: bcm: Switch board, clk and pinctrl to bcm2711 compatible After the decision to use bcm2711 compatible for upstream, we should @@ -337247,13 +337247,13 @@ index 282a023027fc..e538e0f899a5 100644 NULL }; -- -2.18.2 +2.18.4 -From 7e12605497f8535c936c540c39eac54d926e029f Mon Sep 17 00:00:00 2001 +From 0033b3144366b378e489352800715bb9bd54c557 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 21 Jul 2019 16:01:36 +0200 -Subject: [PATCH 0342/1113] pinctrl: bcm2835: Add support for BCM2711 pull-up +Subject: [PATCH 0342/1148] pinctrl: bcm2835: Add support for BCM2711 pull-up functionality commit e38a9a437fb93ddafab5030165e4c6a3a5021669 upstream. @@ -337293,13 +337293,13 @@ index 76fad11f2ad8..3cd4c4f1a47c 100644 if (IS_ERR(pc->pctl_dev)) { gpiochip_remove(&pc->gpio_chip); -- -2.18.2 +2.18.4 -From 3ed4b3d1a416b126d9b4056d7e009399dacd68c9 Mon Sep 17 00:00:00 2001 +From 4aab84ef01f468feb8c5d4ab3a634f07970d9cdb Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Sun, 6 Oct 2019 03:23:15 +0200 -Subject: [PATCH 0343/1113] vchiq_2835_arm: suppress warning +Subject: [PATCH 0343/1148] vchiq_2835_arm: suppress warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -337331,13 +337331,13 @@ index 230e1b1144a9..2dfdee1f814f 100644 /* * Store the pagelistinfo address in remote_data, -- -2.18.2 +2.18.4 -From 5014322248ceaa2cdefa1e2130d4833db64f059b Mon Sep 17 00:00:00 2001 +From 10a299fb71969fc08d17499b3d4d9dc4d2d4fd67 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 24 Sep 2019 18:26:55 +0100 -Subject: [PATCH 0344/1113] Rename HDMI ALSA device names, check for enable +Subject: [PATCH 0344/1148] Rename HDMI ALSA device names, check for enable state HDMI Alsa devices renamed to match names used by DRM, to @@ -337477,13 +337477,13 @@ index 4d5b99d8ae9d..2f465dba54bf 100644 if (err) return err; -- -2.18.2 +2.18.4 -From 2687b296ba255112647c107b85fd44a0ca5faa8a Mon Sep 17 00:00:00 2001 +From 24e2620803949657fc0027b77c4ca7b73269d568 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Fri, 4 Oct 2019 16:41:30 +0200 -Subject: [PATCH 0345/1113] pcie-brcmstb-bounce64.c: dev_err() -> dev_info() +Subject: [PATCH 0345/1148] pcie-brcmstb-bounce64.c: dev_err() -> dev_info() for info messages "dmabounce: initialised" is not an error, so do not log it as such. @@ -337508,13 +337508,13 @@ index 6a872975ba9e..ac8dde3c030b 100644 return 0; -- -2.18.2 +2.18.4 -From 0b1607bb316e52e715f96bb6b87c746f4d767575 Mon Sep 17 00:00:00 2001 +From bcf0af66346fd5ce40ce786259d93fe4e494c3b0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Sep 2019 18:28:17 +0100 -Subject: [PATCH 0346/1113] drm/vc4: Add support for YUV color encodings and +Subject: [PATCH 0346/1148] drm/vc4: Add support for YUV color encodings and ranges The BT601/BT709 color encoding and limited vs full @@ -337654,13 +337654,13 @@ index b5a6b4cdd332..8416fdaf2ec4 100644 #define SCALER_TPZ0_VERT_RECALC BIT(31) #define SCALER_TPZ0_SCALE_MASK VC4_MASK(28, 8) -- -2.18.2 +2.18.4 -From 91752f49b088870194b401e09d8836b102263e88 Mon Sep 17 00:00:00 2001 +From 01a427be179a960d4c5629aee80de60e9355f46d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Sep 2019 18:36:32 +0100 -Subject: [PATCH 0347/1113] drm/vc4: Add support for H & V flips +Subject: [PATCH 0347/1148] drm/vc4: Add support for H & V flips The HVS supports horizontal and vertical flips whilst composing. @@ -337766,13 +337766,13 @@ index 1c5eef3ac441..f21c03f550e5 100644 return plane; } -- -2.18.2 +2.18.4 -From bf89943ff4148c3981700291e0ecaec65cf6368a Mon Sep 17 00:00:00 2001 +From 5bd4b286dc3e0c0f533e73ccd944010d4f4d6a87 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 18 Sep 2019 15:49:13 +0100 -Subject: [PATCH 0348/1113] drm/vc4: Correct handling of rotation parameter in +Subject: [PATCH 0348/1148] drm/vc4: Correct handling of rotation parameter in fkms One bit within DRM_MODE_ROTATE_MASK will always be set to @@ -337858,13 +337858,13 @@ index a487fcf1eaf3..f3ec265a9798 100644 BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709) | -- -2.18.2 +2.18.4 -From f837837b92e84073b5d9289168e867e3c49a2840 Mon Sep 17 00:00:00 2001 +From 4d18ce994811c5f69e1805ff70254499f07ab631 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 9 Oct 2019 17:22:07 +0100 -Subject: [PATCH 0349/1113] bcm2711: Retain support for old dtbs +Subject: [PATCH 0349/1148] 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 @@ -337923,13 +337923,13 @@ index 3cd4c4f1a47c..e77c3ea15fde 100644 }; -- -2.18.2 +2.18.4 -From 331b9441c0e81ed076ebac7979659bba4453b28f Mon Sep 17 00:00:00 2001 +From 5a0c677727029f921a28e46f89db2fdc595df690 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Thu, 10 Oct 2019 19:12:08 +0200 -Subject: [PATCH 0350/1113] dt-bindings: Add binding for the Infineon IRS1125 +Subject: [PATCH 0350/1148] dt-bindings: Add binding for the Infineon IRS1125 sensor Adds a binding for the Infineon IRS1125 time-of-flight depth @@ -337996,13 +337996,13 @@ index 000000000000..25a48028c957 + }; + }; -- -2.18.2 +2.18.4 -From e0288c7c978f4e7d4b637bb5911f70a37312505b Mon Sep 17 00:00:00 2001 +From 98716e56a705a3c087a6f7c9424e03651e304e3b Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Thu, 10 Oct 2019 19:12:36 +0200 -Subject: [PATCH 0351/1113] media: i2c: Add a driver for the Infineon IRS1125 +Subject: [PATCH 0351/1148] media: i2c: Add a driver for the Infineon IRS1125 depth sensor The Infineon IRS1125 is a time of flight depth sensor that @@ -339241,13 +339241,13 @@ index 000000000000..dccaca23aa76 +#endif /* IRS1125 */ + -- -2.18.2 +2.18.4 -From d4fb706f74d312e1ccf9c5c86eb79c9fce216128 Mon Sep 17 00:00:00 2001 +From 32b63984b79fb7892160082dfa753201d62f1140 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 17:19:33 +0100 -Subject: [PATCH 0352/1113] staging:bcm2835-codec: Add support for +Subject: [PATCH 0352/1148] staging:bcm2835-codec: Add support for ENUM_FRAMESIZES Required for compliance testing for the encoder. @@ -339345,13 +339345,13 @@ index ce6364322266..09d662d1dee3 100644 static int bcm2835_codec_set_ctrls(struct bcm2835_codec_ctx *ctx) -- -2.18.2 +2.18.4 -From 07c0d65f4bd8868ed8afae9655f6eee8a89ad449 Mon Sep 17 00:00:00 2001 +From 08d4400124ba7f8d2d64aa2147fd575038fd06d4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 17:22:08 +0100 -Subject: [PATCH 0353/1113] staging: bcm2835-codec: Correct buffer type check +Subject: [PATCH 0353/1148] staging: bcm2835-codec: Correct buffer type check on G_PARM The output queue buffer type is now OUTPUT_MPLANE. @@ -339376,13 +339376,13 @@ index 09d662d1dee3..a0d4b0d006c6 100644 parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME; -- -2.18.2 +2.18.4 -From 09d9b06dfe709fb9acacd37a4ccb33050b6a73bd Mon Sep 17 00:00:00 2001 +From 7c783762dc69495a269f23be04f663c6e3e9f48a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 17:23:26 +0100 -Subject: [PATCH 0354/1113] staging: bcm2835-codec: Set default and error check +Subject: [PATCH 0354/1148] staging: bcm2835-codec: Set default and error check timeperframe G_PARM default was invalid as 0/0, and the driver didn't check @@ -339419,13 +339419,13 @@ index a0d4b0d006c6..41fca575b395 100644 v4l2_fh_init(&ctx->fh, video_devdata(file)); file->private_data = &ctx->fh; -- -2.18.2 +2.18.4 -From 1f822cfce6145f057093f9e4313c888ceff6103c Mon Sep 17 00:00:00 2001 +From e931c9e09982520d0c91d0ea9317fdc9e0d35139 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 7 Oct 2019 14:02:57 +0100 -Subject: [PATCH 0355/1113] staging: bcm2835-codec: Fix imbalance in +Subject: [PATCH 0355/1148] staging: bcm2835-codec: Fix imbalance in dma_buf_get/dma_buf_put When represented with a dmabuf buffer that had previously been @@ -339455,13 +339455,13 @@ index 41fca575b395..f5adaac765cd 100644 ret = 0; break; -- -2.18.2 +2.18.4 -From 4bf1232359016052c07b1aa443d849e658973bf9 Mon Sep 17 00:00:00 2001 +From 3c0da03bd5d9cf7534a495ff52dc752606c909ef Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 16 Oct 2019 14:49:23 +0100 -Subject: [PATCH 0356/1113] drm:vc4 Added calls for firmware display +Subject: [PATCH 0356/1148] drm:vc4 Added calls for firmware display blank/unblank Requires new display power mailbox call to be present. @@ -339551,13 +339551,13 @@ index 102c2e5dd2f2..ae71820af8e5 100644 RPI_FIRMWARE_GET_DMA_CHANNELS = 0x00060001, }; -- -2.18.2 +2.18.4 -From 1d8ab0189c8e58c37be183a234504b9f35601969 Mon Sep 17 00:00:00 2001 +From cc434a1a11d6918788b015ac3ab60164f5220243 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 4 Nov 2019 00:52:35 +0000 -Subject: [PATCH 0357/1113] configs: Rebuild with savedefconfig +Subject: [PATCH 0357/1148] configs: Rebuild with savedefconfig --- arch/arm/configs/bcm2711_defconfig | 8 -------- @@ -339625,13 +339625,13 @@ index ec25f919fe4b..0775637872ca 100644 CONFIG_SND_BCM2835=m CONFIG_VIDEO_BCM2835=m -- -2.18.2 +2.18.4 -From 4887a28b1cef6849124fa752267ac9ff2cdec2c1 Mon Sep 17 00:00:00 2001 +From 74bb4a7a736f030237d902907491db77e2b4e976 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 Nov 2019 11:28:19 +0000 -Subject: [PATCH 0358/1113] Revert "pinctrl: bcm2835: Pass irqchip when adding +Subject: [PATCH 0358/1148] Revert "pinctrl: bcm2835: Pass irqchip when adding gpiochip" This reverts commit 73345a18d464b1b945b29f54f630ace6873344e2. @@ -339738,13 +339738,13 @@ index e77c3ea15fde..4ce2dd704c13 100644 if (match) { bcm2835_pinctrl_desc.confops = -- -2.18.2 +2.18.4 -From d691c8741e3c2282f2d74231c5f68c4d20da9402 Mon Sep 17 00:00:00 2001 +From 63d3a422defbe827f359938b0f9fe6408bbe2929 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Nov 2019 14:01:41 +0000 -Subject: [PATCH 0359/1113] drm/v3d: Don't clear MMU control bits on exception +Subject: [PATCH 0359/1148] 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 @@ -339778,13 +339778,13 @@ index 662e67279a7b..fe2060c6b495 100644 if (v3d->ver >= 41) { axi_id = axi_id >> 5; -- -2.18.2 +2.18.4 -From 44fb4b7f03911a0f3d589d03c2c4660f3a679558 Mon Sep 17 00:00:00 2001 +From 6785b3bb35555ca735f1619bf2b4ee517379e0ff Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Nov 2019 20:18:08 +0000 -Subject: [PATCH 0360/1113] drm/v3d: Suppress all but the first MMU error +Subject: [PATCH 0360/1148] 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. @@ -339823,13 +339823,13 @@ index fe2060c6b495..7dde90d846f1 100644 } -- -2.18.2 +2.18.4 -From cfd0e41dc4884344c10b3a60171d7fd02033757b Mon Sep 17 00:00:00 2001 +From aec5e4d930d8dbe0899ec96b5f19aea67a4b2999 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 Nov 2019 16:41:21 +0000 -Subject: [PATCH 0361/1113] drm/v3d: Plug dma_fence leak +Subject: [PATCH 0361/1148] 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 @@ -339857,13 +339857,13 @@ index 035de14066d0..8b5dc2b20e38 100644 kfree(job); -- -2.18.2 +2.18.4 -From ba5be6069734799ee6592dd08ad28b1c719758e9 Mon Sep 17 00:00:00 2001 +From 1a96e91c983e0bd6fae1b5b53bb3e7547fb5e0b7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:57:48 +0000 -Subject: [PATCH 0362/1113] staging: vchiq_arm: Register vcsm-cma as a platform +Subject: [PATCH 0362/1148] staging: vchiq_arm: Register vcsm-cma as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, @@ -339903,13 +339903,13 @@ index 4e684ccd9346..2b859b98e17b 100644 device_destroy(vchiq_class, vchiq_devid); cdev_del(&vchiq_cdev); -- -2.18.2 +2.18.4 -From 9f52dd92df27cdcca6c4359a0dbc47268e0f6bd3 Mon Sep 17 00:00:00 2001 +From 7bfe409dba043b8a8f4f44a0563cf57177103e85 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:57:58 +0000 -Subject: [PATCH 0363/1113] staging: vchiq_arm: Register bcm2835-codec as a +Subject: [PATCH 0363/1148] staging: vchiq_arm: Register bcm2835-codec as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, @@ -339949,13 +339949,13 @@ index 2b859b98e17b..1e8b2c460783 100644 vchiq_debugfs_deinit(); device_destroy(vchiq_class, vchiq_devid); -- -2.18.2 +2.18.4 -From e3bef459a9011374a177bfb8525f0d99d51ff7a3 Mon Sep 17 00:00:00 2001 +From 00838b718f22aa33af6d2a4757e5af7143a95314 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:58:08 +0000 -Subject: [PATCH 0364/1113] staging: bcm2835-codec: Fix potential memory leak +Subject: [PATCH 0364/1148] staging: bcm2835-codec: Fix potential memory leak of isp instance "d867785 staging: bcm2835-codec: add media controller support" added @@ -339984,13 +339984,13 @@ index f5adaac765cd..50395795c3db 100644 bcm2835_codec_destroy(drv->encode); drv->encode = NULL; -- -2.18.2 +2.18.4 -From 79d6546433421ac2e17e0bbecfe4571c59330d2c Mon Sep 17 00:00:00 2001 +From 2476eccdd7663d20a91a7d3d11213f6f517c80b2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:58:18 +0000 -Subject: [PATCH 0365/1113] staging: vchiq_arm: Unify the unload handling of +Subject: [PATCH 0365/1148] staging: vchiq_arm: Unify the unload handling of platform devs A helper function vchiq_register_child was added to deal with @@ -340019,13 +340019,13 @@ index 1e8b2c460783..d9492e24e07d 100644 platform_device_unregister(vcsm_cma); vchiq_debugfs_deinit(); -- -2.18.2 +2.18.4 -From 46fc68d73f814a278ec61c429dde5a08906b4c3f Mon Sep 17 00:00:00 2001 +From d7f01b7dd7ee78b432bcfdf35eb2acfe91947b42 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Nov 2019 11:59:01 +0000 -Subject: [PATCH 0366/1113] net: bcmgenet: The second IRQ is optional +Subject: [PATCH 0366/1148] 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. @@ -340049,13 +340049,13 @@ index 7dde90d846f1..586fb850f00f 100644 return irq1; if (irq1 > 0) { -- -2.18.2 +2.18.4 -From 75aea05a985043993b272faf8b7ae9d9d54f8e2f Mon Sep 17 00:00:00 2001 +From 2e938a76240ae505add103a32b71e381d8f0dd9c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Nov 2019 12:00:43 +0000 -Subject: [PATCH 0367/1113] drm/v3d: The third IRQ is optional +Subject: [PATCH 0367/1148] 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. @@ -340079,13 +340079,13 @@ index b9d7a088c336..0cb19a1120b6 100644 dev_err(&pdev->dev, "can't find IRQs\n"); err = -EINVAL; -- -2.18.2 +2.18.4 -From c4c7dae62060fb771644165ecf7a1f8a4bc2f37e Mon Sep 17 00:00:00 2001 +From 1a81c466a83b1a7204a8edadf4c2b2e0521e4c68 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 15 Nov 2019 08:48:08 +0000 -Subject: [PATCH 0368/1113] dwc_otg: Declare DMA capability with HCD_DMA flag +Subject: [PATCH 0368/1148] 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 @@ -340112,13 +340112,13 @@ index 9a150d6fdeb4..70cce7abfb8d 100644 //.reset = .start = hcd_start, -- -2.18.2 +2.18.4 -From 3d4b306a7386cd1e319ccaae3d94a5f490766715 Mon Sep 17 00:00:00 2001 +From 30652550b6b1418ac895d924c94f3e0315798e0d Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 31 Oct 2019 13:37:16 +0000 -Subject: [PATCH 0369/1113] rpi-poe-fan: fix def_pwm1 writes +Subject: [PATCH 0369/1148] rpi-poe-fan: fix def_pwm1 writes Signed-off-by: Serge Schneider --- @@ -340139,13 +340139,13 @@ index 3effaf2eb86d..c9654e9e9f2d 100644 ctx->def_pwm_value = def_pwm; exit_set_def_pwm_err: -- -2.18.2 +2.18.4 -From b4ad9764a73a971f964877f510862d79b714f7b1 Mon Sep 17 00:00:00 2001 +From 30104b1abfaf22c59c2a5b4911d45c2f199ddfda Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 31 Oct 2019 14:39:44 +0000 -Subject: [PATCH 0370/1113] net:phy:2711 Allow ethernet LED mode to be set via +Subject: [PATCH 0370/1148] net:phy:2711 Allow ethernet LED mode to be set via device tree Add device tree entries and code to allow the specification of @@ -340270,13 +340270,13 @@ index f5881fb95a5b..8f26eaf2280c 100644 return 0; -- -2.18.2 +2.18.4 -From c7b8b64c8579c42630b6baf60ae21541a8897d2f Mon Sep 17 00:00:00 2001 +From a525e6ba3c1d764ee332a450d672ebd7d7b46206 Mon Sep 17 00:00:00 2001 From: Pierre-jean Texier Date: Wed, 6 Nov 2019 10:00:43 +0100 -Subject: [PATCH 0371/1113] overlays: smi: fix typo in comment (#3320) +Subject: [PATCH 0371/1148] overlays: smi: fix typo in comment (#3320) 5 represent alt1 function not alt0. @@ -340299,13 +340299,13 @@ index 70104c11627c..bb8c7830df23 100644 5 5 5 5 5 5 5 5 5>; /* /CS, /WE and /OE are pulled high, as they are -- -2.18.2 +2.18.4 -From 72ee96a29ba64abfed3e59f17dd4c77d1d65497d Mon Sep 17 00:00:00 2001 +From 2eaeb93ce95f72dc4bf2e40753bdc5c6b31abb04 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 7 Nov 2019 14:59:59 +0000 -Subject: [PATCH 0372/1113] net:phy:2711 Change the default ethernet LED +Subject: [PATCH 0372/1148] net:phy:2711 Change the default ethernet LED actions This should return default behaviour back to that of previous @@ -340339,13 +340339,13 @@ index 8f26eaf2280c..ed394d48ea24 100644 BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1); bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val); -- -2.18.2 +2.18.4 -From 6b00a4f72af8fbff3a90c5d05509e6435c1c4be1 Mon Sep 17 00:00:00 2001 +From d7ceeb35194d83e90717abc67e60308a8d85f8dd Mon Sep 17 00:00:00 2001 From: Michael Kaplan Date: Fri, 8 Nov 2019 10:35:57 +0100 -Subject: [PATCH 0373/1113] overlays: Add apds9960 overlay +Subject: [PATCH 0373/1148] 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. @@ -340453,13 +340453,13 @@ index 000000000000..c216932278ab +}; + -- -2.18.2 +2.18.4 -From 0f18f7cfc2a24b2dc80fc210333528452bcb08db Mon Sep 17 00:00:00 2001 +From d6c07efa84b810bc389056f4253bf604230395c6 Mon Sep 17 00:00:00 2001 From: Michael Kaplan Date: Fri, 8 Nov 2019 11:13:25 +0100 -Subject: [PATCH 0374/1113] configs: apds9960: add module to defconfigs +Subject: [PATCH 0374/1148] configs: apds9960: add module to defconfigs Signed-off-by: Michael Kaplan --- @@ -340538,13 +340538,13 @@ index ca7668f549bc..d87831d79a03 100644 CONFIG_PWM_PCA9685=m CONFIG_EXT4_FS=y -- -2.18.2 +2.18.4 -From bdfde81a4089e29591eaa8ecaa39c16a41dbb0d0 Mon Sep 17 00:00:00 2001 +From 1ee74f9df087aa5639443f0dc37d9860fb1f9137 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Oct 2019 10:19:50 +0100 -Subject: [PATCH 0375/1113] overlays: Remove hack from uart0 overlay +Subject: [PATCH 0375/1148] 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 @@ -340589,13 +340589,13 @@ index 57ba7745d023..73d563bbaabf 100755 }; }; -- -2.18.2 +2.18.4 -From 19c5878f6799c99818d2b668e615b61c448fde43 Mon Sep 17 00:00:00 2001 +From c84016dba9b0883d400308c5d720fef9e0199ccb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 Nov 2019 16:28:10 +0000 -Subject: [PATCH 0376/1113] Revert "brcmfmac: Disable power management" +Subject: [PATCH 0376/1148] 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 @@ -340634,13 +340634,13 @@ index 4b97dfcda3cd..4beef16e328f 100644 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm); if (err) { -- -2.18.2 +2.18.4 -From 62ff285a6cfee90eeb50adb532fb30881fc91b0a Mon Sep 17 00:00:00 2001 +From 5c566d305888d261ac0b2035301e7468f8a7460e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Nov 2019 16:20:24 +0000 -Subject: [PATCH 0377/1113] arm: dts: overlays: pitft35-resistive: add upstream +Subject: [PATCH 0377/1148] arm: dts: overlays: pitft35-resistive: add upstream compatible The upstream hx8357d driver uses "adafruit,yx350hv15" for the compatible @@ -340667,13 +340667,13 @@ index a69b6c2c7608..37629f18a740 100644 pinctrl-names = "default"; pinctrl-0 = <&pitft_pins>; -- -2.18.2 +2.18.4 -From bb9ba39d6bfc09d6d610508ddef6131be4c92b05 Mon Sep 17 00:00:00 2001 +From 91b55f198824eca5b243799e9a850df0a902f2c9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 23 Aug 2019 16:34:38 +0100 -Subject: [PATCH 0378/1113] v3d_drv: Handle missing clock more gracefully +Subject: [PATCH 0378/1148] v3d_drv: Handle missing clock more gracefully Signed-off-by: popcornmix --- @@ -340698,13 +340698,13 @@ index 72da17e4963e..8b08ad828fe7 100644 } v3d->clk_up_rate = clk_get_rate(v3d->clk); -- -2.18.2 +2.18.4 -From d720f4d494a3036c64bf5d3e9b0218ab2c48f070 Mon Sep 17 00:00:00 2001 +From da4e2b66f5049027834ee171df167c1dbb00bcac Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 23:50:44 +0100 -Subject: [PATCH 0379/1113] v3d_drv: Allow clock retrieval by name +Subject: [PATCH 0379/1148] v3d_drv: Allow clock retrieval by name Signed-off-by: Phil Elwell --- @@ -340727,13 +340727,13 @@ index 8b08ad828fe7..2f50268c0159 100644 if (PTR_ERR(v3d->clk) != -EPROBE_DEFER) dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk)); -- -2.18.2 +2.18.4 -From f60da3f7045799ede53b3e3c997c73796fafd03c Mon Sep 17 00:00:00 2001 +From 50d946b6fba64e2046280dfb1b154dcd01558fea Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 5 Sep 2019 17:59:14 +0100 -Subject: [PATCH 0380/1113] v3d_gem: Kick the clock so firmware knows we are +Subject: [PATCH 0380/1148] 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 @@ -340760,13 +340760,13 @@ index 8b5dc2b20e38..2d0626a52706 100644 * treat 0 as special, such as the occlusion query counters * where 0 means "disabled". -- -2.18.2 +2.18.4 -From a7081d957fc66867d2b6d25b2c4d6a24ae2b3136 Mon Sep 17 00:00:00 2001 +From df9e85be98479056c36d45216f0259c9b586242e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 15:49:56 +0100 -Subject: [PATCH 0381/1113] clk-raspberrypi: Allow cpufreq driver to also +Subject: [PATCH 0381/1148] clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks For performance/power it is beneficial to adjust gpu clocks with arm clock. @@ -340791,13 +340791,13 @@ index 1654fd0eedc9..e4e139240340 100644 int ret; -- -2.18.2 +2.18.4 -From ba143c20698a02642baa68c197c3347ffff30a58 Mon Sep 17 00:00:00 2001 +From 4c09b53c5630ec13667cb398399399de8ede6e80 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 21 Aug 2019 14:55:56 +0100 -Subject: [PATCH 0382/1113] clk-raspberrypi: Also support v3d clock +Subject: [PATCH 0382/1148] clk-raspberrypi: Also support v3d clock Signed-off-by: popcornmix --- @@ -341444,13 +341444,13 @@ index e4e139240340..8daf26df5430 100644 -1, NULL, 0); -- -2.18.2 +2.18.4 -From 774e0269cb59134e7cae6d4c41afb05325defaf9 Mon Sep 17 00:00:00 2001 +From b7ab08bc2d49d1392cfb17a7fccf2c2cedf5dec2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 3 Sep 2019 20:28:00 +0100 -Subject: [PATCH 0383/1113] clk-bcm2835: Disable v3d clock +Subject: [PATCH 0383/1148] clk-bcm2835: Disable v3d clock This is controlled by firmware, see clk-raspberrypi.c @@ -341508,13 +341508,13 @@ index 30e548c0031c..e544e476bf84 100644 * VPU clock. This doesn't have an enable bit, since it drives * the bus for everything else, and is special so it doesn't need -- -2.18.2 +2.18.4 -From 6345b59f45d4c3c1cd1b7db6dbd81b1af3bf3da8 Mon Sep 17 00:00:00 2001 +From fea353c3a927cb1bb2b53478b34b3af3a6bb0ade Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 20 Aug 2019 17:53:47 +0100 -Subject: [PATCH 0384/1113] config: Switch to upstream cpufreq driver +Subject: [PATCH 0384/1148] config: Switch to upstream cpufreq driver Signed-off-by: popcornmix --- @@ -341544,13 +341544,13 @@ index 5f08fcdb02b1..3d437a331698 100644 CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set -- -2.18.2 +2.18.4 -From dcf93e6ef84668c74686f911091f26c4ffd848fe Mon Sep 17 00:00:00 2001 +From 6a2d51c2af7d4e18431a145d9cd6bfddfa4b9f0a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 13 Sep 2019 13:45:11 +0100 -Subject: [PATCH 0385/1113] raspberrypi-cpufreq: Only report integer pll +Subject: [PATCH 0385/1148] raspberrypi-cpufreq: Only report integer pll divisor frequencies --- @@ -341590,13 +341590,13 @@ index 2bc7d9734272..8bcfab2749a8 100644 if (ret) goto remove_opp; -- -2.18.2 +2.18.4 -From 22ad20d2524f59096733f1e97393b9713850f4fb Mon Sep 17 00:00:00 2001 +From ea3114a55f2c34963f62f5d752eb663dd2a18c84 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 11:38:09 +0000 -Subject: [PATCH 0386/1113] configs: Regenerate defconfigs +Subject: [PATCH 0386/1148] configs: Regenerate defconfigs Signed-off-by: Phil Elwell --- @@ -341827,13 +341827,13 @@ index d87831d79a03..7a29553d08d6 100644 CONFIG_VIDEO_BCM2835=m CONFIG_VIDEO_CODEC_BCM2835=m -- -2.18.2 +2.18.4 -From e12dd87202e8c3ec86cb612fc3f0dede226f0780 Mon Sep 17 00:00:00 2001 +From d297eb0b44fb8235fef4d060ca3d36d83c3a6212 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 11:44:30 +0000 -Subject: [PATCH 0387/1113] configs:2711: Add V3D clock support on arm64 +Subject: [PATCH 0387/1148] 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 @@ -341866,13 +341866,13 @@ index edab9acd21c8..cbdad7c47bf3 100644 CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set -- -2.18.2 +2.18.4 -From cd14f4cc846c6657255147f805ac7505bdd22257 Mon Sep 17 00:00:00 2001 +From 44a3a2498e16dcdc64f2dafacd2b0f8cea15b4ef Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 15:08:25 +0000 -Subject: [PATCH 0388/1113] arm/dts: Correct Pi 4B LED values +Subject: [PATCH 0388/1148] 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 @@ -341913,13 +341913,13 @@ index bacebaaac9d3..d9a09e129656 100644 eth_max_speed Set the maximum speed a link is allowed -- -2.18.2 +2.18.4 -From 4dc8ab3f43acd064fb8221886eb91178245a8075 Mon Sep 17 00:00:00 2001 +From 30db632c58c74ae33aea4013fbaf1052bd640666 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 16:23:32 +0000 -Subject: [PATCH 0389/1113] drm/v3d: Set dma_mask as well as coherent_dma_mask +Subject: [PATCH 0389/1148] 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 @@ -341946,13 +341946,13 @@ index 2f50268c0159..87ce683f3c04 100644 ident1 = V3D_READ(V3D_HUB_IDENT1); -- -2.18.2 +2.18.4 -From 83ef2109c1be841e788449360c940f1bea9b72e7 Mon Sep 17 00:00:00 2001 +From d877f11b5c4dc06c12a060de9f2657c1b3f09777 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 28 Nov 2019 15:49:08 +0000 -Subject: [PATCH 0390/1113] arm/dts: 2711: Add 'pcie0' alias +Subject: [PATCH 0390/1148] 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" @@ -341976,13 +341976,13 @@ index 6ce9a58a6ed5..a967a7b86f2c 100644 }; -- -2.18.2 +2.18.4 -From 4b5fc243a5129692c669992583e2dafd87066a38 Mon Sep 17 00:00:00 2001 +From a84de0ad8c7e2052510028dbb5485f3a04facdf7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 28 Nov 2019 15:51:58 +0000 -Subject: [PATCH 0391/1113] Revert "drm/vc4: Add support for H & V flips" +Subject: [PATCH 0391/1148] Revert "drm/vc4: Add support for H & V flips" This reverts commit 3293cb5284bf7c80217cba8e7c3f67fba1953e1d. This functionality has already been added via @@ -342090,13 +342090,13 @@ index f21c03f550e5..1c5eef3ac441 100644 return plane; } -- -2.18.2 +2.18.4 -From 5c07a3e758501bc508d7241af9bc782c092713c4 Mon Sep 17 00:00:00 2001 +From e55ade7141b791ffa161831cf5cddfd56c881115 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 30 Nov 2019 23:10:26 +0100 -Subject: [PATCH 0392/1113] rpi-cirrus-wm5102-overlay: fix pinctrl +Subject: [PATCH 0392/1148] rpi-cirrus-wm5102-overlay: fix pinctrl configuration Separate GPIOs connected to wm5102 and wm8804 into 2 pinctrl @@ -342220,13 +342220,13 @@ index e2c25a0535e6..1cbf5812af35 100644 __overlay__ { compatible = "wlf,rpi-cirrus"; -- -2.18.2 +2.18.4 -From ba510a8a4e8ee963efb3b18902cf81cda5c15690 Mon Sep 17 00:00:00 2001 +From 5934aeeceb809fdc76d8dc4fe1400cd100fcdb80 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Jan 2019 16:13:25 +0000 -Subject: [PATCH 0393/1113] staging: vchiq_arm: Set up dma ranges on child +Subject: [PATCH 0393/1148] staging: vchiq_arm: Set up dma ranges on child devices The VCHIQ driver now loads the audio, camera, codec, and vc-sm @@ -342259,13 +342259,13 @@ index d9492e24e07d..d556f42f575a 100644 } -- -2.18.2 +2.18.4 -From c50b7a2b09ab8aea2f19595b55c71a442a9ab340 Mon Sep 17 00:00:00 2001 +From cdcbf2af562a13cb8fcc8c95d6ed164e0203483a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Jun 2019 12:15:50 +0100 -Subject: [PATCH 0394/1113] staging: vchiq: Use the old dma controller for OF +Subject: [PATCH 0394/1148] 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 @@ -342316,13 +342316,13 @@ index d556f42f575a..d84f7324fe14 100644 return child; } -- -2.18.2 +2.18.4 -From 444774fae100682e2193751ad64595dd07f474f6 Mon Sep 17 00:00:00 2001 +From 728e893ef8f498d58622d8662137026cf47f865d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 5 Dec 2019 16:34:39 +0000 -Subject: [PATCH 0395/1113] Revert "staging: bcm2835_camera: Ensure all buffers +Subject: [PATCH 0395/1148] Revert "staging: bcm2835_camera: Ensure all buffers are returned on disable" This reverts commit d70c57a7c6a069977a0d827e1d5e2de53fb87e6d. @@ -342349,13 +342349,13 @@ index 341594ab669f..61a3593cdcfc 100644 msg_context->u.bulk.port, msg_context->u.bulk.status, -- -2.18.2 +2.18.4 -From b2b603f48e915db410bc2500b471fb6f2d2a6b59 Mon Sep 17 00:00:00 2001 +From 10166cc311296cc4d4d51ed315fbd0880daaa2aa Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Sun, 17 Nov 2019 10:31:46 +0800 -Subject: [PATCH 0396/1113] dwc_otg: checking the urb->transfer_buffer too +Subject: [PATCH 0396/1148] dwc_otg: checking the urb->transfer_buffer too early (#3332) After enable the HIGHMEM and VMSPLIT_3G, the dwc_otg driver doesn't @@ -342414,13 +342414,13 @@ index 70cce7abfb8d..eda7a33908b3 100644 flags |= URB_GIVEBACK_ASAP; if (urb->transfer_flags & URB_ZERO_PACKET) -- -2.18.2 +2.18.4 -From c43ea9aabadf202eec4de7b69d2624b4125ebad9 Mon Sep 17 00:00:00 2001 +From 676620091504eb1c1b480b93f4d7532a50e84f86 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Dec 2019 12:32:20 +0000 -Subject: [PATCH 0397/1113] overlays: Make mcp342x run-time compatible +Subject: [PATCH 0397/1148] 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 @@ -342629,13 +342629,13 @@ index 7bbb528f804f..714eca5a4b5e 100644 }; -- -2.18.2 +2.18.4 -From 26ec5736f170fe870959e0be4af7a9c9e3a6860d Mon Sep 17 00:00:00 2001 +From 76db7c11f90a905fcb69f62e38322e3ac72d066b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 29 Nov 2019 16:37:26 +0000 -Subject: [PATCH 0398/1113] config: arm64: Switch to upstream cpufreq driver +Subject: [PATCH 0398/1148] config: arm64: Switch to upstream cpufreq driver Signed-off-by: popcornmix --- @@ -342657,13 +342657,13 @@ index cbdad7c47bf3..7c14f88445a8 100644 CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_AES_ARM64_BS=m -- -2.18.2 +2.18.4 -From 4d43b68d179d997e0d0af6f8a5f08182289e824c Mon Sep 17 00:00:00 2001 +From 4bab2425a8b906b61d5c3243aefd657aec660e69 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 16 Dec 2019 23:25:44 +0100 -Subject: [PATCH 0399/1113] rpi-cirrus-wm5102-overlay: use reset-gpios instead +Subject: [PATCH 0399/1148] rpi-cirrus-wm5102-overlay: use reset-gpios instead of wlf,reset wlf,reset has been deprecated in favour of the standard reset-gpios @@ -342689,13 +342689,13 @@ index 1cbf5812af35..ed0c2745399f 100644 wlf,gpio-defaults = < ARIZONA_GP_DEFAULT -- -2.18.2 +2.18.4 -From 84defd6112c447dc71127674a07a9366048e372d Mon Sep 17 00:00:00 2001 +From 9ae36de01339d1113ea43d5c824b8409b5b20751 Mon Sep 17 00:00:00 2001 From: Johannes Krude Date: Sat, 16 Nov 2019 12:41:06 +0100 -Subject: [PATCH 0400/1113] sound/soc: only first codec is master in multicodec +Subject: [PATCH 0400/1148] sound/soc: only first codec is master in multicodec setup When using multiple codecs, at most one codec should generate the master @@ -342729,13 +342729,13 @@ index 0b9f9a06bdb5..dd7fdb53cd64 100644 dev_warn(codec_dai->dev, "ASoC: Failed to set DAI format: %d\n", ret); -- -2.18.2 +2.18.4 -From 856f8abc9885e10fa0b05c90e8c4aa8dc67bf7d6 Mon Sep 17 00:00:00 2001 +From 4184c1fff6362f7b8ceb30e8535af7d50b2a9d51 Mon Sep 17 00:00:00 2001 From: Johannes Krude Date: Sat, 16 Nov 2019 13:14:43 +0100 -Subject: [PATCH 0401/1113] Allow simultaneous use of JustBoom DAC and Digi +Subject: [PATCH 0401/1148] Allow simultaneous use of JustBoom DAC and Digi Signed-off-by: Johannes Krude --- @@ -343244,13 +343244,13 @@ index 000000000000..3d0194c1cab8 +MODULE_DESCRIPTION("ASoC Driver for simultaneous use of JustBoom PI Digi & DAC HAT Sound Cards"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 180980d9db1ec5783b61520e34f3245bab8d78c5 Mon Sep 17 00:00:00 2001 +From 5e9a557a01ff64dc561ce4fcf1dea1dd402a22b9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Dec 2019 10:41:33 +0000 -Subject: [PATCH 0402/1113] overlays: dht11: Allow multiple instantiation +Subject: [PATCH 0402/1148] 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. @@ -343284,13 +343284,13 @@ index 8de67527e317..6feeeb402493 100644 }; }; -- -2.18.2 +2.18.4 -From ddd3e2b9c10e3cac966e7b5bb65e8f976f3b3596 Mon Sep 17 00:00:00 2001 +From a6c493ca1caa6af64363880e5215778f50688220 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 20 Dec 2019 15:50:19 +0000 -Subject: [PATCH 0403/1113] configs: Add CONFIG_NET_SCH_CAKE=m +Subject: [PATCH 0403/1148] configs: Add CONFIG_NET_SCH_CAKE=m See: https://github.com/raspberrypi/linux/issues/3180 @@ -343364,13 +343364,13 @@ index cfef51db953a..10cf5ac4b833 100644 CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m -- -2.18.2 +2.18.4 -From 56ea56e8cdf43de9d647fc727153afc7d2c99f9f Mon Sep 17 00:00:00 2001 +From 28fa9ca8bf9b0a975da6e6c36d983adb7894058b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sun, 22 Dec 2019 15:13:37 +0000 -Subject: [PATCH 0404/1113] configs: Add RTS_DRV_PCF85363 +Subject: [PATCH 0404/1148] configs: Add RTS_DRV_PCF85363 See: https://github.com/raspberrypi/firmware/issues/1309 @@ -343444,13 +343444,13 @@ index 10cf5ac4b833..d8efa2d79d10 100644 CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m -- -2.18.2 +2.18.4 -From 7a70546f96c61c5672636b11bc4dea5f1fa3679d Mon Sep 17 00:00:00 2001 +From 9e3a486f33ec548bc16c1f085c62cdd3443056c1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sun, 22 Dec 2019 15:29:40 +0000 -Subject: [PATCH 0405/1113] overlays: i2c-rtc: Add pcf85363 support +Subject: [PATCH 0405/1148] overlays: i2c-rtc: Add pcf85363 support See: https://github.com/raspberrypi/firmware/issues/1309 @@ -343508,13 +343508,13 @@ index af5ca042de75..5df390b52a7b 100644 addr = <&abx80x>, "reg:0", <&ds1307>, "reg:0", -- -2.18.2 +2.18.4 -From 234286737bea3e8d1b9a128182dd437ea88b1659 Mon Sep 17 00:00:00 2001 +From 6f37e021a1f0cd8c8ddfbf84457b413b352f1f18 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jan 2020 16:04:30 +0000 -Subject: [PATCH 0406/1113] pinctrl: bcm2835: Remove gpiochip on error +Subject: [PATCH 0406/1148] 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. @@ -343539,13 +343539,13 @@ index 4ce2dd704c13..c8db202f239d 100644 dev_err(dev, "could not add GPIO chip\n"); return err; -- -2.18.2 +2.18.4 -From adf7bb44471ddb459b630189eeffbe35c085b6df Mon Sep 17 00:00:00 2001 +From 0f01cc80613bab879532cc7a83a50dc8d68d29e5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jan 2020 14:05:42 +0000 -Subject: [PATCH 0407/1113] pinctrl: bcm2835: Change init order for gpio hogs +Subject: [PATCH 0407/1148] 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 @@ -343633,13 +343633,13 @@ index c8db202f239d..cf308212feca 100644 } -- -2.18.2 +2.18.4 -From 5ecefd1407709f723867268d63617d2660502eb0 Mon Sep 17 00:00:00 2001 +From a1e547b3449d2d6cf2125f707d76309423eb5f0a Mon Sep 17 00:00:00 2001 From: Giedrius Date: Tue, 7 Jan 2020 11:04:21 +0200 -Subject: [PATCH 0408/1113] Pisound: MIDI communication fixes for scaled down +Subject: [PATCH 0408/1148] Pisound: MIDI communication fixes for scaled down CPU. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -343739,13 +343739,13 @@ index 6af9921b55c7..c9a881cf8f7c 100644 if (!kfifo_is_empty(&spi_fifo_in) && g_recvCallback) -- -2.18.2 +2.18.4 -From fe14f4d72d46525daf3a30f1b6097bcbbba29632 Mon Sep 17 00:00:00 2001 +From 9ed3b9b37c19e80ef639acb1d0fc70f205234032 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Jan 2020 17:21:09 +0000 -Subject: [PATCH 0409/1113] pcie-brcmstb: Eliminate arch_dma_ops error message +Subject: [PATCH 0409/1148] 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 @@ -343893,13 +343893,13 @@ index e8c8b355548a..e646818ff21c 100644 bridge->ops = &brcm_pcie_ops; bridge->sysdata = pcie; -- -2.18.2 +2.18.4 -From ae9f5392f7012450a0bee60dc993eadf79adb920 Mon Sep 17 00:00:00 2001 +From 698ad9c575cdad0364a54931a05ec128057c11a5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Jan 2020 14:15:39 +0000 -Subject: [PATCH 0410/1113] brcmfmac: Disable power management +Subject: [PATCH 0410/1148] brcmfmac: Disable power management Disable power management in the brcmfmac driver again as it is still causing problems for some users. @@ -343930,13 +343930,13 @@ index 4beef16e328f..4b97dfcda3cd 100644 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm); if (err) { -- -2.18.2 +2.18.4 -From 7a2d7c9c47821ad964f0237c2eca734a29526fdb Mon Sep 17 00:00:00 2001 +From e8589cb359d291e79b8a798e56f47eeb081720f4 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 8 Dec 2019 14:45:14 +0100 -Subject: [PATCH 0411/1113] Revert "mmc: sdhci: Mask "spurious" interrupts" +Subject: [PATCH 0411/1148] Revert "mmc: sdhci: Mask "spurious" interrupts" This reverts commit adac895210b88770190e9a501462f2100ab40ac8, because this issue is already addressed by commit 19ec6bb80290e496021488084944b77f03a87dd7. @@ -343962,13 +343962,13 @@ index 07af68d5afa0..136f9737713d 100644 sdhci_cmd_irq(host, intmask & SDHCI_INT_CMD_MASK, &intmask); -- -2.18.2 +2.18.4 -From d803be2ef7d867d6fe8de0d3b1e4596cb193bc26 Mon Sep 17 00:00:00 2001 +From 0d98c6cf283ac7c74e1174ee0b4404622c05f0cc Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 16 Aug 2019 22:32:02 +0200 -Subject: [PATCH 0412/1113] ARM: dts: bcm283x: Remove simple-bus from fixed +Subject: [PATCH 0412/1148] ARM: dts: bcm283x: Remove simple-bus from fixed clocks commit 4b2d24662126b1e2a6b95c9dfe9e9044e105e5bd upstream. @@ -344019,13 +344019,13 @@ index f0dbd6af90fa..701123c5f6ee 100644 clock-output-names = "otg"; clock-frequency = <480000000>; -- -2.18.2 +2.18.4 -From 85498ec644e0d67dd8862faf0cc4077126ce3a4b Mon Sep 17 00:00:00 2001 +From 32b0e8f654dd84425638488db275006e645c3d52 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:15:00 +0100 -Subject: [PATCH 0413/1113] ARM: dts: bcm283x: Move system timer back to +Subject: [PATCH 0413/1148] ARM: dts: bcm283x: Move system timer back to bcm283x.dtsi During Raspberry Pi 4 upstream discussion Tim Gover confirmed that the @@ -344102,13 +344102,13 @@ index 701123c5f6ee..c9f405a0f5ec 100644 compatible = "brcm,bcm2835-txp"; reg = <0x7e004000 0x20>; -- -2.18.2 +2.18.4 -From ecdc0228dd8fbb5a96458900989f70fdfff7b85b Mon Sep 17 00:00:00 2001 +From c257a2697cd6f777bf81ed45002b1bf82bdcd93f Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 16:06:13 +0100 -Subject: [PATCH 0414/1113] ARM: dts: bcm283x: Move pixelvalve to +Subject: [PATCH 0414/1148] ARM: dts: bcm283x: Move pixelvalve to bcm2835-common.dtsi According to Eric Anholt the pixelvalves doesn't exists on BCM2711. @@ -344224,13 +344224,13 @@ index c9f405a0f5ec..1a78bd08c19e 100644 compatible = "brcm,bcm2835-hdmi"; reg = <0x7e902000 0x600>, -- -2.18.2 +2.18.4 -From ef9d23dddd616fcb19b959ba4d26617e030da6b3 Mon Sep 17 00:00:00 2001 +From 07712998439f8c02e5b98a5ad71f5658756f5dd3 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 15:32:29 +0100 -Subject: [PATCH 0415/1113] ARM: dts: bcm2838-rpi-4-b: Fix memory node +Subject: [PATCH 0415/1148] 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 @@ -344256,13 +344256,13 @@ index 7170a97bd3e4..35502763882e 100644 leds { -- -2.18.2 +2.18.4 -From 3be26c3e8f1ad619ae401dd036c980cffb0d0610 Mon Sep 17 00:00:00 2001 +From aa4e8d4a893c7a6452a76392e825dd2db369cb3e Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 15:43:41 +0100 -Subject: [PATCH 0416/1113] ARM: dts: bcm2838-rpi-4-b: Backport BT part from +Subject: [PATCH 0416/1148] 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 @@ -344289,13 +344289,13 @@ index 35502763882e..e65f924e1fd2 100644 bluetooth { -- -2.18.2 +2.18.4 -From c2350f735de84d5d171f1f0a83496bd2839f4a95 Mon Sep 17 00:00:00 2001 +From 9cc66bea1d9a5fc814f9b7a830ef284336ca284c Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 15:55:29 +0100 -Subject: [PATCH 0417/1113] ARM: dts: bcm2838: Backport node names from +Subject: [PATCH 0417/1148] ARM: dts: bcm2838: Backport node names from upstream According to devicetree specification the node name should describe @@ -344338,13 +344338,13 @@ index f7b64e077043..9b6edd6af4f2 100644 "ethernet-phy-ieee802.3-c22"; /* No interrupts - use PHY_POLL */ -- -2.18.2 +2.18.4 -From 15a64f95a4768dd701776647ef056e0e87679cad Mon Sep 17 00:00:00 2001 +From cd6a18744098134a08431b2348cf11c30f9eccbc Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 18:01:57 +0100 -Subject: [PATCH 0418/1113] ARM: dts: bcm283x: Move intc label to +Subject: [PATCH 0418/1148] 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. @@ -344382,13 +344382,13 @@ index 1a78bd08c19e..3706a795b586 100644 #size-cells = <1>; -- -2.18.2 +2.18.4 -From 7ec55fb8649fb3ad05236a3698099dce1acf9f23 Mon Sep 17 00:00:00 2001 +From 6b74f8f959b1e69f2a3e55024de0d923c92e671f Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 18:19:28 +0100 -Subject: [PATCH 0419/1113] ARM: dts: bcm2838: Remove always-on from +Subject: [PATCH 0419/1148] ARM: dts: bcm2838: Remove always-on from armv7-timer After moving bcm2835-system-timer to bcm283x.dtsi there is no need for @@ -344412,13 +344412,13 @@ index 9b6edd6af4f2..bfde2a2ad3d0 100644 cpus: cpus { -- -2.18.2 +2.18.4 -From 71e99ac08f27bfbec249f73bd6f6178f78d26289 Mon Sep 17 00:00:00 2001 +From 1c0c38ad75bcfa7b335c5bc688078277aacd0389 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 13:48:08 +0100 -Subject: [PATCH 0420/1113] Revert "phy: bcm54213pe: configure the LED outputs +Subject: [PATCH 0420/1148] Revert "phy: bcm54213pe: configure the LED outputs to be more user-friendly" This reverts commit 0f6693225eee62ee01c479c86fff76442979f906. @@ -344478,13 +344478,13 @@ index d7ebafbb3221..bfb37218f435 100644 #define BCM54XX_SHD_APD 0x0a #define BCM_APD_CLR_MASK 0xFE9F /* clear bits 5, 6 & 8 */ -- -2.18.2 +2.18.4 -From 1ccfc4f1a7f1e70b409032279f30d796238c7b58 Mon Sep 17 00:00:00 2001 +From 2ce43cf9d0efc91fec21c063ce11c24d2281df5b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 13:48:32 +0100 -Subject: [PATCH 0421/1113] Revert "phy: broadcom: split out the BCM54213PE +Subject: [PATCH 0421/1148] Revert "phy: broadcom: split out the BCM54213PE from the BCM54210E IDs" This reverts commit a377688aa4f69ebfe75c9dfc986e7d19605eb39f. @@ -344552,13 +344552,13 @@ index bfb37218f435..6db2d9a6e503 100644 #define PHY_ID_BCM5461 0x002060c0 #define PHY_ID_BCM54612E 0x03625e60 -- -2.18.2 +2.18.4 -From 9478be73b1ebb2116bb645bd2a44bbb1e1ec2e2b Mon Sep 17 00:00:00 2001 +From 940289ed6d47691d3c697e281c48d2aeecb37688 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 16:35:54 +0100 -Subject: [PATCH 0422/1113] net: bcmgenet: Add RGMII_RXID support +Subject: [PATCH 0422/1148] 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. @@ -344586,13 +344586,13 @@ index 3ba733295718..0516d14f4703 100644 PORT_MODE_EXT_GPHY, SYS_PORT_CTRL); break; -- -2.18.2 +2.18.4 -From 80966aa3983b931103576a0dfdb517b05bf8a86f Mon Sep 17 00:00:00 2001 +From 8f5306e60037b7c69a84eab30cb37eda1715b79b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 16:40:47 +0100 -Subject: [PATCH 0423/1113] ARM: dts: bcm2838: Backport genet from upstream +Subject: [PATCH 0423/1148] ARM: dts: bcm2838: Backport genet from upstream This backport all genet differences (different compatible, right PHY mode, board specific stuff) from upstream. @@ -344693,13 +344693,13 @@ index bfde2a2ad3d0..e6c79a2949e5 100644 }; -- -2.18.2 +2.18.4 -From 59ce1db364d9a6410367dee9bc039662e6362d4d Mon Sep 17 00:00:00 2001 +From 70b0e0f46c1bf72c18ae90d9f81fa54b2d041744 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:40:56 +0100 -Subject: [PATCH 0424/1113] ARM: bcm: Backport BCM2711 support from upstream +Subject: [PATCH 0424/1148] ARM: bcm: Backport BCM2711 support from upstream Make the BCM2711 a different machine, but keep it in board_bcm2835. @@ -344791,13 +344791,13 @@ index 16d761475a86..63b463b88040 100644 config ARCH_BCM_IPROC bool "Broadcom iProc SoC Family" -- -2.18.2 +2.18.4 -From 05c91baabe5f8eb855d58622a78cb876428a01ba Mon Sep 17 00:00:00 2001 +From 09fae8e9b93957235eeb4d51d175c8b0b5032818 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:55:59 +0100 -Subject: [PATCH 0425/1113] hwrng: iproc-rng200 - Add support for BCM2711 +Subject: [PATCH 0425/1148] hwrng: iproc-rng200 - Add support for BCM2711 commit 0f95b09a5f624964d520c8f6a2674090fb98ae25 upstream. @@ -344826,13 +344826,13 @@ index f971a4cb8951..7b6966b7f602 100644 { .compatible = "brcm,bcm7278-rng200", }, { .compatible = "brcm,iproc-rng200", }, -- -2.18.2 +2.18.4 -From 7923bd20758ee6b9152a1f5f218e2563141b7566 Mon Sep 17 00:00:00 2001 +From dc2c3bb43382fdd511bff6cfc2aacc67fd7d29c3 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 12:01:17 +0100 -Subject: [PATCH 0426/1113] ARM: dts: bcm2838: Add upstream RNG compatible +Subject: [PATCH 0426/1148] 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. @@ -344856,13 +344856,13 @@ index e6c79a2949e5..60c706b4def0 100644 &sdhost { -- -2.18.2 +2.18.4 -From 39fb4a34aa60cbbfbcdaa2b7a8ebf889bf167ab8 Mon Sep 17 00:00:00 2001 +From ceb9499fab562c2650f5b686b461ae8656253284 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 13:59:57 +0000 -Subject: [PATCH 0427/1113] driver: char: rpivid: Destroy the legacy device on +Subject: [PATCH 0427/1148] driver: char: rpivid: Destroy the legacy device on remove The legacy name support created a new device that was never destroyed. @@ -344888,13 +344888,13 @@ index e4e5fb1fb820..f69047d6f964 100644 class_destroy(priv->class); cdev_del(&priv->rpivid_mem_cdev); -- -2.18.2 +2.18.4 -From 415fe64abd1858beede2523bee3267fbe38a1705 Mon Sep 17 00:00:00 2001 +From 1c047c7d29d44d6e96af86ac0e3f9aa88e06c6ce Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 Jan 2020 16:24:45 +0000 -Subject: [PATCH 0428/1113] driver: char: rpivid: Clean up error handling use +Subject: [PATCH 0428/1148] driver: char: rpivid: Clean up error handling use of ERR_PTR/IS_ERR The driver used an unnecessary intermediate void* variable so it @@ -344956,13 +344956,13 @@ index f69047d6f964..ab42526ea8cf 100644 unregister_chrdev_region(priv->devid, 1); failed_alloc_chrdev: -- -2.18.2 +2.18.4 -From 3e8c07b12a59f2b6ffc3a598cdb48e1e6fe99cff Mon Sep 17 00:00:00 2001 +From a1aca4c0dfa6a0999d961d79624fd8d454aa3c7b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 14:02:43 +0000 -Subject: [PATCH 0429/1113] driver: char: rpivid: Add error handling to the +Subject: [PATCH 0429/1148] driver: char: rpivid: Add error handling to the legacy device load The return value from device_create for the legacy device was never @@ -345004,13 +345004,13 @@ index ab42526ea8cf..331e2e72aa4b 100644 class_destroy(priv->class); failed_class_create: -- -2.18.2 +2.18.4 -From fe1ebf99527c3fec43d31bb5274450aa912b5092 Mon Sep 17 00:00:00 2001 +From 6b7a18240ec0bc69c039adbf1d0313c52d34e222 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 14:05:45 +0000 -Subject: [PATCH 0430/1113] driver: char: rpivid: Fix coding style whitespace +Subject: [PATCH 0430/1148] driver: char: rpivid: Fix coding style whitespace issues. Makes checkpatch happier. @@ -345041,13 +345041,13 @@ index 331e2e72aa4b..432fb05944f2 100644 priv = kzalloc(sizeof(struct rpivid_mem_priv), GFP_KERNEL); -- -2.18.2 +2.18.4 -From 472b34dac8645572b0a0662546d5a7060f11f363 Mon Sep 17 00:00:00 2001 +From 2d23709b6df4dfcc24fe7de0c39c3d727c8ccec6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 14:07:16 +0000 -Subject: [PATCH 0431/1113] driver: char: rpimem: Add SPDX licence header. +Subject: [PATCH 0431/1148] driver: char: rpimem: Add SPDX licence header. Stops checkpatch complaining. @@ -345066,13 +345066,13 @@ index 432fb05944f2..fa97649b86c0 100644 * rpivid-mem.c - character device access to the RPiVid decoder registers * -- -2.18.2 +2.18.4 -From 75726592535c19d8923dcfe0476a7161875ec1ca Mon Sep 17 00:00:00 2001 +From de9a7e8234d803b013e27dfa102c6c3b9d1519fd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 Jan 2020 16:44:14 +0000 -Subject: [PATCH 0432/1113] driver: char: rpivid: Fix access to freed memory +Subject: [PATCH 0432/1148] 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. @@ -345099,13 +345099,13 @@ index fa97649b86c0..fbf3d4f3fe0c 100644 } -- -2.18.2 +2.18.4 -From 021fd792977a5a608a41e3e98546c884c96b9873 Mon Sep 17 00:00:00 2001 +From 5ab4921d9a88f13b93be1a6e762ed1893fcb9664 Mon Sep 17 00:00:00 2001 From: Willem Remie Date: Thu, 9 Jan 2020 21:16:49 +0100 -Subject: [PATCH 0433/1113] add BME680 to i2c-sensor overlay +Subject: [PATCH 0433/1148] add BME680 to i2c-sensor overlay --- arch/arm/boot/dts/overlays/README | 7 +++++-- @@ -345174,13 +345174,13 @@ index 777e4a68190a..40881d72a157 100644 }; }; -- -2.18.2 +2.18.4 -From ba7154ba3cf883267ea71ce90239e38ad7dd2558 Mon Sep 17 00:00:00 2001 +From 41e635aa4f20d60223f0476c878b26e4f1d96854 Mon Sep 17 00:00:00 2001 From: Willem Remie Date: Thu, 9 Jan 2020 21:54:11 +0100 -Subject: [PATCH 0434/1113] configs: Add BME680 +Subject: [PATCH 0434/1148] configs: Add BME680 --- arch/arm/configs/bcm2709_defconfig | 1 + @@ -345251,13 +345251,13 @@ index d8efa2d79d10..48eb2e6e342b 100644 CONFIG_HTU21=m CONFIG_APDS9960=m -- -2.18.2 +2.18.4 -From 8137554976cb266feb01950d44f5ecb385b3e058 Mon Sep 17 00:00:00 2001 +From 83267a3aca2f788e8ab08f864cb7170aa01b2594 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 7 Jan 2020 10:08:19 +0000 -Subject: [PATCH 0435/1113] dwc_otg: constrain endpoint max packet and transfer +Subject: [PATCH 0435/1148] dwc_otg: constrain endpoint max packet and transfer size on split IN The hcd would unconditionally set the transfer length to the endpoint @@ -345300,13 +345300,13 @@ index 9f2cd510c301..cba2aa07e8b8 100644 hc->xfer_len = 188; } -- -2.18.2 +2.18.4 -From 1ecfa589ef3895f74572a95ded08475f097ef950 Mon Sep 17 00:00:00 2001 +From 0ce9abee0ac15fd95f23e22e91ab61930b64a45a Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 8 Jan 2020 12:48:09 +0000 -Subject: [PATCH 0436/1113] dwc_otg: fiq_fsm: pause when cancelling split +Subject: [PATCH 0436/1148] dwc_otg: fiq_fsm: pause when cancelling split transactions Non-periodic splits will DMA to/from the driver-provided transfer_buffer, @@ -345403,13 +345403,13 @@ index 0e9a34fe3a5c..7a77977c9ddf 100644 #include -- -2.18.2 +2.18.4 -From ecf1106ff07737f5d5c8e2950d9c64538609f79d Mon Sep 17 00:00:00 2001 +From 1b821bb02cad86a71a570c1b1e0d3d8e38ade4a8 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Mon, 13 Jan 2020 15:54:55 +0000 -Subject: [PATCH 0437/1113] dwc_otg: fiq_fsm: add a barrier on entry into FIQ +Subject: [PATCH 0437/1148] dwc_otg: fiq_fsm: add a barrier on entry into FIQ handler(s) On BCM2835, there is no hardware guarantee that multiple outstanding @@ -345458,13 +345458,13 @@ index a86d8ed77140..490a7801e737 100644 hfnum.d32 = FIQ_READ(state->dwc_regs_base + HFNUM); gintsts.d32 = FIQ_READ(state->dwc_regs_base + GINTSTS); -- -2.18.2 +2.18.4 -From a6ef3edf99fbd369aaa56cd4bb93a3159b3d087d Mon Sep 17 00:00:00 2001 +From f6c6fcc1bc958693f82ba42ae95b6db1a8e299a4 Mon Sep 17 00:00:00 2001 From: Ed Spiridonov Date: Tue, 10 Dec 2019 22:45:04 +0300 -Subject: [PATCH 0438/1113] Add universal device tree overlay for SPI devices +Subject: [PATCH 0438/1148] 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! @@ -345742,14 +345742,14 @@ index 000000000000..87523dcca318 + }; +}; -- -2.18.2 +2.18.4 -From 8332d7e40311a9498a947f4e926c9ae3a0b40f4e Mon Sep 17 00:00:00 2001 +From 1839147568f33433060519bdd963bc530eb97edb 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 0439/1113] sound: Add the HiFiBerry DAC+HD version +Subject: [PATCH 0439/1148] 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. @@ -346633,13 +346633,13 @@ index 000000000000..79436dd0e06d +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ HD"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 19bcb51a30f9680fdc4ced63075f018584033304 Mon Sep 17 00:00:00 2001 +From f7cadfc40e23b2e9ef13b040e376727dbd538523 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Jan 2020 15:02:05 +0000 -Subject: [PATCH 0440/1113] configs: Add missing HIFIBERRYs to +Subject: [PATCH 0440/1148] configs: Add missing HIFIBERRYs to bcmrpi3_defconfig Signed-off-by: Phil Elwell @@ -346662,13 +346662,13 @@ index 3adf9e47b802..ff65bc543f61 100644 CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m CONFIG_SND_BCM2708_SOC_RPI_DAC=m -- -2.18.2 +2.18.4 -From c9df22bd8d22f8d8d794b05c8fb7abfa8bf41703 Mon Sep 17 00:00:00 2001 +From 90489a52611c834325239ede5345d56ae76cb929 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 0441/1113] Initialise rpi-firmware before clk-bcm2835 +Subject: [PATCH 0441/1148] 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 @@ -346717,14 +346717,14 @@ index 6ab3bec57532..4f3ab14d275a 100644 static void __init rpi_firmware_exit(void) { -- -2.18.2 +2.18.4 -From d2acbe642b6a318e2f6f82f34befa8e2bd6b6f2c Mon Sep 17 00:00:00 2001 +From 7d62fb71bc612897d160ccfbf7236ad8f563603f 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 0442/1113] Fix master mode settings of HiFiBerry DAC+ADC PRO +Subject: [PATCH 0442/1148] Fix master mode settings of HiFiBerry DAC+ADC PRO card (#3424) This patch fixes the board DAI setting when in master-mode. @@ -346749,13 +346749,13 @@ index cc33d4174839..06e0b6a8fda6 100644 // set DAC DAI configuration ret = snd_soc_dai_set_fmt(rtd->codec_dais[0], -- -2.18.2 +2.18.4 -From 131c7e6aa214ca1dac75fd80bdef1c6cf85620a4 Mon Sep 17 00:00:00 2001 +From 56c9a2e29ec1622ee7a4e17c510a82325634241d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Jan 2020 09:02:37 +0000 -Subject: [PATCH 0443/1113] overlays: Use preferred compatible strings +Subject: [PATCH 0443/1148] overlays: Use preferred compatible strings Make sure all overlays have correct compatible strings before enabling the automated checking. @@ -346835,13 +346835,13 @@ index b610d8283608..bafab6c92506 100644 target = <&soc>; __overlay__ { -- -2.18.2 +2.18.4 -From d671f15184052d450b33416798bd69fb7b3798e0 Mon Sep 17 00:00:00 2001 +From cb628700204377671e7e16a17fc96a842da0b88f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Jan 2020 11:38:28 +0000 -Subject: [PATCH 0444/1113] tty: amba-pl011: Add un/throttle support +Subject: [PATCH 0444/1148] 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 @@ -346902,13 +346902,13 @@ index 46ec9073a00b..823a530ccda0 100644 .break_ctl = pl011_break_ctl, .startup = pl011_startup, -- -2.18.2 +2.18.4 -From 8c60d6aa0ee2426fd6ab858e83119ec0eab1764f Mon Sep 17 00:00:00 2001 +From 4624ee295cc62205ef01c2314c19917b49dcc3e4 Mon Sep 17 00:00:00 2001 From: MikeDK Date: Sun, 26 Jan 2020 23:33:54 +0100 -Subject: [PATCH 0445/1113] Fix i2c-pwm-pca9685a overlay +Subject: [PATCH 0445/1148] Fix i2c-pwm-pca9685a overlay --- arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts | 2 +- @@ -346928,13 +346928,13 @@ index 108165df165e..9bb16465a50e 100644 reg = <0x40>; status = "okay"; -- -2.18.2 +2.18.4 -From 11bedcc6d9ae4300d4d94703118148fdaf90375c Mon Sep 17 00:00:00 2001 +From 153097e4159a8d83613b14f0096f60f3525a057f Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Mon, 27 Jan 2020 17:45:51 +0100 -Subject: [PATCH 0446/1113] adds LED OFF feature to HiFiBerry DAC+ADC PRO sound +Subject: [PATCH 0446/1148] adds LED OFF feature to HiFiBerry DAC+ADC PRO sound card This adds a DT overlay parameter 'leds_off' which allows @@ -347027,13 +347027,13 @@ index 06e0b6a8fda6..2883c3ce9488 100644 if (ret && ret != -EPROBE_DEFER) dev_err(&pdev->dev, -- -2.18.2 +2.18.4 -From 1985bb522d58bef4a39c7eaddaf2adca4ed0a9c7 Mon Sep 17 00:00:00 2001 +From f888e737a3ebae8f7a60e4d0e071367176cd232c Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Mon, 27 Jan 2020 20:37:34 +0100 -Subject: [PATCH 0447/1113] adds LED OFF feature to HiFiBerry DAC+ADC sound +Subject: [PATCH 0447/1148] adds LED OFF feature to HiFiBerry DAC+ADC sound card This adds a DT overlay parameter 'leds_off' which allows @@ -347114,13 +347114,13 @@ index ab454f2ecb17..ca763fea1d82 100644 ret = devm_snd_soc_register_card(&pdev->dev, &snd_rpi_hifiberry_dacplusadc); -- -2.18.2 +2.18.4 -From 58dca943f6404a722563781fb3f98f43cdf15c7e Mon Sep 17 00:00:00 2001 +From 1cdc7a609a9c1a44c4ab23d1979a0d7c5803a2e8 Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Mon, 27 Jan 2020 20:58:24 +0100 -Subject: [PATCH 0448/1113] adds LED OFF feature to HiFiBerry DAC+/DAC+PRO +Subject: [PATCH 0448/1148] adds LED OFF feature to HiFiBerry DAC+/DAC+PRO sound cards This adds a DT overlay parameter 'leds_off' which allows @@ -347201,13 +347201,13 @@ index fdf6e950abd8..4cde60a5b6f6 100644 ret = devm_snd_soc_register_card(&pdev->dev, -- -2.18.2 +2.18.4 -From b139c8895e057fadf635acd4f43478b808ed1dcc Mon Sep 17 00:00:00 2001 +From 5e30368b73e40032292b46934ec7e6e2e17004ae Mon Sep 17 00:00:00 2001 From: gtrainavicius Date: Tue, 28 Jan 2020 14:16:37 +0200 -Subject: [PATCH 0449/1113] pisound: Added reading Pisound board hardware +Subject: [PATCH 0449/1148] 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: @@ -347408,13 +347408,13 @@ index c9a881cf8f7c..3d0861082c83 100644 pisnd_kobj = kobject_create_and_add("pisound", kernel_kobj); if (!pisnd_kobj) { -- -2.18.2 +2.18.4 -From b21d16961ca675ce646d1ab7859b903a6bc239f2 Mon Sep 17 00:00:00 2001 +From 978e2c84aba5d2067a0bfac8d4e6e4cc0569a7e8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 2 Aug 2019 15:20:11 +0100 -Subject: [PATCH 0450/1113] mmc: sdhci-iproc: Fix vmmc regulators on iProc +Subject: [PATCH 0450/1148] 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 @@ -347460,13 +347460,13 @@ index f4f5f0a70cda..203940fd2900 100644 .reset = sdhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, -- -2.18.2 +2.18.4 -From 926f7e27ec74c388784222d80170a8f2ed508708 Mon Sep 17 00:00:00 2001 +From ae2332dc0a2fc3db2cff71f46382ed94ab54984b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 30 Jul 2019 12:37:02 +0100 -Subject: [PATCH 0451/1113] ARM: dts: Declare RPi 4B SD card power regulator +Subject: [PATCH 0451/1148] 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 @@ -347535,13 +347535,13 @@ index a0605e2480af..315576a5b957 100644 CONFIG_REGULATOR_ARIZONA_MICSUPP=m CONFIG_REGULATOR_GPIO=y -- -2.18.2 +2.18.4 -From c411c53e7666deb92306408c46cdd788b6123e7f Mon Sep 17 00:00:00 2001 +From a439ebf893e340f2149d5a16b376fc274300113e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 11:41:25 +0100 -Subject: [PATCH 0452/1113] pcie-brcmstb: Bounce buffer support is for +Subject: [PATCH 0452/1148] pcie-brcmstb: Bounce buffer support is for BCM2711B0 Add a new compatible string to identify BCM2711B0, as later revisions @@ -347630,13 +347630,13 @@ index e646818ff21c..fb777a4e4750 100644 ret = brcm_pcie_bounce_init(dev, bounce_buffer, (dma_addr_t)bounce_threshold); -- -2.18.2 +2.18.4 -From 7a3cff617f8bfb0d3cfef2e104f89dee09960d40 Mon Sep 17 00:00:00 2001 +From adefbfb7ee1c157ac20e11414c1ad170a7a63128 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 11:43:03 +0100 -Subject: [PATCH 0453/1113] bcm2838.dtsi: Use BCM2711 PCIe compatible string +Subject: [PATCH 0453/1148] 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 @@ -347665,13 +347665,13 @@ index 60c706b4def0..847dc7e35c94 100644 max-link-speed = <2>; tot-num-pcie = <1>; -- -2.18.2 +2.18.4 -From 775697ddefb92f41c4b5e7728a8989b2dd88938c Mon Sep 17 00:00:00 2001 +From c8b4b90a77f35b80244317268831cab0d77a6a5c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 11:29:06 +0000 -Subject: [PATCH 0454/1113] ARM: dts: Remove bcm2838-rpi-4-b.dts +Subject: [PATCH 0454/1148] 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. @@ -347836,13 +347836,13 @@ index 7c3fc83fe66e..000000000000 - status = "okay"; -}; -- -2.18.2 +2.18.4 -From 99be74f09f3d87e055417b5d3875dfdfc829a2e5 Mon Sep 17 00:00:00 2001 +From fd36afc310e66729ea5012cfe84bdc47d7c94082 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 09:35:19 +0000 -Subject: [PATCH 0455/1113] tty: amba-pl011: Avoid rare write-when-full error +Subject: [PATCH 0455/1148] 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 @@ -347884,13 +347884,13 @@ index 823a530ccda0..72184fe62eec 100644 break; -- -2.18.2 +2.18.4 -From 69a6039bdb141caca3853c49c4ef05224e341053 Mon Sep 17 00:00:00 2001 +From 7efc455b5adabff6e9e78ac7751ac90a7317f66c 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 0456/1113] usb: xhci: Raspberry Pi FW loader for VIA VL805 +Subject: [PATCH 0456/1148] 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 @@ -347976,13 +347976,13 @@ index ae71820af8e5..05c6989ec4c6 100644 /* Dispmanx TAGS */ RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE = 0x00040001, -- -2.18.2 +2.18.4 -From cfb1d2ad4c19460b2fcc1ea521322398abfb27f9 Mon Sep 17 00:00:00 2001 +From 3753f8f7ba5a4012dc8412cbba2300ef7298e0c6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 14:32:51 +0000 -Subject: [PATCH 0457/1113] overlays: Correct the eth_led* colour assignments +Subject: [PATCH 0457/1148] overlays: Correct the eth_led* colour assignments See: https://github.com/raspberrypi/firmware/issues/1311 @@ -348033,13 +348033,13 @@ index 3f324380a9f2..4032e1120d03 100644 eth_max_speed Set the maximum speed a link is allowed to negotiate. Legal values are 10, 100 and -- -2.18.2 +2.18.4 -From 81ecd7026c15e915bf69b403d5ff0a06a54d229a Mon Sep 17 00:00:00 2001 +From 3d29020887dc94f5c666042979b91fb3bf76d538 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 30 Jan 2020 12:42:07 +0000 -Subject: [PATCH 0458/1113] Revert "staging: vchiq_arm: Register a platform +Subject: [PATCH 0458/1148] Revert "staging: vchiq_arm: Register a platform device for audio" This reverts commit 25c7597af20d2b1d042bafd9be84eaa69c1690b7. @@ -348068,13 +348068,13 @@ index d84f7324fe14..7a9de9d0193c 100644 return 0; -- -2.18.2 +2.18.4 -From 403b872cab2b19672520e9e8a650ac54d24c71b4 Mon Sep 17 00:00:00 2001 +From 34f9a5f4558b2cacc7c4176bd26fb3355494b3a3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jan 2020 09:47:00 +0000 -Subject: [PATCH 0459/1113] ARM: dts: Add sd_poll_once dtparam to bcm283x/2711 +Subject: [PATCH 0459/1148] 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 @@ -348137,13 +348137,13 @@ index 4032e1120d03..699bf9a2fa85 100644 sd_pio_limit Number of blocks above which to use DMA for -- -2.18.2 +2.18.4 -From 22adcab520f036547c51ccac823d6c2c163f7eb2 Mon Sep 17 00:00:00 2001 +From c76b327baa48a9e05ceab71fabb6e4aeb1c43247 Mon Sep 17 00:00:00 2001 From: MikeDK Date: Fri, 31 Jan 2020 10:57:21 +0100 -Subject: [PATCH 0460/1113] overlays: Add ssd1306-spi, ssh1106-spi, +Subject: [PATCH 0460/1148] overlays: Add ssd1306-spi, ssh1106-spi, ssd-1351-spi Add overlays for SSD1306, SH1106 and SSD1351 based OLED displays. @@ -348508,13 +348508,13 @@ index 000000000000..0eb1451b36c0 + }; +}; -- -2.18.2 +2.18.4 -From aa4c7ac6b9ddca136b69197654535082236df5cd Mon Sep 17 00:00:00 2001 +From b87d5d05cbf942f070496f189c3c2b81a0d363e9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 12:42:27 +0000 -Subject: [PATCH 0461/1113] configs: Add NFS 4.2 support +Subject: [PATCH 0461/1148] configs: Add NFS 4.2 support See: https://github.com/raspberrypi/linux/issues/3397 @@ -348589,13 +348589,13 @@ index ff65bc543f61..4688da5d2e64 100644 CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m -- -2.18.2 +2.18.4 -From f44ea199ede64df3e678497337c7294a6cd36191 Mon Sep 17 00:00:00 2001 +From 90816750f3757b296583002cdf8f8c238156a5a1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 13:03:21 +0000 -Subject: [PATCH 0462/1113] overlays: dwc2: Increase RX FIFO size +Subject: [PATCH 0462/1148] 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 @@ -348643,13 +348643,13 @@ index 6112640837fc..96837d962188 100644 status = "okay"; }; -- -2.18.2 +2.18.4 -From 3912a4cc6415da4caa933ebf285087aa98666ce7 Mon Sep 17 00:00:00 2001 +From 8ca0af5a796562470f9eae32b35716989341aa40 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 15:22:55 +0000 -Subject: [PATCH 0463/1113] overlays: Fix mcp23017's addr parameter +Subject: [PATCH 0463/1148] 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 @@ -348695,13 +348695,13 @@ index 16af971c3bdb..c546d8ba7e6d 100644 }; -- -2.18.2 +2.18.4 -From 268b49d6d5fec1476a391e58745773d06cc3faaa Mon Sep 17 00:00:00 2001 +From bac4298db2d71dc76d55749eafaa59370a162302 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 16:35:12 +0000 -Subject: [PATCH 0464/1113] SQUASH: Fix spi driver compiler warnings +Subject: [PATCH 0464/1148] SQUASH: Fix spi driver compiler warnings Squash with "spi: spi-bcm2835: Disable forced software CS" @@ -348724,13 +348724,13 @@ index c2e7a2dbbcc7..dc759de7124b 100644 /* -- -2.18.2 +2.18.4 -From d11f18de4afcecdc304813987be8302793784f61 Mon Sep 17 00:00:00 2001 +From 00770d7c624151afdf458a0d0e433eaa5bbfebac Mon Sep 17 00:00:00 2001 From: Michael Kaplan Date: Wed, 5 Feb 2020 10:27:23 +0100 -Subject: [PATCH 0465/1113] overlays: add hdmi-backlight-hwhack-gpio-overlay +Subject: [PATCH 0465/1148] overlays: add hdmi-backlight-hwhack-gpio-overlay This is a Devicetree overlay for GPIO based backlight on/off capability. @@ -348841,13 +348841,13 @@ index 000000000000..50b9a2665c80 + }; +}; -- -2.18.2 +2.18.4 -From af77519abbb4f48ac07bc4a77fdcbcd63f0d7e91 Mon Sep 17 00:00:00 2001 +From 140b7c54f91111102200d515b45a86040e28a42b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 Nov 2019 16:28:10 +0000 -Subject: [PATCH 0466/1113] Revert "brcmfmac: Disable power management" +Subject: [PATCH 0466/1148] 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 @@ -348886,13 +348886,13 @@ index 4b97dfcda3cd..4beef16e328f 100644 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm); if (err) { -- -2.18.2 +2.18.4 -From 8901a4b755b78060f222fc7c385798f534164dab Mon Sep 17 00:00:00 2001 +From 527de7ef6bbccf57314b2b5f84bf3261cd2bae8e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 09:32:22 +0000 -Subject: [PATCH 0467/1113] brcmfmac: Increase power saving delay to 2s +Subject: [PATCH 0467/1148] 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, @@ -348917,13 +348917,13 @@ index 4beef16e328f..16bfcbe191c2 100644 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm); if (err) { -- -2.18.2 +2.18.4 -From 53b2cee11b8426ec406b09e29a7ea001446dd0dd Mon Sep 17 00:00:00 2001 +From 098322ca5f90fc4b4c74c50f14b97b2bba4507c8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jan 2020 11:39:39 +0000 -Subject: [PATCH 0468/1113] ARM: dts: Revert all changes to upstream dts files +Subject: [PATCH 0468/1148] 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. @@ -350878,13 +350878,13 @@ index 3706a795b586..202a61f574c7 100644 clocks { -- -2.18.2 +2.18.4 -From baa481929d3ff506ec2376ddb117e62a0113c5da Mon Sep 17 00:00:00 2001 +From 963cfaaadaec38d7437666026b64d198d0b23f78 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 16:53:13 +0000 -Subject: [PATCH 0469/1113] ARM: dts: Clean out downstream BCM2711/2838 files +Subject: [PATCH 0469/1148] ARM: dts: Clean out downstream BCM2711/2838 files Signed-off-by: Phil Elwell --- @@ -352743,13 +352743,13 @@ index 847dc7e35c94..000000000000 - interrupts = ; -}; -- -2.18.2 +2.18.4 -From 8df40b7b6afd8dd9927df1a5ff88b1aa67d7f627 Mon Sep 17 00:00:00 2001 +From 967cd475482952c86d337bc6dc6ffae357b5d236 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 6 Oct 2019 15:41:25 +0200 -Subject: [PATCH 0470/1113] ARM: dts: Add minimal Raspberry Pi 4 support +Subject: [PATCH 0470/1148] 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 @@ -353782,13 +353782,13 @@ index 000000000000..0ff0e9e25327 + g-tx-fifo-size = <256 256 512 512 512 768 768>; +}; -- -2.18.2 +2.18.4 -From a1a771c3aa5bcb4a0707e6ccf9f974d0a0e76cf4 Mon Sep 17 00:00:00 2001 +From 10951ebddf106a1070c0dafad31237beebbe5017 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 6 Nov 2019 10:59:44 +0100 -Subject: [PATCH 0471/1113] ARM: dts: bcm2711: force CMA into first GB of +Subject: [PATCH 0471/1148] ARM: dts: bcm2711: force CMA into first GB of memory arm64 places the CMA in ZONE_DMA32, which is not good enough for the @@ -353834,13 +353834,13 @@ index ac83dac2e6ba..34d24fe272e2 100644 /* * Defined ranges: -- -2.18.2 +2.18.4 -From 7efda4dbfcc5c912f5f1c92100c1dc2976304f2d Mon Sep 17 00:00:00 2001 +From d685fd1a367ef743431863730f408581bdd1ebbc Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 11 Nov 2019 20:49:26 +0100 -Subject: [PATCH 0472/1113] ARM: dts: bcm2711-rpi-4: Enable GENET support +Subject: [PATCH 0472/1148] 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 @@ -353928,13 +353928,13 @@ index 34d24fe272e2..961bed832755 100644 &clk_osc { -- -2.18.2 +2.18.4 -From 5944fa27556a4f5af250aa3ae1819b9e01524cd1 Mon Sep 17 00:00:00 2001 +From 911247bd022895a8e9d7a750786e196c0b5fed64 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 4 Dec 2019 13:56:33 +0100 -Subject: [PATCH 0473/1113] ARM: dts: bcm2711: fix soc's node dma-ranges +Subject: [PATCH 0473/1148] 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 @@ -353974,13 +353974,13 @@ index 961bed832755..e2f6ffb00aa9 100644 /* * This node is the provider for the enable-method for -- -2.18.2 +2.18.4 -From dcb718f56019bc43fd3fe75a0cc1a7a810d32e2d Mon Sep 17 00:00:00 2001 +From 4af5aa91216f7795f9f94bff1e6f298efb94cde7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jan 2020 15:48:00 +0000 -Subject: [PATCH 0474/1113] ARM: dts: Rebuild downstream DTS files +Subject: [PATCH 0474/1148] 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 @@ -355074,13 +355074,13 @@ index 000000000000..6c8b26388229 + compatible = "brcm,bcm2711-genet-v5", "brcm,genet-v5"; +}; -- -2.18.2 +2.18.4 -From 9f3638c05255f0f791c8102b86d131bc01c20502 Mon Sep 17 00:00:00 2001 +From 2c735fe4c20745da558dba07a53bcb7a31ce7a78 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 15:47:43 +0000 -Subject: [PATCH 0475/1113] Revert "bcm2711: Retain support for old dtbs" +Subject: [PATCH 0475/1148] Revert "bcm2711: Retain support for old dtbs" This reverts commit 61a505c739150c8dbb57a73db5c6c720d5160157. --- @@ -355132,13 +355132,13 @@ index cf308212feca..43e3127e25cd 100644 }; -- -2.18.2 +2.18.4 -From 437ff0fd5709e8a1bea124620788ae6c378e7bb2 Mon Sep 17 00:00:00 2001 +From 519304c1805f32869ba4865f4f069dbb5c16b995 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:26:18 +0000 -Subject: [PATCH 0476/1113] staging/vchiq_arm: Fix bcm2711 compatible string +Subject: [PATCH 0476/1148] staging/vchiq_arm: Fix bcm2711 compatible string Fixes: "vchiq: Add 36-bit address support" @@ -355170,13 +355170,13 @@ index 7a9de9d0193c..3a120f3b33ad 100644 }; MODULE_DEVICE_TABLE(of, vchiq_of_match); -- -2.18.2 +2.18.4 -From 43155060be0acef3740309e3ac7aebeca63c4455 Mon Sep 17 00:00:00 2001 +From ffce27d9f02ac529ed0c5ffbcb2e872999891a00 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:28:57 +0000 -Subject: [PATCH 0477/1113] bcm2835-dma: Correct SoC name +Subject: [PATCH 0477/1148] bcm2835-dma: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355665,13 +355665,13 @@ index 87fd58272e95..8d7c80536aa4 100644 /* get irqs for each channel that we support */ -- -2.18.2 +2.18.4 -From c6dd2ece09dad38f5d5597965161b46129674155 Mon Sep 17 00:00:00 2001 +From 86c738ec609fd6b351661b5d8fd7ef9d6880f1a6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:33:40 +0000 -Subject: [PATCH 0478/1113] thermal: brcmstb_thermal: Correct SoC name +Subject: [PATCH 0478/1148] thermal: brcmstb_thermal: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355718,13 +355718,13 @@ index 7a7c6ad7b8a0..08f71fec5152 100644 }; MODULE_DEVICE_TABLE(of, brcmstb_thermal_id_table); -- -2.18.2 +2.18.4 -From 39bdc7f821f727d535aacce5cc23dd64e0d6339c Mon Sep 17 00:00:00 2001 +From 56a6878a2905cd29fbabfb68eae537088aff09c3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:36:57 +0000 -Subject: [PATCH 0479/1113] hwrng: iproc-rng200: Correct SoC name +Subject: [PATCH 0479/1148] hwrng: iproc-rng200: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355793,13 +355793,13 @@ index 7b6966b7f602..857dacd49c3b 100644 }; MODULE_DEVICE_TABLE(of, iproc_rng200_of_match); -- -2.18.2 +2.18.4 -From f40004220f491d345b6c351a27d831f4ee1129a4 Mon Sep 17 00:00:00 2001 +From 964fc16c727e30a569d9c23e91241ba383fbd82f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:39:40 +0000 -Subject: [PATCH 0480/1113] pcie-brcmstb: Correct SoC name +Subject: [PATCH 0480/1148] pcie-brcmstb: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355897,13 +355897,13 @@ index ac8dde3c030b..dec65992902e 100644 return ret; -- -2.18.2 +2.18.4 -From 63322be38b8e6ef85fd3f3726ab7a20c2b483266 Mon Sep 17 00:00:00 2001 +From de0e77a7f3182ed92b012391a26dbf589f945207 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 15:24:59 +0000 -Subject: [PATCH 0481/1113] ARM: dts: Correct SoC name +Subject: [PATCH 0481/1148] ARM: dts: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355953,13 +355953,13 @@ index 6c8b26388229..29e7aa15d5a3 100644 }; -- -2.18.2 +2.18.4 -From 8d2b6c23f3a72e26b775c8f9f467aea5f490660c Mon Sep 17 00:00:00 2001 +From 621a66fc6c76eb95609866565c09157f5b245fdb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 1 Feb 2020 08:58:11 +0000 -Subject: [PATCH 0482/1113] ARM: dts: Remove CMA allocation from Pi 4 dts +Subject: [PATCH 0482/1148] 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. @@ -355991,13 +355991,13 @@ index 2013cf832567..f5bd44ea2bf1 100644 &mmcnr { -- -2.18.2 +2.18.4 -From dca3a93c83a9f3b7ee6749efd7852a6452ef813c Mon Sep 17 00:00:00 2001 +From ff59e8895a0abc885012a4eb57d2557b0741241e Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 6 Dec 2018 19:28:55 +0100 -Subject: [PATCH 0483/1113] staging: vchiq_arm: Register a platform device for +Subject: [PATCH 0483/1148] staging: vchiq_arm: Register a platform device for audio Following Eric's commit 37b7b3087a2f ("staging/vc04_services: Register a @@ -356032,13 +356032,13 @@ index 3a120f3b33ad..57867b75d61a 100644 return 0; -- -2.18.2 +2.18.4 -From a86c608e246353ddd7642aeb62abf998786b5659 Mon Sep 17 00:00:00 2001 +From 1760d4a01c86aa6852e3da39f43f95c94493ac72 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 17:30:46 +0000 -Subject: [PATCH 0484/1113] staging: vchiq_arm: Give vchiq children DT nodes +Subject: [PATCH 0484/1148] 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 @@ -356077,13 +356077,13 @@ index 57867b75d61a..a3fcb1830995 100644 * We want the dma-ranges etc to be copied from a device with the * correct dma-ranges for the VPU. -- -2.18.2 +2.18.4 -From 1d9f8bdeffc542b7f0616670a4a602d62c87742d Mon Sep 17 00:00:00 2001 +From 7ca21775fa1605391ce381dae6dbd82560675601 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 17:03:29 +0000 -Subject: [PATCH 0485/1113] ARM: dts: Move audio node under the vchiq parent +Subject: [PATCH 0485/1148] 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 @@ -356164,13 +356164,13 @@ index 29e7aa15d5a3..a71b2eb74723 100644 /* The VPU firmware uses DMA channel 11 for VCHIQ */ brcm,dma-channel-mask = <0x1f5>; -- -2.18.2 +2.18.4 -From 0949947b091c0d863479958f51cf2c3d3860f6f2 Mon Sep 17 00:00:00 2001 +From 9782b06c2703d7ee655c55742a9300bc63184fd7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Feb 2020 13:34:08 +0000 -Subject: [PATCH 0486/1113] ARM: dts: bcm283x: Restore simple-bus to /clocks +Subject: [PATCH 0486/1148] 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 @@ -356205,13 +356205,13 @@ index 202a61f574c7..18a95aaca191 100644 clk_osc: clk-osc { compatible = "fixed-clock"; -- -2.18.2 +2.18.4 -From 533ce9903c0912fad57dac90b1068616c1d5a219 Mon Sep 17 00:00:00 2001 +From 7f7c24a7c7651de2920049c9a001187146bbd480 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Feb 2020 10:22:48 +0000 -Subject: [PATCH 0487/1113] Revert "ARM: dts: bcm283x: Restore simple-bus to +Subject: [PATCH 0487/1148] Revert "ARM: dts: bcm283x: Restore simple-bus to /clocks" This reverts commit 894dece014e4df68c9f6a11a0761fba1fcfc844f. @@ -356235,13 +356235,13 @@ index 18a95aaca191..202a61f574c7 100644 clk_osc: clk-osc { compatible = "fixed-clock"; -- -2.18.2 +2.18.4 -From 733525e8aac24ad1e5b56f0a6a3d31ab48681667 Mon Sep 17 00:00:00 2001 +From f498554013012ec34b77d6b36237c46ee067dd0f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Feb 2020 11:22:40 +0000 -Subject: [PATCH 0488/1113] ARM: dts: overlays: Create custom clocks in / +Subject: [PATCH 0488/1148] 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. @@ -356328,13 +356328,13 @@ index 7bf0317ea83b..c5583e010339 100644 dachd_osc: pll_dachd_osc { compatible = "hifiberry,dachd-clk"; -- -2.18.2 +2.18.4 -From 6d5021e0ffa3e9accfb090f2952c164e06fdd1df Mon Sep 17 00:00:00 2001 +From f1a03c5fe5875d33db2c03072db7049f1fd329a3 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 30 Jan 2020 12:35:44 +0000 -Subject: [PATCH 0489/1113] staging: vc04_services: Fix vcsm overflow bug when +Subject: [PATCH 0489/1148] staging: vc04_services: Fix vcsm overflow bug when counting transactions The response block and local state were using u16 and u32 respectively @@ -356360,13 +356360,13 @@ index 83110c55f440..c87b964abb31 100644 u8 msg[VC_SM_MAX_MSG_LEN]; -- -2.18.2 +2.18.4 -From aae3b97368e90da53e16d6fa65a11a3490b088cf Mon Sep 17 00:00:00 2001 +From 2ed6e29eb683a892b61d920c9d30d48566c3d91f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 7 Feb 2020 09:51:31 +0000 -Subject: [PATCH 0490/1113] overlays: Add timeout_ms parameter to gpio-poweroff +Subject: [PATCH 0490/1148] 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. @@ -356402,13 +356402,13 @@ index bb8cd3bf264d..416aa2bc797a 100644 }; }; -- -2.18.2 +2.18.4 -From 8d87685a96540b703550b2b1b37c6cc7fb901576 Mon Sep 17 00:00:00 2001 +From 86d4461068f43289ddd09bc05c51a8ff6885b166 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 10 Feb 2020 15:47:07 +0100 -Subject: [PATCH 0491/1113] defconfigs: enable CONFIG_BPF_LIRC_MODE2 +Subject: [PATCH 0491/1148] defconfigs: enable CONFIG_BPF_LIRC_MODE2 This enables support for IR decoding via BPF programs. @@ -356469,13 +356469,13 @@ index 6b4eae39fee6..894168aeef61 100644 CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m -- -2.18.2 +2.18.4 -From 1c171d45fb4a208e6d1d725d38f77589869a7f61 Mon Sep 17 00:00:00 2001 +From cbfd4cdad0140e470b646be84924348dccc5aa1a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 10 Feb 2020 18:21:02 +0100 -Subject: [PATCH 0492/1113] bcmrpi3_defconfig: align RC config with +Subject: [PATCH 0492/1148] bcmrpi3_defconfig: align RC config with bcm2711_defconfig Signed-off-by: Matthias Reichl @@ -356521,13 +356521,13 @@ index 4688da5d2e64..1dad7bcb579a 100644 CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -- -2.18.2 +2.18.4 -From 123ca8080b46bc4645aecd069954fc6b152ed744 Mon Sep 17 00:00:00 2001 +From f80463d80b80c34fda6fcb4573c885ccba2ff83f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 6 Feb 2020 12:23:15 +0000 -Subject: [PATCH 0493/1113] of: overlay: Correct symbol path fixups +Subject: [PATCH 0493/1148] 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 @@ -356564,13 +356564,13 @@ index 1688f576ee8a..bef83edca195 100644 new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL); if (!new_prop) -- -2.18.2 +2.18.4 -From d8c780c49d27c0cef6a1a3cc014e4c1a427c68c3 Mon Sep 17 00:00:00 2001 +From 5db68bcce73e247a2351505c1e6014de7ae7314b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 24 Feb 2020 11:13:09 +0000 -Subject: [PATCH 0494/1113] configs: Add CONFIG_HID_STEAM=m +Subject: [PATCH 0494/1148] configs: Add CONFIG_HID_STEAM=m See: https://github.com/raspberrypi/linux/issues/3344 @@ -356644,13 +356644,13 @@ index 1dad7bcb579a..fa691991528f 100644 CONFIG_HID_GREENASIA=m CONFIG_HID_SMARTJOYPLUS=m -- -2.18.2 +2.18.4 -From ad2ba7683317958feb871a549a13b6be3d529a5a Mon Sep 17 00:00:00 2001 +From d01e74cb227328efe2de2716172a509e12e8de17 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Feb 2020 11:23:09 +0000 -Subject: [PATCH 0495/1113] configs: Add CONFIG_EXT4_ENCRYPTION=y +Subject: [PATCH 0495/1148] 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 @@ -356756,13 +356756,13 @@ index fa691991528f..b40477e1553b 100644 CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m -- -2.18.2 +2.18.4 -From 11d2792d9a90f5325930579073f33d095ff8f64e Mon Sep 17 00:00:00 2001 +From 62ad161b75c3553221c6494ae14542322cf48249 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Feb 2020 17:25:52 +0000 -Subject: [PATCH 0496/1113] configs: Add KVM support to arm64 bcm2711_defconfig +Subject: [PATCH 0496/1148] configs: Add KVM support to arm64 bcm2711_defconfig See: https://github.com/raspberrypi/linux/issues/3035 @@ -356787,13 +356787,13 @@ index 6be7a169eac1..bf0551437fd7 100644 CONFIG_CRYPTO_AES_ARM64_BS=m CONFIG_KPROBES=y -- -2.18.2 +2.18.4 -From b9deb2eb9d7a3e319eaa699c5c0e02fa053a8713 Mon Sep 17 00:00:00 2001 +From 9898be07cf5684cac2a92ba50cb3b8591ee1d6f0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Mar 2020 09:43:41 +0000 -Subject: [PATCH 0497/1113] overlays: sc16ic750-i2c: Fix xtal parameter +Subject: [PATCH 0497/1148] overlays: sc16ic750-i2c: Fix xtal parameter The xtal parameter is targetting the wrong node - fix it. @@ -356818,13 +356818,13 @@ index 5fbff2e6c02d..16fe0d08cef1 100644 }; -- -2.18.2 +2.18.4 -From 65a243edeb83e56c731df19814b6d9f509c09015 Mon Sep 17 00:00:00 2001 +From 3b6a75b13ea03e5af7a0e4af932d83d6c3abef27 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:11 +0000 -Subject: [PATCH 0498/1113] Revert "pcie-brcmstb: Correct SoC name" +Subject: [PATCH 0498/1148] Revert "pcie-brcmstb: Correct SoC name" This reverts commit 900b4ad0814df7dbacb01318bf49af5bab605fa0. --- @@ -356917,13 +356917,13 @@ index dec65992902e..ac8dde3c030b 100644 return ret; -- -2.18.2 +2.18.4 -From b8d431b7a98b2c1cbc341777441cc64ba255088c Mon Sep 17 00:00:00 2001 +From 1c9ce990e8a08d13c41d102d4be4646f8e44e387 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:23 +0000 -Subject: [PATCH 0499/1113] Revert "pcie-brcmstb: Bounce buffer support is for +Subject: [PATCH 0499/1148] Revert "pcie-brcmstb: Bounce buffer support is for BCM2711B0" This reverts commit 58ac2d4474e531300f9f83773aa4d09e95ee2626. @@ -357009,13 +357009,13 @@ index fb777a4e4750..e646818ff21c 100644 ret = brcm_pcie_bounce_init(dev, bounce_buffer, (dma_addr_t)bounce_threshold); -- -2.18.2 +2.18.4 -From c6135137abb77d09d55bfb9e5584d1cdd341555c Mon Sep 17 00:00:00 2001 +From 7fb9a62c08368d8c5e6fef866dee80f8b60c408f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:39 +0000 -Subject: [PATCH 0500/1113] Revert "pcie-brcmstb: Eliminate arch_dma_ops error +Subject: [PATCH 0500/1148] Revert "pcie-brcmstb: Eliminate arch_dma_ops error message" This reverts commit 27cf0ad95cdf30f52a5fc6c69014a0d7bf5a1222. @@ -357158,13 +357158,13 @@ index e646818ff21c..e8c8b355548a 100644 bridge->ops = &brcm_pcie_ops; bridge->sysdata = pcie; -- -2.18.2 +2.18.4 -From c6187971f1558e6a2d8f6749bdc0b914f35212cc Mon Sep 17 00:00:00 2001 +From 52880f143ef9cf5b798a49e4a1fd42482cddb365 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:51 +0000 -Subject: [PATCH 0501/1113] Revert "pcie-brcmstb-bounce64.c: dev_err() -> +Subject: [PATCH 0501/1148] Revert "pcie-brcmstb-bounce64.c: dev_err() -> dev_info() for info messages" This reverts commit 2340a88a493d750dc3fcfa48de880fc4b8e479d2. @@ -357186,13 +357186,13 @@ index ac8dde3c030b..6a872975ba9e 100644 return 0; -- -2.18.2 +2.18.4 -From 2a22983dd4916311cb1f11492fe0321573eda5f1 Mon Sep 17 00:00:00 2001 +From d09f6d672a1a3fb83749f2de560a3cde77b3bcb8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 17:00:01 +0000 -Subject: [PATCH 0502/1113] Revert "Ported pcie-brcmstb bounce buffer +Subject: [PATCH 0502/1148] Revert "Ported pcie-brcmstb bounce buffer implementation to ARM64. (#3144)" This reverts commit 60f3db31d4cb785befed715b80c430f60f647701. @@ -357911,13 +357911,13 @@ index e8c8b355548a..87fd40ae3140 100644 case BUS_NOTIFY_DEL_DEVICE: -- -2.18.2 +2.18.4 -From 2ae82aab48b4658234589ae8e3fc14c3989211a6 Mon Sep 17 00:00:00 2001 +From c35c6ce1bd883d4740b2e7d8bf8ad7a68726ef07 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 17:00:16 +0000 -Subject: [PATCH 0503/1113] Revert "pcie-brcmstb: Don't set DMA ops for root +Subject: [PATCH 0503/1148] Revert "pcie-brcmstb: Don't set DMA ops for root complex" This reverts commit 510a127017a0aada2734dbf57d25aaa0189198ff. @@ -357940,13 +357940,13 @@ index 87fd40ae3140..746cfb405ad3 100644 case BUS_NOTIFY_DEL_DEVICE: -- -2.18.2 +2.18.4 -From 8f4dc5d0115a00ad4dd8b71917aac167e378814e Mon Sep 17 00:00:00 2001 +From 47a987a4f6fda0e2d7dd9639a8a0fba030f538a1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:06:59 +0000 -Subject: [PATCH 0504/1113] Revert "bcm2835-dma: Correct SoC name" +Subject: [PATCH 0504/1148] Revert "bcm2835-dma: Correct SoC name" This reverts commit f498861a16d0b9a189a329080da1aa64d6e9bda7. --- @@ -358433,13 +358433,13 @@ index 8d7c80536aa4..87fd58272e95 100644 /* get irqs for each channel that we support */ -- -2.18.2 +2.18.4 -From 3f77977aabef89bcbbd397f91e19baadaf543c63 Mon Sep 17 00:00:00 2001 +From a82f21091c1f0edd4f5c5bbff359115887a7de09 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:07:15 +0000 -Subject: [PATCH 0505/1113] Revert "bcm2835-dma: Add proper 40-bit DMA support" +Subject: [PATCH 0505/1148] Revert "bcm2835-dma: Add proper 40-bit DMA support" This reverts commit 773a2db89ad2785d72b215673d87c0a51d769f61. --- @@ -359385,13 +359385,13 @@ index 746cfb405ad3..782725e3adad 100644 if (IS_ERR(pcie->clk)) { dev_warn(&pdev->dev, "could not get clock\n"); -- -2.18.2 +2.18.4 -From d78b7d1ad2d6f0af5b120df64cac8cff6c4b9337 Mon Sep 17 00:00:00 2001 +From 08119020ebc36fe8113a173affcf4f73162b6c29 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:07:39 +0000 -Subject: [PATCH 0506/1113] Revert "pcie-brcmstb: Changes for BCM2711" +Subject: [PATCH 0506/1148] Revert "pcie-brcmstb: Changes for BCM2711" This reverts commit 1dab5ded41ed07adc12f26e529aa64209a7c44b6. --- @@ -360831,13 +360831,13 @@ index 254783d1065f..000000000000 -EXPORT_SYMBOL_GPL(brcmstb_memory_memc_size); - -- -2.18.2 +2.18.4 -From e1a63cf6ffe199972eee839b4807568491becb41 Mon Sep 17 00:00:00 2001 +From a4ccb4ff835a277531693b1784447ee471d68bf5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:08:35 +0000 -Subject: [PATCH 0507/1113] Revert "PCI: brcmstb: Add MSI capability" +Subject: [PATCH 0507/1148] Revert "PCI: brcmstb: Add MSI capability" This reverts commit b1619c83208e7b804e2c3547dbf24bb02b3be239. --- @@ -361370,13 +361370,13 @@ index b028d4be81a2..27bcf83c99d7 100644 _brcm_pcie_remove(pcie); return ret; -- -2.18.2 +2.18.4 -From cd5bc80e70bd23d14b422e8acf5acba32b94cddf Mon Sep 17 00:00:00 2001 +From 398244604a7d0a9ea2f5566b1e0e633e3284ef6c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:08:49 +0000 -Subject: [PATCH 0508/1113] Revert "PCI: brcmstb: Add dma-range mapping for +Subject: [PATCH 0508/1148] Revert "PCI: brcmstb: Add dma-range mapping for inbound traffic" This reverts commit d45590eb858ac7a2578d477791881ba7ffb1e615. @@ -361878,13 +361878,13 @@ index 27bcf83c99d7..babef9191e88 100644 pcie->reg_offsets = data->offsets; pcie->reg_field_info = data->reg_field_info; -- -2.18.2 +2.18.4 -From 631c3129fec3837f7fe59051afaa7cabefd20644 Mon Sep 17 00:00:00 2001 +From d27cf269e781b7be6c8dd158ed7b9bfc3e15c3f1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:10:54 +0000 -Subject: [PATCH 0509/1113] Revert "PCI: brcmstb: Add Broadcom STB PCIe host +Subject: [PATCH 0509/1148] Revert "PCI: brcmstb: Add Broadcom STB PCIe host controller driver" This reverts commit 79624ca23c53064fefee774a89952a587b72cc01. @@ -363068,13 +363068,13 @@ index d92290679067..000000000000 - -#endif /* __MEMORY_API_H */ -- -2.18.2 +2.18.4 -From 683bfd7ef5590e5a418d068df1d7066102cb5024 Mon Sep 17 00:00:00 2001 +From 2b29396b15bcb9c6efa1c9cfa5aa26aedd16b981 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 12 Mar 2020 12:16:18 +0000 -Subject: [PATCH 0510/1113] Revert "arm64/mm: Limit the DMA zone for arm64" +Subject: [PATCH 0510/1148] Revert "arm64/mm: Limit the DMA zone for arm64" This reverts commit 47fec0dcefa53f44985e95785021447d646daa2b. --- @@ -363095,13 +363095,13 @@ index 1b15656c96db..45c00a54909c 100644 #ifdef CONFIG_NUMA -- -2.18.2 +2.18.4 -From 99e45156aef7ad611c60c019c48abda1a62c6f00 Mon Sep 17 00:00:00 2001 +From 26a800c30e7f9e4fc1e2f77fb77f4798c96a844d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 12 Mar 2020 14:06:04 +0000 -Subject: [PATCH 0511/1113] Revert "dma-direct: check for overflows on 32 bit +Subject: [PATCH 0511/1148] Revert "dma-direct: check for overflows on 32 bit DMA addresses" This reverts commit e44850bd4205a8cf17f23c44668c0f8d28ad40b1. @@ -363145,13 +363145,13 @@ index 6a18a97b76a8..adf993a3bd58 100644 #endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */ -- -2.18.2 +2.18.4 -From 2b40ea4b8e26036e2d8a36f8c7fb633ee4d32c09 Mon Sep 17 00:00:00 2001 +From 669abca4cbe07c6ba946ec3c6fc5a78984e814cf Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 3 Jul 2019 18:23:01 +0100 -Subject: [PATCH 0512/1113] of/address: Introduce of_get_next_dma_parent() +Subject: [PATCH 0512/1148] of/address: Introduce of_get_next_dma_parent() helper commit 862ab5578f754117742c8b8c8e5ddf98bdb190ba upstream. @@ -363191,13 +363191,13 @@ index 8f74c4626e0e..02d235ed202c 100644 { struct device_node *host; -- -2.18.2 +2.18.4 -From b627e1f1bd6a508d0b58a10cf42e13aefef6f6cf Mon Sep 17 00:00:00 2001 +From 0f37bc3123c8cff1ecdb124f31af6bfcf928f106 Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 3 Jul 2019 14:47:31 +0100 -Subject: [PATCH 0513/1113] of: address: Follow DMA parent for "dma-coherent" +Subject: [PATCH 0513/1148] of: address: Follow DMA parent for "dma-coherent" commit c60bf3eb888a362100aa1bdbea351dab681e262a upstream. @@ -363227,13 +363227,13 @@ index 02d235ed202c..fa2098983b33 100644 of_node_put(node); return false; -- -2.18.2 +2.18.4 -From 987899437c66525a5ab34b50c19252b466403dcb Mon Sep 17 00:00:00 2001 +From c98351706cc8633232932b2f52985b142ca186a9 Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Tue, 2 Jul 2019 18:42:39 +0100 -Subject: [PATCH 0514/1113] of: Factor out #{addr,size}-cells parsing +Subject: [PATCH 0514/1148] 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 @@ -363354,13 +363354,13 @@ index 24786818e32e..66294d29942a 100644 + #endif /* _LINUX_OF_PRIVATE_H */ -- -2.18.2 +2.18.4 -From aa9353ec679f4bcdbbc6a283bee877ca9d0275c1 Mon Sep 17 00:00:00 2001 +From 48529d962b21b9bbb151d5f6f9c0c4f6e9ee50c4 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 4 Sep 2019 11:43:30 +0100 -Subject: [PATCH 0515/1113] of/address: Translate 'dma-ranges' for parent nodes +Subject: [PATCH 0515/1148] of/address: Translate 'dma-ranges' for parent nodes missing 'dma-ranges' commit 81db12ee15cb83926e290a8a3654a2dfebc80935 upstream. @@ -363400,13 +363400,13 @@ index 8f4f655e571f..924ceb1ba773 100644 return 1; } -- -2.18.2 +2.18.4 -From 5895c72626336f5d6d1101f8ae7e069e4115f99d Mon Sep 17 00:00:00 2001 +From 49543ee17a77c42031a5188515c55b4258c9a743 Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 3 Jul 2019 18:42:20 +0100 -Subject: [PATCH 0516/1113] of: Make of_dma_get_range() work on bus nodes +Subject: [PATCH 0516/1148] of: Make of_dma_get_range() work on bus nodes commit 951d48855d86e72e0d6de73440fe09d363168064 upstream. @@ -363513,13 +363513,13 @@ index 924ceb1ba773..4632f912efa4 100644 pr_err("translation of DMA address(%pad) to CPU address failed node(%pOF)\n", dma_addr, np); -- -2.18.2 +2.18.4 -From cfd1d907e1b4ef7e4f06019c94d34bb52e2f6a2b Mon Sep 17 00:00:00 2001 +From 0989abda3372b27166b2891c9f4d3d60bd3652b7 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:43 +0200 -Subject: [PATCH 0517/1113] arm64: mm: use arm64_dma_phys_limit instead of +Subject: [PATCH 0517/1148] arm64: mm: use arm64_dma_phys_limit instead of calling max_zone_dma_phys() commit ae970dc096b2d39f65f2e18d142e3978dc9ee1c7 upstream. @@ -363549,13 +363549,13 @@ index 45c00a54909c..098c0f5bedf6 100644 max_zone_pfns[ZONE_NORMAL] = max; -- -2.18.2 +2.18.4 -From 42762b7a162e93906433b366cf56249a061de724 Mon Sep 17 00:00:00 2001 +From 58a13297ff20862b355c97f97362dada7b3d0c3f Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:44 +0200 -Subject: [PATCH 0518/1113] arm64: rename variables used to calculate +Subject: [PATCH 0518/1148] arm64: rename variables used to calculate ZONE_DMA32's size commit a573cdd7973dedd87e62196c400332896bb236c8 upstream. @@ -363672,13 +363672,13 @@ index 098c0f5bedf6..8e9bc64c5878 100644 else swiotlb_force = SWIOTLB_NO_FORCE; -- -2.18.2 +2.18.4 -From 3459025bd04eb4aa5b76c840d269ac496f0e78ec Mon Sep 17 00:00:00 2001 +From e349af9d315661aa2aa32775f3a2d806456d3760 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:45 +0200 -Subject: [PATCH 0519/1113] arm64: use both ZONE_DMA and ZONE_DMA32 +Subject: [PATCH 0519/1148] arm64: use both ZONE_DMA and ZONE_DMA32 commit 1a8e1cef7603e218339ac63cb3178b25554524e5 upstream. @@ -363856,13 +363856,13 @@ index 8e9bc64c5878..44f07fdf7a59 100644 else swiotlb_force = SWIOTLB_NO_FORCE; -- -2.18.2 +2.18.4 -From d698ae7ba2b739762dc3c3dd65805bac9fac5a9b Mon Sep 17 00:00:00 2001 +From 0823e4f6c5c9bb3baa401bd2a5ee711233a9fbc5 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:46 +0200 -Subject: [PATCH 0520/1113] mm: refresh ZONE_DMA and ZONE_DMA32 comments in +Subject: [PATCH 0520/1148] mm: refresh ZONE_DMA and ZONE_DMA32 comments in 'enum zone_type' commit 734f9246e791d8da278957b2c326d7709b2a97c0 upstream. @@ -363880,7 +363880,7 @@ Signed-off-by: Catalin Marinas 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h -index 85804ba62215..6d448d9a5972 100644 +index a90aba3d6afb..6d8ea64eeb28 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -358,33 +358,40 @@ struct per_cpu_nodestat { @@ -363944,13 +363944,13 @@ index 85804ba62215..6d448d9a5972 100644 #endif /* -- -2.18.2 +2.18.4 -From b213f10dddb2d9352e7b20687a58bbf570c89cfb Mon Sep 17 00:00:00 2001 +From cb9bc761c3c6ef38d1951c3d7eecc344c50b85a3 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 28 Oct 2019 11:32:32 -0500 -Subject: [PATCH 0521/1113] resource: Add a resource_list_first_type helper +Subject: [PATCH 0521/1148] resource: Add a resource_list_first_type helper commit 494f8b10d832456a96be4ee7317425f6936cabc8 upstream. @@ -363986,13 +363986,13 @@ index 06da59b23b79..ff0339df56af 100644 + #endif /* _LINUX_RESOURCE_EXT_H */ -- -2.18.2 +2.18.4 -From 327860e1c4ed2cd24cba4c892ea2c35bab3f46df Mon Sep 17 00:00:00 2001 +From 1db4b3746b027181973110a819f8149d5554cf96 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Mon, 14 Oct 2019 20:31:03 +0200 -Subject: [PATCH 0522/1113] dma/direct: turn ARCH_ZONE_DMA_BITS into a variable +Subject: [PATCH 0522/1148] dma/direct: turn ARCH_ZONE_DMA_BITS into a variable commit 8b5369ea580964dbc982781bfb9fb93459fc5e8d upstream. @@ -364201,13 +364201,13 @@ index d2b462835469..947823f1ccdf 100644 min_mask = DMA_BIT_MASK(30); -- -2.18.2 +2.18.4 -From 3bd1b0e90a1e9ae4b6de3d7e3738b76f56274b3a Mon Sep 17 00:00:00 2001 +From 9e1e1ec1f20443b22db3e301ee9951f2410236d9 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 Nov 2019 16:06:44 +0100 -Subject: [PATCH 0523/1113] dma-direct: check for overflows on 32 bit DMA +Subject: [PATCH 0523/1148] 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 @@ -364271,13 +364271,13 @@ index d03af3605460..7aadb776924d 100644 #endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */ -- -2.18.2 +2.18.4 -From 3f96f6628da4cfdf94e63b15d188b1d63450fb18 Mon Sep 17 00:00:00 2001 +From f727f6e45de1fd623d66c28ccf8b1bfb4384f7fd Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 Nov 2019 16:06:45 +0100 -Subject: [PATCH 0524/1113] x86/PCI: sta2x11: use default DMA address +Subject: [PATCH 0524/1148] x86/PCI: sta2x11: use default DMA address translation commit e380a0394c36a3a878c858418d5dd7f5f195b6fc upstream. @@ -364543,13 +364543,13 @@ index 6269a175385d..4a631264b809 100644 { struct sta2x11_mapping *map = sta2x11_pdev_to_mapping(pdev); -- -2.18.2 +2.18.4 -From 2ec1c3bfa7bdeb66dbed7952d3a0f76de3ac71ff Mon Sep 17 00:00:00 2001 +From 6551b837afcc794804ee45135db508a19be9736e Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 30 Oct 2019 17:30:57 -0500 -Subject: [PATCH 0525/1113] PCI: of: Add inbound resource parsing to helpers +Subject: [PATCH 0525/1148] 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 @@ -364985,10 +364985,10 @@ index a5adc2e2c351..3dcd031118dd 100644 return -EINVAL; } diff --git a/include/linux/pci.h b/include/linux/pci.h -index f39f22f9ee47..fa49f6e0b844 100644 +index e92bd9b32f36..bca14457c44b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -2278,6 +2278,7 @@ struct irq_domain; +@@ -2277,6 +2277,7 @@ struct irq_domain; struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus); int pci_parse_request_of_pci_ranges(struct device *dev, struct list_head *resources, @@ -364996,7 +364996,7 @@ index f39f22f9ee47..fa49f6e0b844 100644 struct resource **bus_range); /* Arch may override this (weak) */ -@@ -2286,9 +2287,11 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus); +@@ -2285,9 +2286,11 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus); #else /* CONFIG_OF */ static inline struct irq_domain * pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; } @@ -365012,13 +365012,13 @@ index f39f22f9ee47..fa49f6e0b844 100644 return -EINVAL; } -- -2.18.2 +2.18.4 -From c3178b4eae77bc6cc65f353d98ed73dabc12bc2d Mon Sep 17 00:00:00 2001 +From 261581d601187f1f87e628bd9be97b0dd36499d9 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 12 Nov 2019 17:06:04 +0100 -Subject: [PATCH 0526/1113] dma-direct: unify the dma_capable definitions +Subject: [PATCH 0526/1148] dma-direct: unify the dma_capable definitions commit 130c1ccbf55330b55e82612a6e54eebb82c9d746 upstream. @@ -365127,13 +365127,13 @@ index 7aadb776924d..9e2e3d37b15c 100644 #ifdef CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED bool force_dma_unencrypted(struct device *dev); -- -2.18.2 +2.18.4 -From 9f4371ad0406168f06348fb99288a4e11a8d1218 Mon Sep 17 00:00:00 2001 +From 39d7434d34a750725af2077f8fc9030544485c8a Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 12 Nov 2019 17:07:43 +0100 -Subject: [PATCH 0527/1113] dma-direct: avoid a forward declaration for +Subject: [PATCH 0527/1148] 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 @@ -365202,13 +365202,13 @@ index 9e2e3d37b15c..f812ea2459f1 100644 void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs); -- -2.18.2 +2.18.4 -From b66a473ec57839a656ca37b8e0d7dfa5ecf6b638 Mon Sep 17 00:00:00 2001 +From 28db8684599b077ce7af3d8874d68778f69efb2c Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 19 Nov 2019 17:38:58 +0100 -Subject: [PATCH 0528/1113] dma-direct: exclude dma_direct_map_resource from +Subject: [PATCH 0528/1148] dma-direct: exclude dma_direct_map_resource from the min_low_pfn check commit 68a33b1794665ba8a1d1ef1d3bfcc7c587d380a6 upstream. @@ -365331,13 +365331,13 @@ index 673a2cdb2656..9280d6f8271e 100644 attrs | DMA_ATTR_SKIP_CPU_SYNC); return false; -- -2.18.2 +2.18.4 -From 3fb653efdc99f43204ee8bf323b8e6c6b8d60222 Mon Sep 17 00:00:00 2001 +From 4df995767345c748531fcb1c2a5b471d1e4afdfe Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 21 Nov 2019 10:26:44 +0100 -Subject: [PATCH 0529/1113] dma-mapping: treat dev->bus_dma_mask as a DMA limit +Subject: [PATCH 0529/1148] dma-mapping: treat dev->bus_dma_mask as a DMA limit commit a7ba70f1787f977f970cd116076c6fce4b9e01cc upstream. @@ -365727,13 +365727,13 @@ index 803bb857aa1b..085a0db545c7 100644 gfp |= GFP_DMA32; goto again; -- -2.18.2 +2.18.4 -From 212b2c1350557bb2ad3f704ac91831e6768c2248 Mon Sep 17 00:00:00 2001 +From 315093de7f0dba89427940ace140c1bf92e01385 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Mon, 16 Dec 2019 12:01:08 +0100 -Subject: [PATCH 0530/1113] ARM: dts: bcm2711: Enable PCIe controller +Subject: [PATCH 0530/1148] ARM: dts: bcm2711: Enable PCIe controller commit d5c8dc0d4c880fbde5293cc186b1ab23466254c4 upstream. @@ -365789,13 +365789,13 @@ index e2f6ffb00aa9..b56388ce1216 100644 genet: ethernet@7d580000 { compatible = "brcm,bcm2711-genet-v5"; -- -2.18.2 +2.18.4 -From 973f125f5c86bad9831d396b7bc4d5c5c307ac94 Mon Sep 17 00:00:00 2001 +From ff5900b51e92d9d6bbd1160287df87bc74bf39a9 Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 16 Dec 2019 12:01:09 +0100 -Subject: [PATCH 0531/1113] PCI: brcmstb: Add Broadcom STB PCIe host controller +Subject: [PATCH 0531/1148] PCI: brcmstb: Add Broadcom STB PCIe host controller driver commit c0452137034bda8f686dd9a2e167949bfffd6776 upstream. @@ -366610,13 +366610,13 @@ index 000000000000..3250a2e6b1b4 +MODULE_DESCRIPTION("Broadcom STB PCIe RC driver"); +MODULE_AUTHOR("Broadcom"); -- -2.18.2 +2.18.4 -From a694cfbcbfcd277e61c774152b2f55cae69e9a8f Mon Sep 17 00:00:00 2001 +From 03a1d9d287d0cd352d2afff704af07032a3c220a Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 16 Dec 2019 12:01:10 +0100 -Subject: [PATCH 0532/1113] PCI: brcmstb: Add MSI support +Subject: [PATCH 0532/1148] PCI: brcmstb: Add MSI support commit 40ca1bf580ef24df30702032ba5e40dfdcaa200b upstream. @@ -367001,13 +367001,13 @@ index 3250a2e6b1b4..d20aabc26273 100644 bridge->busnr = 0; bridge->ops = &brcm_pcie_ops; -- -2.18.2 +2.18.4 -From c2660d84cd15222adc72cfdaad727a6f39650e9e Mon Sep 17 00:00:00 2001 +From 3ff28154fffc04b42839edbb4acc726ba2a02af1 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 27 Feb 2020 12:51:46 +0100 -Subject: [PATCH 0533/1113] PCI: brcmstb: Fix build on 32bit ARM platforms with +Subject: [PATCH 0533/1148] PCI: brcmstb: Fix build on 32bit ARM platforms with older compilers commit 73a7a271b3eee7b83f29b13866163776f1cbef89 upstream. @@ -367045,13 +367045,13 @@ index d20aabc26273..3a10e678c7f4 100644 dev_err(dev, "Invalid rc_bar2_offset/size: size 0x%llx, off 0x%llx\n", *rc_bar2_size, *rc_bar2_offset); -- -2.18.2 +2.18.4 -From 03d45b15ca5de4ae0aa18b8a968a2a0739c4aec5 Mon Sep 17 00:00:00 2001 +From 6bdd30b7edf087313f886d2ff8874e60886452cd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 2 Mar 2020 15:05:25 +0000 -Subject: [PATCH 0534/1113] bcm2711-rpi.dtsi: Use upstream pcie node +Subject: [PATCH 0534/1148] 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. @@ -367128,13 +367128,13 @@ index a71b2eb74723..18ba012413aa 100644 compatible = "brcm,bcm2711-dma"; reg = <0x0 0x7e007b00 0x400>; -- -2.18.2 +2.18.4 -From 358e05555ae530cbcbe10992a2b18b15401b356b Mon Sep 17 00:00:00 2001 +From e1abbf28ed981dc8da91507e44de0cbc8b3a71dd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:14:49 +0000 -Subject: [PATCH 0535/1113] Revert "media: i2c: Add driver for Sony IMX219 +Subject: [PATCH 0535/1148] Revert "media: i2c: Add driver for Sony IMX219 sensor" This reverts commit 39d484cb87cbe5da5035199fbdec1f3c0b71d2ea. @@ -368279,13 +368279,13 @@ index 682397a48492..000000000000 -MODULE_DESCRIPTION("Sony IMX219 sensor driver"); -MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From e24731663cd7a2f5951e5565375c50239edb30f5 Mon Sep 17 00:00:00 2001 +From 8337104f6bff51fe17446ee769e1e55e8d7bca45 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:14:58 +0000 -Subject: [PATCH 0536/1113] Revert "media: dt-bindings: Add binding for the +Subject: [PATCH 0536/1148] Revert "media: dt-bindings: Add binding for the Sony IMX219 sensor" This reverts commit e3dca865875b345a2fa45e8295e32d701c666334. @@ -368360,13 +368360,13 @@ index a02f1ce1e120..000000000000 - }; - }; -- -2.18.2 +2.18.4 -From feea0f905d2c365169d5c47f40c162c5e923d3e3 Mon Sep 17 00:00:00 2001 +From 5b5cdacc896555c903015b50b3698917a9107319 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Mon, 20 Jan 2020 05:15:57 -0300 -Subject: [PATCH 0537/1113] media: dt-bindings: media: i2c: Add IMX219 CMOS +Subject: [PATCH 0537/1148] media: dt-bindings: media: i2c: Add IMX219 CMOS sensor binding Commit 9d730f2cf4c0391785855dd231577d2de2594df9 upstream. @@ -368525,13 +368525,13 @@ index b7685777a806..d99bdf934705 100644 M: Sakari Ailus L: linux-media@vger.kernel.org -- -2.18.2 +2.18.4 -From 82d9c1e7a353fc6f91328afb07eb6e21f7b65f31 Mon Sep 17 00:00:00 2001 +From 5e02093be0c580b7842fa972fa47481f2c2d895e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Jan 2020 05:15:58 -0300 -Subject: [PATCH 0538/1113] media: i2c: Add driver for Sony IMX219 sensor +Subject: [PATCH 0538/1148] media: i2c: Add driver for Sony IMX219 sensor Commit 1283b3b8f82b9004fbb94398cade5c8e797a2c8d upstream. (Currently on linux-media/master, queued for 5.7) @@ -369908,13 +369908,13 @@ index 000000000000..f1effb5a5f66 +MODULE_DESCRIPTION("Sony IMX219 sensor driver"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 4b95e8a2107ebb119cf192a0880afaba464cc57d Mon Sep 17 00:00:00 2001 +From 90915c18be86159df28e4f02889b42c1409dad60 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:07:57 +0000 -Subject: [PATCH 0539/1113] overlays: imx219: Correct link frequency to match +Subject: [PATCH 0539/1148] overlays: imx219: Correct link frequency to match the upstream driver The upstream driver is checking the link frequency parameter, and @@ -369939,13 +369939,13 @@ index 2a1500d07b68..b9e3d9e5730d 100644 }; }; -- -2.18.2 +2.18.4 -From 0939b3b57427fe1ccd3fec57498f6a13a24e89f6 Mon Sep 17 00:00:00 2001 +From 509e171a1b8f657abcefd3ccab51cfb0fa2a9567 Mon Sep 17 00:00:00 2001 From: Nataliya Korovkina Date: Thu, 12 Mar 2020 17:22:53 -0400 -Subject: [PATCH 0540/1113] Kbuild: Allow .dtbo overlays to be built, adjust. +Subject: [PATCH 0540/1148] Kbuild: Allow .dtbo overlays to be built, adjust. This is adjustment to commit d368ceaacdccd7732dc97d1d7987bdf7149d62e3 "kbuild: Allow .dtbo overlays to be built piecemeal" @@ -369958,7 +369958,7 @@ Signed-off-by: Nataliya Korovkina 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index fe75cf05e1ae..ca96084a638b 100644 +index 79843dd0993c..30dc5fb5f4e8 100644 --- a/Makefile +++ b/Makefile @@ -1264,7 +1264,7 @@ ifneq ($(dtstree),) @@ -369971,13 +369971,13 @@ index fe75cf05e1ae..ca96084a638b 100644 PHONY += dtbs dtbs_install dtbs_check -- -2.18.2 +2.18.4 -From a9c1e334e755b449526ef734400ac8f018a759f7 Mon Sep 17 00:00:00 2001 +From 42651e566c899ead3110cbe7187724904551d51b Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 15 Jan 2020 13:40:38 +0000 -Subject: [PATCH 0541/1113] media: ov5647: Fix return codes from +Subject: [PATCH 0541/1148] media: ov5647: Fix return codes from ov5647_write/ov5647_read functions. Previously they were returning positive non-zero codes for success, @@ -370051,13 +370051,13 @@ index 07550377be2e..6ecc018ac431 100644 return ret; } -- -2.18.2 +2.18.4 -From ccda44fbf1e4d6392f87620c01c38bc158ab4583 Mon Sep 17 00:00:00 2001 +From 998c3b26233977cab04b17d57a16b978144dd657 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:30:53 +0000 -Subject: [PATCH 0542/1113] media: ov5647: Add basic support for multiple +Subject: [PATCH 0542/1148] media: ov5647: Add basic support for multiple sensor modes. Specifically: @@ -370464,13 +370464,13 @@ index 6ecc018ac431..0d84b7640cf3 100644 v4l2_i2c_subdev_init(sd, client, &ov5647_subdev_ops); sensor->sd.internal_ops = &ov5647_subdev_internal_ops; -- -2.18.2 +2.18.4 -From 445c291123d291456f44ecee3a2842a8d89eeae9 Mon Sep 17 00:00:00 2001 +From 07923a2e14e7f193b67d4a426d808dfdc76d4af3 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:23 +0000 -Subject: [PATCH 0543/1113] media: ov5647: Add V4L2 controls for analogue gain, +Subject: [PATCH 0543/1148] media: ov5647: Add V4L2 controls for analogue gain, exposure and AWB Added basic v4l2_ctrl_handler infrastructure (there was none @@ -370747,13 +370747,13 @@ index 0d84b7640cf3..16cfafc9cf9c 100644 mutex_destroy(&ov5647->lock); -- -2.18.2 +2.18.4 -From 038700cb21442220b6fac04b1dd14c924b4d58c2 Mon Sep 17 00:00:00 2001 +From 0e4024c4d10c8e1b92ca1bf6efcb24e8c391a681 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:28 +0000 -Subject: [PATCH 0544/1113] media: ov5647: Add extra 10-bit sensor modes. +Subject: [PATCH 0544/1148] media: ov5647: Add extra 10-bit sensor modes. The 8-bit VGA mode remains, we add the following 10-bit modes: @@ -371302,13 +371302,13 @@ index 16cfafc9cf9c..fc6c5d9c4532 100644 v4l2_i2c_subdev_init(sd, client, &ov5647_subdev_ops); sensor->sd.internal_ops = &ov5647_subdev_internal_ops; -- -2.18.2 +2.18.4 -From df8f54efe991a51646cadfcc307ba11323529572 Mon Sep 17 00:00:00 2001 +From 2a61f56646cdb46a50c53e5796aa4bff86aac81f Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:32 +0000 -Subject: [PATCH 0545/1113] media: ov5647: change defaults to better match raw +Subject: [PATCH 0545/1148] media: ov5647: change defaults to better match raw camera applications. Specifically: @@ -371367,13 +371367,13 @@ index fc6c5d9c4532..66b3ee5cc190 100644 V4L2_CID_EXPOSURE, 4, /* min lines */ -- -2.18.2 +2.18.4 -From c2c3cd6f7a28b4e1020fbf309aabfdc4bb2245b2 Mon Sep 17 00:00:00 2001 +From acf129548c086b8b1734ef86f93000924db40fd8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 15:44:31 +0100 -Subject: [PATCH 0546/1113] drm/vc4: fkms: Change crtc_state structure name to +Subject: [PATCH 0546/1148] drm/vc4: fkms: Change crtc_state structure name to avoid conflict Signed-off-by: Maxime Ripard @@ -371452,13 +371452,13 @@ index b0c1096efbe5..2bfa10660fe0 100644 __drm_atomic_helper_crtc_duplicate_state(crtc, &vc4_state->base); -- -2.18.2 +2.18.4 -From ec161a86b3d29b204f8073e9e80491adf164e2d8 Mon Sep 17 00:00:00 2001 +From 9d2c6c920ce2a66c3fe8e3c7322396ddbf8b9392 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:22:06 +0000 -Subject: [PATCH 0547/1113] drm/fourcc: Add packed 10bit YUV 4:2:0 format +Subject: [PATCH 0547/1148] 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). @@ -371515,13 +371515,13 @@ index 3feeaa3f987a..9847286609a8 100644 #define DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(v) \ -- -2.18.2 +2.18.4 -From 06c13c9dd77fc7fc9300d789843dd5bd466eb56a Mon Sep 17 00:00:00 2001 +From 97eb28786341e9440cc04f8465694493c3293071 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:24:33 +0000 -Subject: [PATCH 0548/1113] drm/vc4: Add DRM_FORMAT_P030 support to +Subject: [PATCH 0548/1148] drm/vc4: Add DRM_FORMAT_P030 support to firmware-kms Adds support for this format which is 3 10bit samples packed into @@ -371595,13 +371595,13 @@ index 0bdffe5dd1e9..8e76576733ef 100644 VC_IMAGE_MAX, /* bounds for error checking */ VC_IMAGE_FORCE_ENUM_16BIT = 0xffff, -- -2.18.2 +2.18.4 -From b1a1103e239570ab7274966086fc4cd14e30ce82 Mon Sep 17 00:00:00 2001 +From 59ddc24965d1e1e12a9bb28fa85c02dc454dda08 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 6 Mar 2020 11:08:10 +0100 -Subject: [PATCH 0549/1113] gpio-ir-overlay: add parameter to configure signal +Subject: [PATCH 0549/1148] gpio-ir-overlay: add parameter to configure signal polarity (#3490) Standard IR receivers use inverted / active-low signalling @@ -371648,13 +371648,13 @@ index 58f588498d68..162b6ce07dc9 100644 rc-map-name = <&gpio_ir>,"linux,rc-map-name"; // default rc map }; -- -2.18.2 +2.18.4 -From 4417ce3b6b2d4a8e1ec9861ad14b6e646d256464 Mon Sep 17 00:00:00 2001 +From d042bbefe6d96f2e17ffe7f87da22802c790877e Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Mon, 24 Feb 2020 22:56:59 +0100 -Subject: [PATCH 0550/1113] Add support for merus-amp soundcard and ma120x0p +Subject: [PATCH 0550/1148] Add support for merus-amp soundcard and ma120x0p codec correct checkpatch warnings and errors @@ -373257,13 +373257,13 @@ index 000000000000..39c74b17e007 +MODULE_DESCRIPTION("ASoC driver for ma120x0p"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 1a0a5c7e389748f6adc113f05753bc4bf68727bf Mon Sep 17 00:00:00 2001 +From b70ded7fb6d924c517c20cd0a2aa8d6326b7db51 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 17 Mar 2020 16:39:07 +0000 -Subject: [PATCH 0551/1113] ARM: dts: bcm2711: Add 32-bit PMU compatibility +Subject: [PATCH 0551/1148] 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 @@ -373290,13 +373290,13 @@ index 18ba012413aa..b434b8392e9e 100644 compatible = "simple-bus"; #address-cells = <1>; -- -2.18.2 +2.18.4 -From 74f7f865d9ce3655df2cde104fae8d524c9f791a Mon Sep 17 00:00:00 2001 +From e061d9817cf612a94e83ce8cd44c2f74b0b283c5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 19 Mar 2020 10:04:46 +0000 -Subject: [PATCH 0552/1113] ARM: dts: bcm271x: Use a53 pmu, drop RPI364 +Subject: [PATCH 0552/1148] 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 @@ -373373,13 +373373,13 @@ index 1fd86f81f542..bf69a4b0b172 100644 - #include "../../../../arm/boot/dts/bcm2711-rpi-4-b.dts" -- -2.18.2 +2.18.4 -From c405ab35f266203120f1f214e39ca8570a6ce250 Mon Sep 17 00:00:00 2001 +From 3a3dafe42cd1beb10c29aaf6be7a51f098dfbe4c Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Tue, 25 Feb 2020 14:11:59 +0100 -Subject: [PATCH 0553/1113] net: bcmgenet: Clear ID_MODE_DIS in +Subject: [PATCH 0553/1148] net: bcmgenet: Clear ID_MODE_DIS in EXT_RGMII_OOB_CTRL when not needed commit 402482a6a78e5c61d8a2ec6311fc5b4aca392cd6 upstream. @@ -373411,13 +373411,13 @@ index 0516d14f4703..942ee7cc8266 100644 if (GENET_IS_V1(priv) || GENET_IS_V2(priv) || GENET_IS_V3(priv)) reg |= RGMII_MODE_EN_V123; -- -2.18.2 +2.18.4 -From 8aab91370acf1b4c51b21db3a88ff9452c5c9cdb Mon Sep 17 00:00:00 2001 +From 87241b010e4412b3ab8595533664947bf6ad1c5b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:22 +0100 -Subject: [PATCH 0554/1113] drm/modes: parse_cmdline: Fix possible reference +Subject: [PATCH 0554/1148] drm/modes: parse_cmdline: Fix possible reference past end of string Commit 8582e244e5fe72d2e9ace186fa8f3ed3bb4122e1 upstream. @@ -373558,13 +373558,13 @@ index 3fd35e6b9d53..86fb462a8ca1 100644 if (!(rotation & DRM_MODE_ROTATE_MASK)) -- -2.18.2 +2.18.4 -From e289b424f9a6d57d1b4a35ee442290edc1af14d5 Mon Sep 17 00:00:00 2001 +From cf52fddde820a1f3c8f4b5c078538ff29bde43e7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:23 +0100 -Subject: [PATCH 0555/1113] drm/modes: parse_cmdline: Make various char +Subject: [PATCH 0555/1148] drm/modes: parse_cmdline: Make various char pointers const Commit 83e14ea3a64f00897cc31974d3ae4e27e5a7405b upstream. @@ -373614,13 +373614,13 @@ index 86fb462a8ca1..342fe8076ee7 100644 int ret; -- -2.18.2 +2.18.4 -From cc8ea7af5722142f3485de3529c4044d0ef9c997 Mon Sep 17 00:00:00 2001 +From ac082bf3ebe8644a8a9fb344887b9b9f74dbbef1 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:24 +0100 -Subject: [PATCH 0556/1113] drm/modes: parse_cmdline: Stop parsing extras after +Subject: [PATCH 0556/1148] drm/modes: parse_cmdline: Stop parsing extras after bpp / refresh at ', ' Commit c2ed3e941901810ad3d55ce1935fa22c5007fee4 upstream. @@ -373719,13 +373719,13 @@ index 035f86c5d648..7b199acaf292 100644 static int __init test_drm_cmdline_init(void) -- -2.18.2 +2.18.4 -From 8000a10eb8adbc918addfa0097f8e2c152f97cb6 Mon Sep 17 00:00:00 2001 +From d6b2198d504979ebc2a1d4b8dff8704538e3f20c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:25 +0100 -Subject: [PATCH 0557/1113] drm/modes: parse_cmdline: Accept extras directly +Subject: [PATCH 0557/1148] drm/modes: parse_cmdline: Accept extras directly after mode combined with options Commit cfb0881b8f621b656a9e23b31944a5db94cf5842 upstream. @@ -373806,13 +373806,13 @@ index 7b199acaf292..a1210b7bf937 100644 static int __init test_drm_cmdline_init(void) -- -2.18.2 +2.18.4 -From a8a897bcb6970be20715a11eb2f53098f2f31b04 Mon Sep 17 00:00:00 2001 +From 3afd891ef91bb438c60470d55e9f4c73a163ba47 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:26 +0100 -Subject: [PATCH 0558/1113] drm/modes: parse_cmdline: Rework +Subject: [PATCH 0558/1148] drm/modes: parse_cmdline: Rework drm_mode_parse_cmdline_options() Commit 739b200c2edcaaa7a86f37b0c11db57956433dfb upstream. @@ -373888,13 +373888,13 @@ index ff9d9daf2631..0d7de6f4dec0 100644 if (ret) return false; -- -2.18.2 +2.18.4 -From be9b70b1f517edde0ec4fd351e223d93a12ec13e Mon Sep 17 00:00:00 2001 +From 6aff260bbd48a9a93442ec5939ea55dfd49f9744 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:27 +0100 -Subject: [PATCH 0559/1113] drm/modes: parse_cmdline: Add freestanding argument +Subject: [PATCH 0559/1148] drm/modes: parse_cmdline: Add freestanding argument to drm_mode_parse_cmdline_options() Commit 99e2716e053734b70434502867be24d20a3e2d84 upstream. @@ -373943,13 +373943,13 @@ index 0d7de6f4dec0..d4b9e7ed6dfe 100644 if (ret) return false; -- -2.18.2 +2.18.4 -From 06103010b21d745a4d848e18477405da35d466dd Mon Sep 17 00:00:00 2001 +From 7fe469b122630791ff58d9b9c7881bf6288ec321 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:28 +0100 -Subject: [PATCH 0560/1113] drm/modes: parse_cmdline: Set bpp/refresh_specified +Subject: [PATCH 0560/1148] drm/modes: parse_cmdline: Set bpp/refresh_specified after successful parsing Commit 6a2d163756545aa3180d7851d5f8322b865e72be upstream. @@ -374013,13 +374013,13 @@ index d4b9e7ed6dfe..7b9f067a8898 100644 /* -- -2.18.2 +2.18.4 -From d7a7d319caf5577c6fd1371245ccd9c101877f33 Mon Sep 17 00:00:00 2001 +From f6beed693845769c61667fb44ce30053520da4da Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:29 +0100 -Subject: [PATCH 0561/1113] drm/modes: parse_cmdline: Allow specifying +Subject: [PATCH 0561/1148] drm/modes: parse_cmdline: Allow specifying stand-alone options Commit 7b1cce760afe38b40f0989cdf10b2190dccf9815 upstream. @@ -374269,13 +374269,13 @@ index a1210b7bf937..9835dd329cfc 100644 static int __init test_drm_cmdline_init(void) -- -2.18.2 +2.18.4 -From 14e352dcc6814547befa3305e4918a94a42ec1af Mon Sep 17 00:00:00 2001 +From abe292b6217308a95fee19da74fe3a840639cf29 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:30 +0100 -Subject: [PATCH 0562/1113] drm/modes: parse_cmdline: Add support for +Subject: [PATCH 0562/1148] drm/modes: parse_cmdline: Add support for specifying panel_orientation (v2) Commit 4e7a4a6fbdc669c44e6079f9d5eb25673749455f upstream. @@ -374440,13 +374440,13 @@ index 681cb590f952..3fbcf7d3fcaf 100644 * @tv_margins: TV margins to apply to the mode. */ -- -2.18.2 +2.18.4 -From d6510329b760a4c3bb0a45205311f7b32e687ef8 Mon Sep 17 00:00:00 2001 +From 096e2d5e7fd744605236be607ccb9e937f664654 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:31 +0100 -Subject: [PATCH 0563/1113] drm/modes: parse_cmdline: Remove some unnecessary +Subject: [PATCH 0563/1148] drm/modes: parse_cmdline: Remove some unnecessary code (v2) Commit 5b926617cdef41ce0696e09834991194b1759e28 upstream. @@ -374484,13 +374484,13 @@ index 378a915b81dd..99149616fce0 100644 mode->specified = false; return false; -- -2.18.2 +2.18.4 -From 042c40ab97a4c6106ee6f7497e1e64d6a1b08aa0 Mon Sep 17 00:00:00 2001 +From 1e2ff3a68a85c5c4a49f95794950da1ea86b9d7c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:32 +0100 -Subject: [PATCH 0564/1113] drm/modes: parse_cmdline: Explicitly memset the +Subject: [PATCH 0564/1148] drm/modes: parse_cmdline: Explicitly memset the passed in drm_cmdline_mode struct Commit d1fe276b5115f0d581c3cfe6154633b3547e8aab upstream. @@ -374531,13 +374531,13 @@ index 99149616fce0..afc0ee99b138 100644 name = mode_option; -- -2.18.2 +2.18.4 -From 521e0c0b39835415a585d8cadfd9cbbdfff6d738 Mon Sep 17 00:00:00 2001 +From ca3f1a2dd2a1c5f88b820d929f338953525fc959 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 0565/1113] drm/v3d: Replace wait_for macros to remove use of +Subject: [PATCH 0565/1148] drm/v3d: Replace wait_for macros to remove use of msleep (#3510) commit 9daee6141cc9c75b09659b02b1cb9eeb2f5e16cc upstream. @@ -374626,13 +374626,13 @@ index 15bc4e28b6cc..197dd4a8a7e1 100644 { /* nsecs_to_jiffies64() does not guard against overflow */ -- -2.18.2 +2.18.4 -From 08e4cc79aaaa30ea5bf294cfe5f68a46e868e5a0 Mon Sep 17 00:00:00 2001 +From e1a58febe3450736138795e78269a07b9ab460e9 Mon Sep 17 00:00:00 2001 From: Nick B Date: Mon, 9 Mar 2020 09:05:39 -0400 -Subject: [PATCH 0566/1113] Reduce noise from rpi poe hat fan +Subject: [PATCH 0566/1148] 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 @@ -374728,13 +374728,13 @@ index 21f8fe6f1229..544038b614e1 100644 }; }; -- -2.18.2 +2.18.4 -From d9088fb66b9936857ec21285035bc39569327fff Mon Sep 17 00:00:00 2001 +From 00c95d6e38b0a0c1ec96f7bfccdeeaba015831be 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 0567/1113] add Sensirion SPS30 to i2c-sensor overlay +Subject: [PATCH 0567/1148] add Sensirion SPS30 to i2c-sensor overlay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -374795,13 +374795,13 @@ index 40881d72a157..ce97837b0db5 100644 }; }; -- -2.18.2 +2.18.4 -From 205db96976af130e9239d00546dc3e4a95961557 Mon Sep 17 00:00:00 2001 +From 7bf25e3c9f790f5bd16c33d7d700b3314e476f7d Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 7 Oct 2019 12:06:31 -0300 -Subject: [PATCH 0568/1113] media: add V4L2_CTRL_TYPE_AREA control type +Subject: [PATCH 0568/1148] media: add V4L2_CTRL_TYPE_AREA control type Commit d1dc49370f8371b00e682ac409aa1987ce641e93 upstream. @@ -374962,13 +374962,13 @@ index 3c05779e2687..7b673d92b54f 100644 /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ -- -2.18.2 +2.18.4 -From e2fcc38f91072f4fead92cc74d32cb5ffcb379f8 Mon Sep 17 00:00:00 2001 +From dd815be692b63af937ecf2ea8c07f2381a084c5d Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 7 Oct 2019 12:06:33 -0300 -Subject: [PATCH 0569/1113] media: add V4L2_CID_UNIT_CELL_SIZE control +Subject: [PATCH 0569/1148] media: add V4L2_CID_UNIT_CELL_SIZE control Commit 61fd036d01111679b01e4b92e6bd0cdd33809aea upstream. @@ -375022,13 +375022,13 @@ index 616a7c64c4d2..d21ac7545626 100644 /* Image processing controls */ -- -2.18.2 +2.18.4 -From e8311cd253e0f74ab522a1db983b4dce7a990551 Mon Sep 17 00:00:00 2001 +From 1e2c6a393be8e36248b444c1209b0370ee7aa202 Mon Sep 17 00:00:00 2001 From: Benoit Parrot Date: Mon, 7 Oct 2019 12:10:07 -0300 -Subject: [PATCH 0570/1113] media: v4l2-common: add pixel encoding support +Subject: [PATCH 0570/1148] media: v4l2-common: add pixel encoding support Commit d5a897c8428b38053df4b427a4277b1a0722bfa0 upstream. @@ -375259,13 +375259,13 @@ index c070d8ae11e5..d8c29e089000 100644 const struct v4l2_frmsize_stepwise *frmsize); int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u32 pixelformat, -- -2.18.2 +2.18.4 -From 3304482cf5a62505335b2e44d629d73773d099b2 Mon Sep 17 00:00:00 2001 +From efca9eaec4fa5aadc5a8d367317fc18a18088956 Mon Sep 17 00:00:00 2001 From: Benoit Parrot Date: Mon, 7 Oct 2019 12:10:08 -0300 -Subject: [PATCH 0571/1113] media: v4l2-common: add RGB565 and RGB55 to +Subject: [PATCH 0571/1148] media: v4l2-common: add RGB565 and RGB55 to v4l2_format_info Commit b373f84d77e1c409aacb4ff5bb5726c45fc8b166 upstream. @@ -375293,13 +375293,13 @@ index 09a3915b98a3..d0e5ebc736f9 100644 /* YUV packed formats */ { .format = V4L2_PIX_FMT_YUYV, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .hdiv = 2, .vdiv = 1 }, -- -2.18.2 +2.18.4 -From 70dd17633061ae7650a634af4fb9c72dcee10eaf Mon Sep 17 00:00:00 2001 +From 94063b9b4da488752f5923b14de15f13ed301f27 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:40 -0300 -Subject: [PATCH 0572/1113] media: vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF +Subject: [PATCH 0572/1148] media: vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF This patch adds support for the V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF flag. @@ -375493,13 +375493,13 @@ index 7b673d92b54f..bccfa30d264c 100644 #define V4L2_BUF_FLAG_PREPARED 0x00000400 /* Cache handling flags */ -- -2.18.2 +2.18.4 -From 95a0d8a4c5180e1bff77aaf7953795d51b3664c9 Mon Sep 17 00:00:00 2001 +From 0f27e16bf98249c4b759195a4c50fc1b01da6b30 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:41 -0300 -Subject: [PATCH 0573/1113] media: v4l2-mem2mem: support held capture buffers +Subject: [PATCH 0573/1148] media: v4l2-mem2mem: support held capture buffers Commit f8cca8c97a63d77f48334cde81d15014f43530ef upstream. @@ -375761,13 +375761,13 @@ index 0b9c3a287061..229d9f5d4370 100644 v4l2_m2m_buf_done(struct vb2_v4l2_buffer *buf, enum vb2_buffer_state state) { -- -2.18.2 +2.18.4 -From 7e84ba34657df4dd4babd17b8139195545c03618 Mon Sep 17 00:00:00 2001 +From f746f7a53b01d2ece69f612395772937390ddd6e Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:42 -0300 -Subject: [PATCH 0574/1113] media: videodev2.h: add V4L2_DEC_CMD_FLUSH +Subject: [PATCH 0574/1148] media: videodev2.h: add V4L2_DEC_CMD_FLUSH Add this new V4L2_DEC_CMD_FLUSH decoder command and document it. @@ -375828,13 +375828,13 @@ index bccfa30d264c..f5687e5063c2 100644 /* Flags for V4L2_DEC_CMD_START */ #define V4L2_DEC_CMD_START_MUTE_AUDIO (1 << 0) -- -2.18.2 +2.18.4 -From bb521e27bf53a4971aaa3ff952df52822d514198 Mon Sep 17 00:00:00 2001 +From adf5cc7ae21ae3937c834768ced5c99300c306ed Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 11 Oct 2019 06:32:43 -0300 -Subject: [PATCH 0575/1113] media: v4l2-mem2mem: add +Subject: [PATCH 0575/1148] media: v4l2-mem2mem: add stateless_(try_)decoder_cmd ioctl helpers Commit bef41d93aac64b54c3008ca6170bec54f85784f5 upstream. @@ -375932,13 +375932,13 @@ index 229d9f5d4370..3d9e48ed8817 100644 __poll_t v4l2_m2m_fop_poll(struct file *file, poll_table *wait); -- -2.18.2 +2.18.4 -From 37db1f0fdcfb974d2a7c9f29b7d414cda68cc797 Mon Sep 17 00:00:00 2001 +From 6ce1a41b41ae4f9528eab66dd3e9b3decab26405 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:44 -0300 -Subject: [PATCH 0576/1113] media: v4l2-mem2mem: add new_frame detection +Subject: [PATCH 0576/1148] media: v4l2-mem2mem: add new_frame detection Commit f07602ac388723233e9e3c5a05b54baf34e0a3e9 upstream. @@ -376009,13 +376009,13 @@ index 3d9e48ed8817..1d85e24791e4 100644 struct v4l2_m2m_dev *m2m_dev; -- -2.18.2 +2.18.4 -From 72ce48b3b4b4cbb2b93b0c0bb682d312aa53a349 Mon Sep 17 00:00:00 2001 +From 3a949310bea7aee1fb96689a6334acf9937b56bf Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 7 Oct 2019 12:06:32 -0300 -Subject: [PATCH 0577/1113] media: Documentation: media: Document +Subject: [PATCH 0577/1148] media: Documentation: media: Document V4L2_CTRL_TYPE_AREA Commit 8ae3a0862993c09a8ef0f9abb379553370c517e3 upstream. @@ -376063,13 +376063,13 @@ index a79028e4d929..c23e5ef30c78 100644 # V4L2 capability defines replace define V4L2_CAP_VIDEO_CAPTURE device-capabilities -- -2.18.2 +2.18.4 -From d61218026f96a77a4e0186355a1614a6f623372d Mon Sep 17 00:00:00 2001 +From be2b978a30f8b706c091ce1e655e16659c5072b4 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 22 Oct 2019 12:26:52 -0300 -Subject: [PATCH 0578/1113] media: v4l: Add definitions for HEVC stateless +Subject: [PATCH 0578/1148] media: v4l: Add definitions for HEVC stateless decoding This introduces the required definitions for HEVC decoding support with @@ -377177,13 +377177,13 @@ index e7f93109e4a4..65575e9b5a2b 100644 void *p; }; -- -2.18.2 +2.18.4 -From 1aad498885b43ffea8cad2349300ba1a988d606d Mon Sep 17 00:00:00 2001 +From f3cd1616bdea6433dac29588a08e899e4990f59b Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Wed, 6 Nov 2019 08:02:53 +0100 -Subject: [PATCH 0579/1113] media: v4l2-mem2mem: Fix hold buf flag checks +Subject: [PATCH 0579/1148] media: v4l2-mem2mem: Fix hold buf flag checks Commit 1076df3a77b490d33429560a9e0603b3673223e2 upstream. @@ -377220,13 +377220,13 @@ index 5867d81f3d2c..cc34c5ab7009 100644 spin_lock_irqsave(&m2m_dev->job_spinlock, flags); schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx); -- -2.18.2 +2.18.4 -From 02abd92c7da7d76d645d0b2d6c9b4703a79a062c Mon Sep 17 00:00:00 2001 +From 91a0f7237b59165cbe42378a6d576545f9ae85b9 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 22 Oct 2019 12:26:53 -0300 -Subject: [PATCH 0580/1113] media: pixfmt: Document the HEVC slice pixel format +Subject: [PATCH 0580/1148] media: pixfmt: Document the HEVC slice pixel format Commit de06f289283298e2938445019999cec46435375c upstream. @@ -377276,13 +377276,13 @@ index 292fdc116c77..7e9b2b939e59 100644 - ``V4L2_PIX_FMT_FWHT`` -- -2.18.2 +2.18.4 -From f6dfac7bc707bc2101a3c49d137c88e0b315058c Mon Sep 17 00:00:00 2001 +From b339e988d6b937cb5a601aecceb40ad17f4170e5 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 13 Dec 2019 17:04:25 +0100 -Subject: [PATCH 0581/1113] media: uapi: hevc: Add scaling matrix control +Subject: [PATCH 0581/1148] media: uapi: hevc: Add scaling matrix control Taken from https://patchwork.linuxtv.org/patch/60728/ Changes (mainly documentation) have been requested. @@ -377438,13 +377438,13 @@ index 1009cf0891cc..1592e52c3614 100644 + #endif -- -2.18.2 +2.18.4 -From 6836f59db7eded64436087424e14ccdc55593dc5 Mon Sep 17 00:00:00 2001 +From 2d0d1a8a73891f5d649daf88bdc49026e462894a Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 13 Dec 2019 17:04:27 +0100 -Subject: [PATCH 0582/1113] media: uapi: hevc: Add segment address field +Subject: [PATCH 0582/1148] media: uapi: hevc: Add segment address field From https://patchwork.linuxtv.org/patch/60725/ Changes requested, but mainly docs. @@ -377507,13 +377507,13 @@ index 1592e52c3614..3e2e32098312 100644 /* ISO/IEC 23008-2, ITU-T Rec. H.265: General slice segment header */ struct v4l2_hevc_dpb_entry dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]; -- -2.18.2 +2.18.4 -From 6f4688bf4c4f49865e02b76ab2b44774c28ddeb8 Mon Sep 17 00:00:00 2001 +From f76d716bc88fd9a6d0afe5fe34e30a85534d42f8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 23 Mar 2020 18:34:01 +0000 -Subject: [PATCH 0583/1113] media: hevc_ctrls: Add slice param dependent slice +Subject: [PATCH 0583/1148] media: hevc_ctrls: Add slice param dependent slice segment Adds V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT define. @@ -377536,13 +377536,13 @@ index 3e2e32098312..0ba7735465a2 100644 struct v4l2_ctrl_hevc_slice_params { __u32 bit_size; -- -2.18.2 +2.18.4 -From bc64f42e02967e27890706ca66784820c7670ebc Mon Sep 17 00:00:00 2001 +From 9f0e6445be63855bc46c96c06400705bffc3f114 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 23 Mar 2020 19:00:17 +0000 -Subject: [PATCH 0584/1113] media: uapi: Add hevc ctrls for WPP decoding +Subject: [PATCH 0584/1148] media: uapi: Add hevc ctrls for WPP decoding WPP can allow greater parallelism within the decode, but needs offset information to be passed in. @@ -377582,13 +377582,13 @@ index 0ba7735465a2..9c976b3cf092 100644 /* ISO/IEC 23008-2, ITU-T Rec. H.265: General slice segment header */ struct v4l2_hevc_dpb_entry dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]; -- -2.18.2 +2.18.4 -From d89e9326ce481f9535df3dc99fbb9be5083e63b8 Mon Sep 17 00:00:00 2001 +From 353f379225085e2101d97e419a1c80a7837c71c5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:28:21 +0000 -Subject: [PATCH 0585/1113] media: videodev2.h: Add a format for column +Subject: [PATCH 0585/1148] 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 @@ -377899,13 +377899,13 @@ index f5687e5063c2..f927a77cb2f1 100644 /* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */ #define V4L2_PIX_FMT_IPU3_SBGGR10 v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */ -- -2.18.2 +2.18.4 -From 7adf36ef6f2ccc9fc9512582771f9f839a3e0c41 Mon Sep 17 00:00:00 2001 +From 70b750ba3814e3684d0f340a1ad56190164c21da Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 5 Mar 2020 14:46:54 +0000 -Subject: [PATCH 0586/1113] media: v4l2-mem2mem: allow request job buffer +Subject: [PATCH 0586/1148] media: v4l2-mem2mem: allow request job buffer processing after job finish Allow the capture buffer to be detached from a v4l2 request job such @@ -378183,13 +378183,13 @@ index 59bf33a12648..b5b5fad97de7 100644 /* VB2 V4L2 flags as set in vb2_queue.subsystem_flags */ -- -2.18.2 +2.18.4 -From fda30e3dac520951cbc0562e35f8df955fe2b4d1 Mon Sep 17 00:00:00 2001 +From eadd10b82b1514dff6f6fe90a779330b6d2e7fea Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Mar 2020 10:53:16 +0000 -Subject: [PATCH 0587/1113] media: dt-bindings: media: Add binding for the +Subject: [PATCH 0587/1148] 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. @@ -378298,13 +378298,13 @@ index d99bdf934705..9a76a6de3e98 100644 M: Dave Stevenson L: linux-media@vger.kernel.org -- -2.18.2 +2.18.4 -From bb644f6fdc2c9ab01073be9ee808f0445376e2d0 Mon Sep 17 00:00:00 2001 +From 393ef6c779a746308ac5b78ed976f84253d1368a Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 5 Mar 2020 18:30:41 +0000 -Subject: [PATCH 0588/1113] staging: media: Add Raspberry Pi V4L2 H265 decoder +Subject: [PATCH 0588/1148] 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. @@ -382701,13 +382701,13 @@ index 000000000000..9c4f3fb2f9f6 + +#endif -- -2.18.2 +2.18.4 -From 622f7f46864d35586574b5c9f730b17832ab2b2e Mon Sep 17 00:00:00 2001 +From 3588fecdcf9510dc12d79718e5876c7fcfd6a47f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Mar 2020 16:52:55 +0000 -Subject: [PATCH 0589/1113] dtoverlays: Add overlay to enable the HEVC V4L2 +Subject: [PATCH 0589/1148] dtoverlays: Add overlay to enable the HEVC V4L2 driver This replaces the rpivid_mem register mapping driver. @@ -382835,13 +382835,13 @@ index e4ea63553dc0..5fe23a0bf27f 100644 CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m -- -2.18.2 +2.18.4 -From b9afdc72791582cb75610ad19742af30186d2b6b Mon Sep 17 00:00:00 2001 +From 1a19cbe90f7106e695b3794dc0bd6db3d42d8ca2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Mar 2020 16:55:32 +0000 -Subject: [PATCH 0590/1113] defconfig: Add V4L2 HEVC driver to +Subject: [PATCH 0590/1148] defconfig: Add V4L2 HEVC driver to bcm2711_defconfig This replaces the register mapped driver. @@ -382872,13 +382872,13 @@ index 5fe23a0bf27f..e4ea63553dc0 100644 CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m -- -2.18.2 +2.18.4 -From 57a3218a9dad53a29fb1c6bc4e50c20a2103b733 Mon Sep 17 00:00:00 2001 +From 1a37a9d75cc44fc3bf3e4cf81bff183badecb650 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 6 Dec 2019 13:05:27 +0100 -Subject: [PATCH 0591/1113] mmc: sdhci: Silence MMC warnings +Subject: [PATCH 0591/1148] 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. @@ -382920,13 +382920,13 @@ index 136f9737713d..ee270043d59e 100644 sdhci_dumpregs(host); -- -2.18.2 +2.18.4 -From 9d956598921d17116655ce16e99a06f4ca53fb90 Mon Sep 17 00:00:00 2001 +From f98bc90ffe2571c08e152123f8551427c1597d2a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 17 Feb 2020 16:20:27 +0100 -Subject: [PATCH 0592/1113] Revert "v3d_drv: Allow clock retrieval by name" +Subject: [PATCH 0592/1148] Revert "v3d_drv: Allow clock retrieval by name" This reverts commit 229fbb896ca6e0a40272cc846e41eeb0c29a551f. --- @@ -382949,13 +382949,13 @@ index 87ce683f3c04..91b0769b69ef 100644 if (PTR_ERR(v3d->clk) != -EPROBE_DEFER) dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk)); -- -2.18.2 +2.18.4 -From 8218058efbbc27bc1355096fdb1d228d686710b3 Mon Sep 17 00:00:00 2001 +From 19b0ab98057ae0749b3d35b41ac04be27b215e21 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 09:33:51 +0100 -Subject: [PATCH 0593/1113] Revert "clk-raspberrypi: Also support v3d clock" +Subject: [PATCH 0593/1148] Revert "clk-raspberrypi: Also support v3d clock" This reverts commit 54354f31352ca1e058b029abd384819435c9ef47. --- @@ -383602,13 +383602,13 @@ index 8daf26df5430..e4e139240340 100644 -1, NULL, 0); -- -2.18.2 +2.18.4 -From b451b92f6a72eb6ce8d1586766de0476b826a6e7 Mon Sep 17 00:00:00 2001 +From 2af1d90bdd73c250294cbe744268509c9fe1080f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 09:33:59 +0100 -Subject: [PATCH 0594/1113] Revert "clk-raspberrypi: Allow cpufreq driver to +Subject: [PATCH 0594/1148] Revert "clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks" This reverts commit 60dc4841efc8fe97b710b49d37d50bd719e8ca07. @@ -383630,13 +383630,13 @@ index e4e139240340..1654fd0eedc9 100644 int ret; -- -2.18.2 +2.18.4 -From 0269f5dc62c03a4076727b304a0d9542402e1057 Mon Sep 17 00:00:00 2001 +From 3d6a470190296a58ce4da800d5b21e196ba8955e Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 16:55:01 +0100 -Subject: [PATCH 0595/1113] dt-bindings: i2c: brcmstb: Convert the BRCMSTB +Subject: [PATCH 0595/1148] dt-bindings: i2c: brcmstb: Convert the BRCMSTB binding to a schema Switch the DT binding to a YAML schema to enable the DT validation. @@ -383768,13 +383768,13 @@ index 9a76a6de3e98..faa83d7e339f 100644 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER M: Al Cooper -- -2.18.2 +2.18.4 -From 7b2da109b55a3e82f5bc51fa68557f0e7f086ed6 Mon Sep 17 00:00:00 2001 +From d643fd3aface26a87f7d5c91e2b4c0b0fe23477a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 17 Dec 2019 09:58:34 +0100 -Subject: [PATCH 0596/1113] dt-bindings: i2c: brcmstb: Add BCM2711 BSC/AUTO-I2C +Subject: [PATCH 0596/1148] dt-bindings: i2c: brcmstb: Add BCM2711 BSC/AUTO-I2C binding The HDMI blocks in the BCM2771 have an i2c controller to retrieve the @@ -383870,13 +383870,13 @@ index 3189d74096e8..edbca2476128 100644 + ... -- -2.18.2 +2.18.4 -From 096fe770de84bc2a64f5fc77f84faabb0851b52f Mon Sep 17 00:00:00 2001 +From 97fcfbdf93d002a006382fb0be5990a3578f59de Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 17 Dec 2019 09:58:34 +0100 -Subject: [PATCH 0597/1113] i2c: brcmstb: Support BCM2711 HDMI BSC controllers +Subject: [PATCH 0597/1148] 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, @@ -383963,13 +383963,13 @@ index 506991596b68..169a2836922d 100644 }; MODULE_DEVICE_TABLE(of, brcmstb_i2c_of_match); -- -2.18.2 +2.18.4 -From 50fca085db90d74286acd009292480dd34ec195b Mon Sep 17 00:00:00 2001 +From 7ea687788c5611d2276a89d23646cf8ec57e6282 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 Jan 2020 13:36:42 +0100 -Subject: [PATCH 0598/1113] i2c: brcmstb: Allow to compile it on BCM2835 +Subject: [PATCH 0598/1148] 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. @@ -384000,13 +384000,13 @@ index c9ae45f55d2b..1291bda7e6f1 100644 help If you say yes to this option, support will be included for the -- -2.18.2 +2.18.4 -From fb99dffc84c756de8ebe4c3ce2f936a86cea2b3b Mon Sep 17 00:00:00 2001 +From 2688fc1f9f04bd12824ac7a53b17b381d0412b0a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:51:09 +0100 -Subject: [PATCH 0599/1113] dt-bindings: clock: Add a binding for the RPi +Subject: [PATCH 0599/1148] dt-bindings: clock: Add a binding for the RPi Firmware clocks The firmare running on the RPi VideoCore can be used to discover and @@ -384070,13 +384070,13 @@ index 000000000000..d37bc311321d + +... -- -2.18.2 +2.18.4 -From 58c5f6938313b1c5d4fe526cb10a12a3d2bc2656 Mon Sep 17 00:00:00 2001 +From 7d60ed73990019525a2784132f2274bc9fac0389 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 23 Dec 2019 19:58:08 +0100 -Subject: [PATCH 0600/1113] clk: bcm: rpi: Allow the driver to be probed by DT +Subject: [PATCH 0600/1148] 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. @@ -384136,13 +384136,13 @@ index 1654fd0eedc9..94870234824c 100644 .probe = raspberrypi_clk_probe, .remove = raspberrypi_clk_remove, -- -2.18.2 +2.18.4 -From 881f5e45883892b898dc7e74b8a7297f06248217 Mon Sep 17 00:00:00 2001 +From 664039ed758fee82e1f1ab12d1ad847913cc9a3c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 14:17:54 +0100 -Subject: [PATCH 0601/1113] clk: bcm: rpi: Statically init clk_init_data +Subject: [PATCH 0601/1148] clk: bcm: rpi: Statically init clk_init_data Instead of declaring the clk_init_data and then calling memset on it, just initialise properly. @@ -384174,13 +384174,13 @@ index 94870234824c..64fd91b5ffe9 100644 /* All of the PLLs derive from the external oscillator. */ init.parent_names = (const char *[]){ "osc" }; -- -2.18.2 +2.18.4 -From 7472645fe6070d05bfb09cfb82c8309a77e72981 Mon Sep 17 00:00:00 2001 +From d73dbe8fcf47b1bbbf01ed8f3336ce799d8071b7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:40:00 +0100 -Subject: [PATCH 0602/1113] clk: bcm: rpi: Use clk_hw_register for pllb_arm +Subject: [PATCH 0602/1148] 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 @@ -384236,13 +384236,13 @@ index 64fd91b5ffe9..48cffa44db64 100644 rpi->pllb_arm_lookup = clkdev_hw_create(rpi->pllb_arm, NULL, "cpu0"); if (!rpi->pllb_arm_lookup) { -- -2.18.2 +2.18.4 -From 6d4469c3ea94db408187778a7ca1a9b515ea3c43 Mon Sep 17 00:00:00 2001 +From ac3ce34753b4664fe77df1cc9d5f292b89a1eb57 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:41:37 +0100 -Subject: [PATCH 0603/1113] clk: bcm: rpi: Remove global pllb_arm clock pointer +Subject: [PATCH 0603/1148] 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. @@ -384287,13 +384287,13 @@ index 48cffa44db64..61a942f9a6a2 100644 } -- -2.18.2 +2.18.4 -From ba360075693cf7a1921b462af4dec6a5b9eabe29 Mon Sep 17 00:00:00 2001 +From 3e21f77375e64ec551188913496e3bf23da1baaa Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:42:40 +0100 -Subject: [PATCH 0604/1113] clk: bcm: rpi: Make sure pllb_arm is removed +Subject: [PATCH 0604/1148] 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 @@ -384333,13 +384333,13 @@ index 61a942f9a6a2..783c8c5e5373 100644 } -- -2.18.2 +2.18.4 -From dd378d9feeb0d146d37f2c88033f104f491659d8 Mon Sep 17 00:00:00 2001 +From 31a0ce3fb53039ed76947f374e3198a86b137812 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:46:24 +0100 -Subject: [PATCH 0605/1113] clk: bcm: rpi: Remove pllb_arm_lookup global +Subject: [PATCH 0605/1148] clk: bcm: rpi: Remove pllb_arm_lookup global pointer The pllb_arm_lookup pointer in the struct raspberrypi_clk is not used for @@ -384391,13 +384391,13 @@ index 783c8c5e5373..0c1d6c292302 100644 return -ENOMEM; } -- -2.18.2 +2.18.4 -From 429e0cc82b20b2dab3cace5e2433b6039dea63e7 Mon Sep 17 00:00:00 2001 +From 2bd65a2204a4493a20101148c8bb9e8c891ef369 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 14:21:45 +0100 -Subject: [PATCH 0606/1113] clk: bcm: rpi: Switch to clk_hw_register_clkdev +Subject: [PATCH 0606/1148] 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 @@ -384442,13 +384442,13 @@ index 0c1d6c292302..b97c7ec61376 100644 return 0; -- -2.18.2 +2.18.4 -From bae2cd1fc755387a5c7ff5804cde2dc6731370fd Mon Sep 17 00:00:00 2001 +From cbaf9f7b60eaead7e8a226a5503801d3d5e82a98 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:47:13 +0100 -Subject: [PATCH 0607/1113] clk: bcm: rpi: Make sure the clkdev lookup is +Subject: [PATCH 0607/1148] clk: bcm: rpi: Make sure the clkdev lookup is removed The clkdev lookup created for the cpufreq device is never removed if @@ -384483,13 +384483,13 @@ index b97c7ec61376..b8b55134ba3f 100644 dev_err(rpi->dev, "Failed to initialize clkdev\n"); return ret; -- -2.18.2 +2.18.4 -From 73f5146379da4b71ba515ee600cbc9ef82227cd3 Mon Sep 17 00:00:00 2001 +From f4dce94284073d2527a6cb06030aebc8dba7172a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:01:33 +0100 -Subject: [PATCH 0608/1113] clk: bcm: rpi: Create a data structure for the +Subject: [PATCH 0608/1148] clk: bcm: rpi: Create a data structure for the clocks So far the driver has really only been providing a single clock, and stored @@ -384616,13 +384616,13 @@ index b8b55134ba3f..964fc8f792cc 100644 static struct clk_fixed_factor raspberrypi_clk_pllb_arm = { -- -2.18.2 +2.18.4 -From eec98d30625d279611c1754e6703ce7b283e377f Mon Sep 17 00:00:00 2001 +From 2ca0db1295c9dd39498d97fe5491441ed91c4cfc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:04:16 +0100 -Subject: [PATCH 0609/1113] clk: bcm: rpi: Add clock id to data +Subject: [PATCH 0609/1148] 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 @@ -384708,13 +384708,13 @@ index 964fc8f792cc..e796dabbc641 100644 dev_err(rpi->dev, "Failed to get %s max freq: %d\n", init.name, ret); -- -2.18.2 +2.18.4 -From f02529e33f3c9cbe153eda19e90211fc6acf4210 Mon Sep 17 00:00:00 2001 +From e128ccc69a10b00b117f00d5d5b4121a24a761c2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:08:17 +0100 -Subject: [PATCH 0610/1113] clk: bcm: rpi: Pass the clocks data to the firmware +Subject: [PATCH 0610/1148] clk: bcm: rpi: Pass the clocks data to the firmware function The raspberry_clock_property only takes the clock ID as an argument, but @@ -384810,13 +384810,13 @@ index e796dabbc641..055dd34c5acc 100644 dev_err(rpi->dev, "Failed to get %s max freq: %d\n", init.name, ret); -- -2.18.2 +2.18.4 -From ac1e7da711efa821a05dcd16cf2e8bebb653581f Mon Sep 17 00:00:00 2001 +From 008e49541020e15317ac8b6d62d2deb339cb14ad Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 20 Feb 2020 12:45:47 +0100 -Subject: [PATCH 0611/1113] clk: bcm: rpi: Rename is_prepared function +Subject: [PATCH 0611/1148] 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. @@ -384856,13 +384856,13 @@ index 055dd34c5acc..2f10bccf03a5 100644 .set_rate = raspberrypi_fw_pll_set_rate, .determine_rate = raspberrypi_pll_determine_rate, -- -2.18.2 +2.18.4 -From 487a361efe2abbc582bebf5cf5fe503b6585ce67 Mon Sep 17 00:00:00 2001 +From 31a825affde4fdbc20c342c9fc62b7bd525c903d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:14:18 +0100 -Subject: [PATCH 0612/1113] clk: bcm: rpi: Split pllb clock hooks +Subject: [PATCH 0612/1148] 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. @@ -384942,13 +384942,13 @@ index 2f10bccf03a5..d1b5826c95bb 100644 * Sadly there is no firmware rate rounding interface. We borrowed it from * clk-bcm2835. -- -2.18.2 +2.18.4 -From c994a63a955b5fd53b9f26bbf2d53a9449c0b68a Mon Sep 17 00:00:00 2001 +From d65deacef974e431c1725fb81ca8b61e3d86ca29 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:30:01 +0100 -Subject: [PATCH 0613/1113] clk: bcm: rpi: Make the PLLB registration function +Subject: [PATCH 0613/1148] clk: bcm: rpi: Make the PLLB registration function return a clk_hw The raspberrypi_register_pllb has been returning an integer so far to @@ -385092,13 +385092,13 @@ index d1b5826c95bb..05ed2f2cde31 100644 rpi->cpufreq = platform_device_register_data(dev, "raspberrypi-cpufreq", -1, NULL, 0); -- -2.18.2 +2.18.4 -From eabb631a0e55273169b988cd6cca7e82a3083306 Mon Sep 17 00:00:00 2001 +From 448833c0d06c2a8a44c21bd8d55d4b704d6d77f2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 17:03:46 +0100 -Subject: [PATCH 0614/1113] clk: bcm: rpi: Add DT provider for the clocks +Subject: [PATCH 0614/1148] 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. @@ -385165,13 +385165,13 @@ index 05ed2f2cde31..f2fbcef54c9c 100644 rpi->cpufreq = platform_device_register_data(dev, "raspberrypi-cpufreq", -1, NULL, 0); -- -2.18.2 +2.18.4 -From eafaae13fccdf6f4f2fd8b3f295a25aab6837ad7 Mon Sep 17 00:00:00 2001 +From e5c2390643856cf1467397dd212a64c268c69ba7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 10 Feb 2020 14:06:09 +0100 -Subject: [PATCH 0615/1113] clk: bcm: rpi: Discover the firmware clocks +Subject: [PATCH 0615/1148] 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 @@ -385346,13 +385346,13 @@ index 05c6989ec4c6..3335c2a2993c 100644 int rpi_firmware_property(struct rpi_firmware *fw, u32 tag, void *data, size_t len); -- -2.18.2 +2.18.4 -From 475bdc6d0461ca58d38d7e8bbd2fba96cf305efa Mon Sep 17 00:00:00 2001 +From 688cdd4950696466ea2e45e31c66b27f85f5bbee Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 23 Dec 2019 19:58:30 +0100 -Subject: [PATCH 0616/1113] ARM: dts: bcm2711: Add firmware clocks node +Subject: [PATCH 0616/1148] 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. @@ -385393,13 +385393,13 @@ index b56388ce1216..7acd4a3cf1e5 100644 soc { /* -- -2.18.2 +2.18.4 -From a5acc527e5afbc8881c1e660eee637a4fa5e5ed3 Mon Sep 17 00:00:00 2001 +From 365718639643612846e87cb6923d9ecd3bfde38e Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 09:33:52 +0100 -Subject: [PATCH 0617/1113] reset: Move reset-simple header out of +Subject: [PATCH 0617/1148] reset: Move reset-simple header out of drivers/reset The reset-simple code can be useful for drivers outside of drivers/reset @@ -385490,13 +385490,13 @@ similarity index 100% rename from drivers/reset/reset-simple.h rename to include/linux/reset/reset-simple.h -- -2.18.2 +2.18.4 -From 0a1e19de6f0ac5d820e65e90acbf595eddfe2e36 Mon Sep 17 00:00:00 2001 +From d9d225da7519aaa9c34dd42333d98c7d4b3c42c9 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 16:22:20 +0100 -Subject: [PATCH 0618/1113] reset: simple: Add reset callback +Subject: [PATCH 0618/1148] 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 @@ -385583,13 +385583,13 @@ index 08ccb25a55e6..5eb83625a495 100644 extern const struct reset_control_ops reset_simple_ops; -- -2.18.2 +2.18.4 -From 71fd6551ea2e5c7f726edf814628507d9c8c3450 Mon Sep 17 00:00:00 2001 +From c771d5bbc16e444306b9ad0c652457a58e889ccd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:50:31 +0100 -Subject: [PATCH 0619/1113] dt-bindings: clock: Add BCM2711 DVP binding +Subject: [PATCH 0619/1148] 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. @@ -385658,13 +385658,13 @@ index 000000000000..08543ecbe35b + +... -- -2.18.2 +2.18.4 -From 909ac259376decd219233ef09c9fb7cf701c45a3 Mon Sep 17 00:00:00 2001 +From 9149ca2e968675a622d0ec774c8060ab282aabaa Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 09:36:27 +0100 -Subject: [PATCH 0620/1113] clk: bcm: Add BCM2711 DVP driver +Subject: [PATCH 0620/1148] clk: bcm: Add BCM2711 DVP driver The HDMI block has a block that controls clocks and reset signals to the HDMI0 and HDMI1 controllers. @@ -385841,13 +385841,13 @@ index 000000000000..bfe4e5b4a148 +}; +module_platform_driver(clk_dvp_driver); -- -2.18.2 +2.18.4 -From 4a619fc78729d943ab52c8f59dbb533a07d679dd Mon Sep 17 00:00:00 2001 +From e35c75e831172d6c7f3c8ba62ddff887054dae59 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 09:37:06 +0100 -Subject: [PATCH 0621/1113] ARM: dts: bcm2711: Add HDMI DVP +Subject: [PATCH 0621/1148] ARM: dts: bcm2711: Add HDMI DVP Now that we have a driver for the DVP, let's add its DT node. @@ -385890,13 +385890,13 @@ index 7acd4a3cf1e5..7cf1a9748f00 100644 arm-pmu { -- -2.18.2 +2.18.4 -From 9b2a41765de8b0e7baa4594cd00d176613540c4f Mon Sep 17 00:00:00 2001 +From 3810884c1fcd40c6b4bff2bde0ee904bd550741c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:42:05 +0100 -Subject: [PATCH 0622/1113] dt-bindings: display: Convert VC4 bindings to +Subject: [PATCH 0622/1148] dt-bindings: display: Convert VC4 bindings to schemas The BCM283x SoCs have a display pipeline composed of several controllers @@ -386633,13 +386633,13 @@ index faa83d7e339f..b1b23c692186 100644 DRM DRIVERS FOR VIVANTE GPU IP -- -2.18.2 +2.18.4 -From b82a5fc024758572d7bab0950075dd7e0ec044ce Mon Sep 17 00:00:00 2001 +From d877258839750fb4f2ff87e15160aca0ad6dd674 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:47:18 +0100 -Subject: [PATCH 0623/1113] dt-bindings: display: vc4: dpi: Add missing +Subject: [PATCH 0623/1148] dt-bindings: display: vc4: dpi: Add missing clock-names property While the device tree and the driver expected a clock-names property, it @@ -386677,13 +386677,13 @@ index 288494b70e82..58213c564e03 100644 additionalProperties: false -- -2.18.2 +2.18.4 -From 2c02be139dd76eb0c6d212789567eca2755b70ef Mon Sep 17 00:00:00 2001 +From abfda9a52a049c86f1bdf403f740a1aed5018c6f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:47:18 +0100 -Subject: [PATCH 0624/1113] dt-bindings: display: vc4: dsi: Add missing clock +Subject: [PATCH 0624/1148] dt-bindings: display: vc4: dsi: Add missing clock properties While the device tree and the driver expected a clock-names and a @@ -386737,13 +386737,13 @@ index 3887675f844e..3c643b227a70 100644 - interrupts -- -2.18.2 +2.18.4 -From 0e834a2d9524a4f41028fc719aef414369f97e19 Mon Sep 17 00:00:00 2001 +From 78bc6da13fe42fb39e8b0084556d9f9d0a980640 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:47:18 +0100 -Subject: [PATCH 0625/1113] dt-bindings: display: vc4: hdmi: Add missing +Subject: [PATCH 0625/1148] dt-bindings: display: vc4: hdmi: Add missing clock-names property While the device tree and the driver expected a clock-names property, it @@ -386777,13 +386777,13 @@ index 834cc5f1c254..52b3cdac0bdf 100644 ddc: allOf: -- -2.18.2 +2.18.4 -From 9bc70b45c0a69ab952b16f4d9b00905904db91eb Mon Sep 17 00:00:00 2001 +From f75c5850bc198eb9f5375d12ea702496f01361fc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:40:56 +0100 -Subject: [PATCH 0626/1113] dt-bindings: display: vc4: Document BCM2711 VC5 +Subject: [PATCH 0626/1148] dt-bindings: display: vc4: Document BCM2711 VC5 The BCM2711 comes with a new VideoCore. Add a compatible for it. @@ -386807,13 +386807,13 @@ index 0dcf0c397375..49a5e041aa49 100644 - brcm,cygnus-vc4 -- -2.18.2 +2.18.4 -From 40e67be616f90d5942b47b00668fc9add668b3e9 Mon Sep 17 00:00:00 2001 +From 202f5619172907fbae57e4721a1bd99966c5cfcc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 18:08:48 +0100 -Subject: [PATCH 0627/1113] drm/vc4: drv: Add include guards +Subject: [PATCH 0627/1148] 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. @@ -386843,13 +386843,13 @@ index 308f0473592a..95f7433c8630 100644 + +#endif /* _VC4_DRV_H_ */ -- -2.18.2 +2.18.4 -From 266f7fc83dc3a3ce9158269dae6e098ef0f90ba3 Mon Sep 17 00:00:00 2001 +From ec40359b91a24ee26562508c574bb1edd27cb1f1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 15:40:34 +0100 -Subject: [PATCH 0628/1113] drm/vc4: drv: Support BCM2711 +Subject: [PATCH 0628/1148] 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 @@ -386964,13 +386964,13 @@ index 1c5eef3ac441..81ec016a12d8 100644 vc4_state = to_vc4_plane_state(state); crtc_state = drm_atomic_get_existing_crtc_state(state->state, -- -2.18.2 +2.18.4 -From 05e5449c78c807fd7e51fea779224ae554be56bb Mon Sep 17 00:00:00 2001 +From 27217740c01d6b2b472bf3889e9982716ff18b58 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Aug 2019 17:51:07 +0100 -Subject: [PATCH 0629/1113] drm/vc4: drv: Add support for the BCM2711 HVS5 +Subject: [PATCH 0629/1148] drm/vc4: drv: Add support for the BCM2711 HVS5 The HVS found in the BCM2711 is slightly different from the previous generations. @@ -387475,13 +387475,13 @@ index 8416fdaf2ec4..22b895258545 100644 * integers, except that the 2 integer bits map as {0x0: 0, 0x1: 1, * 0x2: 2, 0x3: -1} -- -2.18.2 +2.18.4 -From c4f15c1248652beb9bd6dfda09a50d8bc2ff4fdc Mon Sep 17 00:00:00 2001 +From f2e906ea16be131973cf44bd30e5a85c0fd1b0cd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 11 Feb 2020 16:55:02 +0000 -Subject: [PATCH 0630/1113] drm/vc4: plane: Improve LBM usage +Subject: [PATCH 0630/1148] 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 @@ -387579,13 +387579,13 @@ index 49c16d0e2527..ed07e25f6b94 100644 if (ret) -- -2.18.2 +2.18.4 -From ec9035c3bb4b63a118d7e2f5d920aec798253d4e Mon Sep 17 00:00:00 2001 +From 7a9a92e566d31f3f796a9692f221160ea55bb61a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:32:57 +0100 -Subject: [PATCH 0631/1113] drm/vc4: plane: Move planes creation to its own +Subject: [PATCH 0631/1148] drm/vc4: plane: Move planes creation to its own function The planes so far were created as part of the CRTC binding code with @@ -387714,13 +387714,13 @@ index ed07e25f6b94..940d046b07b6 100644 + return 0; +} -- -2.18.2 +2.18.4 -From 732da5c09dc90c705a6142d1bfb929b892189eb5 Mon Sep 17 00:00:00 2001 +From 59e4442d792c407b4216ff85d09b2920db63ffe2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:41:41 +0100 -Subject: [PATCH 0632/1113] drm/vc4: plane: Move additional planes creation to +Subject: [PATCH 0632/1148] drm/vc4: plane: Move additional planes creation to driver So far the plane creation was done when each CRTC was bound, and those @@ -387797,13 +387797,13 @@ index 4e5d63609736..cea611e5b604 100644 ret = vc4_kms_load(drm); -- -2.18.2 +2.18.4 -From ce6791ac66b9a2de07ae8527879ec0fd8d76a2c8 Mon Sep 17 00:00:00 2001 +From 0a1da65813c04a07b81fd18d70cf20c0ac65f535 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:46:14 +0100 -Subject: [PATCH 0633/1113] drm/vc4: plane: Register all the planes at once +Subject: [PATCH 0633/1148] 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. @@ -387932,13 +387932,13 @@ index 940d046b07b6..603351b4c428 100644 return 0; -- -2.18.2 +2.18.4 -From b6a45b451e1023ab334eaa1bfaf7a2b2ff1e7297 Mon Sep 17 00:00:00 2001 +From c9db7593dff96d041cf2d39575ff31ec2ef45477 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:50:06 +0100 -Subject: [PATCH 0634/1113] drm/vc4: plane: Create overlays for any CRTC +Subject: [PATCH 0634/1148] 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. @@ -388008,13 +388008,13 @@ index 603351b4c428..744034c41ce2 100644 * since we overlay planes on the CRTC in the order they were * initialized. -- -2.18.2 +2.18.4 -From 3714e3b1466f3e07d5dd15230748f10567b0e5ba Mon Sep 17 00:00:00 2001 +From d97b9bb2a3ec7a7625b750d13658540db66946af Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:52:42 +0100 -Subject: [PATCH 0635/1113] drm/vc4: plane: Create more planes +Subject: [PATCH 0635/1148] drm/vc4: plane: Create more planes Let's now create more planes that can be affected to all the CRTCs. @@ -388046,13 +388046,13 @@ index 744034c41ce2..887ef481e746 100644 vc4_plane_init(drm, DRM_PLANE_TYPE_OVERLAY); -- -2.18.2 +2.18.4 -From 3048b4a3ffe00149077ad1358c92da3184b30774 Mon Sep 17 00:00:00 2001 +From c4104024629e6e3b49205842cb07575c45da0eae Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 11:45:04 +0100 -Subject: [PATCH 0636/1113] drm/vc4: crtc: Rename SoC data structures +Subject: [PATCH 0636/1148] 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 @@ -388108,13 +388108,13 @@ index c570dd09b180..8e6c6784f9a3 100644 }; -- -2.18.2 +2.18.4 -From 15cd8e6efe382df90c3c44531bfa682581581ed1 Mon Sep 17 00:00:00 2001 +From a5ab85000a0935ea084afa8ee22890dc6779b672 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 15:45:04 +0100 -Subject: [PATCH 0637/1113] drm/vc4: crtc: Move crtc state to common header +Subject: [PATCH 0637/1148] 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 @@ -388190,13 +388190,13 @@ index d2d253a94288..2703b9d8936b 100644 #define V3D_WRITE(offset, val) writel(val, vc4->v3d->regs + offset) #define HVS_READ(offset) readl(vc4->hvs->regs + offset) -- -2.18.2 +2.18.4 -From 647a76b27586bd13c34177aab4287a610bb07865 Mon Sep 17 00:00:00 2001 +From 56e67fbf18f5acab76f0fde85931003f8ec5a5da Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 11:36:50 +0100 -Subject: [PATCH 0638/1113] drm/vc4: crtc: Deal with different number of pixel +Subject: [PATCH 0638/1148] drm/vc4: crtc: Deal with different number of pixel per clock Some of the HDMI pixelvalves in vc5 output two pixels per clock cycle. @@ -388284,13 +388284,13 @@ index 2703b9d8936b..dabf9951c375 100644 const char *debugfs_name; }; -- -2.18.2 +2.18.4 -From d9ae1dd876d52aaae8c5b488e1e247fdbdc193dd Mon Sep 17 00:00:00 2001 +From b28ada932518dfc9fd78d90bdb4e549f2ec479c0 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 9 Jan 2020 18:40:49 +0100 -Subject: [PATCH 0639/1113] drm/vc4: crtc: Use a shared interrupt +Subject: [PATCH 0639/1148] 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. @@ -388316,13 +388316,13 @@ index 5e94adb4f70b..4eedaddb8c92 100644 goto err_destroy_planes; -- -2.18.2 +2.18.4 -From bbd1c0821d0e9585b23bc71da691af7ec08b80af Mon Sep 17 00:00:00 2001 +From 90c55cffd1880505cad7ab01942534eb965d3fa1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Jan 2020 13:39:32 +0100 -Subject: [PATCH 0640/1113] drm/vc4: crtc: Turn static const variable into a +Subject: [PATCH 0640/1148] 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 @@ -388372,13 +388372,13 @@ index 4eedaddb8c92..7b08e6fd1fb1 100644 } -- -2.18.2 +2.18.4 -From dceaade7a731b676050f108992a9b9ac7c8d2fe2 Mon Sep 17 00:00:00 2001 +From 7780da83d74a14fbf5f91c134bea70d483b1eb2a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 15:48:09 +0100 -Subject: [PATCH 0641/1113] drm/vc4: crtc: Move the cob allocation outside of +Subject: [PATCH 0641/1148] drm/vc4: crtc: Move the cob allocation outside of bind The COB allocation depends on the HVS channel used for a given @@ -388490,13 +388490,13 @@ index dabf9951c375..a7c9295aecc3 100644 struct drm_pending_vblank_event *event; -- -2.18.2 +2.18.4 -From 16d1b76c2ffdaaa14a6ad7185b39b3125e9c5842 Mon Sep 17 00:00:00 2001 +From 22526186eff15bab5a4273e1f482fb69c88f4f93 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 13:49:17 +0100 -Subject: [PATCH 0642/1113] drm/vc4: crtc: Rename HVS channel to output +Subject: [PATCH 0642/1148] 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 @@ -388578,13 +388578,13 @@ index a7c9295aecc3..f6fc92663191 100644 /* Number of pixels output per clock period */ u8 pixels_per_clock; -- -2.18.2 +2.18.4 -From e4d74842595023d93b78867cf7ba274bb896d965 Mon Sep 17 00:00:00 2001 +From ec55fe24f7a6e141d45c311dd8d3c0c8dd0a58dc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 Jan 2020 13:37:27 +0100 -Subject: [PATCH 0643/1113] drm/vc4: crtc: Use local chan variable +Subject: [PATCH 0643/1148] 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. @@ -388608,13 +388608,13 @@ index 8267e38abd5f..2e1aee1ba05b 100644 spin_unlock_irqrestore(&dev->event_lock, flags); } -- -2.18.2 +2.18.4 -From c74ce0647ad1265a308abc43fea8dcec6a42e078 Mon Sep 17 00:00:00 2001 +From d1b177c781c950bd0ab1018caaa6317d9ebf0def Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 14:34:31 +0100 -Subject: [PATCH 0644/1113] drm/vc4: crtc: Enable and disable the PV in +Subject: [PATCH 0644/1148] 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 @@ -388669,13 +388669,13 @@ index 2e1aee1ba05b..b394f873b194 100644 * drm_crtc_get_vblank() fails in vc4_crtc_update_dlist(). */ -- -2.18.2 +2.18.4 -From 55b356a3121dce43ccfa0ad0821fdd8838e9e0cf Mon Sep 17 00:00:00 2001 +From 20195c994030cbba727d775bc396358f6598d7f5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 17:53:18 +0100 -Subject: [PATCH 0645/1113] drm/vc4: crtc: Assign output to channel +Subject: [PATCH 0645/1148] drm/vc4: crtc: Assign output to channel automatically The HVS found in the BCM2711 has 6 outputs and 3 FIFOs, with each output @@ -389141,13 +389141,13 @@ index 22b895258545..1300198716aa 100644 #define SCALER_DISPLIST1 0x00000024 #define SCALER_DISPLIST2 0x00000028 -- -2.18.2 +2.18.4 -From dd28c135d98b9ade7de6d41389f7091c3f8b12e6 Mon Sep 17 00:00:00 2001 +From 1308985ed881716402c11f8bad2c7a10358bd6e2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Jan 2020 13:39:20 +0100 -Subject: [PATCH 0646/1113] drm/vc4: crtc: Add FIFO depth to vc4_crtc_data +Subject: [PATCH 0646/1148] 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 @@ -389235,13 +389235,13 @@ index 8208dfd0cb08..6eb030445419 100644 unsigned int hvs_available_channels; -- -2.18.2 +2.18.4 -From 5bb6104be6235b15595fe3269b1152208685d56a Mon Sep 17 00:00:00 2001 +From 7021cee6f54cfe7d3f8e07097c43df4ce0140b73 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Jan 2020 13:40:37 +0100 -Subject: [PATCH 0647/1113] drm/vc4: crtc: Add function to compute FIFO level +Subject: [PATCH 0647/1148] drm/vc4: crtc: Add function to compute FIFO level bits The longer FIFOs in vc5 pixelvalves means that the FIFO full level @@ -389285,13 +389285,13 @@ index 961da7b2439d..81d144fd446d 100644 PV_CONTROL_CLR_AT_START | PV_CONTROL_TRIGGER_UNDERFLOW | -- -2.18.2 +2.18.4 -From d3263d59a2b4f0649050e059f8e0175ce888f7ca Mon Sep 17 00:00:00 2001 +From 0a39da6f79f5dd0be6bc0fa9cac83ef843fa22c9 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 9 Jan 2020 18:35:13 +0100 -Subject: [PATCH 0648/1113] drm/vc4: crtc: Rename HDMI encoder type to HDMI0 +Subject: [PATCH 0648/1148] 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 @@ -389331,10 +389331,10 @@ index 6eb030445419..4aed118c7925 100644 VC4_ENCODER_TYPE_DSI0, VC4_ENCODER_TYPE_DSI1, diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 0c3d9d27e196..2a85d59e3e4e 100644 +index d59fd8714c5d..821eb9c4dfbf 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1319,7 +1319,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1320,7 +1320,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) GFP_KERNEL); if (!vc4_hdmi_encoder) return -ENOMEM; @@ -389344,13 +389344,13 @@ index 0c3d9d27e196..2a85d59e3e4e 100644 hdmi->pdev = pdev; -- -2.18.2 +2.18.4 -From 9f7897b6a7d793de88a00354ef37ae00774dc0ff Mon Sep 17 00:00:00 2001 +From 21332f2b16dadec8a852bdbd316bccacb59879a9 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 9 Jan 2020 18:39:30 +0100 -Subject: [PATCH 0649/1113] drm/vc4: crtc: Add HDMI1 encoder type +Subject: [PATCH 0649/1148] drm/vc4: crtc: Add HDMI1 encoder type The BCM2711 sports a second HDMI controller, so let's add that second HDMI encoder type. @@ -389373,13 +389373,13 @@ index 4aed118c7925..4a83b8879f1c 100644 VC4_ENCODER_TYPE_DSI0, VC4_ENCODER_TYPE_DSI1, -- -2.18.2 +2.18.4 -From 60c93cbad56a7bbbe3053abd8e034821f9a1fede Mon Sep 17 00:00:00 2001 +From 104e0df4728964dbb8ae75ec2be45155da402e14 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 16:48:19 +0100 -Subject: [PATCH 0650/1113] drm/vc4: crtc: Remove redundant call to +Subject: [PATCH 0650/1148] drm/vc4: crtc: Remove redundant call to drm_crtc_enable_color_mgmt The driver calls the helper to add the color management properties twice, @@ -389403,13 +389403,13 @@ index fa68ddfc9360..312077e84f63 100644 /* We support CTM, but only for one CRTC at a time. It's therefore * implemented as private driver state in vc4_kms, not here. -- -2.18.2 +2.18.4 -From 96839fc56c3b12eed22b699276c0698e52f8f0a9 Mon Sep 17 00:00:00 2001 +From 4e4f1340fad6b5a8380cb5fff22f027a42b2da02 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 16:54:21 +0100 -Subject: [PATCH 0651/1113] drm/vc4: crtc: Disable color management for HVS5 +Subject: [PATCH 0651/1148] drm/vc4: crtc: Disable color management for HVS5 The HVS5 uses different color matrices. Disable color management support for now. @@ -389463,13 +389463,13 @@ index 312077e84f63..daf882b7f95e 100644 CRTC_WRITE(PV_INTEN, 0); CRTC_WRITE(PV_INTSTAT, PV_INT_VFP_START); -- -2.18.2 +2.18.4 -From 167e573b4dc6559e4742e1fc070b566f61e149a4 Mon Sep 17 00:00:00 2001 +From be1f126e21c66aab78abe44e886ceb0f23e30832 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:07:02 +0100 -Subject: [PATCH 0652/1113] dt-bindings: display: vc4: pv: Add BCM2711 pixel +Subject: [PATCH 0652/1148] dt-bindings: display: vc4: pv: Add BCM2711 pixel valves The BCM2711 comes with other pixelvalves that have different requirements @@ -389499,13 +389499,13 @@ index e60791db1fa1..4e1ba03f6477 100644 reg: maxItems: 1 -- -2.18.2 +2.18.4 -From bbe5e162bd7405d0ebe97717e1e6127d49beacf8 Mon Sep 17 00:00:00 2001 +From 4d66ba40f2e8023d600d0b738f5aa9c8de9508e7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 11:35:58 +0100 -Subject: [PATCH 0653/1113] drm/vc4: crtc: Add BCM2711 pixelvalves +Subject: [PATCH 0653/1148] drm/vc4: crtc: Add BCM2711 pixelvalves The BCM2711 has 5 pixelvalves, so now that our driver is ready, let's add support for them. @@ -389659,13 +389659,13 @@ index 1300198716aa..ca563d373d9d 100644 #define SCALER_DISPCTRL 0x00000000 -- -2.18.2 +2.18.4 -From 713938208cf7b1c70c7a1f3871c0fb0908d2d4e6 Mon Sep 17 00:00:00 2001 +From 4ed2968cd79e9ed7b423ece5fe33b14ecf26c3e1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 Jan 2020 17:24:32 +0100 -Subject: [PATCH 0654/1113] drm/vc4: hdmi: Use debugfs private field +Subject: [PATCH 0654/1148] 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 @@ -389680,7 +389680,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 2a85d59e3e4e..5de9e48f949e 100644 +index 821eb9c4dfbf..3bcb6ff781ec 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -182,9 +182,7 @@ static const struct debugfs_reg32 hd_regs[] = { @@ -389695,13 +389695,13 @@ index 2a85d59e3e4e..5de9e48f949e 100644 drm_print_regset32(&p, &hdmi->hdmi_regset); -- -2.18.2 +2.18.4 -From 7dc69903d745e79d6243751c825ca3af48a198ec Mon Sep 17 00:00:00 2001 +From 654957ce3c23689e1a7d9aea96df19f30481f9a2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Dec 2019 18:35:12 +0100 -Subject: [PATCH 0655/1113] drm/vc4: hdmi: Move structure to header +Subject: [PATCH 0655/1148] 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. @@ -389714,7 +389714,7 @@ Signed-off-by: Maxime Ripard create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi.h diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 5de9e48f949e..8d095e8f1984 100644 +index 3bcb6ff781ec..dcbf695c9d46 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -48,87 +48,13 @@ @@ -389899,13 +389899,13 @@ index 000000000000..5ec5d1f6b1e6 + +#endif /* _VC4_HDMI_H_ */ -- -2.18.2 +2.18.4 -From f35bedf075093b04f464ccb47897f1d26f780d73 Mon Sep 17 00:00:00 2001 +From f68efb6f03de8caa988f1ffdbd869b20dd46f1f4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 17:17:29 +0100 -Subject: [PATCH 0656/1113] drm/vc4: hdmi: rework connectors and encoders +Subject: [PATCH 0656/1148] 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. @@ -389923,7 +389923,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 71 insertions(+), 77 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 8d095e8f1984..8442b9bf82af 100644 +index dcbf695c9d46..e8de9fa499ae 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -190,19 +190,14 @@ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = @@ -390086,7 +390086,7 @@ index 8d095e8f1984..8442b9bf82af 100644 return 0; } -@@ -1230,7 +1229,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1231,7 +1230,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = drm->dev_private; struct vc4_hdmi *hdmi; @@ -390095,7 +390095,7 @@ index 8d095e8f1984..8442b9bf82af 100644 struct device_node *ddc_node; u32 value; int ret; -@@ -1239,14 +1238,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1240,14 +1239,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) if (!hdmi) return -ENOMEM; @@ -390113,7 +390113,7 @@ index 8d095e8f1984..8442b9bf82af 100644 hdmi->hdmicore_regs = vc4_ioremap_regs(pdev, 0); if (IS_ERR(hdmi->hdmicore_regs)) return PTR_ERR(hdmi->hdmicore_regs); -@@ -1332,15 +1327,14 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1333,15 +1328,14 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) } pm_runtime_enable(dev); @@ -390134,7 +390134,7 @@ index 8d095e8f1984..8442b9bf82af 100644 #ifdef CONFIG_DRM_VC4_HDMI_CEC hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4, "vc4", -@@ -1350,7 +1344,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1351,7 +1345,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) if (ret < 0) goto err_destroy_conn; @@ -390143,7 +390143,7 @@ index 8d095e8f1984..8442b9bf82af 100644 cec_s_conn_info(hdmi->cec_adap, &conn_info); HDMI_WRITE(VC4_HDMI_CPU_MASK_SET, 0xffffffff); -@@ -1387,10 +1381,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1388,10 +1382,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) err_delete_cec_adap: cec_delete_adapter(hdmi->cec_adap); err_destroy_conn: @@ -390156,7 +390156,7 @@ index 8d095e8f1984..8442b9bf82af 100644 err_unprepare_hsm: clk_disable_unprepare(hdmi->hsm_clock); pm_runtime_disable(dev); -@@ -1408,8 +1402,8 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, +@@ -1409,8 +1403,8 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, struct vc4_hdmi *hdmi = vc4->hdmi; cec_unregister_adapter(hdmi->cec_adap); @@ -390255,13 +390255,13 @@ index 5ec5d1f6b1e6..17079a39f1b1 100644 - #endif /* _VC4_HDMI_H_ */ -- -2.18.2 +2.18.4 -From 3b0a54e14765f4d4927c478b3249f344d4cc6d11 Mon Sep 17 00:00:00 2001 +From 86b79cdee6d7ab957aa173c30a66c216c6a9108d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:07:05 +0100 -Subject: [PATCH 0657/1113] drm/vc4: hdmi: Rename hdmi to vc4_hdmi +Subject: [PATCH 0657/1148] 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. @@ -390272,7 +390272,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 136 insertions(+), 135 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 8442b9bf82af..b2bbbb5cadfd 100644 +index e8de9fa499ae..45892e16eb04 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -108,11 +108,11 @@ static const struct debugfs_reg32 hd_regs[] = { @@ -390663,7 +390663,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 dai_link->num_cpus = 1; dai_link->num_codecs = 1; -@@ -1058,7 +1058,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi) +@@ -1059,7 +1059,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi) * now stored in card->drvdata and should be retrieved with * snd_soc_card_get_drvdata() if needed. */ @@ -390672,7 +390672,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 ret = devm_snd_soc_register_card(dev, card); if (ret) dev_err(dev, "Could not register sound card: %d\n", ret); -@@ -1071,20 +1071,21 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi) +@@ -1072,20 +1072,21 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi) static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) { struct vc4_dev *vc4 = priv; @@ -390702,7 +390702,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 0, 2, 0, 0); } return IRQ_HANDLED; -@@ -1110,23 +1111,23 @@ static void vc4_cec_read_msg(struct vc4_dev *vc4, u32 cntrl1) +@@ -1111,23 +1112,23 @@ static void vc4_cec_read_msg(struct vc4_dev *vc4, u32 cntrl1) static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) { struct vc4_dev *vc4 = priv; @@ -390731,7 +390731,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 cntrl1 &= ~VC4_HDMI_CEC_START_XMIT_BEGIN; } HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, cntrl1); -@@ -1228,44 +1229,44 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1229,44 +1230,44 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = drm->dev_private; @@ -390799,7 +390799,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 } ddc_node = of_parse_phandle(dev->of_node, "ddc", 0); -@@ -1274,9 +1275,9 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1275,9 +1276,9 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) return -ENODEV; } @@ -390811,7 +390811,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 DRM_DEBUG("Failed to get ddc i2c adapter by node\n"); return -EPROBE_DEFER; } -@@ -1285,13 +1286,13 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1286,13 +1287,13 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) * needs to be a bit higher than the pixel clock rate * (generally 148.5Mhz). */ @@ -390827,7 +390827,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 if (ret) { DRM_ERROR("Failed to turn on HDMI state machine clock: %d\n", ret); -@@ -1304,18 +1305,18 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1305,18 +1306,18 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) if (of_find_property(dev->of_node, "hpd-gpios", &value)) { enum of_gpio_flags hpd_gpio_flags; @@ -390851,7 +390851,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 /* HDMI core must be enabled. */ if (!(HD_READ(VC4_HD_M_CTL) & VC4_HD_M_ENABLE)) { -@@ -1331,21 +1332,21 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1332,21 +1333,21 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) DRM_MODE_ENCODER_TMDS, NULL); drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs); @@ -390878,7 +390878,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 HDMI_WRITE(VC4_HDMI_CPU_MASK_SET, 0xffffffff); value = HDMI_READ(VC4_HDMI_CEC_CNTRL_1); -@@ -1364,32 +1365,32 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1365,32 +1366,32 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) "vc4 hdmi cec", vc4); if (ret) goto err_delete_cec_adap; @@ -390918,7 +390918,7 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 return ret; } -@@ -1399,16 +1400,16 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, +@@ -1400,16 +1401,16 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, { struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = drm->dev_private; @@ -390942,13 +390942,13 @@ index 8442b9bf82af..b2bbbb5cadfd 100644 vc4->hdmi = NULL; } -- -2.18.2 +2.18.4 -From 15b06cc54970371dcbeb73bf73a7b52e70d67023 Mon Sep 17 00:00:00 2001 +From 9466d6eb5c2385cda0fb6d0e0b8087f9ed2d51f2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:21:44 +0100 -Subject: [PATCH 0658/1113] drm/vc4: hdmi: Move accessors to vc4_hdmi +Subject: [PATCH 0658/1148] 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 @@ -390965,7 +390965,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index b2bbbb5cadfd..00f36244e379 100644 +index 45892e16eb04..87b66f528065 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -122,6 +122,7 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) @@ -391049,7 +391049,7 @@ index b2bbbb5cadfd..00f36244e379 100644 switch (cmd) { case SNDRV_PCM_TRIGGER_START: -@@ -1093,7 +1083,8 @@ static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) +@@ -1094,7 +1084,8 @@ static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) static void vc4_cec_read_msg(struct vc4_dev *vc4, u32 cntrl1) { @@ -391059,7 +391059,7 @@ index b2bbbb5cadfd..00f36244e379 100644 unsigned int i; msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >> -@@ -1139,6 +1130,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) +@@ -1140,6 +1131,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) { struct vc4_dev *vc4 = cec_get_drvdata(adap); @@ -391067,7 +391067,7 @@ index b2bbbb5cadfd..00f36244e379 100644 /* clock period in microseconds */ const u32 usecs = 1000000 / CEC_CLOCK_FREQ; u32 val = HDMI_READ(VC4_HDMI_CEC_CNTRL_5); -@@ -1182,6 +1174,7 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) +@@ -1183,6 +1175,7 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) { struct vc4_dev *vc4 = cec_get_drvdata(adap); @@ -391075,7 +391075,7 @@ index b2bbbb5cadfd..00f36244e379 100644 HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, (HDMI_READ(VC4_HDMI_CEC_CNTRL_1) & ~VC4_HDMI_CEC_ADDR_MASK) | -@@ -1193,6 +1186,7 @@ static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, +@@ -1194,6 +1187,7 @@ static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, u32 signal_free_time, struct cec_msg *msg) { struct vc4_dev *vc4 = cec_get_drvdata(adap); @@ -391102,13 +391102,13 @@ index 17079a39f1b1..cdc9d90f62ac 100644 #endif /* _VC4_HDMI_H_ */ -- -2.18.2 +2.18.4 -From bb04afc792198fb4f77ac6088ce7e03713136e38 Mon Sep 17 00:00:00 2001 +From cd702dd349ccb5d6058b89ac74b0bc137570e8fa Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:44:36 +0100 -Subject: [PATCH 0659/1113] drm/vc4: hdmi: Use local vc4_hdmi directly +Subject: [PATCH 0659/1148] 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 @@ -391122,7 +391122,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 00f36244e379..a20805825855 100644 +index 87b66f528065..05a15407ea3a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -124,20 +124,20 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) @@ -391153,13 +391153,13 @@ index 00f36244e379..a20805825855 100644 } -- -2.18.2 +2.18.4 -From 2993e4aa728820e18c1b56143855e8d4ec28f2d8 Mon Sep 17 00:00:00 2001 +From b2012c5f8d34d6e26bdb1753be4bf779141a1660 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:45:46 +0100 -Subject: [PATCH 0660/1113] drm/vc4: hdmi: Add container_of macros for encoders +Subject: [PATCH 0660/1148] drm/vc4: hdmi: Add container_of macros for encoders and connectors Whenever the code needs to access the vc4_hdmi structure from a DRM @@ -391180,7 +391180,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index a20805825855..47d299c81a07 100644 +index 05a15407ea3a..3f0ed00c62df 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -120,9 +120,7 @@ static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused) @@ -391312,13 +391312,13 @@ index cdc9d90f62ac..749a807cd1f3 100644 #define HDMI_WRITE(offset, val) writel(val, vc4_hdmi->hdmicore_regs + offset) #define HD_READ(offset) readl(vc4_hdmi->hd_regs + offset) -- -2.18.2 +2.18.4 -From 5d1654e78a944dd1a23421bc39e39a743fb9a6af Mon Sep 17 00:00:00 2001 +From 757f493cf12d0f394afa33e2e0df50a024a81efb Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:47:53 +0100 -Subject: [PATCH 0661/1113] drm/vc4: hdmi: Pass vc4_hdmi to CEC code +Subject: [PATCH 0661/1148] 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 @@ -391333,10 +391333,10 @@ Signed-off-by: Maxime Ripard 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 47d299c81a07..eb8a43c4ea98 100644 +index 3f0ed00c62df..ed18826dfc2f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1043,8 +1043,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) +@@ -1044,8 +1044,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) #ifdef CONFIG_DRM_VC4_HDMI_CEC static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) { @@ -391346,7 +391346,7 @@ index 47d299c81a07..eb8a43c4ea98 100644 if (vc4_hdmi->cec_irq_was_rx) { if (vc4_hdmi->cec_rx_msg.len) -@@ -1064,9 +1063,8 @@ static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) +@@ -1065,9 +1064,8 @@ static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) return IRQ_HANDLED; } @@ -391357,7 +391357,7 @@ index 47d299c81a07..eb8a43c4ea98 100644 struct cec_msg *msg = &vc4_hdmi->cec_rx_msg; unsigned int i; -@@ -1084,8 +1082,7 @@ static void vc4_cec_read_msg(struct vc4_dev *vc4, u32 cntrl1) +@@ -1085,8 +1083,7 @@ static void vc4_cec_read_msg(struct vc4_dev *vc4, u32 cntrl1) static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) { @@ -391367,7 +391367,7 @@ index 47d299c81a07..eb8a43c4ea98 100644 u32 stat = HDMI_READ(VC4_HDMI_CPU_STATUS); u32 cntrl1, cntrl5; -@@ -1096,7 +1093,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) +@@ -1097,7 +1094,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) cntrl5 = HDMI_READ(VC4_HDMI_CEC_CNTRL_5); vc4_hdmi->cec_irq_was_rx = cntrl5 & VC4_HDMI_CEC_RX_CEC_INT; if (vc4_hdmi->cec_irq_was_rx) { @@ -391376,7 +391376,7 @@ index 47d299c81a07..eb8a43c4ea98 100644 cntrl1 |= VC4_HDMI_CEC_CLEAR_RECEIVE_OFF; HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, cntrl1); cntrl1 &= ~VC4_HDMI_CEC_CLEAR_RECEIVE_OFF; -@@ -1112,8 +1109,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) +@@ -1113,8 +1110,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) { @@ -391386,7 +391386,7 @@ index 47d299c81a07..eb8a43c4ea98 100644 /* clock period in microseconds */ const u32 usecs = 1000000 / CEC_CLOCK_FREQ; u32 val = HDMI_READ(VC4_HDMI_CEC_CNTRL_5); -@@ -1156,8 +1152,7 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) +@@ -1157,8 +1153,7 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) { @@ -391396,7 +391396,7 @@ index 47d299c81a07..eb8a43c4ea98 100644 HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, (HDMI_READ(VC4_HDMI_CEC_CNTRL_1) & ~VC4_HDMI_CEC_ADDR_MASK) | -@@ -1168,8 +1163,7 @@ static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) +@@ -1169,8 +1164,7 @@ static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, u32 signal_free_time, struct cec_msg *msg) { @@ -391406,7 +391406,7 @@ index 47d299c81a07..eb8a43c4ea98 100644 u32 val; unsigned int i; -@@ -1315,7 +1309,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1316,7 +1310,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) #ifdef CONFIG_DRM_VC4_HDMI_CEC vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, @@ -391415,7 +391415,7 @@ index 47d299c81a07..eb8a43c4ea98 100644 CEC_CAP_DEFAULTS | CEC_CAP_CONNECTOR_INFO, 1); ret = PTR_ERR_OR_ZERO(vc4_hdmi->cec_adap); -@@ -1339,7 +1333,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1340,7 +1334,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0), vc4_cec_irq_handler, vc4_cec_irq_handler_thread, 0, @@ -391425,13 +391425,13 @@ index 47d299c81a07..eb8a43c4ea98 100644 goto err_delete_cec_adap; ret = cec_register_adapter(vc4_hdmi->cec_adap, dev); -- -2.18.2 +2.18.4 -From 0ba66f351c944b6f359b875cef0021fe8ef72951 Mon Sep 17 00:00:00 2001 +From d6b0b5302c61397b927210bf8b787bf810f71a3f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:49:11 +0100 -Subject: [PATCH 0662/1113] drm/vc4: hdmi: Remove vc4_dev hdmi pointer +Subject: [PATCH 0662/1148] drm/vc4: hdmi: Remove vc4_dev hdmi pointer Now that we don't have any users anymore, we can kill that pointer. @@ -391454,10 +391454,10 @@ index 4a83b8879f1c..48d96ae391e0 100644 struct vc4_v3d *v3d; struct vc4_dpi *dpi; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index eb8a43c4ea98..251567ae36b3 100644 +index ed18826dfc2f..08933446b358 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1199,7 +1199,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1200,7 +1200,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) #endif struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); @@ -391465,7 +391465,7 @@ index eb8a43c4ea98..251567ae36b3 100644 struct vc4_hdmi *vc4_hdmi; struct drm_encoder *encoder; struct device_node *ddc_node; -@@ -1287,8 +1286,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1288,8 +1287,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) vc4_hdmi->hpd_active_low = hpd_gpio_flags & OF_GPIO_ACTIVE_LOW; } @@ -391474,7 +391474,7 @@ index eb8a43c4ea98..251567ae36b3 100644 /* HDMI core must be enabled. */ if (!(HD_READ(VC4_HD_M_CTL) & VC4_HD_M_ENABLE)) { HD_WRITE(VC4_HD_M_CTL, VC4_HD_M_SW_RST); -@@ -1369,9 +1366,12 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1370,9 +1367,12 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) static void vc4_hdmi_unbind(struct device *dev, struct device *master, void *data) { @@ -391490,7 +391490,7 @@ index eb8a43c4ea98..251567ae36b3 100644 cec_unregister_adapter(vc4_hdmi->cec_adap); vc4_hdmi_connector_destroy(&vc4_hdmi->connector.base); -@@ -1381,8 +1381,6 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, +@@ -1382,8 +1382,6 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, pm_runtime_disable(dev); put_device(&vc4_hdmi->ddc->dev); @@ -391500,13 +391500,13 @@ index eb8a43c4ea98..251567ae36b3 100644 static const struct component_ops vc4_hdmi_ops = { -- -2.18.2 +2.18.4 -From 217cfb7295fd7f4a21122b737efaaea782c2ff24 Mon Sep 17 00:00:00 2001 +From 974545190067d29b6ae32b20c93e46aebf99e9bd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:57:16 +0100 -Subject: [PATCH 0663/1113] drm/vc4: hdmi: Remove vc4_hdmi_connector +Subject: [PATCH 0663/1148] 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 @@ -391519,7 +391519,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 251567ae36b3..aef285ab3269 100644 +index 08933446b358..9fd13b50df2d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -188,13 +188,10 @@ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = @@ -391573,7 +391573,7 @@ index 251567ae36b3..aef285ab3269 100644 memcpy(ucontrol->value.bytes.data, connector->eld, sizeof(connector->eld)); -@@ -1313,7 +1310,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1314,7 +1311,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) if (ret < 0) goto err_destroy_conn; @@ -391582,7 +391582,7 @@ index 251567ae36b3..aef285ab3269 100644 cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info); HDMI_WRITE(VC4_HDMI_CPU_MASK_SET, 0xffffffff); -@@ -1350,7 +1347,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1351,7 +1348,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) err_delete_cec_adap: cec_delete_adapter(vc4_hdmi->cec_adap); err_destroy_conn: @@ -391591,7 +391591,7 @@ index 251567ae36b3..aef285ab3269 100644 #endif err_destroy_encoder: vc4_hdmi_encoder_destroy(encoder); -@@ -1374,7 +1371,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, +@@ -1375,7 +1372,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, struct vc4_hdmi *vc4_hdmi = snd_soc_card_get_drvdata(card); cec_unregister_adapter(vc4_hdmi->cec_adap); @@ -391649,13 +391649,13 @@ index 749a807cd1f3..88794136d2e4 100644 static inline struct vc4_hdmi * -- -2.18.2 +2.18.4 -From 6edc157990794be5978a9351e761c0f59b28d3a9 Mon Sep 17 00:00:00 2001 +From dfd5a418a8b2170a47953b842f0c56171898892a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Dec 2019 11:30:54 +0100 -Subject: [PATCH 0664/1113] drm/vc4: hdmi: Introduce resource init and variant +Subject: [PATCH 0664/1148] 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. @@ -391671,10 +391671,10 @@ Signed-off-by: Maxime Ripard 2 files changed, 54 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index aef285ab3269..d23465420fea 100644 +index 9fd13b50df2d..31ea26e4eb7d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1189,38 +1189,23 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { +@@ -1190,38 +1190,23 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { }; #endif @@ -391720,7 +391720,7 @@ index aef285ab3269..d23465420fea 100644 vc4_hdmi->hd_regset.base = vc4_hdmi->hd_regs; vc4_hdmi->hd_regset.regs = hd_regs; vc4_hdmi->hd_regset.nregs = ARRAY_SIZE(hd_regs); -@@ -1230,12 +1215,44 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1231,12 +1216,44 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) DRM_ERROR("Failed to get pixel clock\n"); return PTR_ERR(vc4_hdmi->pixel_clock); } @@ -391765,7 +391765,7 @@ index aef285ab3269..d23465420fea 100644 ddc_node = of_parse_phandle(dev->of_node, "ddc", 0); if (!ddc_node) { DRM_ERROR("Failed to find ddc node in device tree\n"); -@@ -1396,8 +1413,12 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) +@@ -1397,8 +1414,12 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) return 0; } @@ -391808,13 +391808,13 @@ index 88794136d2e4..4cd712779ad3 100644 struct vc4_hdmi_encoder encoder; struct drm_connector connector; -- -2.18.2 +2.18.4 -From 2276bda522e9c7c69e9601b092182ca2b584f6da Mon Sep 17 00:00:00 2001 +From 49805563e612247de5d42df670b1866aa6f525da Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Dec 2019 19:15:08 +0100 -Subject: [PATCH 0665/1113] drm/vc4: hdmi: Implement a register layout +Subject: [PATCH 0665/1148] drm/vc4: hdmi: Implement a register layout abstraction The HDMI controllers found in the BCM2711 have most of the registers @@ -391838,7 +391838,7 @@ Signed-off-by: Maxime Ripard create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi_regs.h diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index d23465420fea..0289444ed710 100644 +index 31ea26e4eb7d..7a97104b9625 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -49,62 +49,13 @@ @@ -392340,7 +392340,7 @@ index d23465420fea..0289444ed710 100644 vc4_hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; vc4_hdmi->audio.dma_data.maxburst = 2; -@@ -1068,7 +1031,7 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) +@@ -1069,7 +1032,7 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >> VC4_HDMI_CEC_REC_WRD_CNT_SHIFT); for (i = 0; i < msg->len; i += 4) { @@ -392349,7 +392349,7 @@ index d23465420fea..0289444ed710 100644 msg->msg[i] = val & 0xff; msg->msg[i + 1] = (val >> 8) & 0xff; -@@ -1080,26 +1043,26 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) +@@ -1081,26 +1044,26 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) { struct vc4_hdmi *vc4_hdmi = priv; @@ -392382,7 +392382,7 @@ index d23465420fea..0289444ed710 100644 return IRQ_WAKE_THREAD; } -@@ -1109,7 +1072,7 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) +@@ -1110,7 +1073,7 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap); /* clock period in microseconds */ const u32 usecs = 1000000 / CEC_CLOCK_FREQ; @@ -392391,7 +392391,7 @@ index d23465420fea..0289444ed710 100644 val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET | VC4_HDMI_CEC_CNT_TO_4700_US_MASK | -@@ -1118,30 +1081,30 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) +@@ -1119,30 +1082,30 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) ((4500 / usecs) << VC4_HDMI_CEC_CNT_TO_4500_US_SHIFT); if (enable) { @@ -392430,7 +392430,7 @@ index d23465420fea..0289444ed710 100644 VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); } return 0; -@@ -1151,8 +1114,8 @@ static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) +@@ -1152,8 +1115,8 @@ static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) { struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap); @@ -392441,7 +392441,7 @@ index d23465420fea..0289444ed710 100644 (log_addr & 0xf) << VC4_HDMI_CEC_ADDR_SHIFT); return 0; } -@@ -1165,20 +1128,20 @@ static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, +@@ -1166,20 +1129,20 @@ static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, unsigned int i; for (i = 0; i < msg->len; i += 4) @@ -392466,7 +392466,7 @@ index d23465420fea..0289444ed710 100644 return 0; } -@@ -1189,26 +1152,63 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { +@@ -1190,26 +1153,63 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { }; #endif @@ -392536,7 +392536,7 @@ index d23465420fea..0289444ed710 100644 vc4_hdmi->pixel_clock = devm_clk_get(dev, "pixel"); if (IS_ERR(vc4_hdmi->pixel_clock)) { -@@ -1301,12 +1301,12 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1302,12 +1302,12 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) } /* HDMI core must be enabled. */ @@ -392553,7 +392553,7 @@ index d23465420fea..0289444ed710 100644 } pm_runtime_enable(dev); -@@ -1330,8 +1330,8 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1331,8 +1331,8 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector); cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info); @@ -392564,7 +392564,7 @@ index d23465420fea..0289444ed710 100644 value &= ~VC4_HDMI_CEC_DIV_CLK_CNT_MASK; /* * Set the logical address to Unregistered and set the clock -@@ -1340,7 +1340,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1341,7 +1341,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) */ value |= VC4_HDMI_CEC_ADDR_MASK | (4091 << VC4_HDMI_CEC_DIV_CLK_CNT_SHIFT); @@ -392573,7 +392573,7 @@ index d23465420fea..0289444ed710 100644 ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0), vc4_cec_irq_handler, vc4_cec_irq_handler_thread, 0, -@@ -1387,6 +1387,9 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, +@@ -1388,6 +1388,9 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, struct snd_soc_card *card = dev_get_drvdata(dev); struct vc4_hdmi *vc4_hdmi = snd_soc_card_get_drvdata(card); @@ -392583,7 +392583,7 @@ index d23465420fea..0289444ed710 100644 cec_unregister_adapter(vc4_hdmi->cec_adap); vc4_hdmi_connector_destroy(&vc4_hdmi->connector); vc4_hdmi_encoder_destroy(&vc4_hdmi->encoder.base.base); -@@ -1414,6 +1417,9 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) +@@ -1415,6 +1418,9 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) } static const struct vc4_hdmi_variant bcm2835_variant = { @@ -393131,13 +393131,13 @@ index ca563d373d9d..78809866097c 100644 #define HVS_BOOTLOADER_DLIST_END 32 -- -2.18.2 +2.18.4 -From 88bd64f8c15c8458a8001e91e123bd8950872f5e Mon Sep 17 00:00:00 2001 +From bf941e7a6be9e9be204c4fd57ea912a6d9e62aed Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 16:25:26 +0100 -Subject: [PATCH 0666/1113] drm/vc4: hdmi: Add reset callback +Subject: [PATCH 0666/1148] 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. @@ -393149,7 +393149,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 0289444ed710..785a8940a8a0 100644 +index 7a97104b9625..da882735a620 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -68,6 +68,15 @@ static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused) @@ -393182,7 +393182,7 @@ index 0289444ed710..785a8940a8a0 100644 /* PHY should be in reset, like * vc4_hdmi_encoder_disable() does. -@@ -1421,6 +1427,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1422,6 +1428,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .num_registers = ARRAY_SIZE(vc4_hdmi_fields), .init_resources = vc4_hdmi_init_resources, @@ -393205,13 +393205,13 @@ index f7d0ca9447d2..93695674c2d3 100644 /* HDMI audio information */ -- -2.18.2 +2.18.4 -From e03f3d582d46f343894f4d6af5a3281bf72e06a9 Mon Sep 17 00:00:00 2001 +From 7d7f720292d9a32aaec709fa9ea661bd89dd789b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 16:53:33 +0100 -Subject: [PATCH 0667/1113] drm/vc4: hdmi: Add PHY init and disable function +Subject: [PATCH 0667/1148] 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. @@ -393240,7 +393240,7 @@ index e90c6304775a..8281a044834f 100644 vc4_hvs.o \ vc4_irq.o \ diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 785a8940a8a0..af04a624618b 100644 +index da882735a620..90a522d8624b 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -324,7 +324,9 @@ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder) @@ -393269,7 +393269,7 @@ index 785a8940a8a0..af04a624618b 100644 if (debug_dump_regs) { struct drm_printer p = drm_info_printer(&vc4_hdmi->pdev->dev); -@@ -1428,6 +1426,8 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1429,6 +1427,8 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .init_resources = vc4_hdmi_init_resources, .reset = vc4_hdmi_reset, @@ -393346,13 +393346,13 @@ index 000000000000..26d6ee08edcf + HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0xf << 16); +} -- -2.18.2 +2.18.4 -From aa53ffe4e28a2e46a52eb9e10e42b8611f6d46b1 Mon Sep 17 00:00:00 2001 +From 9d771492bf2eb3b7b8149e089af9225b0a15c305 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 17:22:24 +0100 -Subject: [PATCH 0668/1113] drm/vc4: hdmi: Add PHY RNG enable / disable +Subject: [PATCH 0668/1148] drm/vc4: hdmi: Add PHY RNG enable / disable function Let's continue the implementation of hooks for the parts that change in the @@ -393366,7 +393366,7 @@ Signed-off-by: Maxime Ripard 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index af04a624618b..a0535a320b37 100644 +index 90a522d8624b..80d8cdddd39a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -765,9 +765,9 @@ static int vc4_hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd, @@ -393396,7 +393396,7 @@ index af04a624618b..a0535a320b37 100644 break; default: break; -@@ -1428,6 +1429,8 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1429,6 +1430,8 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .reset = vc4_hdmi_reset, .phy_init = vc4_hdmi_phy_init, .phy_disable = vc4_hdmi_phy_disable, @@ -393461,13 +393461,13 @@ index 26d6ee08edcf..8fdea621d8b1 100644 + VC4_HDMI_TX_PHY_RNG_PWRDN); +} -- -2.18.2 +2.18.4 -From 6c6bfb3589c86487fa5e6a487b13b3ceb548a7ab Mon Sep 17 00:00:00 2001 +From dff4b2e7ae654c20dc4f5b0ef5661d3b86b3e290 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 18:41:53 +0100 -Subject: [PATCH 0669/1113] drm/vc4: hdmi: Add a CSC setup callback +Subject: [PATCH 0669/1148] 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. @@ -393479,7 +393479,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 45 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index a0535a320b37..919aef860a79 100644 +index 80d8cdddd39a..4871a161bac9 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -337,6 +337,41 @@ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder) @@ -393580,7 +393580,7 @@ index a0535a320b37..919aef860a79 100644 HDMI_WRITE(HDMI_FIFO_CTL, VC4_HDMI_FIFO_CTL_MASTER_SLAVE_N); if (debug_dump_regs) { -@@ -1426,6 +1438,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1427,6 +1439,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .num_registers = ARRAY_SIZE(vc4_hdmi_fields), .init_resources = vc4_hdmi_init_resources, @@ -393603,13 +393603,13 @@ index 9ae4d2c5a4f0..22669e07b22e 100644 void (*phy_init)(struct vc4_hdmi *vc4_hdmi, struct drm_display_mode *mode); -- -2.18.2 +2.18.4 -From 39506e5d4eb2a0cfaffc9a92271560fd8dd27625 Mon Sep 17 00:00:00 2001 +From 14aeda529e6509d9c17520d3cbf29e067105cb16 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 13:43:27 +0100 -Subject: [PATCH 0670/1113] drm/vc4: hdmi: Add a set_timings callback +Subject: [PATCH 0670/1148] 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 @@ -393625,7 +393625,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 44 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 919aef860a79..46c2b0cf4a29 100644 +index 4871a161bac9..c0dba5dd93b8 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -372,12 +372,9 @@ static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable) @@ -393720,7 +393720,7 @@ index 919aef860a79..46c2b0cf4a29 100644 if (vc4_encoder->hdmi_monitor && drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_LIMITED) { -@@ -1440,6 +1448,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1441,6 +1449,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .init_resources = vc4_hdmi_init_resources, .csc_setup = vc4_hdmi_csc_setup, .reset = vc4_hdmi_reset, @@ -393744,13 +393744,13 @@ index 22669e07b22e..4a67d62aef53 100644 void (*phy_init)(struct vc4_hdmi *vc4_hdmi, struct drm_display_mode *mode); -- -2.18.2 +2.18.4 -From 9e1291c3ca2d86b3d4ba7860917fa1f565fc5357 Mon Sep 17 00:00:00 2001 +From cc3b92fe20d6d485802de4b1cc93f20a64389a86 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 7 Jan 2020 13:14:07 +0100 -Subject: [PATCH 0671/1113] drm/vc4: hdmi: Add HDMI ID +Subject: [PATCH 0671/1148] 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 @@ -393765,10 +393765,10 @@ Signed-off-by: Maxime Ripard 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 46c2b0cf4a29..362903acfe43 100644 +index c0dba5dd93b8..434240cbfaa6 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1267,11 +1267,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1268,11 +1268,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL); if (!vc4_hdmi) return -ENOMEM; @@ -393798,13 +393798,13 @@ index 4a67d62aef53..4d3117de383a 100644 const struct vc4_hdmi_register *registers; -- -2.18.2 +2.18.4 -From fc30882f835dc86b8016dcef44f05983ed215c78 Mon Sep 17 00:00:00 2001 +From 9bdb95b3cce058e4e5b20a8d903fe5ab7a87d105 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 16 Jan 2020 14:27:56 +0100 -Subject: [PATCH 0672/1113] drm/vc4: hdmi: Deal with multiple debugfs files +Subject: [PATCH 0672/1148] drm/vc4: hdmi: Deal with multiple debugfs files The HDMI driver was registering a single debugfs file so far with the name hdmi_regs. @@ -393821,10 +393821,10 @@ Signed-off-by: Maxime Ripard 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 362903acfe43..b754b7efc420 100644 +index 434240cbfaa6..25672d88f8f3 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1380,7 +1380,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1381,7 +1381,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) if (ret) goto err_destroy_encoder; @@ -393837,13 +393837,13 @@ index 362903acfe43..b754b7efc420 100644 return 0; -- -2.18.2 +2.18.4 -From c5960da91d9945693099a67c8ba6f9df4051d5d0 Mon Sep 17 00:00:00 2001 +From 1061cf8aee7dae6f67d33a7d74e6b2f12bc5b6e6 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 16:21:45 +0100 -Subject: [PATCH 0673/1113] drm/vc4: hdmi: Add an audio support flag +Subject: [PATCH 0673/1148] 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 @@ -393856,7 +393856,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 7 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index b754b7efc420..3360a26524c6 100644 +index 25672d88f8f3..b51d3e997e0c 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -944,6 +944,9 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) @@ -393869,7 +393869,7 @@ index b754b7efc420..3360a26524c6 100644 if (!of_find_property(dev->of_node, "dmas", &len) || len == 0) { dev_warn(dev, -@@ -1444,6 +1447,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) +@@ -1445,6 +1448,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) } static const struct vc4_hdmi_variant bcm2835_variant = { @@ -393892,13 +393892,13 @@ index 4d3117de383a..f41116507156 100644 const struct vc4_hdmi_register *registers; -- -2.18.2 +2.18.4 -From 7104773394b0d3a1ba47af2c2281ddc61ed8fd4a Mon Sep 17 00:00:00 2001 +From af6e87aa76d4b92e67d115f5ef4fa49288c007b7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 16:22:13 +0100 -Subject: [PATCH 0674/1113] drm/vc4: hdmi: Move CEC init to its own function +Subject: [PATCH 0674/1148] 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 @@ -393910,10 +393910,10 @@ Signed-off-by: Maxime Ripard 1 file changed, 67 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 3360a26524c6..21122fccd0ef 100644 +index b51d3e997e0c..3fadc534f41a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1178,6 +1178,67 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { +@@ -1179,6 +1179,67 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { .adap_log_addr = vc4_hdmi_cec_adap_log_addr, .adap_transmit = vc4_hdmi_cec_adap_transmit, }; @@ -393981,7 +393981,7 @@ index 3360a26524c6..21122fccd0ef 100644 #endif static int vc4_hdmi_build_regset(struct vc4_hdmi *vc4_hdmi, -@@ -1255,9 +1316,6 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) +@@ -1256,9 +1317,6 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) { @@ -393991,7 +393991,7 @@ index 3360a26524c6..21122fccd0ef 100644 struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); const struct vc4_hdmi_variant *variant; -@@ -1345,43 +1403,13 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1346,43 +1404,13 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) if (ret) goto err_destroy_encoder; @@ -394038,7 +394038,7 @@ index 3360a26524c6..21122fccd0ef 100644 vc4_debugfs_add_file(drm, variant->id ? "hdmi1_regs" : "hdmi_regs", -@@ -1390,12 +1418,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1391,12 +1419,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) return 0; @@ -394053,7 +394053,7 @@ index 3360a26524c6..21122fccd0ef 100644 err_destroy_encoder: vc4_hdmi_encoder_destroy(encoder); err_unprepare_hsm: -@@ -1420,7 +1446,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, +@@ -1421,7 +1447,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, kfree(vc4_hdmi->hdmi_regset.regs); kfree(vc4_hdmi->hd_regset.regs); @@ -394063,13 +394063,13 @@ index 3360a26524c6..21122fccd0ef 100644 vc4_hdmi_encoder_destroy(&vc4_hdmi->encoder.base.base); -- -2.18.2 +2.18.4 -From 71486a34acab1e5649bc5fa45afa1e7b5ef2f89b Mon Sep 17 00:00:00 2001 +From b832b78d7846512f94cb5ad90108ada9a4728781 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 16:22:50 +0100 -Subject: [PATCH 0675/1113] drm/vc4: hdmi: Add CEC support flag +Subject: [PATCH 0675/1148] 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 @@ -394082,10 +394082,10 @@ Signed-off-by: Maxime Ripard 2 files changed, 7 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 21122fccd0ef..a5a949253d87 100644 +index 3fadc534f41a..8d5848990e4a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1186,6 +1186,9 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +@@ -1187,6 +1187,9 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) u32 value; int ret; @@ -394095,7 +394095,7 @@ index 21122fccd0ef..a5a949253d87 100644 vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4_hdmi, "vc4", CEC_CAP_DEFAULTS | -@@ -1474,6 +1477,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) +@@ -1475,6 +1478,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) static const struct vc4_hdmi_variant bcm2835_variant = { .audio_available = true, @@ -394118,13 +394118,13 @@ index f41116507156..cbb1d3ab85d7 100644 const struct vc4_hdmi_register *registers; -- -2.18.2 +2.18.4 -From 5496742d754a8bfcc27e4ca9f1059324177c6a4e Mon Sep 17 00:00:00 2001 +From 193ca63b3247d5f767201834738ea301de80917c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 10 Feb 2020 15:15:47 +0100 -Subject: [PATCH 0676/1113] drm/vc4: hdmi: Remove unused CEC_CLOCK_DIV define +Subject: [PATCH 0676/1148] 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. @@ -394135,7 +394135,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index a5a949253d87..6360f63dd2d1 100644 +index 8d5848990e4a..5a1a6e84b947 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -54,7 +54,6 @@ @@ -394147,13 +394147,13 @@ index a5a949253d87..6360f63dd2d1 100644 static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused) { -- -2.18.2 +2.18.4 -From 5dfb209f438e32e9c67c11ddb242cbca8028c870 Mon Sep 17 00:00:00 2001 +From 6aed6f13de1615fbcd56c186041cbad3501737af Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 12:31:09 +0100 -Subject: [PATCH 0677/1113] drm/vc4: hdmi: Rename drm_encoder pointer in +Subject: [PATCH 0677/1148] 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 @@ -394166,7 +394166,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 6360f63dd2d1..7b0ad9c10cf9 100644 +index 5a1a6e84b947..f74200cc878d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -559,7 +559,7 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) @@ -394179,13 +394179,13 @@ index 6360f63dd2d1..7b0ad9c10cf9 100644 { /* -- -2.18.2 +2.18.4 -From 37532eebe0b06b2751e47cb525b9a85e5a9bcf91 Mon Sep 17 00:00:00 2001 +From 31116760c630a45011768ce8f951ec85b49864fc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 10 Feb 2020 15:23:06 +0100 -Subject: [PATCH 0678/1113] drm/vc4: hdmi: Adjust HSM clock rate depending on +Subject: [PATCH 0678/1148] 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 @@ -394210,7 +394210,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 7b0ad9c10cf9..4cc42de2d751 100644 +index f74200cc878d..8e84f88347f3 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -52,7 +52,6 @@ @@ -394285,7 +394285,7 @@ index 7b0ad9c10cf9..4cc42de2d751 100644 return MODE_CLOCK_HIGH; return MODE_OK; -@@ -1353,23 +1373,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1354,23 +1374,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) return -EPROBE_DEFER; } @@ -394309,7 +394309,7 @@ index 7b0ad9c10cf9..4cc42de2d751 100644 /* Only use the GPIO HPD pin if present in the DT, otherwise * we'll use the HDMI core's register. */ -@@ -1427,9 +1430,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1428,9 +1431,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) err_destroy_encoder: vc4_hdmi_encoder_destroy(encoder); err_unprepare_hsm: @@ -394319,7 +394319,7 @@ index 7b0ad9c10cf9..4cc42de2d751 100644 put_device(&vc4_hdmi->ddc->dev); return ret; -@@ -1452,7 +1453,6 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, +@@ -1453,7 +1454,6 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, vc4_hdmi_connector_destroy(&vc4_hdmi->connector); vc4_hdmi_encoder_destroy(&vc4_hdmi->encoder.base.base); @@ -394327,7 +394327,7 @@ index 7b0ad9c10cf9..4cc42de2d751 100644 pm_runtime_disable(dev); put_device(&vc4_hdmi->ddc->dev); -@@ -1475,6 +1475,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) +@@ -1476,6 +1476,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) } static const struct vc4_hdmi_variant bcm2835_variant = { @@ -394350,13 +394350,13 @@ index cbb1d3ab85d7..ee9753255b68 100644 const struct vc4_hdmi_register *registers; -- -2.18.2 +2.18.4 -From 5c9b67aa0116f607c61fd38f429e86a7e18ce0f9 Mon Sep 17 00:00:00 2001 +From 0005284e0439da93780e863b28aa00a2d408bef2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 17 Dec 2019 11:48:37 +0100 -Subject: [PATCH 0679/1113] drm/vc4: hdmi: Support the BCM2711 HDMI controllers +Subject: [PATCH 0679/1148] 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. @@ -394370,7 +394370,7 @@ Signed-off-by: Maxime Ripard 4 files changed, 959 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 4cc42de2d751..131e32d88764 100644 +index 8e84f88347f3..8bebdb45642b 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -42,6 +42,7 @@ @@ -394532,7 +394532,7 @@ index 4cc42de2d751..131e32d88764 100644 static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) { struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; -@@ -1336,6 +1460,92 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) +@@ -1337,6 +1461,92 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) return 0; } @@ -394625,7 +394625,7 @@ index 4cc42de2d751..131e32d88764 100644 static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) { struct platform_device *pdev = to_platform_device(dev); -@@ -1491,8 +1701,52 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1492,8 +1702,52 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .phy_rng_disable = vc4_hdmi_phy_rng_disable, }; @@ -395493,13 +395493,13 @@ index 5f78da6e25c7..ea948ffaa69b 100644 return NULL; } -- -2.18.2 +2.18.4 -From 644baa751e9813171e3aef04e4c87cf8308a90f7 Mon Sep 17 00:00:00 2001 +From 6d32e720add89a419e1f3ef5606c3b5e4299dad2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 16:45:24 +0100 -Subject: [PATCH 0680/1113] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI +Subject: [PATCH 0680/1148] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI controllers bindings The HDMI controllers found in the BCM2711 SoC need some adjustments to the @@ -395673,13 +395673,13 @@ index 52b3cdac0bdf..a9d24e1cf684 100644 + ... -- -2.18.2 +2.18.4 -From fc9280ca0eef594be7a55a8dd8d532e89d330ed7 Mon Sep 17 00:00:00 2001 +From bb3f00149ba727389d95d04ba9a6f82fb21f7856 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 12:26:40 +0100 -Subject: [PATCH 0681/1113] ARM: dts: bcm2711: Enable the display pipeline +Subject: [PATCH 0681/1148] 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. @@ -395891,13 +395891,13 @@ index 7cf1a9748f00..10f14e897eb1 100644 arm-pmu { -- -2.18.2 +2.18.4 -From 92156de5934a118a892f55dfb31287ee39eed2ba Mon Sep 17 00:00:00 2001 +From 51c5cd4b04965dfa7bb97369db67ae23fcdeb4dd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 17:10:45 +0100 -Subject: [PATCH 0682/1113] [DOWNSTREAM] ARM: dts: rpi4: Disable KMS driver by +Subject: [PATCH 0682/1148] [DOWNSTREAM] ARM: dts: rpi4: Disable KMS driver by default Signed-off-by: Maxime Ripard @@ -395989,13 +395989,13 @@ index 207c15f37a23..e8b1e9279c67 100644 }; -- -2.18.2 +2.18.4 -From 186aab10f07dd850c6d3964d04c656abeefef35e Mon Sep 17 00:00:00 2001 +From 0a184dff0b28cc9f2a8d460a5279557ef5120fae Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 20 Sep 2019 17:20:01 +0100 -Subject: [PATCH 0683/1113] dtoverlays: Add Pi4 version of vc4-kms-v3d +Subject: [PATCH 0683/1148] 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 @@ -396241,13 +396241,13 @@ index 000000000000..7d59a30a3662 + }; +}; -- -2.18.2 +2.18.4 -From 8791bf82e6456df4d2c34d698a4235616bb0c497 Mon Sep 17 00:00:00 2001 +From 28fd25967241a8fd8d17b399f192429c6ba944f1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 27 Jan 2020 10:22:44 +0000 -Subject: [PATCH 0684/1113] drm: Checking of the pitch is only valid for linear +Subject: [PATCH 0684/1148] drm: Checking of the pitch is only valid for linear formats framebuffer_check was computing a minimum pitch value and ensuring @@ -396287,13 +396287,13 @@ index 57564318ceea..fa54768fe4d2 100644 if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) { -- -2.18.2 +2.18.4 -From 9fe1c3c5d8893a4f33b406e260fa05ad221ecf1b Mon Sep 17 00:00:00 2001 +From c995ed4454d8614907a39dc022a97a26f89fef14 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:25:41 +0000 -Subject: [PATCH 0685/1113] drm/vc4: Add support for DRM_FORMAT_P030 to vc4 +Subject: [PATCH 0685/1148] drm/vc4: Add support for DRM_FORMAT_P030 to vc4 planes This currently doesn't handle non-zero source rectangles correctly, @@ -396467,13 +396467,13 @@ index 887ef481e746..e01bea748c77 100644 drm_plane_helper_add(plane, &vc4_plane_helper_funcs); -- -2.18.2 +2.18.4 -From f68f117848c7028cee7447c02a62818bd5f58172 Mon Sep 17 00:00:00 2001 +From cb3092f05daa53955e9154bad0ec963c7acd064e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Feb 2020 17:35:10 +0000 -Subject: [PATCH 0686/1113] Fixup P030 support +Subject: [PATCH 0686/1148] Fixup P030 support I got the logic wrong for enabling pixel formats, resulting in Pi0-3 only getting a single, invalid, format (P030 SAND). @@ -396499,13 +396499,13 @@ index e01bea748c77..d0957d618167 100644 num_formats++; } -- -2.18.2 +2.18.4 -From e7cab6c0d415fe3c769fcd1e530d52b605f41ddb Mon Sep 17 00:00:00 2001 +From 20ca1bed2cf23dcd6639980d8e5d9ac974241ce6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 11 Feb 2020 15:36:59 +0000 -Subject: [PATCH 0687/1113] drm/vc4: The check for assigned HVS channels is not +Subject: [PATCH 0687/1148] drm/vc4: The check for assigned HVS channels is not applicable firmware_kms Channel assignments is only in full KMS, so skip the check @@ -396538,13 +396538,13 @@ index fdd1ed754087..0dea148852d5 100644 /* -- -2.18.2 +2.18.4 -From a90dd38ce5b343a6fcd23cd0fd6fdee42a2a9d54 Mon Sep 17 00:00:00 2001 +From 5c78fd8e157497391f2231e202f3683c49342ee8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 17 Feb 2020 11:37:21 +0000 -Subject: [PATCH 0688/1113] dt: Update v3d to use firmware_clocks. +Subject: [PATCH 0688/1148] 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. @@ -396567,13 +396567,13 @@ index e8b1e9279c67..b113ca5bfbf6 100644 status = "disabled"; }; -- -2.18.2 +2.18.4 -From 3b9593609c20e0f2de4538c29e6767e51943d22c Mon Sep 17 00:00:00 2001 +From a1cf084e4d66df3517be0f89c532a19ff6e7178d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:01:04 +0000 -Subject: [PATCH 0689/1113] drm/vc4: Reset audio infoframe on encoder_enable if +Subject: [PATCH 0689/1148] drm/vc4: Reset audio infoframe on encoder_enable if previously streaming If the encoder is disabled and re-enabled (eg mode change) all infoframes @@ -396588,7 +396588,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 14 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 131e32d88764..b797bfe0e3a9 100644 +index 8bebdb45642b..9c972433e894 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -344,8 +344,16 @@ static void vc4_hdmi_set_audio_infoframe(struct drm_encoder *encoder) @@ -396647,13 +396647,13 @@ index 7a43abbe0cfa..6a775ec7616f 100644 /* General HDMI hardware state. */ -- -2.18.2 +2.18.4 -From 26a31cd33bea62f86998160b81b8fa46822c576d Mon Sep 17 00:00:00 2001 +From 18efabfba2e5f05c4d819a08b3ce18868df6d897 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:03:42 +0000 -Subject: [PATCH 0690/1113] drm/vc4: Set the b-frame marker to the match ALSA's +Subject: [PATCH 0690/1148] drm/vc4: Set the b-frame marker to the match ALSA's default. ALSA's iec958 plugin by default sets the block start preamble @@ -396667,7 +396667,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index b797bfe0e3a9..62089946e389 100644 +index 9c972433e894..abf25910d843 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -885,10 +885,11 @@ static int vc4_hdmi_audio_hw_params(struct snd_pcm_substream *substream, @@ -396684,13 +396684,13 @@ index b797bfe0e3a9..62089946e389 100644 channel_mask = GENMASK(vc4_hdmi->audio.channels - 1, 0); audio_packet_config |= VC4_SET_FIELD(channel_mask, -- -2.18.2 +2.18.4 -From 64d271929c7d9ae154022b65d8b96c40a5806263 Mon Sep 17 00:00:00 2001 +From 4e1089b0a052d10f3656f4ec93dc0401dfe577a0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:07:19 +0000 -Subject: [PATCH 0691/1113] dts: Add reg-names for the HDMI registers on +Subject: [PATCH 0691/1148] dts: Add reg-names for the HDMI registers on bcm2835 Pi4 is requiring many more register configs in the HDMI @@ -396718,13 +396718,13 @@ index fe1ab40c7f22..e269e75f0f57 100644 ddc = <&i2c2>; clocks = <&clocks BCM2835_PLLH_PIX>, -- -2.18.2 +2.18.4 -From d9ce7b14223d9e271518dba375ab4fd50b9168e3 Mon Sep 17 00:00:00 2001 +From 0349fcc1d4d69e719e1e0c34ec2a806957a02439 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:08:39 +0000 -Subject: [PATCH 0692/1113] dt: Add HDMI audio dma values to bcm2711.dtsi +Subject: [PATCH 0692/1148] dt: Add HDMI audio dma values to bcm2711.dtsi Adds the relevant DMA settings for HDMI audio to work. @@ -396756,13 +396756,13 @@ index 10f14e897eb1..141d9403fe27 100644 }; -- -2.18.2 +2.18.4 -From e1016db0e644bc89b54bef5db1aa0274331df8ae Mon Sep 17 00:00:00 2001 +From e3aaf16ab2cf8f8ce22a19a162c61d671e4725e4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:11:41 +0000 -Subject: [PATCH 0693/1113] drm/vc4: Use reg-names to configure HDMI audio. +Subject: [PATCH 0693/1148] drm/vc4: Use reg-names to configure HDMI audio. HDMI audio configuration was using fixed index numbers to load in DT register settings. @@ -396774,7 +396774,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 62089946e389..56bffb8bb78a 100644 +index abf25910d843..6a5e06314cae 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1097,6 +1097,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) @@ -396797,13 +396797,13 @@ index 62089946e389..56bffb8bb78a 100644 vc4_hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; vc4_hdmi->audio.dma_data.maxburst = 2; -- -2.18.2 +2.18.4 -From 6d488a885881ec6b01002f3b88ee087205684293 Mon Sep 17 00:00:00 2001 +From a75bcf3a0eea7a8ef746b968dfdb3dae53fb553b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:16:14 +0000 -Subject: [PATCH 0694/1113] drm/vc4: Add audio initialisation for Pi4. +Subject: [PATCH 0694/1148] drm/vc4: Add audio initialisation for Pi4. The audio configuration has changed for Pi4, so support the configuration functions via the variant tables. @@ -396815,7 +396815,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 56bffb8bb78a..2486a99b9b3b 100644 +index 6a5e06314cae..6757863e465d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -742,10 +742,44 @@ static const struct drm_encoder_helper_funcs vc4_hdmi_encoder_helper_funcs = { @@ -396887,7 +396887,7 @@ index 56bffb8bb78a..2486a99b9b3b 100644 HDMI_WRITE(HDMI_MAI_CHANNEL_MAP, channel_map); HDMI_WRITE(HDMI_AUDIO_PACKET_CONFIG, audio_packet_config); vc4_hdmi_set_n_cts(vc4_hdmi); -@@ -1715,6 +1744,8 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1716,6 +1745,8 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .phy_disable = vc4_hdmi_phy_disable, .phy_rng_enable = vc4_hdmi_phy_rng_enable, .phy_rng_disable = vc4_hdmi_phy_rng_disable, @@ -396896,7 +396896,7 @@ index 56bffb8bb78a..2486a99b9b3b 100644 }; static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { -@@ -1736,6 +1767,8 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { +@@ -1737,6 +1768,8 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { .phy_init = vc5_hdmi_phy_init, .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, @@ -396905,7 +396905,7 @@ index 56bffb8bb78a..2486a99b9b3b 100644 }; static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { -@@ -1757,6 +1790,8 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { +@@ -1758,6 +1791,8 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { .phy_init = vc5_hdmi_phy_init, .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, @@ -396932,13 +396932,13 @@ index 6a775ec7616f..9b80f9401d58 100644 /* HDMI audio information */ -- -2.18.2 +2.18.4 -From aeb3a44445822590fed5dcd3a35de8e0c9c7d24e Mon Sep 17 00:00:00 2001 +From 325b96a4b6f80a3528b9308fd5f709a176b52044 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:18:45 +0000 -Subject: [PATCH 0695/1113] drm/vc4: Enable audio on Pi4. +Subject: [PATCH 0695/1148] 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. @@ -396949,10 +396949,10 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 2486a99b9b3b..f89734b8db2d 100644 +index 6757863e465d..a5f0ee70625c 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1750,6 +1750,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1751,6 +1751,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { .id = 0, @@ -396960,7 +396960,7 @@ index 2486a99b9b3b..f89734b8db2d 100644 .max_pixel_clock = 297000000, .registers = vc5_hdmi_hdmi0_fields, .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields), -@@ -1773,6 +1774,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { +@@ -1774,6 +1775,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { .id = 1, @@ -396969,13 +396969,13 @@ index 2486a99b9b3b..f89734b8db2d 100644 .registers = vc5_hdmi_hdmi1_fields, .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi1_fields), -- -2.18.2 +2.18.4 -From 287304f264785fb65986eac8039af18f052c88f9 Mon Sep 17 00:00:00 2001 +From 069592addff0b3637fd5574c142cac215117d00b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:22:40 +0000 -Subject: [PATCH 0696/1113] drm/vc4: Alter the HDMI state machine clock calc to +Subject: [PATCH 0696/1148] drm/vc4: Alter the HDMI state machine clock calc to allow for 1920x1200 Whilst the documentation for BCM2835 states that the HDMI state machine @@ -396993,7 +396993,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index f89734b8db2d..02419aa8c3b5 100644 +index a5f0ee70625c..0e394d6b1200 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -581,10 +581,11 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) @@ -397011,7 +397011,7 @@ index f89734b8db2d..02419aa8c3b5 100644 ret = clk_set_rate(vc4_hdmi->hsm_clock, hsm_rate); if (ret) { DRM_ERROR("Failed to set HSM clock rate: %d\n", ret); -@@ -1730,7 +1731,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) +@@ -1731,7 +1732,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) } static const struct vc4_hdmi_variant bcm2835_variant = { @@ -397021,13 +397021,13 @@ index f89734b8db2d..02419aa8c3b5 100644 .cec_available = true, .registers = vc4_hdmi_fields, -- -2.18.2 +2.18.4 -From 5f1e0fffaa5ed9e9e6ffcdaa0ef4b799e9f4621a Mon Sep 17 00:00:00 2001 +From c4d8c87234cf4e58a835e70b9470cce7fbcbeabf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 26 Mar 2020 11:51:55 +0000 -Subject: [PATCH 0697/1113] dtoverlays: Remove comment about vc4-kms-v3d +Subject: [PATCH 0697/1148] 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 @@ -397055,13 +397055,13 @@ index 03f6224d6f8d..88aa213e693f 100644 Params: cma-256 CMA is 256MB (needs 1GB) cma-192 CMA is 192MB (needs 1GB) -- -2.18.2 +2.18.4 -From 274f271d10a804d3b0442576914e6b3db949a0a3 Mon Sep 17 00:00:00 2001 +From 19cb7039c02d3a7add4b0cb4153d9eafab870f14 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 26 Mar 2020 15:32:19 +0000 -Subject: [PATCH 0698/1113] drm/vc4: Kick the core clock up during a mode +Subject: [PATCH 0698/1148] drm/vc4: Kick the core clock up during a mode change Experimental commit to kick the core clock up during mode @@ -397165,13 +397165,13 @@ index 0dea148852d5..20b328d7e43b 100644 up(&vc4->async_modeset); -- -2.18.2 +2.18.4 -From 0f796c27fefc2cd9639715cf0ef089866ffffab0 Mon Sep 17 00:00:00 2001 +From 0c8d29b31c8c400c8350649e4b0667a6da52c5df Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 30 Mar 2020 12:52:26 +0100 -Subject: [PATCH 0699/1113] drm/vc4: Fixup for firmware KMS +Subject: [PATCH 0699/1148] 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 @@ -397207,13 +397207,13 @@ index 20b328d7e43b..7f857af77898 100644 drm_atomic_state_put(state); -- -2.18.2 +2.18.4 -From ce8b713d6de70746792146f24af20cfa81fc392d Mon Sep 17 00:00:00 2001 +From a8becc525fd831376b3f1c4aaf0ebe720bb130dd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 30 Mar 2020 18:25:10 +0100 -Subject: [PATCH 0700/1113] drm/vc4: Fixup plane init within firmware-kms +Subject: [PATCH 0700/1148] 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 @@ -397244,13 +397244,13 @@ index 7a65f19c99b4..f45cad62214a 100644 drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false); -- -2.18.2 +2.18.4 -From 73e9f3d357cd18d032debe019c808753994c670d Mon Sep 17 00:00:00 2001 +From 90cfd786d2515216279fdf7e8a0046371afd1586 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 31 Mar 2020 16:21:45 +0100 -Subject: [PATCH 0701/1113] drm/vc4-hdmi: Give the HDMI audio instances +Subject: [PATCH 0701/1148] drm/vc4-hdmi: Give the HDMI audio instances different names The debugfs usage within asoc gets confused if multiple interfaces @@ -397263,7 +397263,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 02419aa8c3b5..f3bb03cf3284 100644 +index 0e394d6b1200..6621eb3e01c6 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1198,7 +1198,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) @@ -397273,16 +397273,16 @@ index 02419aa8c3b5..f3bb03cf3284 100644 - card->name = "vc4-hdmi"; + card->name = vc4_hdmi->variant->id ? "vc4-hdmi1" : "vc4-hdmi"; card->dev = dev; + card->owner = THIS_MODULE; - /* -- -2.18.2 +2.18.4 -From b4a0e273a975623c5a142e6dce7f151836950fb8 Mon Sep 17 00:00:00 2001 +From f38c9c0a0838cdf7e87034105080dc3cec5fccdd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 31 Mar 2020 16:23:11 +0100 -Subject: [PATCH 0702/1113] i2c: brcmstb: The interrupt line is optional, so +Subject: [PATCH 0702/1148] 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 @@ -397332,13 +397332,13 @@ index 169a2836922d..d4e0a0f6732a 100644 if (of_property_read_u32(dev->device->of_node, -- -2.18.2 +2.18.4 -From 36989b85a319ff9def53862439b4d6f17fc5f61d Mon Sep 17 00:00:00 2001 +From af70e189e44ed3f797d6f541c34f6ef57d9c228a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 31 Mar 2020 17:54:08 +0100 -Subject: [PATCH 0703/1113] dt: Drop I2C for Pi4 HDMI interfaces to 97.5kHz. +Subject: [PATCH 0703/1148] 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 @@ -397373,13 +397373,13 @@ index 5f3c9313d9a7..3ecff12736ad 100644 }; }; -- -2.18.2 +2.18.4 -From c73ce505218d5a9c3498f5c69ba3f5aab5ccf0ec Mon Sep 17 00:00:00 2001 +From 8dfa768cc6ee5718e14a7beaa8f82b3d033cc511 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 27 Mar 2020 13:49:25 +0000 -Subject: [PATCH 0704/1113] overlays: Add missing rpi-poe parameters +Subject: [PATCH 0704/1148] overlays: Add missing rpi-poe parameters The rpi-poe fan overlay has gained two more fan speeds and adjusted the thresholds and hystereses. @@ -397418,13 +397418,13 @@ index 88aa213e693f..5832c5f00230 100644 -- -2.18.2 +2.18.4 -From 59080c080af79063c1f62b6831acdfa6de035bfb Mon Sep 17 00:00:00 2001 +From c58e6d3a1efd55f23d3bc8377016c1170952528d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 2 Apr 2020 16:46:31 +0100 -Subject: [PATCH 0705/1113] vc4_hdmi_phy: Fix offset calculation +Subject: [PATCH 0705/1148] vc4_hdmi_phy: Fix offset calculation The original firmware code worked with float and did offset = ((vco_freq / fref * 2) * (1 << 22)); @@ -397454,13 +397454,13 @@ index a436fabbc128..732d8a0e5a1c 100644 return offset; -- -2.18.2 +2.18.4 -From ad343c7b5105be614b85e3412e46c1634a44211b Mon Sep 17 00:00:00 2001 +From 0cb01534fd0261634dbe7c587d66a4defe86f436 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Apr 2020 15:09:42 +0100 -Subject: [PATCH 0706/1113] overlays: Add overlay_map +Subject: [PATCH 0706/1148] overlays: Add overlay_map The overlay map permits platform-specific overlays, with deprecation and renaming. @@ -397564,13 +397564,13 @@ index 000000000000..e9b04b954d55 + }; +}; -- -2.18.2 +2.18.4 -From 8d0f1a861032601227d337ecb041e4fb5f518497 Mon Sep 17 00:00:00 2001 +From 047a2ca6b6957233657014e3cc4ab35483100afe Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Apr 2020 17:24:15 +0100 -Subject: [PATCH 0707/1113] overlays: Formally rename/deprecate old overlays +Subject: [PATCH 0707/1148] overlays: Formally rename/deprecate old overlays Take advantage of the overlay_map to rename or deprecate some obsolete overlays. @@ -397821,13 +397821,13 @@ index 94c14267716e..000000000000 @@ -1 +0,0 @@ -#include "miniuart-bt-overlay.dts" -- -2.18.2 +2.18.4 -From 37ab07fe9bc9d2c8acdbec6c667f8a38867d8f4b Mon Sep 17 00:00:00 2001 +From 7a43bffc0dd625a4ae5e277475cd32fc0ce2cff3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Apr 2020 15:51:56 +0100 -Subject: [PATCH 0708/1113] overlays: Add vc4-kms-v3d-pi4 to overlay_map +Subject: [PATCH 0708/1148] overlays: Add vc4-kms-v3d-pi4 to overlay_map Signed-off-by: Phil Elwell --- @@ -397853,13 +397853,13 @@ index 113098ea6908..c4f7f33fb5da 100644 + }; }; -- -2.18.2 +2.18.4 -From cce058e08eb61254f5d3a084e657e4ce2f79c853 Mon Sep 17 00:00:00 2001 +From 732a8400691b60a3ca86b21681d9a55a297da492 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Apr 2020 09:47:42 +0100 -Subject: [PATCH 0709/1113] Add upstream and upstream-pi4 to overlay_map +Subject: [PATCH 0709/1148] 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. @@ -398095,13 +398095,13 @@ index 000000000000..2db343ef2237 + }; +}; -- -2.18.2 +2.18.4 -From ca6c6c274a18ede0e351b10118f82bb8cd73d8a6 Mon Sep 17 00:00:00 2001 +From 674d24fd5b9ffb549ca688a5cbe9c9133c66da2b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 15:49:56 +0100 -Subject: [PATCH 0710/1113] clk-raspberrypi: Allow cpufreq driver to also +Subject: [PATCH 0710/1148] clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks For performance/power it is beneficial to adjust gpu clocks with arm clock. @@ -398126,13 +398126,13 @@ index 86b18f8cc98d..eb1844148af9 100644 int ret; -- -2.18.2 +2.18.4 -From bd48c72c255fcb7263dffbbd5aa4edae44a0b0ba Mon Sep 17 00:00:00 2001 +From 6425dffbd82051a2f0f5ab0019661208b2657599 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 09:48:29 +0100 -Subject: [PATCH 0711/1113] configs: FS_ENCRYPTION replaces EXT4_ENCRYPTION +Subject: [PATCH 0711/1148] configs: FS_ENCRYPTION replaces EXT4_ENCRYPTION The filesystem-specific encryption options have been replaced by a generic FS_ENCRYPTION option. @@ -398226,13 +398226,13 @@ index b40477e1553b..544c16a75b34 100644 CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m -- -2.18.2 +2.18.4 -From 7a239fd48c2641bba3a2d9937280be46f40a5229 Mon Sep 17 00:00:00 2001 +From 2a15bd3538005ec3963a00a23ed5b50287556cd9 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Wed, 8 Apr 2020 20:00:30 +1000 -Subject: [PATCH 0712/1113] Add support for the AudioInjector.net Isolated +Subject: [PATCH 0712/1148] Add support for the AudioInjector.net Isolated sound card This patch adds support for the Audio Injector Isolated sound card. @@ -398672,13 +398672,13 @@ index 000000000000..652464658fef +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:audioinjector-isolated-soundcard"); -- -2.18.2 +2.18.4 -From 52d046a0f4cfd1c2a1ead43945ad555ea6642145 Mon Sep 17 00:00:00 2001 +From d9940e0a48ad2656a270f547e6b253f52d4ee85e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 11:59:39 +0100 -Subject: [PATCH 0713/1113] overlays: Fix dtc warnings in i2c-gpio +Subject: [PATCH 0713/1148] overlays: Fix dtc warnings in i2c-gpio Better late than never. @@ -398702,13 +398702,13 @@ index 39e7bc5fa9d8..e94053b55610 100644 reg = <0xffffffff>; compatible = "i2c-gpio"; -- -2.18.2 +2.18.4 -From bc2e021c9078c352078da78b989bfb479e80edc2 Mon Sep 17 00:00:00 2001 +From 1277ce803bca96512f9136aa772ade0be7fc6356 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 15:23:56 +0100 -Subject: [PATCH 0714/1113] kbuild: Disable gcc plugins +Subject: [PATCH 0714/1148] 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 @@ -398736,13 +398736,13 @@ index d3caefe53eab..6ee109e5d266 100755 SHOW_ERROR= -- -2.18.2 +2.18.4 -From 87fc90cb736be0299f11135a654424d61eef1d29 Mon Sep 17 00:00:00 2001 +From aeac70ca87d75e189a326166fa5bec4c2f204f82 Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Wed, 8 Apr 2020 09:31:39 +0200 -Subject: [PATCH 0715/1113] configs: add MA120X0P codec +Subject: [PATCH 0715/1148] configs: add MA120X0P codec Signed-off-by: AMuszkat --- @@ -398814,13 +398814,13 @@ index a24cbb4837b8..34aa78d5d814 100644 CONFIG_SND_SIMPLE_CARD=m CONFIG_HIDRAW=y -- -2.18.2 +2.18.4 -From 568ff85c730de2ebc6e94ff0a53a2749463965e1 Mon Sep 17 00:00:00 2001 +From 81865eabb75dabfffc8952b26eea63f258ac21c2 Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Wed, 8 Apr 2020 10:04:49 +0200 -Subject: [PATCH 0716/1113] ASoC: ma120x0p: Add 96KHz rate support +Subject: [PATCH 0716/1148] ASoC: ma120x0p: Add 96KHz rate support Add 96KHz rate support to MA120X0P codec and make enable and mute gpio pins optional. @@ -398862,13 +398862,13 @@ index 39c74b17e007..e1591b6aff43 100644 if (IS_ERR(priv_data->enable_gpio)) { ret = PTR_ERR(priv_data->enable_gpio); -- -2.18.2 +2.18.4 -From 2728e32919d161e7e7bf485b4b870da16a3efb4e Mon Sep 17 00:00:00 2001 +From 0b3eaad2f560fc7267d6d757fd8d1537c4649d9b Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 Nov 2019 10:56:11 +0100 -Subject: [PATCH 0717/1113] arm64: mm: reserve CMA and crashkernel in +Subject: [PATCH 0717/1148] arm64: mm: reserve CMA and crashkernel in ZONE_DMA32 commit bff3b04460a80f425442fe8e5c6ee8c3ebef611f upstream. @@ -398913,13 +398913,13 @@ index ddd6a6ce158e..9ee7894d6414 100644 void __init bootmem_init(void) -- -2.18.2 +2.18.4 -From aa01cf031857a7ce65051e2ee274d7846c0a6107 Mon Sep 17 00:00:00 2001 +From c28fb88153d6a48b7636caf89d0d5957064babc2 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 3 Dec 2019 12:10:13 +0000 -Subject: [PATCH 0718/1113] arm64: mm: Fix initialisation of DMA zones on +Subject: [PATCH 0718/1148] arm64: mm: Fix initialisation of DMA zones on non-NUMA systems commit 93b90414c33f59b7960bc8d607da0ce83377e021 upstream. @@ -399024,13 +399024,13 @@ index 9ee7894d6414..9af647dafa51 100644 } -- -2.18.2 +2.18.4 -From 27add501bd728bc3cd332f0a122825c23ab700d0 Mon Sep 17 00:00:00 2001 +From 80feeb13b8cfe5ff61506d53231e897586052773 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 10 Jan 2020 18:29:35 +0100 -Subject: [PATCH 0719/1113] ARM: dts: bcm283x: Unify CMA configuration +Subject: [PATCH 0719/1148] ARM: dts: bcm283x: Unify CMA configuration commit c5a1e5375d19bd4001c59dc5d482ac5b1ba51cbf upstream. @@ -399127,13 +399127,13 @@ index 202a61f574c7..adb59ca3df6c 100644 cpu_thermal: cpu-thermal { polling-delay-passive = <0>; -- -2.18.2 +2.18.4 -From 6e0696fe260cfbb6ce6dae745a90cf0205d6a36d Mon Sep 17 00:00:00 2001 +From f493053bed243e15d2c143f5008fe44b01bba64e Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 10 Jan 2020 18:19:33 +0100 -Subject: [PATCH 0720/1113] dma-contiguous: CMA: give precedence to cmdline +Subject: [PATCH 0720/1148] dma-contiguous: CMA: give precedence to cmdline commit 8c8c5a4994a306c217fd061cbfc5903399fd4c1c upstream. @@ -399182,13 +399182,13 @@ index 69cfb4345388..8477bf549dc9 100644 rmem->ops = &rmem_cma_ops; -- -2.18.2 +2.18.4 -From f2a81593fa6e98dc9b026f3bcadd6eb2bda6d581 Mon Sep 17 00:00:00 2001 +From 8c34a8854e6bc528e9c11d979b95fb1ba2883d62 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 2 Apr 2020 19:22:46 +0200 -Subject: [PATCH 0721/1113] ARM: dts: Use upstream CMA configuration +Subject: [PATCH 0721/1148] 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 @@ -399224,13 +399224,13 @@ index 83a8431d9e5f..996112381eef 100644 &mmcnr { -- -2.18.2 +2.18.4 -From 9cc342a0f0ec8c3bfb03a605a06e83ecfa2f5b12 Mon Sep 17 00:00:00 2001 +From 3c4a0c409e2821d376ce803d72930e66fb4655ec Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 2 Apr 2020 19:54:33 +0200 -Subject: [PATCH 0722/1113] ARM: dts: overlays: Unify overlay CMA handling +Subject: [PATCH 0722/1148] 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. @@ -400116,13 +400116,13 @@ index 7d59a30a3662..134ad9ecbd4a 100644 }; }; -- -2.18.2 +2.18.4 -From a2dfb1d6e35dc4d68445bba0a3b0286ddf5a9f9a Mon Sep 17 00:00:00 2001 +From 07e665c0b5c6b9020c3420aca1501a191d94f028 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 19 Mar 2020 20:00:13 +0100 -Subject: [PATCH 0723/1113] ARM: dts: bcm283x: Fix vc4's firmware bus DMA +Subject: [PATCH 0723/1148] ARM: dts: bcm283x: Fix vc4's firmware bus DMA limitations The bus is virtual and devices have to inherit their DMA constraints @@ -400150,13 +400150,13 @@ index 394c8a71b13b..fd2c766e0f71 100644 power: power { -- -2.18.2 +2.18.4 -From 8720394870e9406aa0d7e3d4519f66af9478445b Mon Sep 17 00:00:00 2001 +From 2d6cfd697ea0a47210f27817eea40cf610e4d351 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Apr 2020 15:25:02 +0100 -Subject: [PATCH 0724/1113] ARM: dts: bcm2711: Restrict CMA to first 768MB +Subject: [PATCH 0724/1148] 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 @@ -400189,13 +400189,13 @@ index b113ca5bfbf6..f27cb47448b1 100644 thermal: thermal@7d5d2200 { compatible = "brcm,avs-tmon-bcm2711"; -- -2.18.2 +2.18.4 -From a7b32277fb103698b5968765e8ea88fb87f929b4 Mon Sep 17 00:00:00 2001 +From 11e36098cbf070a4fbb455d2343202cd68c7fe93 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Feb 2020 12:00:42 +0000 -Subject: [PATCH 0725/1113] configs: Restore CONFIG_GPIO_SYSFS +Subject: [PATCH 0725/1148] configs: Restore CONFIG_GPIO_SYSFS Signed-off-by: Phil Elwell --- @@ -400254,13 +400254,13 @@ index 818e84acbf53..dac95c734828 100644 CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m -- -2.18.2 +2.18.4 -From 1d4691ab111fbe5ffae3163b68064d1c6ed0f6a1 Mon Sep 17 00:00:00 2001 +From 8baa463f783a23e0da567a568ccd8782317b76fa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 12:51:56 +0000 -Subject: [PATCH 0726/1113] ARM: dts: Extend SCB bus address range +Subject: [PATCH 0726/1148] ARM: dts: Extend SCB bus address range Signed-off-by: Phil Elwell --- @@ -400283,13 +400283,13 @@ index f27cb47448b1..4bc44b2ad211 100644 dma40: dma@7e007b00 { compatible = "brcm,bcm2711-dma"; -- -2.18.2 +2.18.4 -From d8c1a3fff6633e90fd1be4e67bb032ecef3737a0 Mon Sep 17 00:00:00 2001 +From 98efe07209cdfb3f7c0f4b6c8f65a5097f9e4720 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Dec 2019 18:02:08 +0000 -Subject: [PATCH 0727/1113] dts: bcm2711: Move emmc2 to its own "bus" +Subject: [PATCH 0727/1148] 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 @@ -400341,13 +400341,13 @@ index 996112381eef..34251ec1b531 100644 /delete-node/ wifi-pwrseq; -- -2.18.2 +2.18.4 -From ff5ed71fb2707c67681e35642f52dd0c26c2bbb8 Mon Sep 17 00:00:00 2001 +From 3a8ef3666c6c58c40ddc061c2b2ab4e300ce3ef4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 10 Apr 2020 19:24:40 -0600 -Subject: [PATCH 0728/1113] drm/vc4: hdmi: Silence pixel clock error on +Subject: [PATCH 0728/1148] drm/vc4: hdmi: Silence pixel clock error on -EPROBE_DEFER If the vc4 hdmi driver loads before the pixel clock is available we @@ -400359,10 +400359,10 @@ Signed-off-by: James Hilliard 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index f3bb03cf3284..a2881c823d16 100644 +index 6621eb3e01c6..2ebaea7e2a7b 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1493,8 +1493,10 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) +@@ -1494,8 +1494,10 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) vc4_hdmi->pixel_clock = devm_clk_get(dev, "pixel"); if (IS_ERR(vc4_hdmi->pixel_clock)) { @@ -400376,14 +400376,14 @@ index f3bb03cf3284..a2881c823d16 100644 vc4_hdmi->hsm_clock = devm_clk_get(dev, "hdmi"); -- -2.18.2 +2.18.4 -From 3e2684b1fd16719053819717e5965a69c909adc0 Mon Sep 17 00:00:00 2001 +From 9f20099894e6989701d19bb783389a461df7f9a2 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 0729/1113] Fixes a problem with clock settings of HiFiBerry +Subject: [PATCH 0729/1148] Fixes a problem with clock settings of HiFiBerry DAC+ADC PRO (#3545) This patch fixes a problem of the re-calculation of @@ -400424,13 +400424,13 @@ index 2883c3ce9488..ffa76014e7df 100644 } -- -2.18.2 +2.18.4 -From 6df646ab341f1b534e04d9c9745d0afc3b0321c4 Mon Sep 17 00:00:00 2001 +From 2eae2220fcd1c6d52a843d905a1c71aef6232d86 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 7 Apr 2020 17:21:55 +0200 -Subject: [PATCH 0730/1113] Documentation: media: Update sub-device API intro +Subject: [PATCH 0730/1148] 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 @@ -400464,13 +400464,13 @@ index 29e07e23f888..41ccb3e5c707 100644 Device nodes named ``v4l-subdev``\ *X* can be created in ``/dev`` to access sub-devices directly. If a sub-device supports direct userspace configuration -- -2.18.2 +2.18.4 -From 1bd8bd198463e33f0d84266bcb9e4c6255be77b3 Mon Sep 17 00:00:00 2001 +From cc136ea3149caff9c7ae00e8bb7aa21f5328b42f Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 7 Apr 2020 17:21:56 +0200 -Subject: [PATCH 0731/1113] Documentation: media: Document read-only subdevice +Subject: [PATCH 0731/1148] 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. @@ -400701,13 +400701,13 @@ index fc73d27e6d74..feba9f807135 100644 + The ``VIDIOC_SUBDEV_S_SELECTION`` ioctl has been called on a read-only + subdevice and the ``which`` field is set to ``V4L2_SUBDEV_FORMAT_ACTIVE``. -- -2.18.2 +2.18.4 -From 7fae7030922df11417b07b9982b9d93dbbbe9683 Mon Sep 17 00:00:00 2001 +From 69cff70679667e4bf958b364bf465a0ec714ea6d Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 7 Apr 2020 17:21:57 +0200 -Subject: [PATCH 0732/1113] media: v4l2-dev: Add +Subject: [PATCH 0732/1148] media: v4l2-dev: Add v4l2_device_register_ro_subdev_node() Add to the V4L2 core a function to register device nodes for video @@ -400919,13 +400919,13 @@ index a0e93f0ef62a..841d23e3bbcf 100644 /** * v4l2_subdev_notify - Sends a notification to v4l2_device. -- -2.18.2 +2.18.4 -From f498f6c396c825f22bda02c1fd9c144f4cc05773 Mon Sep 17 00:00:00 2001 +From f18d3efef31ce198566fcf7b3a868fca060da949 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:39:49 +0100 -Subject: [PATCH 0733/1113] media: bcm2835-unicam: Driver for CCP2/CSI2 camera +Subject: [PATCH 0733/1148] media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface Add driver for the Unicam camera receiver block on @@ -403650,13 +403650,13 @@ index 000000000000..ae059a171d0f + +#endif -- -2.18.2 +2.18.4 -From 4c5a2bbd72d73127e9501d6f344b9ef454a6f22c Mon Sep 17 00:00:00 2001 +From 53749f3363dba38f4811d68f77487b5bf2935f76 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:46:29 +0100 -Subject: [PATCH 0734/1113] defconfig: Add bcm2835-unicam to platform +Subject: [PATCH 0734/1148] defconfig: Add bcm2835-unicam to platform defconfigs. This commit enables the bcm2835-unicam driver in the following @@ -403710,13 +403710,13 @@ index 8eddf1eec9b7..543948a9499d 100644 CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -- -2.18.2 +2.18.4 -From 11f1c21cbca17542c393e7ee4cf504bea24f0ff1 Mon Sep 17 00:00:00 2001 +From 931e32e00c1ec2cf4d349647894a48b0e22c290e Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:46:29 +0100 -Subject: [PATCH 0735/1113] media: uapi: v4l2-core: Add sensor ancillary data +Subject: [PATCH 0735/1148] media: uapi: v4l2-core: Add sensor ancillary data V4L2 foucc type. Add V4L2_META_FMT_SENSOR_DATA format 4CC. @@ -403808,13 +403808,13 @@ index f927a77cb2f1..350d03021818 100644 /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe -- -2.18.2 +2.18.4 -From ab879300db470771967bc42ec15706f4ebe48511 Mon Sep 17 00:00:00 2001 +From 9ca86ac59cee4aab3e3f6fa429b2be7e133417d6 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Jan 2020 14:06:47 +0000 -Subject: [PATCH 0736/1113] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media +Subject: [PATCH 0736/1148] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media bus format This patch adds MEDIA_BUS_FMT_SENSOR_DATA used by the bcm2835-unicam @@ -403880,13 +403880,13 @@ index 16c1fa2d89a4..4b5e2a71dfec 100644 + #endif /* __LINUX_MEDIA_BUS_FORMAT_H */ -- -2.18.2 +2.18.4 -From b94c79d38f6af8d269e7d369c0a827f4d02627a5 Mon Sep 17 00:00:00 2001 +From fd3ec652a4a968cb05a4f42d938029671146e512 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 7 Apr 2020 10:42:14 +0100 -Subject: [PATCH 0737/1113] media: bcm2835-unicam: Add support for mulitple +Subject: [PATCH 0737/1148] media: bcm2835-unicam: Add support for mulitple device nodes. Move device node specific state out of the device state structure and @@ -404969,13 +404969,13 @@ index 8c1b220e6d8c..c19f96ce9d29 100644 v4l2_subdev_free_pad_config(unicam->sensor_config); media_device_unregister(&unicam->mdev); -- -2.18.2 +2.18.4 -From 6d175d27031c69cffd92c40b5fbfc7c975527861 Mon Sep 17 00:00:00 2001 +From 6f77627f2477e5ef419154ada481908282d202c5 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 16 Apr 2020 11:35:41 +0100 -Subject: [PATCH 0738/1113] media: bcm2835-unicam: Add embedded data node. +Subject: [PATCH 0738/1148] 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 @@ -406143,13 +406143,13 @@ index c19f96ce9d29..27752969c275 100644 unregister_nodes(unicam); if (unicam->sensor_config) -- -2.18.2 +2.18.4 -From 994b1a858e1fda0b94c48d1c25819796b5c55c08 Mon Sep 17 00:00:00 2001 +From f213cc3e2c85e1c4a134fa185d5636ee5e2a5a59 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 2 Apr 2020 16:08:51 +0100 -Subject: [PATCH 0739/1113] media: bcm2835-unicam: Use dummy buffer if none +Subject: [PATCH 0739/1148] media: bcm2835-unicam: Use dummy buffer if none have been queued If no buffer has been queued by a userland application, we use an @@ -406457,13 +406457,13 @@ index 27752969c275..62248db04bfa 100644 } -- -2.18.2 +2.18.4 -From c1532bd38c791a7a7a8a82fb8100df3560fdac7c Mon Sep 17 00:00:00 2001 +From c470b816ffb80ce176bac94c082a27d476acd1da Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Apr 2020 10:46:19 +0100 -Subject: [PATCH 0740/1113] spi: Force CS_HIGH if GPIO descriptors are used +Subject: [PATCH 0740/1148] 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 @@ -406484,10 +406484,10 @@ Signed-off-by: Phil Elwell 1 file changed, 9 insertions(+) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 6a81b2a33cb4..5a0902238f34 100644 +index 982753ac1bf6..eba2f687f1e6 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -3053,6 +3053,7 @@ static int __spi_validate_bits_per_word(struct spi_controller *ctlr, +@@ -3058,6 +3058,7 @@ static int __spi_validate_bits_per_word(struct spi_controller *ctlr, */ int spi_setup(struct spi_device *spi) { @@ -406495,7 +406495,7 @@ index 6a81b2a33cb4..5a0902238f34 100644 unsigned bad_bits, ugly_bits; int status; -@@ -3070,6 +3071,14 @@ int spi_setup(struct spi_device *spi) +@@ -3075,6 +3076,14 @@ int spi_setup(struct spi_device *spi) (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL | SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL))) return -EINVAL; @@ -406511,13 +406511,13 @@ index 6a81b2a33cb4..5a0902238f34 100644 * that aren't supported with their current controller * SPI_CS_WORD has a fallback software implementation, -- -2.18.2 +2.18.4 -From 46d9982d3298bb838288dd6b880a918db2df93bb Mon Sep 17 00:00:00 2001 +From f4b47d9a478175ae628eebfea3ec37553ed70f74 Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 10 Mar 2020 14:17:07 +0100 -Subject: [PATCH 0741/1113] media: i2c: imx219: Fix power sequence +Subject: [PATCH 0741/1148] media: i2c: imx219: Fix power sequence Commit ca45448a56659c6df6e0436188e97f6cc65dea8a upstream. @@ -406572,13 +406572,13 @@ index f1effb5a5f66..16010ca1781a 100644 if (ret) goto error_power_off; -- -2.18.2 +2.18.4 -From ad669dfb0129019f64409f874452d0768e6c5e71 Mon Sep 17 00:00:00 2001 +From 48ba3f8cd5489f7faf3adf0fcaf3aa968555d2da Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 10 Mar 2020 14:17:08 +0100 -Subject: [PATCH 0742/1113] media: i2c: imx219: Add support for RAW8 bit bayer +Subject: [PATCH 0742/1148] media: i2c: imx219: Add support for RAW8 bit bayer format Commit 22da1d56e982151e0bdfafe9de6fe94098a51356 upstream. @@ -406897,13 +406897,13 @@ index 16010ca1781a..3207487b4c10 100644 if (ret) { dev_err(dev, "failed to init entity pads: %d\n", ret); -- -2.18.2 +2.18.4 -From 8666a976731e8bfc146744a7f4a27d3e22dcec07 Mon Sep 17 00:00:00 2001 +From e0460592c97b559a918abc347f25299a3399d77f Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 10 Mar 2020 14:17:09 +0100 -Subject: [PATCH 0743/1113] media: i2c: imx219: Add support for cropped 640x480 +Subject: [PATCH 0743/1148] media: i2c: imx219: Add support for cropped 640x480 resolution Commit 25130b8ad409d5532f3763bcf891af74f550a70d upstream. @@ -407021,13 +407021,13 @@ index 3207487b4c10..cb03bdec1f9c 100644 struct imx219 { -- -2.18.2 +2.18.4 -From 65649eb5f256357367cac28dd4f0f4a72b4d329f Mon Sep 17 00:00:00 2001 +From b0c462ca1745647e278de42cb54d811c090a37c2 Mon Sep 17 00:00:00 2001 From: Dafna Hirschfeld Date: Tue, 31 Mar 2020 20:06:30 +0200 -Subject: [PATCH 0744/1113] media: i2c: imx219: Fix a bug in +Subject: [PATCH 0744/1148] media: i2c: imx219: Fix a bug in imx219_enum_frame_size https://patchwork.linuxtv.org/patch/62740/ @@ -407061,13 +407061,13 @@ index cb03bdec1f9c..86e0564bfb4f 100644 fse->min_width = supported_modes[fse->index].width; -- -2.18.2 +2.18.4 -From 14e725048e1e6444f5c2603feffb8e38448e4956 Mon Sep 17 00:00:00 2001 +From 55c0e44d37876f653bdf35f157adce163d9b494f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 24 Mar 2020 23:13:02 +0200 -Subject: [PATCH 0745/1113] media: bcm2835-unicam: Disable event-related ioctls +Subject: [PATCH 0745/1148] media: bcm2835-unicam: Disable event-related ioctls on metadata node The unicam driver supports both the SOURCE_CHANGE and CTRL events. Both @@ -407098,13 +407098,13 @@ index 62248db04bfa..4840aa6c96c4 100644 !v4l2_subdev_has_op(unicam->sensor, video, s_std)) { v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD); -- -2.18.2 +2.18.4 -From f69d94fd9019474cc18bcef40da702d611972d81 Mon Sep 17 00:00:00 2001 +From 95da89d5dc7f4e22ca4d911b9ff9ad97359076ad Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 24 Mar 2020 23:13:02 +0200 -Subject: [PATCH 0746/1113] media: bcm2835-unicam: Add support for the +Subject: [PATCH 0746/1148] media: bcm2835-unicam: Add support for the FRAME_SYNC event The FRAME_SYNC event is useful for userspace image processing algorithms @@ -407159,13 +407159,13 @@ index 4840aa6c96c4..2ddac7382fb9 100644 return v4l2_event_subscribe(fh, sub, 4, NULL); } -- -2.18.2 +2.18.4 -From df49f97328090cc09e4938c7d91bc45a15f7620c Mon Sep 17 00:00:00 2001 +From 034e9bfe0a14c8325247612e8255c8296db5dc48 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 17 Apr 2020 16:24:21 +0100 -Subject: [PATCH 0747/1113] configs: Enable CONFIG_ARM_BCM2835_CPUFREQ +Subject: [PATCH 0747/1148] 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. @@ -407189,13 +407189,13 @@ index dac95c734828..14398af7f558 100644 CONFIG_VIRTUALIZATION=y CONFIG_KVM=y -- -2.18.2 +2.18.4 -From 73a4eea45da39d8b456d291e9ee18393819355c8 Mon Sep 17 00:00:00 2001 +From ed461c7ef24f549e98c94df0cb2cf9e290090380 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Apr 2020 16:20:55 +0100 -Subject: [PATCH 0748/1113] Revert "firmware: raspberrypi: register clk device" +Subject: [PATCH 0748/1148] Revert "firmware: raspberrypi: register clk device" This reverts commit 91f2cf4a6b2131016b1ae9c9500245f0572112c7. @@ -407253,13 +407253,13 @@ index 4f3ab14d275a..dc11a1968e99 100644 g_pdev = NULL; -- -2.18.2 +2.18.4 -From 5b9959f0c919ef3f5fb253c7d7b6299d835474f0 Mon Sep 17 00:00:00 2001 +From 97375e6958d54c757e13b8b49cd7c9d29cbb5cf8 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 12 Mar 2020 14:09:38 +0000 -Subject: [PATCH 0749/1113] media: imx219: Advertise embedded data node on +Subject: [PATCH 0749/1148] media: imx219: Advertise embedded data node on media pad 1 This commit updates the imx219 driver to adverise support for embedded @@ -407594,13 +407594,13 @@ index 86e0564bfb4f..017ae503cc09 100644 dev_err(dev, "failed to init entity pads: %d\n", ret); goto error_handler_free; -- -2.18.2 +2.18.4 -From a65e05527999b7c477cd80877b850120741ff66e Mon Sep 17 00:00:00 2001 +From 92f449e80510bee047d5d58d627f0cd03fc2912b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 11:25:18 +0100 -Subject: [PATCH 0750/1113] dts: bcm2711: EMMC2 can address the whole first GB +Subject: [PATCH 0750/1148] 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 @@ -407631,13 +407631,13 @@ index 34251ec1b531..b3a00baba962 100644 emmc2: emmc2@7e340000 { compatible = "brcm,bcm2711-emmc2"; -- -2.18.2 +2.18.4 -From fdac1fe20fe63a699e67aa77ea8cc6c0f338493c Mon Sep 17 00:00:00 2001 +From 0fe2890aefdc3e7b88d871602ec3b6b6c3acc3c1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 22:18:52 +0100 -Subject: [PATCH 0751/1113] driver: char: rpivid: Remove legacy name support +Subject: [PATCH 0751/1148] driver: char: rpivid: Remove legacy name support Signed-off-by: Phil Elwell --- @@ -407690,13 +407690,13 @@ index fbf3d4f3fe0c..5f4c91924ec1 100644 class_destroy(priv->class); cdev_del(&priv->rpivid_mem_cdev); -- -2.18.2 +2.18.4 -From 250d4a75e9b71752225acd7b07d0502300768a82 Mon Sep 17 00:00:00 2001 +From 933cf8ca59ab0d39ef7f5173111359509e87ec70 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Apr 2020 11:30:23 +0100 -Subject: [PATCH 0752/1113] driver: char: rpivid: Don't map more than wanted +Subject: [PATCH 0752/1148] 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. @@ -407747,13 +407747,13 @@ index 5f4c91924ec1..9f38083f4cb6 100644 dev_err(priv->dev, "failed to get IO resource"); err = -ENOENT; -- -2.18.2 +2.18.4 -From 3a431dcbbdff1a9748a4ae062abec518e87188d0 Mon Sep 17 00:00:00 2001 +From 312ce605a12697f3a3fcad5d0d5f9e8c4a162341 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 12:43:22 +0100 -Subject: [PATCH 0753/1113] defconfig: Enable I2C_MUX_PINCTRL in all Pi configs +Subject: [PATCH 0753/1148] 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. @@ -407833,13 +407833,13 @@ index 34aa78d5d814..3a39acd6d0ab 100644 CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m -- -2.18.2 +2.18.4 -From 80982e97a99e5209cbf9f0d788500f1ead96fb6f Mon Sep 17 00:00:00 2001 +From beb6045383143bdae96bcbd8262bd3631e00dde5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 12:46:13 +0100 -Subject: [PATCH 0754/1113] dt: Implement an I2C pinctrl mux for BSC0. +Subject: [PATCH 0754/1148] 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 @@ -408305,13 +408305,13 @@ index adb59ca3df6c..4426f9e6ba92 100644 compatible = "brcm,bcm2835-dpi"; reg = <0x7e208000 0x8c>; -- -2.18.2 +2.18.4 -From 684e7d4ba51d3832a64fb888ff96a6a77499937c Mon Sep 17 00:00:00 2001 +From 6d483178b1cd66f6f3beb896992404a6e6ef9ed5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 15:04:14 +0100 -Subject: [PATCH 0755/1113] dtoverlays: Update CSI overlays to use i2c_csi_dsi +Subject: [PATCH 0755/1148] 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. @@ -408746,13 +408746,13 @@ index 2a1a3a80de49..f8c059827234 100644 link-frequency = <&tc358743>,"link-frequencies#0"; }; -- -2.18.2 +2.18.4 -From 0e86cfa54e9ba374247b7eda2b353ef6cbb1014a Mon Sep 17 00:00:00 2001 +From fd41e49a43430250a090498c5e38c9c8b7b8cf88 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 17:26:13 +0100 -Subject: [PATCH 0756/1113] dt: Update all mainline bcm283x dt files for i2c0 +Subject: [PATCH 0756/1148] 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 @@ -408979,13 +408979,13 @@ index 588d9411ceb6..dde209ade51b 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; -- -2.18.2 +2.18.4 -From ad0a214cdc7be0bc84803663dd4f49ab59bebbf3 Mon Sep 17 00:00:00 2001 +From 206f4a5d01d0de406f65171cf3fd8d676a9c22b9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Apr 2020 17:34:27 +0100 -Subject: [PATCH 0757/1113] ARM: dts: Create bcm2708-rpi-b-rev1.dts +Subject: [PATCH 0757/1148] 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. @@ -409172,13 +409172,13 @@ index 2af64cd43729..e3d90b4262f1 100644 status = "disabled"; }; -- -2.18.2 +2.18.4 -From 7fd1cb11c783d4850544cf7cc459492fc874ba94 Mon Sep 17 00:00:00 2001 +From dd85e776ad8a73449613cdbb080a3e233778d024 Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Wed, 22 Apr 2020 13:40:47 +0300 -Subject: [PATCH 0758/1113] dts: bcm2711: set #size-cells = <2> +Subject: [PATCH 0758/1148] dts: bcm2711: set #size-cells = <2> There already is one 4 GiB range, and one more will appear when high peripheral mode is enabled. @@ -409297,13 +409297,13 @@ index b34a65ff6316..41698e7f5e24 100644 #size-cells = <0x1>; interrupts = , -- -2.18.2 +2.18.4 -From 88bba9b60048a4d6ac94d39fe26dced9d7351ec9 Mon Sep 17 00:00:00 2001 +From 1c6811c65c84774703bdc5dbe006b5b1944842a3 Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Wed, 22 Apr 2020 16:34:59 +0300 -Subject: [PATCH 0759/1113] dts: bcm2711: add "High Peripheral" mode overlay +Subject: [PATCH 0759/1148] dts: bcm2711: add "High Peripheral" mode overlay The following addresses change: @@ -409452,13 +409452,13 @@ index a20c0e079cc8..1287964c15bf 100644 deprecated = "use i2c0"; }; -- -2.18.2 +2.18.4 -From 1f8c89b28d88f2e1f0d5c648e586b0c817c3cb54 Mon Sep 17 00:00:00 2001 +From 4eadfc72cf0efb08e0a12a18c89b9699316d979f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 13:41:10 +0100 -Subject: [PATCH 0760/1113] Revert "spi: spidev: Fix CS polarity if GPIO +Subject: [PATCH 0760/1148] Revert "spi: spidev: Fix CS polarity if GPIO descriptors are used" This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28. @@ -409490,13 +409490,13 @@ index 736af270d7a1..d41630b23968 100644 spi->mode = (u16)tmp; retval = spi_setup(spi); -- -2.18.2 +2.18.4 -From 9d50545447017eba934315cf750e950f7608ffd2 Mon Sep 17 00:00:00 2001 +From 711b3d039c475e8cfcfb1626fa7e9a905c429d73 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 13:30:49 +0100 -Subject: [PATCH 0761/1113] spi: use_gpio_descriptor fixup moved to spi_setup +Subject: [PATCH 0761/1148] 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 @@ -409531,10 +409531,10 @@ Signed-off-by: Phil Elwell 1 file changed, 9 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 5a0902238f34..2c333192686c 100644 +index eba2f687f1e6..571ef41edb83 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -1787,15 +1787,6 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, +@@ -1792,15 +1792,6 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, } spi->chip_select = value; @@ -409551,13 +409551,13 @@ index 5a0902238f34..2c333192686c 100644 rc = of_property_read_u32(nc, "spi-max-frequency", &value); if (rc) { -- -2.18.2 +2.18.4 -From 97b0d9fec9bf4c271431bfab7fbe9102bd87f735 Mon Sep 17 00:00:00 2001 +From d75ab124cb81863da00e6dcb7f985aa6dabf0797 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Apr 2020 15:17:06 +0100 -Subject: [PATCH 0762/1113] overlays: rpivid-v4l2 also needs size-cells = 2 +Subject: [PATCH 0762/1148] overlays: rpivid-v4l2 also needs size-cells = 2 Fixes: "dts: bcm2711: set #size-cells = <2>" @@ -409587,13 +409587,13 @@ index e6ece0570e90..cd8d96bb5715 100644 "hevc"; -- -2.18.2 +2.18.4 -From 256733e69851c2a27d6bf78a3efa9fd791459046 Mon Sep 17 00:00:00 2001 +From 9b2fd794592f4984b6e642d6fb5a06f21fc10f41 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Apr 2020 16:26:03 +0100 -Subject: [PATCH 0763/1113] media: bcm2835-unicam: Re-fetch mbus code from +Subject: [PATCH 0763/1148] 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 @@ -409642,13 +409642,13 @@ index 2ddac7382fb9..2e022c5e1cfd 100644 return 0; -- -2.18.2 +2.18.4 -From 8bee011d5636fd1cf147f80af80bbb8a405a84f9 Mon Sep 17 00:00:00 2001 +From 77db9f5a9d0382200556980cc3bc981c2c255078 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:18:15 +0100 -Subject: [PATCH 0764/1113] uapi: bcm2835-isp: Add bcm2835-isp uapi header file +Subject: [PATCH 0764/1148] 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. @@ -409986,13 +409986,13 @@ index 000000000000..e7afc367fd76 + +#endif /* __BCM2835_ISP_H_ */ -- -2.18.2 +2.18.4 -From 781d47d4c4fb24432e053b6c8164e581c3b4fee7 Mon Sep 17 00:00:00 2001 +From 265c1f89a1a5420883a04a4aec235e629c91cbd6 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:20:26 +0100 -Subject: [PATCH 0765/1113] media: uapi: v4l2-core: Add ISP statistics output +Subject: [PATCH 0765/1148] media: uapi: v4l2-core: Add ISP statistics output V4L2 fourcc type Add V4L2_META_FMT_BCM2835_ISP_STATS V4L2 format type. @@ -410093,13 +410093,13 @@ index 350d03021818..5b33ba237b6d 100644 /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe -- -2.18.2 +2.18.4 -From e9f38c045c5ed959d4d27196d204fd18fa9b4c94 Mon Sep 17 00:00:00 2001 +From 64a80938584502deb60e06818d313afb65ef71c7 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Apr 2020 15:06:19 +0100 -Subject: [PATCH 0766/1113] media: uapi: v4l-ctrls: Add CID base for the +Subject: [PATCH 0766/1148] media: uapi: v4l-ctrls: Add CID base for the bcm2835-isp driver We are reserving controls for the new bcm2835-isp driver. @@ -410273,13 +410273,13 @@ index d21ac7545626..660574b1b4e7 100644 /* The MPEG controls are applicable to all codec controls * and the 'MPEG' part of the define is historical */ -- -2.18.2 +2.18.4 -From 2c3ca920b5de34ce22d19c43c4325cd69189ac2b Mon Sep 17 00:00:00 2001 +From 59fa5c84baaf9110107769097bbc826eb1ebe7f9 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:12:24 +0100 -Subject: [PATCH 0767/1113] staging: mmal-vchiq: Fix formatting errors in +Subject: [PATCH 0767/1148] staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h No functional changes in this commit. @@ -410397,13 +410397,13 @@ index d3d7828d1e56..27bafc5f01d2 100644 }; -- -2.18.2 +2.18.4 -From 62fb3954f045548570f81b0dd9b181b3af3b8a3f Mon Sep 17 00:00:00 2001 +From 8bf54a815c54b1a4a82633ac210389515bfb63ba Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:17:37 +0100 -Subject: [PATCH 0768/1113] staging: vc04_services: ISP: Add a more complex ISP +Subject: [PATCH 0768/1148] staging: vc04_services: ISP: Add a more complex ISP processing component Driver for the BCM2835 ISP hardware block. This driver uses the MMAL @@ -412681,13 +412681,13 @@ index 27bafc5f01d2..9c752db45565 100644 #endif -- -2.18.2 +2.18.4 -From bf8519026e62e652b5df0ac88ffc55deee844f9e Mon Sep 17 00:00:00 2001 +From 742b6f168d28c52ac5280b3bff751bea73173de3 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 22 Apr 2020 08:32:32 +0100 -Subject: [PATCH 0769/1113] staging: vchiq: Load bcm2835_isp driver from vchiq +Subject: [PATCH 0769/1148] 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. @@ -412726,13 +412726,13 @@ index a3fcb1830995..d01c2d424310 100644 platform_device_unregister(bcm2835_camera); platform_device_unregister(bcm2835_codec); -- -2.18.2 +2.18.4 -From 3b6fbcbb8a85ed76f0a97553f95659c07931fcd1 Mon Sep 17 00:00:00 2001 +From f18dbd873f66023966011b02025010e640f33ffe Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 20 Jan 2020 12:58:06 +0000 -Subject: [PATCH 0770/1113] configs: Add VIDEO_ISP_BCM2835 to all Pi defconfigs +Subject: [PATCH 0770/1148] configs: Add VIDEO_ISP_BCM2835 to all Pi defconfigs This commit enables the bcm2835-isp driver in the following defconfigs: @@ -412812,13 +412812,13 @@ index 3a39acd6d0ab..bb3b687406ab 100644 CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set -- -2.18.2 +2.18.4 -From 4423740c418f1b6e00ac0f4761065973a4d2443a Mon Sep 17 00:00:00 2001 +From ea2d32499fcd0a89d9687be17ca72ab758ab40da Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Apr 2020 17:35:07 +0100 -Subject: [PATCH 0771/1113] vc4_hvs: Mark core clock as optional +Subject: [PATCH 0771/1148] vc4_hvs: Mark core clock as optional This isn't required on Pi3, so don't treat as an error @@ -412841,13 +412841,13 @@ index 59198019aa1d..d76521be2c0d 100644 dev_err(&pdev->dev, "Couldn't get core clock\n"); return PTR_ERR(hvs->regs); -- -2.18.2 +2.18.4 -From b4dd06d5ee10c2d65bfa6d10f805216cf8b8d577 Mon Sep 17 00:00:00 2001 +From 8f7f6be6b1fd03ed2e7e08e288aab0fded73bc36 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Apr 2020 19:07:50 +0100 -Subject: [PATCH 0772/1113] vc4_hdmi: BCM2835 requires a fixed hsm clock for +Subject: [PATCH 0772/1148] vc4_hdmi: BCM2835 requires a fixed hsm clock for CEC to work Signed-off-by: popcornmix @@ -412857,7 +412857,7 @@ Signed-off-by: popcornmix 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index a2881c823d16..87e6f2d867ea 100644 +index 2ebaea7e2a7b..2919549b227f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -580,12 +580,7 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) @@ -412903,7 +412903,7 @@ index a2881c823d16..87e6f2d867ea 100644 static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask) { int i; -@@ -1748,6 +1765,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1749,6 +1766,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .phy_rng_enable = vc4_hdmi_phy_rng_enable, .phy_rng_disable = vc4_hdmi_phy_rng_disable, .get_hsm_clock = vc4_hdmi_get_hsm_clock, @@ -412911,7 +412911,7 @@ index a2881c823d16..87e6f2d867ea 100644 .channel_map = vc4_hdmi_channel_map, }; -@@ -1772,6 +1790,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { +@@ -1773,6 +1791,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, .get_hsm_clock = vc5_hdmi_get_hsm_clock, @@ -412919,7 +412919,7 @@ index a2881c823d16..87e6f2d867ea 100644 .channel_map = vc5_hdmi_channel_map, }; -@@ -1796,6 +1815,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { +@@ -1797,6 +1816,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, .get_hsm_clock = vc5_hdmi_get_hsm_clock, @@ -412942,13 +412942,13 @@ index 9b80f9401d58..95bed29531b9 100644 u32 (*channel_map)(struct vc4_hdmi *vc4_hdmi, u32 channel_mask); }; -- -2.18.2 +2.18.4 -From 256c54141e60595328de58ee7dd1a5e9debaced5 Mon Sep 17 00:00:00 2001 +From 48f0f390f3b55fca3c60ac71ffd1042739db0003 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 29 Apr 2020 13:41:20 +0100 -Subject: [PATCH 0773/1113] configs: Enable CONFIG_DRM_VC4_HDMI_CEC +Subject: [PATCH 0773/1148] configs: Enable CONFIG_DRM_VC4_HDMI_CEC Signed-off-by: popcornmix --- @@ -412981,13 +412981,13 @@ index bb3b687406ab..f6c12a7a04be 100644 CONFIG_FB_BCM2708=y CONFIG_FB_UDL=m -- -2.18.2 +2.18.4 -From 15f0dafc529025e825b750477f30b73cda969838 Mon Sep 17 00:00:00 2001 +From da0dfc20869d8f8b0c1e10a1981f390fb9b0e2e4 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Wed, 29 Apr 2020 11:50:38 +0200 -Subject: [PATCH 0774/1113] media: i2c: imx219: Implement get_selection +Subject: [PATCH 0774/1148] 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 @@ -413168,13 +413168,13 @@ index 017ae503cc09..988ebf6dd895 100644 }; -- -2.18.2 +2.18.4 -From c901e3cc69f561325ae90afb083dfc56a6622792 Mon Sep 17 00:00:00 2001 +From 114ed328837bff74fdac32177a616c60d58f4bea Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 11:46:07 +0100 -Subject: [PATCH 0775/1113] media: i2c: ov5647: Add support for g_selection to +Subject: [PATCH 0775/1148] 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 @@ -413380,13 +413380,13 @@ index 66b3ee5cc190..e7c7e3ab4b38 100644 /* Set the default format to the same as the sensor. */ *format = state->mode->format; -- -2.18.2 +2.18.4 -From 0063c85136685f56721d253d75d3486cb9ff101b Mon Sep 17 00:00:00 2001 +From e7d5aecd66b17c39dba34d7d4818a8836ba01f09 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 11:50:52 +0100 -Subject: [PATCH 0776/1113] media: i2c: ov5467: Fixup error path to release +Subject: [PATCH 0776/1148] media: i2c: ov5467: Fixup error path to release mutex "87f3ab9 media: ov5647: Add basic support for multiple sensor modes." @@ -413416,13 +413416,13 @@ index e7c7e3ab4b38..09d68b0b4a13 100644 *fmt = mode->format; if (format->which == V4L2_SUBDEV_FORMAT_TRY) { -- -2.18.2 +2.18.4 -From 1e78af161884d2ae543bba0fbb39b2f934108811 Mon Sep 17 00:00:00 2001 +From e15593d7e083bff4df7ea5ffefc9e44c5b9e2e6d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 12:25:13 +0100 -Subject: [PATCH 0777/1113] media: i2c: ov5647: Support V4L2_CID_PIXEL_RATE +Subject: [PATCH 0777/1148] media: i2c: ov5647: Support V4L2_CID_PIXEL_RATE Clients need to know the pixel rate in order to compute exposure and frame rate values. @@ -413553,13 +413553,13 @@ index 09d68b0b4a13..02d72feb837e 100644 sensor->write_mode_regs = true; -- -2.18.2 +2.18.4 -From 3d5a51ca2910983c89e6181aace31e6402226b0c Mon Sep 17 00:00:00 2001 +From fcd0c01220bfa6cc1d70adfb5ecb7beafdce7f5a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 17:25:56 +0100 -Subject: [PATCH 0778/1113] media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS +Subject: [PATCH 0778/1148] media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS flag The ov5647 subdev can generate control events, therefore set @@ -413702,13 +413702,13 @@ index 02d72feb837e..c012e0b3d68b 100644 sensor->pad.flags = MEDIA_PAD_FL_SOURCE; sd->entity.function = MEDIA_ENT_F_CAM_SENSOR; -- -2.18.2 +2.18.4 -From 2380d2eefb467a532bdb86cfae1c8042e1ed3409 Mon Sep 17 00:00:00 2001 +From ccc82502dcb80d891f89a401003f8afedcc6af32 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 21:39:58 +0100 -Subject: [PATCH 0779/1113] media: i2c: ov5647: Add support for V4L2_CID_VBLANK +Subject: [PATCH 0779/1148] media: i2c: ov5647: Add support for V4L2_CID_VBLANK Adds vblank control to allow for frame rate control. @@ -413913,13 +413913,13 @@ index c012e0b3d68b..445a0ce186ec 100644 ret = sensor->ctrls.error; dev_err(&client->dev, "%s control init failed (%d)\n", -- -2.18.2 +2.18.4 -From 57522a0af782ca0331141f9686a54188cbb8840c Mon Sep 17 00:00:00 2001 +From 1e9bc0164179f9291cd5b6691421c65284825c78 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 21:47:25 +0100 -Subject: [PATCH 0780/1113] media: i2c: ov5647: Neither analogue gain nor +Subject: [PATCH 0780/1148] media: i2c: ov5647: Neither analogue gain nor exposure need EXECUTE_ON_WRITE The controls for analogue gain and exposure were defined with @@ -413977,13 +413977,13 @@ index 445a0ce186ec..49247711221c 100644 /* Set the default mode before we init the subdev */ sensor->mode = OV5647_DEFAULT_MODE; -- -2.18.2 +2.18.4 -From 661dd4ef9c65e0dd6f86ed31fd4d461ccd82791d Mon Sep 17 00:00:00 2001 +From bcbaf82091d324c10b3d3437bce349c6ddfc15f5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 22:11:01 +0100 -Subject: [PATCH 0781/1113] media: i2c: ov5647: Use member names in mode tables +Subject: [PATCH 0781/1148] 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. @@ -414094,13 +414094,13 @@ index 49247711221c..da4ef30d8f32 100644 }; -- -2.18.2 +2.18.4 -From 9f843d18daaa20dcf3c3cb0c0b70eb28a7455bdb Mon Sep 17 00:00:00 2001 +From ec2a4239d85c5c1d266e41830ad2597fa283f078 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 Apr 2020 11:03:00 +0100 -Subject: [PATCH 0782/1113] media: i2c: ov5647: Advertise the correct exposure +Subject: [PATCH 0782/1148] media: i2c: ov5647: Advertise the correct exposure range Exposure is clipped by the VTS of the mode, so needs to be updated as @@ -414219,13 +414219,13 @@ index da4ef30d8f32..6d84d2785f74 100644 sensor->pixel_rate = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops, V4L2_CID_PIXEL_RATE, -- -2.18.2 +2.18.4 -From afe131dcfe9714c8946022cc6ee729024c255c88 Mon Sep 17 00:00:00 2001 +From 59728feaa9f0fb35929d179362a2215f557f20bd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Apr 2020 11:01:21 +0100 -Subject: [PATCH 0783/1113] media: i2c: imx219: Declare that the driver can +Subject: [PATCH 0783/1148] media: i2c: imx219: Declare that the driver can create events The flag V4L2_SUBDEV_FL_HAS_EVENTS is required if the subdev can @@ -414252,13 +414252,13 @@ index 988ebf6dd895..b84fc19e9ff7 100644 /* Initialize source pads */ -- -2.18.2 +2.18.4 -From 3f89e0a5b3e18bed02260c2e97d74d841f58aca8 Mon Sep 17 00:00:00 2001 +From 5f9f95dd06b9b31f4a732d4cf21c7431a6b5f00d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 16:45:02 +0100 -Subject: [PATCH 0784/1113] media: bcm2835-unicam: Add support for +Subject: [PATCH 0784/1148] media: bcm2835-unicam: Add support for VIDIOC_[S|G]_SELECTION Sensors are now reflecting cropping and scaling parameters through @@ -414340,13 +414340,13 @@ index 2e022c5e1cfd..f94a790ca315 100644 if (ret) { unicam_err(unicam, "Unable to register video device.\n"); -- -2.18.2 +2.18.4 -From 0c63a65c1c4445fc15ce50da7df21ccf65962248 Mon Sep 17 00:00:00 2001 +From fc006be25fcf0974d2a3f501543ed969c6fc88d6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 22:05:09 +0100 -Subject: [PATCH 0785/1113] media: bcm2835-unicam: Do not stop streaming in +Subject: [PATCH 0785/1148] media: bcm2835-unicam: Do not stop streaming in unicam_release unicam_release calls _vb2_fop_release, which will call stop_streaming @@ -414374,13 +414374,13 @@ index f94a790ca315..e7c0e91cb841 100644 mutex_unlock(&node->lock); -- -2.18.2 +2.18.4 -From 3abc4aa41d59210442054fccf043b1d2a84011ba Mon Sep 17 00:00:00 2001 +From 6ce8298ea1117c2057d2ea410035d0939282d8bf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 Apr 2020 09:52:50 +0100 -Subject: [PATCH 0786/1113] media: bcm2835-unicam: Fix reference counting in +Subject: [PATCH 0786/1148] media: bcm2835-unicam: Fix reference counting in unicam_open The reference counting of node->open was only incremented after @@ -414418,13 +414418,13 @@ index e7c0e91cb841..5b5585f6770c 100644 unlock: -- -2.18.2 +2.18.4 -From a962e4fbbd49fca5a00abab32aff22b4ecd14d11 Mon Sep 17 00:00:00 2001 +From 7c6208aeab9fe7a0eebf35d3665ce1a8eac1dcd1 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 1 May 2020 14:15:24 +0100 -Subject: [PATCH 0787/1113] staging: vc04_services: ISP: Add enum_framesizes +Subject: [PATCH 0787/1148] staging: vc04_services: ISP: Add enum_framesizes ioctl This is used to enumerate available frame sizes on all nodes @@ -414759,13 +414759,13 @@ index ded2be584f95..9d8ccb403480 100644 /* ISP statistics format */ .fourcc = V4L2_META_FMT_BCM2835_ISP_STATS, -- -2.18.2 +2.18.4 -From a0c61dc701855b97333ed8e41f734e33292eb351 Mon Sep 17 00:00:00 2001 +From afce9ef6cc546839f640df7cec9f45fbcb7cacf8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 1 May 2020 14:58:23 +0100 -Subject: [PATCH 0788/1113] SQUASH: spi: Demote SPI_CS_HIGH warning to +Subject: [PATCH 0788/1148] SQUASH: spi: Demote SPI_CS_HIGH warning to KERN_DEBUG This warning is unavoidable from a client's perspective and @@ -414779,10 +414779,10 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 2c333192686c..a5a0cd73884b 100644 +index 571ef41edb83..9a1983f81435 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -3065,8 +3065,8 @@ int spi_setup(struct spi_device *spi) +@@ -3070,8 +3070,8 @@ int spi_setup(struct spi_device *spi) if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods && ctlr->cs_gpiods[spi->chip_select] && !(spi->mode & SPI_CS_HIGH)) { @@ -414794,13 +414794,13 @@ index 2c333192686c..a5a0cd73884b 100644 } -- -2.18.2 +2.18.4 -From ff85b5ab0d8f72bf5c5d7baba8c1e13a54e9ac04 Mon Sep 17 00:00:00 2001 +From d51b93b815adf6a8acfa2d8b261216632b72fde6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Apr 2019 13:33:47 +0100 -Subject: [PATCH 0789/1113] bcm2835-dma: Add proper 40-bit DMA support +Subject: [PATCH 0789/1148] 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. @@ -415600,13 +415600,13 @@ index 1e5d6f1bed4e..53346d7eb66c 100644 return 0; -- -2.18.2 +2.18.4 -From 5a2fad592780207aefab886e0a64e6ff759f0cf5 Mon Sep 17 00:00:00 2001 +From 867aedb90fdbe6a79b2834cdd6951f1b22e19c82 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Apr 2020 12:43:05 +0100 -Subject: [PATCH 0790/1113] ARM: dts: bcm2711: Allow 40-bit DMA for SPI +Subject: [PATCH 0790/1148] 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, @@ -415648,13 +415648,13 @@ index ece3d3143643..505f37235473 100644 number generator (default "on") -- -2.18.2 +2.18.4 -From ecc8593fecca725d5b8e3a53ec49a1b4ad49d439 Mon Sep 17 00:00:00 2001 +From bcee15807f14b38e0f659ab4e0e671e7e9cba02d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 1 May 2020 17:56:13 +0100 -Subject: [PATCH 0791/1113] overlays: Make the i2c-gpio overlay safe again +Subject: [PATCH 0791/1148] 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 @@ -415686,13 +415686,13 @@ index e94053b55610..39e7bc5fa9d8 100644 reg = <0xffffffff>; compatible = "i2c-gpio"; -- -2.18.2 +2.18.4 -From 0d6292a4b76deb66ee31199a2c5e42a830210cf5 Mon Sep 17 00:00:00 2001 +From c651e6efc695e2c35fb00972a83fd400755bcab2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 1 May 2020 17:49:08 +0100 -Subject: [PATCH 0792/1113] staging: vc04_services: isp: Remove duplicated +Subject: [PATCH 0792/1148] staging: vc04_services: isp: Remove duplicated initialisation With the codec code from which this was derived, the driver had to @@ -415754,13 +415754,13 @@ index 6c4405ab4dc5..edb1a27328de 100644 } -- -2.18.2 +2.18.4 -From 38c6fc6a4c0083e921a3f899a44a6ee5871361fc Mon Sep 17 00:00:00 2001 +From c218d40d493377e9ce3413056fa9f0e7ea35ae72 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 1 May 2020 16:54:20 +0100 -Subject: [PATCH 0793/1113] staging: vc04_services: isp: Make all references to +Subject: [PATCH 0793/1148] staging: vc04_services: isp: Make all references to bcm2835_isp_fmt const The array of potential formats and their configuration should be const. @@ -415910,13 +415910,13 @@ index 9d8ccb403480..af3bde152bb2 100644 }; -- -2.18.2 +2.18.4 -From 586e1b70587d0baab8dc4b15aee50bb29e600e2d Mon Sep 17 00:00:00 2001 +From 8e4f81f15b3a2cd00c64828d9ffe0f1c1b14fb1e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 2 May 2020 13:43:06 +0100 -Subject: [PATCH 0794/1113] overlays: gpio-keys: Avoid open-drain warnings +Subject: [PATCH 0794/1148] 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. @@ -415945,13 +415945,13 @@ index 39e7bc5fa9d8..def139db8bcb 100644 #size-cells = <0>; }; -- -2.18.2 +2.18.4 -From 459c13acafcd119d5069cdb6abcf84d3807bb77f Mon Sep 17 00:00:00 2001 +From cd8e7503387887b3bad93d254b8d17b04f8f8863 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 4 May 2020 11:06:04 +0100 -Subject: [PATCH 0795/1113] configs: Add missing PPS configs +Subject: [PATCH 0795/1148] configs: Add missing PPS configs The arm64 bcm2711_defconfig was inexplicably missing three PPS config options. Add them, along with another missing option from @@ -415992,13 +415992,13 @@ index f6c12a7a04be..751f6efda9f1 100644 CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m -- -2.18.2 +2.18.4 -From 5ab5b40318704c73e5499ec589bebc84504ee67c Mon Sep 17 00:00:00 2001 +From a3ce09722c978538ed403c74466e6c09369ffb6b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 4 May 2020 13:38:39 +0100 -Subject: [PATCH 0796/1113] configs: Add missing TOUCHSCREEN_RASPBERRYPI_FW=m +Subject: [PATCH 0796/1148] configs: Add missing TOUCHSCREEN_RASPBERRYPI_FW=m The 32- and 64-bit bcm2711 defconfigs are missing support for the official Raspberry Pi touchscreen. @@ -416038,13 +416038,13 @@ index d626405a9199..7c362f4355c5 100644 CONFIG_TOUCHSCREEN_STMPE=m CONFIG_INPUT_MISC=y -- -2.18.2 +2.18.4 -From 5bc70ddf1e350f7ad4f9e61cebd69be45c528ef3 Mon Sep 17 00:00:00 2001 +From 8e12343871c162bdb7423d350d1393a6d1c6bd3f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 6 Apr 2020 17:07:31 +0100 -Subject: [PATCH 0797/1113] vc4_hdmi_phy: Fix typo in phy_get_cp_current +Subject: [PATCH 0797/1148] vc4_hdmi_phy: Fix typo in phy_get_cp_current This is stored in a 6-bit register field which causes a WARN @@ -416067,13 +416067,13 @@ index 732d8a0e5a1c..0e242f87db9e 100644 static u32 phy_get_rm_offset(unsigned long long vco_freq) -- -2.18.2 +2.18.4 -From f72c9ec76ad836ea4bc2df78629c805d08cdbeec Mon Sep 17 00:00:00 2001 +From 7aca24c9467ebb5da186af302fe47fe3d1485579 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 4 May 2020 15:13:24 +0100 -Subject: [PATCH 0798/1113] overlays: Make use of intra-overlay fragments +Subject: [PATCH 0798/1148] 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 @@ -416167,13 +416167,13 @@ index b380d925f0a5..4fc571c2db33 100644 #address-cells = <1>; #size-cells = <0>; -- -2.18.2 +2.18.4 -From 68331f6ce47d579c213191f9c8ff2bfe4f1315fa Mon Sep 17 00:00:00 2001 +From a075e36ba6f3666ff60119eba356464dc9d271c3 Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:28:14 +0200 -Subject: [PATCH 0799/1113] media: i2c: tc358743: Fix fallthrough warning +Subject: [PATCH 0799/1148] media: i2c: tc358743: Fix fallthrough warning Signed-off-by: Jacko Dirks --- @@ -416193,13 +416193,13 @@ index ad9f7e833243..68aa716c14ba 100644 state->pdata.lineinitcnt = 0xe80; state->pdata.lptxtimecnt = 0x003; -- -2.18.2 +2.18.4 -From 92003816296ae05ff0ed7645b19ce02edd28cd9a Mon Sep 17 00:00:00 2001 +From 570f7a9303c540001d359ff7d7616ea30a65a29d Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:33:31 +0200 -Subject: [PATCH 0800/1113] media: bcm2835: unicam: Fix uninitialized warning +Subject: [PATCH 0800/1148] media: bcm2835: unicam: Fix uninitialized warning Signed-off-by: Jacko Dirks --- @@ -416220,13 +416220,13 @@ index 5b5585f6770c..6fd1b0939a07 100644 for (j = 0; ret != -EINVAL && ret != -ENOIOCTLCMD; ++j) { -- -2.18.2 +2.18.4 -From 12fa9f0811b8cfbe5cb6789b8644c90056b8d944 Mon Sep 17 00:00:00 2001 +From 41bd926b0f5e6cc741026cefaf79b56ee1666736 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 19:45:41 +0100 -Subject: [PATCH 0801/1113] video: bcm2708_fb: Disable FB if no displays found +Subject: [PATCH 0801/1148] 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 @@ -416260,13 +416260,13 @@ index 8234207b1914..d035fa59c269 100644 fbdev->firmware_supports_multifb = 1; } -- -2.18.2 +2.18.4 -From 6aa91c0d148281534ac91be00dc28545fa0b8cc1 Mon Sep 17 00:00:00 2001 +From d56522379f1cceaf2e8c514627a9a4b5ccf72cb3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 May 2020 14:25:20 +0100 -Subject: [PATCH 0802/1113] overlays: sc16is752-spi1: Add xtal parameter +Subject: [PATCH 0802/1148] 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 @@ -416306,13 +416306,13 @@ index 4e33b14afc78..131d3ab43d3a 100644 }; }; -- -2.18.2 +2.18.4 -From b0c4f79e56f6b6783131d496a0d56ca58f374375 Mon Sep 17 00:00:00 2001 +From 7d007d5570a22a4ec902e42b03ef531d5341b21d Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 0803/1113] vc4_hdmi: Fix register offset when sending longer +Subject: [PATCH 0803/1148] vc4_hdmi: Fix register offset when sending longer CEC messages Signed-off-by: Dom Cobley @@ -416321,10 +416321,10 @@ Signed-off-by: Dom Cobley 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 87e6f2d867ea..89d96fc8ea01 100644 +index 2919549b227f..7b5421d24871 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1264,8 +1264,13 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) +@@ -1265,8 +1265,13 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >> VC4_HDMI_CEC_REC_WRD_CNT_SHIFT); @@ -416339,7 +416339,7 @@ index 87e6f2d867ea..89d96fc8ea01 100644 msg->msg[i] = val & 0xff; msg->msg[i + 1] = (val >> 8) & 0xff; -@@ -1361,8 +1366,12 @@ static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, +@@ -1362,8 +1367,12 @@ static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, u32 val; unsigned int i; @@ -416354,13 +416354,13 @@ index 87e6f2d867ea..89d96fc8ea01 100644 (msg->msg[i + 1] << 8) | (msg->msg[i + 2] << 16) | -- -2.18.2 +2.18.4 -From c96b7268f476c2fee6c33c0835a0036addc63744 Mon Sep 17 00:00:00 2001 +From 96588fa57950fccb8662721466676dbfbde0be36 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 0804/1113] vc4_hdmi: Fix up CEC registers +Subject: [PATCH 0804/1148] vc4_hdmi: Fix up CEC registers Fix an incorrect register address, add a missing one and reorder into address order @@ -416403,13 +416403,13 @@ index ea948ffaa69b..a0fa082a017c 100644 VC4_HDMI_REG(HDMI_RAM_PACKET_START, 0x0400), }; -- -2.18.2 +2.18.4 -From 5d3854eb77b82f288b62acdd6e8603978667b888 Mon Sep 17 00:00:00 2001 +From 1c435d4f65652ee4be244a9c5478a68aa8e4b9a0 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 0805/1113] vc4_hdmi_regs: Add Intr2 register block +Subject: [PATCH 0805/1148] vc4_hdmi_regs: Add Intr2 register block Signed-off-by: Dom Cobley --- @@ -416478,10 +416478,10 @@ index 41698e7f5e24..96ef133391d1 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 89d96fc8ea01..c2d46b01e14a 100644 +index 7b5421d24871..8d8ba07b3c9b 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1581,6 +1581,14 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) +@@ -1582,6 +1582,14 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) if (IS_ERR(vc4_hdmi->dvp_regs)) return PTR_ERR(vc4_hdmi->dvp_regs); @@ -416566,13 +416566,13 @@ index a0fa082a017c..7311a8c0f1e5 100644 return hdmi->phy_regs; -- -2.18.2 +2.18.4 -From d725c461584fc986440ae3e197a3ff4dd65771a7 Mon Sep 17 00:00:00 2001 +From 01e5c4f3ed005c55b73769dd92052dfcba6aabde Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 0806/1113] vc4_hdmi_regs: Make interrupt mask variant specific +Subject: [PATCH 0806/1148] vc4_hdmi_regs: Make interrupt mask variant specific Signed-off-by: Dom Cobley --- @@ -416582,10 +416582,10 @@ Signed-off-by: Dom Cobley 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index c2d46b01e14a..bfd29c33b8fe 100644 +index 8d8ba07b3c9b..9f6b260a7238 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1285,7 +1285,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) +@@ -1286,7 +1286,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) u32 stat = HDMI_READ(HDMI_CEC_CPU_STATUS); u32 cntrl1, cntrl5; @@ -416594,7 +416594,7 @@ index c2d46b01e14a..bfd29c33b8fe 100644 return IRQ_NONE; vc4_hdmi->cec_rx_msg.len = 0; cntrl1 = HDMI_READ(HDMI_CEC_CNTRL_1); -@@ -1301,7 +1301,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) +@@ -1302,7 +1302,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) cntrl1 &= ~VC4_HDMI_CEC_START_XMIT_BEGIN; } HDMI_WRITE(HDMI_CEC_CNTRL_1, cntrl1); @@ -416603,7 +416603,7 @@ index c2d46b01e14a..bfd29c33b8fe 100644 return IRQ_WAKE_THREAD; } -@@ -1340,9 +1340,9 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) +@@ -1341,9 +1341,9 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) ((3600 / usecs) << VC4_HDMI_CEC_CNT_TO_3600_US_SHIFT) | ((3500 / usecs) << VC4_HDMI_CEC_CNT_TO_3500_US_SHIFT)); @@ -416615,7 +416615,7 @@ index c2d46b01e14a..bfd29c33b8fe 100644 HDMI_WRITE(HDMI_CEC_CNTRL_5, val | VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); } -@@ -1784,6 +1784,8 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1785,6 +1785,8 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .get_hsm_clock = vc4_hdmi_get_hsm_clock, .calc_hsm_clock = vc4_hdmi_calc_hsm_clock, .channel_map = vc4_hdmi_channel_map, @@ -416624,7 +416624,7 @@ index c2d46b01e14a..bfd29c33b8fe 100644 }; static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { -@@ -1809,6 +1811,8 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { +@@ -1810,6 +1812,8 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { .get_hsm_clock = vc5_hdmi_get_hsm_clock, .calc_hsm_clock = vc5_hdmi_calc_hsm_clock, .channel_map = vc5_hdmi_channel_map, @@ -416633,7 +416633,7 @@ index c2d46b01e14a..bfd29c33b8fe 100644 }; static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { -@@ -1834,6 +1838,8 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { +@@ -1835,6 +1839,8 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { .get_hsm_clock = vc5_hdmi_get_hsm_clock, .calc_hsm_clock = vc5_hdmi_calc_hsm_clock, .channel_map = vc5_hdmi_channel_map, @@ -416677,13 +416677,13 @@ index 78809866097c..4d017572a5c2 100644 # define VC4_HD_CECRXD BIT(9) /* Debug: Override CEC output to 0. */ -- -2.18.2 +2.18.4 -From 602ad40c04a3819351ed6f4088ea9b479b60f259 Mon Sep 17 00:00:00 2001 +From 64e6c6516768be1c4018d0cd778184d4283a2803 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 0807/1113] vc4_hdmi: Make irq shared +Subject: [PATCH 0807/1148] vc4_hdmi: Make irq shared Signed-off-by: Dom Cobley --- @@ -416691,10 +416691,10 @@ Signed-off-by: Dom Cobley 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index bfd29c33b8fe..bc6da63d0e91 100644 +index 9f6b260a7238..7b9d98fe2e3e 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1428,7 +1428,8 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +@@ -1429,7 +1429,8 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) HDMI_WRITE(HDMI_CEC_CNTRL_1, value); ret = devm_request_threaded_irq(&pdev->dev, platform_get_irq(pdev, 0), vc4_cec_irq_handler, @@ -416705,13 +416705,13 @@ index bfd29c33b8fe..bc6da63d0e91 100644 if (ret) goto err_delete_cec_adap; -- -2.18.2 +2.18.4 -From fd44908cfc71645fb460ba021ad18e996310fd76 Mon Sep 17 00:00:00 2001 +From 7cef5890c1a01047eabcdf97dc1e9a2da3f3ae76 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 0808/1113] vc4_hdmi: Adjust CEC ref clock based on its input +Subject: [PATCH 0808/1148] vc4_hdmi: Adjust CEC ref clock based on its input clock 2711 uses a fixed 27MHz input, earlier models use the HSM clock @@ -416723,7 +416723,7 @@ Signed-off-by: Dom Cobley 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index bc6da63d0e91..baa84700309e 100644 +index 7b9d98fe2e3e..35d1da61f05d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -79,6 +79,7 @@ @@ -416744,7 +416744,7 @@ index bc6da63d0e91..baa84700309e 100644 } static u32 vc5_hdmi_calc_hsm_clock(struct vc4_hdmi *vc4_hdmi, unsigned long pixel_rate) -@@ -1399,6 +1399,7 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +@@ -1400,6 +1400,7 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) struct cec_connector_info conn_info; struct platform_device *pdev = vc4_hdmi->pdev; u32 value; @@ -416752,7 +416752,7 @@ index bc6da63d0e91..baa84700309e 100644 int ret; if (!vc4_hdmi->variant->cec_available) -@@ -1423,8 +1424,9 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +@@ -1424,8 +1425,9 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) * divider: the hsm_clock rate and this divider setting will * give a 40 kHz CEC clock. */ @@ -416763,7 +416763,7 @@ index bc6da63d0e91..baa84700309e 100644 HDMI_WRITE(HDMI_CEC_CNTRL_1, value); ret = devm_request_threaded_irq(&pdev->dev, platform_get_irq(pdev, 0), vc4_cec_irq_handler, -@@ -1769,6 +1771,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) +@@ -1770,6 +1772,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) static const struct vc4_hdmi_variant bcm2835_variant = { .max_pixel_clock = 162000000, @@ -416771,7 +416771,7 @@ index bc6da63d0e91..baa84700309e 100644 .audio_available = true, .cec_available = true, .registers = vc4_hdmi_fields, -@@ -1793,6 +1796,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { +@@ -1794,6 +1797,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { .id = 0, .audio_available = true, .max_pixel_clock = 297000000, @@ -416779,7 +416779,7 @@ index bc6da63d0e91..baa84700309e 100644 .registers = vc5_hdmi_hdmi0_fields, .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields), .phy_lane_mapping = { -@@ -1820,6 +1824,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { +@@ -1821,6 +1825,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { .id = 1, .audio_available = true, .max_pixel_clock = 297000000, @@ -416802,13 +416802,13 @@ index 7765b9cf885b..dbf96a3b01ee 100644 const struct vc4_hdmi_register *registers; -- -2.18.2 +2.18.4 -From 061c2f072d7a8038610109b7af65439005a41bdb Mon Sep 17 00:00:00 2001 +From 05b29090e1fbcdb53a815ebe00d2b849ed34388c Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:09 +0100 -Subject: [PATCH 0809/1113] vc4_hdmi: Remove cec_available flag as always +Subject: [PATCH 0809/1148] vc4_hdmi: Remove cec_available flag as always supported Signed-off-by: Dom Cobley @@ -416818,10 +416818,10 @@ Signed-off-by: Dom Cobley 2 files changed, 7 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index baa84700309e..2d608cf9dff9 100644 +index 35d1da61f05d..093f424ad5b4 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1402,9 +1402,6 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +@@ -1403,9 +1403,6 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) u32 clk_cnt; int ret; @@ -416831,7 +416831,7 @@ index baa84700309e..2d608cf9dff9 100644 vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4_hdmi, "vc4", CEC_CAP_DEFAULTS | -@@ -1773,7 +1770,6 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1774,7 +1771,6 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .max_pixel_clock = 162000000, .cec_input_clock = VC4_HSM_CLOCK, .audio_available = true, @@ -416854,13 +416854,13 @@ index dbf96a3b01ee..60f7bf99e06e 100644 unsigned long long max_pixel_clock; -- -2.18.2 +2.18.4 -From 782e32fb82de30fe5bedf4ad05585e558faebcb6 Mon Sep 17 00:00:00 2001 +From 9015d8384a49a32b85e8ba38919e4173d4b07b79 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:09 +0100 -Subject: [PATCH 0810/1113] config: Enable CONFIG_DRM_VC4_HDMI_CEC +Subject: [PATCH 0810/1148] config: Enable CONFIG_DRM_VC4_HDMI_CEC Signed-off-by: Dom Cobley --- @@ -416893,13 +416893,13 @@ index 7c362f4355c5..35afa6b6ffd6 100644 CONFIG_TINYDRM_ILI9341=m CONFIG_TINYDRM_MI0283QT=m -- -2.18.2 +2.18.4 -From 5a9d57d91d3da08286d5f81ff1018796824db517 Mon Sep 17 00:00:00 2001 +From 6ceb7874dd5497975bbb8f5e3a304456fa1a4ab9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 May 2020 11:55:45 +0100 -Subject: [PATCH 0811/1113] overlays: tc358743: Use intra-overlay fragments +Subject: [PATCH 0811/1148] 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 @@ -416954,13 +416954,13 @@ index f8c059827234..b317e088b37e 100644 }; -- -2.18.2 +2.18.4 -From d096ebb0bdd9e7e3a34df8e68ad9e04976ee41e9 Mon Sep 17 00:00:00 2001 +From d7c16e91ab930c6abc03690f0ee1cb7a63baa237 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 May 2020 15:12:21 +0100 -Subject: [PATCH 0812/1113] overlays: Move "fixed-clock" nodes to the root +Subject: [PATCH 0812/1148] 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" @@ -417308,13 +417308,13 @@ index b317e088b37e..2ea99cd9e1a1 100644 4lane = <0>, "-2+3"; link-frequency = <&tc358743>,"link-frequencies#0"; -- -2.18.2 +2.18.4 -From 3e47f63291c6f38e101174b59f822abb9db3bb87 Mon Sep 17 00:00:00 2001 +From 85948ecf82a669f80abd6795c27d2bbf8c93aa59 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 May 2020 08:32:42 +0100 -Subject: [PATCH 0813/1113] raspberrypi: dts: Switch to discrete ALSA devices +Subject: [PATCH 0813/1148] raspberrypi: dts: Switch to discrete ALSA devices Add the command line options required to enable audio over discrete ALSA devices. @@ -417408,13 +417408,13 @@ index 86dd3093e709..05220fa0202b 100644 aliases { -- -2.18.2 +2.18.4 -From 08baca686d1ed6a44651934f62d7f0e48bbf4c91 Mon Sep 17 00:00:00 2001 +From 5e19d1ac494cd29d88b28eef4c5f1e199fbdf97f Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:50:54 +0100 -Subject: [PATCH 0814/1113] dt-bindings: media: i2c: Add IMX477 CMOS sensor +Subject: [PATCH 0814/1148] dt-bindings: media: i2c: Add IMX477 CMOS sensor binding Add YAML device tree binding for IMX477 CMOS image sensor. @@ -417545,13 +417545,13 @@ index 000000000000..0994e13e67f6 + +... -- -2.18.2 +2.18.4 -From aef73e658317c0edaf754d502eb80066967f51e1 Mon Sep 17 00:00:00 2001 +From 638eaf9de442e0b4437440c842554dd88eabdd52 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:50:04 +0100 -Subject: [PATCH 0815/1113] dtoverlays: Add IMX477 sensor overlay +Subject: [PATCH 0815/1148] dtoverlays: Add IMX477 sensor overlay Add an overlay for the Sony IMX477 CMOS sensor device. Also update overlay README and Makefile. @@ -417712,13 +417712,13 @@ index 000000000000..1dd6f92b4dfe + }; +}; -- -2.18.2 +2.18.4 -From b8d039353bf5fb00b545f723686fbef6898de950 Mon Sep 17 00:00:00 2001 +From a19de33e4851cf8b04f12d8a6b34533395c9b0c6 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 8 May 2020 10:00:12 +0100 -Subject: [PATCH 0816/1113] media: i2c: Add driver for Sony IMX477 sensor +Subject: [PATCH 0816/1148] 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 @@ -419991,13 +419991,13 @@ index 000000000000..ec56b0cfd57b +MODULE_DESCRIPTION("Sony IMX477 sensor driver"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 7cbc4293754412a7ca3a63520be12741c5a89377 Mon Sep 17 00:00:00 2001 +From ed60dd316329b66feda84e826d64ab06253496b9 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 8 May 2020 09:41:17 +0100 -Subject: [PATCH 0817/1113] media: i2c: imx477: Add support for adaptive frame +Subject: [PATCH 0817/1148] media: i2c: imx477: Add support for adaptive frame control Use V4L2_CID_EXPOSURE_AUTO_PRIORITY to control if the driver should @@ -420179,13 +420179,13 @@ index ec56b0cfd57b..bd0e2c291a32 100644 V4L2_CID_HFLIP, 0, 1, 1, 0); if (imx477->hflip) -- -2.18.2 +2.18.4 -From 6a585b9b2b862b9cd7c1b73cd019e9af101232b4 Mon Sep 17 00:00:00 2001 +From fcfe2a46413b7a52a8a43887982b278b9fc672cd Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:36:25 +0100 -Subject: [PATCH 0818/1113] configs: Add imx477 sensor driver to all Raspberry +Subject: [PATCH 0818/1148] configs: Add imx477 sensor driver to all Raspberry Pi defconfigs This commit enables the imx477 sensor driver in the following @@ -420266,13 +420266,13 @@ index 751f6efda9f1..efb1b60cbbb6 100644 CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_IRS1125=m -- -2.18.2 +2.18.4 -From 04e47fe29e9631ff81b6debb9e5572a793ed2f8b Mon Sep 17 00:00:00 2001 +From 3f911fad9455256a29e8b64ab4cb9d67c9e68ca4 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Tue, 26 Nov 2019 15:25:16 +0100 -Subject: [PATCH 0819/1113] udmabuf: Remove deleted map/unmap handlers. +Subject: [PATCH 0819/1148] udmabuf: Remove deleted map/unmap handlers. Commit 19d32ace8b6acebc45da1ea748000ac79ccc7721 upstream. @@ -420324,13 +420324,13 @@ index 9635897458a0..9de539c1def4 100644 }; -- -2.18.2 +2.18.4 -From 56b568fb50df99f26bb8f1099a2572ec365227ac Mon Sep 17 00:00:00 2001 +From 22e9256d091d8daa6d826bba88dc8d8ff83b97dd Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:24 -0800 -Subject: [PATCH 0820/1113] udmabuf: use cache_sgt_mapping option +Subject: [PATCH 0820/1148] udmabuf: use cache_sgt_mapping option Commit bc7a71da43b48333f84c6534ab43d240e34cf9eb uptream. @@ -420365,13 +420365,13 @@ index 9de539c1def4..be15eb6b0586 100644 #define SEALS_WANTED (F_SEAL_SHRINK) -- -2.18.2 +2.18.4 -From 541d7fb849ea08d3ad68e99adf970dd333072c3e Mon Sep 17 00:00:00 2001 +From 3f608d82865b675f549203dab61d64d797a11c47 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:25 -0800 -Subject: [PATCH 0821/1113] udmabuf: add a pointer to the miscdevice in dma-buf +Subject: [PATCH 0821/1148] udmabuf: add a pointer to the miscdevice in dma-buf private data Commit c1bbed668997268c9edccdc9db1bd1487d9e20b0 upstream. @@ -420438,13 +420438,13 @@ index be15eb6b0586..f0bf3ba7441e 100644 return ret; } -- -2.18.2 +2.18.4 -From 7863a204998710f368033dc9170f42a533c68707 Mon Sep 17 00:00:00 2001 +From 15494fb9cf6d4f414af1c48fa715ef9b5d88a7f0 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:26 -0800 -Subject: [PATCH 0822/1113] udmabuf: separate out creating/destroying +Subject: [PATCH 0822/1148] udmabuf: separate out creating/destroying scatter-table Commit 17a7ce203490459cff14fb1c8f9a15d65fd1c544 upstream. @@ -420515,13 +420515,13 @@ index f0bf3ba7441e..0a610e09ae23 100644 static void release_udmabuf(struct dma_buf *buf) -- -2.18.2 +2.18.4 -From 364d46a502023ea99da617c212e88a05f2be716e Mon Sep 17 00:00:00 2001 +From 09c389c71fabf934c61cee34cbe61b4ff4be483d Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:27 -0800 -Subject: [PATCH 0823/1113] udmabuf: implement begin_cpu_access/end_cpu_access +Subject: [PATCH 0823/1148] udmabuf: implement begin_cpu_access/end_cpu_access hooks Commit 284562e1f34874e267d4f499362c3816f8f6bc3f upstream. @@ -420611,13 +420611,13 @@ index 0a610e09ae23..61b0a2cff874 100644 #define SEALS_WANTED (F_SEAL_SHRINK) -- -2.18.2 +2.18.4 -From a7e7c43341ae7c6de38c473a7ffa2a91cbe91907 Mon Sep 17 00:00:00 2001 +From bbc0dcfc0d5c0727f79dd730ee8b4d9c20946709 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Tue, 17 Dec 2019 15:02:28 -0800 -Subject: [PATCH 0824/1113] udmabuf: fix dma-buf cpu access +Subject: [PATCH 0824/1148] udmabuf: fix dma-buf cpu access Commit 1ffe09590121fbb3786d6c860acdd200f7ab095c upstream. @@ -420677,13 +420677,13 @@ index 61b0a2cff874..acb26c627d27 100644 } -- -2.18.2 +2.18.4 -From 7e0742be751917c1ed57eb448f1b3c716c3a9678 Mon Sep 17 00:00:00 2001 +From 11f6bc3c355e1d61f3966a7e3d3854e6eb68ee48 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Tue, 3 Dec 2019 17:26:37 +0000 -Subject: [PATCH 0825/1113] dma-buf: Add dma-buf heaps framework +Subject: [PATCH 0825/1148] dma-buf: Add dma-buf heaps framework Commit c02a81fba74fe3488ad6b08bfb5a1329005418f8 upstream. This framework allows a unified userspace interface for dma-buf @@ -421221,13 +421221,13 @@ index 000000000000..73e7f66c1cae + +#endif /* _UAPI_LINUX_DMABUF_POOL_H */ -- -2.18.2 +2.18.4 -From 5d1de4522c1ae86d4881c69d5a0df6735366bed4 Mon Sep 17 00:00:00 2001 +From f32d974cd2c14bafaa980edc1ac6a442629dfb48 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:38 +0000 -Subject: [PATCH 0826/1113] dma-buf: heaps: Add heap helpers +Subject: [PATCH 0826/1148] dma-buf: heaps: Add heap helpers Commit 5248eb12fea890a03b4cdc3ef546d6319d4d9b73 upstream. @@ -421630,13 +421630,13 @@ index 000000000000..805d2df88024 +extern const struct dma_buf_ops heap_helper_ops; +#endif /* _HEAP_HELPERS_H */ -- -2.18.2 +2.18.4 -From cb73f962b1880a3e6566b6d4a33a4a2a5b366e57 Mon Sep 17 00:00:00 2001 +From 07b5e9334da2fc2cf0b49de49978e226bbbc705e Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:39 +0000 -Subject: [PATCH 0827/1113] dma-buf: heaps: Add system heap to dmabuf heaps +Subject: [PATCH 0827/1148] dma-buf: heaps: Add system heap to dmabuf heaps Commit efa04fefebbd724ffda7f49e42d057a7217c45b0 upstream. @@ -421844,13 +421844,13 @@ index 000000000000..1aa01e98c595 +module_init(system_heap_create); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 11af671085516a1613a2234774a290a4e9263d18 Mon Sep 17 00:00:00 2001 +From 6c8e815b40074248b42a54841babeac1fb0d743b Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:40 +0000 -Subject: [PATCH 0828/1113] dma-buf: heaps: Add CMA heap to dmabuf heaps +Subject: [PATCH 0828/1148] dma-buf: heaps: Add CMA heap to dmabuf heaps Commit b61614ec318aae0c77ecd2816878d851dd61d9a6 upstream. @@ -422106,13 +422106,13 @@ index 000000000000..626cf7fd033a +MODULE_DESCRIPTION("DMA-BUF CMA Heap"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 5f5f9c804890749af661d840e369c51a7c4c730b Mon Sep 17 00:00:00 2001 +From 6ed4e19b56ea68e31ad7cd296d8a10b823cb5fa8 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:41 +0000 -Subject: [PATCH 0829/1113] kselftests: Add dma-heap test +Subject: [PATCH 0829/1148] kselftests: Add dma-heap test Commit a8779927fd86c91f5400bfcbccfa018a667d8350 upstream. @@ -422569,13 +422569,13 @@ index 000000000000..3e53ad331bdc + return ret; +} -- -2.18.2 +2.18.4 -From 7808bcc768fe2ee46a39c40e9835112f724ada1f Mon Sep 17 00:00:00 2001 +From 62ebd22e907d51380e4e64620a57620e56fd6d4e Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Mon, 16 Dec 2019 08:34:04 -0500 -Subject: [PATCH 0830/1113] dma-buf: heaps: Use _IOCTL_ for userspace IOCTL +Subject: [PATCH 0830/1148] dma-buf: heaps: Use _IOCTL_ for userspace IOCTL identifier Commit b3b4346544b571c96d46be615b9db69a601ce4c8 upstream. @@ -422648,13 +422648,13 @@ index 3e53ad331bdc..cd5e1f602ac9 100644 return ret; *dmabuf_fd = (int)data.fd; -- -2.18.2 +2.18.4 -From 8f0684d46bd99c2ea491c2c10b98aaae72e9c4a8 Mon Sep 17 00:00:00 2001 +From d5342eb7029d3d9ce34363df85e4a7d8af8512a0 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Mon, 16 Dec 2019 08:34:05 -0500 -Subject: [PATCH 0831/1113] dma-buf: heaps: Remove redundant heap identifier +Subject: [PATCH 0831/1148] 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 @@ -422682,13 +422682,13 @@ index 1aa01e98c595..0bf688e3c023 100644 exp_info.priv = NULL; -- -2.18.2 +2.18.4 -From c323ceb90bc6d285d95edc5238e2fc53b6c1ece2 Mon Sep 17 00:00:00 2001 +From 9d28c99f084277922cdde96331d0824fc155a378 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Mon, 16 Dec 2019 16:10:59 +0000 -Subject: [PATCH 0832/1113] dma-buf: fix resource leak on -ENOTTY error return +Subject: [PATCH 0832/1148] dma-buf: fix resource leak on -ENOTTY error return path Commit f9d3b2c600075d1f79efcd5cdb1718c2f554c0f9 upstream. @@ -422722,13 +422722,13 @@ index a24721496114..1886aee46131 100644 if (copy_to_user((void __user *)arg, kdata, out_size) != 0) -- -2.18.2 +2.18.4 -From a9633ffdf3f47b9447bd3e6c9b6e72bff09395f8 Mon Sep 17 00:00:00 2001 +From 959645c3110bf817731ebddeefd8b99cee7ff740 Mon Sep 17 00:00:00 2001 From: zhong jiang Date: Wed, 18 Dec 2019 00:38:22 +0530 -Subject: [PATCH 0833/1113] dma-heap: Make the symbol 'dma_heap_ioctl_cmds' +Subject: [PATCH 0833/1148] dma-heap: Make the symbol 'dma_heap_ioctl_cmds' static Commit 7d411afe8444060454a53b1f9b70ee78b3e75ef1 upstream. @@ -422762,13 +422762,13 @@ index 1886aee46131..afd22c9dbdcf 100644 }; -- -2.18.2 +2.18.4 -From 19e5518fe8259147de52a3cdda4ab6061223a3dd Mon Sep 17 00:00:00 2001 +From 6cebf54b74ab334e4db1da6a600096d5525a14d7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 May 2020 20:44:12 +0100 -Subject: [PATCH 0834/1113] defconfig: Add CMA and system dma-heaps to the +Subject: [PATCH 0834/1148] defconfig: Add CMA and system dma-heaps to the config The CMA dma-heap allocator can be used in place of vcsm-cma @@ -422854,13 +422854,13 @@ index efb1b60cbbb6..1f037a5bd4ef 100644 CONFIG_UIO_PDRV_GENIRQ=m CONFIG_STAGING=y -- -2.18.2 +2.18.4 -From 649cf793a0341932f63d447177dc7bbbf9f5cdda Mon Sep 17 00:00:00 2001 +From 29a071f628ef5c76d7de779874115b24aeb83f94 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 May 2020 17:02:26 +0100 -Subject: [PATCH 0835/1113] ARM: dts: Enable firmware-clocks on all Pis +Subject: [PATCH 0835/1148] ARM: dts: Enable firmware-clocks on all Pis Signed-off-by: Phil Elwell --- @@ -422885,13 +422885,13 @@ index bf90fd585364..d2f5ea1f31f8 100644 watchdog: watchdog@7e100000 { -- -2.18.2 +2.18.4 -From 9307f4158ebdcf19a80ce5fcfe4bf1aecdfc4873 Mon Sep 17 00:00:00 2001 +From 4e89fefee56146fea57f84ea14fc3234599cdb33 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 May 2020 17:17:45 +0100 -Subject: [PATCH 0836/1113] configs: Include the firmware-clocks driver +Subject: [PATCH 0836/1148] configs: Include the firmware-clocks driver Signed-off-by: Phil Elwell --- @@ -422937,13 +422937,13 @@ index 1f037a5bd4ef..f546bc80c8b1 100644 CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set -- -2.18.2 +2.18.4 -From 121ec904574803281357ecb0817ddcf4a94373b5 Mon Sep 17 00:00:00 2001 +From f86620dc9318ae607d384b9a1c2e12f9c11f62e4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 May 2020 17:18:28 +0100 -Subject: [PATCH 0837/1113] configs: Use the upstream cpufreq driver +Subject: [PATCH 0837/1148] configs: Use the upstream cpufreq driver Switch to the upstream cpufreq driver on non-BCM2835 Pis. @@ -422995,13 +422995,13 @@ index f546bc80c8b1..05a9f0ef9508 100644 CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_AES_ARM64_BS=m -- -2.18.2 +2.18.4 -From 9d9187760d91ecb3a373b853f0ea1cc3eb249d90 Mon Sep 17 00:00:00 2001 +From 81c89347c96129091129cfd0b4d80dcf0747172d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 May 2020 18:28:27 +0100 -Subject: [PATCH 0838/1113] media: bcm2835-unicam: Always service interrupts +Subject: [PATCH 0838/1148] 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 @@ -423052,13 +423052,13 @@ index 6fd1b0939a07..aadc2ab6ec91 100644 /* Write value back to clear the interrupts */ reg_write(cfg, UNICAM_STA, sta); -- -2.18.2 +2.18.4 -From 66951428b8550bb99542dbcdc9453210e6c5673a Mon Sep 17 00:00:00 2001 +From f3c7215a53f21f8cfd26e1ba34faa2ec2b66a358 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 May 2020 20:10:15 +0100 -Subject: [PATCH 0839/1113] sc16is7xx: Fix for hardware flow control +Subject: [PATCH 0839/1148] sc16is7xx: Fix for hardware flow control The SC16IS7XX hardware flow control is mishandled by the driver in a number of ways: @@ -423128,13 +423128,13 @@ index fe486498530d..7eda5b1eb1d9 100644 regcache_cache_bypass(s->regmap, false); -- -2.18.2 +2.18.4 -From 4557837d868e7d1c2c46436a2f5d3beeaadae690 Mon Sep 17 00:00:00 2001 +From 3979b7338be701337ddd7ffddd424eef76bb877b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 14 May 2020 14:44:15 +0100 -Subject: [PATCH 0840/1113] drm/vc4: Fix VIC usage with Broadcast RGB +Subject: [PATCH 0840/1148] 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 @@ -423192,13 +423192,13 @@ index 6701cd3a0249..25a1f066e62c 100644 } -- -2.18.2 +2.18.4 -From 89577591fd2a1cd12cd4ae727374391000c2ded3 Mon Sep 17 00:00:00 2001 +From 2308046ce5792f85f9ca738346bd3d10709cb358 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:42:10 +0100 -Subject: [PATCH 0841/1113] staging: vc04_services: mmal-vchiq: Update +Subject: [PATCH 0841/1148] staging: vc04_services: mmal-vchiq: Update parameters list Adds in a couple of new MMAL parameter defines. @@ -423226,13 +423226,13 @@ index 9c752db45565..5b596b5c057f 100644 /** Valid mirror modes */ -- -2.18.2 +2.18.4 -From 04b813b2dd6d7bc6e06914c779a0f691e1eced24 Mon Sep 17 00:00:00 2001 +From 7518cae1c5d1236bb4a7e1947fb3e5a352581a19 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:43:08 +0100 -Subject: [PATCH 0842/1113] staging:vc04_services: bcm2835-codec: Request +Subject: [PATCH 0842/1148] staging:vc04_services: bcm2835-codec: Request headers with I-frame V4L2 wishes to have the codec header bytes in the same buffer as the @@ -423261,13 +423261,13 @@ index 50395795c3db..3c819e251513 100644 if (ctx->q_data[V4L2_M2M_DST].sizeimage < ctx->component->output[0].minimum_buffer.size) -- -2.18.2 +2.18.4 -From bf4e15e0163432ec425fdb263e737ccd6a998386 Mon Sep 17 00:00:00 2001 +From 1942a687486578610085d760be8a370bc83b151a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:47:13 +0100 -Subject: [PATCH 0843/1113] staging:vc04_services: bcm2835-codec: Avoid +Subject: [PATCH 0843/1148] staging:vc04_services: bcm2835-codec: Avoid fragmenting buffers The firmware by default is quite happy to fragment encoded @@ -423299,13 +423299,13 @@ index 3c819e251513..1c7fbba6c9c8 100644 if (ctx->q_data[V4L2_M2M_DST].sizeimage < ctx->component->output[0].minimum_buffer.size) -- -2.18.2 +2.18.4 -From ac5578f4eec218224334730b8ff69d13d870d065 Mon Sep 17 00:00:00 2001 +From 165e7e59b521fa602cb00e092861ff6ce5c713ad Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:48:59 +0100 -Subject: [PATCH 0844/1113] staging:vc04_services: bcm2835-camera: Request +Subject: [PATCH 0844/1148] staging:vc04_services: bcm2835-camera: Request headers with I-frame V4L2 wishes to have the codec header bytes in the same buffer as the @@ -423335,13 +423335,13 @@ index e69ec072c2c7..b7214741fa61 100644 ret = bm2835_mmal_set_all_camera_controls(dev); if (ret < 0) { -- -2.18.2 +2.18.4 -From c5159f8f72093543e88794b588fcbff5b989d285 Mon Sep 17 00:00:00 2001 +From 9a71e6ca1f492736139eeaaf8b6ca6a173a90b3a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 15 May 2020 17:18:20 +0100 -Subject: [PATCH 0845/1113] configs: Restore missing NF_TABLES settings +Subject: [PATCH 0845/1148] configs: Restore missing NF_TABLES settings The arm bcm2711_defconfig and the arm64 bcmrpi3_defconfig have been missing their NF_TABLES settings. Restore them. @@ -423499,13 +423499,13 @@ index 05a9f0ef9508..da5a47b18b19 100644 CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m -- -2.18.2 +2.18.4 -From d5e2a91a44b3002be05f39b0f0c919b37cc3f154 Mon Sep 17 00:00:00 2001 +From 1e82429381603c8f2912f370e77f6a33d89ecd63 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 18 May 2020 09:46:48 +0100 -Subject: [PATCH 0846/1113] overlays: Fix audio parameter of vc4-kms-v3d +Subject: [PATCH 0846/1148] overlays: Fix audio parameter of vc4-kms-v3d The CMA handling change broke the audio parameter - the fragment numbering has changed - so fix it. @@ -423530,13 +423530,13 @@ index b40aa1d8f432..caa64bfb95a7 100644 }; }; -- -2.18.2 +2.18.4 -From 9485d2634d7045ae8b167dcc0b1648d4fd7d686c Mon Sep 17 00:00:00 2001 +From dd9e1e24000f37f7b81fe772fcc1cb013f176fab Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Tue, 19 May 2020 13:56:17 +0200 -Subject: [PATCH 0847/1113] Switch to snd_soc_dai_set_bclk_ratio Replaces +Subject: [PATCH 0847/1148] Switch to snd_soc_dai_set_bclk_ratio Replaces obsolete function snd_soc_dai_set_tdm_slot Signed-off-by: Joerg Schambacher @@ -423574,13 +423574,13 @@ index ffa76014e7df..a7fab4d951b6 100644 } -- -2.18.2 +2.18.4 -From 1ac17b8f3649d9af4a11b2b79dbd23f632a60d2a Mon Sep 17 00:00:00 2001 +From f557e53f6b1a18b5ec908b7fd2b1d3744bd1bc4c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 11:46:47 +0100 -Subject: [PATCH 0848/1113] media: bcm2835-unicam: Retain packing information +Subject: [PATCH 0848/1148] media: bcm2835-unicam: Retain packing information on G_FMT The change to retrieve the pixel format always on g_fmt didn't @@ -423628,13 +423628,13 @@ index aadc2ab6ec91..c4e7d2177193 100644 return 0; -- -2.18.2 +2.18.4 -From 5880570149ccd61878e85addb95a605155dde8bd Mon Sep 17 00:00:00 2001 +From a11074d8de5b936d4ada17f9dee69b771cb04245 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 May 2020 15:47:02 +0100 -Subject: [PATCH 0849/1113] zswap: Uncross module parameter setting functions +Subject: [PATCH 0849/1148] 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 @@ -423671,13 +423671,13 @@ index 46a322316e52..b0fc8d9ffe1f 100644 static int zswap_enabled_param_set(const char *val, -- -2.18.2 +2.18.4 -From 74c07d1c82eb1f4131840f653bc634744aec43b4 Mon Sep 17 00:00:00 2001 +From e8835d3af12ffb84afbb0ac17586b54c15fb2f6f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 15:23:32 +0100 -Subject: [PATCH 0850/1113] zswap: Defer zswap initialisation +Subject: [PATCH 0850/1148] 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 @@ -423792,13 +423792,13 @@ index b0fc8d9ffe1f..a347f8df45c1 100644 hp_fail: -- -2.18.2 +2.18.4 -From 5bcffbe084c15550615e3004b58f1ce73989cf3e Mon Sep 17 00:00:00 2001 +From 3a74a545ad8dc9da09ec3c54a81ea44132c7162f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 15:25:06 +0100 -Subject: [PATCH 0851/1113] configs: Add ZSWAP=y, ZBUD=m, Z3FOLD=m +Subject: [PATCH 0851/1148] configs: Add ZSWAP=y, ZBUD=m, Z3FOLD=m Signed-off-by: Phil Elwell --- @@ -423880,13 +423880,13 @@ index da5a47b18b19..4b232432e240 100644 CONFIG_PGTABLE_MAPPING=y CONFIG_NET=y -- -2.18.2 +2.18.4 -From 4392bb509d6caaa28be9e5eb49f00df1ab23a3d6 Mon Sep 17 00:00:00 2001 +From 44b5e87dbfa6677f8400c812f9d2167360add216 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 14:54:28 +0100 -Subject: [PATCH 0852/1113] drm/vc4: Adopt the dma configuration from the HVS +Subject: [PATCH 0852/1148] 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 @@ -423940,13 +423940,13 @@ index f45cad62214a..4a7004729a8a 100644 if (IS_ERR(drm)) return PTR_ERR(drm); -- -2.18.2 +2.18.4 -From 67d7b7fabf90be6ae0b772d6bd8071dd938e6ad9 Mon Sep 17 00:00:00 2001 +From 6e8811e43f4b7f550a0e3a827af4a378f3bd8d97 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 16:20:30 +0100 -Subject: [PATCH 0853/1113] drm/vc4: Add FKMS as an acceptable node for dma +Subject: [PATCH 0853/1148] drm/vc4: Add FKMS as an acceptable node for dma ranges. Under FKMS, the firmware (via FKMS) also requires the VideoCore cache @@ -423973,13 +423973,13 @@ index 4a7004729a8a..cbab26d18342 100644 { .compatible = "brcm,cygnus-v3d" }, { .compatible = "brcm,vc4-v3d" }, -- -2.18.2 +2.18.4 -From 299f94eea80323da4a9ce0cf481c946b82ea8d3f Mon Sep 17 00:00:00 2001 +From 186e474682a1f7bcb9ca2cec5ab0c032781dcf9e Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 16:56:33 +0100 -Subject: [PATCH 0854/1113] media: i2c: imx477: Return correct result on sensor +Subject: [PATCH 0854/1148] media: i2c: imx477: Return correct result on sensor id verification The test should return -EIO if the register read id does not match @@ -424004,13 +424004,13 @@ index bd0e2c291a32..e42a8633087d 100644 return 0; -- -2.18.2 +2.18.4 -From 9295042c31c87f9fa2d5c75b21e5ce5be00f3f8d Mon Sep 17 00:00:00 2001 +From 6164dab0f021cd2b5265eb6819bf279bfb9ea34b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 May 2020 16:36:33 +0100 -Subject: [PATCH 0855/1113] staging: vchiq_arm: Clean up 40-bit DMA support +Subject: [PATCH 0855/1148] 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- @@ -424166,13 +424166,13 @@ index d01c2d424310..d55f038637fc 100644 } -- -2.18.2 +2.18.4 -From e7985cf596d994a0c2d0935be19d8ef8c3c6f67b Mon Sep 17 00:00:00 2001 +From 7b89aa9c97d23596ee3af1b2a559612085b15301 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 May 2020 16:36:57 +0100 -Subject: [PATCH 0856/1113] ARM: dts: Update for new VCHIQ BCM2711 DMA support +Subject: [PATCH 0856/1148] 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, @@ -424239,13 +424239,13 @@ index 2c55c78bd7cb..46bcfd586f17 100644 interrupts = ; }; -- -2.18.2 +2.18.4 -From 69e83ec3ebe5dde33660f788a456d64697e65aeb Mon Sep 17 00:00:00 2001 +From 826391f236d1f11e81a8b9d36a9cfdc2c84449a9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 25 May 2020 21:52:40 +0100 -Subject: [PATCH 0857/1113] Revert "zswap: Uncross module parameter setting +Subject: [PATCH 0857/1148] Revert "zswap: Uncross module parameter setting functions" This reverts commit e5e8a2214dff0c43580afc5dc22d496f667c3bbf. @@ -424274,13 +424274,13 @@ index a347f8df45c1..232f4565e795 100644 static int zswap_enabled_param_set(const char *val, -- -2.18.2 +2.18.4 -From a11df54ab960cf9fe8731c290ea2d05fd367389c Mon Sep 17 00:00:00 2001 +From befa49fefe9b6f743f0831facbb2fdb2078f382c Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 28 May 2020 11:09:48 +0100 -Subject: [PATCH 0858/1113] media: bcm2835-unicam: change minimum number of +Subject: [PATCH 0858/1148] 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 @@ -424308,13 +424308,13 @@ index c4e7d2177193..47b2d3a03fbf 100644 ret = vb2_queue_init(q); -- -2.18.2 +2.18.4 -From cff2ec5fa4e94c95141f8ab36ecb63d2ded8f7ca Mon Sep 17 00:00:00 2001 +From 162e03be00d718ce5e5a8a118261aba3291d6528 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:15 +0100 -Subject: [PATCH 0859/1113] dt-bindings: Add Broadcom AVS RO thermal +Subject: [PATCH 0859/1148] dt-bindings: Add Broadcom AVS RO thermal Commit ee31ff373da6602e7a4e60fe11322b41ac38eb22 upstream. @@ -424385,13 +424385,13 @@ index 000000000000..98e7b57bfa13 + }; +... -- -2.18.2 +2.18.4 -From 446f4b5daab9366c6524d0c4ff07b9067ec248e1 Mon Sep 17 00:00:00 2001 +From d0f6274517ab4a59fc2372c9a6b2b6eed7d5d077 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:16 +0100 -Subject: [PATCH 0860/1113] thermal: Add BCM2711 thermal driver +Subject: [PATCH 0860/1148] thermal: Add BCM2711 thermal driver Commit 59b781352dc4cb9ae27a8ddae0cda979d29d8af7 upstream. @@ -424569,13 +424569,13 @@ index 000000000000..67c2a737bc9d +MODULE_AUTHOR("Stefan Wahren"); +MODULE_DESCRIPTION("Broadcom AVS RO thermal sensor driver"); -- -2.18.2 +2.18.4 -From 41957516b3bd938c979326131cd21029b14493f4 Mon Sep 17 00:00:00 2001 +From cc2af0c97fe9fd6f66b207ba302f5bf2cac85626 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:17 +0100 -Subject: [PATCH 0861/1113] ARM: dts: bcm2711: Enable thermal +Subject: [PATCH 0861/1148] ARM: dts: bcm2711: Enable thermal Commit a1d6989bf12b01cd9198e2c31a96678ac9c47415 upstream. @@ -424624,13 +424624,13 @@ index 96ef133391d1..20114a723cf9 100644 &dsi0 { -- -2.18.2 +2.18.4 -From e5d4fbe43ad6205d26538b52558ae1990b2d4239 Mon Sep 17 00:00:00 2001 +From 17e4791c3424f02a8da95e000ba365b6f72b1b0e Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:18 +0100 -Subject: [PATCH 0862/1113] ARM: configs: Build BCM2711 thermal as module +Subject: [PATCH 0862/1148] ARM: configs: Build BCM2711 thermal as module Commit 1a90e73248c4d0add6583bd88bb5e082c3e090bc upstream. @@ -424673,13 +424673,13 @@ index c9a867ac32d4..4486777c7f86 100644 CONFIG_BRCMSTB_THERMAL=m CONFIG_EXYNOS_THERMAL=y -- -2.18.2 +2.18.4 -From 61bb64aaf0b4507c269a241f499538bc2024bc94 Mon Sep 17 00:00:00 2001 +From 3d45cf55246eda6a719c0e3ce7ed8dfc8b5649fb Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2020 17:24:24 +0800 -Subject: [PATCH 0863/1113] Revert "thermal: brcmstb_thermal: Correct SoC name" +Subject: [PATCH 0863/1148] Revert "thermal: brcmstb_thermal: Correct SoC name" This reverts commit 6642a4f0769be5732fd372a5637fc1b01d62f93a. @@ -424724,13 +424724,13 @@ index 08f71fec5152..7a7c6ad7b8a0 100644 }; MODULE_DEVICE_TABLE(of, brcmstb_thermal_id_table); -- -2.18.2 +2.18.4 -From 74c7c677dcaf42127a536acd485f77f079d57130 Mon Sep 17 00:00:00 2001 +From d0a84cd85b84300672fcaeabc851bd4539f919a9 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2020 17:24:28 +0800 -Subject: [PATCH 0864/1113] Revert "thermal: brcmstb_thermal: Add BCM2838 +Subject: [PATCH 0864/1148] Revert "thermal: brcmstb_thermal: Add BCM2838 support" This reverts commit 9d62448adc918a94fba091d475d0e6f1648c36f4. @@ -424884,13 +424884,13 @@ index 7a7c6ad7b8a0..680f1a070606 100644 ret = PTR_ERR(thermal); dev_err(&pdev->dev, "could not register sensor: %d\n", ret); -- -2.18.2 +2.18.4 -From fe733c8805992012ec6deeaef97de2b9fa945ae6 Mon Sep 17 00:00:00 2001 +From d7ca82fd2059f43f056512ce74798acd49bc99f9 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2020 17:39:30 +0800 -Subject: [PATCH 0865/1113] ARM: dts: bcm2711-rpi: Remove downstream thermal +Subject: [PATCH 0865/1148] ARM: dts: bcm2711-rpi: Remove downstream thermal sensor node Signed-off-by: Chen-Yu Tsai @@ -424931,13 +424931,13 @@ index 46bcfd586f17..05e51a05bf56 100644 compatible = "brcm,bcm2711-genet-v5", "brcm,genet-v5"; }; -- -2.18.2 +2.18.4 -From d171e3e33d5d3ef39061df21b5a91e18766a2667 Mon Sep 17 00:00:00 2001 +From 9f874adb69e902b58ffcbe7b065697e5482854bf Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Fri, 15 May 2020 15:38:12 +0800 -Subject: [PATCH 0866/1113] configs: Switch to upstream thermal sensor for RPi +Subject: [PATCH 0866/1148] configs: Switch to upstream thermal sensor for RPi 4 - BCM2711_THERMAL Signed-off-by: Chen-Yu Tsai @@ -424987,13 +424987,13 @@ index 05d721c25d2d..09d3180c9fd9 100644 CONFIG_MFD_ARIZONA_SPI=m CONFIG_MFD_WM5102=y -- -2.18.2 +2.18.4 -From 6b3b052c125a28279db93e1606a2d8b4878e0b39 Mon Sep 17 00:00:00 2001 +From f6a94a28791abe0e7b6dde13e04f627d91821c62 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Fri, 15 May 2020 15:56:14 +0800 -Subject: [PATCH 0867/1113] configs: Build HWMON core into kernel +Subject: [PATCH 0867/1148] 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. @@ -425068,13 +425068,13 @@ index 4b232432e240..585a975caf2a 100644 CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SHTC1=m -- -2.18.2 +2.18.4 -From 8c52d0b89627678fd0736099ac4a6cfcaca5abbc Mon Sep 17 00:00:00 2001 +From db055214ddaacb9cc26bceed5438bf454d15584b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 May 2020 09:46:12 +0100 -Subject: [PATCH 0868/1113] brcmfmac: BCM43436 needs dedicated firmware +Subject: [PATCH 0868/1148] brcmfmac: BCM43436 needs dedicated firmware Signed-off-by: Phil Elwell --- @@ -425104,13 +425104,13 @@ index 370301ac248b..ee540d5fd96b 100644 BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455), BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354), -- -2.18.2 +2.18.4 -From 66102a91be32a9e534c77ca0f0c60e78499fbda6 Mon Sep 17 00:00:00 2001 +From b24b1958e9d020e359021df3f296d768b3f3fa26 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 May 2020 14:41:13 +0100 -Subject: [PATCH 0869/1113] overlays: i2c-rtc: Fix trickle-resistor-ohms param +Subject: [PATCH 0869/1148] 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. @@ -425136,13 +425136,13 @@ index 5df390b52a7b..24c86974b0db 100644 backup-switchover-mode = <&rv3028>,"backup-switchover-mode:0"; wakeup-source = <&ds1339>,"wakeup-source?", -- -2.18.2 +2.18.4 -From 61c4282fe23fbe8a4e956551b8cf02a531bc729b Mon Sep 17 00:00:00 2001 +From b21ab1c46f8582cc72d74ccea2ef555fbd555885 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 0870/1113] overlays: gpio-shutdown: Add information for SysV +Subject: [PATCH 0870/1148] overlays: gpio-shutdown: Add information for SysV init / inittab KeyboardSignal and kb::kbrequest can be used to call /sbin/shutdown @@ -425193,13 +425193,13 @@ index 0a9c9ec6cc8d..2afd499b2808 100644 can be powered up again by driving GPIO3 low. The default configuration uses GPIO3 with a pullup, so if you connect a -- -2.18.2 +2.18.4 -From 80dcaee0af81cb08e27d0e9675f1f4e102108638 Mon Sep 17 00:00:00 2001 +From 822baff5f093c1ae9df7082822306b3f352c7736 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 0871/1113] overlays: gpio-shutdown: Add information for +Subject: [PATCH 0871/1148] 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. @@ -425263,13 +425263,13 @@ index db07ba67781d..0a27595143ec 100644 // Allow setting the active_low flag. 0 = active high, 1 = active low -- -2.18.2 +2.18.4 -From 8475b78dd82d55d186dbbbf455d5d6b5b6ef450f Mon Sep 17 00:00:00 2001 +From abc61ea47b114a3c2dc3e473e99b78494415a8af Mon Sep 17 00:00:00 2001 From: bjorn Date: Thu, 7 May 2020 05:11:43 +0200 -Subject: [PATCH 0872/1113] overlays: Add spi0 overlay to support sc16is752 +Subject: [PATCH 0872/1148] overlays: Add spi0 overlay to support sc16is752 Signed-off-by: Bjorn --- @@ -425361,13 +425361,13 @@ index 000000000000..ccce7ad599bc + }; +}; -- -2.18.2 +2.18.4 -From 7278e6b79758a15c949ac3a1712d920b41cde4f2 Mon Sep 17 00:00:00 2001 +From 1a4b72ab0f781026ddc24afb138d2f1be5410fb6 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 24 Nov 2019 16:40:48 -0600 -Subject: [PATCH 0873/1113] net: rtl8192cu: fix gcc misleading whitespace +Subject: [PATCH 0873/1148] net: rtl8192cu: fix gcc misleading whitespace warning This fixes a gcc warning about misleading whitespace. @@ -425410,13 +425410,13 @@ index 8fa8ed51b721..bdd9c73cba3f 100755 construct_ctr_preload( ctr_preload, -- -2.18.2 +2.18.4 -From f9c40ee0bc1eb5604100707f24560f92ab831ba3 Mon Sep 17 00:00:00 2001 +From ad133bb720720761b0aa9b5a3bb0dda75ca02337 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 May 2020 16:55:12 +0100 -Subject: [PATCH 0874/1113] overlays: i2c-rtc-gpio: Fix trickle-resistor-ohms +Subject: [PATCH 0874/1148] overlays: i2c-rtc-gpio: Fix trickle-resistor-ohms param The abx80x implementation of the trickle-resistor-ohms parameter is @@ -425443,13 +425443,13 @@ index 44df77459520..125bd77fff0a 100644 backup-switchover-mode = <&rv3028>,"backup-switchover-mode:0"; wakeup-source = <&ds1339>,"wakeup-source?", -- -2.18.2 +2.18.4 -From 5bae88c353a2f1398ab04d24cd0cac66f6c84232 Mon Sep 17 00:00:00 2001 +From 1324722615f69880e2deab0d6cca01a4aa4340c5 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Fri, 29 May 2020 14:36:56 +0100 -Subject: [PATCH 0875/1113] media: bcm2835-isp: fix bytes per line calculations +Subject: [PATCH 0875/1148] media: bcm2835-isp: fix bytes per line calculations for some image formats The bytes per line numbers calculated by get_bytesperline was not @@ -425531,13 +425531,13 @@ index af3bde152bb2..40ca0f6e9c97 100644 .mmal_fmt = MMAL_ENCODING_BGRA, .size_multiplier_x2 = 2, -- -2.18.2 +2.18.4 -From 151b3137d424546b35afbef9d37eeacc8f3f82d1 Mon Sep 17 00:00:00 2001 +From 9c9bb39096774d7338d22a6a68d272c023bfe76b Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 1 Jun 2020 07:02:00 -0400 -Subject: [PATCH 0876/1113] Add Micro Crystal RV-1805 to i2c-rtc overlays +Subject: [PATCH 0876/1148] 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 @@ -425708,13 +425708,13 @@ index 24c86974b0db..df59d93cd759 100644 wakeup-source = <&ds1339>,"wakeup-source?", <&ds3231>,"wakeup-source?", -- -2.18.2 +2.18.4 -From b3487f83344c3aae8d232b32851af90c2949ffe7 Mon Sep 17 00:00:00 2001 +From 2feb2c9261f6fc168cf057cd9f24f77fc22cdba3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 2 Jun 2020 10:06:05 +0100 -Subject: [PATCH 0877/1113] configs: Add SND_SOC_MAX98357A=m +Subject: [PATCH 0877/1148] configs: Add SND_SOC_MAX98357A=m Enable the MAX98357A driver. @@ -425798,13 +425798,13 @@ index 585a975caf2a..c82e163a095c 100644 CONFIG_SND_SIMPLE_CARD=m CONFIG_HIDRAW=y -- -2.18.2 +2.18.4 -From be11fdd8c861cb4c366e550e33a608b875ebc1ba Mon Sep 17 00:00:00 2001 +From 9a3f51fa6364d71f097f91ef7c9cf8bd5fb5e0de Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 2 Jun 2020 19:31:49 +0100 -Subject: [PATCH 0878/1113] vc4: Set driver_name for card +Subject: [PATCH 0878/1148] vc4: Set driver_name for card Allows use of the same alsa conf file for hdmi1 @@ -425814,7 +425814,7 @@ Signed-off-by: Dom Cobley 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 2d608cf9dff9..036a98ea0e8a 100644 +index 093f424ad5b4..4ba7add2737f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1216,6 +1216,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) @@ -425823,16 +425823,16 @@ index 2d608cf9dff9..036a98ea0e8a 100644 card->name = vc4_hdmi->variant->id ? "vc4-hdmi1" : "vc4-hdmi"; + card->driver_name = "vc4-hdmi"; card->dev = dev; + card->owner = THIS_MODULE; - /* -- -2.18.2 +2.18.4 -From 4cd930e04f83faa3d626bfbfd809994f1deae107 Mon Sep 17 00:00:00 2001 +From f56f9b80ca44040597f0c1e12f254046e78b15ab Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Jun 2020 17:23:36 +0100 -Subject: [PATCH 0879/1113] staging: vchiq_arm: Use g_dma_dev for dma_unmap_sg +Subject: [PATCH 0879/1148] 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 @@ -425859,13 +425859,13 @@ index d6a6ca9e06ec..b396fed96f3f 100644 pagelistinfo->scatterlist_mapped = 0; -- -2.18.2 +2.18.4 -From ef2b949f9472475f83454ac59a40bd86f6fe2b71 Mon Sep 17 00:00:00 2001 +From b7333588427a9705b054d7a0a0a81c54b3d64d0b Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 3 Jun 2020 12:20:19 +0100 -Subject: [PATCH 0880/1113] vc4: cec: Restore cec physical address on reconnect +Subject: [PATCH 0880/1148] 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 @@ -425879,7 +425879,7 @@ Signed-off-by: Dom Cobley 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 036a98ea0e8a..e9cacbaedd00 100644 +index 4ba7add2737f..5aa5236e576d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -113,20 +113,29 @@ static enum drm_connector_status @@ -425921,13 +425921,13 @@ index 036a98ea0e8a..e9cacbaedd00 100644 return connector_status_disconnected; } -- -2.18.2 +2.18.4 -From 4e1976fcecaa6c753259cdd0707c72c896c835bf Mon Sep 17 00:00:00 2001 +From 58e675207f998723d2da6e014960d614842460de Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Fri, 5 Jun 2020 09:22:49 +0000 -Subject: [PATCH 0881/1113] snd_bcm2835: disable HDMI audio when vc4 is used +Subject: [PATCH 0881/1148] snd_bcm2835: disable HDMI audio when vc4 is used (#3640) Things don't work too well when both the vc4 driver and the firmware @@ -426025,13 +426025,13 @@ index 2f465dba54bf..a53c39d1bbaa 100644 enable_headphones = true; } else { -- -2.18.2 +2.18.4 -From 0d2c27a17db47af10c542e97bc8557f4c2493342 Mon Sep 17 00:00:00 2001 +From 23eab954a3ce1889bbaa26c97f640b60df038f43 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jun 2020 16:06:59 +0100 -Subject: [PATCH 0882/1113] Revert "overlays: gpio-keys: Avoid open-drain +Subject: [PATCH 0882/1148] Revert "overlays: gpio-keys: Avoid open-drain warnings" This reverts commit 907e08e6e70dd557a1f5cd03ef28492ffebffb08. @@ -426053,13 +426053,13 @@ index def139db8bcb..39e7bc5fa9d8 100644 #size-cells = <0>; }; -- -2.18.2 +2.18.4 -From 03ea2c3bdfa4bf9267d020f3cfab4fbc6bdc2649 Mon Sep 17 00:00:00 2001 +From 2a4e71e0eea64d560e82d157db335cd8e08bbfd5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jun 2020 16:07:07 +0100 -Subject: [PATCH 0883/1113] overlays: i2c-gpio: Avoid open-drain warnings +Subject: [PATCH 0883/1148] 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. @@ -426156,13 +426156,13 @@ index 23813369093a..227e3c0fa1cd 100644 i2c-gpio,delay-us = <2>; /* ~100 kHz */ #address-cells = <1>; -- -2.18.2 +2.18.4 -From 5c730a7db721c88932ce6c086f9afd7368752d7a Mon Sep 17 00:00:00 2001 +From a8c2bd72459813f2c7dbdadc3f4c1f0dc293b6c1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jun 2020 16:18:52 +0100 -Subject: [PATCH 0884/1113] overlays: Update upstream overlays after +Subject: [PATCH 0884/1148] overlays: Update upstream overlays after vc4-kms-v3d change Signed-off-by: Phil Elwell @@ -426206,13 +426206,13 @@ index 428aa5dcc38f..30130f09fbc6 100644 #address-cells = <1>; #size-cells = <1>; -- -2.18.2 +2.18.4 -From 82eecf0bff651527fe4d903cb89c15be1a39e15f Mon Sep 17 00:00:00 2001 +From 96714ee238f47238c5bd964b464372ccdac855b3 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:35:35 +0200 -Subject: [PATCH 0885/1113] w1_therm: adding code comments and code reordering +Subject: [PATCH 0885/1148] w1_therm: adding code comments and code reordering commit 92b8d2724464bc1d2e735a84c0da5741dce33485 upstream. @@ -426792,13 +426792,13 @@ index e028e0092799..1234916daaa8 100644 if (w1_reset_bus(sl->master)) goto error; -- -2.18.2 +2.18.4 -From c77f3c1757f9615a17e82ebd20252412563fdc9c Mon Sep 17 00:00:00 2001 +From 6dcc0ed5004da65a36425e6d271f56d85460f4da Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:36:10 +0200 -Subject: [PATCH 0886/1113] w1_therm: fix reset_select_slave during discovery +Subject: [PATCH 0886/1148] w1_therm: fix reset_select_slave during discovery commit c8ad65f6fbfdcb9b620674ef456020eef2bfeb36 upstream. @@ -426947,13 +426947,13 @@ index 1234916daaa8..aa5678369c0b 100644 /* 10ms strong pullup/delay after the copy command */ -- -2.18.2 +2.18.4 -From 9634d844a8fcc9c0ee6353716c5bf9e2c7537ace Mon Sep 17 00:00:00 2001 +From 85b941140df4239ccb73e249e3c5707dcd8c3eda Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:36:50 +0200 -Subject: [PATCH 0887/1113] w1_therm: adding ext_power sysfs entry +Subject: [PATCH 0887/1148] w1_therm: adding ext_power sysfs entry commit b7bb6ca17a90f47c2fe2848531b5bbaf27a65ba7 upstream. @@ -427249,13 +427249,13 @@ index aa5678369c0b..932a0738b52a 100644 static int w1_read_temp(struct device *device, u32 attr, int channel, long *val) -- -2.18.2 +2.18.4 -From 93d0713f0b7cb52b9d716355b6ab770dfaa55f6e Mon Sep 17 00:00:00 2001 +From f751d72636242bab10b622002a720ac37ab1c354 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:37:08 +0200 -Subject: [PATCH 0888/1113] w1_therm: adding resolution sysfs entry +Subject: [PATCH 0888/1148] w1_therm: adding resolution sysfs entry commit 308bdb94de0c1abe7eac5193f58638b8aeaddf4b upstream. @@ -427970,13 +427970,13 @@ index 932a0738b52a..7ab8a141ce6e 100644 static int w1_read_temp(struct device *device, u32 attr, int channel, long *val) -- -2.18.2 +2.18.4 -From c6bd6bf08987d8fd84a4e677b864195c4a0cb9d0 Mon Sep 17 00:00:00 2001 +From 1b50f4cfebe5a225281afecb1c65b531993fca68 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:37:25 +0200 -Subject: [PATCH 0889/1113] w1_therm: adding eeprom sysfs entry +Subject: [PATCH 0889/1148] w1_therm: adding eeprom sysfs entry commit 45d457a4cf24455eefd076a01a3d86414fc2ff1e upstream. @@ -428350,13 +428350,13 @@ index 7ab8a141ce6e..1ba07b0833fa 100644 static int w1_read_temp(struct device *device, u32 attr, int channel, long *val) -- -2.18.2 +2.18.4 -From fbef19a433b74778c89d3cfe16696c069d5c9ba9 Mon Sep 17 00:00:00 2001 +From 056bbbf9216c40bb9d2870be2c811eb3dd930f11 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:37:42 +0200 -Subject: [PATCH 0890/1113] w1_therm: optimizing temperature read timings +Subject: [PATCH 0890/1148] w1_therm: optimizing temperature read timings commit 67b392f7b8edfa6f427fecd98722acab34c1c99f upstream. @@ -428886,13 +428886,13 @@ index 1ba07b0833fa..5a81ce2a4e74 100644 break; default: -- -2.18.2 +2.18.4 -From cc142e332f9ca6447153168b9162dd0763251ddf Mon Sep 17 00:00:00 2001 +From 2a07771efcb9e892a6a17ffc885125e4e8dee48f Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:38:01 +0200 -Subject: [PATCH 0891/1113] w1_therm: adding alarm sysfs entry +Subject: [PATCH 0891/1148] w1_therm: adding alarm sysfs entry commit e2c94d6f572079511945e64537eb1218643f2e68 upstream. @@ -429213,13 +429213,13 @@ index 5a81ce2a4e74..825536196e61 100644 static int w1_read_temp(struct device *device, u32 attr, int channel, long *val) -- -2.18.2 +2.18.4 -From a2aef235f3ffa3068fb45ad4de69f0a0f78de989 Mon Sep 17 00:00:00 2001 +From 8c570fe6399c6fbd69c9d156ae01072476c75648 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:38:20 +0200 -Subject: [PATCH 0892/1113] w1_therm: adding bulk read support to trigger +Subject: [PATCH 0892/1148] w1_therm: adding bulk read support to trigger multiple conversion on bus commit 57c76221d5af648c8355a55c09b050c5d8d38189 upstream. @@ -429810,13 +429810,13 @@ index 825536196e61..cc4b88056b33 100644 static int w1_read_temp(struct device *device, u32 attr, int channel, long *val) -- -2.18.2 +2.18.4 -From 7fdf8eb0f13b8d1fcd743064c4acb8bbf6c68449 Mon Sep 17 00:00:00 2001 +From d39cdf8c6120a77bad493170c4bf688a6e8c4b23 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 20 May 2020 15:00:19 +0300 -Subject: [PATCH 0893/1113] w1_therm: Free the correct variable +Subject: [PATCH 0893/1148] w1_therm: Free the correct variable commit e420637b81f78d0fbacf539bdb1b341eba602aea upstream. @@ -429857,13 +429857,13 @@ index cc4b88056b33..a6c85e486671 100644 return size; } -- -2.18.2 +2.18.4 -From f08dd4b3b575ce78215b6c234554d265e515c633 Mon Sep 17 00:00:00 2001 +From 1feb0f8130dfb5921f4ab138110b76d515750fbd Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Tue, 19 May 2020 16:45:53 +0100 -Subject: [PATCH 0894/1113] w1_therm: remove redundant assignments to variable +Subject: [PATCH 0894/1148] w1_therm: remove redundant assignments to variable ret commit f37d13d52c0560bd2bac40b22466af538e61a5ce upstream. @@ -429921,13 +429921,13 @@ index a6c85e486671..c1b4eda16719 100644 s8 tl, th, tt; /* 1 byte per value + temp ring order */ char *p_args, *orig; -- -2.18.2 +2.18.4 -From e1c1c59d2ea5b08adb6831faf06fcf1ab38b4cfe Mon Sep 17 00:00:00 2001 +From 26c93b977bf341fe9ef021dce344e25ad0fa24e0 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 May 2020 19:20:20 +0200 -Subject: [PATCH 0895/1113] PCI: brcmstb: Assert fundamental reset on +Subject: [PATCH 0895/1148] PCI: brcmstb: Assert fundamental reset on initialization commit 22e21e51ce755399fd42055a3f668ee4af370881 upstream. @@ -429960,13 +429960,13 @@ index 3a10e678c7f4..9e452c366b26 100644 usleep_range(100, 200); -- -2.18.2 +2.18.4 -From 1d00b1e44ccdf913d085605ca3b54c0dd4a72159 Mon Sep 17 00:00:00 2001 +From 7286ba3aa7be5bced6d757ac9a8de9e90019c490 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 10 Jun 2020 16:28:56 +0200 -Subject: [PATCH 0896/1113] clk: rpi: Adjust DT binding to match upstream +Subject: [PATCH 0896/1148] clk: rpi: Adjust DT binding to match upstream Signed-off-by: Maxime Ripard --- @@ -430175,13 +430175,13 @@ index eb1844148af9..c4929416b6d5 100644 return -EPROBE_DEFER; -- -2.18.2 +2.18.4 -From 9653aa1d40adcbf5ab7ded0edaf3ffe544c2a5f3 Mon Sep 17 00:00:00 2001 +From 691133ebf75ba54a0d67ff4ab6099d0cd5059404 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 26 May 2020 14:23:04 +0200 -Subject: [PATCH 0897/1113] clk: bcm: rpi: Add an enum for the firmware clocks +Subject: [PATCH 0897/1148] 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. @@ -430261,13 +430261,13 @@ index c4929416b6d5..c21d8c7de439 100644 if (!clk_data) return -ENOMEM; -- -2.18.2 +2.18.4 -From 6a2ef90033311d5a5ea20647baf2503e9df57358 Mon Sep 17 00:00:00 2001 +From 8fd46b8a13c1fa2720a693dc00dd8710336f1206 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 27 May 2020 11:13:52 +0200 -Subject: [PATCH 0898/1113] clk: bcm: rpi: Use CCF boundaries instead of +Subject: [PATCH 0898/1148] clk: bcm: rpi: Use CCF boundaries instead of rolling our own The raspberrypi firmware clock driver has a min_rate / max_rate clamping by @@ -430401,13 +430401,13 @@ index c21d8c7de439..70574c937b68 100644 } -- -2.18.2 +2.18.4 -From f6972cfdb2663526c726d099788211216e9d078d Mon Sep 17 00:00:00 2001 +From d2a0716444ed7f4a991311456209cd7939ecfb07 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 26 May 2020 14:30:31 +0200 -Subject: [PATCH 0899/1113] clk: bcm: rpi: Give firmware clocks a name +Subject: [PATCH 0899/1148] 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 @@ -430459,13 +430459,13 @@ index 70574c937b68..4f7fe01c1b3b 100644 init.flags = CLK_GET_RATE_NOCACHE; -- -2.18.2 +2.18.4 -From 1965f02df8ad61bf083138f6585f1a83dc34afe7 Mon Sep 17 00:00:00 2001 +From 59ed6b8290ca1d3c8b0a438ec74ba8f1e96d1c01 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 26 May 2020 15:27:35 +0200 -Subject: [PATCH 0900/1113] clk: bcm: rpi: Remove the quirks for the CPU clock +Subject: [PATCH 0900/1148] 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, @@ -430672,13 +430672,13 @@ index 4f7fe01c1b3b..c87e3ee58e4b 100644 } -- -2.18.2 +2.18.4 -From 1df8306c80e48c5b10fe60f6becf3f685ba279c6 Mon Sep 17 00:00:00 2001 +From 6451416de972370df10b4c1c0d76441cabbe0a51 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 10 Jun 2020 16:18:17 +0200 -Subject: [PATCH 0901/1113] clk: rpi: Only register a few firmware clocks +Subject: [PATCH 0901/1148] clk: rpi: Only register a few firmware clocks Signed-off-by: Maxime Ripard --- @@ -430722,13 +430722,13 @@ index c87e3ee58e4b..642622fb77ea 100644 return 0; -- -2.18.2 +2.18.4 -From 0a2db1830bc53072f2ae642d53abc500c93bcf1c Mon Sep 17 00:00:00 2001 +From d482c36cf6c52111140bbb65cf001d1559933c95 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 10 Jun 2020 16:29:08 +0200 -Subject: [PATCH 0902/1113] clk: rpi: Fix compatible indentation +Subject: [PATCH 0902/1148] clk: rpi: Fix compatible indentation Signed-off-by: Maxime Ripard --- @@ -430751,13 +430751,13 @@ index 642622fb77ea..cb87980b468e 100644 MODULE_DEVICE_TABLE(of, raspberrypi_clk_match); -- -2.18.2 +2.18.4 -From fbf1f015d50d46c21c7f236e42efc431cf702e66 Mon Sep 17 00:00:00 2001 +From 8a6470dcf22d507d865d2d2a6284a866d64758b4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 16:34:00 +0100 -Subject: [PATCH 0903/1113] SQUASH: dts: Fix firmware clocks support +Subject: [PATCH 0903/1148] 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 @@ -430953,13 +430953,13 @@ index 73e1290616e4..925cb37c22f0 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; -- -2.18.2 +2.18.4 -From 188002e93b0f49cb0e18486f028e4c17b3da1419 Mon Sep 17 00:00:00 2001 +From c94e4b67403bdea6374961c450b6baf128ca151f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 2 Jun 2020 17:19:51 +0100 -Subject: [PATCH 0904/1113] ARM: dts: Add bcm2711-rpi-cm4.dts +Subject: [PATCH 0904/1148] ARM: dts: Add bcm2711-rpi-cm4.dts Add initial DTS file for Compute Module 4. @@ -431595,13 +431595,13 @@ index 3c38fbe71886..073d7dadcc95 100644 interface (default "off") -- -2.18.2 +2.18.4 -From 78b60faae397b1f85f9c74524df2e64680e87ccd Mon Sep 17 00:00:00 2001 +From e038b8b6bf4a6a364564d438faeebf691d589756 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 09:57:03 +0100 -Subject: [PATCH 0905/1113] PCI: brcmstb: Add DT property to control L1SS +Subject: [PATCH 0905/1148] 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. @@ -431680,13 +431680,13 @@ index 9e452c366b26..1e0a94778856 100644 ret = pci_parse_request_of_pci_ranges(pcie->dev, &bridge->windows, &bridge->dma_ranges, NULL); -- -2.18.2 +2.18.4 -From 6b5481f0e26cf81c62abe1d9bc9551ebd73fa149 Mon Sep 17 00:00:00 2001 +From 6f174d12911744f9f2e562893063022c72496679 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 11:22:38 +0100 -Subject: [PATCH 0906/1113] ARM: dts: Set brcm,enable-l1ss for CM4 +Subject: [PATCH 0906/1148] 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 @@ -431713,13 +431713,13 @@ index f616d3f23f14..2ea54b92fbca 100644 pinctrl-names = "default"; pinctrl-0 = <&sdio_pins>; -- -2.18.2 +2.18.4 -From f4bac399f3ece378e79aea2066ff73d48c0adbb0 Mon Sep 17 00:00:00 2001 +From 99a4486a573af5c9c91b07ef5b99ca3ca0209e3b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 16 Jun 2020 10:23:03 +0100 -Subject: [PATCH 0907/1113] Revert "SQUASH: Fix spi driver compiler warnings" +Subject: [PATCH 0907/1148] Revert "SQUASH: Fix spi driver compiler warnings" This reverts commit fe3f696b7e5229678ae45d1293e97b5ecc00c245. @@ -431742,13 +431742,13 @@ index dc759de7124b..c2e7a2dbbcc7 100644 /* -- -2.18.2 +2.18.4 -From 6d3463b1fdc5a3da213f43dcaf79fd8a9a74f908 Mon Sep 17 00:00:00 2001 +From 203d3aa177bae6af6f5d0bbb291fd018df589107 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 16 Jun 2020 10:23:29 +0100 -Subject: [PATCH 0908/1113] Revert "spi: spi-bcm2835: Disable forced software +Subject: [PATCH 0908/1148] Revert "spi: spi-bcm2835: Disable forced software CS" This reverts commit 2697f0186db346176832b8eb79adaf5c874681e8. @@ -431807,13 +431807,13 @@ index c2e7a2dbbcc7..9dccfbaa2e1d 100644 } -- -2.18.2 +2.18.4 -From e28272100a1d1a5eb1ffa70fd9916fa9558e92be Mon Sep 17 00:00:00 2001 +From daf6c525eb06cc7652aee26395a152f755991608 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 16 Jun 2020 10:23:42 +0100 -Subject: [PATCH 0909/1113] Revert "spi: spi-bcm2835: Re-enable HW CS" +Subject: [PATCH 0909/1148] Revert "spi: spi-bcm2835: Re-enable HW CS" This reverts commit 49b9bd89784e3fa29f143ebf1ac8f125be47b708. @@ -431895,13 +431895,13 @@ index 9dccfbaa2e1d..6899558fcba2 100644 ctlr->handle_err = bcm2835_spi_handle_err; ctlr->prepare_message = bcm2835_spi_prepare_message; -- -2.18.2 +2.18.4 -From cb105d9d86269d413c90831074873be2d0bb1869 Mon Sep 17 00:00:00 2001 +From cecedc07316ab2961d5dc389eacc3b2008523a0c Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:24:31 +0200 -Subject: [PATCH 0910/1113] media: irs1125: Using i2c_transfer for ic2 reads +Subject: [PATCH 0910/1148] 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. @@ -431966,13 +431966,13 @@ index 25e1dd5a08ef..6680afea5894 100644 static int irs1125_write_array(struct v4l2_subdev *sd, -- -2.18.2 +2.18.4 -From d38b40de2abdae49a57bbc776d9130991afed955 Mon Sep 17 00:00:00 2001 +From f8697351d6a7cfbfb779e8e6ce785971da6c1942 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:27:42 +0200 -Subject: [PATCH 0911/1113] media: irs1125: Refactoring and debug messages +Subject: [PATCH 0911/1148] media: irs1125: Refactoring and debug messages Changed some variable names to comply with checkpatch --strict mode. Debug messages added. @@ -432095,13 +432095,13 @@ index 6680afea5894..289f0c25b141 100644 mutex_init(&sensor->lock); -- -2.18.2 +2.18.4 -From c3b9c4d8215719769919027a981d7a8a1467a305 Mon Sep 17 00:00:00 2001 +From e21242a7ca069e3caf0a7d4480f45d10668faddf Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:31:36 +0200 -Subject: [PATCH 0912/1113] media: irs1125: Atomic access to imager +Subject: [PATCH 0912/1148] media: irs1125: Atomic access to imager reconfiguration Instead of changing the exposure and framerate settings for all sequences, @@ -432484,13 +432484,13 @@ index dccaca23aa76..96d676123d5e 100644 __u16 pllcfg1; __u16 pllcfg2; -- -2.18.2 +2.18.4 -From bd75aa57d284968a793d047970f51d3cacb7b51a Mon Sep 17 00:00:00 2001 +From 2443ff1da8d3dc3ae949c93bf12660cefeac6f01 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:33:56 +0200 -Subject: [PATCH 0913/1113] media: irs1125: Keep HW in sync after imager reset +Subject: [PATCH 0913/1148] 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 @@ -432671,13 +432671,13 @@ index d59e05004a03..30c3d2640386 100644 struct irs1125_seq_cfg *cfg_new; -- -2.18.2 +2.18.4 -From fc2980fe3b37a550151c385d2debf243c0d21ed4 Mon Sep 17 00:00:00 2001 +From 794c75572ac3f3b13fbae23a428e1426cc8426fe Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sat, 20 Jun 2020 15:40:00 +0300 -Subject: [PATCH 0914/1113] staging: bcm2835-audio: Add missing MODULE_ALIAS +Subject: [PATCH 0914/1148] 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 @@ -432707,13 +432707,13 @@ index a53c39d1bbaa..b9716f3e264c 100644 MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2835_audio"); -- -2.18.2 +2.18.4 -From 6bbf86ff3c54f9f462fd9be9c033f47e4c41ad48 Mon Sep 17 00:00:00 2001 +From d11af5072bc5143f87cc2e315ba554f12e5818c0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 26 Jun 2020 11:51:05 +0100 -Subject: [PATCH 0915/1113] brcmfmac: Prefer a ccode from OTP over nvram file +Subject: [PATCH 0915/1148] 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. @@ -432844,13 +432844,13 @@ index 3aed4c4b887a..a926c466706f 100644 if (free_bcm47xx_nvram) bcm47xx_nvram_release_contents(data); -- -2.18.2 +2.18.4 -From 41e8bbf0fae82d6a70942930061bc26fe26aa84d Mon Sep 17 00:00:00 2001 +From 8a15c3d3e8732b79a9c267dcdbe6e989137b6c7e Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:36 +0200 -Subject: [PATCH 0916/1113] media: v4l2-subdev: Introduce [get|set]_mbus_config +Subject: [PATCH 0916/1148] media: v4l2-subdev: Introduce [get|set]_mbus_config pad ops Upstream https://patchwork.linuxtv.org/patch/64669/ @@ -432913,13 +432913,13 @@ index 71f1f2f0da53..ab736577b882 100644 /** -- -2.18.2 +2.18.4 -From b23dacbeca42da974e2680de7d3cf4b8a3fcd942 Mon Sep 17 00:00:00 2001 +From 2cbc6ece699017e27f001505fd049a02a4057320 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:37 +0200 -Subject: [PATCH 0917/1113] media: i2c: Use the new get_mbus_config pad op +Subject: [PATCH 0917/1148] media: i2c: Use the new get_mbus_config pad op Upstream https://patchwork.linuxtv.org/patch/64669/ @@ -433166,13 +433166,13 @@ index edad49cebcdf..8ffff67ce2b7 100644 static const struct v4l2_subdev_ops tvp5150_ops = { -- -2.18.2 +2.18.4 -From a0f3b3b779021c9f0b418c8971053fdce1352478 Mon Sep 17 00:00:00 2001 +From 2bcdfdb0534089a23a3416a903fcaef2154e9eb3 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:38 +0200 -Subject: [PATCH 0918/1113] media: i2c: ov6650: Use new [get|set]_mbus_config +Subject: [PATCH 0918/1148] media: i2c: ov6650: Use new [get|set]_mbus_config ops Upstream https://patchwork.linuxtv.org/patch/64674/ @@ -433306,13 +433306,13 @@ index af482620f94a..704064728f55 100644 static const struct v4l2_subdev_ops ov6650_subdev_ops = { -- -2.18.2 +2.18.4 -From c3d1f48fcb983d236a181d7cdf986fe08cc8deaa Mon Sep 17 00:00:00 2001 +From 64d0c29cdf60f6070ecae384b37294ba71f3af15 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:39 +0200 -Subject: [PATCH 0919/1113] media: pxa_camera: Use the new set_mbus_config op +Subject: [PATCH 0919/1148] media: pxa_camera: Use the new set_mbus_config op Upstream https://patchwork.linuxtv.org/patch/64671/ @@ -433595,13 +433595,13 @@ index 8d47ea0c33f8..1200d9991b18 100644 case MEDIA_BUS_FMT_UYVY8_2X8: formats++; -- -2.18.2 +2.18.4 -From 74f1316b95951e82ff4f5cb8a16da7548b4cad8d Mon Sep 17 00:00:00 2001 +From 951bb2788d30295742591ffb7167a61d4a191a92 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:40 +0200 -Subject: [PATCH 0920/1113] media: v4l2-subdev: Remove [s|g]_mbus_config video +Subject: [PATCH 0920/1148] media: v4l2-subdev: Remove [s|g]_mbus_config video ops Upstream https://patchwork.linuxtv.org/patch/64670/ @@ -433644,13 +433644,13 @@ index ab736577b882..d5225239f316 100644 unsigned int *size); }; -- -2.18.2 +2.18.4 -From 0616d5881f02f2e6b577e7887fc363fbf39b1577 Mon Sep 17 00:00:00 2001 +From 0309e40300cdbadee9ccce15e32abc152b1e98a4 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:41 +0200 -Subject: [PATCH 0921/1113] staging: media: imx: Update TODO entry +Subject: [PATCH 0921/1148] staging: media: imx: Update TODO entry Upstream https://patchwork.linuxtv.org/patch/64672/ @@ -433678,13 +433678,13 @@ index 6f29b5ca5324..64c6ba5945ca 100644 video capture devices, from the subdevices in the capture device's pipeline. The controls for each capture device are updated in the -- -2.18.2 +2.18.4 -From e566cf6f58d3c28ef5f4f0312cc1ee1bb278366f Mon Sep 17 00:00:00 2001 +From 88847efec251ec4ca81b8788e47683724d55397e Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:42 +0200 -Subject: [PATCH 0922/1113] media: i2c: adv748x: Adjust TXA data lanes number +Subject: [PATCH 0922/1148] media: i2c: adv748x: Adjust TXA data lanes number MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -433809,13 +433809,13 @@ index fccb388ce179..1061f425ece5 100644 struct media_pad pads[ADV748X_CSI2_NR_PADS]; struct v4l2_ctrl_handler ctrl_hdl; -- -2.18.2 +2.18.4 -From 38567760abb9544605aad06eca1635cf3983c206 Mon Sep 17 00:00:00 2001 +From c75d805e4aea1ebfa2e1507963cf0dc9b64d68b3 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:43 +0200 -Subject: [PATCH 0923/1113] media: i2c: adv748x: Implement get_mbus_config +Subject: [PATCH 0923/1148] media: i2c: adv748x: Implement get_mbus_config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -433878,13 +433878,13 @@ index 2091cda50935..99bb63d05eef 100644 /* ----------------------------------------------------------------------------- -- -2.18.2 +2.18.4 -From f53a7cd095c54e0bf96644f81bc14ac6948a5cf9 Mon Sep 17 00:00:00 2001 +From f962ec83806c8060051dfbbd8a0de70b82af69a0 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:44 +0200 -Subject: [PATCH 0924/1113] media: rcar-csi2: Negotiate data lanes number +Subject: [PATCH 0924/1148] media: rcar-csi2: Negotiate data lanes number Upstream https://patchwork.linuxtv.org/patch/64675/ @@ -434043,13 +434043,13 @@ index c14af1b929df..a59f8ae0b119 100644 dev_dbg(priv->dev, "Bound %s pad: %d\n", subdev->name, pad); -- -2.18.2 +2.18.4 -From d4ab6b04a862883db9bd61c0dad07fdc76aa4070 Mon Sep 17 00:00:00 2001 +From 4dbcf60d3d5cfac4da82699c5490a289f9435007 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 10:05:57 +0100 -Subject: [PATCH 0925/1113] drivers: media: Remove the downstream version of +Subject: [PATCH 0925/1148] drivers: media: Remove the downstream version of bcm2835-unicam About to be replaced by the upstream version. @@ -437234,13 +437234,13 @@ index ae059a171d0f..000000000000 - -#endif -- -2.18.2 +2.18.4 -From 52fe11300100e3a8712c32fa4c1d488f0b0a2b35 Mon Sep 17 00:00:00 2001 +From d6b8a71e01b280b493d02439c8aae126f376c13a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 10:35:24 +0100 -Subject: [PATCH 0926/1113] include: media: Add vfl_devnode_type of +Subject: [PATCH 0926/1148] include: media: Add vfl_devnode_type of VFL_TYPE_VIDEO Upsstream are renaming VFL_TYPE_GRABBER to VFL_TYPE_VIDEO. @@ -437265,13 +437265,13 @@ index 8f2befe9c905..4cc362a79c7c 100644 VFL_TYPE_RADIO, VFL_TYPE_SUBDEV, -- -2.18.2 +2.18.4 -From eb56c3637db7aec178903c7529b041a5f8934523 Mon Sep 17 00:00:00 2001 +From 07fbb085426b1b16d45c06f6aeed90549bf1737b Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 4 May 2020 12:25:41 +0300 -Subject: [PATCH 0927/1113] media: bcm2835-unicam: Driver for CCP2/CSI2 camera +Subject: [PATCH 0927/1148] media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface Add a driver for the Unicam camera receiver block on BCM283x processors. @@ -440433,13 +440433,13 @@ index 000000000000..ae059a171d0f + +#endif -- -2.18.2 +2.18.4 -From bf2ee37526024dd643d0a34931b487e092bf8162 Mon Sep 17 00:00:00 2001 +From d99504066fab84eb31f4a966c3add48099b5121a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 14:32:51 +0100 -Subject: [PATCH 0928/1113] media: bcm2835-unicam: Add support for +Subject: [PATCH 0928/1148] 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 @@ -440495,13 +440495,13 @@ index 2e9387cbc1e0..9adfb2d217af 100644 if (ret) { unicam_err(dev, "failed to set up clock\n"); -- -2.18.2 +2.18.4 -From 8ab6b64c4ca4eb1dea0eb865a671ad3a2dd892e3 Mon Sep 17 00:00:00 2001 +From 77bca85774fc8e70a221c55b639deb0be676722f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 May 2020 18:28:27 +0100 -Subject: [PATCH 0929/1113] media: bcm2835-unicam: Always service interrupts +Subject: [PATCH 0929/1148] 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 @@ -440552,13 +440552,13 @@ index 9adfb2d217af..9c0b9375572d 100644 /* Write value back to clear the interrupts */ reg_write(unicam, UNICAM_STA, sta); -- -2.18.2 +2.18.4 -From 5583483fecc0541be9d0fe6da9453215b7df39cb Mon Sep 17 00:00:00 2001 +From d8f279e80c923dc2c2ed1871c30774504cfebb1b Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:33:31 +0200 -Subject: [PATCH 0930/1113] media: bcm2835: unicam: Fix uninitialized warning +Subject: [PATCH 0930/1148] media: bcm2835: unicam: Fix uninitialized warning Signed-off-by: Jacko Dirks --- @@ -440579,13 +440579,13 @@ index 9c0b9375572d..7906c2813a70 100644 for (i = 0; ret != -EINVAL && ret != -ENOIOCTLCMD; ++i) { memset(&mbus_code, 0, sizeof(mbus_code)); -- -2.18.2 +2.18.4 -From 45cb2321507289f10fe822c9dee65a3117e8c9ec Mon Sep 17 00:00:00 2001 +From c8ff880be789d58d69296828d475428834a107ce Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 15:14:05 +0100 -Subject: [PATCH 0931/1113] media: bcm2835-unicam: Fixup review comments from +Subject: [PATCH 0931/1148] media: bcm2835-unicam: Fixup review comments from Hans. Updates the driver based on the upstream review comments from @@ -440829,13 +440829,13 @@ index 7906c2813a70..94e08ae92c1f 100644 !v4l2_subdev_has_op(unicam->sensor, video, s_std)) { v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD); -- -2.18.2 +2.18.4 -From 9c50da667272118a224566664dc0140f8e1aad9b Mon Sep 17 00:00:00 2001 +From e5fb6feeecab4b8e2ea46a09dd702bf0109e02dd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 11:46:47 +0100 -Subject: [PATCH 0932/1113] media: bcm2835-unicam: Retain packing information +Subject: [PATCH 0932/1148] media: bcm2835-unicam: Retain packing information on G_FMT The change to retrieve the pixel format always on g_fmt didn't @@ -440883,13 +440883,13 @@ index 94e08ae92c1f..96c0b9fea942 100644 return 0; -- -2.18.2 +2.18.4 -From 2f42c0db2125503fcd5a38e08b5a0114f1be60f2 Mon Sep 17 00:00:00 2001 +From e8f0a53f2c2d0cd6a622bbd7ff6982cedf37d46e Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 28 May 2020 11:09:48 +0100 -Subject: [PATCH 0933/1113] media: bcm2835-unicam: change minimum number of +Subject: [PATCH 0933/1148] 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 @@ -440917,13 +440917,13 @@ index 96c0b9fea942..f2cd2083bbd4 100644 ret = vb2_queue_init(q); -- -2.18.2 +2.18.4 -From 3e904fe0a5c217420adc2d4d51bb684feb7e1cf6 Mon Sep 17 00:00:00 2001 +From f6f06804a17ce63d6e1293db08c2d1aa7a77841c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 15:41:42 +0100 -Subject: [PATCH 0934/1113] dt/dtoverlays: Fix up base DT and overlays for +Subject: [PATCH 0934/1148] dt/dtoverlays: Fix up base DT and overlays for updated Unicam driver The upstreamed Unicam driver uses a dt property to denote how many @@ -441083,13 +441083,13 @@ index 2ea99cd9e1a1..a1f8af36d2e7 100644 }; }; -- -2.18.2 +2.18.4 -From 793de0ba45bb5fb906ec0c69ac526a2cbf617e3c Mon Sep 17 00:00:00 2001 +From 7059ac1c185f4092cce5a047e07a1a371cbbf253 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Jun 2020 15:53:44 +0100 -Subject: [PATCH 0935/1113] media: bcm2835-unicam: Avoid gcc warning over {0} +Subject: [PATCH 0935/1148] media: bcm2835-unicam: Avoid gcc warning over {0} on endpoint Older gcc versions object to = { 0 } initialisation if the first @@ -441116,13 +441116,13 @@ index f2cd2083bbd4..f70167d271fe 100644 struct device_node *sensor_node; unsigned int lane; -- -2.18.2 +2.18.4 -From 029458252592c236d3d8b963d867799d0bc6dc66 Mon Sep 17 00:00:00 2001 +From 0b5d099f7f0f73de9edcd14ebf8735708ed7f968 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 4 Oct 2019 13:05:24 -0300 -Subject: [PATCH 0936/1113] media: dt-bindings: media: i2c: Add IMX290 CMOS +Subject: [PATCH 0936/1148] media: dt-bindings: media: i2c: Add IMX290 CMOS sensor binding Commit 8a97a4676f8b1badcd9cfbed2b081342847bb1b1 upstream. @@ -441223,13 +441223,13 @@ index d744087f13a7..1543a5147d22 100644 M: Bingbu Cao L: linux-media@vger.kernel.org -- -2.18.2 +2.18.4 -From 38ba5930871c7ee336d2c01ae42a7759f6f490e0 Mon Sep 17 00:00:00 2001 +From cdd81b330875351608c5dfb85c915b4895b696f7 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 4 Oct 2019 13:05:25 -0300 -Subject: [PATCH 0937/1113] media: i2c: Add IMX290 CMOS image sensor driver +Subject: [PATCH 0937/1148] media: i2c: Add IMX290 CMOS image sensor driver Commit 828dbc299278065b634e913d2700d254a3224853 upstream. @@ -442173,13 +442173,13 @@ index 000000000000..f7678e5a5d87 +MODULE_AUTHOR("Manivannan Sadhasivam "); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 90e4ef40d662dcc574de296fb3e639c8a11b071a Mon Sep 17 00:00:00 2001 +From d769950be7486beb91a1b2d9dfed1a34a3c222a3 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:46 +0200 -Subject: [PATCH 0938/1113] media: i2c: imx290: set the format before +Subject: [PATCH 0938/1148] media: i2c: imx290: set the format before VIDIOC_SUBDEV_G_FMT is called Commit d46cfdc86c30d5ec768924f0b1e2683c8d20b671 upstream. @@ -442229,13 +442229,13 @@ index f7678e5a5d87..2d8c38ffe2f0 100644 if (ret < 0) { dev_err(dev, "Could not register v4l2 device\n"); -- -2.18.2 +2.18.4 -From b548652ac990846f9f7e325c288325de8107211f Mon Sep 17 00:00:00 2001 +From c7ce8f475682e4e4f7a113efdc5089292fd43280 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:47 +0200 -Subject: [PATCH 0939/1113] media: i2c: imx290: fix the order of the args in +Subject: [PATCH 0939/1148] media: i2c: imx290: fix the order of the args in SET_RUNTIME_PM_OPS() Commit 8d2d1bedb1b9af3e0c039a4444858da7b6da71f8 upstream. @@ -442265,13 +442265,13 @@ index 2d8c38ffe2f0..d0322f9a8856 100644 static const struct v4l2_subdev_video_ops imx290_video_ops = { -- -2.18.2 +2.18.4 -From 108d7ee3a7e978ed4e6ed88567ac975a0e77717f Mon Sep 17 00:00:00 2001 +From 5b062d0ee3000407429ff6dd3fd8fcdc814d0887 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:48 +0200 -Subject: [PATCH 0940/1113] media: i2c: imx290: fix reset GPIO pin handling +Subject: [PATCH 0940/1148] media: i2c: imx290: fix reset GPIO pin handling Commit 3909a92d7df622b41b9ceeeea694e641cad7667b upstream. @@ -442332,13 +442332,13 @@ index d0322f9a8856..7b1de1f0c8b7 100644 dev_err(dev, "Cannot get reset gpio\n"); ret = PTR_ERR(imx290->rst_gpio); -- -2.18.2 +2.18.4 -From c765b1b2e89232b7ca1fa766e23c66c88bf8d056 Mon Sep 17 00:00:00 2001 +From 3054dc7a61d9024c9103f590a3aa2605c368ce6e Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:49 +0200 -Subject: [PATCH 0941/1113] media: i2c: imx290: Add support for 2 data lanes +Subject: [PATCH 0941/1148] media: i2c: imx290: Add support for 2 data lanes Commit 97589ad61c730e0f486635c6c19fa25ab8e8f29d upstream. @@ -442652,13 +442652,13 @@ index 7b1de1f0c8b7..ffb393962ffc 100644 imx290->sd.ctrl_handler = &imx290->ctrls; -- -2.18.2 +2.18.4 -From cc6ad6fd2fa15801e61624701506a45031ff0e47 Mon Sep 17 00:00:00 2001 +From 9c32254f5ba85e75c7ae914cff96071152cdc319 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:50 +0200 -Subject: [PATCH 0942/1113] media: i2c: imx290: Add configurable link frequency +Subject: [PATCH 0942/1148] media: i2c: imx290: Add configurable link frequency and pixel rate Commit 98e0500eadb772e1be32d8e369fcc3b7bcac93ed upstream. @@ -442964,13 +442964,13 @@ index ffb393962ffc..152b65cb7cbc 100644 if (ret < 0) { dev_err(dev, "Could not register v4l2 device\n"); -- -2.18.2 +2.18.4 -From 241710974fb3a0d6b56a9dfb97a97ad4b8b06d3b Mon Sep 17 00:00:00 2001 +From 6ea8f16b9018823399fc2cd63e81ee6d32a3a859 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:51 +0200 -Subject: [PATCH 0943/1113] media: i2c: imx290: Add support for test pattern +Subject: [PATCH 0943/1148] media: i2c: imx290: Add support for test pattern generation Commit a58df1f9e4885eaf3d0663574a217e513821a9f0 upstream. @@ -443080,13 +443080,13 @@ index 152b65cb7cbc..67725a5aabd3 100644 if (imx290->ctrls.error) { -- -2.18.2 +2.18.4 -From 45248d5255e91a1403267ee218a61f8d884ae60e Mon Sep 17 00:00:00 2001 +From 532eb18768d36aa45f762cd777a445afc266fae8 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:52 +0200 -Subject: [PATCH 0944/1113] media: i2c: imx290: Add RAW12 mode support +Subject: [PATCH 0944/1148] media: i2c: imx290: Add RAW12 mode support Commit c566ac01ceaa02450acc155201772c0623530e76 upstream. @@ -443195,13 +443195,13 @@ index 67725a5aabd3..c654a9a8fb08 100644 dev_err(imx290->dev, "Unknown pixel format\n"); return -EINVAL; -- -2.18.2 +2.18.4 -From c874f4eb9deff54e05202a07b86fd224a6be6101 Mon Sep 17 00:00:00 2001 +From 912e5435af7b993e10c9d0ef5780497a9f99b5fe Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:53 +0200 -Subject: [PATCH 0945/1113] media: i2c: imx290: Add support to enumerate all +Subject: [PATCH 0945/1148] media: i2c: imx290: Add support to enumerate all frame sizes Commit 3b867fb641d884b714fba390ae866714ba475f29 upstream. @@ -443259,13 +443259,13 @@ index c654a9a8fb08..fd147fac5ef2 100644 .set_fmt = imx290_set_fmt, }; -- -2.18.2 +2.18.4 -From f1ea47b1ba2ce821ca0530ed95cf40cb5998267e Mon Sep 17 00:00:00 2001 +From 41d28aa62f0697c62f898eb20e25dc791bb08720 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:54 +0200 -Subject: [PATCH 0946/1113] media: i2c: imx290: Move the settle time delay out +Subject: [PATCH 0946/1148] media: i2c: imx290: Move the settle time delay out of loop Commit 6544af9b04b4484867c234ba0be1b5008e4a14ee upstream. @@ -443302,13 +443302,13 @@ index fd147fac5ef2..02001c1b0dfc 100644 } -- -2.18.2 +2.18.4 -From 9b1f5944320f9858f665678e7055e2c3464e2629 Mon Sep 17 00:00:00 2001 +From 2340e4f1e704f91411eda0e53cfe0c9b1c83eb48 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:55 +0200 -Subject: [PATCH 0947/1113] media: i2c: imx290: set bus_type before calling +Subject: [PATCH 0947/1148] media: i2c: imx290: set bus_type before calling v4l2_fwnode_endpoint_alloc_parse() Commit a270675875829b6d46eb9e38960fd6019555ebb8 upstream. @@ -443445,13 +443445,13 @@ index 02001c1b0dfc..9c97830164e9 100644 return ret; } -- -2.18.2 +2.18.4 -From 72f23134bf0fb0d3a0492c6579800bd33533d7b1 Mon Sep 17 00:00:00 2001 +From d7ed11aa16b594e0eabc1af7182c50ff4628bd29 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 08:28:51 +0100 -Subject: [PATCH 0948/1113] media: i2c: imx290: Add support for 74.25MHz clock +Subject: [PATCH 0948/1148] 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. @@ -443715,13 +443715,13 @@ index 9c97830164e9..656716fea44b 100644 dev_err(dev, "Could not set xclk frequency\n"); goto free_err; -- -2.18.2 +2.18.4 -From 3ca222d915fea94d1fe50441af096f795cac6d41 Mon Sep 17 00:00:00 2001 +From e68319dbbcda79c8b17e6fad74ce33859b8d3d0a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 13:41:43 +0100 -Subject: [PATCH 0949/1113] media: i2c: imx290: Correct range for V4L2_CID_GAIN +Subject: [PATCH 0949/1148] 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 @@ -443747,13 +443747,13 @@ index 656716fea44b..e7eecbea9bb0 100644 imx290->link_freq = v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops, -- -2.18.2 +2.18.4 -From 0db79844220d0d339570b7e51d69e20bc602139f Mon Sep 17 00:00:00 2001 +From 7985ef2bc136666b3757a4f2bc0d2abbf1395f16 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 14:36:40 +0100 -Subject: [PATCH 0950/1113] media: i2c: imx290: Convert HMAX setting into +Subject: [PATCH 0950/1148] media: i2c: imx290: Convert HMAX setting into V4L2_CID_HBLANK Userspace needs to know HBLANK if it is to work out exposure times @@ -443912,13 +443912,13 @@ index e7eecbea9bb0..876ad590102b 100644 v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops, V4L2_CID_LINK_FREQ, -- -2.18.2 +2.18.4 -From 0a55f719d5b1b1a08eb1f4f5c79cb0b6d48b20e1 Mon Sep 17 00:00:00 2001 +From 8211197dc78519cc7caf868ed92c2c42962415b5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:09:12 +0100 -Subject: [PATCH 0951/1113] media: i2c: imx290: Add support for V4L2_CID_VBLANK +Subject: [PATCH 0951/1148] 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, @@ -444059,13 +444059,13 @@ index 876ad590102b..ea0559e8dcc9 100644 v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops, V4L2_CID_LINK_FREQ, -- -2.18.2 +2.18.4 -From 1de12fbe6538cab787bcdf97f50f8169371cc722 Mon Sep 17 00:00:00 2001 +From 04c0c6c9f571c5b77f4fb644fdac9b62d20cca47 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:19:13 +0100 -Subject: [PATCH 0952/1113] media: i2c: imx290: Add exposure control to the +Subject: [PATCH 0952/1148] media: i2c: imx290: Add exposure control to the driver. Adds support for V4L2_CID_EXPOSURE so that userspace can control @@ -444158,13 +444158,13 @@ index ea0559e8dcc9..df1ad9ac509f 100644 v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops, V4L2_CID_LINK_FREQ, -- -2.18.2 +2.18.4 -From 024cd148ae5742ddfc362d9e58a3829644e8899c Mon Sep 17 00:00:00 2001 +From 7bc6131d314e44295b2bc34df306f92eae86f70c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:34:16 +0100 -Subject: [PATCH 0953/1113] media: i2c: imx290: Add H and V flip controls +Subject: [PATCH 0953/1148] 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. @@ -444247,13 +444247,13 @@ index df1ad9ac509f..246c4b149598 100644 v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops, V4L2_CID_LINK_FREQ, -- -2.18.2 +2.18.4 -From 6ca2dcbfdf45233da8e2cd0e4bc251b194e8b025 Mon Sep 17 00:00:00 2001 +From 01367cf9acb6dbbe229de413e734ca79523db19c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 16:52:14 +0100 -Subject: [PATCH 0954/1113] media: dt-bindings: media: i2c: Add mono version to +Subject: [PATCH 0954/1148] media: dt-bindings: media: i2c: Add mono version to IMX290 bindings The IMX290 module is available as either monochrome or colour and @@ -444289,13 +444289,13 @@ index a3cc21410f7c..294e63650d9e 100644 - clocks: Reference to the xclk clock. - clock-names: Should be "xclk". -- -2.18.2 +2.18.4 -From fdf4061a691270c61de8b04d035a99322e1366a0 Mon Sep 17 00:00:00 2001 +From 6d04a80fcfc67b0c41f84dda64da2b3237e66654 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:03:11 +0100 -Subject: [PATCH 0955/1113] media : i2c: imx290: Add support for the mono +Subject: [PATCH 0955/1148] media : i2c: imx290: Add support for the mono sensor variant. The IMX290 module is available as either mono or colour (Bayer). @@ -444480,13 +444480,13 @@ index 246c4b149598..a6c5d9ce709f 100644 static struct i2c_driver imx290_i2c_driver = { -- -2.18.2 +2.18.4 -From 6a3a0f1819e7d0a72adf4159a74b2e9164d383fa Mon Sep 17 00:00:00 2001 +From d52a2a4e3919580f996417b6fade19de30249246 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Jun 2020 18:11:49 +0100 -Subject: [PATCH 0956/1113] media: i2c: imx290: Switch set_hmax to use +Subject: [PATCH 0956/1148] media: i2c: imx290: Switch set_hmax to use imx290_write_buffered_reg imx290_set_hmax was using two independent writes to set up hmax, @@ -444529,13 +444529,13 @@ index a6c5d9ce709f..9431c2b917ed 100644 static int imx290_set_vmax(struct imx290 *imx290, u32 val) -- -2.18.2 +2.18.4 -From a996e7aba38e56a3bcc7646d3fc716eae7f68092 Mon Sep 17 00:00:00 2001 +From 631dd8912756f8e74ca1ccbe59a0622ce4105d6e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 13:35:17 +0100 -Subject: [PATCH 0957/1113] dtoverlays: Add an overlay for the Sony IMX290 +Subject: [PATCH 0957/1148] dtoverlays: Add an overlay for the Sony IMX290 image sensor Adds an overlay to configure the IMX290 image sensor. @@ -444779,13 +444779,13 @@ index 000000000000..8f1dadb13f6a + }; +}; -- -2.18.2 +2.18.4 -From 8609a4df1a4d688aba26dcf519d0193c8b82b3aa Mon Sep 17 00:00:00 2001 +From d3c27737ab96475b0114cf1ca57d13d4c62e6404 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 18:12:17 +0100 -Subject: [PATCH 0958/1113] defconfig: Add Sony IMX290 image sensor driver to +Subject: [PATCH 0958/1148] defconfig: Add Sony IMX290 image sensor driver to all Pi defconfigs Adds the mainline IMX290 sensor driver (with extra features) to @@ -444861,13 +444861,13 @@ index c82e163a095c..55bf3bbbcb74 100644 CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV7640=m -- -2.18.2 +2.18.4 -From 6e6c6d2894b55335f6246f82a85481ef85ffdf0f Mon Sep 17 00:00:00 2001 +From 16e91a5b33780da77c93cdd59ae022fbbc722749 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 23 Jun 2020 18:37:01 +0100 -Subject: [PATCH 0959/1113] vc4_hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET +Subject: [PATCH 0959/1148] vc4_hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET Symptom is random switching of speakers when using multichannel. @@ -444892,7 +444892,7 @@ Signed-off-by: Dom Cobley 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index e9cacbaedd00..031d4e54c1fb 100644 +index 5aa5236e576d..994bcb027172 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1002,6 +1002,8 @@ static int vc4_hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd, @@ -444905,13 +444905,13 @@ index e9cacbaedd00..031d4e54c1fb 100644 break; case SNDRV_PCM_TRIGGER_STOP: -- -2.18.2 +2.18.4 -From ba9b94f63e1d97229cd2fc55eaac230b4d9db255 Mon Sep 17 00:00:00 2001 +From 8736783c8edb6014ab5dac1cad49921ab6c523ed Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 15:56:47 +0100 -Subject: [PATCH 0960/1113] staging: vc04_services: isp: Fixup g/s_selection +Subject: [PATCH 0960/1148] staging: vc04_services: isp: Fixup g/s_selection implementation Add V4L2_SEL_TGT_CROP_DEFAULT and V4L2_SEL_TGT_CROP_BOUND targets. @@ -445040,13 +445040,13 @@ index bc86354ac4c6..83471996a84d 100644 } -- -2.18.2 +2.18.4 -From ebc8eb268ab957048d6921f5de04b35c81f20039 Mon Sep 17 00:00:00 2001 +From 32518134fc76b32a8b7fdd00786f592c60a301e0 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 15:57:08 +0100 -Subject: [PATCH 0961/1113] staging: vc04_services: isp: Reorder operations +Subject: [PATCH 0961/1148] staging: vc04_services: isp: Reorder operations during device probe Register the video node at the end of the probe, swapping order with @@ -445138,13 +445138,13 @@ index 83471996a84d..815cf50cd07a 100644 /* Unregister one of the /dev/video nodes associated with the ISP. */ -- -2.18.2 +2.18.4 -From c99c20f6deef515e6212fc7a08175feab3a9f66d Mon Sep 17 00:00:00 2001 +From ff980da948445a7c7da55feaaf808303cc4d8e72 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 15:57:23 +0100 -Subject: [PATCH 0962/1113] uapi: bcm2835-isp: Fixups for bcm2835-isp uapi +Subject: [PATCH 0962/1148] uapi: bcm2835-isp: Fixups for bcm2835-isp uapi structures Rename pad_[] to padding[]. @@ -445178,13 +445178,13 @@ index e7afc367fd76..bb16dcbcb40f 100644 /** -- -2.18.2 +2.18.4 -From a0c8df98aa9b0257aae5dec94944f89591daf7d9 Mon Sep 17 00:00:00 2001 +From 312feb6d20eeacb98945d8de5f9809bde92bb845 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sun, 21 Jun 2020 18:06:31 +0300 -Subject: [PATCH 0963/1113] config: Set CONFIG_SERIAL_DEV_CTRL_TTYPORT=y in +Subject: [PATCH 0963/1148] config: Set CONFIG_SERIAL_DEV_CTRL_TTYPORT=y in Raspberry Pi defconfigs The next patch adds a device tree overlay for Bluetooth. The Bluetooth @@ -445286,13 +445286,13 @@ index 55bf3bbbcb74..bf65e6561589 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y -- -2.18.2 +2.18.4 -From 36dd5a3866368de3487e404135caea4ae29ab61f Mon Sep 17 00:00:00 2001 +From e863a16e6daa287ae875b8c6a69e097c64b849f8 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sat, 27 Jun 2020 13:08:26 +0300 -Subject: [PATCH 0964/1113] ARM: dts: Add Bluetooth nodes for Raspberry Pi +Subject: [PATCH 0964/1148] 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 @@ -445593,13 +445593,13 @@ index 30d3d8549da0..44d8e10ef735 100644 + }; }; -- -2.18.2 +2.18.4 -From 970bc3af65839be24680fc53d8b4b97fb9a9ada7 Mon Sep 17 00:00:00 2001 +From e1ce1be5b056d35bff7acb69be16e8108a8908fb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 30 Jun 2020 18:04:13 +0100 -Subject: [PATCH 0965/1113] drm/vc4: Allow interlaced HDMI modes from FKMS. +Subject: [PATCH 0965/1148] 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 @@ -445636,13 +445636,13 @@ index 25a1f066e62c..ab794eec6afe 100644 ret = drm_mode_create_tv_margin_properties(dev); -- -2.18.2 +2.18.4 -From f280ead874b0bb4ace06a763fbfef28734cba827 Mon Sep 17 00:00:00 2001 +From dd994b7bcbb49516bc0b2dae37a66fca64b89be8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 2 Jul 2020 13:53:20 +0100 -Subject: [PATCH 0966/1113] serial: 8250: bcm2835aux - defer if clock is zero +Subject: [PATCH 0966/1148] serial: 8250: bcm2835aux - defer if clock is zero See: https://github.com/raspberrypi/linux/issues/3700 @@ -445670,13 +445670,13 @@ index 33da68341c3a..8102ad9d04ea 100644 ret = serial8250_register_8250_port(&data->uart); if (ret < 0) { -- -2.18.2 +2.18.4 -From b66fb1883bcce28fccb2f924001e40ef1c9382ca Mon Sep 17 00:00:00 2001 +From eb436fd5e42790a2166fd858676e0a1f0ff84e2a Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 24 Feb 2020 18:52:20 +0100 -Subject: [PATCH 0967/1113] media: v4l: Add 14-bit raw bayer pixel formats +Subject: [PATCH 0967/1148] media: v4l: Add 14-bit raw bayer pixel formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -445834,13 +445834,13 @@ index 5b33ba237b6d..4da08fe3590e 100644 #define V4L2_PIX_FMT_SBGGR14P v4l2_fourcc('p', 'B', 'E', 'E') #define V4L2_PIX_FMT_SGBRG14P v4l2_fourcc('p', 'G', 'E', 'E') -- -2.18.2 +2.18.4 -From f7398e8553e4b62e3efd64ee0d27c5c5da38d236 Mon Sep 17 00:00:00 2001 +From 7333c63e0a3e356e7038735ad10f5b17de8ec2dc 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 0968/1113] media: v4l: Add 14-bit raw greyscale pixel format +Subject: [PATCH 0968/1148] media: v4l: Add 14-bit raw greyscale pixel format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -445978,13 +445978,13 @@ index 4da08fe3590e..f3ce1c88dbf8 100644 #define V4L2_PIX_FMT_Y16_BE v4l2_fourcc_be('Y', '1', '6', ' ') /* 16 Greyscale BE */ -- -2.18.2 +2.18.4 -From c0e960d31099ce9fabf5630a56be7178eda12989 Mon Sep 17 00:00:00 2001 +From d83f7b89a5c953630f323723610f8d221d444d7b 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 0969/1113] media: v4l: Add 1X14 14-bit greyscale media bus +Subject: [PATCH 0969/1148] media: v4l: Add 1X14 14-bit greyscale media bus code definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -446074,13 +446074,13 @@ index 4b5e2a71dfec..3c2848e91c1b 100644 #define MEDIA_BUS_FMT_VYUY8_1X16 0x2010 #define MEDIA_BUS_FMT_YUYV8_1X16 0x2011 -- -2.18.2 +2.18.4 -From 6dfd3d247cd0e4911f8a1484c46b506635504728 Mon Sep 17 00:00:00 2001 +From a7c22157f7da58c30d9cb6f6db4afbc2f7ae6baa Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 May 2020 16:59:03 +0100 -Subject: [PATCH 0970/1113] media: Add a pixel format for MIPI packed 12bit +Subject: [PATCH 0970/1148] media: Add a pixel format for MIPI packed 12bit luma only. This is the format used by monochrome 12bit image sensors. @@ -446182,13 +446182,13 @@ index f3ce1c88dbf8..28772badf558 100644 /* Palette formats */ #define V4L2_PIX_FMT_PAL8 v4l2_fourcc('P', 'A', 'L', '8') /* 8 8-bit palette */ -- -2.18.2 +2.18.4 -From 645fc34c4533deb2def1c9ab2d968bed29aced77 Mon Sep 17 00:00:00 2001 +From ac0195c8c3fe0eaec0d623815edfcdeb1d5e2d6d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:51:03 +0100 -Subject: [PATCH 0971/1113] media: Add a pixel format for MIPI packed 14bit +Subject: [PATCH 0971/1148] media: Add a pixel format for MIPI packed 14bit luma only. This is the format used by monochrome 14bit image sensors. @@ -446299,13 +446299,13 @@ index 28772badf558..f93979a670a5 100644 /* Palette formats */ #define V4L2_PIX_FMT_PAL8 v4l2_fourcc('P', 'A', 'L', '8') /* 8 8-bit palette */ -- -2.18.2 +2.18.4 -From 11f98805efffb2d20ae5bbaffa5ffcd0381d770a Mon Sep 17 00:00:00 2001 +From e9a1c06bcf7afe53bfaec36b2d16737ee63c2992 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:09:04 +0100 -Subject: [PATCH 0972/1113] staging: vc04_services: isp: Add support for 14bit +Subject: [PATCH 0972/1148] staging: vc04_services: isp: Add support for 14bit Bayer The only thing missing was a set of defines, therefore add them in. @@ -446382,13 +446382,13 @@ index 8d904fcce388..4288d50a7e6b 100644 #define MMAL_ENCODING_BAYER_SBGGR16 MMAL_FOURCC('B', 'G', '1', '6') #define MMAL_ENCODING_BAYER_SGBRG16 MMAL_FOURCC('G', 'B', '1', '6') -- -2.18.2 +2.18.4 -From 55f7c0d0315236061f145ac42c3796ce6b8d9506 Mon Sep 17 00:00:00 2001 +From baed5eab6409edbe5829d70999cd8695c35cb031 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:11:14 +0100 -Subject: [PATCH 0973/1113] staging: vc04_services: isp: Add monochrome image +Subject: [PATCH 0973/1148] staging: vc04_services: isp: Add monochrome image formats Adds support for monochrome image formats in the various @@ -446482,13 +446482,13 @@ index 4288d50a7e6b..8eb6334ee055 100644 */ #define MMAL_ENCODING_EGL_IMAGE MMAL_FOURCC('E', 'G', 'L', 'I') -- -2.18.2 +2.18.4 -From bef64f80902dc852f53cea8c64c9121c5bef47df Mon Sep 17 00:00:00 2001 +From b86459e88105a29da632aaacc5a20c3d2940fe75 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:24:34 +0100 -Subject: [PATCH 0974/1113] staging: vc04_services: isp: Increase the number of +Subject: [PATCH 0974/1148] staging: vc04_services: isp: Increase the number of supported formats expected The ISP now supports 47 different input formats, therefore increase the @@ -446517,13 +446517,13 @@ index 815cf50cd07a..424e7e6da1d6 100644 /* Populate node->supported_fmts with the formats supported by those ports. */ static int bcm2835_isp_get_supported_fmts(struct bcm2835_isp_node *node) -- -2.18.2 +2.18.4 -From 12c175e12f6e705db074bc4495a3b3c005d3d6ba Mon Sep 17 00:00:00 2001 +From 28618bd7dd774331eeb2c8fa7d5ee606812ae90a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:40:56 +0100 -Subject: [PATCH 0975/1113] staging: vc04_services: codec: Increase the number +Subject: [PATCH 0975/1148] staging: vc04_services: codec: Increase the number of supported formats expected The ISP now supports 47 different input formats, therefore increase the @@ -446552,13 +446552,13 @@ index 1c7fbba6c9c8..2391d589f170 100644 /* Populate dev->supported_fmts with the formats supported by those ports. */ static int bcm2835_codec_get_supported_fmts(struct bcm2835_codec_dev *dev) -- -2.18.2 +2.18.4 -From 5cc28036c8d5bc991664c0bd66780345052d7dd7 Mon Sep 17 00:00:00 2001 +From 606e46fb96a2a3a55df904817bb495fa5525714d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:38:12 +0100 -Subject: [PATCH 0976/1113] staging: vc04_services: codec: Add support for mono +Subject: [PATCH 0976/1148] staging: vc04_services: codec: Add support for mono formats The firmware ISP component now allows for processing of mono @@ -446622,13 +446622,13 @@ index 2391d589f170..b9415f3cdb76 100644 /* Compressed formats */ .fourcc = V4L2_PIX_FMT_H264, -- -2.18.2 +2.18.4 -From 6d96fe5bf9d8079c5ba6888be78980a56c776247 Mon Sep 17 00:00:00 2001 +From 6fa9c37c97cd943914fbe46c0b75f0b363091a60 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:50:12 +0100 -Subject: [PATCH 0977/1113] staging: vc04_services: codec: Add support for +Subject: [PATCH 0977/1148] staging: vc04_services: codec: Add support for 14bit Bayer formats Now that the 14bit Bayer formats have been defined within @@ -446685,13 +446685,13 @@ index b9415f3cdb76..3fe81979aaa1 100644 /* 16 bit */ .fourcc = V4L2_PIX_FMT_SRGGB16, -- -2.18.2 +2.18.4 -From 9dafc4984197fc212b23fa45182a6db06b94d1dc Mon Sep 17 00:00:00 2001 +From 22ad3eb84afa2ed287a07f8cb988beb90026b49f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:53:32 +0100 -Subject: [PATCH 0978/1113] media: bcm2835-unicam: Add support for 12bit mono +Subject: [PATCH 0978/1148] media: bcm2835-unicam: Add support for 12bit mono packed format Now that V4L2_PIX_FMT_Y12P is defined, allow passing raw 12bit @@ -446716,13 +446716,13 @@ index f70167d271fe..104f4d0f9f05 100644 .code = MEDIA_BUS_FMT_Y12_1X12, .depth = 12, -- -2.18.2 +2.18.4 -From 3d070a37fdba3e3f907471c30edf4897c8a7ff9b Mon Sep 17 00:00:00 2001 +From 69606d0f57189e91bae66fb06b4ba226b29f29e7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 18:03:47 +0100 -Subject: [PATCH 0979/1113] media: bcm2835-unicam: Add support for 14bit mono +Subject: [PATCH 0979/1148] media: bcm2835-unicam: Add support for 14bit mono sources Now that V4L2_PIX_FMT_Y14 and V4L2_PIX_FMT_Y14P are defined, @@ -446751,13 +446751,13 @@ index 104f4d0f9f05..799bea3d4f41 100644 /* Embedded data format */ { -- -2.18.2 +2.18.4 -From 8e66104f675e482838e6ee0a34a0760b34b286a4 Mon Sep 17 00:00:00 2001 +From 42f8f170288777bc96a97ce773c731f37f7290b9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:57:57 +0100 -Subject: [PATCH 0980/1113] media: bcm2835-unicam: Add support for unpacked +Subject: [PATCH 0980/1148] media: bcm2835-unicam: Add support for unpacked 14bit Bayer formats Now that the 14bit non-packed Bayer formats are defined, add them @@ -446799,13 +446799,13 @@ index 799bea3d4f41..3b082587dd14 100644 .depth = 14, .csi_dt = 0x2d, -- -2.18.2 +2.18.4 -From 267b0240cfef6a638efdc2ae38af5d76b81f4ad1 Mon Sep 17 00:00:00 2001 +From c0702082a80248fc150b5bc2f1c6d61bf2450b67 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 2 Jul 2020 15:21:05 +0100 -Subject: [PATCH 0981/1113] overlays: Fix miniuart-bt "krnbt" parameter +Subject: [PATCH 0981/1148] 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 @@ -446837,13 +446837,13 @@ index 44d8e10ef735..da49f14a0940 100644 }; }; -- -2.18.2 +2.18.4 -From c14df83da0acf51874ca63b590b7940e078128f1 Mon Sep 17 00:00:00 2001 +From 9556bb5da8c8a6a803fb717411399af31c9d4e09 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 14:11:55 +0100 -Subject: [PATCH 0982/1113] drm/vc4: Make FKMS max refresh rate a module +Subject: [PATCH 0982/1148] drm/vc4: Make FKMS max refresh rate a module parameter Some people want to use the high refresh rate modes for 1080p100 @@ -446898,13 +446898,13 @@ index ab794eec6afe..a173ca430db4 100644 /* Limit the pixel clock based on the HDMI clock limits from the -- -2.18.2 +2.18.4 -From b914f793cefae5dd252988a58b92e4dd29bf72d9 Mon Sep 17 00:00:00 2001 +From 704acb0334c00452568ab872d2741f4c205509df Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 16:06:55 +0100 -Subject: [PATCH 0983/1113] drm/vc4: FKMS Block modes with odd horizontal +Subject: [PATCH 0983/1148] drm/vc4: FKMS Block modes with odd horizontal timing values on Pi4 Pi4 HDMI pipeline is 2 pixels/clock and can not produce timings @@ -446978,13 +446978,13 @@ index a173ca430db4..ff726486c785 100644 * we can't do the precise vblank timestamp mode. */ -- -2.18.2 +2.18.4 -From 2affc37c77c52562d646e8d41370256a75b13c9b Mon Sep 17 00:00:00 2001 +From 08186c2419849b38201078d4d701414a5dc7baca Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 16:05:37 +0100 -Subject: [PATCH 0984/1113] dt: Use rpi-firmware-kms-2711 on 2711 platforms +Subject: [PATCH 0984/1148] dt: Use rpi-firmware-kms-2711 on 2711 platforms Signed-off-by: Dave Stevenson --- @@ -447023,13 +447023,13 @@ index c42fa2aa5ef2..ce3edc2cda7d 100644 // Board specific stuff here -- -2.18.2 +2.18.4 -From a8a01e7a91f433128a633ad7c95f9d93f32ffa35 Mon Sep 17 00:00:00 2001 +From 7a8c11ae631f8ae58f56eb7606113ef9e7124a4b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 16:13:33 +0100 -Subject: [PATCH 0985/1113] drm/vc4: FKMS: Put includes in alphabetical order, +Subject: [PATCH 0985/1148] drm/vc4: FKMS: Put includes in alphabetical order, and use <> instead of "" Reorder the includes, and use the system include paths rather than @@ -447086,13 +447086,13 @@ index ff726486c785..ec5c223033c8 100644 int fkms_max_refresh_rate = 85; module_param(fkms_max_refresh_rate, int, 0644); -- -2.18.2 +2.18.4 -From 13f8377c4be9b5ac9f781f4677e303d968c50f5b Mon Sep 17 00:00:00 2001 +From 5a72fc97ab625ebcea9ac41304b82326776be81a Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Tue, 4 Feb 2020 15:50:41 +0100 -Subject: [PATCH 0986/1113] irqchip/bcm2835: Quiesce IRQs left enabled by +Subject: [PATCH 0986/1148] irqchip/bcm2835: Quiesce IRQs left enabled by bootloader [ Upstream commit bd59b343a9c902c522f006e6d71080f4893bbf42 ] @@ -447197,13 +447197,13 @@ index 40c1b38d5db5..be181d4aecca 100644 last_irq = irq; -- -2.18.2 +2.18.4 -From 431214ad498c10ff92fb34ee8957693604b95c01 Mon Sep 17 00:00:00 2001 +From fd08f62b4700e45a79aff549babdd4afe2cb9dd6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 18:28:10 +0100 -Subject: [PATCH 0987/1113] dtoverlays: Fixup imx219 and imx477 overlays due to +Subject: [PATCH 0987/1148] dtoverlays: Fixup imx219 and imx477 overlays due to parsing failures imx219 overlay failed to detect as CSI2 as it was missing any @@ -447247,13 +447247,13 @@ index bd187713939e..73d4f79d54e6 100644 }; }; -- -2.18.2 +2.18.4 -From 391cbd159f088bd5f4d2d3386ff12aad865d5bb3 Mon Sep 17 00:00:00 2001 +From 17cb0888b0986ec7798086a00283068fc876f9f3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 4 Jul 2020 22:19:26 +0100 -Subject: [PATCH 0988/1113] overlays: rpi-ft5406: Fix boolean parameters +Subject: [PATCH 0988/1148] overlays: rpi-ft5406: Fix boolean parameters An improvement in the automated testing of overlays revealed these invalid boolean parameter declarations. @@ -447280,13 +447280,13 @@ index 4dcb490f04b6..8483c4f4b2eb 100644 }; }; -- -2.18.2 +2.18.4 -From b4a2eb1ed880b584d263e8d2cf1d23621c0cfeb8 Mon Sep 17 00:00:00 2001 +From 8e02ce61939e28d6e30ab7d2e61e65cb85554221 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jul 2020 20:04:53 +0100 -Subject: [PATCH 0989/1113] configs: Regenerate Pi defconfigs +Subject: [PATCH 0989/1148] configs: Regenerate Pi defconfigs Signed-off-by: Phil Elwell --- @@ -447358,13 +447358,13 @@ index bf65e6561589..99ed08604d56 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y -- -2.18.2 +2.18.4 -From 6f01261026482a1a13e77b7ba61afc104b78e46c Mon Sep 17 00:00:00 2001 +From fc539c07e2f8f8029594a0a5dc4bd0b28dc941a3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jul 2020 17:53:47 +0100 -Subject: [PATCH 0990/1113] ARM: dts: Copy kernel BT changes to CM4 +Subject: [PATCH 0990/1148] ARM: dts: Copy kernel BT changes to CM4 Signed-off-by: Phil Elwell --- @@ -447393,13 +447393,13 @@ index ce3edc2cda7d..d5d62245f73c 100644 &uart1 { -- -2.18.2 +2.18.4 -From c3c92c906b5efc1920fd7d6db02aaffb5e7b5505 Mon Sep 17 00:00:00 2001 +From b4ba3818c60c53d9b0d947d39968c4c9e2e54ab9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 Jul 2020 09:01:54 +0100 -Subject: [PATCH 0991/1113] ARM: dts: Make bcm2711 dts more like 5.7 +Subject: [PATCH 0991/1148] 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 @@ -448101,13 +448101,13 @@ index 4b98dba51e59..4f87bb4fd3d1 100644 }; }; -- -2.18.2 +2.18.4 -From b3cc53de9d9fdf54070c7d74b0906eccc2eb7a8f Mon Sep 17 00:00:00 2001 +From bb7f08b1fd241ebc2895c2aba124d8aae6cef823 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Jul 2020 20:28:27 +0100 -Subject: [PATCH 0992/1113] bcm2835-dma: Add NO_WAIT_RESP flag +Subject: [PATCH 0992/1148] 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. @@ -448161,13 +448161,13 @@ index 53346d7eb66c..9fec52489421 100644 size_t max_len = bcm2835_dma_max_frame_length(c); size_t frames; -- -2.18.2 +2.18.4 -From 7d4300600d6ddc106000296ee7cfcc5d1d9f438b Mon Sep 17 00:00:00 2001 +From a10d04115b306eb9557e21505fb66758a8ef6162 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 Jul 2020 14:08:55 +0100 -Subject: [PATCH 0993/1113] ARM: dts: Restore the old 2711 scb ranges property +Subject: [PATCH 0993/1148] ARM: dts: Restore the old 2711 scb ranges property The back-ported value breaks PCIe. @@ -448191,13 +448191,13 @@ index e8c6a0dfc9f7..4a3659d21997 100644 <0x1 0x00000000 0x1 0x00000000 0x1 0x00000000>; -- -2.18.2 +2.18.4 -From c3cf69bae92f3b3e86710f0cca401406689b309e Mon Sep 17 00:00:00 2001 +From dc3525c2a3075712d9e09643653ab80a05703e1f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 Jul 2020 14:22:25 +0100 -Subject: [PATCH 0994/1113] configs: Enable CONFIG_BLK_DEV_NVME=m +Subject: [PATCH 0994/1148] configs: Enable CONFIG_BLK_DEV_NVME=m Enable support for NVME SSDs. @@ -448232,13 +448232,13 @@ index 9656ca9f5316..656068a1bbb8 100644 CONFIG_TI_ST=m CONFIG_SCSI=y -- -2.18.2 +2.18.4 -From 5f8a5290aa4c2076e92dc939b84b722c14b71b3e Mon Sep 17 00:00:00 2001 +From 37aab2f45b37a0cd0494c19f4924b6be1f7626a1 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Fri, 17 May 2019 18:23:03 +0800 -Subject: [PATCH 0995/1113] media: i2c: add ov9281 driver. +Subject: [PATCH 0995/1148] media: i2c: add ov9281 driver. Change-Id: I7b77250bbc56d2f861450cf77271ad15f9b88ab1 Signed-off-by: Zefa Chen @@ -449461,13 +449461,13 @@ index 000000000000..4a6324a3e5da +MODULE_DESCRIPTION("OmniVision ov9281 sensor driver"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From 194b13413ec04b2eff56d4fa53045fc5fd9664dc Mon Sep 17 00:00:00 2001 +From 9b4dea84f478d87d0d2cd2e80296c0dc76b3a85f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 15:47:09 +0100 -Subject: [PATCH 0996/1113] media: i2c: ov9281: fix mclk issue when probe +Subject: [PATCH 0996/1148] media: i2c: ov9281: fix mclk issue when probe multiple camera. Takes the ov9281 part only from the Rockchip's patch. @@ -449527,13 +449527,13 @@ index 4a6324a3e5da..0d6759942f79 100644 ov9281->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(ov9281->reset_gpio)) -- -2.18.2 +2.18.4 -From c06bd79b494ce7307049c81c8c767ca91fad0843 Mon Sep 17 00:00:00 2001 +From 8adc08102039e3a3dfba4c04745914b8da841397 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 15:51:50 +0100 -Subject: [PATCH 0997/1113] media: i2c: ov9281: add enum_frame_interval +Subject: [PATCH 0997/1148] 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 @@ -449630,13 +449630,13 @@ index 0d6759942f79..273aa904683c 100644 .set_fmt = ov9281_set_fmt, }; -- -2.18.2 +2.18.4 -From 052f461bd96d1b9530f57eed93a92be061fc26c6 Mon Sep 17 00:00:00 2001 +From 7ba863eb85b7b8733e90514175596e0c146ff192 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 16:12:33 +0100 -Subject: [PATCH 0998/1113] media: i2c: ov9281: Fixup for recent kernel +Subject: [PATCH 0998/1148] 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 @@ -450327,13 +450327,13 @@ index 273aa904683c..7b9bea476cfb 100644 static const struct i2c_device_id ov9281_match_id[] = { { "ovti,ov9281", 0 }, -- -2.18.2 +2.18.4 -From b2c5ffe4b2a244da3c56167a545fa10201f9fc65 Mon Sep 17 00:00:00 2001 +From 30fd44c096842b7fe285f0d586e0c9aa86e42fa0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 17:51:32 +0100 -Subject: [PATCH 0999/1113] media: i2c: ov9281: Read chip ID via 2 reads +Subject: [PATCH 0999/1148] 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 @@ -450375,13 +450375,13 @@ index 7b9bea476cfb..bb8efc3d3cba 100644 } -- -2.18.2 +2.18.4 -From 4a868d396a370e7814e9bd7238dd7d9853690b79 Mon Sep 17 00:00:00 2001 +From 0862d55aa66310b7858b0d3abb6b5576abe4a790 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 17:32:21 +0100 -Subject: [PATCH 1000/1113] dtoverlay: Add overlay for Omnivision OV9281 image +Subject: [PATCH 1000/1148] dtoverlay: Add overlay for Omnivision OV9281 image sensor Adds an overlay for the OV9281 mono imaging sensor using 2 CSI-2 @@ -450543,13 +450543,13 @@ index 000000000000..4411c9d96564 + }; +}; -- -2.18.2 +2.18.4 -From 4c290da21b3157cb0e17355013cf7660bc0677ec Mon Sep 17 00:00:00 2001 +From 41f7bbde522a67d559077fa5b15d7c3505f66cca Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 18:45:01 +0100 -Subject: [PATCH 1001/1113] defconfigs: Add OV9281 to all the Pi defconfigs +Subject: [PATCH 1001/1148] defconfigs: Add OV9281 to all the Pi defconfigs Adds the driver for use by the dtoverlay. @@ -450623,13 +450623,13 @@ index 99ed08604d56..e238f963d172 100644 CONFIG_VIDEO_MT9V011=m CONFIG_DRM=m -- -2.18.2 +2.18.4 -From ccd3318cf8957669159cf64c8a5c240203d80b41 Mon Sep 17 00:00:00 2001 +From 0e639aca70d6328a654852b18914b11b4791908b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 6 Oct 2019 17:28:19 +0200 -Subject: [PATCH 1002/1113] Bluetooth: hci_bcm: Fix RTS handling during startup +Subject: [PATCH 1002/1148] Bluetooth: hci_bcm: Fix RTS handling during startup commit 3347a80965b38f096b1d6f995c00c9c9e53d4b8b upstream. @@ -450662,13 +450662,13 @@ index 94ed734c1d7e..f204ae626c69 100644 goto err_unset_hu; } -- -2.18.2 +2.18.4 -From 4ee0954548ed276e207931e76fdc0086821e1497 Mon Sep 17 00:00:00 2001 +From 14e1fdf1e0a329666b0c9476439e8ae7ce9eb658 Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Fri, 25 Oct 2019 14:54:26 -0700 -Subject: [PATCH 1003/1113] Bluetooth: hci_bcm: Add compatible string for +Subject: [PATCH 1003/1148] Bluetooth: hci_bcm: Add compatible string for BCM43540 commit d462af20dbfa1b9b1a831412f32d9d6757b82459 upstream. @@ -450696,13 +450696,13 @@ index f204ae626c69..31943895b22e 100644 }; MODULE_DEVICE_TABLE(of, bcm_bluetooth_of_match); -- -2.18.2 +2.18.4 -From 7c74e59db2afb996f6439c60e0c3922cdab35470 Mon Sep 17 00:00:00 2001 +From 05385375208dd5bb1d873645772011ccdcb6f787 Mon Sep 17 00:00:00 2001 From: Mohammad Rasim Date: Wed, 20 Nov 2019 14:02:35 +0300 -Subject: [PATCH 1004/1113] Bluetooth: btbcm: Add entry for BCM4335A0 UART +Subject: [PATCH 1004/1148] Bluetooth: btbcm: Add entry for BCM4335A0 UART bluetooth commit 1199ab4c9e1d4cdfbabd70b4aadbc8e72c691f65 upstream. @@ -450762,13 +450762,13 @@ index 31943895b22e..d5b6467b0e9f 100644 }; MODULE_DEVICE_TABLE(of, bcm_bluetooth_of_match); -- -2.18.2 +2.18.4 -From d0844018f0e64499f7343fee73678f553a9cbf57 Mon Sep 17 00:00:00 2001 +From a47ffb814e4f6b897ce9fa8ec09d2f8f531623b9 Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Tue, 26 Nov 2019 08:17:29 +0100 -Subject: [PATCH 1005/1113] Bluetooth: hci_bcm: Disallow set_baudrate for +Subject: [PATCH 1005/1148] Bluetooth: hci_bcm: Disallow set_baudrate for BCM4354 commit 5d6f391073d5c1c903ac12be72c66b96b2ae93f4 upstream. @@ -450883,13 +450883,13 @@ index d5b6467b0e9f..84a32c58712e 100644 { }, }; -- -2.18.2 +2.18.4 -From 7ee4272bc7c5ca4e5993be3c2019b06661d99c60 Mon Sep 17 00:00:00 2001 +From 77d4959e6b703dd02f475ea1a9e771e0b1aba8ae Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Tue, 26 Nov 2019 08:17:30 +0100 -Subject: [PATCH 1006/1113] Bluetooth: btbcm: Support pcm configuration +Subject: [PATCH 1006/1148] Bluetooth: btbcm: Support pcm configuration commit 528379902337102b0264fe5343eafb3d6c59fa45 upstream. @@ -451015,13 +451015,13 @@ index d204be8a84bf..3c7dd0765837 100644 { return -EOPNOTSUPP; -- -2.18.2 +2.18.4 -From 75e0d3090f35e4f42dedfa8da48d72db65990ed2 Mon Sep 17 00:00:00 2001 +From c4c5af4750dc38035dd6ad0703ea07ac7243c52e Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Tue, 26 Nov 2019 08:17:32 +0100 -Subject: [PATCH 1007/1113] Bluetooth: hci_bcm: Support pcm params in dts +Subject: [PATCH 1007/1148] Bluetooth: hci_bcm: Support pcm params in dts commit eb762b94111b646b4f116ebfdbfcadbad14e12b3 upstream. @@ -451095,13 +451095,13 @@ index 84a32c58712e..4f21b60a8a20 100644 err = bcm_acpi_probe(bcmdev); else -- -2.18.2 +2.18.4 -From 07d231cd545de8692260818cdb0d7243a9c1df96 Mon Sep 17 00:00:00 2001 +From c6a9eeb28549057a839156dd66510e139fc5d795 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 1 Jan 2020 15:01:34 +0100 -Subject: [PATCH 1008/1113] Bluetooth: hci_bcm: Drive RTS only for BCM43438 +Subject: [PATCH 1008/1148] Bluetooth: hci_bcm: Drive RTS only for BCM43438 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -451193,13 +451193,13 @@ index 4f21b60a8a20..de05b1428289 100644 { .compatible = "brcm,bcm4335a0" }, { }, -- -2.18.2 +2.18.4 -From 3e267a6588f7cfdd9571a55b037cb631141d29cf Mon Sep 17 00:00:00 2001 +From 200d6f69d18e98947297ab6f0cc57b7b6363a3ca Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Tue, 7 Jul 2020 15:09:06 +0200 -Subject: [PATCH 1009/1113] Enhances the DAC+ driver to control the optional +Subject: [PATCH 1009/1148] Enhances the DAC+ driver to control the optional headphone amplifier Probes on the I2C bus for TPA6130A2, if successful, it sets DT-parameter @@ -451335,13 +451335,13 @@ index 4cde60a5b6f6..286a62c3ff48 100644 snd_rpi_hifiberry_dacplus.dev = &pdev->dev; if (pdev->dev.of_node) { -- -2.18.2 +2.18.4 -From cfbe5179b4aa295281e700cb71b51448e90b916a Mon Sep 17 00:00:00 2001 +From e771c485511f536e4c0e61443b5b253d91d35069 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Jul 2020 17:33:06 +0100 -Subject: [PATCH 1010/1113] ARM: dts: hifiberry-dacplus headphone amp support +Subject: [PATCH 1010/1148] ARM: dts: hifiberry-dacplus headphone amp support Signed-off-by: Phil Elwell --- @@ -451365,13 +451365,13 @@ index 2ca3d886ebb7..ff19015ba656 100644 }; -- -2.18.2 +2.18.4 -From a5024c2293801084f3ae427c7651b03149556af1 Mon Sep 17 00:00:00 2001 +From b9c7e2c78da7a3c698509977dbede375d755cc71 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 10:31:53 +0100 -Subject: [PATCH 1011/1113] media: i2c: imx290: Explicitly set v&h blank on +Subject: [PATCH 1011/1148] media: i2c: imx290: Explicitly set v&h blank on mode change __v4l2_ctrl_modify_range only updates the current value should @@ -451417,13 +451417,13 @@ index 9431c2b917ed..0aa3940c577e 100644 __v4l2_ctrl_modify_range(imx290->exposure, mode->vmax - mode->height, -- -2.18.2 +2.18.4 -From bd2e454569bd04547c03ff0512e1e9526af97435 Mon Sep 17 00:00:00 2001 +From a817de6f8b3445254bbdd68e4fb19f4388c7a746 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 11:23:48 +0100 -Subject: [PATCH 1012/1113] media: i2c: imx290: Add support for g_selection to +Subject: [PATCH 1012/1148] media: i2c: imx290: Add support for g_selection to report cropping Userspace needs to know the cropping arrangements for each mode, @@ -451579,13 +451579,13 @@ index 0aa3940c577e..5b7083b7050e 100644 static const struct v4l2_subdev_ops imx290_subdev_ops = { -- -2.18.2 +2.18.4 -From ee3213f062ef1ca8be69ccca3a039f65c5505633 Mon Sep 17 00:00:00 2001 +From b2e3e62f8764da313469482acb7e950f07add0c0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 11:51:26 +0100 -Subject: [PATCH 1013/1113] media: i2c: imx290: Set the colorspace fields in +Subject: [PATCH 1013/1148] media: i2c: imx290: Set the colorspace fields in the format The colorspace fields were left untouched in imx290_set_fmt @@ -451616,13 +451616,13 @@ index 5b7083b7050e..0057e0b98912 100644 if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { format = v4l2_subdev_get_try_format(sd, cfg, fmt->pad); -- -2.18.2 +2.18.4 -From 19709102a9acad6fbc73344c6ee028a33313e8ca Mon Sep 17 00:00:00 2001 +From d99040ff56bfe21caee789a7bd6083dfa667294c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 14:23:40 +0100 -Subject: [PATCH 1014/1113] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE +Subject: [PATCH 1014/1148] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE in the caps v4l2-compliance throws a failure if the device doesn't advertise @@ -451650,13 +451650,13 @@ index 3b082587dd14..6b7780ec8ec6 100644 /* Define the device names */ snprintf(vdev->name, sizeof(vdev->name), "%s-%s", UNICAM_MODULE_NAME, -- -2.18.2 +2.18.4 -From 80e1379beb50226104d6b8f96d581d00793d36a9 Mon Sep 17 00:00:00 2001 +From b7bd21f59465925db6a514b449d6df084e8b6442 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 14:52:43 +0100 -Subject: [PATCH 1015/1113] media: bcm2835-unicam: Ensure type is VIDEO_CAPTURE +Subject: [PATCH 1015/1148] 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 @@ -451692,13 +451692,13 @@ index 6b7780ec8ec6..c2b9d89f0ae5 100644 if (!ret) sel->r = sdsel.r; -- -2.18.2 +2.18.4 -From 0413a219d5915731f4fb6c58c5a019de311bc0ca Mon Sep 17 00:00:00 2001 +From 86ec25374c4530eaa2c0280a4cf278d7f0058b2b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Jul 2020 14:34:34 +0100 -Subject: [PATCH 1016/1113] configs: Add CAN_EMS_USB=m +Subject: [PATCH 1016/1148] configs: Add CAN_EMS_USB=m See: https://github.com/raspberrypi/linux/issues/3716 @@ -451772,13 +451772,13 @@ index e238f963d172..c028ffce473a 100644 CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y -- -2.18.2 +2.18.4 -From 1cd8bdfc389efde3ffe9e976615653fa65c98c89 Mon Sep 17 00:00:00 2001 +From 3e9459c2cb91b31bcb7500e468143cd989879e81 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 16:12:05 +0100 -Subject: [PATCH 1017/1113] dtoverlays: Create an overlay for the Omnivision +Subject: [PATCH 1017/1148] dtoverlays: Create an overlay for the Omnivision OV7251 sensor Adds an overlay for the OV7251 VGA global shutter sensor. @@ -451940,13 +451940,13 @@ index 000000000000..f04eafd4adf9 + }; +}; -- -2.18.2 +2.18.4 -From c949a93fb518c292354728946631cc5cbfacc634 Mon Sep 17 00:00:00 2001 +From 3b565135efcc3db7189adf496b96603a4b4e3a22 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 16:14:36 +0100 -Subject: [PATCH 1018/1113] defconfigs: Add the Omnivision OV7251 sensor driver +Subject: [PATCH 1018/1148] defconfigs: Add the Omnivision OV7251 sensor driver to the defconfigs Signed-off-by: Dave Stevenson @@ -452019,13 +452019,13 @@ index c028ffce473a..1d42667e3c11 100644 CONFIG_VIDEO_OV9281=m CONFIG_VIDEO_IRS1125=m -- -2.18.2 +2.18.4 -From 76883263ee382dc80a564b7f8190de8c4f970609 Mon Sep 17 00:00:00 2001 +From da532e6a621f6c686079c63b8f424b7e11283405 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 10 Mar 2020 22:21:15 +0000 -Subject: [PATCH 1019/1113] vc4_hdmi: Set HDMI_MAI_FMT +Subject: [PATCH 1019/1148] vc4_hdmi: Set HDMI_MAI_FMT The hardware uses this for generating the right audio data island packets when using formats other than PCM @@ -452037,7 +452037,7 @@ Signed-off-by: Dom Cobley 2 files changed, 78 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 031d4e54c1fb..75c68e42cc3a 100644 +index 994bcb027172..f3e692b2ffa1 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -917,6 +917,45 @@ static void vc4_hdmi_audio_shutdown(struct snd_pcm_substream *substream, @@ -452151,13 +452151,13 @@ index 4d017572a5c2..a388a9265afc 100644 /* When set, the CTS_PERIOD counts based on MAI bus sync pulse instead -- -2.18.2 +2.18.4 -From 1e20eedf21e099bbd15a31d37ac86b8d8879dc8b Mon Sep 17 00:00:00 2001 +From 24baa6299cd1ce2529567632ac31afe9400d90b9 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 17 Mar 2020 12:12:22 +0100 -Subject: [PATCH 1020/1113] drm/vc4: add iec958 controls to vc4_hdmi +Subject: [PATCH 1020/1148] 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 @@ -452173,7 +452173,7 @@ Signed-off-by: Matthias Reichl 2 files changed, 62 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 75c68e42cc3a..1311f794e6b5 100644 +index f3e692b2ffa1..913dbcc7a7dd 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -43,6 +43,7 @@ @@ -452278,13 +452278,13 @@ index 60f7bf99e06e..5914de41705c 100644 /* General HDMI hardware state. */ -- -2.18.2 +2.18.4 -From 3d6b5ae2fd2a1390b58b84f37c489076ebaa67ee Mon Sep 17 00:00:00 2001 +From 56cea755a4e4131413542b1bc77593828938ab06 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 19 Mar 2020 20:00:35 +0100 -Subject: [PATCH 1021/1113] drm/vc4: move setup from hw_params to prepare +Subject: [PATCH 1021/1148] 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 @@ -452296,7 +452296,7 @@ Signed-off-by: Matthias Reichl 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 1311f794e6b5..aa41d603d9ae 100644 +index 913dbcc7a7dd..d6961466e2eb 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -958,8 +958,7 @@ static int sample_rate_to_mai_fmt(int samplerate) @@ -452340,13 +452340,13 @@ index 1311f794e6b5..aa41d603d9ae 100644 .trigger = vc4_hdmi_audio_trigger, }; -- -2.18.2 +2.18.4 -From e92a832d00b68b36ea87e95b7afcbcd6897241a7 Mon Sep 17 00:00:00 2001 +From f0c9841e6fd98643cd2e5a4df09af1a73e5387ed Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Fri, 10 Jul 2020 11:51:16 +0100 -Subject: [PATCH 1022/1113] drm/vc4: enable HBR MAI format on HBR streams +Subject: [PATCH 1022/1148] drm/vc4: enable HBR MAI format on HBR streams Signed-off-by: Matthias Reichl --- @@ -452354,7 +452354,7 @@ Signed-off-by: Matthias Reichl 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index aa41d603d9ae..202e4cc1e390 100644 +index d6961466e2eb..3108e0a1eacd 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -991,7 +991,11 @@ static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream, @@ -452371,13 +452371,13 @@ index aa41d603d9ae..202e4cc1e390 100644 VC4_SET_FIELD(mai_sample_rate, VC4_HDMI_MAI_FORMAT_SAMPLE_RATE) | VC4_SET_FIELD(mai_audio_format, VC4_HDMI_MAI_FORMAT_AUDIO_FORMAT)); -- -2.18.2 +2.18.4 -From a58aece52f242bc4a3a2ae91dc8c0018aef8afc5 Mon Sep 17 00:00:00 2001 +From f35541e5f756930c6efe4284e5314f29d6bd30ef Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 25 Jun 2020 18:48:40 +0100 -Subject: [PATCH 1023/1113] vc4_hdmi: Remove firmware logic for MAI threshold +Subject: [PATCH 1023/1148] vc4_hdmi: Remove firmware logic for MAI threshold setting This was a workaround for bugs in hardware on earlier Pi models @@ -452391,7 +452391,7 @@ Signed-off-by: Dom Cobley 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 202e4cc1e390..61799a11a6eb 100644 +index 3108e0a1eacd..19a243c9d805 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1010,22 +1010,12 @@ static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream, @@ -452424,13 +452424,13 @@ index 202e4cc1e390..61799a11a6eb 100644 HDMI_WRITE(HDMI_MAI_CONFIG, VC4_HDMI_MAI_CONFIG_BIT_REVERSE | -- -2.18.2 +2.18.4 -From 2a1b49209978478ef29587140ad220b2eac5c574 Mon Sep 17 00:00:00 2001 +From 91badf4e6b364458157787f44b5a09443baef25b Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 30 Jun 2020 11:23:49 +0100 -Subject: [PATCH 1024/1113] vc_hdmi: Set VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE +Subject: [PATCH 1024/1148] 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 @@ -452442,7 +452442,7 @@ Signed-off-by: Dom Cobley 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 61799a11a6eb..c4028aed5fc2 100644 +index 19a243c9d805..5e74a6ca0c99 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1019,6 +1019,7 @@ static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream, @@ -452454,13 +452454,13 @@ index 61799a11a6eb..c4028aed5fc2 100644 channel_map = vc4_hdmi->variant->channel_map(vc4_hdmi, channel_mask); -- -2.18.2 +2.18.4 -From d8be934dc19648c6e992082263e9d0be0db4419f Mon Sep 17 00:00:00 2001 +From eeb98853fcee5f0ef30b1c99ad01341461ab78fb Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 2 Jul 2020 19:36:08 +0100 -Subject: [PATCH 1025/1113] dts: Enable NO_WAIT_RESP for hdmi audio dma +Subject: [PATCH 1025/1148] 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 @@ -452507,13 +452507,13 @@ index e269e75f0f57..e39577e90cc1 100644 status = "disabled"; }; -- -2.18.2 +2.18.4 -From 371fe9382c9954a7325db82fe46e5bd4c8cf67d9 Mon Sep 17 00:00:00 2001 +From afc684a90854b8d668f02fcdbeb5d8d449074438 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 10 Jul 2020 16:57:43 +0100 -Subject: [PATCH 1026/1113] SQUASH: dts: Further simplify firmware clocks +Subject: [PATCH 1026/1148] 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. @@ -452588,13 +452588,13 @@ index 52b47038ca82..c4c858b984c6 100644 - }; -}; -- -2.18.2 +2.18.4 -From 66b9ce5311a0e9af638fb390c08b2ce4bb374525 Mon Sep 17 00:00:00 2001 +From 5a25cd0d93727660a047aa75878059e977351bd0 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 11 May 2020 13:02:22 +0100 -Subject: [PATCH 1027/1113] media: bcm2835: unicam: Set VPU min clock freq to +Subject: [PATCH 1027/1148] media: bcm2835: unicam: Set VPU min clock freq to 250Mhz. When streaming with Unicam, the VPU must have a clock frequency of at @@ -452750,13 +452750,13 @@ index c2b9d89f0ae5..57c3c5f5db56 100644 if (ret <= 0) { dev_err(&pdev->dev, "No IRQ resource\n"); -- -2.18.2 +2.18.4 -From 616677b17784b493d5210550f9081228987574c5 Mon Sep 17 00:00:00 2001 +From 2d53e606ae33f2c051f494d4ff4a4e56cb82453d Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 11 May 2020 13:06:27 +0100 -Subject: [PATCH 1028/1113] dt-bindings: bcm2835-unicam: Update documentation +Subject: [PATCH 1028/1148] dt-bindings: bcm2835-unicam: Update documentation with new clock params Update the documentation to reflect the new "VPU" clock needed @@ -452794,13 +452794,13 @@ index 7714fb374b34..164d0377dcd2 100644 csi1_ep: endpoint { remote-endpoint = <&tc358743_0>; -- -2.18.2 +2.18.4 -From 0d8a715a3ccec7cc48a8e470cf7b65fb229103a6 Mon Sep 17 00:00:00 2001 +From 2fb120fc5face9df65ee8c80632a8a8f4a4e290f Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Tue, 14 Jul 2020 17:51:03 +0200 -Subject: [PATCH 1029/1113] correct SND_SOC_DAILINK_DEFS +Subject: [PATCH 1029/1148] correct SND_SOC_DAILINK_DEFS Signed-off-by: AMuszkat --- @@ -452821,13 +452821,13 @@ index 41965c71c912..db43239d29c9 100644 static struct snd_soc_dai_link snd_merus_amp_dai[] = { -- -2.18.2 +2.18.4 -From c2d77785e3cab2607f5c825077f772af41f09299 Mon Sep 17 00:00:00 2001 +From cd00ea107d7d0d4f36c236f97e34058d6aa44188 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:44 +0200 -Subject: [PATCH 1030/1113] media: dt-bindings: video-interfaces: Document +Subject: [PATCH 1030/1148] media: dt-bindings: video-interfaces: Document 'orientation' property Add the 'orientation' device property, used to specify the device mounting @@ -452870,13 +452870,13 @@ index f884ada0bffc..b1ff492c7da7 100644 Optional endpoint properties ---------------------------- -- -2.18.2 +2.18.4 -From 50d4fc0a177f2cbd3d090894cc85a7665b81e7b9 Mon Sep 17 00:00:00 2001 +From 5d939383930034224d954d962bce38783fa0f8ab Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:45 +0200 -Subject: [PATCH 1031/1113] media: dt-bindings: video-interface: Replace +Subject: [PATCH 1031/1148] media: dt-bindings: video-interface: Replace 'rotation' description Replace the 'rotation' property description by providing a definition @@ -453266,13 +453266,13 @@ index b1ff492c7da7..3920f25a9123 100644 - orientation: The orientation of a device (typically an image sensor or a flash LED) describing its mounting position relative to the usage orientation of the -- -2.18.2 +2.18.4 -From 15c96155bc53a4129e96c73ac9d2967a81e84d3d Mon Sep 17 00:00:00 2001 +From 12edaa1cd38f9f5406a6c2a17802fb7da921da03 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:46 +0200 -Subject: [PATCH 1032/1113] media: v4l2-ctrl: Document +Subject: [PATCH 1032/1148] media: v4l2-ctrl: Document V4L2_CID_CAMERA_ORIENTATION Add documentation for the V4L2_CID_CAMERA_ORIENTATION camera @@ -453333,13 +453333,13 @@ index 51c1d5c9eb00..c65a2b66232e 100644 This control may be changed to a menu control in the future, if more options are required. -- -2.18.2 +2.18.4 -From a955116acf58ce085206f1f7084f4feb348399fe Mon Sep 17 00:00:00 2001 +From 9e29353113903115b93ba0a46c0951317bd64b1f Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:47 +0200 -Subject: [PATCH 1033/1113] media: v4l2-ctrl: Document +Subject: [PATCH 1033/1148] media: v4l2-ctrl: Document V4L2_CID_CAMERA_SENSOR_ROTATION Add documentation for the V4L2_CID_CAMERA_SENSOR_ROTATION camera @@ -453490,13 +453490,13 @@ index c65a2b66232e..e64c1b2c01e8 100644 This control may be changed to a menu control in the future, if more options are required. -- -2.18.2 +2.18.4 -From ab8d07b0f692d4901c7feb5764d9eb900c50ee8e Mon Sep 17 00:00:00 2001 +From 06840cfbfb07558b1a2ed45a50de0366105ba0a8 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:48 +0200 -Subject: [PATCH 1034/1113] media: v4l2-ctrls: Add camera orientation and +Subject: [PATCH 1034/1148] media: v4l2-ctrls: Add camera orientation and rotation Add support for the newly defined V4L2_CID_CAMERA_ORIENTATION @@ -453587,13 +453587,13 @@ index 660574b1b4e7..b6173d8c38f1 100644 #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) -- -2.18.2 +2.18.4 -From 06b89ffc80683d4be4967e032c0a90ce4e1164f2 Mon Sep 17 00:00:00 2001 +From 0807da5b5376559cd95a9ead318fdea978c7c707 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:49 +0200 -Subject: [PATCH 1035/1113] media: v4l2-fwnode: Add helper to parse device +Subject: [PATCH 1035/1148] media: v4l2-fwnode: Add helper to parse device properties Add an helper function to parse common device properties in the same @@ -453733,13 +453733,13 @@ index f6a7bcd13197..7bb8da2092f6 100644 * typedef parse_endpoint_func - Driver's callback function to be called on * each V4L2 fwnode endpoint. -- -2.18.2 +2.18.4 -From 2b156aeb5182152aad2cd756f02c9b784208e6f9 Mon Sep 17 00:00:00 2001 +From ab022795df766118bd77bf18356c9b3003059883 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:52 +0200 -Subject: [PATCH 1036/1113] media: v4l2-ctrls: Add helper to register +Subject: [PATCH 1036/1148] media: v4l2-ctrls: Add helper to register properties Add an helper function to v4l2-ctrls to register controls associated @@ -453855,13 +453855,13 @@ index 65575e9b5a2b..162859aa2138 100644 + const struct v4l2_fwnode_device_properties *p); #endif -- -2.18.2 +2.18.4 -From 9758b6bb0581a1fdfecab836d9a32d8a01c03985 Mon Sep 17 00:00:00 2001 +From 71461649d84c54abfe14148cb6c8091af0e2a66f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 01:45:08 +0300 -Subject: [PATCH 1037/1113] media: i2c: ov5647: Parse and register properties +Subject: [PATCH 1037/1148] media: i2c: ov5647: Parse and register properties Parse device properties and register controls for them using the V4L2 fwnode properties helpers. @@ -453910,13 +453910,13 @@ index 6d84d2785f74..86a821a172b3 100644 /* Write out the register set over I2C on stream-on. */ -- -2.18.2 +2.18.4 -From 2e6815e51184fbf43b3319fcf9c093f2e7f28ca4 Mon Sep 17 00:00:00 2001 +From 208b9c8ba8dfe984b3d80b81e9df58b0b76dd919 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:55 +0200 -Subject: [PATCH 1038/1113] media: i2c: imx219: Parse and register properties +Subject: [PATCH 1038/1148] media: i2c: imx219: Parse and register properties Parse device properties and register controls for them using the newly introduced helpers. @@ -453967,13 +453967,13 @@ index b84fc19e9ff7..812323107f36 100644 return 0; -- -2.18.2 +2.18.4 -From 3d37810704bbb78bb33b96259467a58f9bd36377 Mon Sep 17 00:00:00 2001 +From f7de9725aac24fd938a559d3235da31509f5e336 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 01:45:08 +0300 -Subject: [PATCH 1039/1113] media: i2c: imx477: Parse and register properties +Subject: [PATCH 1039/1148] media: i2c: imx477: Parse and register properties Parse device properties and register controls for them using the V4L2 fwnode properties helpers. @@ -454018,13 +454018,13 @@ index e42a8633087d..3fbb173fa079 100644 /* Setup exposure and frame/line length limits. */ -- -2.18.2 +2.18.4 -From deffa2f479b061988466888751929ac11ac4c660 Mon Sep 17 00:00:00 2001 +From e358df7714dfcc0c524593adb63413544289b47f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 03:04:38 +0300 -Subject: [PATCH 1040/1113] dt/dtoverlays: ov5647: Add parameter to set camera +Subject: [PATCH 1040/1148] dt/dtoverlays: ov5647: Add parameter to set camera module rotation Add a rotation DT overlay parameter to allow specifying the camera @@ -454075,13 +454075,13 @@ index 5eba3cb9fb91..fd1e7a457f69 100644 + }; }; -- -2.18.2 +2.18.4 -From 9f74ddc564ef83257f60f256668abd2c50aa36c6 Mon Sep 17 00:00:00 2001 +From 4afa13c6a90735a20136fd2084a6201d8d2cbfa8 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 03:04:38 +0300 -Subject: [PATCH 1041/1113] dt/dtoverlays: imx219: Add parameter to set camera +Subject: [PATCH 1041/1148] dt/dtoverlays: imx219: Add parameter to set camera module rotation Add a rotation DT overlay parameter to allow specifying the camera @@ -454133,13 +454133,13 @@ index 3c2d3fac93d2..dce07b335c4e 100644 + }; }; -- -2.18.2 +2.18.4 -From 4d5ca1b6a8a519946ecb3159834c79f0c746475c Mon Sep 17 00:00:00 2001 +From b7af8b8252ef65865239e18d47872c1a4b7198cf Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 03:04:38 +0300 -Subject: [PATCH 1042/1113] dt/dtoverlays: imx477: Add parameter to set camera +Subject: [PATCH 1042/1148] dt/dtoverlays: imx477: Add parameter to set camera module rotation Add a rotation DT overlay parameter to allow specifying the camera @@ -454191,13 +454191,13 @@ index 73d4f79d54e6..1a97eaaf4c82 100644 + }; }; -- -2.18.2 +2.18.4 -From 595264a5d1bb794d4c3732aea5f19f0c2e963ac9 Mon Sep 17 00:00:00 2001 +From 984a7d0fc591cb0cc4e1d36cb9b212774c8fda16 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 16 Jul 2020 12:02:47 +0100 -Subject: [PATCH 1043/1113] drm/vc4: Add DRM_MODE_FLAG_DBLCLK support to +Subject: [PATCH 1043/1148] drm/vc4: Add DRM_MODE_FLAG_DBLCLK support to vc4-fkms 480i and several other modes use DRM_MODE_FLAG_DBLCLK and pixel @@ -454251,13 +454251,13 @@ index ec5c223033c8..31982bda0062 100644 return MODE_OK; } -- -2.18.2 +2.18.4 -From 660897e031b909cf090fc8739fd7b500f2fcdaf6 Mon Sep 17 00:00:00 2001 +From 356566e068487bebc777048fe0aa7b9a6257836e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Jul 2020 10:33:19 +0100 -Subject: [PATCH 1044/1113] leds: Add the actpwr trigger +Subject: [PATCH 1044/1148] 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 @@ -454498,13 +454498,13 @@ index 000000000000..4e89fb314e2c +MODULE_DESCRIPTION("ACT/PWR LED trigger"); +MODULE_LICENSE("GPL v2"); -- -2.18.2 +2.18.4 -From e9510a70c4823790aa76e33794214a403c3f8cff Mon Sep 17 00:00:00 2001 +From ac4ddf286fd9d5359d725d19689c80119908addf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2020 13:18:11 +0100 -Subject: [PATCH 1045/1113] configs: Enable LEDS_TRIGGER_ACTPWR +Subject: [PATCH 1045/1148] configs: Enable LEDS_TRIGGER_ACTPWR Make the combined mmc0 activity & power trigger available to use. @@ -454578,13 +454578,13 @@ index 1d42667e3c11..c7e5eeacb27c 100644 # CONFIG_RTC_HCTOSYS is not set CONFIG_RTC_DRV_ABX80X=m -- -2.18.2 +2.18.4 -From e0d1a8d502acdc9f19f2f3023d2bf88bfe22dd08 Mon Sep 17 00:00:00 2001 +From 3f35c94f271bdc81deecfc39136f6fb21da2ae5d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 16 Jul 2020 18:19:58 +0100 -Subject: [PATCH 1046/1113] ARM: dts: Select the actpwr LED trigger on Zeroes +Subject: [PATCH 1046/1148] 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 @@ -454627,13 +454627,13 @@ index c2f58e84eb32..5655eb4769ea 100644 }; -- -2.18.2 +2.18.4 -From fceec068b5b696fea1f28714e6bd1b355da8d4e4 Mon Sep 17 00:00:00 2001 +From 9b1c3f56338186aa18a7cbe0f3bedeaebd291841 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 May 2020 22:05:29 +0100 -Subject: [PATCH 1047/1113] staging: vc04_services: isp: Rework lens shading to +Subject: [PATCH 1047/1148] staging: vc04_services: isp: Rework lens shading to take a dmabuf This removes the need for the client to use vcsm at all. @@ -454722,13 +454722,13 @@ index bb16dcbcb40f..cf8c0437f159 100644 __u32 corner_sampled; __u32 gain_format; -- -2.18.2 +2.18.4 -From e75159340e9b50c49b8234d6b526e0383a10106f Mon Sep 17 00:00:00 2001 +From 5bc08eb00c79597f35ef4c2020c2183af8c43d12 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Fri, 17 Jul 2020 09:17:36 +1000 -Subject: [PATCH 1048/1113] Mute bug fix for the Audioinjector.net isolated +Subject: [PATCH 1048/1148] Mute bug fix for the Audioinjector.net isolated soundcard. --- @@ -454792,13 +454792,13 @@ index 652464658fef..27e1316e387d 100644 ret = devm_snd_soc_register_card(&pdev->dev, card); -- -2.18.2 +2.18.4 -From 5472e6dbc1732326581f8ad44b69e57b9b9651c1 Mon Sep 17 00:00:00 2001 +From 8bf3e7950dfb7ee13cd2fafdc6cd116553982a0c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Jul 2020 17:56:17 +0100 -Subject: [PATCH 1049/1113] configs: Add MAXIM_THERMOCOUPLE=m +Subject: [PATCH 1049/1148] configs: Add MAXIM_THERMOCOUPLE=m See: https://github.com/raspberrypi/linux/issues/3732 @@ -454872,13 +454872,13 @@ index c7e5eeacb27c..04128417383a 100644 CONFIG_PWM_PCA9685=m CONFIG_EXT4_FS=y -- -2.18.2 +2.18.4 -From c005776f7015a60ef4f55a680b2d93462b9bf040 Mon Sep 17 00:00:00 2001 +From e3660296d3ac5f14feecdabeafa78d50a288d78d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 20 Apr 2020 18:00:38 +0100 -Subject: [PATCH 1050/1113] vc4: Report channel mapping back to userspace +Subject: [PATCH 1050/1148] 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 @@ -454895,7 +454895,7 @@ Signed-off-by: Dom Cobley 2 files changed, 418 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index c4028aed5fc2..219964ff2f0e 100644 +index 5e74a6ca0c99..2f6730983183 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -48,6 +48,7 @@ @@ -455384,13 +455384,13 @@ index 5914de41705c..e866979a6df5 100644 /* General HDMI hardware state. */ -- -2.18.2 +2.18.4 -From 7a78973d248fe9aa33621c9111952b464164a43e Mon Sep 17 00:00:00 2001 +From 12f929c0cd72ffc0071e983508580b3a32654cdc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Jul 2020 09:35:46 +0100 -Subject: [PATCH 1051/1113] SQUASH: leds: actpwr - delete unused variable +Subject: [PATCH 1051/1148] SQUASH: leds: actpwr - delete unused variable Signed-off-by: Phil Elwell --- @@ -455410,13 +455410,13 @@ index 4e89fb314e2c..1a52107ceb03 100644 active = &trig->virt_leds[trig->next_active]; trig->active = active; -- -2.18.2 +2.18.4 -From 7513869a5a38b285887130272f12c61733ae302f Mon Sep 17 00:00:00 2001 +From 55d24d29cafe8cd944f802c4405586aecc4f3875 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Jul 2020 17:34:09 +0100 -Subject: [PATCH 1052/1113] staging: vchiq_arm: children inherit DMA config +Subject: [PATCH 1052/1148] 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 @@ -455452,13 +455452,13 @@ index d55f038637fc..4edfca26410e 100644 } -- -2.18.2 +2.18.4 -From 4be9e9d184ad12d4fe70a2d9b0b119032f14a6db Mon Sep 17 00:00:00 2001 +From 6e35c5f513032d7757303dab23c073baabd00c64 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 Jul 2020 17:45:24 +0100 -Subject: [PATCH 1053/1113] ARM: dts: 2711 DMA can address 36 bits +Subject: [PATCH 1053/1148] 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. @@ -455483,13 +455483,13 @@ index 444a3d74e8f2..c2c63bbef338 100644 dma40: dma@7e007b00 { compatible = "brcm,bcm2711-dma"; -- -2.18.2 +2.18.4 -From 38f5e8034efb35e81230835f6ac91b80c010d485 Mon Sep 17 00:00:00 2001 +From bf8d8544f13536d44d57ff8150b5a860f1a5d55c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 Jul 2020 17:59:31 +0100 -Subject: [PATCH 1054/1113] bcm2835-dma: Advertise the full DMA range +Subject: [PATCH 1054/1148] bcm2835-dma: Advertise the full DMA range Unless the DMA mask is set wider than 32 bits, DMA mapping will use a bounce buffer. @@ -455566,13 +455566,13 @@ index 9fec52489421..5a9b18edc2b7 100644 /* Request DMA channel mask from device tree */ if (of_property_read_u32(pdev->dev.of_node, -- -2.18.2 +2.18.4 -From 6a5e11a74947ccd41aa1498d7a05b5a4bd265ca3 Mon Sep 17 00:00:00 2001 +From 3094c244cd923d8a772fad2ef08cb50b1234e94d Mon Sep 17 00:00:00 2001 From: iamdavidcz Date: Thu, 23 Jul 2020 23:10:22 +0200 -Subject: [PATCH 1055/1113] add CONFIG_CRYPTO_USER_API_HASH=m +Subject: [PATCH 1055/1148] add CONFIG_CRYPTO_USER_API_HASH=m --- arch/arm/configs/bcm2709_defconfig | 1 + @@ -455643,13 +455643,13 @@ index 04128417383a..05459f731972 100644 CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y -- -2.18.2 +2.18.4 -From 44b9713d8d1790026627c989355663c5cea8a28a Mon Sep 17 00:00:00 2001 +From b1e4d5b756b5f3120cb5e2759ff866a2c0adb569 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Jul 2020 14:56:16 +0100 -Subject: [PATCH 1056/1113] configs: Adding remaining crypto API modules +Subject: [PATCH 1056/1148] 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 @@ -455732,13 +455732,13 @@ index 05459f731972..11f3ff5d60f8 100644 CONFIG_LIBCRC32C=y CONFIG_DMA_CMA=y -- -2.18.2 +2.18.4 -From 2e88d15eab87d8b7044e384afc9c995fdf6e0f6e Mon Sep 17 00:00:00 2001 +From 52a346374801958e73aa3230d6369e9fc44a10ab Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Jul 2020 15:34:19 +0100 -Subject: [PATCH 1057/1113] configs: Restore missing cgroups to BCM2835-7 +Subject: [PATCH 1057/1148] configs: Restore missing cgroups to BCM2835-7 See: https://github.com/raspberrypi/linux/issues/3644 @@ -455789,13 +455789,13 @@ index 11f3ff5d60f8..feca764ecd74 100644 CONFIG_CPUSETS=y CONFIG_CGROUP_DEVICE=y -- -2.18.2 +2.18.4 -From 0a70a04ede6b396ba81f9af660bbf31ac60b3dc1 Mon Sep 17 00:00:00 2001 +From 92c26b716c6b91f0e0759296552132303ad91c8f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Jul 2020 11:20:07 +0100 -Subject: [PATCH 1058/1113] ARM: dts: Add UART skip-init properties for U-boot +Subject: [PATCH 1058/1148] 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 @@ -455830,13 +455830,13 @@ index e3d90b4262f1..68a7e1c09db1 100644 status = "disabled"; }; -- -2.18.2 +2.18.4 -From dbe3bbd90c63ca259739ce749c58cb9e104210f6 Mon Sep 17 00:00:00 2001 +From 7c8286acfa657b6601c96c9436be350e95446af8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 28 Jul 2020 13:01:42 +0100 -Subject: [PATCH 1059/1113] drm/vc4: Remove UIF from the list of modifiers +Subject: [PATCH 1059/1148] 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 @@ -455865,13 +455865,13 @@ index 31982bda0062..7802020cc3c0 100644 default: return false; -- -2.18.2 +2.18.4 -From 67c696566d6286c3c6ea4c41e017740ced2e6b1e Mon Sep 17 00:00:00 2001 +From 39e6c616ed9d97ed15ff086670f773022516009e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jul 2020 13:47:55 +0100 -Subject: [PATCH 1060/1113] ARM: proc-v7: Force misalignment of early stmia +Subject: [PATCH 1060/1148] 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 @@ -455931,13 +455931,13 @@ index c4e8006a1a8c..d5d63b9fbe22 100644 __INITDATA -- -2.18.2 +2.18.4 -From 5c86dc611f10967868417a106876681d7e4dba7e Mon Sep 17 00:00:00 2001 +From e8259282386db8d5d73283bf40a726e330dce708 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jul 2020 15:13:09 +0100 -Subject: [PATCH 1061/1113] overlays: Fix sc16is75x overlays w.r.t. serdev +Subject: [PATCH 1061/1148] 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, @@ -456125,13 +456125,13 @@ index ffdea106434a..730c6e8cd614 100644 #clock-cells = <0>; clock-frequency = <14745600>; -- -2.18.2 +2.18.4 -From d41262044afc19f70738c5b7dc16192b0d6792f3 Mon Sep 17 00:00:00 2001 +From e20a1921b60914a86b9ed495c2e03547d6970e2e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jul 2020 18:06:24 +0100 -Subject: [PATCH 1062/1113] overlays: Delete spi0-hw-cs +Subject: [PATCH 1062/1148] 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 @@ -456225,13 +456225,13 @@ index 168a0dc80ad1..000000000000 - }; -}; -- -2.18.2 +2.18.4 -From 4669728c857e0a5ec4a24c00cf5194c5ae7d5b9f Mon Sep 17 00:00:00 2001 +From 00581ddf750606a2280c4422fc92aa85abe884ce Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Tue, 22 Oct 2019 10:36:24 +0200 -Subject: [PATCH 1063/1113] backlight: gpio: Explicitly set the direction of +Subject: [PATCH 1063/1148] backlight: gpio: Explicitly set the direction of the GPIO commit 706dc68102bc7421a9e6573d149ab6d769d71cc7 upstream. @@ -456319,13 +456319,13 @@ index 18e053e4716c..40e94eb7a7b3 100644 platform_set_drvdata(pdev, bl); return 0; -- -2.18.2 +2.18.4 -From 1d96254c30e2afd4084b64c42ed6ffdb173a705b Mon Sep 17 00:00:00 2001 +From 0c273ae423b3826924cac69363e0eee9a044c292 Mon Sep 17 00:00:00 2001 From: Dougie Lawson Date: Mon, 27 Jul 2020 23:52:40 +0100 -Subject: [PATCH 1064/1113] overlays: Add maxtherm overlay for MAX6675/31855 +Subject: [PATCH 1064/1148] overlays: Add maxtherm overlay for MAX6675/31855 Add an overlay - maxtherm - to support the MAX6675 and MAX31855 family of thermocouples. @@ -456568,13 +456568,13 @@ index 000000000000..34d5727069ec + }; +}; -- -2.18.2 +2.18.4 -From 8a57798c8356a9d110155db732d2ea7a9aae885e Mon Sep 17 00:00:00 2001 +From 582429715da2f3f95d89f6dfca0d68b194d917f5 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Sun, 2 Aug 2020 18:19:43 +0000 -Subject: [PATCH 1065/1113] configs: add CONFIG_SENSORS_IIO_HWMON=m +Subject: [PATCH 1065/1148] 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 @@ -456651,13 +456651,13 @@ index feca764ecd74..497a14e0a6aa 100644 CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SHTC1=m -- -2.18.2 +2.18.4 -From 53f68b99c74985dfb08a9667df0d40e2a0986158 Mon Sep 17 00:00:00 2001 +From 1f0f7b4639bb162a11712fa79f0f18822f518cc0 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Sun, 2 Aug 2020 18:25:07 +0000 -Subject: [PATCH 1066/1113] dtoverlays: Add the iio_hwmon driver to correct ADC +Subject: [PATCH 1066/1148] dtoverlays: Add the iio_hwmon driver to correct ADC issues The Linux kernel maintainers removed the hwmon driver for the @@ -456697,13 +456697,13 @@ index 08bfce0edb23..d18187d7f343 100644 adc_ch4: channel@4 { reg = <4>; -- -2.18.2 +2.18.4 -From 5c54a5d1340d96b419ca6a5393dde0e2e3ed7877 Mon Sep 17 00:00:00 2001 +From 0e4de8b1ae2a9a1162396327bf7a77b14d6e81bb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2020 14:03:44 +0200 -Subject: [PATCH 1067/1113] Revert "ath9k: Fix general protection fault in +Subject: [PATCH 1067/1148] Revert "ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb" This reverts commit b5c8896bc14f54e5c4dd5a6e42879f125b8abd2d which is @@ -456888,13 +456888,13 @@ index 5985aa15ca93..a94e7e1c86e9 100644 #define HIF_USB_TX_FLUSH BIT(1) -- -2.18.2 +2.18.4 -From ccd971a872c30cf260a38d6f643c51737b875059 Mon Sep 17 00:00:00 2001 +From 69a84ccb9346fb4e757b603492d60c844eaedbbe Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 7 Aug 2020 13:55:18 +0100 -Subject: [PATCH 1068/1113] dts: bcm2711: Disable DVP by default +Subject: [PATCH 1068/1148] 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 @@ -456940,13 +456940,13 @@ index 935e9469e318..3c662cea4e1f 100644 audio = <0>,"!17"; audio1 = <0>,"!18"; -- -2.18.2 +2.18.4 -From 5028e7db3d64dfdeb4c4be774d17d410284726c9 Mon Sep 17 00:00:00 2001 +From 0ddc7fe913fcb29667e6e4e402e3c382ff9e4bdb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Aug 2020 17:34:27 +0100 -Subject: [PATCH 1069/1113] config: Add USB gadget support to bcm2711 config +Subject: [PATCH 1069/1148] config: Add USB gadget support to bcm2711 config Signed-off-by: Phil Elwell --- @@ -456999,13 +456999,13 @@ index 085507434521..7ea2b663bdc0 100644 CONFIG_IIO=m CONFIG_IIO_BUFFER_CB=m -- -2.18.2 +2.18.4 -From 1547c94310a8267e73c3f2e52091da1ec3cdf904 Mon Sep 17 00:00:00 2001 +From 093c1764556350fc1760456361ecc2d0942c0bd7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Aug 2020 17:35:48 +0100 -Subject: [PATCH 1070/1113] ARM: dts: Add required USB power domain for XCHI +Subject: [PATCH 1070/1148] 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 @@ -457029,13 +457029,13 @@ index 0d804cc824e0..b624ab54ad05 100644 hevc-decoder@7eb00000 { -- -2.18.2 +2.18.4 -From 84640bab0779f88f297127a7d3ed79a6d7380bdf Mon Sep 17 00:00:00 2001 +From 3fc4908e69a0d101e26e8a56af71770cde5436a9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Aug 2020 10:15:52 +0100 -Subject: [PATCH 1071/1113] overlays: Regenerate upstream-pi4 +Subject: [PATCH 1071/1148] 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. @@ -457063,13 +457063,13 @@ index 30130f09fbc6..d88bbcfc36d1 100644 #address-cells = <1>; #size-cells = <1>; -- -2.18.2 +2.18.4 -From e06e4158eb1a89f177471c1309205a1290b691a1 Mon Sep 17 00:00:00 2001 +From 19aa40565fbfe679fa23c66fbfaf0877c81e9560 Mon Sep 17 00:00:00 2001 From: Qiujun Huang Date: Sat, 4 Apr 2020 12:18:38 +0800 -Subject: [PATCH 1072/1113] ath9k: Fix general protection fault in +Subject: [PATCH 1072/1148] ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -457288,13 +457288,13 @@ index a94e7e1c86e9..5985aa15ca93 100644 #define HIF_USB_TX_FLUSH BIT(1) -- -2.18.2 +2.18.4 -From 270b2460876714501172c89734ad5f7a4811d419 Mon Sep 17 00:00:00 2001 +From 71f63c3533c28c03d51033ce5bbdc4d49044f1cd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Jul 2020 16:42:57 +0100 -Subject: [PATCH 1073/1113] drm/vc4: Increase the number of planes per crtc in +Subject: [PATCH 1073/1148] drm/vc4: Increase the number of planes per crtc in FKMS. The number assigned was arbitrary as one primary, one overlay, @@ -457399,13 +457399,13 @@ index 7802020cc3c0..bafdd1265289 100644 vc4_encoder = devm_kzalloc(dev, sizeof(*vc4_encoder), GFP_KERNEL); -- -2.18.2 +2.18.4 -From 6595c1bb7b97df92cdc7141495f3fcde82ce1726 Mon Sep 17 00:00:00 2001 +From ae6a9226e08abcee60a90e1b3e2082aaa1631a61 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 18:29:56 +0100 -Subject: [PATCH 1074/1113] drm/vc4: Set the possible crtcs mask correctly for +Subject: [PATCH 1074/1148] drm/vc4: Set the possible crtcs mask correctly for planes with FKMS The driver was assigning all planes to crtcs when actually they're @@ -457445,13 +457445,13 @@ index bafdd1265289..0063d78a1b4a 100644 if (!vc4_encoder) return -ENOMEM; -- -2.18.2 +2.18.4 -From 035da2364c62fa91e5f0047c77b90f2d4d78cd3e Mon Sep 17 00:00:00 2001 +From 9688180768401c4cfa2f4aa752070708229ece67 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 16:58:18 +0100 -Subject: [PATCH 1075/1113] staging: vc04_services: codec: Fix incorrect buffer +Subject: [PATCH 1075/1148] staging: vc04_services: codec: Fix incorrect buffer cleanup The allocated input and output buffers are initialised in @@ -457503,13 +457503,13 @@ index 3fe81979aaa1..b6c5a66b4b4a 100644 /* If both ports disabled, then disable the component */ if (!ctx->component->input[0].enabled && -- -2.18.2 +2.18.4 -From 05a64a948f14d7aa69e51aaad6b783336c895ed5 Mon Sep 17 00:00:00 2001 +From 8092202722e433f84dc51ec5bb59d0be72589691 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 17:01:27 +0100 -Subject: [PATCH 1076/1113] staging: vc04_service: codec: Allow start_streaming +Subject: [PATCH 1076/1148] staging: vc04_service: codec: Allow start_streaming to update the buffernum start_streaming passes a count of how many buffers have been queued @@ -457579,13 +457579,13 @@ index b6c5a66b4b4a..427048c0ea31 100644 if (ret) v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed enabling o/p port, ret %d\n", -- -2.18.2 +2.18.4 -From a3739b9802e49d0ea77b8043734982b8b62a6d43 Mon Sep 17 00:00:00 2001 +From 3107e97642ec9035d29c1518e9c970550aab88c4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 17:04:53 +0100 -Subject: [PATCH 1077/1113] staging: vc04_services: codec: Fix component +Subject: [PATCH 1077/1148] staging: vc04_services: codec: Fix component enable/disable start_streaming enabled the VPU component if ctx->component_enabled @@ -457623,13 +457623,13 @@ index 427048c0ea31..14c47e2ea995 100644 if (V4L2_TYPE_IS_OUTPUT(q->type)) -- -2.18.2 +2.18.4 -From ac0a784ab69a328a9d9dcf92b70257fddbe7ff1c Mon Sep 17 00:00:00 2001 +From 550787a4cf659e0dbbdacce272a754e52f0cc3c4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 14 Aug 2020 17:29:29 +0100 -Subject: [PATCH 1078/1113] configs: Add USB_GADGET=m to bcmrpi3_defconfig +Subject: [PATCH 1078/1148] configs: Add USB_GADGET=m to bcmrpi3_defconfig See: https://github.com/raspberrypi/linux/issues/3796 @@ -457651,13 +457651,13 @@ index 497a14e0a6aa..65432c855202 100644 CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y -- -2.18.2 +2.18.4 -From 3a74d4c3072591ff84e9affc0e7ac203dd88dc65 Mon Sep 17 00:00:00 2001 +From 1be4bb0fd429ec4aa52c98a8ecfb30d8e1bd9e66 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 1079/1113] update rpi-display-overlay.dts pins for 5.4 +Subject: [PATCH 1079/1148] update rpi-display-overlay.dts pins for 5.4 --- arch/arm/boot/dts/overlays/rpi-display-overlay.dts | 6 +++--- @@ -457689,13 +457689,13 @@ index a5eed07d6a4b..de87432ff2be 100644 ti,pressure-max = /bits/ 16 <255>; }; -- -2.18.2 +2.18.4 -From 1ad34a9fbcc84afcc128d6216ad783e3af0c01e9 Mon Sep 17 00:00:00 2001 +From 2b4296e2c6f462c196bccf97e2b277d5751ae4ba Mon Sep 17 00:00:00 2001 From: "Ziqian SUN (Zamir)" Date: Sat, 11 Apr 2020 09:34:27 +0800 -Subject: [PATCH 1080/1113] Bluetooth: btrtl: Add support for RTL8761B +Subject: [PATCH 1080/1148] Bluetooth: btrtl: Add support for RTL8761B commit 04896832c94aae4842100cafb8d3a73e1bed3a45 upstream. @@ -457739,7 +457739,7 @@ Signed-off-by: Marcel Holtmann 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c -index bf3c02be6930..e4041607863b 100644 +index 0dfaf90a31b0..6cfdef7fc4b1 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -130,12 +130,19 @@ static const struct id_table ic_id_table[] = { @@ -457772,13 +457772,13 @@ index bf3c02be6930..e4041607863b 100644 min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3; -- -2.18.2 +2.18.4 -From bf422ee83f72a285c94ae8e9faa58f87e61084d1 Mon Sep 17 00:00:00 2001 +From 426c25e940ff563d8ba49a3cd93539ec01fd4252 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 17 Aug 2020 18:11:47 +0100 -Subject: [PATCH 1081/1113] dtoverlays: Add overlay for the PCA953x family of +Subject: [PATCH 1081/1148] dtoverlays: Add overlay for the PCA953x family of GPIO expanders Adds an overlay for configuring all the GPIO expanders supported @@ -458098,13 +458098,13 @@ index 000000000000..8b6ee44665ce + }; +}; -- -2.18.2 +2.18.4 -From 485a12a49a29586fc12381b20d487eb5603ac53c Mon Sep 17 00:00:00 2001 +From 7818388ad029c859863b7696228964fc061166d2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 15 May 2020 16:28:32 +0100 -Subject: [PATCH 1082/1113] rtc: rv3028: Write BSM and TCE/TCR to EEPROM +Subject: [PATCH 1082/1148] 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 @@ -458224,13 +458224,13 @@ index 8b2446909a1b..e02ae4b1cbc2 100644 ret = rtc_add_group(rv3028->rtc, &rv3028_attr_group); -- -2.18.2 +2.18.4 -From 0b33a8c77b462ce39bd874154d381684ebbb321b Mon Sep 17 00:00:00 2001 +From 2304e4f024f2e94457689cbb7716d605fe70f741 Mon Sep 17 00:00:00 2001 From: Einar Vading Date: Fri, 14 Aug 2020 22:14:41 +0200 -Subject: [PATCH 1083/1113] rtc: rv3028: Refresh RAM on EEPROM write +Subject: [PATCH 1083/1148] 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. @@ -458322,13 +458322,13 @@ index e02ae4b1cbc2..99d10d7ead2f 100644 } -- -2.18.2 +2.18.4 -From 36f50d0853dfe5acab1067def04affb1aa061603 Mon Sep 17 00:00:00 2001 +From 2cf36579f9a4801cc16f16b7367593d96154e6a5 Mon Sep 17 00:00:00 2001 From: Thomas Preston Date: Thu, 13 Aug 2020 01:38:35 +0100 -Subject: [PATCH 1084/1113] dt/overlays: Add PiFace Digital Device Tree Overlay +Subject: [PATCH 1084/1148] dt/overlays: Add PiFace Digital Device Tree Overlay The PiFace Digital is a convenient breakout board for the Microchip mcp23s17 SPI GPIO port expander. @@ -458532,13 +458532,13 @@ index 000000000000..532a858683d6 + }; +}; -- -2.18.2 +2.18.4 -From b289bfe6349d2396cd4792a468df89ce8f83bae1 Mon Sep 17 00:00:00 2001 +From 4c4fd77ceb007b81f1d4c5f88858b41f05c2f50c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 18 Aug 2020 13:16:39 +0100 -Subject: [PATCH 1085/1113] configs: Add CONFIG_UEVENT_HELPER=y +Subject: [PATCH 1085/1148] configs: Add CONFIG_UEVENT_HELPER=y See: https://github.com/raspberrypi/linux/issues/3785 @@ -458612,13 +458612,13 @@ index 65432c855202..9c6ada12bebf 100644 CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=m -- -2.18.2 +2.18.4 -From 535013c3e1ee737086947d82948f4dec124f0c3c Mon Sep 17 00:00:00 2001 +From c3986f944cefdab84a5bc5906bd2051521482b7d Mon Sep 17 00:00:00 2001 From: RICCIARDI-Adrien Date: Thu, 20 Aug 2020 10:18:35 +0200 -Subject: [PATCH 1086/1113] overlays: Updated MCP3008 compatible strings. +Subject: [PATCH 1086/1148] overlays: Updated MCP3008 compatible strings. Used recommended ones from Documentation/devicetree/bindings/iio/adc/mcp320x.txt. --- @@ -458702,13 +458702,13 @@ index 0b7d9f75546e..957fdb9310af 100755 spi-max-frequency = <1600000>; }; -- -2.18.2 +2.18.4 -From 3bc89b5af7cf850efaed34c7ca4913eeaaab8045 Mon Sep 17 00:00:00 2001 +From 1e990365bf6177aac89e6246f0673c93b44774b2 Mon Sep 17 00:00:00 2001 From: Ramin Moussavi Date: Sat, 25 Jul 2020 22:31:49 +0200 -Subject: [PATCH 1087/1113] RESET_CONTROLLER needs to be activated to compile +Subject: [PATCH 1087/1148] RESET_CONTROLLER needs to be activated to compile Broadcom BCM2835 clock support --- @@ -458728,13 +458728,13 @@ index 03bbd8040451..2d32eeca0153 100644 Enable common clock framework support for Broadcom BCM2835 SoCs. -- -2.18.2 +2.18.4 -From 3aba5fe0d2ae7908056efef31c8f46df531ab26c Mon Sep 17 00:00:00 2001 +From 79d9533d77622de680f08aaf670606a833e66e28 Mon Sep 17 00:00:00 2001 From: Andrei Koshkosh Date: Sun, 29 Sep 2019 05:04:05 -0300 -Subject: [PATCH 1088/1113] media: dvbsky: use a single mutex and state buffers +Subject: [PATCH 1088/1148] media: dvbsky: use a single mutex and state buffers for all R/W ops commit cecf0bbbcb6f035a5ca2197f3e11ec2b7fb3da83 upstream. @@ -458798,13 +458798,13 @@ index dc380c0c9536..199ba6a8201f 100644 state->last_lock = 0; -- -2.18.2 +2.18.4 -From 240efe21f27b8e7ac4ec90a22c351b6332007d07 Mon Sep 17 00:00:00 2001 +From 31018f29f6f2ea9b387c0cc1c1250ad6f189cd9f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 24 Aug 2020 17:11:34 +0100 -Subject: [PATCH 1089/1113] ARM: dts: bcm2711: Enable support for DDR52 eMMC +Subject: [PATCH 1089/1148] ARM: dts: bcm2711: Enable support for DDR52 eMMC See: https://github.com/raspberrypi/linux/issues/3802 @@ -458826,13 +458826,13 @@ index b624ab54ad05..0556c73e332a 100644 + mmc-ddr-3_3v; +}; -- -2.18.2 +2.18.4 -From 7870142f16f8a1f96d1492102c169924d0fcb1e6 Mon Sep 17 00:00:00 2001 +From 46e19fa526714dccd96416a83d666a118ed59ba7 Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Mon, 24 Aug 2020 17:14:29 +0900 -Subject: [PATCH 1090/1113] staging: vc04_services: ISP: Fix dmabuf error check +Subject: [PATCH 1090/1148] 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, @@ -458857,13 +458857,13 @@ index db38649124b7..f3703f2a0143 100644 ret = vc_sm_cma_import_dmabuf(dmabuf, -- -2.18.2 +2.18.4 -From 659e0c8796b2df6448b0f35649f518111047d05a Mon Sep 17 00:00:00 2001 +From 78851361aa8e9f8dd52d049cf7549f6c3f38b983 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 24 Aug 2020 18:28:52 +0100 -Subject: [PATCH 1091/1113] ARM: dts: bcm2708.dtsi: Don't delete the cpus node +Subject: [PATCH 1091/1148] 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 @@ -458889,13 +458889,13 @@ index a32ff21613ed..36ec4989403f 100644 arm_freq; }; -- -2.18.2 +2.18.4 -From 9064741c9cf042359b7b9daff1fa50b48a380981 Mon Sep 17 00:00:00 2001 +From d5b6f6a053dd8cec4972d307c3e7373f475d52d8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 11:06:20 +0100 -Subject: [PATCH 1092/1113] ARM: dts: bcm2711: Add mmc_ddr_1_8v where possible +Subject: [PATCH 1092/1148] ARM: dts: bcm2711: Add mmc_ddr_1_8v where possible Advertise mmc_ddr_1_8v on platforms that support 1.8V SD/MMC DDR52. @@ -458934,13 +458934,13 @@ index d4ea928e30ce..823aeeca393d 100644 status = "okay"; }; -- -2.18.2 +2.18.4 -From f32767eafb7d15e812cb9cdd3db7e8b04d34cbad Mon Sep 17 00:00:00 2001 +From da6a16630e07c61ad8f3488b27fff061710b3d26 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 14:06:34 +0100 -Subject: [PATCH 1093/1113] configs: Add I2C_HID=m +Subject: [PATCH 1093/1148] configs: Add I2C_HID=m Enable support for I2C HID devices. @@ -459016,13 +459016,13 @@ index 9c6ada12bebf..f278668e178d 100644 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_MON=m -- -2.18.2 +2.18.4 -From 019910aad9cf8bc052a90a042ff53a57411ce436 Mon Sep 17 00:00:00 2001 +From 7efdb4a2fc8b2c4eb62d0e4aae6c0971a338bbe3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 14:19:51 +0100 -Subject: [PATCH 1094/1113] Revert "ARM: dts: bcm2711: Add mmc_ddr_1_8v where +Subject: [PATCH 1094/1148] Revert "ARM: dts: bcm2711: Add mmc_ddr_1_8v where possible" The commit being reverted has been seen to prevent booting with an eMMC @@ -459063,13 +459063,13 @@ index 823aeeca393d..d4ea928e30ce 100644 status = "okay"; }; -- -2.18.2 +2.18.4 -From 466bba2f5881c338f011ac721b27b8e4c9771b82 Mon Sep 17 00:00:00 2001 +From 5e322602c5c89359ef4f5d03ca373c624892155c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 17:08:17 +0100 -Subject: [PATCH 1095/1113] configs: Add CONFIG_SPS30=m +Subject: [PATCH 1095/1148] 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 @@ -459147,13 +459147,13 @@ index f278668e178d..a69ed1899039 100644 CONFIG_HTU21=m CONFIG_APDS9960=m -- -2.18.2 +2.18.4 -From cc8beeacac4fd437f15d95f3ac8af24122f597ca Mon Sep 17 00:00:00 2001 +From 40a4f8b64720e6a846d58d85670805e8f1765b80 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 24 Aug 2020 17:30:06 +0100 -Subject: [PATCH 1096/1113] Revert "raspberrypi-cpufreq: Only report integer +Subject: [PATCH 1096/1148] Revert "raspberrypi-cpufreq: Only report integer pll divisor frequencies" This reverts commit f44019c198fdfea0c880f5e64641b8a43c13e829. @@ -459194,13 +459194,13 @@ index 8bcfab2749a8..2bc7d9734272 100644 if (ret) goto remove_opp; -- -2.18.2 +2.18.4 -From 2a4db30342f9f648e4e50e477e62d966c7913a43 Mon Sep 17 00:00:00 2001 +From e812d5e66ec6d3a0c84efd0fd68bbdf75c657dcd Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 25 Aug 2020 11:26:04 +0100 -Subject: [PATCH 1097/1113] configs: Enable upstream cpufreq driver for pi0/pi1 +Subject: [PATCH 1097/1148] configs: Enable upstream cpufreq driver for pi0/pi1 Signed-off-by: popcornmix --- @@ -459222,13 +459222,13 @@ index 9789478cc4d1..d681885c1d2b 100644 # CONFIG_SUSPEND is not set CONFIG_PM=y -- -2.18.2 +2.18.4 -From 2b52f27416d900edc6c54e6d89d729611cba7084 Mon Sep 17 00:00:00 2001 +From b7c5c345df30900654ff23ac9550fee374ea6f5c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Aug 2020 17:57:18 +0100 -Subject: [PATCH 1098/1113] ARM: dts: bcm2835: Use the L2 non-allocating alias +Subject: [PATCH 1098/1148] 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 @@ -459258,13 +459258,13 @@ index 53bf4579cc22..b94d5ec3f332 100644 arm-pmu { -- -2.18.2 +2.18.4 -From fbcc3bde86a786df682d5c150d8875fb98657743 Mon Sep 17 00:00:00 2001 +From ddf3c7b428b04fe62c51f0cadf1de2af216fc28a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 27 Aug 2020 16:30:26 +0100 -Subject: [PATCH 1099/1113] media: bcm2835-unicam: Drop WARN on uing direct +Subject: [PATCH 1099/1148] media: bcm2835-unicam: Drop WARN on uing direct cache alias Pi 0&1 pass all ARM accesses through the VPU L2 cache, therefore @@ -459298,13 +459298,13 @@ index 57c3c5f5db56..6501fb205e20 100644 reg_write(dev, UNICAM_IBSA0, dmaaddr); reg_write(dev, UNICAM_IBEA0, endaddr); -- -2.18.2 +2.18.4 -From 68b2f47210d9d9f0bea7b3af54db83f2d82dffe8 Mon Sep 17 00:00:00 2001 +From af96354422ef8cb00962a4fdc9055bceaaff36fc Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 Jul 2020 12:40:50 +0100 -Subject: [PATCH 1100/1113] media: i2c: tc358743: Only allow supported pixel +Subject: [PATCH 1100/1148] media: i2c: tc358743: Only allow supported pixel fmts in set_fmt Fix commit "media: tc358743: Return an appropriate colorspace from @@ -459334,13 +459334,13 @@ index 4831f14197b2..fe34ae82d8d7 100644 if (ret) return ret; -- -2.18.2 +2.18.4 -From 6b4ce89a6d599c427702a0af02e14ef35ede32a0 Mon Sep 17 00:00:00 2001 +From 8c7e85c8a5448a205d765310b154d10816f9e691 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 18:29:10 +0100 -Subject: [PATCH 1101/1113] media: i2c: ov9281: Add support for 8 bit readout +Subject: [PATCH 1101/1148] 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. @@ -459528,13 +459528,13 @@ index bb8efc3d3cba..9610c24ceff1 100644 h_blank = mode->hts_def - mode->width; ov9281->hblank = v4l2_ctrl_new_std(handler, NULL, V4L2_CID_HBLANK, -- -2.18.2 +2.18.4 -From 0f68df163b2d78ef41a50153790f855e72d0708c Mon Sep 17 00:00:00 2001 +From 5e3b8ef208a16d90e75614df8e6e7edb79335a2d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Aug 2020 12:55:41 +0100 -Subject: [PATCH 1102/1113] overlays: Add spi0-1cs and spi0-2cs +Subject: [PATCH 1102/1148] 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 @@ -459694,13 +459694,13 @@ index ff41439a483a..df6519537c3a 100644 }; }; -- -2.18.2 +2.18.4 -From 4ec256c898ee88036d381ca9695262fddcb75e8b Mon Sep 17 00:00:00 2001 +From 31e21f57011119551e7c9e1471aa900bb1aeb653 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Aug 2020 22:04:05 +0100 -Subject: [PATCH 1103/1113] overlays: Fix error in README +Subject: [PATCH 1103/1148] overlays: Fix error in README spi0-cs has been renamed spi0-2cs, not spi0-1cs. @@ -459723,13 +459723,13 @@ index a0adf476eafa..e2d90595c3c0 100644 Load: -- -2.18.2 +2.18.4 -From 71bc23de1891d09a0c0c0b1d4a42d762e29613da Mon Sep 17 00:00:00 2001 +From 0dd4e889d4de7b59ab7033b01b3fdedccb777ab4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 15:46:28 +0100 -Subject: [PATCH 1104/1113] configs: Make the evdev module a built-in +Subject: [PATCH 1104/1148] 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 @@ -459813,13 +459813,13 @@ index a69ed1899039..93c935bc9fb6 100644 CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_MATRIX=m -- -2.18.2 +2.18.4 -From 0769225279bf01fda81487ca694384551c0c4dfb Mon Sep 17 00:00:00 2001 +From 09a6e7c0fbea9bbcdff6cbf16dd755274721de7e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 17:31:31 +0100 -Subject: [PATCH 1105/1113] configs: Include AppArmor support +Subject: [PATCH 1105/1148] 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 @@ -460025,13 +460025,13 @@ index 93c935bc9fb6..e5696e1c86c2 100644 CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m -- -2.18.2 +2.18.4 -From 8d1ff0355a26f9cb6707f4eeb87f747b82e5c1f3 Mon Sep 17 00:00:00 2001 +From 5890cc4ff58cb21c3ed0d5c49fcbbf03ddfc2df9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 2 Sep 2020 08:39:57 +0100 -Subject: [PATCH 1106/1113] overlays: Minor README correction +Subject: [PATCH 1106/1148] overlays: Minor README correction Signed-off-by: Phil Elwell --- @@ -460052,13 +460052,13 @@ index e2d90595c3c0..9662d297ac6f 100644 legal values. -- -2.18.2 +2.18.4 -From afa1c82bc717680075fdebebfcd852c4cd835927 Mon Sep 17 00:00:00 2001 +From 835ce90caf039601f6e5522cd71280c62696fa28 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 18:15:27 +0100 -Subject: [PATCH 1107/1113] staging/fbtft: Add support for display variants +Subject: [PATCH 1107/1148] 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 @@ -460266,13 +460266,13 @@ index 9b6bdb62093d..c5703cd5ec7d 100644 /* shorthand debug levels */ -- -2.18.2 +2.18.4 -From ad3e3a687eab31fa023a7f48305cb895e1d6dead Mon Sep 17 00:00:00 2001 +From d7f495f5ed8fe69dea913658ce65fcc9c8b99a8e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 3 Sep 2020 17:36:00 +0100 -Subject: [PATCH 1108/1113] overlays: Add adafruit18 and sainsmart18 overlays +Subject: [PATCH 1108/1148] overlays: Add adafruit18 and sainsmart18 overlays Add support for three ST7735R-based displays - adafruit18, adafruit18_green and sainsmart18. @@ -460449,13 +460449,13 @@ index 000000000000..38bbe2cfc207 + }; +}; -- -2.18.2 +2.18.4 -From 6ab45160e4bcb93e275a4b26157a589ed8e2739e Mon Sep 17 00:00:00 2001 +From 2eaea70c790c0e903c71be2416affec7bd8ea0ab Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 4 Sep 2020 09:04:29 +0100 -Subject: [PATCH 1109/1113] ARM: dts: Limit BT modem baud rate on 3B +Subject: [PATCH 1109/1148] 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 @@ -460483,13 +460483,13 @@ index e833915a7854..7dc3ef47e78f 100644 pinctrl-names = "default"; pinctrl-0 = <&spi0_pins &spi0_cs_pins>; -- -2.18.2 +2.18.4 -From 46e13b9282023c01c06523a5cdc2a8f76333ee18 Mon Sep 17 00:00:00 2001 +From 6245dc18d09233e063036159cd1d00254d5fb540 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Sep 2020 13:47:20 +0100 -Subject: [PATCH 1110/1113] configs: Enable CHACHA20POLY1305=m +Subject: [PATCH 1110/1148] configs: Enable CHACHA20POLY1305=m Enable the CHACHA20 cipher, a high-performance AES alternative, and the POLY1305 authentication algorithm. Together they make up RFC-7539. @@ -460568,13 +460568,13 @@ index e5696e1c86c2..a32bad78a0a3 100644 CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m -- -2.18.2 +2.18.4 -From a43c9ca28575d4e65ce54aadb1a2626e845c3160 Mon Sep 17 00:00:00 2001 +From bba1c26da073eb88613035191e99a438ee8e932b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 3 Sep 2020 14:59:40 +0100 -Subject: [PATCH 1111/1113] overlays: Update i2c0 overlay to disable the +Subject: [PATCH 1111/1148] overlays: Update i2c0 overlay to disable the i2c0mux. The i2c0 overlay was assigning pinctrl settings to node i2c0, @@ -460646,13 +460646,13 @@ index 6b1f9ec6c878..7c6771f84d8e 100644 pins_0_1 = <0>,"+1-2-3-4"; pins_28_29 = <0>,"-1+2-3-4"; -- -2.18.2 +2.18.4 -From f729ab93f0a32df8779eacf8bdefcdb1552c0c6a Mon Sep 17 00:00:00 2001 +From 88dc424e3ae1ba8bd2ba50b936f95846cb8a90c2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 3 Sep 2020 15:12:50 +0100 -Subject: [PATCH 1112/1113] dt: Remove duplicate assignment for i2c0 pinctrl +Subject: [PATCH 1112/1148] dt: Remove duplicate assignment for i2c0 pinctrl config The include file bcm283x-rpi-i2c0mux_0_XX.dtsi was setting @@ -460825,13 +460825,13 @@ index 88f7fe53b97f..f972979281f5 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; -- -2.18.2 +2.18.4 -From 56782aa9f2536812a0fd2b86fef8b5327257906f Mon Sep 17 00:00:00 2001 +From 9af68c1ed37bed7d24d705f254a4d7f08217d6e7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 27 Aug 2020 18:57:26 +0100 -Subject: [PATCH 1113/1113] overlays: Add option for composite to +Subject: [PATCH 1113/1148] overlays: Add option for composite to vc4-kms-v3d-pi4. Composite is an alternative to HDMI/DPI/DSI on Pi4 as it @@ -460901,5 +460901,3496 @@ index 3c662cea4e1f..f721f12d729d 100644 }; }; -- -2.18.2 +2.18.4 + + +From 68d72ea4a0c192250920052976f99912ffa7e0a6 Mon Sep 17 00:00:00 2001 +From: lsellens +Date: Mon, 14 Sep 2020 22:35:39 -0500 +Subject: [PATCH 1114/1148] minor typo in directions + +--- + arch/arm/boot/dts/overlays/gpio-fan-overlay.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts +index 0b14981b4824..77a7bbb41e3b 100644 +--- a/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts ++++ b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts +@@ -31,7 +31,7 @@ + * - sudo nano /boot/config.txt add "dtoverlay=gpio-fan" or "dtoverlay=gpio-fan,gpiopin=12,temp=45000" + * or + * - sudo sh -c 'printf "\n# Enable PI GPIO-Fan Default\ndtoverlay=gpio-fan\n" >> /boot/config.txt' +- * - sudo sh -c 'printf "\n# Enable PI GPIO-Fan Custom\ntoverlay=gpio-fan,gpiopin=12,temp=45000\n" >> /boot/config.txt' ++ * - sudo sh -c 'printf "\n# Enable PI GPIO-Fan Custom\ndtoverlay=gpio-fan,gpiopin=12,temp=45000\n" >> /boot/config.txt' + * + */ + /dts-v1/; +-- +2.18.4 + + +From e8618718dbeb71a0872a25f2bfc55b8371458f12 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 14 Sep 2020 15:49:38 +0100 +Subject: [PATCH 1115/1148] overlays: Regenerate upstream-pi4 overlay + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts +index d88bbcfc36d1..5673f61b7951 100644 +--- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts ++++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts +@@ -134,6 +134,18 @@ + }; + }; + fragment@21 { ++ target = <&pixelvalve3>; ++ __dormant__ { ++ status = "okay"; ++ }; ++ }; ++ fragment@22 { ++ target = <&vec>; ++ __dormant__ { ++ status = "okay"; ++ }; ++ }; ++ fragment@23 { + target = <&usb>; + #address-cells = <1>; + #size-cells = <1>; +-- +2.18.4 + + +From b620f82a87face0a9172d5b27b74ef787e8f5fe9 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 14 Sep 2020 15:48:16 +0100 +Subject: [PATCH 1116/1148] overlays: Add parameters to adafruit18, sainsmart18 + +Also fix polarity of the reset GPIO. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/README | 13 +++++++++++++ + arch/arm/boot/dts/overlays/adafruit18-overlay.dts | 11 +++++++++-- + arch/arm/boot/dts/overlays/sainsmart18-overlay.dts | 10 ++++++++-- + 3 files changed, 30 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 3e583922ac0d..9d21a3eb21dc 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -267,6 +267,13 @@ Info: Overlay for the SPI-connected Adafruit 1.8" display (based on the + Load: dtoverlay=adafruit18,= + Params: green Use the adafruit18_green variant. + rotate Display rotation {0,90,180,270} ++ speed SPI bus speed in Hz (default 4000000) ++ fps Display frame rate in Hz ++ bgr Enable BGR mode (default on) ++ debug Debug output level {0-7} ++ dc_pin GPIO pin for D/C (default 24) ++ reset_pin GPIO pin for RESET (default 25) ++ led_pin GPIO used to control backlight (default 18) + + + Name: adau1977-adc +@@ -2271,6 +2278,12 @@ Info: Overlay for the SPI-connected Sainsmart 1.8" display (based on the + ST7735R chip). + Load: dtoverlay=sainsmart18,= + Params: rotate Display rotation {0,90,180,270} ++ speed SPI bus speed in Hz (default 4000000) ++ fps Display frame rate in Hz ++ bgr Enable BGR mode (default on) ++ debug Debug output level {0-7} ++ dc_pin GPIO pin for D/C (default 24) ++ reset_pin GPIO pin for RESET (default 25) + + + Name: sc16is750-i2c +diff --git a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts +index bd2b1315d444..aae485ab7d6c 100644 +--- a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts ++++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts +@@ -33,7 +33,7 @@ + fps = <50>; + height = <160>; + width = <128>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; + led-gpios = <&gpio 18 0>; + bgr; +@@ -44,6 +44,13 @@ + + __overrides__ { + green = <&af18>, "compatible=fbtft,adafruit18_green"; +- rotate = <&af18>, "rotate:0"; ++ speed = <&af18>,"spi-max-frequency:0"; ++ rotate = <&af18>,"rotate:0"; ++ fps = <&af18>,"fps:0"; ++ bgr = <&af18>,"bgr?"; ++ debug = <&af18>,"debug:0"; ++ dc_pin = <&af18>,"dc-gpios:4"; ++ reset_pin = <&af18>,"reset-gpios:4"; ++ led_pin = <&af18>,"led-gpios:4"; + }; + }; +diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts +index 38bbe2cfc207..ce2f942ba316 100644 +--- a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts ++++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts +@@ -33,7 +33,7 @@ + fps = <50>; + height = <160>; + width = <128>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; + bgr; + debug = <0>; +@@ -42,6 +42,12 @@ + }; + + __overrides__ { +- rotate = <&ss18>, "rotate:0"; ++ speed = <&ss18>,"spi-max-frequency:0"; ++ rotate = <&ss18>,"rotate:0"; ++ fps = <&ss18>,"fps:0"; ++ bgr = <&ss18>,"bgr?"; ++ debug = <&ss18>,"debug:0"; ++ dc_pin = <&ss18>,"dc-gpios:4"; ++ reset_pin = <&ss18>,"reset-gpios:4"; + }; + }; +-- +2.18.4 + + +From cda9ed1f3b50d9597f204f0d383f96435f90b3d1 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Mon, 21 Sep 2020 14:02:44 +0100 +Subject: [PATCH 1117/1148] rpivid_h265: Fix width/height typo + +Signed-off-by: popcornmix +--- + drivers/staging/media/rpivid/rpivid_h265.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c +index 47d4de42c584..b677910e237c 100644 +--- a/drivers/staging/media/rpivid/rpivid_h265.c ++++ b/drivers/staging/media/rpivid/rpivid_h265.c +@@ -2178,7 +2178,7 @@ static int rpivid_h265_start(struct rpivid_ctx *ctx) + if (w > 4096) + w = 4096; + if (h == 0) +- w = 1088; ++ h = 1088; + if (h > 4096) + h = 4096; + wxh = w * h; +-- +2.18.4 + + +From 2d4c4fea7b24ad7fea00461c89bd0f5aca2d0cce Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 21 Sep 2020 22:00:10 +0100 +Subject: [PATCH 1118/1148] overlays: Add extra CMA sizes (up to 512M) + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/README | 24 ++++++++++++++++++---- + arch/arm/boot/dts/overlays/cma-overlay.dts | 4 ++++ + 2 files changed, 24 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 9d21a3eb21dc..afd40f84a342 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -582,7 +582,11 @@ Name: cma + Info: Set custom CMA sizes, only use if you know what you are doing, might + clash with other overlays like vc4-fkms-v3d and vc4-kms-v3d. + Load: dtoverlay=cma,= +-Params: cma-256 CMA is 256MB (needs 1GB) ++Params: cma-512 CMA is 512MB (needs 1GB) ++ cma-448 CMA is 448MB (needs 1GB) ++ cma-384 CMA is 384MB (needs 1GB) ++ cma-320 CMA is 320MB (needs 1GB) ++ cma-256 CMA is 256MB (needs 1GB) + cma-192 CMA is 192MB (needs 1GB) + cma-128 CMA is 128MB + cma-96 CMA is 96MB +@@ -2892,7 +2896,11 @@ Name: vc4-fkms-v3d + Info: Enable Eric Anholt's DRM VC4 V3D driver on top of the dispmanx + display stack. + Load: dtoverlay=vc4-fkms-v3d, +-Params: cma-256 CMA is 256MB (needs 1GB) ++Params: cma-512 CMA is 512MB (needs 1GB) ++ cma-448 CMA is 448MB (needs 1GB) ++ cma-384 CMA is 384MB (needs 1GB) ++ cma-320 CMA is 320MB (needs 1GB) ++ cma-256 CMA is 256MB (needs 1GB) + cma-192 CMA is 192MB (needs 1GB) + cma-128 CMA is 128MB + cma-96 CMA is 96MB +@@ -2911,7 +2919,11 @@ Params: + Name: vc4-kms-v3d + Info: Enable Eric Anholt's DRM VC4 HDMI/HVS/V3D driver. + Load: dtoverlay=vc4-kms-v3d, +-Params: cma-256 CMA is 256MB (needs 1GB) ++Params: cma-512 CMA is 512MB (needs 1GB) ++ cma-448 CMA is 448MB (needs 1GB) ++ cma-384 CMA is 384MB (needs 1GB) ++ cma-320 CMA is 320MB (needs 1GB) ++ cma-256 CMA is 256MB (needs 1GB) + cma-192 CMA is 192MB (needs 1GB) + cma-128 CMA is 128MB + cma-96 CMA is 96MB +@@ -2925,7 +2937,11 @@ Params: cma-256 CMA is 256MB (needs 1GB) + Name: vc4-kms-v3d-pi4 + Info: Enable Eric Anholt's DRM VC4 HDMI/HVS/V3D driver for Pi4. + Load: dtoverlay=vc4-kms-v3d-pi4, +-Params: cma-256 CMA is 256MB ++Params: cma-512 CMA is 512MB ++ cma-448 CMA is 448MB ++ cma-384 CMA is 384MB ++ cma-320 CMA is 320MB ++ cma-256 CMA is 256MB + cma-192 CMA is 192MB + cma-128 CMA is 128MB + cma-96 CMA is 96MB +diff --git a/arch/arm/boot/dts/overlays/cma-overlay.dts b/arch/arm/boot/dts/overlays/cma-overlay.dts +index 4fbdf161672e..1d87c599f909 100644 +--- a/arch/arm/boot/dts/overlays/cma-overlay.dts ++++ b/arch/arm/boot/dts/overlays/cma-overlay.dts +@@ -21,6 +21,10 @@ + }; + + __overrides__ { ++ cma-512 = <&frag0>,"size:0=",<0x20000000>; ++ cma-448 = <&frag0>,"size:0=",<0x1c000000>; ++ cma-384 = <&frag0>,"size:0=",<0x18000000>; ++ cma-320 = <&frag0>,"size:0=",<0x14000000>; + cma-256 = <&frag0>,"size:0=",<0x10000000>; + cma-192 = <&frag0>,"size:0=",<0xC000000>; + cma-128 = <&frag0>,"size:0=",<0x8000000>; +-- +2.18.4 + + +From 17411e38cea9b462a0df1f500366f31bf461dda1 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 21 Sep 2020 22:09:40 +0100 +Subject: [PATCH 1119/1148] overlays: Add note to BCM2711 overlays + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/README | 32 +++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index afd40f84a342..5118f477cc13 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -1403,7 +1403,7 @@ Load: + + + Name: i2c3 +-Info: Enable the i2c3 bus ++Info: Enable the i2c3 bus. BCM2711 only. + Load: dtoverlay=i2c3, + Params: pins_2_3 Use GPIOs 2 and 3 + pins_4_5 Use GPIOs 4 and 5 (default) +@@ -1412,7 +1412,7 @@ Params: pins_2_3 Use GPIOs 2 and 3 + + + Name: i2c4 +-Info: Enable the i2c4 bus ++Info: Enable the i2c4 bus. BCM2711 only. + Load: dtoverlay=i2c4, + Params: pins_6_7 Use GPIOs 6 and 7 + pins_8_9 Use GPIOs 8 and 9 (default) +@@ -1421,7 +1421,7 @@ Params: pins_6_7 Use GPIOs 6 and 7 + + + Name: i2c5 +-Info: Enable the i2c5 bus ++Info: Enable the i2c5 bus. BCM2711 only. + Load: dtoverlay=i2c5, + Params: pins_10_11 Use GPIOs 10 and 11 + pins_12_13 Use GPIOs 12 and 13 (default) +@@ -1430,7 +1430,7 @@ Params: pins_10_11 Use GPIOs 10 and 11 + + + Name: i2c6 +-Info: Enable the i2c6 bus ++Info: Enable the i2c6 bus. BCM2711 only. + Load: dtoverlay=i2c6, + Params: pins_0_1 Use GPIOs 0 and 1 + pins_22_23 Use GPIOs 22 and 23 (default) +@@ -2582,7 +2582,7 @@ Params: cs0_pin GPIO pin for CS0 (default 43 - BCM SPI2_CE0). + Name: spi3-1cs + Info: Enables spi3 with a single chip select (CS) line and associated spidev + dev node. The gpio pin number for the CS line and spidev device node +- creation are configurable. ++ creation are configurable. BCM2711 only. + Load: dtoverlay=spi3-1cs,= + Params: cs0_pin GPIO pin for CS0 (default 0 - BCM SPI3_CE0). + cs0_spidev Set to 'off' to prevent the creation of a +@@ -2593,7 +2593,7 @@ Params: cs0_pin GPIO pin for CS0 (default 0 - BCM SPI3_CE0). + Name: spi3-2cs + Info: Enables spi3 with two chip select (CS) lines and associated spidev + dev nodes. The gpio pin numbers for the CS lines and spidev device node +- creation are configurable. ++ creation are configurable. BCM2711 only. + Load: dtoverlay=spi3-2cs,= + Params: cs0_pin GPIO pin for CS0 (default 0 - BCM SPI3_CE0). + cs1_pin GPIO pin for CS1 (default 24 - BCM SPI3_CE1). +@@ -2608,7 +2608,7 @@ Params: cs0_pin GPIO pin for CS0 (default 0 - BCM SPI3_CE0). + Name: spi4-1cs + Info: Enables spi4 with a single chip select (CS) line and associated spidev + dev node. The gpio pin number for the CS line and spidev device node +- creation are configurable. ++ creation are configurable. BCM2711 only. + Load: dtoverlay=spi4-1cs,= + Params: cs0_pin GPIO pin for CS0 (default 4 - BCM SPI4_CE0). + cs0_spidev Set to 'off' to prevent the creation of a +@@ -2619,7 +2619,7 @@ Params: cs0_pin GPIO pin for CS0 (default 4 - BCM SPI4_CE0). + Name: spi4-2cs + Info: Enables spi4 with two chip select (CS) lines and associated spidev + dev nodes. The gpio pin numbers for the CS lines and spidev device node +- creation are configurable. ++ creation are configurable. BCM2711 only. + Load: dtoverlay=spi4-2cs,= + Params: cs0_pin GPIO pin for CS0 (default 4 - BCM SPI4_CE0). + cs1_pin GPIO pin for CS1 (default 25 - BCM SPI4_CE1). +@@ -2634,7 +2634,7 @@ Params: cs0_pin GPIO pin for CS0 (default 4 - BCM SPI4_CE0). + Name: spi5-1cs + Info: Enables spi5 with a single chip select (CS) line and associated spidev + dev node. The gpio pin numbers for the CS lines and spidev device node +- creation are configurable. ++ creation are configurable. BCM2711 only. + Load: dtoverlay=spi5-1cs,= + Params: cs0_pin GPIO pin for CS0 (default 12 - BCM SPI5_CE0). + cs0_spidev Set to 'off' to prevent the creation of a +@@ -2645,7 +2645,7 @@ Params: cs0_pin GPIO pin for CS0 (default 12 - BCM SPI5_CE0). + Name: spi5-2cs + Info: Enables spi5 with two chip select (CS) lines and associated spidev + dev nodes. The gpio pin numbers for the CS lines and spidev device node +- creation are configurable. ++ creation are configurable. BCM2711 only. + Load: dtoverlay=spi5-2cs,= + Params: cs0_pin GPIO pin for CS0 (default 12 - BCM SPI5_CE0). + cs1_pin GPIO pin for CS1 (default 26 - BCM SPI5_CE1). +@@ -2660,7 +2660,7 @@ Params: cs0_pin GPIO pin for CS0 (default 12 - BCM SPI5_CE0). + Name: spi6-1cs + Info: Enables spi6 with a single chip select (CS) line and associated spidev + dev node. The gpio pin number for the CS line and spidev device node +- creation are configurable. ++ creation are configurable. BCM2711 only. + Load: dtoverlay=spi6-1cs,= + Params: cs0_pin GPIO pin for CS0 (default 18 - BCM SPI6_CE0). + cs0_spidev Set to 'off' to prevent the creation of a +@@ -2671,7 +2671,7 @@ Params: cs0_pin GPIO pin for CS0 (default 18 - BCM SPI6_CE0). + Name: spi6-2cs + Info: Enables spi6 with two chip select (CS) lines and associated spidev + dev nodes. The gpio pin numbers for the CS lines and spidev device node +- creation are configurable. ++ creation are configurable. BCM2711 only. + Load: dtoverlay=spi6-2cs,= + Params: cs0_pin GPIO pin for CS0 (default 18 - BCM SPI6_CE0). + cs1_pin GPIO pin for CS1 (default 27 - BCM SPI6_CE1). +@@ -2843,25 +2843,25 @@ Params: txd1_pin GPIO pin for TXD1 (14, 32 or 40 - default 14) + + + Name: uart2 +-Info: Enable uart 2 on GPIOs 0-3 ++Info: Enable uart 2 on GPIOs 0-3. BCM2711 only. + Load: dtoverlay=uart2, + Params: ctsrts Enable CTS/RTS on GPIOs 2-3 (default off) + + + Name: uart3 +-Info: Enable uart 3 on GPIOs 4-7 ++Info: Enable uart 3 on GPIOs 4-7. BCM2711 only. + Load: dtoverlay=uart3, + Params: ctsrts Enable CTS/RTS on GPIOs 6-7 (default off) + + + Name: uart4 +-Info: Enable uart 4 on GPIOs 8-11 ++Info: Enable uart 4 on GPIOs 8-11. BCM2711 only. + Load: dtoverlay=uart4, + Params: ctsrts Enable CTS/RTS on GPIOs 10-11 (default off) + + + Name: uart5 +-Info: Enable uart 5 on GPIOs 12-15 ++Info: Enable uart 5 on GPIOs 12-15. BCM2711 only. + Load: dtoverlay=uart5, + Params: ctsrts Enable CTS/RTS on GPIOs 14-15 (default off) + +-- +2.18.4 + + +From 37c686b344504ce38bf6b889422bc50d033ed5c0 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 21 Sep 2020 20:45:46 +0100 +Subject: [PATCH 1120/1148] overlays: adafruit18,sainsmart18: default bgr to + off + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/README | 4 ++-- + arch/arm/boot/dts/overlays/adafruit18-overlay.dts | 1 - + arch/arm/boot/dts/overlays/sainsmart18-overlay.dts | 1 - + 3 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 5118f477cc13..8df8283a7677 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -269,7 +269,7 @@ Params: green Use the adafruit18_green variant. + rotate Display rotation {0,90,180,270} + speed SPI bus speed in Hz (default 4000000) + fps Display frame rate in Hz +- bgr Enable BGR mode (default on) ++ bgr Enable BGR mode (default off) + debug Debug output level {0-7} + dc_pin GPIO pin for D/C (default 24) + reset_pin GPIO pin for RESET (default 25) +@@ -2284,7 +2284,7 @@ Load: dtoverlay=sainsmart18,= + Params: rotate Display rotation {0,90,180,270} + speed SPI bus speed in Hz (default 4000000) + fps Display frame rate in Hz +- bgr Enable BGR mode (default on) ++ bgr Enable BGR mode (default off) + debug Debug output level {0-7} + dc_pin GPIO pin for D/C (default 24) + reset_pin GPIO pin for RESET (default 25) +diff --git a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts +index aae485ab7d6c..e1ce94a8cd3e 100644 +--- a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts ++++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts +@@ -36,7 +36,6 @@ + reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; + led-gpios = <&gpio 18 0>; +- bgr; + debug = <0>; + }; + }; +diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts +index ce2f942ba316..c51f1c030a55 100644 +--- a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts ++++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts +@@ -35,7 +35,6 @@ + width = <128>; + reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; +- bgr; + debug = <0>; + }; + }; +-- +2.18.4 + + +From 6496f637ee599645f7123325dbfeee4cfe8b91de Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Fri, 25 Sep 2020 17:50:14 +0100 +Subject: [PATCH 1121/1148] configs: Remove I2C_BRCMSTB from the kernel + +Make it a module on 2711-based platforms, otherwise delete it +altogether, + +Signed-off-by: Phil Elwell +--- + arch/arm/configs/bcm2709_defconfig | 1 + + arch/arm/configs/bcm2711_defconfig | 1 + + arch/arm/configs/bcmrpi_defconfig | 1 + + arch/arm64/configs/bcm2711_defconfig | 1 + + arch/arm64/configs/bcmrpi3_defconfig | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig +index 53557cce7584..d2e674b2637e 100644 +--- a/arch/arm/configs/bcm2709_defconfig ++++ b/arch/arm/configs/bcm2709_defconfig +@@ -671,6 +671,7 @@ CONFIG_I2C_MUX_PCA954x=m + CONFIG_I2C_MUX_PINCTRL=m + CONFIG_I2C_BCM2708=m + CONFIG_I2C_BCM2835=m ++CONFIG_I2C_BRCMSTB=n + CONFIG_I2C_GPIO=m + CONFIG_I2C_ROBOTFUZZ_OSIF=m + CONFIG_I2C_TINY_USB=m +diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig +index 2014e5451ad3..be6b167f6b4f 100644 +--- a/arch/arm/configs/bcm2711_defconfig ++++ b/arch/arm/configs/bcm2711_defconfig +@@ -681,6 +681,7 @@ CONFIG_I2C_MUX_PCA954x=m + CONFIG_I2C_MUX_PINCTRL=m + CONFIG_I2C_BCM2708=m + CONFIG_I2C_BCM2835=m ++CONFIG_I2C_BRCMSTB=m + CONFIG_I2C_GPIO=m + CONFIG_I2C_ROBOTFUZZ_OSIF=m + CONFIG_I2C_TINY_USB=m +diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig +index d112db106414..23a0cb2d3ee3 100644 +--- a/arch/arm/configs/bcmrpi_defconfig ++++ b/arch/arm/configs/bcmrpi_defconfig +@@ -665,6 +665,7 @@ CONFIG_I2C_MUX_PCA954x=m + CONFIG_I2C_MUX_PINCTRL=m + CONFIG_I2C_BCM2708=m + CONFIG_I2C_BCM2835=m ++CONFIG_I2C_BRCMSTB=n + CONFIG_I2C_GPIO=m + CONFIG_I2C_ROBOTFUZZ_OSIF=m + CONFIG_I2C_TINY_USB=m +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index ba3afaa902b7..31655187154f 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -676,6 +676,7 @@ CONFIG_I2C_MUX_PCA954x=m + CONFIG_I2C_MUX_PINCTRL=m + CONFIG_I2C_BCM2708=m + CONFIG_I2C_BCM2835=m ++CONFIG_I2C_BRCMSTB=m + CONFIG_I2C_GPIO=m + CONFIG_I2C_ROBOTFUZZ_OSIF=m + CONFIG_I2C_TINY_USB=m +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index a32bad78a0a3..7f159969011e 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -652,6 +652,7 @@ CONFIG_I2C_MUX_PCA954x=m + CONFIG_I2C_MUX_PINCTRL=m + CONFIG_I2C_BCM2708=m + CONFIG_I2C_BCM2835=m ++CONFIG_I2C_BRCMSTB=n + CONFIG_I2C_GPIO=m + CONFIG_SPI=y + CONFIG_SPI_BCM2835=m +-- +2.18.4 + + +From 18886ae37ce3f0ee74ce45155dc3b0a36dd66b70 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Fri, 25 Sep 2020 15:07:23 +0100 +Subject: [PATCH 1122/1148] 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 +64-byte packet headers are enabled then this can be fatal. + +Extend bcmgenet_dma_disable to do perform the reset, but not when +called from bcmgenet_resume in order to preserve a wake packet. + +N.B. This different handling of resume is just based on a hunch - +why else wouldn't one reset the RBUF as well as the TBUF? If this +isn't the case then it's easy to change the patch to make the RBUF +reset unconditional. + +See: https://github.com/raspberrypi/linux/issues/3850 + +Signed-off-by: Phil Elwell +--- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +index 0cb19a1120b6..821596627d76 100644 +--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c ++++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +@@ -2789,7 +2789,7 @@ static void bcmgenet_set_hw_addr(struct bcmgenet_priv *priv, + } + + /* Returns a reusable dma control register value */ +-static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) ++static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv, bool flush_rx) + { + u32 reg; + u32 dma_ctrl; +@@ -2808,6 +2808,14 @@ static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) + udelay(10); + bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH); + ++ if (flush_rx) { ++ reg = bcmgenet_rbuf_ctrl_get(priv); ++ bcmgenet_rbuf_ctrl_set(priv, reg | BIT(0)); ++ udelay(10); ++ bcmgenet_rbuf_ctrl_set(priv, reg); ++ udelay(10); ++ } ++ + return dma_ctrl; + } + +@@ -2909,8 +2917,8 @@ static int bcmgenet_open(struct net_device *dev) + bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT); + } + +- /* Disable RX/TX DMA and flush TX queues */ +- dma_ctrl = bcmgenet_dma_disable(priv); ++ /* Disable RX/TX DMA and flush TX and RX queues */ ++ dma_ctrl = bcmgenet_dma_disable(priv, true); + + /* Reinitialize TDMA and RDMA and SW housekeeping */ + ret = bcmgenet_init_dma(priv); +@@ -3668,7 +3676,7 @@ static int bcmgenet_resume(struct device *d) + bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC); + + /* Disable RX/TX DMA and flush TX queues */ +- dma_ctrl = bcmgenet_dma_disable(priv); ++ dma_ctrl = bcmgenet_dma_disable(priv, false); + + /* Reinitialize TDMA and RDMA and SW housekeeping */ + ret = bcmgenet_init_dma(priv); +-- +2.18.4 + + +From 6091669fb15c3f64ee321b0edfb7b3e6244447c5 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Tue, 29 Sep 2020 15:03:34 +0100 +Subject: [PATCH 1123/1148] 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 +support is disabled. It would be tidy to use the exported match table +in cs42xx8.c's of_match_table member, but an imported symbol can't be +used in a module's MODULE_DEVICE_TABLE declaration. Instead, rename +the duplicated declarations so as not to clash. + +See: https://github.com/raspberrypi/linux/issues/3873 + +Signed-off-by: Phil Elwell +--- + sound/soc/codecs/cs42xx8-i2c.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c +index a4586ea4acf6..b8b15b886c22 100644 +--- a/sound/soc/codecs/cs42xx8-i2c.c ++++ b/sound/soc/codecs/cs42xx8-i2c.c +@@ -45,18 +45,18 @@ static struct i2c_device_id cs42xx8_i2c_id[] = { + }; + MODULE_DEVICE_TABLE(i2c, cs42xx8_i2c_id); + +-const struct of_device_id cs42xx8_of_match[] = { ++const struct of_device_id cs42xx8_i2c_of_match[] = { + { .compatible = "cirrus,cs42448", .data = &cs42448_data, }, + { .compatible = "cirrus,cs42888", .data = &cs42888_data, }, + { /* sentinel */ } + }; +-MODULE_DEVICE_TABLE(of, cs42xx8_of_match); ++MODULE_DEVICE_TABLE(of, cs42xx8_i2c_of_match); + + static struct i2c_driver cs42xx8_i2c_driver = { + .driver = { + .name = "cs42xx8", + .pm = &cs42xx8_pm, +- .of_match_table = cs42xx8_of_match, ++ .of_match_table = cs42xx8_i2c_of_match, + }, + .probe = cs42xx8_i2c_probe, + .remove = cs42xx8_i2c_remove, +-- +2.18.4 + + +From ee40eb43e7154b08134549cc5656690ea4bee980 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 30 Sep 2020 12:28:37 +0100 +Subject: [PATCH 1124/1148] configs: Regenerate the defconfigs + +Signed-off-by: Phil Elwell +--- + arch/arm/configs/bcm2709_defconfig | 2 +- + arch/arm/configs/bcmrpi_defconfig | 2 +- + arch/arm64/configs/bcmrpi3_defconfig | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig +index d2e674b2637e..0862670c700c 100644 +--- a/arch/arm/configs/bcm2709_defconfig ++++ b/arch/arm/configs/bcm2709_defconfig +@@ -671,7 +671,7 @@ CONFIG_I2C_MUX_PCA954x=m + CONFIG_I2C_MUX_PINCTRL=m + CONFIG_I2C_BCM2708=m + CONFIG_I2C_BCM2835=m +-CONFIG_I2C_BRCMSTB=n ++# CONFIG_I2C_BRCMSTB is not set + CONFIG_I2C_GPIO=m + CONFIG_I2C_ROBOTFUZZ_OSIF=m + CONFIG_I2C_TINY_USB=m +diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig +index 23a0cb2d3ee3..1dbac6d45cfe 100644 +--- a/arch/arm/configs/bcmrpi_defconfig ++++ b/arch/arm/configs/bcmrpi_defconfig +@@ -665,7 +665,7 @@ CONFIG_I2C_MUX_PCA954x=m + CONFIG_I2C_MUX_PINCTRL=m + CONFIG_I2C_BCM2708=m + CONFIG_I2C_BCM2835=m +-CONFIG_I2C_BRCMSTB=n ++# CONFIG_I2C_BRCMSTB is not set + CONFIG_I2C_GPIO=m + CONFIG_I2C_ROBOTFUZZ_OSIF=m + CONFIG_I2C_TINY_USB=m +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index 7f159969011e..c838461038e6 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -652,7 +652,7 @@ CONFIG_I2C_MUX_PCA954x=m + CONFIG_I2C_MUX_PINCTRL=m + CONFIG_I2C_BCM2708=m + CONFIG_I2C_BCM2835=m +-CONFIG_I2C_BRCMSTB=n ++# CONFIG_I2C_BRCMSTB is not set + CONFIG_I2C_GPIO=m + CONFIG_SPI=y + CONFIG_SPI_BCM2835=m +-- +2.18.4 + + +From 0fa44841a5a2059d920a4053829c1f4b5230e893 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Wed, 30 Sep 2020 12:12:32 +0100 +Subject: [PATCH 1125/1148] staging: bcm2835-codec: Use a define the completion + timeout + +Hiding a use of "HZ" as a timeout is a little nasty. + +Signed-off-by: Dave Stevenson +--- + .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +index 14c47e2ea995..f3dfc7fda884 100644 +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -89,6 +89,9 @@ static const char * const components[] = { + "ril.isp", + }; + ++/* Timeout for stop_streaming to allow all buffers to return */ ++#define COMPLETE_TIMEOUT (2 * HZ) ++ + #define MIN_W 32 + #define MIN_H 32 + #define MAX_W 1920 +@@ -2366,7 +2369,8 @@ static void bcm2835_codec_stop_streaming(struct vb2_queue *q) + while (atomic_read(&port->buffers_with_vpu)) { + v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Waiting for buffers to be returned - %d outstanding\n", + __func__, atomic_read(&port->buffers_with_vpu)); +- ret = wait_for_completion_timeout(&ctx->frame_cmplt, HZ); ++ ret = wait_for_completion_timeout(&ctx->frame_cmplt, ++ COMPLETE_TIMEOUT); + if (ret <= 0) { + v4l2_err(&ctx->dev->v4l2_dev, "%s: Timeout waiting for buffers to be returned - %d outstanding\n", + __func__, +-- +2.18.4 + + +From 02eab7d73a0197e26f5426f560a196dcac900856 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Wed, 30 Sep 2020 12:13:44 +0100 +Subject: [PATCH 1126/1148] staging: bcm2835-codec: Correct buffer number + change on start streaming + +"cac8c90 staging: vc04_service: codec: Allow start_streaming to update +the buffernum" allowed the number of buffers configured to be decreased +as well as increased, but there is no requirement for all buffers to +have been queued when start_streaming is called. + +Only allow increasing the buffernum. + +Fixes: "cac8c90 staging: vc04_service: codec: Allow start_streaming to update the buffernum" +Signed-off-by: Dave Stevenson +--- + .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +index f3dfc7fda884..b1e00e65ce18 100644 +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -2290,7 +2290,7 @@ static int bcm2835_codec_start_streaming(struct vb2_queue *q, + if (count < port->minimum_buffer.num) + count = port->minimum_buffer.num; + +- if (port->current_buffer.num != count + 1) { ++ if (port->current_buffer.num < count + 1) { + v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: ctx:%p, buffer count changed %u to %u\n", + __func__, ctx, port->current_buffer.num, count + 1); + +-- +2.18.4 + + +From 24f86a87a1dd89f6d89de5f04e780f4d903d70a3 Mon Sep 17 00:00:00 2001 +From: Adrian Carpenter +Date: Wed, 14 Aug 2019 15:33:36 +0100 +Subject: [PATCH 1127/1148] 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. +--- + drivers/usb/dwc2/core_intr.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c +index 6272b4ae4740..11c8893fbc1a 100644 +--- a/drivers/usb/dwc2/core_intr.c ++++ b/drivers/usb/dwc2/core_intr.c +@@ -538,14 +538,11 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg) + __func__); + } + skip_power_saving: +- /* +- * Change to L2 (suspend) state before releasing +- * spinlock +- */ +- hsotg->lx_state = DWC2_L2; ++ /* Raspberry Pi seems to call the suspend interrupt on gadget disconnect, so instead of setting state to suspend set to not attached */ + +- /* Call gadget suspend callback */ +- call_gadget(hsotg, suspend); ++ hsotg->lx_state = DWC2_L3; ++ ++ usb_gadget_set_state(&hsotg->gadget, USB_STATE_NOTATTACHED); + } + } else { + if (hsotg->op_state == OTG_STATE_A_PERIPHERAL) { +-- +2.18.4 + + +From ccd44a3c13f1df77d5ea2739d6285cec0a6ab8d3 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 30 Sep 2020 19:23:43 +0100 +Subject: [PATCH 1128/1148] USB: gadget: f_hid: avoid crashes and log spam + +Disconnecting and reconnecting the USB cable can lead to crashes and a +variety of kernel log spam. Try to fix or minimise both. + +See: https://github.com/raspberrypi/linux/issues/3870 + +Signed-off-by: Phil Elwell +--- + drivers/usb/gadget/function/f_hid.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c +index f3816a5c861e..00fae22e941a 100644 +--- a/drivers/usb/gadget/function/f_hid.c ++++ b/drivers/usb/gadget/function/f_hid.c +@@ -344,6 +344,11 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, + + spin_lock_irqsave(&hidg->write_spinlock, flags); + ++ if (!hidg->req) { ++ spin_unlock_irqrestore(&hidg->write_spinlock, flags); ++ return -ESHUTDOWN; ++ } ++ + #define WRITE_COND (!hidg->write_pending) + try_again: + /* write queue */ +@@ -364,7 +369,13 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, + count = min_t(unsigned, count, hidg->report_length); + + spin_unlock_irqrestore(&hidg->write_spinlock, flags); +- status = copy_from_user(req->buf, buffer, count); ++ if (req) { ++ status = copy_from_user(req->buf, buffer, count); ++ } else { ++ ERROR(hidg->func.config->cdev, "hidg->req is NULL\n"); ++ status = -ESHUTDOWN; ++ goto release_write_pending; ++ } + + if (status != 0) { + ERROR(hidg->func.config->cdev, +@@ -393,6 +404,11 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, + + spin_unlock_irqrestore(&hidg->write_spinlock, flags); + ++ if (!hidg->in_ep->enabled) { ++ ERROR(hidg->func.config->cdev, "in_ep is disabled\n"); ++ status = -ESHUTDOWN; ++ goto release_write_pending; ++ } + status = usb_ep_queue(hidg->in_ep, req, GFP_ATOMIC); + if (status < 0) { + ERROR(hidg->func.config->cdev, +-- +2.18.4 + + +From 6660ff71170361cc79d94b98481b0d92aea0da1b 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 1129/1148] 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 +--- + arch/arm/boot/dts/overlays/hy28b-overlay.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/overlays/hy28b-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-overlay.dts +index 2e5e20f327a3..9edd0848d555 100644 +--- a/arch/arm/boot/dts/overlays/hy28b-overlay.dts ++++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts +@@ -61,7 +61,7 @@ + fps = <50>; + buswidth = <8>; + startbyte = <0x70>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + led-gpios = <&gpio 18 1>; + + gamma = "04 1F 4 7 7 0 7 7 6 0\n0F 00 1 7 4 0 0 0 6 7"; +-- +2.18.4 + + +From c0dd6d67f84b356b82e37c8dcb7568b248a44a99 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Fri, 2 Oct 2020 10:06:49 +0100 +Subject: [PATCH 1130/1148] 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 +after a trickle of single-display patches this is a best-guess attempt +to fix the remainder. As none of these changes have been tested on real +displays there is a possibility that this either doesn't fix the +problem or even breaks something that was working - apologies if that +is the case. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/goodix-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/hy28a-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/media-center-overlay.dts | 6 +++--- + arch/arm/boot/dts/overlays/mz61581-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/piscreen-overlay.dts | 4 ++-- + arch/arm/boot/dts/overlays/piscreen2r-overlay.dts | 4 ++-- + arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/tinylcd35-overlay.dts | 4 ++-- + 11 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/arch/arm/boot/dts/overlays/goodix-overlay.dts b/arch/arm/boot/dts/overlays/goodix-overlay.dts +index 8571527de49a..a11d65f81c5e 100644 +--- a/arch/arm/boot/dts/overlays/goodix-overlay.dts ++++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts +@@ -31,7 +31,7 @@ + interrupt-parent = <&gpio>; + interrupts = <4 2>; // high-to-low edge triggered + irq-gpios = <&gpio 4 0>; // Pin7 on GPIO header +- reset-gpios = <&gpio 17 0>; // Pin11 on GPIO header ++ reset-gpios = <&gpio 17 1>; // Pin11 on GPIO header + }; + }; + }; +diff --git a/arch/arm/boot/dts/overlays/hy28a-overlay.dts b/arch/arm/boot/dts/overlays/hy28a-overlay.dts +index aa6463e6e749..5843a5e9c86a 100644 +--- a/arch/arm/boot/dts/overlays/hy28a-overlay.dts ++++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts +@@ -61,7 +61,7 @@ + fps = <50>; + buswidth = <8>; + startbyte = <0x70>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + led-gpios = <&gpio 18 1>; + debug = <0>; + }; +diff --git a/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts +index 42b68b684bd0..95bfb1eadc20 100644 +--- a/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts ++++ b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts +@@ -61,7 +61,7 @@ + fps = <50>; + buswidth = <8>; + startbyte = <0x70>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + led-gpios = <&gpio 18 1>; + + init = <0x10000e5 0x78F0 +diff --git a/arch/arm/boot/dts/overlays/media-center-overlay.dts b/arch/arm/boot/dts/overlays/media-center-overlay.dts +index 0fcdcfa18eb3..1b56963f4f16 100644 +--- a/arch/arm/boot/dts/overlays/media-center-overlay.dts ++++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts +@@ -53,9 +53,9 @@ + bgr; + fps = <30>; + buswidth = <8>; +- reset-gpios = <&gpio 23 0>; ++ reset-gpios = <&gpio 23 1>; + dc-gpios = <&gpio 24 0>; +- led-gpios = <&gpio 12 1>; ++ led-gpios = <&gpio 12 0>; + debug = <0>; + }; + +@@ -66,7 +66,7 @@ + spi-max-frequency = <2000000>; + interrupts = <25 2>; /* high-to-low edge triggered */ + interrupt-parent = <&gpio>; +- pendown-gpio = <&gpio 25 0>; ++ pendown-gpio = <&gpio 25 1>; + ti,x-plate-ohms = /bits/ 16 <60>; + ti,pressure-max = /bits/ 16 <255>; + }; +diff --git a/arch/arm/boot/dts/overlays/mz61581-overlay.dts b/arch/arm/boot/dts/overlays/mz61581-overlay.dts +index 32686968c0d6..6e00e8b2ddf2 100644 +--- a/arch/arm/boot/dts/overlays/mz61581-overlay.dts ++++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts +@@ -65,7 +65,7 @@ + buswidth = <8>; + txbuflen = <32768>; + +- reset-gpios = <&gpio 15 0>; ++ reset-gpios = <&gpio 15 1>; + dc-gpios = <&gpio 25 0>; + led-gpios = <&gpio 18 0>; + +diff --git a/arch/arm/boot/dts/overlays/piscreen-overlay.dts b/arch/arm/boot/dts/overlays/piscreen-overlay.dts +index ae1af76d3923..1ac75a248fab 100644 +--- a/arch/arm/boot/dts/overlays/piscreen-overlay.dts ++++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts +@@ -59,9 +59,9 @@ + fps = <30>; + buswidth = <8>; + regwidth = <16>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; +- led-gpios = <&gpio 22 1>; ++ led-gpios = <&gpio 22 0>; + debug = <0>; + + init = <0x10000b0 0x00 +diff --git a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts +index 93b85be3f7c1..9d2b51101969 100644 +--- a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts ++++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts +@@ -59,9 +59,9 @@ + buswidth = <8>; + regwidth = <16>; + txbuflen = <32768>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; +- led-gpios = <&gpio 22 1>; ++ led-gpios = <&gpio 22 0>; + debug = <0>; + + init = <0x10000b0 0x00 +diff --git a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts +index 70d7bb6faee9..57a0cc9b1741 100644 +--- a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts ++++ b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts +@@ -59,7 +59,7 @@ + rotate = <0>; + fps = <25>; + buswidth = <8>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; + debug = <0>; + +diff --git a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts +index 74635705273e..ffc90c7cecf6 100644 +--- a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts ++++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts +@@ -59,7 +59,7 @@ + rotate = <0>; + fps = <25>; + buswidth = <8>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; + debug = <0>; + +diff --git a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts +index 0eb1451b36c0..ffc872c60648 100644 +--- a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts ++++ b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts +@@ -59,7 +59,7 @@ + rotate = <0>; + fps = <25>; + buswidth = <8>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; + debug = <0>; + +diff --git a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts +index 254ac2e0a214..a102b09e3ab5 100644 +--- a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts ++++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts +@@ -85,9 +85,9 @@ + fps = <20>; + bgr; + buswidth = <8>; +- reset-gpios = <&gpio 25 0>; ++ reset-gpios = <&gpio 25 1>; + dc-gpios = <&gpio 24 0>; +- led-gpios = <&gpio 18 1>; ++ led-gpios = <&gpio 18 0>; + debug = <0>; + + init = <0x10000B0 0x80 +-- +2.18.4 + + +From 7a40b2748f2e6c107443946bb6c0173341ab6db2 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 5 Oct 2020 15:41:15 +0100 +Subject: [PATCH 1131/1148] 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. + +See: https://github.com/raspberrypi/linux/issues/3870 + +Signed-off-by: Phil Elwell +--- + drivers/usb/gadget/function/f_hid.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c +index 00fae22e941a..4670ad21402d 100644 +--- a/drivers/usb/gadget/function/f_hid.c ++++ b/drivers/usb/gadget/function/f_hid.c +@@ -411,8 +411,6 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, + } + status = usb_ep_queue(hidg->in_ep, req, GFP_ATOMIC); + if (status < 0) { +- ERROR(hidg->func.config->cdev, +- "usb_ep_queue error on int endpoint %zd\n", status); + goto release_write_pending; + } else { + status = count; +-- +2.18.4 + + +From 7024450543e43cf6d334a9cce34c267a13f48c02 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 5 Oct 2020 16:08:18 +0100 +Subject: [PATCH 1132/1148] configs: Add CONFIG_RTC_DRV_SD3078=m + +Enable the driver module for the SD3078 RTC. + +See: https://github.com/raspberrypi/linux/issues/3881 + +Signed-off-by: Phil Elwell +--- + arch/arm/configs/bcm2709_defconfig | 1 + + arch/arm/configs/bcm2711_defconfig | 1 + + arch/arm/configs/bcmrpi_defconfig | 1 + + arch/arm64/configs/bcm2711_defconfig | 1 + + arch/arm64/configs/bcmrpi3_defconfig | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig +index 0862670c700c..2c44682484bf 100644 +--- a/arch/arm/configs/bcm2709_defconfig ++++ b/arch/arm/configs/bcm2709_defconfig +@@ -1241,6 +1241,7 @@ CONFIG_RTC_DRV_RX8581=m + CONFIG_RTC_DRV_RX8025=m + CONFIG_RTC_DRV_EM3027=m + CONFIG_RTC_DRV_RV3028=m ++CONFIG_RTC_DRV_SD3078=m + CONFIG_RTC_DRV_M41T93=m + CONFIG_RTC_DRV_M41T94=m + CONFIG_RTC_DRV_DS1302=m +diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig +index be6b167f6b4f..9e1b4b9a19a5 100644 +--- a/arch/arm/configs/bcm2711_defconfig ++++ b/arch/arm/configs/bcm2711_defconfig +@@ -1277,6 +1277,7 @@ CONFIG_RTC_DRV_RX8581=m + CONFIG_RTC_DRV_RX8025=m + CONFIG_RTC_DRV_EM3027=m + CONFIG_RTC_DRV_RV3028=m ++CONFIG_RTC_DRV_SD3078=m + CONFIG_RTC_DRV_M41T93=m + CONFIG_RTC_DRV_M41T94=m + CONFIG_RTC_DRV_DS1302=m +diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig +index 1dbac6d45cfe..e3b5ef7aa876 100644 +--- a/arch/arm/configs/bcmrpi_defconfig ++++ b/arch/arm/configs/bcmrpi_defconfig +@@ -1251,6 +1251,7 @@ CONFIG_RTC_DRV_RX8581=m + CONFIG_RTC_DRV_RX8025=m + CONFIG_RTC_DRV_EM3027=m + CONFIG_RTC_DRV_RV3028=m ++CONFIG_RTC_DRV_SD3078=m + CONFIG_RTC_DRV_M41T93=m + CONFIG_RTC_DRV_M41T94=m + CONFIG_RTC_DRV_DS1302=m +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index 31655187154f..006cc2f760b3 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -1270,6 +1270,7 @@ CONFIG_RTC_DRV_RX8581=m + CONFIG_RTC_DRV_RX8025=m + CONFIG_RTC_DRV_EM3027=m + CONFIG_RTC_DRV_RV3028=m ++CONFIG_RTC_DRV_SD3078=m + CONFIG_RTC_DRV_M41T93=m + CONFIG_RTC_DRV_M41T94=m + CONFIG_RTC_DRV_DS1302=m +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index c838461038e6..ee15660f8306 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -1128,6 +1128,7 @@ CONFIG_RTC_DRV_RX8581=m + CONFIG_RTC_DRV_RX8025=m + CONFIG_RTC_DRV_EM3027=m + CONFIG_RTC_DRV_RV3028=m ++CONFIG_RTC_DRV_SD3078=m + CONFIG_RTC_DRV_M41T93=m + CONFIG_RTC_DRV_M41T94=m + CONFIG_RTC_DRV_DS1302=m +-- +2.18.4 + + +From 7640dbade24a2d1c4c03995f2c19f9d15bdfc8e9 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 5 Oct 2020 16:10:26 +0100 +Subject: [PATCH 1133/1148] overlays: Add sd3078 to the i2c-rtc overlay + +Add support for the SD3078 RTC to the i2c-rtc overlay. + +See: https://github.com/raspberrypi/linux/issues/3881 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/README | 2 ++ + arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts | 16 ++++++++++++++++ + 2 files changed, 18 insertions(+) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 8df8283a7677..0c33d39f6f3a 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -1232,6 +1232,8 @@ Params: abx80x Select one of the ABx80x family: + + rv3028 Select the Micro Crystal RV3028 device + ++ sd3078 Select the ZXW Shenzhen whwave SD3078 device ++ + addr Sets the address for the RTC. Note that the + device must be configured to use the specified + address. +diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts +index df59d93cd759..735ca303e4fa 100644 +--- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts ++++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts +@@ -220,6 +220,21 @@ + }; + }; + ++ fragment@14 { ++ target = <&i2c_arm>; ++ __dormant__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ sd3078: sd3078@32 { ++ compatible = "whwave,sd3078"; ++ reg = <0x32>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ + __overrides__ { + abx80x = <0>,"+0"; + ds1307 = <0>,"+1"; +@@ -235,6 +250,7 @@ + pcf2129 = <0>,"+11"; + pcf85363 = <0>,"+12"; + rv1805 = <0>,"+13"; ++ sd3078 = <0>,"+14"; + + addr = <&abx80x>, "reg:0", + <&ds1307>, "reg:0", +-- +2.18.4 + + +From 123246e7e26a6a826db25692b2ddf83945c7580f Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 5 Oct 2020 17:16:39 +0100 +Subject: [PATCH 1134/1148] 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 +bug. + +See: https://github.com/raspberrypi/linux/issues/3883 + +Signed-off-by: Phil Elwell +--- + arch/arm/configs/bcm2709_defconfig | 2 ++ + arch/arm/configs/bcm2711_defconfig | 2 ++ + arch/arm/configs/bcmrpi_defconfig | 2 ++ + arch/arm64/configs/bcm2711_defconfig | 2 ++ + arch/arm64/configs/bcmrpi3_defconfig | 2 ++ + 5 files changed, 10 insertions(+) + +diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig +index 2c44682484bf..021985dcc1fd 100644 +--- a/arch/arm/configs/bcm2709_defconfig ++++ b/arch/arm/configs/bcm2709_defconfig +@@ -953,6 +953,8 @@ CONFIG_LOGO=y + # CONFIG_LOGO_LINUX_VGA16 is not set + CONFIG_SOUND=y + CONFIG_SND=m ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_PCM_OSS=m + CONFIG_SND_HRTIMER=m + CONFIG_SND_SEQUENCER=m + CONFIG_SND_SEQ_DUMMY=m +diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig +index 9e1b4b9a19a5..52129a760679 100644 +--- a/arch/arm/configs/bcm2711_defconfig ++++ b/arch/arm/configs/bcm2711_defconfig +@@ -967,6 +967,8 @@ CONFIG_LOGO=y + # CONFIG_LOGO_LINUX_VGA16 is not set + CONFIG_SOUND=y + CONFIG_SND=m ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_PCM_OSS=m + CONFIG_SND_HRTIMER=m + CONFIG_SND_SEQUENCER=m + CONFIG_SND_SEQ_DUMMY=m +diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig +index e3b5ef7aa876..985fa8a12926 100644 +--- a/arch/arm/configs/bcmrpi_defconfig ++++ b/arch/arm/configs/bcmrpi_defconfig +@@ -945,6 +945,8 @@ CONFIG_LOGO=y + # CONFIG_LOGO_LINUX_VGA16 is not set + CONFIG_SOUND=y + CONFIG_SND=m ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_PCM_OSS=m + CONFIG_SND_HRTIMER=m + CONFIG_SND_SEQUENCER=m + CONFIG_SND_SEQ_DUMMY=m +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index 006cc2f760b3..9557b03fac1b 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -960,6 +960,8 @@ CONFIG_LOGO=y + # CONFIG_LOGO_LINUX_VGA16 is not set + CONFIG_SOUND=y + CONFIG_SND=m ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_PCM_OSS=m + CONFIG_SND_HRTIMER=m + CONFIG_SND_SEQUENCER=m + CONFIG_SND_SEQ_DUMMY=m +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index ee15660f8306..32fbcba06098 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -869,6 +869,8 @@ CONFIG_LOGO=y + # CONFIG_LOGO_LINUX_VGA16 is not set + CONFIG_SOUND=y + CONFIG_SND=m ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_PCM_OSS=m + CONFIG_SND_HRTIMER=m + CONFIG_SND_SEQUENCER=m + CONFIG_SND_SEQ_DUMMY=m +-- +2.18.4 + + +From c4f06042163d6198a7e3c5112dacaf3568d43965 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Tue, 6 Oct 2020 11:44:16 +0100 +Subject: [PATCH 1135/1148] Revert "usb/dwc2: Set correct state on gadget + disconnect" + +This reverts commit c3974850cc10de2596893eaec2f5c456e9ded6a0. + +See: https://github.com/raspberrypi/linux/issues/3885 + +Signed-off-by: Phil Elwell +--- + drivers/usb/dwc2/core_intr.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c +index 11c8893fbc1a..6272b4ae4740 100644 +--- a/drivers/usb/dwc2/core_intr.c ++++ b/drivers/usb/dwc2/core_intr.c +@@ -538,11 +538,14 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg) + __func__); + } + skip_power_saving: +- /* Raspberry Pi seems to call the suspend interrupt on gadget disconnect, so instead of setting state to suspend set to not attached */ +- +- hsotg->lx_state = DWC2_L3; ++ /* ++ * Change to L2 (suspend) state before releasing ++ * spinlock ++ */ ++ hsotg->lx_state = DWC2_L2; + +- usb_gadget_set_state(&hsotg->gadget, USB_STATE_NOTATTACHED); ++ /* Call gadget suspend callback */ ++ call_gadget(hsotg, suspend); + } + } else { + if (hsotg->op_state == OTG_STATE_A_PERIPHERAL) { +-- +2.18.4 + + +From 743e386c566fa53b72e1d337c25a4b57d81de785 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 7 Oct 2020 13:14:19 +0100 +Subject: [PATCH 1136/1148] 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. + +See: https://github.com/raspberrypi/linux/issues/3886 + +Signed-off-by: Phil Elwell +--- + arch/arm/configs/bcm2709_defconfig | 2 ++ + arch/arm/configs/bcm2711_defconfig | 2 ++ + arch/arm/configs/bcmrpi_defconfig | 2 ++ + arch/arm64/configs/bcm2711_defconfig | 2 ++ + arch/arm64/configs/bcmrpi3_defconfig | 2 ++ + 5 files changed, 10 insertions(+) + +diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig +index 021985dcc1fd..7368dff25c5c 100644 +--- a/arch/arm/configs/bcm2709_defconfig ++++ b/arch/arm/configs/bcm2709_defconfig +@@ -15,6 +15,8 @@ CONFIG_TASK_IO_ACCOUNTING=y + CONFIG_IKCONFIG=m + CONFIG_IKCONFIG_PROC=y + CONFIG_MEMCG=y ++CONFIG_MEMCG_SWAP=y ++# CONFIG_MEMCG_SWAP_ENABLED is not set + CONFIG_BLK_CGROUP=y + CONFIG_CFS_BANDWIDTH=y + CONFIG_CGROUP_PIDS=y +diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig +index 52129a760679..efacba968d3f 100644 +--- a/arch/arm/configs/bcm2711_defconfig ++++ b/arch/arm/configs/bcm2711_defconfig +@@ -15,6 +15,8 @@ CONFIG_TASK_IO_ACCOUNTING=y + CONFIG_IKCONFIG=m + CONFIG_IKCONFIG_PROC=y + CONFIG_MEMCG=y ++CONFIG_MEMCG_SWAP=y ++# CONFIG_MEMCG_SWAP_ENABLED is not set + CONFIG_BLK_CGROUP=y + CONFIG_CFS_BANDWIDTH=y + CONFIG_CGROUP_PIDS=y +diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig +index 985fa8a12926..e2e2168cd3f2 100644 +--- a/arch/arm/configs/bcmrpi_defconfig ++++ b/arch/arm/configs/bcmrpi_defconfig +@@ -14,6 +14,8 @@ CONFIG_TASK_IO_ACCOUNTING=y + CONFIG_IKCONFIG=m + CONFIG_IKCONFIG_PROC=y + CONFIG_MEMCG=y ++CONFIG_MEMCG_SWAP=y ++# CONFIG_MEMCG_SWAP_ENABLED is not set + CONFIG_BLK_CGROUP=y + CONFIG_CFS_BANDWIDTH=y + CONFIG_CGROUP_PIDS=y +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index 9557b03fac1b..3dcc4ead364e 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -15,6 +15,8 @@ CONFIG_TASK_IO_ACCOUNTING=y + CONFIG_IKCONFIG=m + CONFIG_IKCONFIG_PROC=y + CONFIG_MEMCG=y ++CONFIG_MEMCG_SWAP=y ++# CONFIG_MEMCG_SWAP_ENABLED is not set + CONFIG_BLK_CGROUP=y + CONFIG_CFS_BANDWIDTH=y + CONFIG_CGROUP_PIDS=y +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index 32fbcba06098..6d9c9978ccb7 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -14,6 +14,8 @@ CONFIG_TASK_IO_ACCOUNTING=y + CONFIG_IKCONFIG=m + CONFIG_IKCONFIG_PROC=y + CONFIG_MEMCG=y ++CONFIG_MEMCG_SWAP=y ++# CONFIG_MEMCG_SWAP_ENABLED is not set + CONFIG_BLK_CGROUP=y + CONFIG_CFS_BANDWIDTH=y + CONFIG_CGROUP_PIDS=y +-- +2.18.4 + + +From 7ff5090421a8ad1a332ad49f2092b8e6ee16dbf6 Mon Sep 17 00:00:00 2001 +From: Jonathan Bell +Date: Wed, 7 Oct 2020 15:09:29 +0100 +Subject: [PATCH 1137/1148] 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 +periodic schedules. When re-adding, initialise the sched_frame and +start_split_frame from the current value of the frame counter. + +See https://bugs.launchpad.net/raspbian/+bug/1819560 +and + https://github.com/raspberrypi/linux/issues/3883 + +Signed-off-by: Jonathan Bell +--- + drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +index 2823dc9af63f..4503af692aef 100644 +--- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c ++++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +@@ -689,7 +689,11 @@ int dwc_otg_hcd_qh_add(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh) + &qh->qh_list_entry); + //hcd->fiq_state->kick_np_queues = 1; + } else { ++ /* If the QH wasn't in a schedule, then sched_frame is stale. */ ++ qh->sched_frame = dwc_frame_num_inc(dwc_otg_hcd_get_frame_number(hcd), ++ SCHEDULE_SLOP); + status = schedule_periodic(hcd, qh); ++ qh->start_split_frame = qh->sched_frame; + if ( !hcd->periodic_qh_count ) { + intr_mask.b.sofintr = 1; + if (fiq_enable) { +-- +2.18.4 + + +From e459fba07d9e9f568ee723961c5e1a3f6a8f7e51 Mon Sep 17 00:00:00 2001 +From: Kieran Bingham +Date: Thu, 8 Oct 2020 12:06:58 +0100 +Subject: [PATCH 1138/1148] arm64: configs: Enable Unicam support + +Enable the unicam module on 64 bit kernel builds. + +Signed-off-by: Kieran Bingham +--- + arch/arm64/configs/bcm2711_defconfig | 1 + + arch/arm64/configs/bcmrpi3_defconfig | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index 3dcc4ead364e..7d7a62f80587 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -899,6 +899,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m + CONFIG_VIDEO_EM28XX_ALSA=m + CONFIG_VIDEO_EM28XX_DVB=m + CONFIG_V4L_PLATFORM_DRIVERS=y ++CONFIG_VIDEO_BCM2835_UNICAM=m + CONFIG_RADIO_SI470X=m + CONFIG_USB_SI470X=m + CONFIG_I2C_SI470X=m +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index 6d9c9978ccb7..fceaba1e6630 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -817,6 +817,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m + CONFIG_VIDEO_EM28XX_ALSA=m + CONFIG_VIDEO_EM28XX_DVB=m + CONFIG_V4L_PLATFORM_DRIVERS=y ++CONFIG_VIDEO_BCM2835_UNICAM=m + CONFIG_RADIO_SI470X=m + CONFIG_USB_SI470X=m + CONFIG_I2C_SI470X=m +-- +2.18.4 + + +From 28309a8c1fcae4fd32197111beacba7cf6b506ac Mon Sep 17 00:00:00 2001 +From: Kieran Bingham +Date: Thu, 8 Oct 2020 12:07:16 +0100 +Subject: [PATCH 1139/1148] arm64: configs: Enable V4L2 test module support + +Enable the v4l2 test modules on 64 bit kernel builds. + +Signed-off-by: Kieran Bingham +--- + arch/arm64/configs/bcm2711_defconfig | 5 +++++ + arch/arm64/configs/bcmrpi3_defconfig | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index 7d7a62f80587..78233d8d2e35 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -900,6 +900,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m + CONFIG_VIDEO_EM28XX_DVB=m + CONFIG_V4L_PLATFORM_DRIVERS=y + CONFIG_VIDEO_BCM2835_UNICAM=m ++CONFIG_V4L_TEST_DRIVERS=y ++CONFIG_VIDEO_VIMC=m ++CONFIG_VIDEO_VIVID=m ++CONFIG_VIDEO_VIM2M=m ++CONFIG_VIDEO_VICODEC=m + CONFIG_RADIO_SI470X=m + CONFIG_USB_SI470X=m + CONFIG_I2C_SI470X=m +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index fceaba1e6630..a4db16794285 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -818,6 +818,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m + CONFIG_VIDEO_EM28XX_DVB=m + CONFIG_V4L_PLATFORM_DRIVERS=y + CONFIG_VIDEO_BCM2835_UNICAM=m ++CONFIG_V4L_TEST_DRIVERS=y ++CONFIG_VIDEO_VIMC=m ++CONFIG_VIDEO_VIVID=m ++CONFIG_VIDEO_VIM2M=m ++CONFIG_VIDEO_VICODEC=m + CONFIG_RADIO_SI470X=m + CONFIG_USB_SI470X=m + CONFIG_I2C_SI470X=m +-- +2.18.4 + + +From 809e71b57c642a331730238d781279d183cb460f Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Thu, 8 Oct 2020 15:35:14 +0100 +Subject: [PATCH 1140/1148] staging: bcm2835-camera: Replace deprecated + V4L2_PIX_FMT_BGR32 + +V4L2_PIX_FMT_BGR32 is deprecated as it is ambiguous over where +the alpha byte is. Cheese/GStreamer appear to get it wrong for +one, and qv4l2 gets red and blue swapped. + +Swap to the newer V4L2_PIX_FMT_BGRX32 format. + +https://www.raspberrypi.org/forums/viewtopic.php?f=38&t=267736&p=1738912 + +Signed-off-by: Dave Stevenson +--- + drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +index b7214741fa61..da14f1fb8664 100644 +--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c ++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +@@ -175,7 +175,7 @@ static struct mmal_fmt formats[] = { + .ybbp = 1, + .remove_padding = 1, + }, { +- .fourcc = V4L2_PIX_FMT_BGR32, ++ .fourcc = V4L2_PIX_FMT_BGRX32, + .mmal = MMAL_ENCODING_BGRA, + .depth = 32, + .mmal_component = COMP_CAMERA, +-- +2.18.4 + + +From 7c4b813c9037719d246cf2ee79c8a26e658e05e5 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Thu, 8 Oct 2020 16:06:59 +0100 +Subject: [PATCH 1141/1148] staging: bcm2835-codec: Replace deprecated + V4L2_PIX_FMT_BGR32 + +V4L2_PIX_FMT_BGR32 is deprecated as it is ambiguous over where +the alpha byte is. + +Swap to the newer V4L2_PIX_FMT_BGRX32 format. + +Signed-off-by: Dave Stevenson +--- + .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +index b1e00e65ce18..eefe8e101f96 100644 +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -207,7 +207,7 @@ static const struct bcm2835_codec_fmt supported_formats[] = { + .mmal_fmt = MMAL_ENCODING_BGR24, + .size_multiplier_x2 = 2, + }, { +- .fourcc = V4L2_PIX_FMT_BGR32, ++ .fourcc = V4L2_PIX_FMT_BGRX32, + .depth = 32, + .bytesperline_align = 32, + .flags = 0, +-- +2.18.4 + + +From 75ac8bc08d43745c8d39a2e84aa5f5a29cf5fb7e Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 12 Oct 2020 14:36:35 +0100 +Subject: [PATCH 1142/1148] 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 +is redundant, so delete it. + +See: https://github.com/raspberrypi/linux/issues/3896 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/bcm2711-rpi.dtsi | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi +index 0556c73e332a..0c586d9ea6f8 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi +@@ -246,13 +246,8 @@ + }; + }; + +-&dma { +- /* The VPU firmware uses DMA channel 11 for VCHIQ */ +- brcm,dma-channel-mask = <0x1f5>; +-}; +- + &dma40 { +- /* The VPU firmware DMA channel 11 for VCHIQ */ ++ /* The VPU firmware uses DMA channel 11 for VCHIQ */ + brcm,dma-channel-mask = <0x7000>; + }; + +-- +2.18.4 + + +From 0d19dd10fb5ebb8767f130f380bba437882693b2 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 30 Sep 2020 12:00:54 +0100 +Subject: [PATCH 1143/1148] 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 +soft/virtual - and time delays. It can: ++ create dummy GPIOs for drivers that demand them, ++ drive multiple GPIOs from a single input, with optional delays, ++ add a debounce circuit to an input, ++ drive pattern sequences onto LEDs +etc. + +Signed-off-by: Phil Elwell +--- + drivers/gpio/Kconfig | 9 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-fsm.c | 1103 +++++++++++++++++++++++++++ + include/dt-bindings/gpio/gpio-fsm.h | 21 + + 4 files changed, 1134 insertions(+) + create mode 100644 drivers/gpio/gpio-fsm.c + create mode 100644 include/dt-bindings/gpio/gpio-fsm.h + +diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig +index a4fe9a954b88..7f9c5df745e9 100644 +--- a/drivers/gpio/Kconfig ++++ b/drivers/gpio/Kconfig +@@ -1071,6 +1071,15 @@ config HTC_EGPIO + several HTC phones. It provides basic support for input + pins, output pins, and irqs. + ++config GPIO_FSM ++ tristate "GPIO FSM support" ++ help ++ The GPIO FSM driver allows the creation of state machines for ++ manipulating GPIOs (both real and virtual), with state transitions ++ triggered by GPIO edges or delays. ++ ++ If unsure, say N. ++ + config GPIO_JANZ_TTL + tristate "Janz VMOD-TTL Digital IO Module" + depends on MFD_JANZ_CMODIO +diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile +index 86edbc79e595..49a763681c05 100644 +--- a/drivers/gpio/Makefile ++++ b/drivers/gpio/Makefile +@@ -55,6 +55,7 @@ obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o + obj-$(CONFIG_GPIO_EXAR) += gpio-exar.o + obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o + obj-$(CONFIG_GPIO_FTGPIO010) += gpio-ftgpio010.o ++obj-$(CONFIG_GPIO_FSM) += gpio-fsm.o + obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o + obj-$(CONFIG_GPIO_GPIO_MM) += gpio-gpio-mm.o + obj-$(CONFIG_GPIO_GRGPIO) += gpio-grgpio.o +diff --git a/drivers/gpio/gpio-fsm.c b/drivers/gpio/gpio-fsm.c +new file mode 100644 +index 000000000000..eb8b4d58d2d0 +--- /dev/null ++++ b/drivers/gpio/gpio-fsm.c +@@ -0,0 +1,1103 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * GPIO FSM driver ++ * ++ * This driver implements simple state machines that allow real GPIOs to be ++ * controlled in response to inputs from other GPIOs - real and soft/virtual - ++ * and time delays. It can: ++ * + create dummy GPIOs for drivers that demand them ++ * + drive multiple GPIOs from a single input, with optional delays ++ * + add a debounce circuit to an input ++ * + drive pattern sequences onto LEDs ++ * etc. ++ * ++ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#define MODULE_NAME "gpio-fsm" ++ ++#define GF_IO_TYPE(x) ((u32)(x) & 0xffff) ++#define GF_IO_INDEX(x) ((u32)(x) >> 16) ++ ++enum { ++ SIGNAL_GPIO, ++ SIGNAL_SOFT ++}; ++ ++enum { ++ INPUT_GPIO, ++ INPUT_SOFT ++}; ++ ++enum { ++ SYM_UNDEFINED, ++ SYM_NAME, ++ SYM_SET, ++ SYM_START, ++ SYM_SHUTDOWN, ++ ++ SYM_MAX ++}; ++ ++struct soft_gpio { ++ int dir; ++ int value; ++}; ++ ++struct input_gpio_state { ++ struct gpio_fsm *gf; ++ struct gpio_desc *desc; ++ struct fsm_state *target; ++ int index; ++ int value; ++ int irq; ++ bool enabled; ++ bool active_low; ++}; ++ ++struct gpio_event { ++ int index; ++ int value; ++ struct fsm_state *target; ++}; ++ ++struct symtab_entry { ++ const char *name; ++ void *value; ++ struct symtab_entry *next; ++}; ++ ++struct output_signal { ++ u8 type; ++ u8 value; ++ u16 index; ++}; ++ ++struct fsm_state { ++ const char *name; ++ struct output_signal *signals; ++ struct gpio_event *gpio_events; ++ struct gpio_event *soft_events; ++ struct fsm_state *delay_target; ++ struct fsm_state *shutdown_target; ++ unsigned int num_signals; ++ unsigned int num_gpio_events; ++ unsigned int num_soft_events; ++ unsigned int delay_ms; ++ unsigned int shutdown_ms; ++}; ++ ++struct gpio_fsm { ++ struct gpio_chip gc; ++ struct device *dev; ++ spinlock_t spinlock; ++ struct work_struct work; ++ struct timer_list timer; ++ wait_queue_head_t shutdown_event; ++ struct fsm_state *states; ++ struct input_gpio_state *input_gpio_states; ++ struct gpio_descs *input_gpios; ++ struct gpio_descs *output_gpios; ++ struct soft_gpio *soft_gpios; ++ struct fsm_state *start_state; ++ struct fsm_state *shutdown_state; ++ unsigned int num_states; ++ unsigned int num_output_gpios; ++ unsigned int num_input_gpios; ++ unsigned int num_soft_gpios; ++ unsigned int shutdown_timeout_ms; ++ unsigned int shutdown_jiffies; ++ ++ struct fsm_state *current_state; ++ struct fsm_state *next_state; ++ struct fsm_state *delay_target_state; ++ int delay_ms; ++ unsigned int debug; ++ bool shutting_down; ++ struct symtab_entry *symtab; ++}; ++ ++static struct symtab_entry *do_add_symbol(struct symtab_entry **symtab, ++ const char *name, void *value) ++{ ++ struct symtab_entry **p = symtab; ++ ++ while (*p && strcmp((*p)->name, name)) ++ p = &(*p)->next; ++ ++ if (*p) { ++ /* This is an existing symbol */ ++ if ((*p)->value) { ++ /* Already defined */ ++ if (value) { ++ if ((uintptr_t)value < SYM_MAX) ++ return ERR_PTR(-EINVAL); ++ else ++ return ERR_PTR(-EEXIST); ++ } ++ } else { ++ /* Undefined */ ++ (*p)->value = value; ++ } ++ } else { ++ /* This is a new symbol */ ++ *p = kmalloc(sizeof(struct symtab_entry), GFP_KERNEL); ++ if (*p) { ++ (*p)->name = name; ++ (*p)->value = value; ++ (*p)->next = NULL; ++ } ++ } ++ return *p; ++} ++ ++static int add_symbol(struct symtab_entry **symtab, ++ const char *name, void *value) ++{ ++ struct symtab_entry *sym = do_add_symbol(symtab, name, value); ++ ++ return PTR_ERR_OR_ZERO(sym); ++} ++ ++static struct symtab_entry *get_symbol(struct symtab_entry **symtab, ++ const char *name) ++{ ++ struct symtab_entry *sym = do_add_symbol(symtab, name, NULL); ++ ++ if (IS_ERR(sym)) ++ return NULL; ++ return sym; ++} ++ ++static void free_symbols(struct symtab_entry **symtab) ++{ ++ struct symtab_entry *sym = *symtab; ++ void *p; ++ ++ *symtab = NULL; ++ while (sym) { ++ p = sym; ++ sym = sym->next; ++ kfree(p); ++ } ++} ++ ++static int gpio_fsm_get_direction(struct gpio_chip *gc, unsigned int off) ++{ ++ struct gpio_fsm *gf = gpiochip_get_data(gc); ++ struct soft_gpio *sg; ++ ++ if (off >= gf->num_soft_gpios) ++ return -EINVAL; ++ sg = &gf->soft_gpios[off]; ++ ++ return sg->dir; ++} ++ ++static int gpio_fsm_get(struct gpio_chip *gc, unsigned int off) ++{ ++ struct gpio_fsm *gf = gpiochip_get_data(gc); ++ struct soft_gpio *sg; ++ ++ if (off >= gf->num_soft_gpios) ++ return -EINVAL; ++ sg = &gf->soft_gpios[off]; ++ ++ return sg->value; ++} ++ ++static void gpio_fsm_go_to_state(struct gpio_fsm *gf, ++ struct fsm_state *new_state) ++{ ++ struct input_gpio_state *inp_state; ++ struct gpio_event *gp_ev; ++ struct fsm_state *state; ++ int i; ++ ++ dev_dbg(gf->dev, "go_to_state(%s)\n", ++ new_state ? new_state->name : ""); ++ ++ spin_lock(&gf->spinlock); ++ ++ if (gf->next_state) { ++ /* Something else has already requested a transition */ ++ spin_unlock(&gf->spinlock); ++ return; ++ } ++ ++ gf->next_state = new_state; ++ state = gf->current_state; ++ gf->delay_target_state = NULL; ++ ++ if (state) { ++ /* Disarm any GPIO IRQs */ ++ for (i = 0; i < state->num_gpio_events; i++) { ++ gp_ev = &state->gpio_events[i]; ++ inp_state = &gf->input_gpio_states[gp_ev->index]; ++ inp_state->target = NULL; ++ } ++ } ++ ++ spin_unlock(&gf->spinlock); ++ ++ if (new_state) ++ schedule_work(&gf->work); ++} ++ ++static void gpio_fsm_set_soft(struct gpio_fsm *gf, ++ unsigned int off, int val) ++{ ++ struct soft_gpio *sg = &gf->soft_gpios[off]; ++ struct gpio_event *gp_ev; ++ struct fsm_state *state; ++ int i; ++ ++ dev_dbg(gf->dev, "set(%d,%d)\n", off, val); ++ state = gf->current_state; ++ sg->value = val; ++ for (i = 0; i < state->num_soft_events; i++) { ++ gp_ev = &state->soft_events[i]; ++ if (gp_ev->index == off && gp_ev->value == val) { ++ if (gf->debug) ++ dev_info(gf->dev, ++ "GF_SOFT %d->%d -> %s\n", gp_ev->index, ++ gp_ev->value, gp_ev->target->name); ++ gpio_fsm_go_to_state(gf, gp_ev->target); ++ break; ++ } ++ } ++} ++ ++static int gpio_fsm_direction_input(struct gpio_chip *gc, unsigned int off) ++{ ++ struct gpio_fsm *gf = gpiochip_get_data(gc); ++ struct soft_gpio *sg; ++ ++ if (off >= gf->num_soft_gpios) ++ return -EINVAL; ++ sg = &gf->soft_gpios[off]; ++ sg->dir = GPIOF_DIR_IN; ++ ++ return 0; ++} ++ ++static int gpio_fsm_direction_output(struct gpio_chip *gc, unsigned int off, ++ int value) ++{ ++ struct gpio_fsm *gf = gpiochip_get_data(gc); ++ struct soft_gpio *sg; ++ ++ if (off >= gf->num_soft_gpios) ++ return -EINVAL; ++ sg = &gf->soft_gpios[off]; ++ sg->dir = GPIOF_DIR_OUT; ++ gpio_fsm_set_soft(gf, off, value); ++ ++ return 0; ++} ++ ++static void gpio_fsm_set(struct gpio_chip *gc, unsigned int off, int val) ++{ ++ struct gpio_fsm *gf; ++ ++ gf = gpiochip_get_data(gc); ++ if (off < gf->num_soft_gpios) ++ gpio_fsm_set_soft(gf, off, val); ++} ++ ++static void gpio_fsm_enter_state(struct gpio_fsm *gf, ++ struct fsm_state *state) ++{ ++ struct input_gpio_state *inp_state; ++ struct output_signal *signal; ++ struct gpio_event *event; ++ struct gpio_desc *gpiod; ++ struct soft_gpio *soft; ++ int value; ++ int i; ++ ++ dev_dbg(gf->dev, "enter_state(%s)\n", state->name); ++ ++ gf->current_state = state; ++ ++ // 1. Apply any listed signals ++ for (i = 0; i < state->num_signals; i++) { ++ signal = &state->signals[i]; ++ ++ if (gf->debug) ++ dev_info(gf->dev, " set %s %d->%d\n", ++ (signal->type == SIGNAL_GPIO) ? "GF_OUT" : ++ "GF_SOFT", ++ signal->index, signal->value); ++ switch (signal->type) { ++ case SIGNAL_GPIO: ++ gpiod = gf->output_gpios->desc[signal->index]; ++ gpiod_set_value_cansleep(gpiod, signal->value); ++ break; ++ case SIGNAL_SOFT: ++ soft = &gf->soft_gpios[signal->index]; ++ gpio_fsm_set_soft(gf, signal->index, signal->value); ++ break; ++ } ++ } ++ ++ // 2. Exit if successfully reached shutdown state ++ if (gf->shutting_down && state == state->shutdown_target) { ++ wake_up(&gf->shutdown_event); ++ return; ++ } ++ ++ // 3. Schedule a timer callback if shutting down ++ if (state->shutdown_target) { ++ // Remember the absolute shutdown time in case remove is called ++ // at a later time. ++ gf->shutdown_jiffies = ++ jiffies + msecs_to_jiffies(state->shutdown_ms); ++ ++ if (gf->shutting_down) { ++ gf->delay_target_state = state->shutdown_target; ++ gf->delay_ms = state->shutdown_ms; ++ mod_timer(&gf->timer, gf->shutdown_jiffies); ++ } ++ } ++ ++ // During shutdown, skip everything else ++ if (gf->shutting_down) ++ return; ++ ++ // Otherwise record what the shutdown time would be ++ gf->shutdown_jiffies = jiffies + msecs_to_jiffies(state->shutdown_ms); ++ ++ // 4. Check soft inputs for transitions to take ++ for (i = 0; i < state->num_soft_events; i++) { ++ event = &state->soft_events[i]; ++ if (gf->soft_gpios[event->index].value == event->value) { ++ if (gf->debug) ++ dev_info(gf->dev, ++ "GF_SOFT %d=%d -> %s\n", event->index, ++ event->value, event->target->name); ++ gpio_fsm_go_to_state(gf, event->target); ++ return; ++ } ++ } ++ ++ // 5. Check GPIOs for transitions to take, enabling the IRQs ++ for (i = 0; i < state->num_gpio_events; i++) { ++ event = &state->gpio_events[i]; ++ inp_state = &gf->input_gpio_states[event->index]; ++ inp_state->target = event->target; ++ inp_state->value = event->value; ++ inp_state->enabled = true; ++ ++ value = gpiod_get_value(gf->input_gpios->desc[event->index]); ++ ++ // Clear stale event state ++ disable_irq(inp_state->irq); ++ ++ irq_set_irq_type(inp_state->irq, ++ (inp_state->value ^ inp_state->active_low) ? ++ IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING); ++ enable_irq(inp_state->irq); ++ ++ if (value == event->value && inp_state->target) { ++ if (gf->debug) ++ dev_info(gf->dev, ++ "GF_IN %d=%d -> %s\n", event->index, ++ event->value, event->target->name); ++ gpio_fsm_go_to_state(gf, event->target); ++ return; ++ } ++ } ++ ++ // 6. Schedule a timer callback if delay_target ++ if (state->delay_target) { ++ gf->delay_target_state = state->delay_target; ++ gf->delay_ms = state->delay_ms; ++ mod_timer(&gf->timer, ++ jiffies + msecs_to_jiffies(state->delay_ms)); ++ } ++} ++ ++static void gpio_fsm_work(struct work_struct *work) ++{ ++ struct input_gpio_state *inp_state; ++ struct fsm_state *new_state; ++ struct fsm_state *state; ++ struct gpio_event *gp_ev; ++ struct gpio_fsm *gf; ++ int i; ++ ++ gf = container_of(work, struct gpio_fsm, work); ++ spin_lock(&gf->spinlock); ++ state = gf->current_state; ++ new_state = gf->next_state; ++ if (!new_state) ++ new_state = gf->delay_target_state; ++ gf->next_state = NULL; ++ gf->delay_target_state = NULL; ++ spin_unlock(&gf->spinlock); ++ ++ if (state) { ++ /* Disable any enabled GPIO IRQs */ ++ for (i = 0; i < state->num_gpio_events; i++) { ++ gp_ev = &state->gpio_events[i]; ++ inp_state = &gf->input_gpio_states[gp_ev->index]; ++ if (inp_state->enabled) { ++ inp_state->enabled = false; ++ irq_set_irq_type(inp_state->irq, ++ IRQF_TRIGGER_NONE); ++ } ++ } ++ } ++ ++ if (new_state) ++ gpio_fsm_enter_state(gf, new_state); ++} ++ ++static irqreturn_t gpio_fsm_gpio_irq_handler(int irq, void *dev_id) ++{ ++ struct input_gpio_state *inp_state = dev_id; ++ struct gpio_fsm *gf = inp_state->gf; ++ struct fsm_state *target; ++ ++ target = inp_state->target; ++ if (!target) ++ return IRQ_NONE; ++ ++ /* If the IRQ has fired then the desired state _must_ have occurred */ ++ inp_state->enabled = false; ++ irq_set_irq_type(inp_state->irq, IRQF_TRIGGER_NONE); ++ if (gf->debug) ++ dev_info(gf->dev, "GF_IN %d->%d -> %s\n", ++ inp_state->index, inp_state->value, target->name); ++ gpio_fsm_go_to_state(gf, target); ++ return IRQ_HANDLED; ++} ++ ++static void gpio_fsm_timer(struct timer_list *timer) ++{ ++ struct gpio_fsm *gf = container_of(timer, struct gpio_fsm, timer); ++ struct fsm_state *target; ++ ++ target = gf->delay_target_state; ++ if (!target) ++ return; ++ ++ if (gf->debug) ++ dev_info(gf->dev, "GF_DELAY %d -> %s\n", gf->delay_ms, ++ target->name); ++ ++ gpio_fsm_go_to_state(gf, target); ++} ++ ++int gpio_fsm_parse_signals(struct gpio_fsm *gf, struct fsm_state *state, ++ struct property *prop) ++{ ++ const __be32 *cells = prop->value; ++ struct output_signal *signal; ++ u32 io; ++ u32 type; ++ u32 index; ++ u32 value; ++ int ret = 0; ++ int i; ++ ++ if (prop->length % 8) { ++ dev_err(gf->dev, "malformed set in state %s\n", ++ state->name); ++ return -EINVAL; ++ } ++ ++ state->num_signals = prop->length/8; ++ state->signals = devm_kcalloc(gf->dev, state->num_signals, ++ sizeof(struct output_signal), ++ GFP_KERNEL); ++ for (i = 0; i < state->num_signals; i++) { ++ signal = &state->signals[i]; ++ io = be32_to_cpu(cells[0]); ++ type = GF_IO_TYPE(io); ++ index = GF_IO_INDEX(io); ++ value = be32_to_cpu(cells[1]); ++ ++ if (type != GF_OUT && type != GF_SOFT) { ++ dev_err(gf->dev, ++ "invalid set type %d in state %s\n", ++ type, state->name); ++ ret = -EINVAL; ++ break; ++ } ++ if (type == GF_OUT && index >= gf->num_output_gpios) { ++ dev_err(gf->dev, ++ "invalid GF_OUT number %d in state %s\n", ++ index, state->name); ++ ret = -EINVAL; ++ break; ++ } ++ if (type == GF_SOFT && index >= gf->num_soft_gpios) { ++ dev_err(gf->dev, ++ "invalid GF_SOFT number %d in state %s\n", ++ index, state->name); ++ ret = -EINVAL; ++ break; ++ } ++ if (value != 0 && value != 1) { ++ dev_err(gf->dev, ++ "invalid set value %d in state %s\n", ++ value, state->name); ++ ret = -EINVAL; ++ break; ++ } ++ signal->type = (type == GF_OUT) ? SIGNAL_GPIO : SIGNAL_SOFT; ++ signal->index = index; ++ signal->value = value; ++ cells += 2; ++ } ++ ++ return ret; ++} ++ ++struct gpio_event *new_event(struct gpio_event **events, int *num_events) ++{ ++ int num = ++(*num_events); ++ *events = krealloc(*events, num * sizeof(struct gpio_event), ++ GFP_KERNEL); ++ return *events ? *events + (num - 1) : NULL; ++} ++ ++int gpio_fsm_parse_events(struct gpio_fsm *gf, struct fsm_state *state, ++ struct property *prop) ++{ ++ const __be32 *cells = prop->value; ++ struct symtab_entry *sym; ++ int num_cells; ++ int ret = 0; ++ int i; ++ ++ if (prop->length % 8) { ++ dev_err(gf->dev, ++ "malformed transitions from state %s to state %s\n", ++ state->name, prop->name); ++ return -EINVAL; ++ } ++ ++ sym = get_symbol(&gf->symtab, prop->name); ++ num_cells = prop->length / 4; ++ i = 0; ++ while (i < num_cells) { ++ struct gpio_event *gp_ev; ++ u32 event, param; ++ u32 index; ++ ++ event = be32_to_cpu(cells[i++]); ++ param = be32_to_cpu(cells[i++]); ++ index = GF_IO_INDEX(event); ++ ++ switch (GF_IO_TYPE(event)) { ++ case GF_IN: ++ if (index >= gf->num_input_gpios) { ++ dev_err(gf->dev, ++ "invalid GF_IN %d in transitions from state %s to state %s\n", ++ index, state->name, prop->name); ++ return -EINVAL; ++ } ++ if (param > 1) { ++ dev_err(gf->dev, ++ "invalid GF_IN value %d in transitions from state %s to state %s\n", ++ param, state->name, prop->name); ++ return -EINVAL; ++ } ++ gp_ev = new_event(&state->gpio_events, ++ &state->num_gpio_events); ++ if (!gp_ev) ++ return -ENOMEM; ++ gp_ev->index = index; ++ gp_ev->value = param; ++ gp_ev->target = (struct fsm_state *)sym; ++ break; ++ ++ case GF_SOFT: ++ if (index >= gf->num_soft_gpios) { ++ dev_err(gf->dev, ++ "invalid GF_SOFT %d in transitions from state %s to state %s\n", ++ index, state->name, prop->name); ++ return -EINVAL; ++ } ++ if (param > 1) { ++ dev_err(gf->dev, ++ "invalid GF_SOFT value %d in transitions from state %s to state %s\n", ++ param, state->name, prop->name); ++ return -EINVAL; ++ } ++ gp_ev = new_event(&state->soft_events, ++ &state->num_soft_events); ++ if (!gp_ev) ++ return -ENOMEM; ++ gp_ev->index = index; ++ gp_ev->value = param; ++ gp_ev->target = (struct fsm_state *)sym; ++ break; ++ ++ case GF_DELAY: ++ if (state->delay_target) { ++ dev_err(gf->dev, ++ "state %s has multiple GF_DELAYs\n", ++ state->name); ++ return -EINVAL; ++ } ++ state->delay_target = (struct fsm_state *)sym; ++ state->delay_ms = param; ++ break; ++ ++ case GF_SHUTDOWN: ++ if (state->shutdown_target == state) { ++ dev_err(gf->dev, ++ "shutdown state %s has GF_SHUTDOWN\n", ++ state->name); ++ return -EINVAL; ++ } else if (state->shutdown_target) { ++ dev_err(gf->dev, ++ "state %s has multiple GF_SHUTDOWNs\n", ++ state->name); ++ return -EINVAL; ++ } ++ state->shutdown_target = ++ (struct fsm_state *)sym; ++ state->shutdown_ms = param; ++ break; ++ ++ default: ++ dev_err(gf->dev, ++ "invalid event %08x in transitions from state %s to state %s\n", ++ event, state->name, prop->name); ++ return -EINVAL; ++ } ++ } ++ if (i != num_cells) { ++ dev_err(gf->dev, ++ "malformed transitions from state %s to state %s\n", ++ state->name, prop->name); ++ return -EINVAL; ++ } ++ ++ return ret; ++} ++ ++int gpio_fsm_parse_state(struct gpio_fsm *gf, ++ struct fsm_state *state, ++ struct device_node *np) ++{ ++ struct symtab_entry *sym; ++ struct property *prop; ++ int ret; ++ ++ state->name = np->name; ++ ret = add_symbol(&gf->symtab, np->name, state); ++ if (ret) { ++ switch (ret) { ++ case -EINVAL: ++ dev_err(gf->dev, "'%s' is not a valid state name\n", ++ np->name); ++ break; ++ case -EEXIST: ++ dev_err(gf->dev, "state %s already defined\n", ++ np->name); ++ break; ++ default: ++ dev_err(gf->dev, "error %d adding state %s symbol\n", ++ ret, np->name); ++ break; ++ } ++ return ret; ++ } ++ ++ for_each_property_of_node(np, prop) { ++ sym = get_symbol(&gf->symtab, prop->name); ++ if (!sym) { ++ ret = -ENOMEM; ++ break; ++ } ++ ++ switch ((uintptr_t)sym->value) { ++ case SYM_SET: ++ ret = gpio_fsm_parse_signals(gf, state, prop); ++ break; ++ case SYM_START: ++ if (gf->start_state) { ++ dev_err(gf->dev, "multiple start states\n"); ++ ret = -EINVAL; ++ } else { ++ gf->start_state = state; ++ } ++ break; ++ case SYM_SHUTDOWN: ++ state->shutdown_target = state; ++ gf->shutdown_state = state; ++ break; ++ case SYM_NAME: ++ /* Ignore */ ++ break; ++ default: ++ /* A set of transition events to this state */ ++ ret = gpio_fsm_parse_events(gf, state, prop); ++ break; ++ } ++ } ++ ++ return ret; ++} ++ ++static void dump_all(struct gpio_fsm *gf) ++{ ++ int i, j; ++ ++ dev_info(gf->dev, "Input GPIOs:\n"); ++ for (i = 0; i < gf->num_input_gpios; i++) ++ dev_info(gf->dev, " %d: %p\n", i, ++ gf->input_gpios->desc[i]); ++ ++ dev_info(gf->dev, "Output GPIOs:\n"); ++ for (i = 0; i < gf->num_output_gpios; i++) ++ dev_info(gf->dev, " %d: %p\n", i, ++ gf->output_gpios->desc[i]); ++ ++ dev_info(gf->dev, "Soft GPIOs:\n"); ++ for (i = 0; i < gf->num_soft_gpios; i++) ++ dev_info(gf->dev, " %d: %s %d\n", i, ++ (gf->soft_gpios[i].dir == GPIOF_DIR_IN) ? "IN" : "OUT", ++ gf->soft_gpios[i].value); ++ ++ dev_info(gf->dev, "Start state: %s\n", ++ gf->start_state ? gf->start_state->name : "-"); ++ ++ dev_info(gf->dev, "Shutdown timeout: %d ms\n", ++ gf->shutdown_timeout_ms); ++ ++ for (i = 0; i < gf->num_states; i++) { ++ struct fsm_state *state = &gf->states[i]; ++ ++ dev_info(gf->dev, "State %s:\n", state->name); ++ ++ if (state->shutdown_target == state) ++ dev_info(gf->dev, " Shutdown state\n"); ++ ++ dev_info(gf->dev, " Signals:\n"); ++ for (j = 0; j < state->num_signals; j++) { ++ struct output_signal *signal = &state->signals[j]; ++ ++ dev_info(gf->dev, " %d: %s %d=%d\n", j, ++ (signal->type == SIGNAL_GPIO) ? "GPIO" : ++ "SOFT", ++ signal->index, signal->value); ++ } ++ ++ dev_info(gf->dev, " GPIO events:\n"); ++ for (j = 0; j < state->num_gpio_events; j++) { ++ struct gpio_event *event = &state->gpio_events[j]; ++ ++ dev_info(gf->dev, " %d: %d=%d -> %s\n", j, ++ event->index, event->value, ++ event->target->name); ++ } ++ ++ dev_info(gf->dev, " Soft events:\n"); ++ for (j = 0; j < state->num_soft_events; j++) { ++ struct gpio_event *event = &state->soft_events[j]; ++ ++ dev_info(gf->dev, " %d: %d=%d -> %s\n", j, ++ event->index, event->value, ++ event->target->name); ++ } ++ ++ if (state->delay_target) ++ dev_info(gf->dev, " Delay: %d ms -> %s\n", ++ state->delay_ms, state->delay_target->name); ++ ++ if (state->shutdown_target && state->shutdown_target != state) ++ dev_info(gf->dev, " Shutdown: %d ms -> %s\n", ++ state->shutdown_ms, ++ state->shutdown_target->name); ++ } ++ dev_info(gf->dev, "\n"); ++} ++ ++static int resolve_sym_to_state(struct gpio_fsm *gf, struct fsm_state **pstate) ++{ ++ struct symtab_entry *sym = (struct symtab_entry *)*pstate; ++ ++ if (!sym) ++ return -ENOMEM; ++ ++ *pstate = sym->value; ++ ++ if (!*pstate) { ++ dev_err(gf->dev, "state %s not defined\n", ++ sym->name); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static int gpio_fsm_probe(struct platform_device *pdev) ++{ ++ struct input_gpio_state *inp_state; ++ struct device *dev = &pdev->dev; ++ struct device_node *np = dev->of_node; ++ struct device_node *cp; ++ struct gpio_fsm *gf; ++ u32 debug = 0; ++ int num_states; ++ u32 num_soft_gpios; ++ int ret; ++ int i; ++ static const char *const reserved_symbols[] = { ++ [SYM_NAME] = "name", ++ [SYM_SET] = "set", ++ [SYM_START] = "start_state", ++ [SYM_SHUTDOWN] = "shutdown_state", ++ }; ++ ++ if (of_property_read_u32(np, "num-soft-gpios", &num_soft_gpios)) { ++ dev_err(dev, "missing 'num-soft-gpios' property\n"); ++ return -EINVAL; ++ } ++ ++ of_property_read_u32(np, "debug", &debug); ++ ++ gf = devm_kzalloc(dev, sizeof(*gf), GFP_KERNEL); ++ if (!gf) ++ return -ENOMEM; ++ ++ gf->dev = dev; ++ gf->debug = debug; ++ ++ if (of_property_read_u32(np, "shutdown-timeout-ms", ++ &gf->shutdown_timeout_ms)) ++ gf->shutdown_timeout_ms = 5000; ++ ++ gf->num_soft_gpios = num_soft_gpios; ++ gf->soft_gpios = devm_kcalloc(dev, num_soft_gpios, ++ sizeof(struct soft_gpio), GFP_KERNEL); ++ if (!gf->soft_gpios) ++ return -ENOMEM; ++ for (i = 0; i < num_soft_gpios; i++) { ++ struct soft_gpio *sg = &gf->soft_gpios[i]; ++ ++ sg->dir = GPIOF_DIR_IN; ++ sg->value = 0; ++ } ++ ++ gf->input_gpios = devm_gpiod_get_array_optional(dev, "input", GPIOD_IN); ++ if (IS_ERR(gf->input_gpios)) { ++ ret = PTR_ERR(gf->input_gpios); ++ dev_err(dev, "failed to get input gpios from DT - %d\n", ret); ++ return ret; ++ } ++ gf->num_input_gpios = (gf->input_gpios ? gf->input_gpios->ndescs : 0); ++ ++ gf->input_gpio_states = devm_kcalloc(dev, gf->num_input_gpios, ++ sizeof(struct input_gpio_state), ++ GFP_KERNEL); ++ if (!gf->input_gpio_states) ++ return -ENOMEM; ++ for (i = 0; i < gf->num_input_gpios; i++) { ++ inp_state = &gf->input_gpio_states[i]; ++ inp_state->desc = gf->input_gpios->desc[i]; ++ inp_state->gf = gf; ++ inp_state->index = i; ++ inp_state->irq = gpiod_to_irq(inp_state->desc); ++ inp_state->active_low = gpiod_is_active_low(inp_state->desc); ++ if (inp_state->irq >= 0) ++ ret = devm_request_irq(gf->dev, inp_state->irq, ++ gpio_fsm_gpio_irq_handler, ++ IRQF_TRIGGER_NONE, ++ dev_name(dev), ++ inp_state); ++ else ++ ret = inp_state->irq; ++ ++ if (ret) { ++ dev_err(dev, ++ "failed to get IRQ for input gpio - %d\n", ++ ret); ++ return ret; ++ } ++ } ++ ++ gf->output_gpios = devm_gpiod_get_array_optional(dev, "output", ++ GPIOD_OUT_LOW); ++ if (IS_ERR(gf->output_gpios)) { ++ ret = PTR_ERR(gf->output_gpios); ++ dev_err(dev, "failed to get output gpios from DT - %d\n", ret); ++ return ret; ++ } ++ gf->num_output_gpios = (gf->output_gpios ? gf->output_gpios->ndescs : ++ 0); ++ ++ num_states = of_get_child_count(np); ++ if (!num_states) { ++ dev_err(dev, "no states declared\n"); ++ return -EINVAL; ++ } ++ gf->states = devm_kcalloc(dev, num_states, ++ sizeof(struct fsm_state), GFP_KERNEL); ++ if (!gf->states) ++ return -ENOMEM; ++ ++ // add reserved words to the symbol table ++ for (i = 0; i < ARRAY_SIZE(reserved_symbols); i++) { ++ if (reserved_symbols[i]) ++ add_symbol(&gf->symtab, reserved_symbols[i], (void *)i); ++ } ++ ++ // parse the state ++ for_each_child_of_node(np, cp) { ++ struct fsm_state *state = &gf->states[gf->num_states]; ++ ++ ret = gpio_fsm_parse_state(gf, state, cp); ++ if (ret) ++ return ret; ++ gf->num_states++; ++ } ++ ++ if (!gf->start_state) { ++ dev_err(gf->dev, "no start state defined\n"); ++ return -EINVAL; ++ } ++ ++ // resolve symbol pointers into state pointers ++ for (i = 0; !ret && i < gf->num_states; i++) { ++ struct fsm_state *state = &gf->states[i]; ++ int j; ++ ++ for (j = 0; !ret && j < state->num_gpio_events; j++) { ++ struct gpio_event *ev = &state->gpio_events[j]; ++ ++ ret = resolve_sym_to_state(gf, &ev->target); ++ } ++ ++ for (j = 0; !ret && j < state->num_soft_events; j++) { ++ struct gpio_event *ev = &state->soft_events[j]; ++ ++ ret = resolve_sym_to_state(gf, &ev->target); ++ } ++ ++ if (!ret) { ++ resolve_sym_to_state(gf, &state->delay_target); ++ if (state->shutdown_target != state) ++ resolve_sym_to_state(gf, ++ &state->shutdown_target); ++ } ++ } ++ ++ if (!ret && gf->debug > 1) ++ dump_all(gf); ++ ++ free_symbols(&gf->symtab); ++ ++ if (ret) ++ return ret; ++ ++ gf->gc.parent = dev; ++ gf->gc.label = np->name; ++ gf->gc.owner = THIS_MODULE; ++ gf->gc.of_node = np; ++ gf->gc.base = -1; ++ gf->gc.ngpio = num_soft_gpios; ++ ++ gf->gc.get_direction = gpio_fsm_get_direction; ++ gf->gc.direction_input = gpio_fsm_direction_input; ++ gf->gc.direction_output = gpio_fsm_direction_output; ++ gf->gc.get = gpio_fsm_get; ++ gf->gc.set = gpio_fsm_set; ++ gf->gc.can_sleep = true; ++ spin_lock_init(&gf->spinlock); ++ INIT_WORK(&gf->work, gpio_fsm_work); ++ timer_setup(&gf->timer, gpio_fsm_timer, 0); ++ init_waitqueue_head(&gf->shutdown_event); ++ ++ platform_set_drvdata(pdev, gf); ++ ++ if (gf->debug) ++ dev_info(gf->dev, "Start -> %s\n", gf->start_state->name); ++ ++ gpio_fsm_go_to_state(gf, gf->start_state); ++ ++ return devm_gpiochip_add_data(dev, &gf->gc, gf); ++} ++ ++static int gpio_fsm_remove(struct platform_device *pdev) ++{ ++ struct gpio_fsm *gf = platform_get_drvdata(pdev); ++ int i; ++ ++ if (gf->shutdown_state) { ++ if (gf->debug) ++ dev_info(gf->dev, "Shutting down...\n"); ++ ++ spin_lock(&gf->spinlock); ++ gf->shutting_down = true; ++ if (gf->current_state->shutdown_target && ++ gf->current_state->shutdown_target != gf->current_state) { ++ gf->delay_target_state = ++ gf->current_state->shutdown_target; ++ mod_timer(&gf->timer, gf->shutdown_jiffies); ++ } ++ spin_unlock(&gf->spinlock); ++ ++ wait_event_timeout(gf->shutdown_event, ++ gf->current_state->shutdown_target == ++ gf->current_state, ++ msecs_to_jiffies(gf->shutdown_timeout_ms)); ++ if (gf->current_state->shutdown_target == gf->current_state) ++ gpio_fsm_enter_state(gf, gf->shutdown_state); ++ } ++ cancel_work_sync(&gf->work); ++ del_timer_sync(&gf->timer); ++ ++ /* Events aren't allocated from managed storage */ ++ for (i = 0; i < gf->num_states; i++) { ++ kfree(gf->states[i].gpio_events); ++ kfree(gf->states[i].soft_events); ++ } ++ if (gf->debug) ++ dev_info(gf->dev, "Exiting\n"); ++ ++ return 0; ++} ++ ++static void gpio_fsm_shutdown(struct platform_device *pdev) ++{ ++ gpio_fsm_remove(pdev); ++} ++ ++static const struct of_device_id gpio_fsm_ids[] = { ++ { .compatible = "rpi,gpio-fsm" }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, gpio_fsm_ids); ++ ++static struct platform_driver gpio_fsm_driver = { ++ .driver = { ++ .name = MODULE_NAME, ++ .of_match_table = of_match_ptr(gpio_fsm_ids), ++ }, ++ .probe = gpio_fsm_probe, ++ .remove = gpio_fsm_remove, ++ .shutdown = gpio_fsm_shutdown, ++}; ++module_platform_driver(gpio_fsm_driver); ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Phil Elwell "); ++MODULE_DESCRIPTION("GPIO FSM driver"); ++MODULE_ALIAS("platform:gpio-fsm"); +diff --git a/include/dt-bindings/gpio/gpio-fsm.h b/include/dt-bindings/gpio/gpio-fsm.h +new file mode 100644 +index 000000000000..eb40cfdc71df +--- /dev/null ++++ b/include/dt-bindings/gpio/gpio-fsm.h +@@ -0,0 +1,21 @@ ++/* SPDX-License-Identifier: GPL-2.0+ */ ++/* ++ * This header provides constants for binding rpi,gpio-fsm. ++ */ ++ ++#ifndef _DT_BINDINGS_GPIO_FSM_H ++#define _DT_BINDINGS_GPIO_FSM_H ++ ++#define GF_IN 0 ++#define GF_OUT 1 ++#define GF_SOFT 2 ++#define GF_DELAY 3 ++#define GF_SHUTDOWN 4 ++ ++#define GF_IO(t, v) (((v) << 16) | ((t) & 0xffff)) ++ ++#define GF_IP(x) GF_IO(GF_IN, (x)) ++#define GF_OP(x) GF_IO(GF_OUT, (x)) ++#define GF_SW(x) GF_IO(GF_SOFT, (x)) ++ ++#endif +-- +2.18.4 + + +From 3b7df60bba103dab244fe5f779e6f5d098d98eb5 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 30 Sep 2020 12:18:45 +0100 +Subject: [PATCH 1144/1148] configs: Add CONFIG_GPIO_FSM=m + +Enable the gpio-fsm module. + +Signed-off-by: Phil Elwell +--- + arch/arm/configs/bcm2709_defconfig | 1 + + arch/arm/configs/bcm2711_defconfig | 1 + + arch/arm/configs/bcmrpi_defconfig | 1 + + arch/arm64/configs/bcm2711_defconfig | 1 + + arch/arm64/configs/bcmrpi3_defconfig | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig +index 7368dff25c5c..350461728d8f 100644 +--- a/arch/arm/configs/bcm2709_defconfig ++++ b/arch/arm/configs/bcm2709_defconfig +@@ -692,6 +692,7 @@ CONFIG_GPIO_BCM_VIRT=y + CONFIG_GPIO_PCA953X=m + CONFIG_GPIO_PCF857X=m + CONFIG_GPIO_ARIZONA=m ++CONFIG_GPIO_FSM=m + CONFIG_GPIO_STMPE=y + CONFIG_GPIO_MOCKUP=m + CONFIG_W1=m +diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig +index efacba968d3f..d9dc636eb222 100644 +--- a/arch/arm/configs/bcm2711_defconfig ++++ b/arch/arm/configs/bcm2711_defconfig +@@ -702,6 +702,7 @@ CONFIG_GPIO_BCM_VIRT=y + CONFIG_GPIO_PCA953X=m + CONFIG_GPIO_PCF857X=m + CONFIG_GPIO_ARIZONA=m ++CONFIG_GPIO_FSM=m + CONFIG_GPIO_STMPE=y + CONFIG_GPIO_MOCKUP=m + CONFIG_W1=m +diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig +index e2e2168cd3f2..67d7bb17b596 100644 +--- a/arch/arm/configs/bcmrpi_defconfig ++++ b/arch/arm/configs/bcmrpi_defconfig +@@ -685,6 +685,7 @@ CONFIG_GPIO_SYSFS=y + CONFIG_GPIO_PCA953X=m + CONFIG_GPIO_PCF857X=m + CONFIG_GPIO_ARIZONA=m ++CONFIG_GPIO_FSM=m + CONFIG_GPIO_STMPE=y + CONFIG_GPIO_MOCKUP=m + CONFIG_W1=m +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index 78233d8d2e35..60e1cb88fe8c 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -697,6 +697,7 @@ CONFIG_GPIO_BCM_VIRT=y + CONFIG_GPIO_PCA953X=m + CONFIG_GPIO_PCF857X=m + CONFIG_GPIO_ARIZONA=m ++CONFIG_GPIO_FSM=m + CONFIG_GPIO_STMPE=y + CONFIG_GPIO_MOCKUP=m + CONFIG_W1=m +diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig +index a4db16794285..54579a745176 100644 +--- a/arch/arm64/configs/bcmrpi3_defconfig ++++ b/arch/arm64/configs/bcmrpi3_defconfig +@@ -667,6 +667,7 @@ CONFIG_GPIO_SYSFS=y + CONFIG_GPIO_BCM_VIRT=y + CONFIG_GPIO_PCA953X=m + CONFIG_GPIO_ARIZONA=m ++CONFIG_GPIO_FSM=m + CONFIG_GPIO_STMPE=y + CONFIG_GPIO_MOCKUP=m + CONFIG_W1=m +-- +2.18.4 + + +From 82ef295042784db6364118ccbebc11077043b426 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 30 Sep 2020 12:08:08 +0100 +Subject: [PATCH 1145/1148] 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 +7, 8 and 25. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/Makefile | 1 + + arch/arm/boot/dts/overlays/README | 8 ++ + .../boot/dts/overlays/fsm-demo-overlay.dts | 104 ++++++++++++++++++ + 3 files changed, 113 insertions(+) + create mode 100644 arch/arm/boot/dts/overlays/fsm-demo-overlay.dts + +diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile +index 104b0a908f3c..90c9baefc41d 100644 +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -44,6 +44,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + enc28j60-spi2.dtbo \ + exc3000.dtbo \ + fe-pi-audio.dtbo \ ++ fsm-demo.dtbo \ + goodix.dtbo \ + googlevoicehat-soundcard.dtbo \ + gpio-fan.dtbo \ +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 0c33d39f6f3a..6b61b0255fd7 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -767,6 +767,14 @@ Load: dtoverlay=fe-pi-audio + Params: + + ++Name: fsm-demo ++Info: A demonstration of the gpio-fsm driver. The GPIOs are chosen to work ++ nicely with a "traffic-light" display of red, amber and green LEDs on ++ GPIOs 7, 8 and 25 respectively. ++Load: dtoverlay=fsm-demo,= ++Params: fsm_debug Enable debug logging (default off) ++ ++ + Name: goodix + Info: Enables I2C connected Goodix gt9271 multiple touch controller using + GPIOs 4 and 17 (pins 7 and 11 on GPIO header) for interrupt and reset. +diff --git a/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts +new file mode 100644 +index 000000000000..9e06e388e4d3 +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts +@@ -0,0 +1,104 @@ ++// Demo overlay for the gpio-fsm driver ++/dts-v1/; ++/plugin/; ++ ++#include ++ ++#define BUTTON1 GF_IP(0) ++#define BUTTON2 GF_SW(0) ++#define RED GF_OP(0) // GPIO7 ++#define AMBER GF_OP(1) // GPIO8 ++#define GREEN GF_OP(2) // GPIO25 ++ ++/{ ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target-path = "/"; ++ __overlay__ { ++ fsm_demo: fsm-demo { ++ compatible = "rpi,gpio-fsm"; ++ ++ debug = <0>; ++ gpio-controller; ++ #gpio-cells = <2>; ++ num-soft-gpios = <1>; ++ gpio-line-names = "button2"; ++ input-gpios = <&gpio 6 1>; // BUTTON1 (active-low) ++ output-gpios = <&gpio 7 0>, // RED ++ <&gpio 8 0>, // AMBER ++ <&gpio 25 0>; // GREEN ++ shutdown-timeout-ms = <2000>; ++ ++ start { ++ start_state; ++ set = , , ; ++ start2 = ; ++ }; ++ ++ start2 { ++ set = , ; ++ go = ; ++ }; ++ ++ go { ++ set = , , ; ++ ready_wait = ; ++ shutdown1 = ; ++ }; ++ ++ ready_wait { ++ // Clear the soft GPIO ++ set = ; ++ ready = ; ++ shutdown1 = ; ++ }; ++ ++ ready { ++ stopping = , ; ++ shutdown1 = ; ++ }; ++ ++ stopping { ++ set = , ; ++ stopped = ; ++ }; ++ ++ stopped { ++ set = , ; ++ get_set = ; ++ shutdown1 = ; ++ }; ++ ++ get_set { ++ set = ; ++ go = ; ++ }; ++ ++ shutdown1 { ++ set = , , ; ++ shutdown2 = ; ++ }; ++ ++ shutdown2 { ++ set = , ; ++ shutdown3 = ; ++ }; ++ ++ shutdown3 { ++ set = , ; ++ shutdown4 = ; ++ }; ++ ++ shutdown4 { ++ shutdown_state; ++ set = ; ++ }; ++ }; ++ }; ++ }; ++ ++ __overrides__ { ++ fsm_debug = <&fsm_demo>,"debug:0"; ++ }; ++}; +-- +2.18.4 + + +From f9ec784fba114fa446f7b2473cbfa18042024ee7 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 30 Sep 2020 12:17:48 +0100 +Subject: [PATCH 1146/1148] overlays: Add ghost-amp overlay + +Add an overlay for the Ghost amplifier. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/Makefile | 1 + + arch/arm/boot/dts/overlays/README | 7 ++ + .../boot/dts/overlays/ghost-amp-overlay.dts | 119 ++++++++++++++++++ + 3 files changed, 127 insertions(+) + create mode 100644 arch/arm/boot/dts/overlays/ghost-amp-overlay.dts + +diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile +index 90c9baefc41d..ab9fa47c8876 100644 +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -45,6 +45,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + exc3000.dtbo \ + fe-pi-audio.dtbo \ + fsm-demo.dtbo \ ++ ghost-amp.dtbo \ + goodix.dtbo \ + googlevoicehat-soundcard.dtbo \ + gpio-fan.dtbo \ +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 6b61b0255fd7..eff90baed406 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -775,6 +775,13 @@ Load: dtoverlay=fsm-demo,= + Params: fsm_debug Enable debug logging (default off) + + ++Name: ghost-amp ++Info: An overlay for the Ghost amplifier. ++Load: dtoverlay=ghost-amp,= ++Params: fsm_debug Enable debug logging of the GPIO FSM (default ++ off) ++ ++ + Name: goodix + Info: Enables I2C connected Goodix gt9271 multiple touch controller using + GPIOs 4 and 17 (pins 7 and 11 on GPIO header) for interrupt and reset. +diff --git a/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts +new file mode 100644 +index 000000000000..afc9f034b5fc +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts +@@ -0,0 +1,119 @@ ++// Overlay for the PCM5122-based Ghost amplifier using gpio-fsm ++/dts-v1/; ++/plugin/; ++ ++#include ++ ++#define ENABLE GF_SW(0) ++#define FAULT GF_IP(0) // GPIO5 ++#define RELAY1 GF_OP(0) // GPIO22 ++#define RELAY2 GF_OP(1) // GPIO23 ++ ++/ { ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target = <&i2s>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ pcm5122@4c { ++ #sound-dai-cells = <0>; ++ compatible = "ti,pcm5122"; ++ reg = <0x4c>; ++ AVDD-supply = <&vdd_3v3_reg>; ++ DVDD-supply = <&vdd_3v3_reg>; ++ CPVDD-supply = <&vdd_3v3_reg>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&sound>; ++ iqaudio_dac: __overlay__ { ++ compatible = "iqaudio,iqaudio-dac"; ++ i2s-controller = <&i2s>; ++ mute-gpios = <& 0 0>; ++ iqaudio-dac,auto-mute-amp; ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@3 { ++ target-path = "/"; ++ __overlay__ { ++ amp: ghost-amp { ++ compatible = "rpi,gpio-fsm"; ++ ++ debug = <0>; ++ gpio-controller; ++ #gpio-cells = <2>; ++ num-soft-gpios = <1>; ++ gpio-line-names = "enable"; ++ input-gpios = <&gpio 5 1>; // FAULT (active low) ++ output-gpios = <&gpio 22 0>, // RELAY1 ++ <&gpio 23 0>; // RELAY2 ++ shutdown-timeout-ms = <1000>; ++ ++ amp_off { ++ start_state; ++ shutdown_state; ++ ++ set = , ++ ; ++ amp_on_1 = ; ++ fault = ; ++ }; ++ ++ amp_on_1 { ++ set = ; ++ amp_on = ; ++ amp_off = ; ++ fault = ; ++ }; ++ ++ amp_on { ++ set = ; ++ amp_off_wait = ; ++ fault = ; ++ }; ++ ++ amp_off_wait { ++ amp_off_1 = , ++ ; ++ amp_on = ; ++ fault = ; ++ }; ++ ++ amp_off_1 { ++ set = ; ++ amp_on = ; ++ amp_off = ; ++ fault = ; ++ }; ++ ++ // Keep this a distinct state to prevent ++ // changes and for the diagnostic output ++ fault { ++ set = , ++ ; ++ shutdown_state; ++ }; ++ }; ++ }; ++ }; ++ ++ __overrides__ { ++ fsm_debug = <&>,"debug:0"; ++ }; ++}; +-- +2.18.4 + + +From bf71727fe49b171c166df3f20f651ca0aa3c6bf0 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 6 Aug 2020 11:17:13 -0700 +Subject: [PATCH 1147/1148] Bluetooth: Disable High Speed by default + +commit b176dd0ef6afcb3bca24f41d78b0d0b731ec2d08 upstream. + +Bluetooth High Speed requires hardware support which is very uncommon +nowadays since HS has not pickup interest by the industry. + +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Marcel Holtmann +--- + net/bluetooth/Kconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig +index 3803135c88ff..340f169f6d54 100644 +--- a/net/bluetooth/Kconfig ++++ b/net/bluetooth/Kconfig +@@ -64,7 +64,6 @@ source "net/bluetooth/hidp/Kconfig" + config BT_HS + bool "Bluetooth High Speed (HS) features" + depends on BT_BREDR +- default y + help + Bluetooth High Speed includes support for off-loading + Bluetooth connections via 802.11 (wifi) physical layer +-- +2.18.4 + + +From e13a8b6e93eb4b452de2005812bfca56432889b4 Mon Sep 17 00:00:00 2001 +From: Joerg Schambacher +Date: Fri, 16 Oct 2020 15:17:07 +0200 +Subject: [PATCH 1148/1148] Fixes a problem when module probes before i2c + module is available + +The driver crashed while a NULL pointer returned by i2c_get_adapter() +has been used to access the i2c bus functions. +The headphone probing function hb_hp_probe() now returns -EPROBE_DEFER +in case the i2c module has not been loaded yet. + +Signed-off-by: Joerg Schambacher +--- + sound/soc/bcm/hifiberry_dacplus.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c +index 286a62c3ff48..2f1b1ef4191a 100644 +--- a/sound/soc/bcm/hifiberry_dacplus.c ++++ b/sound/soc/bcm/hifiberry_dacplus.c +@@ -315,12 +315,14 @@ static int hb_hp_detect(void) + { + struct i2c_adapter *adap = i2c_get_adapter(1); + int ret; +- + struct i2c_client tpa_i2c_client = { + .addr = 0x60, + .adapter = adap, + }; + ++ if (!adap) ++ return -EPROBE_DEFER; /* I2C module not yet available */ ++ + ret = i2c_smbus_read_byte(&tpa_i2c_client) >= 0; + i2c_put_adapter(adap); + return ret; +@@ -342,7 +344,10 @@ static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev) + struct of_changeset ocs; + + /* probe for head phone amp */ +- if (hb_hp_detect()) { ++ ret = hb_hp_detect(); ++ if (ret < 0) ++ return ret; ++ if (ret) { + card->aux_dev = hifiberry_dacplus_aux_devs; + card->num_aux_devs = + ARRAY_SIZE(hifiberry_dacplus_aux_devs); +-- +2.18.4 diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 4feab11..d06ceea 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,5 +1,5 @@ -%global commit_firmware_long a490197f0672d948860b2b807884ae65eabc4d4f -%global commit_linux_long 65caf603f3b1c43f4c92939f7fbb7149e054f486 +%global commit_firmware_long b0f9870274333af93ecc5e779619bf51c092364d +%global commit_linux_long edc21a35b9b7b427716564c3b744ed2a89fcd19a ExclusiveArch: aarch64 armv7hl @@ -32,7 +32,7 @@ ExclusiveArch: aarch64 armv7hl %define extra_version 1 %define kversion 5.4 -%define kfullversion %{kversion}.65 +%define kfullversion %{kversion}.72 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 +* Sun Oct 18 2020 Pablo Greco - 5.4.72 +- Update to version v5.4.72 + * Sat Sep 12 2020 Pablo Greco - 5.4.65 - Update to version v5.4.65 - Build using devtoolset-8