diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index 0fa6dd0..01d62bf 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,3 +1,3 @@ 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd SOURCES/linux-5.4.tar.xz -f7f3cfeb04785970c2f4ef17ec1fe0b0344daad7 SOURCES/934252b0b5258a6f1caedc6708393d44e6710cbc.tar.gz -97b4435faba8f275d022bf13472d049ea43cbdb9 SOURCES/patch-5.4.88.xz +5a9ea09069d43d227f521a7ed4162097d82d9487 SOURCES/7d91570f20378afc9414107dccdad70705a8a342.tar.gz +db1c1c4a657da52e36075fe90f4b328a10df7457 SOURCES/patch-5.4.96.xz diff --git a/SOURCES/rpi-5.4.x.patch b/SOURCES/rpi-5.4.x.patch index a903740..1c0f4bd 100644 --- a/SOURCES/rpi-5.4.x.patch +++ b/SOURCES/rpi-5.4.x.patch @@ -1,7 +1,7 @@ -From b20b626fe2495348adb591cc117abc85664d15d1 Mon Sep 17 00:00:00 2001 +From a8244f30f4e4d5c44326e9c6d128270977baecd5 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Thu, 21 Sep 2017 09:55:42 -0500 -Subject: [PATCH 0001/1216] arm: partially revert +Subject: [PATCH 0001/1224] arm: partially revert 702b94bff3c50542a6e4ab9a4f4cef093262fe65 * Re-expose some dmi APIs for use in VCSM @@ -13,7 +13,7 @@ Subject: [PATCH 0001/1216] arm: partially revert 4 files changed, 28 insertions(+) diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h -index 7114b9aa46b8..676cf6558944 100644 +index 7114b9aa46b87..676cf65589441 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -91,6 +91,21 @@ @@ -66,7 +66,7 @@ index 7114b9aa46b8..676cf6558944 100644 #endif diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h -index 724f8dac1e5b..aa74173092dd 100644 +index 724f8dac1e5b1..aa74173092dd8 100644 --- a/arch/arm/include/asm/glue-cache.h +++ b/arch/arm/include/asm/glue-cache.h @@ -155,6 +155,8 @@ static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } @@ -79,7 +79,7 @@ index 724f8dac1e5b..aa74173092dd 100644 #endif diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S -index 60ac7c5999a9..f48f3066abef 100644 +index 60ac7c5999a98..f48f3066abefd 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -336,6 +336,8 @@ ENTRY(\name\()_cache_fns) @@ -92,7 +92,7 @@ index 60ac7c5999a9..f48f3066abef 100644 .size \name\()_cache_fns, . - \name\()_cache_fns .endm diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c -index e21249548e9f..33e4a9b8f1ba 100644 +index e21249548e9fb..33e4a9b8f1ba3 100644 --- a/arch/arm/mm/proc-syms.c +++ b/arch/arm/mm/proc-syms.c @@ -27,6 +27,9 @@ EXPORT_SYMBOL(__cpuc_flush_user_all); @@ -109,10 +109,10 @@ index e21249548e9f..33e4a9b8f1ba 100644 2.18.4 -From f68827dc04bbcf4c1a5b7325cc5f5af22b25a1f4 Mon Sep 17 00:00:00 2001 +From ea241fd29c65ff7f40cfb8367a2fae0442d84da7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 29 Oct 2018 14:45:45 +0000 -Subject: [PATCH 0002/1216] Revert "rtc: pcf8523: properly handle oscillator +Subject: [PATCH 0002/1224] Revert "rtc: pcf8523: properly handle oscillator stop bit" This reverts commit ede44c908d44b166a5b6bd7caacd105c2ff5a70f. @@ -125,7 +125,7 @@ Signed-off-by: Phil Elwell 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c -index 2f435e533b10..c85abf77ab50 100644 +index 2f435e533b10b..c85abf77ab509 100644 --- a/drivers/rtc/rtc-pcf8523.c +++ b/drivers/rtc/rtc-pcf8523.c @@ -209,8 +209,28 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm) @@ -171,10 +171,10 @@ index 2f435e533b10..c85abf77ab50 100644 2.18.4 -From 62c5af57f3ddb2282f68266016096b12876559c0 Mon Sep 17 00:00:00 2001 +From 3793d8b1f7ca87a515f4f06fa9ec08125d9825f2 Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Thu, 19 Feb 2015 18:47:12 +0000 -Subject: [PATCH 0003/1216] smsx95xx: fix crimes against truesize +Subject: [PATCH 0003/1224] 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. @@ -186,7 +186,7 @@ Signed-off-by: Steve Glendinning 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index bb4ccbda031a..dedebce4b2d9 100644 +index bb4ccbda031ab..dedebce4b2d9a 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -70,6 +70,10 @@ static bool turbo_mode = true; @@ -224,10 +224,10 @@ index bb4ccbda031a..dedebce4b2d9 100644 2.18.4 -From 81b0a45ec0351ed0f9304780c2db0b3c3a492620 Mon Sep 17 00:00:00 2001 +From 151c681dd52b6268d49e5354f7b1bfc0bd3bc1bd Mon Sep 17 00:00:00 2001 From: Sam Nazarko Date: Fri, 1 Apr 2016 17:27:21 +0100 -Subject: [PATCH 0004/1216] smsc95xx: Experimental: Enable turbo_mode and +Subject: [PATCH 0004/1224] smsc95xx: Experimental: Enable turbo_mode and packetsize=2560 by default See: http://forum.kodi.tv/showthread.php?tid=285288 @@ -236,7 +236,7 @@ See: http://forum.kodi.tv/showthread.php?tid=285288 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index dedebce4b2d9..c5ebcb114309 100644 +index dedebce4b2d9a..c5ebcb114309b 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -74,6 +74,10 @@ static bool truesize_mode = false; @@ -273,10 +273,10 @@ index dedebce4b2d9..c5ebcb114309 100644 2.18.4 -From ee97d7a028c63dd2785397f62e796ddc7ec5fcf7 Mon Sep 17 00:00:00 2001 +From e88df992eae6c6bc7fc20237abb8989ec6cf7eb1 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 26 Mar 2013 17:26:38 +0000 -Subject: [PATCH 0005/1216] Allow mac address to be set in smsc95xx +Subject: [PATCH 0005/1224] Allow mac address to be set in smsc95xx Signed-off-by: popcornmix --- @@ -284,7 +284,7 @@ Signed-off-by: popcornmix 1 file changed, 56 insertions(+) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index c5ebcb114309..510f4d410f69 100644 +index c5ebcb114309b..510f4d410f696 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -48,6 +48,7 @@ @@ -375,10 +375,10 @@ index c5ebcb114309..510f4d410f69 100644 2.18.4 -From e6d6c2aa82058310d1c349f89f5bf861037f7cba Mon Sep 17 00:00:00 2001 +From e089be98d59f3194310ab4474cdf7e814592d03a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 13 Mar 2015 12:43:36 +0000 -Subject: [PATCH 0006/1216] Protect __release_resource against resources +Subject: [PATCH 0006/1224] Protect __release_resource against resources without parents Without this patch, removing a device tree overlay can crash here. @@ -389,7 +389,7 @@ Signed-off-by: Phil Elwell 1 file changed, 6 insertions(+) diff --git a/kernel/resource.c b/kernel/resource.c -index 841737bbda9e..6877c789c5f6 100644 +index 841737bbda9e5..6877c789c5f6b 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -214,6 +214,12 @@ static int __release_resource(struct resource *old, bool release_child) @@ -409,10 +409,10 @@ index 841737bbda9e..6877c789c5f6 100644 2.18.4 -From 30e7a213496cf461fc3e34f9f2f7cd464ea5b3a1 Mon Sep 17 00:00:00 2001 +From 7c1f50484d3134b7b6ddac7eec826f81b48a63e5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 4 Dec 2015 17:41:50 +0000 -Subject: [PATCH 0007/1216] irq-bcm2836: Prevent spurious interrupts, and trap +Subject: [PATCH 0007/1224] irq-bcm2836: Prevent spurious interrupts, and trap them early The old arch-specific IRQ macros included a dsb to ensure the @@ -427,7 +427,7 @@ though, so trap them early. 1 file changed, 1 insertion(+) diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c -index 2038693f074c..597d36ba601e 100644 +index 2038693f074cb..597d36ba601ea 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -135,6 +135,7 @@ __exception_irq_entry bcm2836_arm_irqchip_handle_irq(struct pt_regs *regs) @@ -442,10 +442,10 @@ index 2038693f074c..597d36ba601e 100644 2.18.4 -From a0813cccd81b9830395c56742b7c2a3648ae1afd Mon Sep 17 00:00:00 2001 +From acb04fc8a5b8799b2e6d17392a084417272a5403 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:33:30 +0000 -Subject: [PATCH 0008/1216] irq-bcm2836: Avoid "Invalid trigger warning" +Subject: [PATCH 0008/1224] irq-bcm2836: Avoid "Invalid trigger warning" Initialise the level for each IRQ to avoid a warning from the arm arch timer code. @@ -456,7 +456,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c -index 597d36ba601e..c006a8ac10d5 100644 +index 597d36ba601ea..c006a8ac10d53 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -115,7 +115,7 @@ static int bcm2836_map(struct irq_domain *d, unsigned int irq, @@ -472,10 +472,10 @@ index 597d36ba601e..c006a8ac10d5 100644 2.18.4 -From 076805f913c2b723eb11e856678e86748ae8e348 Mon Sep 17 00:00:00 2001 +From 575a721cdf0a221d6a5b9f8b07c1510c982e6be7 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/1216] irqchip: bcm2835: Add FIQ support +Subject: [PATCH 0009/1224] irqchip: bcm2835: Add FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -493,7 +493,7 @@ Acked-by: Stephen Warren 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig -index 5e5f1fabc3d4..1feec0635758 100644 +index 5e5f1fabc3d40..1feec06357589 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -165,6 +165,7 @@ config ARCH_BCM2835 @@ -505,7 +505,7 @@ index 5e5f1fabc3d4..1feec0635758 100644 select PINCTRL_BCM2835 select MFD_CORE diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 418245d31921..64472b25d0b4 100644 +index 418245d31921b..64472b25d0b4e 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -45,7 +45,7 @@ @@ -607,10 +607,10 @@ index 418245d31921..64472b25d0b4 100644 2.18.4 -From c7f7dff4e5f7f4e9b191fbb1ac8272234304017c Mon Sep 17 00:00:00 2001 +From f6b645a062b114da571b27ac6f7b15a111d6ed94 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/1216] irqchip: irq-bcm2835: Add 2836 FIQ support +Subject: [PATCH 0010/1224] irqchip: irq-bcm2835: Add 2836 FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -621,7 +621,7 @@ Signed-off-by: Noralf Trønnes 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 64472b25d0b4..2fccc5cfe9f3 100644 +index 64472b25d0b4e..2fccc5cfe9f33 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -41,8 +41,11 @@ @@ -712,10 +712,10 @@ index 64472b25d0b4..2fccc5cfe9f3 100644 2.18.4 -From 5b44b1524188443bc2bf101dc4aa1dd9183305f4 Mon Sep 17 00:00:00 2001 +From 0e969a7195c355581833667be97725850302478c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 10:26:09 +0100 -Subject: [PATCH 0011/1216] spi: spidev: Completely disable the spidev warning +Subject: [PATCH 0011/1224] 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. @@ -726,7 +726,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index be503a0e6ef7..736af270d7a1 100644 +index be503a0e6ef73..736af270d7a10 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -733,7 +733,7 @@ static int spidev_probe(struct spi_device *spi) @@ -742,10 +742,10 @@ index be503a0e6ef7..736af270d7a1 100644 2.18.4 -From 81636964d2d23db3610ebc91997ab7d166b38852 Mon Sep 17 00:00:00 2001 +From bad635b8a6c5d5d30c46fdc5f835dbf465888b0e 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/1216] dmaengine: bcm2835: Load driver early and support +Subject: [PATCH 0012/1224] dmaengine: bcm2835: Load driver early and support legacy API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -763,7 +763,7 @@ Signed-off-by: Noralf Trønnes 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index 7af874b69ffb..112e08cedcd5 100644 +index 7af874b69ffb9..112e08cedcd56 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -133,7 +133,7 @@ config COH901318 @@ -776,7 +776,7 @@ index 7af874b69ffb..112e08cedcd5 100644 select DMA_VIRTUAL_CHANNELS diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index e4c593f48575..6860131b02d9 100644 +index e4c593f48575c..6860131b02d9a 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -25,6 +25,7 @@ @@ -851,17 +851,17 @@ index e4c593f48575..6860131b02d9 100644 2.18.4 -From 37c511c8fd6ac9acf212e6d525003951093b31de Mon Sep 17 00:00:00 2001 +From 21ea9a980cd0a41f295d42c7e4453f6ce339ae86 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 25 Jan 2016 17:25:12 +0000 -Subject: [PATCH 0013/1216] firmware: Updated mailbox header +Subject: [PATCH 0013/1224] firmware: Updated mailbox header --- include/soc/bcm2835/raspberrypi-firmware.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index 7800e12ee042..3f357c05788e 100644 +index 7800e12ee042c..3f357c05788e8 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -9,6 +9,8 @@ @@ -884,10 +884,10 @@ index 7800e12ee042..3f357c05788e 100644 2.18.4 -From edb4c768de454c1384c43404cb15225902be4dd9 Mon Sep 17 00:00:00 2001 +From af28d9cf3a717b0e7dfcd2413d98c6b1d60f5b87 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 15 Jun 2016 16:48:41 +0100 -Subject: [PATCH 0014/1216] rtc: Add SPI alias for pcf2123 driver +Subject: [PATCH 0014/1224] rtc: Add SPI alias for pcf2123 driver Without this alias, Device Tree won't cause the driver to be loaded. @@ -898,7 +898,7 @@ See: https://github.com/raspberrypi/linux/pull/1510 1 file changed, 1 insertion(+) diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c -index c3691fa4210e..ead1fd376d2d 100644 +index c3691fa4210e5..ead1fd376d2d8 100644 --- a/drivers/rtc/rtc-pcf2123.c +++ b/drivers/rtc/rtc-pcf2123.c @@ -465,3 +465,4 @@ module_spi_driver(pcf2123_driver); @@ -910,10 +910,10 @@ index c3691fa4210e..ead1fd376d2d 100644 2.18.4 -From 53dee6efefeb86f7e922c7d01cc9b8700bac7ee8 Mon Sep 17 00:00:00 2001 +From 1fbf677bdc4552f908d7bb8d1a22011c936215c8 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/1216] watchdog: bcm2835: Support setting reboot partition +Subject: [PATCH 0015/1224] watchdog: bcm2835: Support setting reboot partition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -932,7 +932,7 @@ Signed-off-by: Noralf Trønnes 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c -index dec6ca019bea..62937e6f83ca 100644 +index dec6ca019beaa..62937e6f83ca1 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -32,13 +32,7 @@ @@ -1018,10 +1018,10 @@ index dec6ca019bea..62937e6f83ca 100644 2.18.4 -From c513733cba1ff04fc8314155b07e4eaebb2cc89c Mon Sep 17 00:00:00 2001 +From 45a7ba2402238604f9c17a6f53dc3464c867cbf5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 Apr 2016 19:40:12 +0100 -Subject: [PATCH 0016/1216] reboot: Use power off rather than busy spinning +Subject: [PATCH 0016/1224] reboot: Use power off rather than busy spinning when halt is requested --- @@ -1029,7 +1029,7 @@ Subject: [PATCH 0016/1216] reboot: Use power off rather than busy spinning 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c -index bb18ed0539f4..a8595ab97e5b 100644 +index bb18ed0539f49..a8595ab97e5b5 100644 --- a/arch/arm/kernel/reboot.c +++ b/arch/arm/kernel/reboot.c @@ -102,9 +102,7 @@ void machine_shutdown(void) @@ -1047,17 +1047,17 @@ index bb18ed0539f4..a8595ab97e5b 100644 2.18.4 -From b8b5f6b865495835d88eb6a9d6dd08e38cddd318 Mon Sep 17 00:00:00 2001 +From 35a0254ac4c012a5e8bbad03192d5f9f8b7aaf1d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Nov 2016 13:02:52 +0000 -Subject: [PATCH 0017/1216] bcm: Make RASPBERRYPI_POWER depend on PM +Subject: [PATCH 0017/1224] bcm: Make RASPBERRYPI_POWER depend on PM --- drivers/soc/bcm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig -index 648e32693b7e..f204562996e2 100644 +index 648e32693b7e3..f204562996e27 100644 --- a/drivers/soc/bcm/Kconfig +++ b/drivers/soc/bcm/Kconfig @@ -17,6 +17,7 @@ config RASPBERRYPI_POWER @@ -1072,10 +1072,10 @@ index 648e32693b7e..f204562996e2 100644 2.18.4 -From 62e4b829e4872b464c08516a143314c6a883bead Mon Sep 17 00:00:00 2001 +From 67fcd0869b90f39a1f1b72c4d30a1c0c3a94f5f8 Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Fri, 2 Sep 2016 16:45:27 +0100 -Subject: [PATCH 0018/1216] Register the clocks early during the boot process, +Subject: [PATCH 0018/1224] 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. @@ -1086,7 +1086,7 @@ Signed-off-by: Martin Sperl 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index c5486537b928..5c2eb7f66887 100644 +index c5486537b9284..5c2eb7f66887d 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -2267,8 +2267,15 @@ static int bcm2835_clk_probe(struct platform_device *pdev) @@ -1123,10 +1123,10 @@ index c5486537b928..5c2eb7f66887 100644 2.18.4 -From 60365fe4a6177c68d6b8c123f16f99364852ea31 Mon Sep 17 00:00:00 2001 +From 2a9430b1f263f2a477065f57b35005f9c165f688 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 6 Dec 2016 17:05:39 +0000 -Subject: [PATCH 0019/1216] bcm2835-rng: Avoid initialising if already enabled +Subject: [PATCH 0019/1224] bcm2835-rng: Avoid initialising if already enabled Avoids the 0x40000 cycles of warmup again if firmware has already used it --- @@ -1134,7 +1134,7 @@ Avoids the 0x40000 cycles of warmup again if firmware has already used it 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c -index f759790c3cdb..1b85ebcbca80 100644 +index f759790c3cdb6..1b85ebcbca803 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c @@ -102,8 +102,10 @@ static int bcm2835_rng_init(struct hwrng *rng) @@ -1154,10 +1154,10 @@ index f759790c3cdb..1b85ebcbca80 100644 2.18.4 -From 0eddb2c3e45a3fc98c88426da52caade187fbb74 Mon Sep 17 00:00:00 2001 +From 563cf8a14fc5104caf734c10fe23459a954b8599 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 0020/1216] clk-bcm2835: Mark used PLLs and dividers CRITICAL +Subject: [PATCH 0020/1224] 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 @@ -1169,7 +1169,7 @@ Signed-off-by: Phil Elwell 1 file changed, 5 insertions(+) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 5c2eb7f66887..7f6e174107d1 100644 +index 5c2eb7f66887d..7f6e174107d1c 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1381,6 +1381,11 @@ bcm2835_register_pll_divider(struct bcm2835_cprman *cprman, @@ -1188,10 +1188,10 @@ index 5c2eb7f66887..7f6e174107d1 100644 2.18.4 -From c372c0c3444bd6e36d3c5ea1a580b80824640c6b Mon Sep 17 00:00:00 2001 +From a5b9d22031592b8753ac7ab0509b935e60e624ad Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 0021/1216] clk-bcm2835: Add claim-clocks property +Subject: [PATCH 0021/1224] 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, @@ -1206,7 +1206,7 @@ Signed-off-by: Phil Elwell 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 7f6e174107d1..70b545652933 100644 +index 7f6e174107d1c..70b5456529336 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1311,6 +1311,8 @@ static const struct clk_ops bcm2835_vpu_clock_clk_ops = { @@ -1296,10 +1296,10 @@ index 7f6e174107d1..70b545652933 100644 2.18.4 -From d2d11530f8b554d4c55ee4f5777019a10e350557 Mon Sep 17 00:00:00 2001 +From 155c40771517fc39bf3fab9b13cef90c069813c7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Mar 2017 09:06:18 +0000 -Subject: [PATCH 0022/1216] clk-bcm2835: Read max core clock from firmware +Subject: [PATCH 0022/1224] 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 @@ -1322,7 +1322,7 @@ Signed-off-by: Phil Elwell 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 70b545652933..9b9d17e9ad5c 100644 +index 70b5456529336..9b9d17e9ad5cd 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -35,6 +35,7 @@ @@ -1417,10 +1417,10 @@ index 70b545652933..9b9d17e9ad5c 100644 2.18.4 -From 00ab4185483265f1d556a916cc71d4a57f3552fb Mon Sep 17 00:00:00 2001 +From 603f29c867917be49aa57a38f79b911fa2547bd3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 9 May 2016 17:28:18 -0700 -Subject: [PATCH 0023/1216] clk: bcm2835: Mark GPIO clocks enabled at boot as +Subject: [PATCH 0023/1224] clk: bcm2835: Mark GPIO clocks enabled at boot as critical. These divide off of PLLD_PER and are used for the ethernet and wifi @@ -1438,7 +1438,7 @@ Signed-off-by: Eric Anholt 1 file changed, 9 insertions(+) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 9b9d17e9ad5c..db1df40271c0 100644 +index 9b9d17e9ad5cd..db1df40271c08 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1472,6 +1472,15 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman, @@ -1461,10 +1461,10 @@ index 9b9d17e9ad5c..db1df40271c0 100644 2.18.4 -From 976d86159fd4c8e8de938b3f84039c1be16754e8 Mon Sep 17 00:00:00 2001 +From cd7ef0c820047cbb8668ef529c014d153d47ac74 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:36:44 +0000 -Subject: [PATCH 0024/1216] sound: Demote deferral errors to INFO level +Subject: [PATCH 0024/1224] 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. @@ -1477,7 +1477,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c -index 9df20768a8f2..0b9f9a06bdb5 100644 +index 9df20768a8f29..0b9f9a06bdb52 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -898,7 +898,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, @@ -1502,10 +1502,10 @@ index 9df20768a8f2..0b9f9a06bdb5 100644 2.18.4 -From 9589c2c46893db8488e9e79376ac7efc66353322 Mon Sep 17 00:00:00 2001 +From fc603613ac05fb37757012e026121a88e0c5bab5 Mon Sep 17 00:00:00 2001 From: Claggy3 Date: Sat, 11 Feb 2017 14:00:30 +0000 -Subject: [PATCH 0025/1216] Update vfpmodule.c +Subject: [PATCH 0025/1224] 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 @@ -1564,7 +1564,7 @@ Signed-off-by: Christopher Alexander Tobias Schulze 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c -index 8c9e7f9f0277..f0ceb1975964 100644 +index 8c9e7f9f0277d..f0ceb1975964f 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -176,8 +176,11 @@ static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v) @@ -1645,10 +1645,10 @@ index 8c9e7f9f0277..f0ceb1975964 100644 2.18.4 -From 96668e7beb455ba77f4d3c9b4366edf2d76b729c Mon Sep 17 00:00:00 2001 +From 83ccaf46310d7d591ce386b4509c4b98a6fdb15a 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/1216] i2c: bcm2835: Add debug support +Subject: [PATCH 0026/1224] i2c: bcm2835: Add debug support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -1683,7 +1683,7 @@ Signed-off-by: Noralf Trønnes 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c -index 5ab901ad615d..beb67afa6a3c 100644 +index 5ab901ad615dd..beb67afa6a3c6 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -51,6 +51,18 @@ @@ -1840,10 +1840,10 @@ index 5ab901ad615d..beb67afa6a3c 100644 2.18.4 -From 0802414cfc0fb82549346ac4a03745a46d4ef8e6 Mon Sep 17 00:00:00 2001 +From fac2fbd5dc87cd737ae837924910e583cc29c8df Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 18 Dec 2014 16:07:15 -0800 -Subject: [PATCH 0027/1216] mm: Remove the PFN busy warning +Subject: [PATCH 0027/1224] mm: Remove the PFN busy warning See commit dae803e165a11bc88ca8dbc07a11077caf97bbcb -- the warning is expected sometimes when using CMA. However, that commit still spams @@ -1855,7 +1855,7 @@ Signed-off-by: Eric Anholt 1 file changed, 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 4357f5475a50..0f49656fc449 100644 +index 4357f5475a504..0f49656fc449b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8512,8 +8512,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, @@ -1871,10 +1871,10 @@ index 4357f5475a50..0f49656fc449 100644 2.18.4 -From ebb180d8d62926000c1b0fab6f9c683ef3120a8b Mon Sep 17 00:00:00 2001 +From 88d4e6799cf14dfdd90904b9cdd3c90a679d1e41 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 23 Mar 2017 10:06:56 +0000 -Subject: [PATCH 0028/1216] ASoC: Add prompt for ICS43432 codec +Subject: [PATCH 0028/1224] 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 @@ -1886,7 +1886,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 229cc89f8c5a..080a2cec3fa8 100644 +index 229cc89f8c5a5..080a2cec3fa81 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -710,7 +710,7 @@ config SND_SOC_HDAC_HDA @@ -1902,10 +1902,10 @@ index 229cc89f8c5a..080a2cec3fa8 100644 2.18.4 -From 58d9783b842013e98f8b4dde6d6e1ef97f20284a Mon Sep 17 00:00:00 2001 +From 1644506dff2236b3dca712b43eacf952b67b883e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Jan 2018 16:52:45 +0000 -Subject: [PATCH 0029/1216] irqchip: irq-bcm2836: Remove regmap and syscon use +Subject: [PATCH 0029/1224] 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 @@ -1925,7 +1925,7 @@ Signed-off-by: Phil Elwell 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 2fccc5cfe9f3..88abd2e67866 100644 +index 2fccc5cfe9f33..88abd2e67866b 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -41,8 +41,6 @@ @@ -1996,7 +1996,7 @@ index 2fccc5cfe9f3..88abd2e67866 100644 /* Make a duplicate irq range which is used to enable FIQ */ diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c -index c006a8ac10d5..49642bcd0b75 100644 +index c006a8ac10d53..49642bcd0b75c 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -21,6 +21,9 @@ struct bcm2836_arm_irqchip_intc { @@ -2022,10 +2022,10 @@ index c006a8ac10d5..49642bcd0b75 100644 2.18.4 -From d4ac0f465e054be231065b9f3aad5967a9e4e88b Mon Sep 17 00:00:00 2001 +From e0cb536147d65386edc48d2158db8cbce9751d5b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 17 Oct 2017 15:04:29 +0100 -Subject: [PATCH 0030/1216] lan78xx: Enable LEDs and auto-negotiation +Subject: [PATCH 0030/1224] 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 @@ -2037,7 +2037,7 @@ Signed-off-by: Phil Elwell 1 file changed, 11 insertions(+) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 71cc5b63d8ce..ba42568316f1 100644 +index 71cc5b63d8ced..ba42568316f1b 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2461,6 +2461,11 @@ static int lan78xx_reset(struct lan78xx_net *dev) @@ -2076,10 +2076,10 @@ index 71cc5b63d8ce..ba42568316f1 100644 2.18.4 -From 4c02e269a9eb1afd94a20b48d9c8c1428766be8d Mon Sep 17 00:00:00 2001 +From db17ffec065375a62b79fa33dab1ec8e5acb629e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Feb 2016 17:26:48 +0000 -Subject: [PATCH 0031/1216] amba_pl011: Don't use DT aliases for numbering +Subject: [PATCH 0031/1224] 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 @@ -2091,7 +2091,7 @@ use the same logic. 1 file changed, 5 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index 16720c97a4dd..35dc702fad87 100644 +index 16720c97a4dde..35dc702fad87a 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2578,7 +2578,12 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, @@ -2111,10 +2111,10 @@ index 16720c97a4dd..35dc702fad87 100644 2.18.4 -From 1f749d67ad04e9e2fee405ebb3577ef652162817 Mon Sep 17 00:00:00 2001 +From 7211091afc66ddeea79cdd98fd23584cbfb20bb2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Mar 2017 16:07:39 +0000 -Subject: [PATCH 0032/1216] amba_pl011: Round input clock up +Subject: [PATCH 0032/1224] 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 @@ -2138,7 +2138,7 @@ Signed-off-by: Phil Elwell 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index 35dc702fad87..b3e24efac6d8 100644 +index 35dc702fad87a..b3e24efac6d81 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1653,6 +1653,23 @@ static void pl011_put_poll_char(struct uart_port *port, @@ -2203,10 +2203,10 @@ index 35dc702fad87..b3e24efac6d8 100644 2.18.4 -From 828e35ebf24b335879cd2c46ab2c8c917173ae5a Mon Sep 17 00:00:00 2001 +From d106db899058cc6d95c1345f498835c9b0b6e16a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 0033/1216] amba_pl011: Insert mb() for correct FIFO handling +Subject: [PATCH 0033/1224] 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 @@ -2221,7 +2221,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index b3e24efac6d8..6d953abd3779 100644 +index b3e24efac6d81..6d953abd37796 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1386,6 +1386,7 @@ static bool pl011_tx_char(struct uart_amba_port *uap, unsigned char c, @@ -2236,10 +2236,10 @@ index b3e24efac6d8..6d953abd3779 100644 2.18.4 -From 258df9867cdb8edd46d52ba911023de4017a759f Mon Sep 17 00:00:00 2001 +From 9baa77f0c94002cfb48c19fb29ed62ae90b681a1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 0034/1216] amba_pl011: Add cts-event-workaround DT property +Subject: [PATCH 0034/1224] 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 @@ -2258,7 +2258,7 @@ Signed-off-by: Phil Elwell 2 files changed, 11 insertions(+) diff --git a/Documentation/devicetree/bindings/serial/pl011.yaml b/Documentation/devicetree/bindings/serial/pl011.yaml -index 1a64d59152aa..a4650389eded 100644 +index 1a64d59152aad..a4650389eded8 100644 --- a/Documentation/devicetree/bindings/serial/pl011.yaml +++ b/Documentation/devicetree/bindings/serial/pl011.yaml @@ -100,6 +100,12 @@ properties: @@ -2275,7 +2275,7 @@ index 1a64d59152aa..a4650389eded 100644 - compatible - reg diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index 6d953abd3779..ba2029bf1e63 100644 +index 6d953abd37796..ba2029bf1e639 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2665,6 +2665,11 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) @@ -2294,10 +2294,10 @@ index 6d953abd3779..ba2029bf1e63 100644 2.18.4 -From 65b4ee6969548e3ab701c3c677e9a52d8447348b Mon Sep 17 00:00:00 2001 +From e40013b35e21a29618cd0166fce7b493f9f76ec1 Mon Sep 17 00:00:00 2001 From: notro Date: Thu, 10 Jul 2014 13:59:47 +0200 -Subject: [PATCH 0035/1216] pinctrl-bcm2835: Set base to 0 give expected gpio +Subject: [PATCH 0035/1224] pinctrl-bcm2835: Set base to 0 give expected gpio numbering Signed-off-by: Noralf Tronnes @@ -2306,7 +2306,7 @@ Signed-off-by: Noralf Tronnes 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -index 0de1a3a96984..76fad11f2ad8 100644 +index 0de1a3a96984c..76fad11f2ad82 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -350,7 +350,7 @@ static const struct gpio_chip bcm2835_gpio_chip = { @@ -2322,10 +2322,10 @@ index 0de1a3a96984..76fad11f2ad8 100644 2.18.4 -From ec526a04fe0bae675eabc32ef409777c4d23139d Mon Sep 17 00:00:00 2001 +From f72a45b5cbf85096d76aadb226afa20aa635c554 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 12 May 2013 12:24:19 +0100 -Subject: [PATCH 0036/1216] Main bcm2708/bcm2709 linux port +Subject: [PATCH 0036/1224] Main bcm2708/bcm2709 linux port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -2357,7 +2357,7 @@ board_bcm2835: Remove coherent dma pool increase - API has gone 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig -index 1feec0635758..34fb06d1b477 100644 +index 1feec06357589..34fb06d1b477c 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -169,6 +169,7 @@ config ARCH_BCM2835 @@ -2369,7 +2369,7 @@ index 1feec0635758..34fb06d1b477 100644 This enables support for the Broadcom BCM2835 and BCM2836 SoCs. This SoC is used in the Raspberry Pi and Roku 2 devices. diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S -index c1c85eb3484f..2758125bf299 100644 +index c1c85eb3484f3..2758125bf2993 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -70,10 +70,19 @@ ENDPROC(cpu_v6_reset) @@ -2396,7 +2396,7 @@ index c1c85eb3484f..2758125bf299 100644 ENTRY(cpu_v6_dcache_clean_area) diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 88abd2e67866..ff7b998579c1 100644 +index 88abd2e67866b..ff7b998579c1e 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -43,7 +43,9 @@ @@ -2432,7 +2432,7 @@ index 88abd2e67866..ff7b998579c1 100644 return 0; } diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c -index 39761d190545..9766d8b50778 100644 +index 39761d1905459..9766d8b50778a 100644 --- a/drivers/mailbox/bcm2835-mailbox.c +++ b/drivers/mailbox/bcm2835-mailbox.c @@ -45,12 +45,15 @@ @@ -2484,10 +2484,10 @@ index 39761d190545..9766d8b50778 100644 2.18.4 -From e55f75acdf95dedf21f49740ccc21bf26f74ac3f Mon Sep 17 00:00:00 2001 +From 16b8a403d387111a7ecea39355959edef06a3bd5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 1 May 2013 19:46:17 +0100 -Subject: [PATCH 0037/1216] Add dwc_otg driver +Subject: [PATCH 0037/1224] Add dwc_otg driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -3466,7 +3466,7 @@ Signed-off-by: Jonathan Bell create mode 100644 drivers/usb/host/dwc_otg/test/test_sysfs.pl diff --git a/arch/arm/include/asm/irqflags.h b/arch/arm/include/asm/irqflags.h -index aeec7f24eb75..a3b186608c60 100644 +index aeec7f24eb75b..a3b186608c609 100644 --- a/arch/arm/include/asm/irqflags.h +++ b/arch/arm/include/asm/irqflags.h @@ -163,13 +163,23 @@ static inline unsigned long arch_local_save_flags(void) @@ -3497,7 +3497,7 @@ index aeec7f24eb75..a3b186608c60 100644 : "r" (flags) : "memory", "cc"); diff --git a/arch/arm/kernel/fiqasm.S b/arch/arm/kernel/fiqasm.S -index 8dd26e1a9bd6..eef484756af2 100644 +index 8dd26e1a9bd69..eef484756af21 100644 --- a/arch/arm/kernel/fiqasm.S +++ b/arch/arm/kernel/fiqasm.S @@ -47,3 +47,7 @@ ENTRY(__get_fiq_regs) @@ -3509,7 +3509,7 @@ index 8dd26e1a9bd6..eef484756af2 100644 + mov pc, r8 +ENDPROC(__FIQ_Branch) diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile -index 1c1c1d659394..68317e5634e8 100644 +index 1c1c1d659394a..68317e5634e8b 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_USB_COMMON) += common/ @@ -3521,7 +3521,7 @@ index 1c1c1d659394..68317e5634e8 100644 obj-$(CONFIG_USB_DWC2) += dwc2/ obj-$(CONFIG_USB_ISP1760) += isp1760/ diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c -index 38f8b3e31762..64e41961ffb1 100644 +index 38f8b3e317628..64e41961ffb19 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c @@ -190,6 +190,7 @@ int usb_choose_configuration(struct usb_device *udev) @@ -3533,7 +3533,7 @@ index 38f8b3e31762..64e41961ffb1 100644 return i; } diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 4d3de33885ff..70780b66d093 100644 +index 4d3de33885ffa..70780b66d0939 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5319,7 +5319,7 @@ static void port_event(struct usb_hub *hub, int port1) @@ -3546,7 +3546,7 @@ 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 041c68ea329f..61d9e2a1a4e5 100644 +index 041c68ea329f4..61d9e2a1a4e5a 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -1993,6 +1993,85 @@ int usb_set_configuration(struct usb_device *dev, int configuration) @@ -3636,7 +3636,7 @@ index 041c68ea329f..61d9e2a1a4e5 100644 /* Now that the interfaces are installed, re-enable LPM. */ usb_unlocked_enable_lpm(dev); diff --git a/drivers/usb/core/otg_whitelist.h b/drivers/usb/core/otg_whitelist.h -index 2ae90158ded7..150d4fa1e09b 100644 +index 2ae90158ded72..150d4fa1e09bc 100644 --- a/drivers/usb/core/otg_whitelist.h +++ b/drivers/usb/core/otg_whitelist.h @@ -15,33 +15,82 @@ @@ -3794,7 +3794,7 @@ index 2ae90158ded7..150d4fa1e09b 100644 diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c new file mode 100644 -index 000000000000..a896d73f7a93 +index 0000000000000..a896d73f7a933 --- /dev/null +++ b/drivers/usb/gadget/file_storage.c @@ -0,0 +1,3676 @@ @@ -7475,7 +7475,7 @@ index 000000000000..a896d73f7a93 +} +module_exit(fsg_cleanup); diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig -index 79b2e79dddd0..878682cf1a8d 100644 +index 79b2e79dddd06..878682cf1a8d5 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -712,6 +712,16 @@ config USB_RENESAS_USBHS_HCD @@ -7496,7 +7496,7 @@ index 79b2e79dddd0..878682cf1a8d 100644 tristate "i.MX21 HCD support" depends on ARM && ARCH_MXC diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile -index b191361257cc..25dda2f0d37e 100644 +index b191361257cc5..25dda2f0d37e2 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -79,6 +79,7 @@ obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o @@ -7509,7 +7509,7 @@ index b191361257cc..25dda2f0d37e 100644 obj-$(CONFIG_USB_EHCI_FSL) += fsl-mph-dr-of.o diff --git a/drivers/usb/host/dwc_common_port/Makefile b/drivers/usb/host/dwc_common_port/Makefile new file mode 100644 -index 000000000000..f10d466d1aea +index 0000000000000..f10d466d1aea8 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/Makefile @@ -0,0 +1,58 @@ @@ -7573,7 +7573,7 @@ index 000000000000..f10d466d1aea + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff --git a/drivers/usb/host/dwc_common_port/Makefile.fbsd b/drivers/usb/host/dwc_common_port/Makefile.fbsd new file mode 100644 -index 000000000000..45db9915b9d3 +index 0000000000000..45db9915b9d31 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/Makefile.fbsd @@ -0,0 +1,17 @@ @@ -7596,7 +7596,7 @@ index 000000000000..45db9915b9d3 +.include diff --git a/drivers/usb/host/dwc_common_port/Makefile.linux b/drivers/usb/host/dwc_common_port/Makefile.linux new file mode 100644 -index 000000000000..0cef7b461bd5 +index 0000000000000..0cef7b461bd50 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/Makefile.linux @@ -0,0 +1,49 @@ @@ -7651,7 +7651,7 @@ index 000000000000..0cef7b461bd5 + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff --git a/drivers/usb/host/dwc_common_port/changes.txt b/drivers/usb/host/dwc_common_port/changes.txt new file mode 100644 -index 000000000000..f6839f92c276 +index 0000000000000..f6839f92c2760 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/changes.txt @@ -0,0 +1,174 @@ @@ -7831,7 +7831,7 @@ index 000000000000..f6839f92c276 +library code directly into a driver module, instead of as a standalone module. diff --git a/drivers/usb/host/dwc_common_port/doc/doxygen.cfg b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg new file mode 100644 -index 000000000000..89aa887af29d +index 0000000000000..89aa887af29df --- /dev/null +++ b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg @@ -0,0 +1,270 @@ @@ -8107,7 +8107,7 @@ index 000000000000..89aa887af29d +SEARCHENGINE = NO diff --git a/drivers/usb/host/dwc_common_port/dwc_cc.c b/drivers/usb/host/dwc_common_port/dwc_cc.c new file mode 100644 -index 000000000000..5ec2ae28698c +index 0000000000000..5ec2ae28698c1 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_cc.c @@ -0,0 +1,532 @@ @@ -8645,7 +8645,7 @@ index 000000000000..5ec2ae28698c +#endif /* DWC_CCLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_cc.h b/drivers/usb/host/dwc_common_port/dwc_cc.h new file mode 100644 -index 000000000000..f86e6f21792b +index 0000000000000..f86e6f21792b9 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_cc.h @@ -0,0 +1,224 @@ @@ -8875,7 +8875,7 @@ index 000000000000..f86e6f21792b +#endif /* _DWC_CC_H_ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c new file mode 100644 -index 000000000000..6dd04b58f8f6 +index 0000000000000..6dd04b58f8f6c --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c @@ -0,0 +1,1308 @@ @@ -10189,7 +10189,7 @@ index 000000000000..6dd04b58f8f6 +} diff --git a/drivers/usb/host/dwc_common_port/dwc_common_linux.c b/drivers/usb/host/dwc_common_port/dwc_common_linux.c new file mode 100644 -index 000000000000..1460afaf997d +index 0000000000000..1460afaf997d7 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_common_linux.c @@ -0,0 +1,1409 @@ @@ -11604,7 +11604,7 @@ index 000000000000..1460afaf997d +#endif /* DWC_LIBMODULE */ diff --git a/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c new file mode 100644 -index 000000000000..49b07e172264 +index 0000000000000..49b07e1722645 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c @@ -0,0 +1,1275 @@ @@ -12885,7 +12885,7 @@ index 000000000000..49b07e172264 +} diff --git a/drivers/usb/host/dwc_common_port/dwc_crypto.c b/drivers/usb/host/dwc_common_port/dwc_crypto.c new file mode 100644 -index 000000000000..3b0353296148 +index 0000000000000..3b0353296148f --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.c @@ -0,0 +1,308 @@ @@ -13199,7 +13199,7 @@ index 000000000000..3b0353296148 +#endif /* DWC_CRYPTOLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_crypto.h b/drivers/usb/host/dwc_common_port/dwc_crypto.h new file mode 100644 -index 000000000000..26fcddcfe9ba +index 0000000000000..26fcddcfe9ba4 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.h @@ -0,0 +1,111 @@ @@ -13316,7 +13316,7 @@ index 000000000000..26fcddcfe9ba +#endif /* _DWC_CRYPTO_H_ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_dh.c b/drivers/usb/host/dwc_common_port/dwc_dh.c new file mode 100644 -index 000000000000..2b429a32aaf0 +index 0000000000000..2b429a32aaf09 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_dh.c @@ -0,0 +1,291 @@ @@ -13613,7 +13613,7 @@ index 000000000000..2b429a32aaf0 +#endif /* DWC_CRYPTOLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_dh.h b/drivers/usb/host/dwc_common_port/dwc_dh.h new file mode 100644 -index 000000000000..25c1cc0d588a +index 0000000000000..25c1cc0d588a4 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_dh.h @@ -0,0 +1,106 @@ @@ -13725,7 +13725,7 @@ index 000000000000..25c1cc0d588a +#endif /* _DWC_DH_H_ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_list.h b/drivers/usb/host/dwc_common_port/dwc_list.h new file mode 100644 -index 000000000000..4ce560df0cae +index 0000000000000..4ce560df0cae6 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_list.h @@ -0,0 +1,594 @@ @@ -14325,7 +14325,7 @@ index 000000000000..4ce560df0cae +#endif /* _DWC_LIST_H_ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_mem.c b/drivers/usb/host/dwc_common_port/dwc_mem.c new file mode 100644 -index 000000000000..ad645ff1ba7e +index 0000000000000..ad645ff1ba7e0 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_mem.c @@ -0,0 +1,245 @@ @@ -14576,7 +14576,7 @@ index 000000000000..ad645ff1ba7e +#endif /* DWC_DEBUG_MEMORY */ diff --git a/drivers/usb/host/dwc_common_port/dwc_modpow.c b/drivers/usb/host/dwc_common_port/dwc_modpow.c new file mode 100644 -index 000000000000..20045381208a +index 0000000000000..20045381208a3 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.c @@ -0,0 +1,636 @@ @@ -15218,7 +15218,7 @@ index 000000000000..20045381208a +#endif /*DWC_CRYPTOLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_modpow.h b/drivers/usb/host/dwc_common_port/dwc_modpow.h new file mode 100644 -index 000000000000..64f00c276e71 +index 0000000000000..64f00c276e71b --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.h @@ -0,0 +1,34 @@ @@ -15258,7 +15258,7 @@ index 000000000000..64f00c276e71 +#endif /* _LINUX_BIGNUM_H */ diff --git a/drivers/usb/host/dwc_common_port/dwc_notifier.c b/drivers/usb/host/dwc_common_port/dwc_notifier.c new file mode 100644 -index 000000000000..8b3772afe11d +index 0000000000000..8b3772afe11d1 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.c @@ -0,0 +1,319 @@ @@ -15583,7 +15583,7 @@ index 000000000000..8b3772afe11d +#endif /* DWC_NOTIFYLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_notifier.h b/drivers/usb/host/dwc_common_port/dwc_notifier.h new file mode 100644 -index 000000000000..4a8cdfe565b1 +index 0000000000000..4a8cdfe565b1f --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.h @@ -0,0 +1,122 @@ @@ -15711,7 +15711,7 @@ index 000000000000..4a8cdfe565b1 +#endif /* __DWC_NOTIFIER_H__ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_os.h b/drivers/usb/host/dwc_common_port/dwc_os.h new file mode 100644 -index 000000000000..9a86d299403b +index 0000000000000..9a86d299403bd --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_os.h @@ -0,0 +1,1276 @@ @@ -16993,7 +16993,7 @@ index 000000000000..9a86d299403b +#endif /* _DWC_OS_H_ */ diff --git a/drivers/usb/host/dwc_common_port/usb.h b/drivers/usb/host/dwc_common_port/usb.h new file mode 100644 -index 000000000000..27bda82dac2e +index 0000000000000..27bda82dac2eb --- /dev/null +++ b/drivers/usb/host/dwc_common_port/usb.h @@ -0,0 +1,946 @@ @@ -17945,7 +17945,7 @@ index 000000000000..27bda82dac2e +#endif /* _USB_H_ */ diff --git a/drivers/usb/host/dwc_otg/Makefile b/drivers/usb/host/dwc_otg/Makefile new file mode 100644 -index 000000000000..7ea65a6bcdb7 +index 0000000000000..7ea65a6bcdb7a --- /dev/null +++ b/drivers/usb/host/dwc_otg/Makefile @@ -0,0 +1,85 @@ @@ -18036,7 +18036,7 @@ index 000000000000..7ea65a6bcdb7 +endif diff --git a/drivers/usb/host/dwc_otg/doc/doxygen.cfg b/drivers/usb/host/dwc_otg/doc/doxygen.cfg new file mode 100644 -index 000000000000..712b057ef7c2 +index 0000000000000..712b057ef7c29 --- /dev/null +++ b/drivers/usb/host/dwc_otg/doc/doxygen.cfg @@ -0,0 +1,224 @@ @@ -18266,7 +18266,7 @@ index 000000000000..712b057ef7c2 +SEARCHENGINE = NO diff --git a/drivers/usb/host/dwc_otg/dummy_audio.c b/drivers/usb/host/dwc_otg/dummy_audio.c new file mode 100644 -index 000000000000..f827102fa644 +index 0000000000000..f827102fa6441 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dummy_audio.c @@ -0,0 +1,1574 @@ @@ -19846,7 +19846,7 @@ index 000000000000..f827102fa644 +module_exit (cleanup); diff --git a/drivers/usb/host/dwc_otg/dwc_cfi_common.h b/drivers/usb/host/dwc_otg/dwc_cfi_common.h new file mode 100644 -index 000000000000..7770e201ad3b +index 0000000000000..7770e201ad3bd --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_cfi_common.h @@ -0,0 +1,142 @@ @@ -19994,7 +19994,7 @@ index 000000000000..7770e201ad3b +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_adp.c b/drivers/usb/host/dwc_otg/dwc_otg_adp.c new file mode 100644 -index 000000000000..ce0618dd3f4a +index 0000000000000..ce0618dd3f4a6 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.c @@ -0,0 +1,854 @@ @@ -20854,7 +20854,7 @@ index 000000000000..ce0618dd3f4a +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_adp.h b/drivers/usb/host/dwc_otg/dwc_otg_adp.h new file mode 100644 -index 000000000000..4110b25d2002 +index 0000000000000..4110b25d2002e --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.h @@ -0,0 +1,80 @@ @@ -20940,7 +20940,7 @@ index 000000000000..4110b25d2002 +#endif //__DWC_OTG_ADP_H__ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_attr.c b/drivers/usb/host/dwc_otg/dwc_otg_attr.c new file mode 100644 -index 000000000000..2f8ea77c3892 +index 0000000000000..2f8ea77c3892b --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.c @@ -0,0 +1,1212 @@ @@ -22158,7 +22158,7 @@ index 000000000000..2f8ea77c3892 +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_attr.h b/drivers/usb/host/dwc_otg/dwc_otg_attr.h new file mode 100644 -index 000000000000..e10b67f97c52 +index 0000000000000..e10b67f97c522 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.h @@ -0,0 +1,89 @@ @@ -22253,7 +22253,7 @@ index 000000000000..e10b67f97c52 +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cfi.c b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c new file mode 100644 -index 000000000000..bbb3d32093d0 +index 0000000000000..bbb3d32093d02 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c @@ -0,0 +1,1876 @@ @@ -24135,7 +24135,7 @@ index 000000000000..bbb3d32093d0 +#endif //DWC_UTE_CFI diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cfi.h b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h new file mode 100644 -index 000000000000..55fd337a283c +index 0000000000000..55fd337a283c3 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h @@ -0,0 +1,320 @@ @@ -24461,7 +24461,7 @@ index 000000000000..55fd337a283c +#endif /* (__DWC_OTG_CFI_H__) */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil.c b/drivers/usb/host/dwc_otg/dwc_otg_cil.c new file mode 100644 -index 000000000000..14300ad0f2af +index 0000000000000..14300ad0f2af7 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.c @@ -0,0 +1,7146 @@ @@ -31613,7 +31613,7 @@ index 000000000000..14300ad0f2af +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil.h b/drivers/usb/host/dwc_otg/dwc_otg_cil.h new file mode 100644 -index 000000000000..79dbf8374f02 +index 0000000000000..79dbf8374f023 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.h @@ -0,0 +1,1464 @@ @@ -33083,7 +33083,7 @@ index 000000000000..79dbf8374f02 +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c new file mode 100644 -index 000000000000..799ab14b9eda +index 0000000000000..799ab14b9edad --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c @@ -0,0 +1,1601 @@ @@ -34690,7 +34690,7 @@ index 000000000000..799ab14b9eda +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_core_if.h b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h new file mode 100644 -index 000000000000..4138fd173337 +index 0000000000000..4138fd173337d --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h @@ -0,0 +1,705 @@ @@ -35401,7 +35401,7 @@ index 000000000000..4138fd173337 +#endif /* __DWC_CORE_IF_H__ */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_dbg.h b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h new file mode 100644 -index 000000000000..ccc24e010e44 +index 0000000000000..ccc24e010e449 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h @@ -0,0 +1,117 @@ @@ -35524,7 +35524,7 @@ index 000000000000..ccc24e010e44 +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.c b/drivers/usb/host/dwc_otg/dwc_otg_driver.c new file mode 100644 -index 000000000000..fa063804931f +index 0000000000000..fa063804931f3 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c @@ -0,0 +1,1772 @@ @@ -37302,7 +37302,7 @@ index 000000000000..fa063804931f +*/ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.h b/drivers/usb/host/dwc_otg/dwc_otg_driver.h new file mode 100644 -index 000000000000..6a8be63a0ab2 +index 0000000000000..6a8be63a0ab20 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.h @@ -0,0 +1,86 @@ @@ -37394,7 +37394,7 @@ index 000000000000..6a8be63a0ab2 +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c new file mode 100644 -index 000000000000..a86d8ed77140 +index 0000000000000..a86d8ed771409 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c @@ -0,0 +1,1425 @@ @@ -38825,7 +38825,7 @@ index 000000000000..a86d8ed77140 +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h new file mode 100644 -index 000000000000..537cc237b4bc +index 0000000000000..537cc237b4bca --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h @@ -0,0 +1,399 @@ @@ -39230,7 +39230,7 @@ index 000000000000..537cc237b4bc +#endif /* DWC_OTG_FIQ_FSM_H_ */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S b/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S new file mode 100644 -index 000000000000..ffa8d21bc61e +index 0000000000000..ffa8d21bc61e8 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S @@ -0,0 +1,80 @@ @@ -39316,7 +39316,7 @@ index 000000000000..ffa8d21bc61e +END(_dwc_otg_fiq_stub) diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c new file mode 100644 -index 000000000000..9f2cd510c301 +index 0000000000000..9f2cd510c3015 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c @@ -0,0 +1,4327 @@ @@ -43649,7 +43649,7 @@ index 000000000000..9f2cd510c301 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.h b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h new file mode 100644 -index 000000000000..5ed8dccf0395 +index 0000000000000..5ed8dccf03959 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h @@ -0,0 +1,870 @@ @@ -44525,7 +44525,7 @@ index 000000000000..5ed8dccf0395 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c new file mode 100644 -index 000000000000..bd8a20403713 +index 0000000000000..bd8a204037134 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c @@ -0,0 +1,1134 @@ @@ -45665,7 +45665,7 @@ index 000000000000..bd8a20403713 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h new file mode 100644 -index 000000000000..a384db5e7ac2 +index 0000000000000..a384db5e7ac21 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h @@ -0,0 +1,421 @@ @@ -46092,7 +46092,7 @@ index 000000000000..a384db5e7ac2 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c new file mode 100644 -index 000000000000..d3097ef3728c +index 0000000000000..d3097ef3728ca --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c @@ -0,0 +1,2757 @@ @@ -48855,7 +48855,7 @@ index 000000000000..d3097ef3728c +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c new file mode 100644 -index 000000000000..9a150d6fdeb4 +index 0000000000000..9a150d6fdeb43 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c @@ -0,0 +1,1083 @@ @@ -49944,7 +49944,7 @@ index 000000000000..9a150d6fdeb4 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c new file mode 100644 -index 000000000000..2823dc9af63f +index 0000000000000..2823dc9af63f1 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c @@ -0,0 +1,970 @@ @@ -50920,7 +50920,7 @@ index 000000000000..2823dc9af63f +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h new file mode 100644 -index 000000000000..0e9a34fe3a5c +index 0000000000000..0e9a34fe3a5c8 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h @@ -0,0 +1,199 @@ @@ -51125,7 +51125,7 @@ index 000000000000..0e9a34fe3a5c +#endif /* _DWC_OS_DEP_H_ */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c new file mode 100644 -index 000000000000..9dabbe5c9791 +index 0000000000000..9dabbe5c9791c --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c @@ -0,0 +1,2725 @@ @@ -53856,7 +53856,7 @@ index 000000000000..9dabbe5c9791 +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd.h b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h new file mode 100644 -index 000000000000..a70ebd049d2c +index 0000000000000..a70ebd049d2cc --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h @@ -0,0 +1,273 @@ @@ -54135,7 +54135,7 @@ index 000000000000..a70ebd049d2c +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h new file mode 100644 -index 000000000000..4c1d591fbc09 +index 0000000000000..4c1d591fbc098 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h @@ -0,0 +1,361 @@ @@ -54502,7 +54502,7 @@ index 000000000000..4c1d591fbc09 +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c new file mode 100644 -index 000000000000..e55ea9c74be4 +index 0000000000000..e55ea9c74be46 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c @@ -0,0 +1,5148 @@ @@ -59656,7 +59656,7 @@ index 000000000000..e55ea9c74be4 +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c new file mode 100644 -index 000000000000..a5ed8e83711d +index 0000000000000..a5ed8e83711db --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c @@ -0,0 +1,1262 @@ @@ -60924,7 +60924,7 @@ index 000000000000..a5ed8e83711d +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_regs.h b/drivers/usb/host/dwc_otg/dwc_otg_regs.h new file mode 100644 -index 000000000000..8e0e7b569f1a +index 0000000000000..8e0e7b569f1ac --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_regs.h @@ -0,0 +1,2550 @@ @@ -63480,7 +63480,7 @@ index 000000000000..8e0e7b569f1a +#endif diff --git a/drivers/usb/host/dwc_otg/test/Makefile b/drivers/usb/host/dwc_otg/test/Makefile new file mode 100644 -index 000000000000..fc453759dea3 +index 0000000000000..fc453759dea3e --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/Makefile @@ -0,0 +1,16 @@ @@ -63502,7 +63502,7 @@ index 000000000000..fc453759dea3 + done diff --git a/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm new file mode 100644 -index 000000000000..85e55fd6ddbc +index 0000000000000..85e55fd6ddbc7 --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm @@ -0,0 +1,337 @@ @@ -63845,7 +63845,7 @@ index 000000000000..85e55fd6ddbc +1; diff --git a/drivers/usb/host/dwc_otg/test/test_mod_param.pl b/drivers/usb/host/dwc_otg/test/test_mod_param.pl new file mode 100644 -index 000000000000..dc3820df577b +index 0000000000000..dc3820df577ba --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/test_mod_param.pl @@ -0,0 +1,133 @@ @@ -63984,7 +63984,7 @@ index 000000000000..dc3820df577b +0; diff --git a/drivers/usb/host/dwc_otg/test/test_sysfs.pl b/drivers/usb/host/dwc_otg/test/test_sysfs.pl new file mode 100644 -index 000000000000..cdc9963176e5 +index 0000000000000..cdc9963176e5a --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/test_sysfs.pl @@ -0,0 +1,193 @@ @@ -64185,10 +64185,10 @@ index 000000000000..cdc9963176e5 2.18.4 -From 604d6d03af2fbb0217e7ec3fc07194bf00c28e39 Mon Sep 17 00:00:00 2001 +From 45b1ecffe8984917bafa929a73947dd8919d2a02 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 17:06:34 +0100 -Subject: [PATCH 0038/1216] bcm2708 framebuffer driver +Subject: [PATCH 0038/1224] bcm2708 framebuffer driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -64291,7 +64291,7 @@ Signed-off-by: Dave Stevenson create mode 100644 drivers/video/fbdev/bcm2708_fb.c diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig -index 1e70e838530e..a03d32346642 100644 +index 1e70e838530ee..a03d32346642d 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -219,6 +219,20 @@ config FB_TILEBLITTING @@ -64316,7 +64316,7 @@ index 1e70e838530e..a03d32346642 100644 tristate "Aeroflex Gaisler framebuffer support" depends on FB && SPARC diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile -index aa6352798cf4..9f4d79be632b 100644 +index aa6352798cf4e..9f4d79be632bb 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_FB_MACMODES) += macmodes.o @@ -64329,7 +64329,7 @@ index aa6352798cf4..9f4d79be632b 100644 obj-$(CONFIG_FB_CLPS711X) += clps711x-fb.o diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c new file mode 100644 -index 000000000000..fc49714a47c7 +index 0000000000000..fc49714a47c79 --- /dev/null +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -0,0 +1,928 @@ @@ -65262,7 +65262,7 @@ index 000000000000..fc49714a47c7 +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); +MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes"); diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm -index 3c14e43b82fe..7626beb6a5bb 100644 +index 3c14e43b82fef..7626beb6a5bb8 100644 --- a/drivers/video/logo/logo_linux_clut224.ppm +++ b/drivers/video/logo/logo_linux_clut224.ppm @@ -1,1604 +1,883 @@ @@ -67752,7 +67752,7 @@ index 3c14e43b82fe..7626beb6a5bb 100644 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index 3f357c05788e..a5f3fff6773e 100644 +index 3f357c05788e8..a5f3fff6773e6 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -123,6 +123,7 @@ enum rpi_firmware_property_tag { @@ -67767,10 +67767,10 @@ index 3f357c05788e..a5f3fff6773e 100644 2.18.4 -From 69a86634d4145141cd6dd71dba221139df485af0 Mon Sep 17 00:00:00 2001 +From b294cd398f5756d25ccdf33ab8632a79218ae2ba Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 14 Mar 2019 13:27:54 +0000 -Subject: [PATCH 0039/1216] Pulled in the multi frame buffer support from the +Subject: [PATCH 0039/1224] Pulled in the multi frame buffer support from the Pi3 repo --- @@ -67779,7 +67779,7 @@ Subject: [PATCH 0039/1216] Pulled in the multi frame buffer support from the 2 files changed, 343 insertions(+), 137 deletions(-) diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c -index fc49714a47c7..a6d0ca46f28b 100644 +index fc49714a47c79..a6d0ca46f28b1 100644 --- a/drivers/video/fbdev/bcm2708_fb.c +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -2,6 +2,7 @@ @@ -68562,7 +68562,7 @@ index fc49714a47c7..a6d0ca46f28b 100644 static int __init bcm2708_fb_init(void) diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index a5f3fff6773e..25fca695f903 100644 +index a5f3fff6773e6..25fca695f9039 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -106,9 +106,15 @@ enum rpi_firmware_property_tag { @@ -68616,10 +68616,10 @@ index a5f3fff6773e..25fca695f903 100644 2.18.4 -From a4dbb37cf208bc02a3b115d18761d6f2ca5e0d2a Mon Sep 17 00:00:00 2001 +From e339a7ac80bfcbf2f7fa812832b7560509c800c6 Mon Sep 17 00:00:00 2001 From: Siarhei Siamashka Date: Mon, 17 Jun 2013 13:32:11 +0300 -Subject: [PATCH 0040/1216] fbdev: add FBIOCOPYAREA ioctl +Subject: [PATCH 0040/1224] fbdev: add FBIOCOPYAREA ioctl Based on the patch authored by Ali Gholami Rudi at https://lkml.org/lkml/2009/7/13/153 @@ -68645,7 +68645,7 @@ Signed-off-by: Dave Stevenson 3 files changed, 213 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c -index a6d0ca46f28b..8234207b1914 100644 +index a6d0ca46f28b1..8234207b1914b 100644 --- a/drivers/video/fbdev/bcm2708_fb.c +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -32,8 +32,10 @@ @@ -68853,7 +68853,7 @@ index a6d0ca46f28b..8234207b1914 100644 static int bcm2708_fb_register(struct bcm2708_fb *fb) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c -index bf76dadbed87..b30252ec6722 100644 +index bf76dadbed87f..b30252ec67224 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1076,6 +1076,30 @@ fb_blank(struct fb_info *info, int blank) @@ -68920,7 +68920,7 @@ index bf76dadbed87..b30252ec6722 100644 /* fall through */ case FBIOBLANK: diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h -index b6aac7ee1f67..212b7d5cb94c 100644 +index b6aac7ee1f670..212b7d5cb94c1 100644 --- a/include/uapi/linux/fb.h +++ b/include/uapi/linux/fb.h @@ -35,6 +35,12 @@ @@ -68953,10 +68953,10 @@ index b6aac7ee1f67..212b7d5cb94c 100644 2.18.4 -From 1c7da183644516cb24631ed2175efcc707a88396 Mon Sep 17 00:00:00 2001 +From c4eae1eb1e9e2b5c5cf328cb427413a36d22de9b Mon Sep 17 00:00:00 2001 From: Harm Hanemaaijer Date: Thu, 20 Jun 2013 20:21:39 +0200 -Subject: [PATCH 0041/1216] Speed up console framebuffer imageblit function +Subject: [PATCH 0041/1224] 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 @@ -68988,7 +68988,7 @@ Signed-off-by: Harm Hanemaaijer 1 file changed, 147 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/core/cfbimgblt.c b/drivers/video/fbdev/core/cfbimgblt.c -index a2bb276a8b24..436494fba15a 100644 +index a2bb276a8b246..436494fba15ab 100644 --- a/drivers/video/fbdev/core/cfbimgblt.c +++ b/drivers/video/fbdev/core/cfbimgblt.c @@ -28,6 +28,11 @@ @@ -69168,10 +69168,10 @@ index a2bb276a8b24..436494fba15a 100644 2.18.4 -From 6256e515e5071d15325d52266d8a855bcaf4a47e Mon Sep 17 00:00:00 2001 +From 6438828094800fe561c99ad8cae270e256720b1a Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Fri, 22 Nov 2013 14:22:53 +0100 -Subject: [PATCH 0042/1216] dmaengine: Add support for BCM2708 +Subject: [PATCH 0042/1224] dmaengine: Add support for BCM2708 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -69347,7 +69347,7 @@ Signed-off-by: Andrei Gherzan create mode 100644 include/linux/platform_data/dma-bcm2708.h diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index 112e08cedcd5..20731f4e5f7b 100644 +index 112e08cedcd56..20731f4e5f7b5 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -133,7 +133,7 @@ config COH901318 @@ -69371,7 +69371,7 @@ index 112e08cedcd5..20731f4e5f7b 100644 tristate "APM X-Gene DMA support" depends on ARCH_XGENE || COMPILE_TEST diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile -index f5ce8665e944..b27ea1ae6e09 100644 +index f5ce8665e944e..b27ea1ae6e099 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_AT_XDMAC) += at_xdmac.o @@ -69384,7 +69384,7 @@ index f5ce8665e944..b27ea1ae6e09 100644 obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o diff --git a/drivers/dma/bcm2708-dmaengine.c b/drivers/dma/bcm2708-dmaengine.c new file mode 100644 -index 000000000000..075da9aadf6d +index 0000000000000..075da9aadf6d6 --- /dev/null +++ b/drivers/dma/bcm2708-dmaengine.c @@ -0,0 +1,281 @@ @@ -69671,7 +69671,7 @@ index 000000000000..075da9aadf6d +MODULE_LICENSE("GPL"); diff --git a/include/linux/platform_data/dma-bcm2708.h b/include/linux/platform_data/dma-bcm2708.h new file mode 100644 -index 000000000000..6ca874d332a8 +index 0000000000000..6ca874d332a8b --- /dev/null +++ b/include/linux/platform_data/dma-bcm2708.h @@ -0,0 +1,143 @@ @@ -69822,10 +69822,10 @@ index 000000000000..6ca874d332a8 2.18.4 -From dff9c8e0f93edec81315b10fbc7d4e7e3e7b0de1 Mon Sep 17 00:00:00 2001 +From 12287faa88e6c12a7653f069ca069e447b75e93e Mon Sep 17 00:00:00 2001 From: gellert Date: Fri, 15 Aug 2014 16:35:06 +0100 -Subject: [PATCH 0043/1216] MMC: added alternative MMC driver +Subject: [PATCH 0043/1224] MMC: added alternative MMC driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -70031,7 +70031,7 @@ Signed-off-by: Yaroslav Rosomakho create mode 100644 drivers/mmc/host/bcm2835-mmc.c diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 63e838ec8af8..91f718cf24cb 100644 +index 63e838ec8af84..91f718cf24cb2 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -166,6 +166,13 @@ static DEFINE_MUTEX(open_lock); @@ -70092,7 +70092,7 @@ index 63e838ec8af8..91f718cf24cb 100644 if (mmc_blk_alloc_parts(card, md)) goto out; diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index 26644b7ec13e..331a4e6b9f04 100644 +index 26644b7ec13e3..331a4e6b9f04d 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1922,7 +1922,8 @@ EXPORT_SYMBOL(mmc_erase); @@ -70106,7 +70106,7 @@ index 26644b7ec13e..331a4e6b9f04 100644 return 0; } diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index b3484def0a8b..8e67114e846b 100644 +index b3484def0a8b0..8e67114e846bd 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -397,15 +397,30 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) @@ -70142,7 +70142,7 @@ index b3484def0a8b..8e67114e846b 100644 kfree(host); return NULL; diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h -index 3dba15bccce2..37b80e1a7ed4 100644 +index 3dba15bccce25..37b80e1a7ed4c 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -99,6 +99,14 @@ static const struct mmc_fixup mmc_blk_fixups[] = { @@ -70161,7 +70161,7 @@ index 3dba15bccce2..37b80e1a7ed4 100644 }; diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 49ea02c467bf..cc4907051e81 100644 +index 49ea02c467bf1..cc4907051e81b 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -5,6 +5,35 @@ @@ -70201,7 +70201,7 @@ index 49ea02c467bf..cc4907051e81 100644 bool "MMC host drivers debugging" depends on MMC != n diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index 11c4598e91d9..5691eacd8988 100644 +index 11c4598e91d93..5691eacd8988a 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o @@ -70214,7 +70214,7 @@ index 11c4598e91d9..5691eacd8988 100644 obj-$(CONFIG_MMC_ALCOR) += alcor.o diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c new file mode 100644 -index 000000000000..ba30cc4b2653 +index 0000000000000..ba30cc4b26535 --- /dev/null +++ b/drivers/mmc/host/bcm2835-mmc.c @@ -0,0 +1,1576 @@ @@ -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 cf3780a6ccc4..dc3fedec75d7 100644 +index cf3780a6ccc4b..dc3fedec75d7b 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -270,6 +270,8 @@ struct mmc_card { @@ -71811,10 +71811,10 @@ index cf3780a6ccc4..dc3fedec75d7 100644 2.18.4 -From fa8258e6565dff31d79d7d271072beb50a827154 Mon Sep 17 00:00:00 2001 +From 44756d8a8ad089b01eb79b20a2c08c2a645ec889 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 25 Mar 2015 17:49:47 +0000 -Subject: [PATCH 0044/1216] Adding bcm2835-sdhost driver, and an overlay to +Subject: [PATCH 0044/1224] Adding bcm2835-sdhost driver, and an overlay to enable it BCM2835 has two SD card interfaces. This driver uses the other one. @@ -72058,7 +72058,7 @@ Signed-off-by: Phil Elwell create mode 100644 drivers/mmc/host/bcm2835-sdhost.c diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index cc4907051e81..fe56ca672265 100644 +index cc4907051e81b..fe56ca6722652 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -34,6 +34,16 @@ config MMC_BCM2835_PIO_DMA_BARRIER @@ -72079,7 +72079,7 @@ index cc4907051e81..fe56ca672265 100644 bool "MMC host drivers debugging" depends on MMC != n diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index 5691eacd8988..2dafa906f48c 100644 +index 5691eacd8988a..2dafa906f48c6 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -24,6 +24,7 @@ obj-$(CONFIG_MMC_SDHCI_F_SDH30) += sdhci_f_sdh30.o @@ -72092,7 +72092,7 @@ index 5691eacd8988..2dafa906f48c 100644 obj-$(CONFIG_MMC_ALCOR) += alcor.o diff --git a/drivers/mmc/host/bcm2835-sdhost.c b/drivers/mmc/host/bcm2835-sdhost.c new file mode 100644 -index 000000000000..ba2dd8345fd4 +index 0000000000000..ba2dd8345fd44 --- /dev/null +++ b/drivers/mmc/host/bcm2835-sdhost.c @@ -0,0 +1,2204 @@ @@ -74304,10 +74304,10 @@ index 000000000000..ba2dd8345fd4 2.18.4 -From 70bdf5dee257747059e1e1e8046ec6f7327f20c9 Mon Sep 17 00:00:00 2001 +From e086410419329a0ac279e7356f952df072c7f53b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 28 Oct 2016 15:36:43 +0100 -Subject: [PATCH 0045/1216] vc_mem: Add vc_mem driver for querying firmware +Subject: [PATCH 0045/1224] vc_mem: Add vc_mem driver for querying firmware memory addresses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -74349,7 +74349,7 @@ Signed-off-by: Dave Stevenson diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig new file mode 100644 -index 000000000000..fc1315209dab +index 0000000000000..fc1315209dab9 --- /dev/null +++ b/drivers/char/broadcom/Kconfig @@ -0,0 +1,18 @@ @@ -74373,14 +74373,14 @@ index 000000000000..fc1315209dab +endif diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile new file mode 100644 -index 000000000000..06c5c8ad00e7 +index 0000000000000..06c5c8ad00e75 --- /dev/null +++ b/drivers/char/broadcom/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o diff --git a/drivers/char/broadcom/vc_mem.c b/drivers/char/broadcom/vc_mem.c new file mode 100644 -index 000000000000..230692e84a58 +index 0000000000000..230692e84a58c --- /dev/null +++ b/drivers/char/broadcom/vc_mem.c @@ -0,0 +1,393 @@ @@ -74779,7 +74779,7 @@ index 000000000000..230692e84a58 +module_param(mem_base, uint, 0644); diff --git a/include/linux/broadcom/vc_mem.h b/include/linux/broadcom/vc_mem.h new file mode 100644 -index 000000000000..3c7079237496 +index 0000000000000..3c70792374964 --- /dev/null +++ b/include/linux/broadcom/vc_mem.h @@ -0,0 +1,39 @@ @@ -74826,10 +74826,10 @@ index 000000000000..3c7079237496 2.18.4 -From 6b69f1ae8a856aff6dbc0dd6fe28e907bb115d33 Mon Sep 17 00:00:00 2001 +From 79de3b2443811f674b76c9837cf72765acad8d34 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 22 Jul 2014 15:41:04 +0100 -Subject: [PATCH 0046/1216] vcsm: VideoCore shared memory service for BCM2835 +Subject: [PATCH 0046/1224] vcsm: VideoCore shared memory service for BCM2835 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -75028,7 +75028,7 @@ Signed-off-by: Hui Wang create mode 100644 include/linux/broadcom/vmcs_sm_ioctl.h diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index df0fc997dc3e..55f6a70b61cd 100644 +index df0fc997dc3e3..55f6a70b61cdd 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -5,6 +5,8 @@ @@ -75041,7 +75041,7 @@ index df0fc997dc3e..55f6a70b61cd 100644 config DEVMEM diff --git a/drivers/char/Makefile b/drivers/char/Makefile -index 7c5ea6f9df14..0ff37301f721 100644 +index 7c5ea6f9df145..0ff37301f721b 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -52,3 +52,4 @@ js-rtc-y = rtc.o @@ -75050,7 +75050,7 @@ index 7c5ea6f9df14..0ff37301f721 100644 obj-$(CONFIG_ADI) += adi.o +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig -index fc1315209dab..2b6132d12b13 100644 +index fc1315209dab9..2b6132d12b13d 100644 --- a/drivers/char/broadcom/Kconfig +++ b/drivers/char/broadcom/Kconfig @@ -16,3 +16,13 @@ config BCM2708_VCMEM @@ -75068,7 +75068,7 @@ index fc1315209dab..2b6132d12b13 100644 + Support for the VC shared memory on the Broadcom reference + design. Uses the VCHIQ stack. diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile -index 06c5c8ad00e7..419af4180deb 100644 +index 06c5c8ad00e75..419af4180deb0 100644 --- a/drivers/char/broadcom/Makefile +++ b/drivers/char/broadcom/Makefile @@ -1 +1,2 @@ @@ -75076,7 +75076,7 @@ index 06c5c8ad00e7..419af4180deb 100644 +obj-$(CONFIG_BCM_VC_SM) += vc_sm/ diff --git a/drivers/char/broadcom/vc_sm/Makefile b/drivers/char/broadcom/vc_sm/Makefile new file mode 100644 -index 000000000000..f73393ef0fdd +index 0000000000000..f73393ef0fdd3 --- /dev/null +++ b/drivers/char/broadcom/vc_sm/Makefile @@ -0,0 +1,9 @@ @@ -75091,7 +75091,7 @@ index 000000000000..f73393ef0fdd + vc_vchi_sm.o diff --git a/drivers/char/broadcom/vc_sm/vc_sm_defs.h b/drivers/char/broadcom/vc_sm/vc_sm_defs.h new file mode 100644 -index 000000000000..de6afe9f65af +index 0000000000000..de6afe9f65af4 --- /dev/null +++ b/drivers/char/broadcom/vc_sm/vc_sm_defs.h @@ -0,0 +1,237 @@ @@ -75334,7 +75334,7 @@ index 000000000000..de6afe9f65af +#endif /* __VC_SM_DEFS_H__INCLUDED__ */ diff --git a/drivers/char/broadcom/vc_sm/vc_sm_knl.h b/drivers/char/broadcom/vc_sm/vc_sm_knl.h new file mode 100644 -index 000000000000..f7f74750d835 +index 0000000000000..f7f74750d8358 --- /dev/null +++ b/drivers/char/broadcom/vc_sm/vc_sm_knl.h @@ -0,0 +1,53 @@ @@ -75393,7 +75393,7 @@ index 000000000000..f7f74750d835 +#endif /* __VC_SM_KNL_H__INCLUDED__ */ diff --git a/drivers/char/broadcom/vc_sm/vc_vchi_sm.c b/drivers/char/broadcom/vc_sm/vc_vchi_sm.c new file mode 100644 -index 000000000000..fda7e378652e +index 0000000000000..fda7e378652e7 --- /dev/null +++ b/drivers/char/broadcom/vc_sm/vc_vchi_sm.c @@ -0,0 +1,500 @@ @@ -75899,7 +75899,7 @@ index 000000000000..fda7e378652e +} diff --git a/drivers/char/broadcom/vc_sm/vc_vchi_sm.h b/drivers/char/broadcom/vc_sm/vc_vchi_sm.h new file mode 100644 -index 000000000000..9f849d2f40de +index 0000000000000..9f849d2f40dec --- /dev/null +++ b/drivers/char/broadcom/vc_sm/vc_vchi_sm.h @@ -0,0 +1,100 @@ @@ -76005,7 +76005,7 @@ index 000000000000..9f849d2f40de +#endif /* __VC_VCHI_SM_H__INCLUDED__ */ diff --git a/drivers/char/broadcom/vc_sm/vmcs_sm.c b/drivers/char/broadcom/vc_sm/vmcs_sm.c new file mode 100644 -index 000000000000..99a5e0d121a1 +index 0000000000000..99a5e0d121a1d --- /dev/null +++ b/drivers/char/broadcom/vc_sm/vmcs_sm.c @@ -0,0 +1,3526 @@ @@ -79537,7 +79537,7 @@ index 000000000000..99a5e0d121a1 +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/broadcom/vmcs_sm_ioctl.h b/include/linux/broadcom/vmcs_sm_ioctl.h new file mode 100644 -index 000000000000..2395ff08c5ce +index 0000000000000..2395ff08c5cee --- /dev/null +++ b/include/linux/broadcom/vmcs_sm_ioctl.h @@ -0,0 +1,294 @@ @@ -79839,10 +79839,10 @@ index 000000000000..2395ff08c5ce 2.18.4 -From 5f3e5b03465828dc88584b269741d1689bed536b Mon Sep 17 00:00:00 2001 +From c690752ec15edeb197e5a9d233a1952c2fa218f3 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Fri, 21 Aug 2015 23:14:48 +0100 -Subject: [PATCH 0047/1216] Add /dev/gpiomem device for rootless user GPIO +Subject: [PATCH 0047/1224] Add /dev/gpiomem device for rootless user GPIO access Signed-off-by: Luke Wren @@ -79860,7 +79860,7 @@ See: https://github.com/raspberrypi/linux/issues/1154 create mode 100644 drivers/char/broadcom/bcm2835-gpiomem.c diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig -index 2b6132d12b13..235704f2d916 100644 +index 2b6132d12b13d..235704f2d916b 100644 --- a/drivers/char/broadcom/Kconfig +++ b/drivers/char/broadcom/Kconfig @@ -26,3 +26,12 @@ config BCM_VC_SM @@ -79877,7 +79877,7 @@ index 2b6132d12b13..235704f2d916 100644 + register page to the user's pointer. + diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile -index 419af4180deb..187a0b02f189 100644 +index 419af4180deb0..187a0b02f1896 100644 --- a/drivers/char/broadcom/Makefile +++ b/drivers/char/broadcom/Makefile @@ -1,2 +1,5 @@ @@ -79888,7 +79888,7 @@ index 419af4180deb..187a0b02f189 100644 + diff --git a/drivers/char/broadcom/bcm2835-gpiomem.c b/drivers/char/broadcom/bcm2835-gpiomem.c new file mode 100644 -index 000000000000..f5e7f1ba8fb6 +index 0000000000000..f5e7f1ba8fb6f --- /dev/null +++ b/drivers/char/broadcom/bcm2835-gpiomem.c @@ -0,0 +1,258 @@ @@ -80154,10 +80154,10 @@ index 000000000000..f5e7f1ba8fb6 2.18.4 -From ae79dd70832e5d24cf467bba2a4aefd79f26edaf Mon Sep 17 00:00:00 2001 +From 533833d39b8784440a935a7fd4b8604814be76f5 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Sat, 5 Sep 2015 01:14:45 +0100 -Subject: [PATCH 0048/1216] Add SMI driver +Subject: [PATCH 0048/1224] Add SMI driver Signed-off-by: Luke Wren @@ -80190,7 +80190,7 @@ bcm2835_smi: re-add dereference to fix DMA transfers diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt new file mode 100644 -index 000000000000..68cc8ebc3392 +index 0000000000000..68cc8ebc3392d --- /dev/null +++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt @@ -0,0 +1,17 @@ @@ -80213,7 +80213,7 @@ index 000000000000..68cc8ebc3392 + diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt new file mode 100644 -index 000000000000..b76dc694f1ac +index 0000000000000..b76dc694f1ac0 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt @@ -0,0 +1,48 @@ @@ -80266,7 +80266,7 @@ index 000000000000..b76dc694f1ac +}; + diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig -index 235704f2d916..4ef0d7af2bc7 100644 +index 235704f2d916b..4ef0d7af2bc72 100644 --- a/drivers/char/broadcom/Kconfig +++ b/drivers/char/broadcom/Kconfig @@ -35,3 +35,11 @@ config BCM2835_DEVGPIOMEM @@ -80282,7 +80282,7 @@ index 235704f2d916..4ef0d7af2bc7 100644 + Broadcom's Secondary Memory interface. The low-level functionality is provided + by the SMI driver itself. diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile -index 187a0b02f189..d0ad04f8e498 100644 +index 187a0b02f1896..d0ad04f8e4981 100644 --- a/drivers/char/broadcom/Makefile +++ b/drivers/char/broadcom/Makefile @@ -2,4 +2,4 @@ obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o @@ -80293,7 +80293,7 @@ index 187a0b02f189..d0ad04f8e498 100644 +obj-$(CONFIG_BCM2835_SMI_DEV) += bcm2835_smi_dev.o diff --git a/drivers/char/broadcom/bcm2835_smi_dev.c b/drivers/char/broadcom/bcm2835_smi_dev.c new file mode 100644 -index 000000000000..9db8f1e3db0f +index 0000000000000..9db8f1e3db0fc --- /dev/null +++ b/drivers/char/broadcom/bcm2835_smi_dev.c @@ -0,0 +1,402 @@ @@ -80700,7 +80700,7 @@ index 000000000000..9db8f1e3db0f + "Character device driver for BCM2835's secondary memory interface"); +MODULE_AUTHOR("Luke Wren "); diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index c55b63750757..62c3ec285393 100644 +index c55b63750757d..62c3ec2853939 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -10,6 +10,14 @@ config SENSORS_LIS3LV02D @@ -80719,7 +80719,7 @@ index c55b63750757..62c3ec285393 100644 tristate "Analog Devices Digital Potentiometers" depends on (I2C || SPI) && SYSFS diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile -index c1860d35dc7e..dbca246199f3 100644 +index c1860d35dc7e2..dbca246199f3d 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_AD525X_DPOT_SPI) += ad525x_dpot-spi.o @@ -80732,7 +80732,7 @@ index c1860d35dc7e..dbca246199f3 100644 obj-$(CONFIG_LKDTM) += lkdtm/ diff --git a/drivers/misc/bcm2835_smi.c b/drivers/misc/bcm2835_smi.c new file mode 100644 -index 000000000000..f1a7f6a3e966 +index 0000000000000..f1a7f6a3e966b --- /dev/null +++ b/drivers/misc/bcm2835_smi.c @@ -0,0 +1,955 @@ @@ -81693,7 +81693,7 @@ index 000000000000..f1a7f6a3e966 +MODULE_AUTHOR("Luke Wren "); diff --git a/include/linux/broadcom/bcm2835_smi.h b/include/linux/broadcom/bcm2835_smi.h new file mode 100644 -index 000000000000..ee3a75edfc03 +index 0000000000000..ee3a75edfc033 --- /dev/null +++ b/include/linux/broadcom/bcm2835_smi.h @@ -0,0 +1,391 @@ @@ -82092,10 +82092,10 @@ index 000000000000..ee3a75edfc03 2.18.4 -From 9aa4249aae36a5e615bdf68e05d560d812240b2e Mon Sep 17 00:00:00 2001 +From e4e8ed6129c1d46741cfdd95fa28223fc54f44b9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 3 Jul 2013 00:49:20 +0100 -Subject: [PATCH 0049/1216] Add cpufreq driver +Subject: [PATCH 0049/1224] Add cpufreq driver Signed-off-by: popcornmix @@ -82111,7 +82111,7 @@ Signed-off-by: Dom Cobley create mode 100644 drivers/cpufreq/bcm2835-cpufreq.c diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index 25f11e9ec358..adf8fd20ef5b 100644 +index 25f11e9ec3587..adf8fd20ef5be 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -301,6 +301,15 @@ config ARM_TANGO_CPUFREQ @@ -82131,7 +82131,7 @@ index 25f11e9ec358..adf8fd20ef5b 100644 tristate "Tegra20 CPUFreq support" depends on ARCH_TEGRA diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index 9a9f5ccd13d9..33349d1f6cfa 100644 +index 9a9f5ccd13d98..33349d1f6cfa6 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -82,6 +82,7 @@ obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o @@ -82144,7 +82144,7 @@ index 9a9f5ccd13d9..33349d1f6cfa 100644 obj-$(CONFIG_ARM_TEGRA186_CPUFREQ) += tegra186-cpufreq.o diff --git a/drivers/cpufreq/bcm2835-cpufreq.c b/drivers/cpufreq/bcm2835-cpufreq.c new file mode 100644 -index 000000000000..66184acdae49 +index 0000000000000..66184acdae491 --- /dev/null +++ b/drivers/cpufreq/bcm2835-cpufreq.c @@ -0,0 +1,211 @@ @@ -82363,10 +82363,10 @@ index 000000000000..66184acdae49 2.18.4 -From a79b0a17810de88b34ccc81938647d01d92ad8c6 Mon Sep 17 00:00:00 2001 +From 67fa7bcf6e869113c106b175f28e08f89af52768 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 15:44:08 +0100 -Subject: [PATCH 0050/1216] Add Chris Boot's i2c driver +Subject: [PATCH 0050/1224] Add Chris Boot's i2c driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -82470,7 +82470,7 @@ both bcm2708_bsc_fifo_fill and ~drain are changed as well. create mode 100644 drivers/i2c/busses/i2c-bcm2708.c diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index 2d08a8719506..539f9309f6e6 100644 +index 2d08a8719506c..539f9309f6e67 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -9,6 +9,25 @@ menu "I2C Hardware Bus support" @@ -82500,7 +82500,7 @@ index 2d08a8719506..539f9309f6e6 100644 tristate "ALI 1535" depends on PCI diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index 3ab8aebc39c9..15eab02361f1 100644 +index 3ab8aebc39c90..15eab02361f1b 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -3,6 +3,8 @@ @@ -82514,7 +82514,7 @@ index 3ab8aebc39c9..15eab02361f1 100644 diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c new file mode 100644 -index 000000000000..962f2e5c7455 +index 0000000000000..962f2e5c7455d --- /dev/null +++ b/drivers/i2c/busses/i2c-bcm2708.c @@ -0,0 +1,512 @@ @@ -83034,10 +83034,10 @@ index 000000000000..962f2e5c7455 2.18.4 -From b845f73fde66dd6bf7b05778a9a3046fd628a141 Mon Sep 17 00:00:00 2001 +From e64d11e7a25a29a4c45a45260aeb882974912084 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/1216] char: broadcom: Add vcio module +Subject: [PATCH 0051/1224] char: broadcom: Add vcio module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -83070,7 +83070,7 @@ Signed-off-by: Dave Stevenson create mode 100644 drivers/char/broadcom/vcio.c diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig -index 4ef0d7af2bc7..cffd17df6a1b 100644 +index 4ef0d7af2bc72..cffd17df6a1b6 100644 --- a/drivers/char/broadcom/Kconfig +++ b/drivers/char/broadcom/Kconfig @@ -15,6 +15,12 @@ config BCM2708_VCMEM @@ -83087,7 +83087,7 @@ index 4ef0d7af2bc7..cffd17df6a1b 100644 config BCM_VC_SM diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile -index d0ad04f8e498..7d9cb3e0b1c3 100644 +index d0ad04f8e4981..7d9cb3e0b1c3c 100644 --- a/drivers/char/broadcom/Makefile +++ b/drivers/char/broadcom/Makefile @@ -1,4 +1,5 @@ @@ -83098,7 +83098,7 @@ index d0ad04f8e498..7d9cb3e0b1c3 100644 obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o diff --git a/drivers/char/broadcom/vcio.c b/drivers/char/broadcom/vcio.c new file mode 100644 -index 000000000000..d2598663a2b5 +index 0000000000000..d2598663a2b5d --- /dev/null +++ b/drivers/char/broadcom/vcio.c @@ -0,0 +1,194 @@ @@ -83300,10 +83300,10 @@ index 000000000000..d2598663a2b5 2.18.4 -From d7ccb8afa44c3e37a9c10fa542c2ca957c90e65e Mon Sep 17 00:00:00 2001 +From e9d37ef5d2474089d41deeb85bdcfc21b16c831a 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/1216] firmware: bcm2835: Support ARCH_BCM270x +Subject: [PATCH 0052/1224] firmware: bcm2835: Support ARCH_BCM270x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -83328,7 +83328,7 @@ Signed-off-by: Noralf Trønnes 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index da26a584dca0..7162f6d6649c 100644 +index da26a584dca06..7162f6d6649c6 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -29,6 +29,8 @@ struct rpi_firmware { @@ -83389,10 +83389,10 @@ index da26a584dca0..7162f6d6649c 100644 2.18.4 -From 89e41ac594f058e1ff7258f12f22cb5b6431eac6 Mon Sep 17 00:00:00 2001 +From fc374cb2abe830cb23ed15fb5a204c7107fe8207 Mon Sep 17 00:00:00 2001 From: notro Date: Wed, 9 Jul 2014 14:46:08 +0200 -Subject: [PATCH 0053/1216] BCM2708: Add core Device Tree support +Subject: [PATCH 0053/1224] BCM2708: Add core Device Tree support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -84062,7 +84062,7 @@ Signed-off-by: Phil Elwell create mode 120000 arch/arm64/boot/dts/overlays diff --git a/.gitignore b/.gitignore -index 70580bdd352c..a0cf56d7d0d2 100644 +index 70580bdd352cc..a0cf56d7d0d2e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ @@ -84074,7 +84074,7 @@ index 70580bdd352c..a0cf56d7d0d2 100644 *.dwo *.elf diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index b21b3a64641a..e6832866849d 100644 +index b21b3a64641a7..e6832866849dd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1,4 +1,18 @@ @@ -84120,7 +84120,7 @@ index b21b3a64641a..e6832866849d 100644 +endif diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts new file mode 100644 -index 000000000000..b800699a03fb +index 0000000000000..b800699a03fbd --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts @@ -0,0 +1,125 @@ @@ -84251,7 +84251,7 @@ index 000000000000..b800699a03fb +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts new file mode 100644 -index 000000000000..ef47775692ce +index 0000000000000..ef47775692cea --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts @@ -0,0 +1,115 @@ @@ -84372,7 +84372,7 @@ index 000000000000..ef47775692ce +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts new file mode 100644 -index 000000000000..64809aee5c0c +index 0000000000000..64809aee5c0ca --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts @@ -0,0 +1,98 @@ @@ -84476,7 +84476,7 @@ index 000000000000..64809aee5c0c +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi new file mode 100644 -index 000000000000..dce160f420fd +index 0000000000000..dce160f420fdc --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi @@ -0,0 +1,18 @@ @@ -84500,7 +84500,7 @@ index 000000000000..dce160f420fd +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts new file mode 100644 -index 000000000000..92f780a3e557 +index 0000000000000..92f780a3e5577 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -0,0 +1,163 @@ @@ -84669,7 +84669,7 @@ index 000000000000..92f780a3e557 +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts new file mode 100644 -index 000000000000..2909ddeafc83 +index 0000000000000..2909ddeafc833 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -0,0 +1,118 @@ @@ -84793,7 +84793,7 @@ index 000000000000..2909ddeafc83 +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi new file mode 100644 -index 000000000000..ce9795dad99f +index 0000000000000..ce9795dad99f3 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi @@ -0,0 +1,154 @@ @@ -84953,7 +84953,7 @@ index 000000000000..ce9795dad99f +}; diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi new file mode 100644 -index 000000000000..16a637363b5d +index 0000000000000..16a637363b5df --- /dev/null +++ b/arch/arm/boot/dts/bcm2708.dtsi @@ -0,0 +1,10 @@ @@ -84969,7 +84969,7 @@ index 000000000000..16a637363b5d +}; diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts new file mode 100644 -index 000000000000..4d2262f8d376 +index 0000000000000..4d2262f8d376b --- /dev/null +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts @@ -0,0 +1,125 @@ @@ -85100,7 +85100,7 @@ index 000000000000..4d2262f8d376 +}; diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi new file mode 100644 -index 000000000000..babfa41cd9f7 +index 0000000000000..babfa41cd9f78 --- /dev/null +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi @@ -0,0 +1,5 @@ @@ -85111,7 +85111,7 @@ index 000000000000..babfa41cd9f7 +}; diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi new file mode 100644 -index 000000000000..8bc67c0aaff1 +index 0000000000000..8bc67c0aaff17 --- /dev/null +++ b/arch/arm/boot/dts/bcm2709.dtsi @@ -0,0 +1,18 @@ @@ -85135,7 +85135,7 @@ index 000000000000..8bc67c0aaff1 +}; diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi new file mode 100644 -index 000000000000..9eb6becfbe41 +index 0000000000000..9eb6becfbe411 --- /dev/null +++ b/arch/arm/boot/dts/bcm270x.dtsi @@ -0,0 +1,165 @@ @@ -85306,7 +85306,7 @@ index 000000000000..9eb6becfbe41 +}; diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts new file mode 100644 -index 000000000000..65a6f4d06866 +index 0000000000000..65a6f4d06866f --- /dev/null +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts @@ -0,0 +1,125 @@ @@ -85437,7 +85437,7 @@ index 000000000000..65a6f4d06866 +}; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts new file mode 100644 -index 000000000000..55420ac94dcf +index 0000000000000..55420ac94dcfa --- /dev/null +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -0,0 +1,183 @@ @@ -85626,7 +85626,7 @@ index 000000000000..55420ac94dcf +}; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts new file mode 100644 -index 000000000000..261827cdb957 +index 0000000000000..261827cdb957c --- /dev/null +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -0,0 +1,194 @@ @@ -85826,7 +85826,7 @@ index 000000000000..261827cdb957 +}; diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts new file mode 100644 -index 000000000000..addebe448e32 +index 0000000000000..addebe448e32c --- /dev/null +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -0,0 +1,135 @@ @@ -85967,7 +85967,7 @@ index 000000000000..addebe448e32 +}; diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi new file mode 100644 -index 000000000000..5c45ded273fe +index 0000000000000..5c45ded273fe3 --- /dev/null +++ b/arch/arm/boot/dts/bcm2710.dtsi @@ -0,0 +1,25 @@ @@ -85998,7 +85998,7 @@ index 000000000000..5c45ded273fe +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts new file mode 100644 -index 000000000000..ccdc274665c0 +index 0000000000000..ccdc274665c09 --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -0,0 +1,338 @@ @@ -86342,7 +86342,7 @@ index 000000000000..ccdc274665c0 +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi new file mode 100644 -index 000000000000..d8ffaab8e86a +index 0000000000000..d8ffaab8e86aa --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -0,0 +1,7 @@ @@ -86355,7 +86355,7 @@ index 000000000000..d8ffaab8e86a +}; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi new file mode 100644 -index 000000000000..f134aba2badb +index 0000000000000..f134aba2badbc --- /dev/null +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -0,0 +1,44 @@ @@ -86405,7 +86405,7 @@ index 000000000000..f134aba2badb +}; diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi new file mode 100644 -index 000000000000..eceb170fd5b7 +index 0000000000000..eceb170fd5b7b --- /dev/null +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -0,0 +1,54 @@ @@ -86464,7 +86464,7 @@ index 000000000000..eceb170fd5b7 + }; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts -index 6c8ce39833bf..0cc6355a8c06 100644 +index 6c8ce39833bf6..0cc6355a8c06e 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -3,6 +3,7 @@ @@ -86476,7 +86476,7 @@ index 6c8ce39833bf..0cc6355a8c06 100644 / { compatible = "raspberrypi,model-a-plus", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts -index 17fdd48346ff..21593978e851 100644 +index 17fdd48346ffb..21593978e8513 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -3,6 +3,7 @@ @@ -86488,7 +86488,7 @@ index 17fdd48346ff..21593978e851 100644 / { compatible = "raspberrypi,model-a", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts -index b0355c229cdc..7c63ba90b827 100644 +index b0355c229cdc2..7c63ba90b827c 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -4,6 +4,7 @@ @@ -86500,7 +86500,7 @@ index b0355c229cdc..7c63ba90b827 100644 / { compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts -index 33b3b5c02521..83e54a5fa3b4 100644 +index 33b3b5c025219..83e54a5fa3b40 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -4,6 +4,7 @@ @@ -86512,7 +86512,7 @@ index 33b3b5c02521..83e54a5fa3b4 100644 / { compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts -index 2b69957e0113..c9d04b1f14fd 100644 +index 2b69957e0113e..c9d04b1f14fd1 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -4,6 +4,7 @@ @@ -86524,7 +86524,7 @@ index 2b69957e0113..c9d04b1f14fd 100644 / { compatible = "raspberrypi,model-b", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts -index 6dd93c6f4966..42ce8b606354 100644 +index 6dd93c6f49666..42ce8b6063547 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -7,6 +7,7 @@ @@ -86536,7 +86536,7 @@ index 6dd93c6f4966..42ce8b606354 100644 / { compatible = "raspberrypi,model-zero", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index 6c6a7f620d8b..c77971e27175 100644 +index 6c6a7f620d8b7..c77971e27175a 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -29,6 +29,22 @@ @@ -86591,7 +86591,7 @@ index 6c6a7f620d8b..c77971e27175 100644 + power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>; +}; diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi -index a5c3824c8056..53bf4579cc22 100644 +index a5c3824c80563..53bf4579cc224 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -1,5 +1,6 @@ @@ -86602,7 +86602,7 @@ index a5c3824c8056..53bf4579cc22 100644 / { compatible = "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts -index 0455a680394a..6b0a6d5d5ca4 100644 +index 0455a680394a2..6b0a6d5d5ca42 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -4,6 +4,7 @@ @@ -86614,7 +86614,7 @@ index 0455a680394a..6b0a6d5d5ca4 100644 / { compatible = "raspberrypi,2-model-b", "brcm,bcm2836"; diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi -index c933e8413884..82d6c4662ae4 100644 +index c933e84138842..82d6c4662ae49 100644 --- a/arch/arm/boot/dts/bcm2836.dtsi +++ b/arch/arm/boot/dts/bcm2836.dtsi @@ -1,5 +1,6 @@ @@ -86625,7 +86625,7 @@ index c933e8413884..82d6c4662ae4 100644 / { compatible = "brcm,bcm2836"; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index 054ecaa355c9..3d03e7d0fbf0 100644 +index 054ecaa355c9a..3d03e7d0fbf0d 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -4,6 +4,7 @@ @@ -86637,7 +86637,7 @@ index 054ecaa355c9..3d03e7d0fbf0 100644 / { compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi -index beb6c502dadc..9e95fee78e19 100644 +index beb6c502dadc7..9e95fee78e192 100644 --- a/arch/arm/boot/dts/bcm2837.dtsi +++ b/arch/arm/boot/dts/bcm2837.dtsi @@ -1,4 +1,5 @@ @@ -86648,7 +86648,7 @@ index beb6c502dadc..9e95fee78e19 100644 compatible = "brcm,bcm2837"; diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts new file mode 100644 -index 000000000000..7170a97bd3e4 +index 0000000000000..7170a97bd3e4f --- /dev/null +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts @@ -0,0 +1,118 @@ @@ -86772,7 +86772,7 @@ index 000000000000..7170a97bd3e4 +}; diff --git a/arch/arm/boot/dts/bcm2838-rpi.dtsi b/arch/arm/boot/dts/bcm2838-rpi.dtsi new file mode 100644 -index 000000000000..140cfa312d1a +index 0000000000000..140cfa312d1ae --- /dev/null +++ b/arch/arm/boot/dts/bcm2838-rpi.dtsi @@ -0,0 +1,25 @@ @@ -86803,7 +86803,7 @@ index 000000000000..140cfa312d1a +}; diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi new file mode 100644 -index 000000000000..a8614cc3ad6a +index 0000000000000..a8614cc3ad6ae --- /dev/null +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -0,0 +1,746 @@ @@ -87555,7 +87555,7 @@ index 000000000000..a8614cc3ad6a +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi new file mode 100644 -index 000000000000..952a28eaf616 +index 0000000000000..952a28eaf6163 --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi @@ -0,0 +1,8 @@ @@ -87569,7 +87569,7 @@ index 000000000000..952a28eaf616 +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi new file mode 100644 -index 000000000000..451fb4bb4ab8 +index 0000000000000..451fb4bb4ab81 --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi @@ -0,0 +1,8 @@ @@ -87583,7 +87583,7 @@ index 000000000000..451fb4bb4ab8 +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi new file mode 100644 -index 000000000000..9279d4b0bfae +index 0000000000000..9279d4b0bfae2 --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi @@ -0,0 +1,8 @@ @@ -87596,7 +87596,7 @@ index 000000000000..9279d4b0bfae + }; +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi -index 70bece63f9a7..7c6c054459b7 100644 +index 70bece63f9a74..7c6c054459b72 100644 --- a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi @@ -29,6 +29,9 @@ @@ -87626,7 +87626,7 @@ index 70bece63f9a7..7c6c054459b7 100644 + }; +}; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 50c64146d492..f0dbd6af90fa 100644 +index 50c64146d4926..f0dbd6af90fae 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -56,18 +56,7 @@ @@ -87771,7 +87771,7 @@ index 50c64146d492..f0dbd6af90fa 100644 }; diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile new file mode 100644 -index 000000000000..e9cd9722bb94 +index 0000000000000..e9cd9722bb94b --- /dev/null +++ b/arch/arm/boot/dts/overlays/Makefile @@ -0,0 +1,194 @@ @@ -87971,7 +87971,7 @@ index 000000000000..e9cd9722bb94 +clean-files := *.dtbo diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README new file mode 100644 -index 000000000000..8ce8cf05a2c8 +index 0000000000000..8ce8cf05a2c86 --- /dev/null +++ b/arch/arm/boot/dts/overlays/README @@ -0,0 +1,2591 @@ @@ -90568,7 +90568,7 @@ index 000000000000..8ce8cf05a2c8 +http://www.raspberrypi.org/documentation/configuration/device-tree.md diff --git a/arch/arm/boot/dts/overlays/act-led-overlay.dts b/arch/arm/boot/dts/overlays/act-led-overlay.dts new file mode 100644 -index 000000000000..2f4bbb407f89 +index 0000000000000..2f4bbb407f896 --- /dev/null +++ b/arch/arm/boot/dts/overlays/act-led-overlay.dts @@ -0,0 +1,27 @@ @@ -90601,7 +90601,7 @@ index 000000000000..2f4bbb407f89 +}; diff --git a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts new file mode 100644 -index 000000000000..298488e19156 +index 0000000000000..298488e191565 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts @@ -0,0 +1,40 @@ @@ -90647,7 +90647,7 @@ index 000000000000..298488e19156 +}; diff --git a/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts new file mode 100644 -index 000000000000..5fed769d2526 +index 0000000000000..5fed769d25260 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts @@ -0,0 +1,52 @@ @@ -90705,7 +90705,7 @@ index 000000000000..5fed769d2526 +}; diff --git a/arch/arm/boot/dts/overlays/ads1015-overlay.dts b/arch/arm/boot/dts/overlays/ads1015-overlay.dts new file mode 100644 -index 000000000000..26d68fccc6a8 +index 0000000000000..26d68fccc6a85 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts @@ -0,0 +1,98 @@ @@ -90809,7 +90809,7 @@ index 000000000000..26d68fccc6a8 +}; diff --git a/arch/arm/boot/dts/overlays/ads1115-overlay.dts b/arch/arm/boot/dts/overlays/ads1115-overlay.dts new file mode 100644 -index 000000000000..b380d925f0a5 +index 0000000000000..b380d925f0a51 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts @@ -0,0 +1,103 @@ @@ -90918,7 +90918,7 @@ index 000000000000..b380d925f0a5 +}; diff --git a/arch/arm/boot/dts/overlays/ads7846-overlay.dts b/arch/arm/boot/dts/overlays/ads7846-overlay.dts new file mode 100644 -index 000000000000..1c5c9b6bb6ff +index 0000000000000..1c5c9b6bb6ffd --- /dev/null +++ b/arch/arm/boot/dts/overlays/ads7846-overlay.dts @@ -0,0 +1,89 @@ @@ -91013,7 +91013,7 @@ index 000000000000..1c5c9b6bb6ff +}; diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts new file mode 100644 -index 000000000000..197c8f41a265 +index 0000000000000..197c8f41a2658 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts @@ -0,0 +1,81 @@ @@ -91100,7 +91100,7 @@ index 000000000000..197c8f41a265 +}; diff --git a/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts new file mode 100644 -index 000000000000..ea392e886984 +index 0000000000000..ea392e886984b --- /dev/null +++ b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts @@ -0,0 +1,37 @@ @@ -91143,7 +91143,7 @@ index 000000000000..ea392e886984 +}; diff --git a/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts new file mode 100644 -index 000000000000..82f9b3734fb1 +index 0000000000000..82f9b3734fb12 --- /dev/null +++ b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts @@ -0,0 +1,49 @@ @@ -91198,7 +91198,7 @@ index 000000000000..82f9b3734fb1 +}; diff --git a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts new file mode 100644 -index 000000000000..dd69916fcb3c +index 0000000000000..dd69916fcb3c1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts @@ -0,0 +1,59 @@ @@ -91263,7 +91263,7 @@ index 000000000000..dd69916fcb3c +}; diff --git a/arch/arm/boot/dts/overlays/allo-digione-overlay.dts b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts new file mode 100644 -index 000000000000..ea018ace34d4 +index 0000000000000..ea018ace34d4f --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts @@ -0,0 +1,44 @@ @@ -91313,7 +91313,7 @@ index 000000000000..ea018ace34d4 +}; diff --git a/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts new file mode 100644 -index 000000000000..b25fd681f09f +index 0000000000000..b25fd681f09f3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts @@ -0,0 +1,57 @@ @@ -91376,7 +91376,7 @@ index 000000000000..b25fd681f09f + diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts new file mode 100644 -index 000000000000..bfc66da6295a +index 0000000000000..bfc66da6295a8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts @@ -0,0 +1,54 @@ @@ -91436,7 +91436,7 @@ index 000000000000..bfc66da6295a +}; diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts new file mode 100644 -index 000000000000..374c553db062 +index 0000000000000..374c553db062e --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts @@ -0,0 +1,55 @@ @@ -91497,7 +91497,7 @@ index 000000000000..374c553db062 +}; diff --git a/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts new file mode 100644 -index 000000000000..4769296ec9d6 +index 0000000000000..4769296ec9d6f --- /dev/null +++ b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts @@ -0,0 +1,57 @@ @@ -91560,7 +91560,7 @@ index 000000000000..4769296ec9d6 +*/ diff --git a/arch/arm/boot/dts/overlays/at86rf233-overlay.dts b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts new file mode 100644 -index 000000000000..5a3f4571ee78 +index 0000000000000..5a3f4571ee789 --- /dev/null +++ b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts @@ -0,0 +1,57 @@ @@ -91623,7 +91623,7 @@ index 000000000000..5a3f4571ee78 +}; diff --git a/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts new file mode 100644 -index 000000000000..57a66eac8e9b +index 0000000000000..57a66eac8e9b2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts @@ -0,0 +1,60 @@ @@ -91689,7 +91689,7 @@ index 000000000000..57a66eac8e9b +}; diff --git a/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts new file mode 100644 -index 000000000000..fb4a4678a17a +index 0000000000000..fb4a4678a17ab --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts @@ -0,0 +1,71 @@ @@ -91766,7 +91766,7 @@ index 000000000000..fb4a4678a17a +}; diff --git a/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts new file mode 100644 -index 000000000000..68f4427d86c3 +index 0000000000000..68f4427d86c35 --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts @@ -0,0 +1,39 @@ @@ -91811,7 +91811,7 @@ index 000000000000..68f4427d86c3 +}; diff --git a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts new file mode 100644 -index 000000000000..4b96a3a8a14a +index 0000000000000..4b96a3a8a14a2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts @@ -0,0 +1,82 @@ @@ -91899,7 +91899,7 @@ index 000000000000..4b96a3a8a14a +}; diff --git a/arch/arm/boot/dts/overlays/audremap-overlay.dts b/arch/arm/boot/dts/overlays/audremap-overlay.dts new file mode 100644 -index 000000000000..d624bb3a3fea +index 0000000000000..d624bb3a3feaf --- /dev/null +++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts @@ -0,0 +1,35 @@ @@ -91940,7 +91940,7 @@ index 000000000000..d624bb3a3fea +}; diff --git a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts new file mode 100644 -index 000000000000..249c8202b2ed +index 0000000000000..249c8202b2ed4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts @@ -0,0 +1,122 @@ @@ -92068,7 +92068,7 @@ index 000000000000..249c8202b2ed +}; diff --git a/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts new file mode 100644 -index 000000000000..26dbbdd03ce5 +index 0000000000000..26dbbdd03ce5a --- /dev/null +++ b/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts @@ -0,0 +1,23 @@ @@ -92097,7 +92097,7 @@ index 000000000000..26dbbdd03ce5 +}; diff --git a/arch/arm/boot/dts/overlays/dht11-overlay.dts b/arch/arm/boot/dts/overlays/dht11-overlay.dts new file mode 100644 -index 000000000000..8de67527e317 +index 0000000000000..8de67527e3179 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dht11-overlay.dts @@ -0,0 +1,39 @@ @@ -92142,7 +92142,7 @@ index 000000000000..8de67527e317 +}; diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts new file mode 100644 -index 000000000000..d863e5c167cc +index 0000000000000..d863e5c167cc9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts @@ -0,0 +1,39 @@ @@ -92187,7 +92187,7 @@ index 000000000000..d863e5c167cc +}; diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts new file mode 100644 -index 000000000000..dfb8922a654b +index 0000000000000..dfb8922a654bb --- /dev/null +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts @@ -0,0 +1,49 @@ @@ -92242,7 +92242,7 @@ index 000000000000..dfb8922a654b +}; diff --git a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts new file mode 100644 -index 000000000000..2f1b655a133c +index 0000000000000..2f1b655a133c3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts @@ -0,0 +1,55 @@ @@ -92303,7 +92303,7 @@ index 000000000000..2f1b655a133c +}; diff --git a/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts new file mode 100644 -index 000000000000..75e046463900 +index 0000000000000..75e0464639000 --- /dev/null +++ b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts @@ -0,0 +1,20 @@ @@ -92329,7 +92329,7 @@ index 000000000000..75e046463900 +}; diff --git a/arch/arm/boot/dts/overlays/dpi18-overlay.dts b/arch/arm/boot/dts/overlays/dpi18-overlay.dts new file mode 100644 -index 000000000000..4abe5be744db +index 0000000000000..4abe5be744db7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dpi18-overlay.dts @@ -0,0 +1,39 @@ @@ -92374,7 +92374,7 @@ index 000000000000..4abe5be744db +}; diff --git a/arch/arm/boot/dts/overlays/dpi24-overlay.dts b/arch/arm/boot/dts/overlays/dpi24-overlay.dts new file mode 100644 -index 000000000000..44335cc81277 +index 0000000000000..44335cc812770 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dpi24-overlay.dts @@ -0,0 +1,39 @@ @@ -92419,7 +92419,7 @@ index 000000000000..44335cc81277 +}; diff --git a/arch/arm/boot/dts/overlays/draws-overlay.dts b/arch/arm/boot/dts/overlays/draws-overlay.dts new file mode 100644 -index 000000000000..32b665c3934b +index 0000000000000..32b665c3934b7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/draws-overlay.dts @@ -0,0 +1,200 @@ @@ -92625,7 +92625,7 @@ index 000000000000..32b665c3934b +}; diff --git a/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts new file mode 100644 -index 000000000000..78c5e9f85048 +index 0000000000000..78c5e9f850484 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts @@ -0,0 +1,14 @@ @@ -92645,7 +92645,7 @@ index 000000000000..78c5e9f85048 +}; diff --git a/arch/arm/boot/dts/overlays/dwc2-overlay.dts b/arch/arm/boot/dts/overlays/dwc2-overlay.dts new file mode 100644 -index 000000000000..732adbe3faaf +index 0000000000000..732adbe3faaf9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dwc2-overlay.dts @@ -0,0 +1,26 @@ @@ -92677,7 +92677,7 @@ index 000000000000..732adbe3faaf +}; diff --git a/arch/arm/boot/dts/overlays/enc28j60-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts new file mode 100644 -index 000000000000..7af5c2e607ea +index 0000000000000..7af5c2e607ea0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts @@ -0,0 +1,53 @@ @@ -92736,7 +92736,7 @@ index 000000000000..7af5c2e607ea +}; diff --git a/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts new file mode 100644 -index 000000000000..17cb5b8fa485 +index 0000000000000..17cb5b8fa4852 --- /dev/null +++ b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts @@ -0,0 +1,47 @@ @@ -92789,7 +92789,7 @@ index 000000000000..17cb5b8fa485 +}; diff --git a/arch/arm/boot/dts/overlays/exc3000-overlay.dts b/arch/arm/boot/dts/overlays/exc3000-overlay.dts new file mode 100644 -index 000000000000..6f087fb20661 +index 0000000000000..6f087fb206618 --- /dev/null +++ b/arch/arm/boot/dts/overlays/exc3000-overlay.dts @@ -0,0 +1,48 @@ @@ -92843,7 +92843,7 @@ index 000000000000..6f087fb20661 +}; diff --git a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts new file mode 100644 -index 000000000000..1c3ec3e21a18 +index 0000000000000..1c3ec3e21a184 --- /dev/null +++ b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts @@ -0,0 +1,70 @@ @@ -92919,7 +92919,7 @@ index 000000000000..1c3ec3e21a18 +}; diff --git a/arch/arm/boot/dts/overlays/goodix-overlay.dts b/arch/arm/boot/dts/overlays/goodix-overlay.dts new file mode 100644 -index 000000000000..8571527de49a +index 0000000000000..8571527de49a6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts @@ -0,0 +1,46 @@ @@ -92971,7 +92971,7 @@ index 000000000000..8571527de49a +}; diff --git a/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts new file mode 100644 -index 000000000000..e443be1f9a0e +index 0000000000000..e443be1f9a0e7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts @@ -0,0 +1,49 @@ @@ -93026,7 +93026,7 @@ index 000000000000..e443be1f9a0e +}; diff --git a/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts new file mode 100644 -index 000000000000..0b14981b4824 +index 0000000000000..0b14981b4824e --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts @@ -0,0 +1,79 @@ @@ -93111,7 +93111,7 @@ index 000000000000..0b14981b4824 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts new file mode 100644 -index 000000000000..58f588498d68 +index 0000000000000..58f588498d68e --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts @@ -0,0 +1,48 @@ @@ -93165,7 +93165,7 @@ index 000000000000..58f588498d68 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts new file mode 100644 -index 000000000000..3625431b7560 +index 0000000000000..3625431b75604 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts @@ -0,0 +1,36 @@ @@ -93207,7 +93207,7 @@ index 000000000000..3625431b7560 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-key-overlay.dts b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts new file mode 100644 -index 000000000000..2e7253d1d0ab +index 0000000000000..2e7253d1d0abf --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts @@ -0,0 +1,48 @@ @@ -93261,7 +93261,7 @@ index 000000000000..2e7253d1d0ab +}; diff --git a/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts new file mode 100755 -index 000000000000..96cbe80820b7 +index 0000000000000..96cbe80820b72 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts @@ -0,0 +1,14 @@ @@ -93281,7 +93281,7 @@ index 000000000000..96cbe80820b7 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts new file mode 100644 -index 000000000000..55f9bff3a8f6 +index 0000000000000..55f9bff3a8f62 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts @@ -0,0 +1,14 @@ @@ -93301,7 +93301,7 @@ index 000000000000..55f9bff3a8f6 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts new file mode 100644 -index 000000000000..bb8cd3bf264d +index 0000000000000..bb8cd3bf264d1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts @@ -0,0 +1,36 @@ @@ -93343,7 +93343,7 @@ index 000000000000..bb8cd3bf264d +}; diff --git a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts new file mode 100644 -index 000000000000..db07ba67781d +index 0000000000000..db07ba67781d7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts @@ -0,0 +1,82 @@ @@ -93431,7 +93431,7 @@ index 000000000000..db07ba67781d +}; diff --git a/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts new file mode 100644 -index 000000000000..ee726669ff51 +index 0000000000000..ee726669ff511 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts @@ -0,0 +1,46 @@ @@ -93483,7 +93483,7 @@ index 000000000000..ee726669ff51 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts new file mode 100644 -index 000000000000..142518ab348b +index 0000000000000..142518ab348b1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts @@ -0,0 +1,39 @@ @@ -93528,7 +93528,7 @@ index 000000000000..142518ab348b +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts new file mode 100644 -index 000000000000..ea8a6c8f36c0 +index 0000000000000..ea8a6c8f36c0a --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts @@ -0,0 +1,34 @@ @@ -93568,7 +93568,7 @@ index 000000000000..ea8a6c8f36c0 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts new file mode 100644 -index 000000000000..5cd14aac3e45 +index 0000000000000..5cd14aac3e45f --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts @@ -0,0 +1,59 @@ @@ -93633,7 +93633,7 @@ index 000000000000..5cd14aac3e45 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts new file mode 100644 -index 000000000000..09adcea8fd37 +index 0000000000000..09adcea8fd377 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts @@ -0,0 +1,71 @@ @@ -93710,7 +93710,7 @@ index 000000000000..09adcea8fd37 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts new file mode 100644 -index 000000000000..00e5d450a88b +index 0000000000000..00e5d450a88b1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts @@ -0,0 +1,64 @@ @@ -93780,7 +93780,7 @@ index 000000000000..00e5d450a88b +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts new file mode 100644 -index 000000000000..63432e8b983f +index 0000000000000..63432e8b983fe --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts @@ -0,0 +1,34 @@ @@ -93820,7 +93820,7 @@ index 000000000000..63432e8b983f +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts new file mode 100644 -index 000000000000..a2309a50e8d8 +index 0000000000000..a2309a50e8d86 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts @@ -0,0 +1,41 @@ @@ -93867,7 +93867,7 @@ index 000000000000..a2309a50e8d8 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts new file mode 100644 -index 000000000000..83de602e76ba +index 0000000000000..83de602e76ba1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts @@ -0,0 +1,43 @@ @@ -93916,7 +93916,7 @@ index 000000000000..83de602e76ba +}; diff --git a/arch/arm/boot/dts/overlays/hy28a-overlay.dts b/arch/arm/boot/dts/overlays/hy28a-overlay.dts new file mode 100644 -index 000000000000..aa6463e6e749 +index 0000000000000..aa6463e6e7497 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts @@ -0,0 +1,93 @@ @@ -94015,7 +94015,7 @@ index 000000000000..aa6463e6e749 +}; diff --git a/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts new file mode 100644 -index 000000000000..42b68b684bd0 +index 0000000000000..42b68b684bd0a --- /dev/null +++ b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts @@ -0,0 +1,152 @@ @@ -94173,7 +94173,7 @@ index 000000000000..42b68b684bd0 +}; diff --git a/arch/arm/boot/dts/overlays/hy28b-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-overlay.dts new file mode 100644 -index 000000000000..2e5e20f327a3 +index 0000000000000..2e5e20f327a3c --- /dev/null +++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts @@ -0,0 +1,148 @@ @@ -94327,7 +94327,7 @@ index 000000000000..2e5e20f327a3 +}; diff --git a/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts new file mode 100644 -index 000000000000..0c4cff354674 +index 0000000000000..0c4cff354674b --- /dev/null +++ b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts @@ -0,0 +1,39 @@ @@ -94372,7 +94372,7 @@ index 000000000000..0c4cff354674 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts new file mode 100644 -index 000000000000..8204b6b3aef8 +index 0000000000000..8204b6b3aef83 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts @@ -0,0 +1,13 @@ @@ -94391,7 +94391,7 @@ index 000000000000..8204b6b3aef8 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts new file mode 100644 -index 000000000000..39e7bc5fa9d8 +index 0000000000000..39e7bc5fa9d88 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts @@ -0,0 +1,45 @@ @@ -94442,7 +94442,7 @@ index 000000000000..39e7bc5fa9d8 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts new file mode 100644 -index 000000000000..112aed91ecb2 +index 0000000000000..112aed91ecb24 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts @@ -0,0 +1,139 @@ @@ -94587,7 +94587,7 @@ index 000000000000..112aed91ecb2 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts new file mode 100644 -index 000000000000..108165df165e +index 0000000000000..108165df165ef --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts @@ -0,0 +1,26 @@ @@ -94619,7 +94619,7 @@ index 000000000000..108165df165e +}; diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts new file mode 100644 -index 000000000000..44df77459520 +index 0000000000000..44df77459520b --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts @@ -0,0 +1,244 @@ @@ -94869,7 +94869,7 @@ index 000000000000..44df77459520 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts new file mode 100644 -index 000000000000..af5ca042de75 +index 0000000000000..af5ca042de75a --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts @@ -0,0 +1,225 @@ @@ -95100,7 +95100,7 @@ index 000000000000..af5ca042de75 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts new file mode 100644 -index 000000000000..777e4a68190a +index 0000000000000..777e4a68190a4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts @@ -0,0 +1,239 @@ @@ -95345,7 +95345,7 @@ index 000000000000..777e4a68190a +}; diff --git a/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts new file mode 100644 -index 000000000000..02f7dca9b71e +index 0000000000000..02f7dca9b71e6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts @@ -0,0 +1,14 @@ @@ -95365,7 +95365,7 @@ index 000000000000..02f7dca9b71e +}; diff --git a/arch/arm/boot/dts/overlays/i2c0-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-overlay.dts new file mode 100644 -index 000000000000..6b1f9ec6c878 +index 0000000000000..6b1f9ec6c8782 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c0-overlay.dts @@ -0,0 +1,61 @@ @@ -95432,7 +95432,7 @@ index 000000000000..6b1f9ec6c878 +}; diff --git a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts new file mode 100644 -index 000000000000..09d8b16a6256 +index 0000000000000..09d8b16a6256d --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts @@ -0,0 +1,9 @@ @@ -95447,7 +95447,7 @@ index 000000000000..09d8b16a6256 +}; diff --git a/arch/arm/boot/dts/overlays/i2c1-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-overlay.dts new file mode 100644 -index 000000000000..addaed73e665 +index 0000000000000..addaed73e6656 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c1-overlay.dts @@ -0,0 +1,44 @@ @@ -95497,7 +95497,7 @@ index 000000000000..addaed73e665 +}; diff --git a/arch/arm/boot/dts/overlays/i2c3-overlay.dts b/arch/arm/boot/dts/overlays/i2c3-overlay.dts new file mode 100644 -index 000000000000..e24a1df21f99 +index 0000000000000..e24a1df21f991 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c3-overlay.dts @@ -0,0 +1,36 @@ @@ -95539,7 +95539,7 @@ index 000000000000..e24a1df21f99 +}; diff --git a/arch/arm/boot/dts/overlays/i2c4-overlay.dts b/arch/arm/boot/dts/overlays/i2c4-overlay.dts new file mode 100644 -index 000000000000..14c7f4d1da4c +index 0000000000000..14c7f4d1da4c7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c4-overlay.dts @@ -0,0 +1,36 @@ @@ -95581,7 +95581,7 @@ index 000000000000..14c7f4d1da4c +}; diff --git a/arch/arm/boot/dts/overlays/i2c5-overlay.dts b/arch/arm/boot/dts/overlays/i2c5-overlay.dts new file mode 100644 -index 000000000000..7953621112de +index 0000000000000..7953621112ded --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c5-overlay.dts @@ -0,0 +1,36 @@ @@ -95623,7 +95623,7 @@ index 000000000000..7953621112de +}; diff --git a/arch/arm/boot/dts/overlays/i2c6-overlay.dts b/arch/arm/boot/dts/overlays/i2c6-overlay.dts new file mode 100644 -index 000000000000..555305a7ee1f +index 0000000000000..555305a7ee1fd --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c6-overlay.dts @@ -0,0 +1,36 @@ @@ -95665,7 +95665,7 @@ index 000000000000..555305a7ee1f +}; diff --git a/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts new file mode 100644 -index 000000000000..cf43094c6ff4 +index 0000000000000..cf43094c6ff45 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts @@ -0,0 +1,18 @@ @@ -95689,7 +95689,7 @@ index 000000000000..cf43094c6ff4 +}; diff --git a/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts new file mode 100644 -index 000000000000..551aba591d26 +index 0000000000000..551aba591d263 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts @@ -0,0 +1,45 @@ @@ -95740,7 +95740,7 @@ index 000000000000..551aba591d26 +}; diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts new file mode 100644 -index 000000000000..2a1500d07b68 +index 0000000000000..2a1500d07b680 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts @@ -0,0 +1,129 @@ @@ -95875,7 +95875,7 @@ index 000000000000..2a1500d07b68 +}; diff --git a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts new file mode 100644 -index 000000000000..ff3ef3942c6c +index 0000000000000..ff3ef3942c6c0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts @@ -0,0 +1,42 @@ @@ -95923,7 +95923,7 @@ index 000000000000..ff3ef3942c6c +}; diff --git a/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts new file mode 100644 -index 000000000000..24073cadd0ef +index 0000000000000..24073cadd0eff --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts @@ -0,0 +1,46 @@ @@ -95975,7 +95975,7 @@ index 000000000000..24073cadd0ef +}; diff --git a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts new file mode 100644 -index 000000000000..7c70b25e58d7 +index 0000000000000..7c70b25e58d75 --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts @@ -0,0 +1,49 @@ @@ -96030,7 +96030,7 @@ index 000000000000..7c70b25e58d7 +}; diff --git a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts new file mode 100644 -index 000000000000..ee54095c869b +index 0000000000000..ee54095c869be --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts @@ -0,0 +1,47 @@ @@ -96083,7 +96083,7 @@ index 000000000000..ee54095c869b +}; diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts new file mode 100644 -index 000000000000..b9006715a539 +index 0000000000000..b9006715a5397 --- /dev/null +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts @@ -0,0 +1,97 @@ @@ -96186,7 +96186,7 @@ index 000000000000..b9006715a539 +}; diff --git a/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts new file mode 100644 -index 000000000000..585c7dbcdf7f +index 0000000000000..585c7dbcdf7f5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts @@ -0,0 +1,309 @@ @@ -96501,7 +96501,7 @@ index 000000000000..585c7dbcdf7f + diff --git a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts new file mode 100644 -index 000000000000..d00515dca419 +index 0000000000000..d00515dca4193 --- /dev/null +++ b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts @@ -0,0 +1,46 @@ @@ -96553,7 +96553,7 @@ index 000000000000..d00515dca419 +}; diff --git a/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts new file mode 100644 -index 000000000000..e73336029c54 +index 0000000000000..e73336029c544 --- /dev/null +++ b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts @@ -0,0 +1,41 @@ @@ -96600,7 +96600,7 @@ index 000000000000..e73336029c54 +}; diff --git a/arch/arm/boot/dts/overlays/ltc294x-overlay.dts b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts new file mode 100644 -index 000000000000..6d971f3649ca +index 0000000000000..6d971f3649ca5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts @@ -0,0 +1,86 @@ @@ -96692,7 +96692,7 @@ index 000000000000..6d971f3649ca +}; diff --git a/arch/arm/boot/dts/overlays/max98357a-overlay.dts b/arch/arm/boot/dts/overlays/max98357a-overlay.dts new file mode 100644 -index 000000000000..9e2afb05b7cb +index 0000000000000..9e2afb05b7cb5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/max98357a-overlay.dts @@ -0,0 +1,84 @@ @@ -96782,7 +96782,7 @@ index 000000000000..9e2afb05b7cb +}; diff --git a/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts new file mode 100644 -index 000000000000..840dd9b31db4 +index 0000000000000..840dd9b31db41 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts @@ -0,0 +1,64 @@ @@ -96852,7 +96852,7 @@ index 000000000000..840dd9b31db4 +}; diff --git a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts new file mode 100644 -index 000000000000..16af971c3bdb +index 0000000000000..16af971c3bdb7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts @@ -0,0 +1,71 @@ @@ -96929,7 +96929,7 @@ index 000000000000..16af971c3bdb + diff --git a/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts new file mode 100644 -index 000000000000..484d64b225fb +index 0000000000000..484d64b225fb8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts @@ -0,0 +1,732 @@ @@ -97667,7 +97667,7 @@ index 000000000000..484d64b225fb + diff --git a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts new file mode 100755 -index 000000000000..0dae8053a9a9 +index 0000000000000..0dae8053a9a91 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts @@ -0,0 +1,73 @@ @@ -97746,7 +97746,7 @@ index 000000000000..0dae8053a9a9 +}; diff --git a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts new file mode 100644 -index 000000000000..c70dc3d05ebf +index 0000000000000..c70dc3d05ebfe --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts @@ -0,0 +1,73 @@ @@ -97825,7 +97825,7 @@ index 000000000000..c70dc3d05ebf +}; diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts new file mode 100755 -index 000000000000..0b7d9f75546e +index 0000000000000..0b7d9f75546ef --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts @@ -0,0 +1,205 @@ @@ -98036,7 +98036,7 @@ index 000000000000..0b7d9f75546e +}; diff --git a/arch/arm/boot/dts/overlays/mcp3202-overlay.dts b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts new file mode 100755 -index 000000000000..8e4e9f60f285 +index 0000000000000..8e4e9f60f285f --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts @@ -0,0 +1,205 @@ @@ -98247,7 +98247,7 @@ index 000000000000..8e4e9f60f285 +}; diff --git a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts new file mode 100644 -index 000000000000..7bbb528f804f +index 0000000000000..7bbb528f804f5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts @@ -0,0 +1,93 @@ @@ -98346,7 +98346,7 @@ index 000000000000..7bbb528f804f + diff --git a/arch/arm/boot/dts/overlays/media-center-overlay.dts b/arch/arm/boot/dts/overlays/media-center-overlay.dts new file mode 100644 -index 000000000000..0fcdcfa18eb3 +index 0000000000000..0fcdcfa18eb3b --- /dev/null +++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts @@ -0,0 +1,134 @@ @@ -98486,7 +98486,7 @@ index 000000000000..0fcdcfa18eb3 +}; diff --git a/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts new file mode 100644 -index 000000000000..565af7cf79d7 +index 0000000000000..565af7cf79d76 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts @@ -0,0 +1,36 @@ @@ -98528,7 +98528,7 @@ index 000000000000..565af7cf79d7 +}; diff --git a/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts new file mode 100644 -index 000000000000..e0bc410acbff +index 0000000000000..e0bc410acbff3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts @@ -0,0 +1,43 @@ @@ -98577,7 +98577,7 @@ index 000000000000..e0bc410acbff +}; diff --git a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts new file mode 100644 -index 000000000000..30d3d8549da0 +index 0000000000000..30d3d8549da0a --- /dev/null +++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts @@ -0,0 +1,74 @@ @@ -98657,7 +98657,7 @@ index 000000000000..30d3d8549da0 +}; diff --git a/arch/arm/boot/dts/overlays/mmc-overlay.dts b/arch/arm/boot/dts/overlays/mmc-overlay.dts new file mode 100644 -index 000000000000..c1a2f691aa1e +index 0000000000000..c1a2f691aa1e7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mmc-overlay.dts @@ -0,0 +1,46 @@ @@ -98709,7 +98709,7 @@ index 000000000000..c1a2f691aa1e +}; diff --git a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts new file mode 100644 -index 000000000000..3109d90562ae +index 0000000000000..3109d90562aee --- /dev/null +++ b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts @@ -0,0 +1,28 @@ @@ -98743,7 +98743,7 @@ index 000000000000..3109d90562ae +}; diff --git a/arch/arm/boot/dts/overlays/mz61581-overlay.dts b/arch/arm/boot/dts/overlays/mz61581-overlay.dts new file mode 100644 -index 000000000000..32686968c0d6 +index 0000000000000..32686968c0d65 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts @@ -0,0 +1,117 @@ @@ -98866,7 +98866,7 @@ index 000000000000..32686968c0d6 +}; diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts new file mode 100644 -index 000000000000..5266d4b8758d +index 0000000000000..5266d4b8758d3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts @@ -0,0 +1,99 @@ @@ -98971,7 +98971,7 @@ index 000000000000..5266d4b8758d +}; diff --git a/arch/arm/boot/dts/overlays/papirus-overlay.dts b/arch/arm/boot/dts/overlays/papirus-overlay.dts new file mode 100644 -index 000000000000..7b6bcfd49c86 +index 0000000000000..7b6bcfd49c86e --- /dev/null +++ b/arch/arm/boot/dts/overlays/papirus-overlay.dts @@ -0,0 +1,89 @@ @@ -99066,35 +99066,35 @@ index 000000000000..7b6bcfd49c86 +}; diff --git a/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts b/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts new file mode 100644 -index 000000000000..aedfc90e8a31 +index 0000000000000..aedfc90e8a31d --- /dev/null +++ b/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts @@ -0,0 +1 @@ +#include "act-led-overlay.dts" diff --git a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts new file mode 100644 -index 000000000000..e09a49295236 +index 0000000000000..e09a49295236b --- /dev/null +++ b/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts @@ -0,0 +1 @@ +#include "disable-bt-overlay.dts" diff --git a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts new file mode 100644 -index 000000000000..b61b69c14f37 +index 0000000000000..b61b69c14f37c --- /dev/null +++ b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts @@ -0,0 +1 @@ +#include "disable-wifi-overlay.dts" diff --git a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts new file mode 100644 -index 000000000000..94c14267716e +index 0000000000000..94c14267716eb --- /dev/null +++ b/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts @@ -0,0 +1 @@ +#include "miniuart-bt-overlay.dts" diff --git a/arch/arm/boot/dts/overlays/pibell-overlay.dts b/arch/arm/boot/dts/overlays/pibell-overlay.dts new file mode 100644 -index 000000000000..9333a9b09772 +index 0000000000000..9333a9b09772f --- /dev/null +++ b/arch/arm/boot/dts/overlays/pibell-overlay.dts @@ -0,0 +1,81 @@ @@ -99181,7 +99181,7 @@ index 000000000000..9333a9b09772 +}; diff --git a/arch/arm/boot/dts/overlays/piglow-overlay.dts b/arch/arm/boot/dts/overlays/piglow-overlay.dts new file mode 100644 -index 000000000000..075bceef158c +index 0000000000000..075bceef158c8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/piglow-overlay.dts @@ -0,0 +1,97 @@ @@ -99284,7 +99284,7 @@ index 000000000000..075bceef158c +}; diff --git a/arch/arm/boot/dts/overlays/piscreen-overlay.dts b/arch/arm/boot/dts/overlays/piscreen-overlay.dts new file mode 100644 -index 000000000000..ae1af76d3923 +index 0000000000000..ae1af76d3923f --- /dev/null +++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts @@ -0,0 +1,102 @@ @@ -99392,7 +99392,7 @@ index 000000000000..ae1af76d3923 +}; diff --git a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts new file mode 100644 -index 000000000000..93b85be3f7c1 +index 0000000000000..93b85be3f7c15 --- /dev/null +++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts @@ -0,0 +1,106 @@ @@ -99504,7 +99504,7 @@ index 000000000000..93b85be3f7c1 + diff --git a/arch/arm/boot/dts/overlays/pisound-overlay.dts b/arch/arm/boot/dts/overlays/pisound-overlay.dts new file mode 100644 -index 000000000000..49efb2b768fb +index 0000000000000..49efb2b768fbc --- /dev/null +++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts @@ -0,0 +1,120 @@ @@ -99630,7 +99630,7 @@ index 000000000000..49efb2b768fb +}; diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts new file mode 100644 -index 000000000000..589ad13795b1 +index 0000000000000..589ad13795b18 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts @@ -0,0 +1,69 @@ @@ -99705,7 +99705,7 @@ index 000000000000..589ad13795b1 +}; diff --git a/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts new file mode 100644 -index 000000000000..33901ee1db7a +index 0000000000000..33901ee1db7a7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts @@ -0,0 +1,91 @@ @@ -99802,7 +99802,7 @@ index 000000000000..33901ee1db7a +}; diff --git a/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts new file mode 100644 -index 000000000000..4a4a3f44c29d +index 0000000000000..4a4a3f44c29d5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts @@ -0,0 +1,119 @@ @@ -99927,7 +99927,7 @@ index 000000000000..4a4a3f44c29d +}; diff --git a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts new file mode 100644 -index 000000000000..a69b6c2c7608 +index 0000000000000..a69b6c2c76081 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts @@ -0,0 +1,119 @@ @@ -100052,7 +100052,7 @@ index 000000000000..a69b6c2c7608 +}; diff --git a/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts new file mode 100644 -index 000000000000..524a1c1d3670 +index 0000000000000..524a1c1d36700 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts @@ -0,0 +1,38 @@ @@ -100096,7 +100096,7 @@ index 000000000000..524a1c1d3670 +}; diff --git a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts new file mode 100644 -index 000000000000..abdeddd0f2c8 +index 0000000000000..abdeddd0f2c87 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts @@ -0,0 +1,47 @@ @@ -100149,7 +100149,7 @@ index 000000000000..abdeddd0f2c8 +}; diff --git a/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts new file mode 100644 -index 000000000000..119caf746b3b +index 0000000000000..119caf746b3b3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts @@ -0,0 +1,40 @@ @@ -100195,7 +100195,7 @@ index 000000000000..119caf746b3b +}; diff --git a/arch/arm/boot/dts/overlays/pwm-overlay.dts b/arch/arm/boot/dts/overlays/pwm-overlay.dts new file mode 100644 -index 000000000000..27809e8dc746 +index 0000000000000..27809e8dc7466 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-overlay.dts @@ -0,0 +1,43 @@ @@ -100244,7 +100244,7 @@ index 000000000000..27809e8dc746 +}; diff --git a/arch/arm/boot/dts/overlays/qca7000-overlay.dts b/arch/arm/boot/dts/overlays/qca7000-overlay.dts new file mode 100644 -index 000000000000..9a451202a2eb +index 0000000000000..9a451202a2eb7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/qca7000-overlay.dts @@ -0,0 +1,55 @@ @@ -100305,7 +100305,7 @@ index 000000000000..9a451202a2eb +}; diff --git a/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts new file mode 100644 -index 000000000000..ea1d952734e9 +index 0000000000000..ea1d952734e9f --- /dev/null +++ b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts @@ -0,0 +1,59 @@ @@ -100370,7 +100370,7 @@ index 000000000000..ea1d952734e9 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts new file mode 100644 -index 000000000000..cac5e44c6ec5 +index 0000000000000..cac5e44c6ec54 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts @@ -0,0 +1,21 @@ @@ -100397,7 +100397,7 @@ index 000000000000..cac5e44c6ec5 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts new file mode 100644 -index 000000000000..e2c25a0535e6 +index 0000000000000..e2c25a0535e68 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts @@ -0,0 +1,152 @@ @@ -100555,7 +100555,7 @@ index 000000000000..e2c25a0535e6 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts b/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts new file mode 100644 -index 000000000000..07a915342702 +index 0000000000000..07a915342702f --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts @@ -0,0 +1,34 @@ @@ -100595,7 +100595,7 @@ index 000000000000..07a915342702 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts new file mode 100644 -index 000000000000..a5eed07d6a4b +index 0000000000000..a5eed07d6a4b4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts @@ -0,0 +1,91 @@ @@ -100692,7 +100692,7 @@ index 000000000000..a5eed07d6a4b +}; diff --git a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts new file mode 100644 -index 000000000000..4dcb490f04b6 +index 0000000000000..4dcb490f04b6f --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts @@ -0,0 +1,25 @@ @@ -100723,7 +100723,7 @@ index 000000000000..4dcb490f04b6 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts new file mode 100644 -index 000000000000..21f8fe6f1229 +index 0000000000000..21f8fe6f12295 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts @@ -0,0 +1,70 @@ @@ -100799,7 +100799,7 @@ index 000000000000..21f8fe6f1229 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts b/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts new file mode 100644 -index 000000000000..9cda044a0f62 +index 0000000000000..9cda044a0f62a --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts @@ -0,0 +1,39 @@ @@ -100844,7 +100844,7 @@ index 000000000000..9cda044a0f62 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts new file mode 100644 -index 000000000000..89d8d2ea6b2e +index 0000000000000..89d8d2ea6b2e7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts @@ -0,0 +1,47 @@ @@ -100897,7 +100897,7 @@ index 000000000000..89d8d2ea6b2e +}; diff --git a/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts new file mode 100644 -index 000000000000..3c97a545d820 +index 0000000000000..3c97a545d8207 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts @@ -0,0 +1,34 @@ @@ -100937,7 +100937,7 @@ index 000000000000..3c97a545d820 +}; diff --git a/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts new file mode 100644 -index 000000000000..87e9a326eff1 +index 0000000000000..87e9a326eff1f --- /dev/null +++ b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts @@ -0,0 +1,49 @@ @@ -100992,7 +100992,7 @@ index 000000000000..87e9a326eff1 +}; diff --git a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts new file mode 100644 -index 000000000000..5fbff2e6c02d +index 0000000000000..5fbff2e6c02df --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts @@ -0,0 +1,38 @@ @@ -101036,7 +101036,7 @@ index 000000000000..5fbff2e6c02d +}; diff --git a/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts new file mode 100644 -index 000000000000..57ae35c38442 +index 0000000000000..57ae35c384425 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts @@ -0,0 +1,40 @@ @@ -101082,7 +101082,7 @@ index 000000000000..57ae35c38442 +}; diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts new file mode 100644 -index 000000000000..4e33b14afc78 +index 0000000000000..4e33b14afc784 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts @@ -0,0 +1,61 @@ @@ -101149,7 +101149,7 @@ index 000000000000..4e33b14afc78 +}; diff --git a/arch/arm/boot/dts/overlays/sdhost-overlay.dts b/arch/arm/boot/dts/overlays/sdhost-overlay.dts new file mode 100644 -index 000000000000..0b72b4eeac88 +index 0000000000000..0b72b4eeac887 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sdhost-overlay.dts @@ -0,0 +1,38 @@ @@ -101193,7 +101193,7 @@ index 000000000000..0b72b4eeac88 +}; diff --git a/arch/arm/boot/dts/overlays/sdio-overlay.dts b/arch/arm/boot/dts/overlays/sdio-overlay.dts new file mode 100644 -index 000000000000..873e49056379 +index 0000000000000..873e490563797 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sdio-overlay.dts @@ -0,0 +1,77 @@ @@ -101276,7 +101276,7 @@ index 000000000000..873e49056379 +}; diff --git a/arch/arm/boot/dts/overlays/sdtweak-overlay.dts b/arch/arm/boot/dts/overlays/sdtweak-overlay.dts new file mode 100644 -index 000000000000..38157d2f9bf3 +index 0000000000000..38157d2f9bf3b --- /dev/null +++ b/arch/arm/boot/dts/overlays/sdtweak-overlay.dts @@ -0,0 +1,25 @@ @@ -101307,7 +101307,7 @@ index 000000000000..38157d2f9bf3 +}; diff --git a/arch/arm/boot/dts/overlays/smi-dev-overlay.dts b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts new file mode 100644 -index 000000000000..b610d8283608 +index 0000000000000..b610d82836081 --- /dev/null +++ b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts @@ -0,0 +1,18 @@ @@ -101331,7 +101331,7 @@ index 000000000000..b610d8283608 +}; diff --git a/arch/arm/boot/dts/overlays/smi-nand-overlay.dts b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts new file mode 100644 -index 000000000000..ae1e50329d66 +index 0000000000000..ae1e50329d660 --- /dev/null +++ b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts @@ -0,0 +1,66 @@ @@ -101403,7 +101403,7 @@ index 000000000000..ae1e50329d66 +}; diff --git a/arch/arm/boot/dts/overlays/smi-overlay.dts b/arch/arm/boot/dts/overlays/smi-overlay.dts new file mode 100644 -index 000000000000..70104c11627c +index 0000000000000..70104c11627cf --- /dev/null +++ b/arch/arm/boot/dts/overlays/smi-overlay.dts @@ -0,0 +1,37 @@ @@ -101446,7 +101446,7 @@ index 000000000000..70104c11627c +}; diff --git a/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts new file mode 100644 -index 000000000000..a132b8637c31 +index 0000000000000..a132b8637c313 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts @@ -0,0 +1,31 @@ @@ -101483,7 +101483,7 @@ index 000000000000..a132b8637c31 +}; diff --git a/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts new file mode 100644 -index 000000000000..9ebcaf1b5ea0 +index 0000000000000..9ebcaf1b5ea07 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts @@ -0,0 +1,36 @@ @@ -101525,7 +101525,7 @@ index 000000000000..9ebcaf1b5ea0 +}; diff --git a/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts new file mode 100644 -index 000000000000..9664afc9845c +index 0000000000000..9664afc9845c9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts @@ -0,0 +1,33 @@ @@ -101564,7 +101564,7 @@ index 000000000000..9664afc9845c +}; diff --git a/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts new file mode 100644 -index 000000000000..ff41439a483a +index 0000000000000..ff41439a483af --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts @@ -0,0 +1,29 @@ @@ -101599,7 +101599,7 @@ index 000000000000..ff41439a483a +}; diff --git a/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts new file mode 100644 -index 000000000000..168a0dc80ad1 +index 0000000000000..168a0dc80ad1a --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts @@ -0,0 +1,26 @@ @@ -101631,7 +101631,7 @@ index 000000000000..168a0dc80ad1 +}; diff --git a/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts new file mode 100644 -index 000000000000..ea2794bc5fd5 +index 0000000000000..ea2794bc5fd5d --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts @@ -0,0 +1,57 @@ @@ -101694,7 +101694,7 @@ index 000000000000..ea2794bc5fd5 +}; diff --git a/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts new file mode 100644 -index 000000000000..dab34ee79ae2 +index 0000000000000..dab34ee79ae28 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts @@ -0,0 +1,69 @@ @@ -101769,7 +101769,7 @@ index 000000000000..dab34ee79ae2 +}; diff --git a/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts new file mode 100644 -index 000000000000..bc7e7d04324b +index 0000000000000..bc7e7d04324bd --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts @@ -0,0 +1,81 @@ @@ -101856,7 +101856,7 @@ index 000000000000..bc7e7d04324b +}; diff --git a/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts new file mode 100644 -index 000000000000..2a29750462af +index 0000000000000..2a29750462af8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts @@ -0,0 +1,57 @@ @@ -101919,7 +101919,7 @@ index 000000000000..2a29750462af +}; diff --git a/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts new file mode 100644 -index 000000000000..642678fc9ddd +index 0000000000000..642678fc9ddd5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts @@ -0,0 +1,69 @@ @@ -101994,7 +101994,7 @@ index 000000000000..642678fc9ddd +}; diff --git a/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts new file mode 100644 -index 000000000000..28d40c6c3c37 +index 0000000000000..28d40c6c3c379 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts @@ -0,0 +1,81 @@ @@ -102081,7 +102081,7 @@ index 000000000000..28d40c6c3c37 +}; diff --git a/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts new file mode 100644 -index 000000000000..335af8637051 +index 0000000000000..335af8637051b --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts @@ -0,0 +1,44 @@ @@ -102131,7 +102131,7 @@ index 000000000000..335af8637051 +}; diff --git a/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts new file mode 100644 -index 000000000000..ce65da27f767 +index 0000000000000..ce65da27f7670 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts @@ -0,0 +1,56 @@ @@ -102193,7 +102193,7 @@ index 000000000000..ce65da27f767 +}; diff --git a/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts new file mode 100644 -index 000000000000..85d70b40352b +index 0000000000000..85d70b40352b1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts @@ -0,0 +1,44 @@ @@ -102243,7 +102243,7 @@ index 000000000000..85d70b40352b +}; diff --git a/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts new file mode 100644 -index 000000000000..8bc2215a6a7e +index 0000000000000..8bc2215a6a7e9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts @@ -0,0 +1,56 @@ @@ -102305,7 +102305,7 @@ index 000000000000..8bc2215a6a7e +}; diff --git a/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts new file mode 100644 -index 000000000000..c0f8cb8510ee +index 0000000000000..c0f8cb8510eee --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts @@ -0,0 +1,44 @@ @@ -102355,7 +102355,7 @@ index 000000000000..c0f8cb8510ee +}; diff --git a/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts new file mode 100644 -index 000000000000..7758b9c00b4e +index 0000000000000..7758b9c00b4e9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts @@ -0,0 +1,56 @@ @@ -102417,7 +102417,7 @@ index 000000000000..7758b9c00b4e +}; diff --git a/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts new file mode 100644 -index 000000000000..8c8a953eca01 +index 0000000000000..8c8a953eca01f --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts @@ -0,0 +1,44 @@ @@ -102467,7 +102467,7 @@ index 000000000000..8c8a953eca01 +}; diff --git a/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts new file mode 100644 -index 000000000000..2ff897f21aed +index 0000000000000..2ff897f21aedb --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts @@ -0,0 +1,56 @@ @@ -102529,7 +102529,7 @@ index 000000000000..2ff897f21aed +}; diff --git a/arch/arm/boot/dts/overlays/ssd1306-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts new file mode 100644 -index 000000000000..84cf10e489d3 +index 0000000000000..84cf10e489d3c --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts @@ -0,0 +1,36 @@ @@ -102571,7 +102571,7 @@ index 000000000000..84cf10e489d3 +}; diff --git a/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts new file mode 100755 -index 000000000000..bad61535981e +index 0000000000000..bad61535981e9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts @@ -0,0 +1,73 @@ @@ -102650,7 +102650,7 @@ index 000000000000..bad61535981e +}; diff --git a/arch/arm/boot/dts/overlays/sx150x-overlay.dts b/arch/arm/boot/dts/overlays/sx150x-overlay.dts new file mode 100644 -index 000000000000..1d1069345da2 +index 0000000000000..1d1069345da21 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sx150x-overlay.dts @@ -0,0 +1,1706 @@ @@ -104362,7 +104362,7 @@ index 000000000000..1d1069345da2 + diff --git a/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts new file mode 100644 -index 000000000000..047695bb0c71 +index 0000000000000..047695bb0c715 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts @@ -0,0 +1,52 @@ @@ -104420,7 +104420,7 @@ index 000000000000..047695bb0c71 +}; diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts new file mode 100644 -index 000000000000..2a1a3a80de49 +index 0000000000000..2a1a3a80de493 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts @@ -0,0 +1,116 @@ @@ -104542,7 +104542,7 @@ index 000000000000..2a1a3a80de49 +}; diff --git a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts new file mode 100644 -index 000000000000..254ac2e0a214 +index 0000000000000..254ac2e0a2144 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts @@ -0,0 +1,222 @@ @@ -104770,7 +104770,7 @@ index 000000000000..254ac2e0a214 +}; diff --git a/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts new file mode 100644 -index 000000000000..e69188503ca3 +index 0000000000000..e69188503ca33 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts @@ -0,0 +1,44 @@ @@ -104820,7 +104820,7 @@ index 000000000000..e69188503ca3 +}; diff --git a/arch/arm/boot/dts/overlays/uart0-overlay.dts b/arch/arm/boot/dts/overlays/uart0-overlay.dts new file mode 100755 -index 000000000000..57ba7745d023 +index 0000000000000..57ba7745d0233 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart0-overlay.dts @@ -0,0 +1,33 @@ @@ -104859,7 +104859,7 @@ index 000000000000..57ba7745d023 +}; diff --git a/arch/arm/boot/dts/overlays/uart1-overlay.dts b/arch/arm/boot/dts/overlays/uart1-overlay.dts new file mode 100644 -index 000000000000..986d725a2652 +index 0000000000000..986d725a26529 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart1-overlay.dts @@ -0,0 +1,38 @@ @@ -104903,7 +104903,7 @@ index 000000000000..986d725a2652 +}; diff --git a/arch/arm/boot/dts/overlays/uart2-overlay.dts b/arch/arm/boot/dts/overlays/uart2-overlay.dts new file mode 100644 -index 000000000000..9face240aca1 +index 0000000000000..9face240aca1f --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart2-overlay.dts @@ -0,0 +1,27 @@ @@ -104936,7 +104936,7 @@ index 000000000000..9face240aca1 +}; diff --git a/arch/arm/boot/dts/overlays/uart3-overlay.dts b/arch/arm/boot/dts/overlays/uart3-overlay.dts new file mode 100644 -index 000000000000..ae9f9fe5ea1d +index 0000000000000..ae9f9fe5ea1db --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart3-overlay.dts @@ -0,0 +1,27 @@ @@ -104969,7 +104969,7 @@ index 000000000000..ae9f9fe5ea1d +}; diff --git a/arch/arm/boot/dts/overlays/uart4-overlay.dts b/arch/arm/boot/dts/overlays/uart4-overlay.dts new file mode 100644 -index 000000000000..ac004ffbadbf +index 0000000000000..ac004ffbadbf8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart4-overlay.dts @@ -0,0 +1,27 @@ @@ -105002,7 +105002,7 @@ index 000000000000..ac004ffbadbf +}; diff --git a/arch/arm/boot/dts/overlays/uart5-overlay.dts b/arch/arm/boot/dts/overlays/uart5-overlay.dts new file mode 100644 -index 000000000000..04eaf376effe +index 0000000000000..04eaf376effe6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart5-overlay.dts @@ -0,0 +1,27 @@ @@ -105035,7 +105035,7 @@ index 000000000000..04eaf376effe +}; diff --git a/arch/arm/boot/dts/overlays/udrc-overlay.dts b/arch/arm/boot/dts/overlays/udrc-overlay.dts new file mode 100644 -index 000000000000..ae7c37996894 +index 0000000000000..ae7c37996894a --- /dev/null +++ b/arch/arm/boot/dts/overlays/udrc-overlay.dts @@ -0,0 +1,128 @@ @@ -105169,7 +105169,7 @@ index 000000000000..ae7c37996894 +}; diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts new file mode 100644 -index 000000000000..6112640837fc +index 0000000000000..6112640837fc0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts @@ -0,0 +1,131 @@ @@ -105306,7 +105306,7 @@ index 000000000000..6112640837fc +}; diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts new file mode 100644 -index 000000000000..d9af97c8414f +index 0000000000000..d9af97c8414f0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts @@ -0,0 +1,81 @@ @@ -105393,7 +105393,7 @@ index 000000000000..d9af97c8414f +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts new file mode 100644 -index 000000000000..b03394844abd +index 0000000000000..b03394844abd9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts @@ -0,0 +1,43 @@ @@ -105442,7 +105442,7 @@ index 000000000000..b03394844abd +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts new file mode 100644 -index 000000000000..c5f687e8bcb9 +index 0000000000000..c5f687e8bcb9a --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts @@ -0,0 +1,152 @@ @@ -105600,7 +105600,7 @@ index 000000000000..c5f687e8bcb9 +}; diff --git a/arch/arm/boot/dts/overlays/vga666-overlay.dts b/arch/arm/boot/dts/overlays/vga666-overlay.dts new file mode 100644 -index 000000000000..a4968d180a5d +index 0000000000000..a4968d180a5d0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vga666-overlay.dts @@ -0,0 +1,30 @@ @@ -105636,7 +105636,7 @@ index 000000000000..a4968d180a5d +}; diff --git a/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts new file mode 100644 -index 000000000000..f44e325bc1f2 +index 0000000000000..f44e325bc1f2e --- /dev/null +++ b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts @@ -0,0 +1,40 @@ @@ -105682,7 +105682,7 @@ index 000000000000..f44e325bc1f2 +}; diff --git a/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts new file mode 100644 -index 000000000000..953c6a1aeab9 +index 0000000000000..953c6a1aeab97 --- /dev/null +++ b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts @@ -0,0 +1,42 @@ @@ -105730,7 +105730,7 @@ index 000000000000..953c6a1aeab9 +}; diff --git a/arch/arm/boot/dts/overlays/w5500-overlay.dts b/arch/arm/boot/dts/overlays/w5500-overlay.dts new file mode 100644 -index 000000000000..4d3e66296753 +index 0000000000000..4d3e662967530 --- /dev/null +++ b/arch/arm/boot/dts/overlays/w5500-overlay.dts @@ -0,0 +1,63 @@ @@ -105799,7 +105799,7 @@ index 000000000000..4d3e66296753 +}; diff --git a/arch/arm/boot/dts/overlays/wittypi-overlay.dts b/arch/arm/boot/dts/overlays/wittypi-overlay.dts new file mode 100644 -index 000000000000..71ce806186de +index 0000000000000..71ce806186deb --- /dev/null +++ b/arch/arm/boot/dts/overlays/wittypi-overlay.dts @@ -0,0 +1,44 @@ @@ -105848,7 +105848,7 @@ index 000000000000..71ce806186de + +}; diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile -index f19b762c008d..fb5542a7a124 100644 +index f19b762c008d8..fb5542a7a124e 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -28,3 +28,5 @@ subdir-y += synaptics @@ -105858,7 +105858,7 @@ index f19b762c008d..fb5542a7a124 100644 + +subdir-y += overlays diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index d1d31ccad758..1004a9fb8bf4 100644 +index d1d31ccad758f..1004a9fb8bf45 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -3,6 +3,17 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-a-plus.dtb \ @@ -105881,7 +105881,7 @@ index d1d31ccad758..1004a9fb8bf4 100644 +endif diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts new file mode 100644 -index 000000000000..d9242ff77079 +index 0000000000000..d9242ff77079c --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts @@ -0,0 +1,3 @@ @@ -105890,7 +105890,7 @@ index 000000000000..d9242ff77079 +#include "../../../../arm/boot/dts/bcm2710-rpi-3-b-plus.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts new file mode 100644 -index 000000000000..deb33441da95 +index 0000000000000..deb33441da952 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts @@ -0,0 +1,3 @@ @@ -105899,7 +105899,7 @@ index 000000000000..deb33441da95 +#include "../../../../arm/boot/dts/bcm2710-rpi-3-b.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts new file mode 100644 -index 000000000000..1c2560017c02 +index 0000000000000..1c2560017c02f --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts @@ -0,0 +1,3 @@ @@ -105908,7 +105908,7 @@ index 000000000000..1c2560017c02 +#include "../../../../arm/boot/dts/bcm2710-rpi-cm3.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts new file mode 100644 -index 000000000000..1fd86f81f542 +index 0000000000000..1fd86f81f5426 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts @@ -0,0 +1,3 @@ @@ -105917,7 +105917,7 @@ index 000000000000..1fd86f81f542 +#include "../../../../arm/boot/dts/bcm2711-rpi-4-b.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi new file mode 120000 -index 000000000000..e5c400284467 +index 0000000000000..e5c400284467a --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi @@ -0,0 +1 @@ @@ -105925,7 +105925,7 @@ index 000000000000..e5c400284467 \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi new file mode 120000 -index 000000000000..fc4c05bbe7fd +index 0000000000000..fc4c05bbe7fd5 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi @@ -0,0 +1 @@ @@ -105933,14 +105933,14 @@ index 000000000000..fc4c05bbe7fd \ No newline at end of file diff --git a/arch/arm64/boot/dts/overlays b/arch/arm64/boot/dts/overlays new file mode 120000 -index 000000000000..ded08646b6f6 +index 0000000000000..ded08646b6f66 --- /dev/null +++ b/arch/arm64/boot/dts/overlays @@ -0,0 +1 @@ +../../../arm/boot/dts/overlays \ No newline at end of file diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst -index 7301ab5e2e06..da2af04a6d7d 100644 +index 7301ab5e2e066..da2af04a6d7da 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -20,6 +20,7 @@ include scripts/Kbuild.include @@ -105968,7 +105968,7 @@ index 7301ab5e2e06..da2af04a6d7d 100644 .PHONY: $(PHONY) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index a6d0044328b1..bdec9e50358d 100644 +index a6d0044328b1f..bdec9e50358db 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -240,6 +240,7 @@ DTC ?= $(objtree)/scripts/dtc/dtc @@ -106002,10 +106002,10 @@ index a6d0044328b1..bdec9e50358d 100644 2.18.4 -From 91997a0c3cd579ab35c2c76143eab353d4504675 Mon Sep 17 00:00:00 2001 +From c2af14c41b2e14d19649b44516b249fefa136a27 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Feb 2015 13:50:57 +0000 -Subject: [PATCH 0054/1216] BCM270x_DT: Add pwr_led, and the required "input" +Subject: [PATCH 0054/1224] BCM270x_DT: Add pwr_led, and the required "input" trigger The "input" trigger makes the associated GPIO an input. This is to support @@ -106035,7 +106035,7 @@ See: https://github.com/raspberrypi/linux/issues/1064 create mode 100644 drivers/leds/trigger/ledtrig-input.c diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c -index 2bf74595610f..b95530703166 100644 +index 2bf74595610f5..b95530703166e 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -46,8 +46,15 @@ static void gpio_led_set(struct led_classdev *led_cdev, @@ -106078,7 +106078,7 @@ index 2bf74595610f..b95530703166 100644 state = gpiod_get_value_cansleep(led_dat->gpiod); if (state < 0) diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig -index ce9429ca6dde..03e3f1c267dd 100644 +index ce9429ca6ddea..03e3f1c267dd7 100644 --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig @@ -114,6 +114,13 @@ config LEDS_TRIGGER_CAMERA @@ -106096,7 +106096,7 @@ index ce9429ca6dde..03e3f1c267dd 100644 bool "LED Panic Trigger" help diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile -index 733a83e2a718..f2d085c67233 100644 +index 733a83e2a7183..f2d085c672333 100644 --- a/drivers/leds/trigger/Makefile +++ b/drivers/leds/trigger/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_LEDS_TRIGGER_ACTIVITY) += ledtrig-activity.o @@ -106109,7 +106109,7 @@ index 733a83e2a718..f2d085c67233 100644 obj-$(CONFIG_LEDS_TRIGGER_PATTERN) += ledtrig-pattern.o diff --git a/drivers/leds/trigger/ledtrig-input.c b/drivers/leds/trigger/ledtrig-input.c new file mode 100644 -index 000000000000..8a974a355656 +index 0000000000000..8a974a3556564 --- /dev/null +++ b/drivers/leds/trigger/ledtrig-input.c @@ -0,0 +1,55 @@ @@ -106169,7 +106169,7 @@ index 000000000000..8a974a355656 +MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\""); +MODULE_LICENSE("GPL"); diff --git a/include/linux/leds.h b/include/linux/leds.h -index efb309dba914..f94aa00431fb 100644 +index efb309dba914a..f94aa00431fb6 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -73,6 +73,9 @@ struct led_classdev { @@ -106186,17 +106186,17 @@ index efb309dba914..f94aa00431fb 100644 2.18.4 -From fbd64ba8170eb3614bb436e094db8d3416e1f48f Mon Sep 17 00:00:00 2001 +From f001f9b1ec8956125ba0b77b53451d61289c31b9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 3 Jul 2013 00:54:08 +0100 -Subject: [PATCH 0055/1216] Added Device IDs for August DVB-T 205 +Subject: [PATCH 0055/1224] Added Device IDs for August DVB-T 205 --- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -index 1a36bda28542..9b1cb1908782 100644 +index 1a36bda285421..9b1cb1908782a 100644 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c @@ -1938,6 +1938,10 @@ static const struct usb_device_id rtl28xxu_id_table[] = { @@ -106214,10 +106214,10 @@ index 1a36bda28542..9b1cb1908782 100644 2.18.4 -From 49ea2753e148a2f65452e77b0bf6d6fea34fc3cb Mon Sep 17 00:00:00 2001 +From 6d90271f1a494026c7f5ed7c583f41e5f3084356 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 28 Nov 2016 16:50:04 +0000 -Subject: [PATCH 0056/1216] Improve __copy_to_user and __copy_from_user +Subject: [PATCH 0056/1224] Improve __copy_to_user and __copy_from_user performance Provide a __copy_from_user that uses memcpy. On BCM2708, use @@ -106259,7 +106259,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm/lib/memset_rpi.S diff --git a/arch/arm/include/asm/string.h b/arch/arm/include/asm/string.h -index 111a1d8a41dd..867a4465cebf 100644 +index 111a1d8a41ddf..867a4465cebf9 100644 --- a/arch/arm/include/asm/string.h +++ b/arch/arm/include/asm/string.h @@ -39,4 +39,9 @@ static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n) @@ -106273,7 +106273,7 @@ index 111a1d8a41dd..867a4465cebf 100644 + #endif diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h -index 98c6b91be4a8..399a25396ca9 100644 +index 98c6b91be4a8a..399a25396ca96 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -512,6 +512,9 @@ do { \ @@ -106287,7 +106287,7 @@ index 98c6b91be4a8..399a25396ca9 100644 raw_copy_from_user(void *to, const void __user *from, unsigned long n) { diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile -index 6d2ba454f25b..8271cde92dec 100644 +index 6d2ba454f25b6..8271cde92dec7 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -7,8 +7,8 @@ @@ -106320,7 +106320,7 @@ index 6d2ba454f25b..8271cde92dec 100644 diff --git a/arch/arm/lib/arm-mem.h b/arch/arm/lib/arm-mem.h new file mode 100644 -index 000000000000..5d4bda19ad20 +index 0000000000000..5d4bda19ad207 --- /dev/null +++ b/arch/arm/lib/arm-mem.h @@ -0,0 +1,159 @@ @@ -106484,7 +106484,7 @@ index 000000000000..5d4bda19ad20 +92: +.endm diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S -index f8016e3db65d..ab7bf28dbec0 100644 +index f8016e3db65d7..ab7bf28dbec08 100644 --- a/arch/arm/lib/copy_from_user.S +++ b/arch/arm/lib/copy_from_user.S @@ -107,7 +107,8 @@ @@ -106507,7 +106507,7 @@ index f8016e3db65d..ab7bf28dbec0 100644 .align 0 diff --git a/arch/arm/lib/exports_rpi.c b/arch/arm/lib/exports_rpi.c new file mode 100644 -index 000000000000..1f826047db75 +index 0000000000000..1f826047db754 --- /dev/null +++ b/arch/arm/lib/exports_rpi.c @@ -0,0 +1,37 @@ @@ -106550,7 +106550,7 @@ index 000000000000..1f826047db75 +EXPORT_SYMBOL(memcmp); diff --git a/arch/arm/lib/memcmp_rpi.S b/arch/arm/lib/memcmp_rpi.S new file mode 100644 -index 000000000000..bf6e4edfc9d3 +index 0000000000000..bf6e4edfc9d3b --- /dev/null +++ b/arch/arm/lib/memcmp_rpi.S @@ -0,0 +1,285 @@ @@ -106841,7 +106841,7 @@ index 000000000000..bf6e4edfc9d3 +ENDPROC(memcmp) diff --git a/arch/arm/lib/memcpy_rpi.S b/arch/arm/lib/memcpy_rpi.S new file mode 100644 -index 000000000000..30f8a9089a83 +index 0000000000000..30f8a9089a835 --- /dev/null +++ b/arch/arm/lib/memcpy_rpi.S @@ -0,0 +1,61 @@ @@ -106908,7 +106908,7 @@ index 000000000000..30f8a9089a83 +ENDPROC(mmiocpy) diff --git a/arch/arm/lib/memcpymove.h b/arch/arm/lib/memcpymove.h new file mode 100644 -index 000000000000..d8be5849c860 +index 0000000000000..d8be5849c8609 --- /dev/null +++ b/arch/arm/lib/memcpymove.h @@ -0,0 +1,506 @@ @@ -107420,7 +107420,7 @@ index 000000000000..d8be5849c860 +.endm diff --git a/arch/arm/lib/memmove_rpi.S b/arch/arm/lib/memmove_rpi.S new file mode 100644 -index 000000000000..8b0760c0904c +index 0000000000000..8b0760c0904c5 --- /dev/null +++ b/arch/arm/lib/memmove_rpi.S @@ -0,0 +1,61 @@ @@ -107487,7 +107487,7 @@ index 000000000000..8b0760c0904c +ENDPROC(memmove) diff --git a/arch/arm/lib/memset_rpi.S b/arch/arm/lib/memset_rpi.S new file mode 100644 -index 000000000000..e8469cecabc1 +index 0000000000000..e8469cecabc15 --- /dev/null +++ b/arch/arm/lib/memset_rpi.S @@ -0,0 +1,128 @@ @@ -107620,7 +107620,7 @@ index 000000000000..e8469cecabc1 +ENDPROC(memset) +ENDPROC(mmioset) diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c -index c9450982a155..296c2985ac17 100644 +index c9450982a1558..296c2985ac176 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -19,6 +19,14 @@ @@ -107779,7 +107779,7 @@ index c9450982a155..296c2985ac17 100644 static unsigned long noinline __clear_user_memset(void __user *addr, unsigned long n) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig -index 34fb06d1b477..5742092f8c09 100644 +index 34fb06d1b477c..5742092f8c09e 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -188,6 +188,13 @@ config ARCH_BCM_53573 @@ -107800,10 +107800,10 @@ index 34fb06d1b477..5742092f8c09 100644 2.18.4 -From 517cf4a6de7d7a978edefdb4c41ce784f7751e1b Mon Sep 17 00:00:00 2001 +From 03a31792dda7b1ddb7089d35704652cb89c2cbb9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 25 Jun 2015 12:16:11 +0100 -Subject: [PATCH 0057/1216] gpio-poweroff: Allow it to work on Raspberry Pi +Subject: [PATCH 0057/1224] 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 @@ -107821,7 +107821,7 @@ of the trigger signal may be preferable. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c -index 6a4bbb506551..beb1df358c8d 100644 +index 6a4bbb5065510..beb1df358c8da 100644 --- a/drivers/power/reset/gpio-poweroff.c +++ b/drivers/power/reset/gpio-poweroff.c @@ -50,9 +50,11 @@ static int gpio_poweroff_probe(struct platform_device *pdev) @@ -107841,10 +107841,10 @@ index 6a4bbb506551..beb1df358c8d 100644 2.18.4 -From 230fe58031422bec2ae812e905b65a8423f01922 Mon Sep 17 00:00:00 2001 +From e27a33b24eaa13ae60e291c91724c3f0687ecf54 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 14:32:47 +0100 -Subject: [PATCH 0058/1216] mfd: Add Raspberry Pi Sense HAT core driver +Subject: [PATCH 0058/1224] mfd: Add Raspberry Pi Sense HAT core driver mfd: Add rpi_sense_core of compatible string --- @@ -107869,7 +107869,7 @@ mfd: Add rpi_sense_core of compatible string create mode 100644 include/linux/mfd/rpisense/joystick.h diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig -index 312b854b5506..e624320c5d9e 100644 +index 312b854b5506f..e624320c5d9e9 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -372,4 +372,12 @@ config JOYSTICK_FSIA6B @@ -107886,7 +107886,7 @@ index 312b854b5506..e624320c5d9e 100644 + endif diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile -index 8656023f6ef5..9b99c2530929 100644 +index 8656023f6ef53..9b99c25309299 100644 --- a/drivers/input/joystick/Makefile +++ b/drivers/input/joystick/Makefile @@ -36,4 +36,4 @@ obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o @@ -107897,7 +107897,7 @@ index 8656023f6ef5..9b99c2530929 100644 +obj-$(CONFIG_JOYSTICK_RPISENSE) += rpisense-js.o diff --git a/drivers/input/joystick/rpisense-js.c b/drivers/input/joystick/rpisense-js.c new file mode 100644 -index 000000000000..6a416769065d +index 0000000000000..6a416769065d2 --- /dev/null +++ b/drivers/input/joystick/rpisense-js.c @@ -0,0 +1,153 @@ @@ -108055,7 +108055,7 @@ index 000000000000..6a416769065d +MODULE_AUTHOR("Serge Schneider "); +MODULE_LICENSE("GPL"); diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index 43169f25da1f..136f27b4733d 100644 +index 43169f25da1fd..136f27b4733de 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -11,6 +11,14 @@ config MFD_CORE @@ -108074,7 +108074,7 @@ index 43169f25da1f..136f27b4733d 100644 tristate "AMD CS5535 and CS5536 southbridge core functions" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index c1067ea46204..3ea14d217f26 100644 +index c1067ea462046..3ea14d217f269 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -255,4 +255,5 @@ obj-$(CONFIG_RAVE_SP_CORE) += rave-sp.o @@ -108085,7 +108085,7 @@ index c1067ea46204..3ea14d217f26 100644 diff --git a/drivers/mfd/rpisense-core.c b/drivers/mfd/rpisense-core.c new file mode 100644 -index 000000000000..6cfd63e5e8b8 +index 0000000000000..6cfd63e5e8b8d --- /dev/null +++ b/drivers/mfd/rpisense-core.c @@ -0,0 +1,165 @@ @@ -108255,7 +108255,7 @@ index 000000000000..6cfd63e5e8b8 +MODULE_LICENSE("GPL"); + diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig -index a03d32346642..11af544231a6 100644 +index a03d32346642d..11af544231a6b 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2277,6 +2277,19 @@ config FB_SM712 @@ -108279,7 +108279,7 @@ index a03d32346642..11af544231a6 100644 source "drivers/video/fbdev/omap2/Kconfig" source "drivers/video/fbdev/mmp/Kconfig" diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile -index 9f4d79be632b..8d406d031c35 100644 +index 9f4d79be632bb..8d406d031c35e 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -132,6 +132,7 @@ obj-$(CONFIG_FB_MX3) += mx3fb.o @@ -108292,7 +108292,7 @@ index 9f4d79be632b..8d406d031c35 100644 obj-$(CONFIG_FB_VIRTUAL) += vfb.o diff --git a/drivers/video/fbdev/rpisense-fb.c b/drivers/video/fbdev/rpisense-fb.c new file mode 100644 -index 000000000000..26432a5a0b4b +index 0000000000000..26432a5a0b4b4 --- /dev/null +++ b/drivers/video/fbdev/rpisense-fb.c @@ -0,0 +1,293 @@ @@ -108591,7 +108591,7 @@ index 000000000000..26432a5a0b4b + diff --git a/include/linux/mfd/rpisense/core.h b/include/linux/mfd/rpisense/core.h new file mode 100644 -index 000000000000..4856aa3c8b06 +index 0000000000000..4856aa3c8b066 --- /dev/null +++ b/include/linux/mfd/rpisense/core.h @@ -0,0 +1,47 @@ @@ -108644,7 +108644,7 @@ index 000000000000..4856aa3c8b06 +#endif diff --git a/include/linux/mfd/rpisense/framebuffer.h b/include/linux/mfd/rpisense/framebuffer.h new file mode 100644 -index 000000000000..2ba95d7eebaf +index 0000000000000..2ba95d7eebaf9 --- /dev/null +++ b/include/linux/mfd/rpisense/framebuffer.h @@ -0,0 +1,32 @@ @@ -108682,7 +108682,7 @@ index 000000000000..2ba95d7eebaf +#endif diff --git a/include/linux/mfd/rpisense/joystick.h b/include/linux/mfd/rpisense/joystick.h new file mode 100644 -index 000000000000..56196dc2af10 +index 0000000000000..56196dc2af10e --- /dev/null +++ b/include/linux/mfd/rpisense/joystick.h @@ -0,0 +1,35 @@ @@ -108725,10 +108725,10 @@ index 000000000000..56196dc2af10 2.18.4 -From 8717b8b134c3ca878408573df383614dad20270c Mon Sep 17 00:00:00 2001 +From 891961905f8d4a8f7e6c54c9f7ca492820c62dc4 Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Mon, 25 Jan 2016 15:48:59 +0000 -Subject: [PATCH 0059/1216] ASoC: Add support for Rpi-DAC +Subject: [PATCH 0059/1224] ASoC: Add support for Rpi-DAC --- sound/soc/codecs/Kconfig | 5 +++ @@ -108738,7 +108738,7 @@ Subject: [PATCH 0059/1216] ASoC: Add support for Rpi-DAC create mode 100644 sound/soc/codecs/pcm1794a.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 080a2cec3fa8..e4ab7e7b4073 100644 +index 080a2cec3fa81..e4ab7e7b40735 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -134,6 +134,7 @@ config SND_SOC_ALL_CODECS @@ -108761,7 +108761,7 @@ index 080a2cec3fa8..e4ab7e7b4073 100644 tristate "Realtek ALC5631/RT5631 CODEC" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index c498373dcc5f..3c40ea93d2ee 100644 +index c498373dcc5f6..3c40ea93d2eeb 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -134,6 +134,7 @@ snd-soc-pcm179x-spi-objs := pcm179x-spi.o @@ -108782,7 +108782,7 @@ index c498373dcc5f..3c40ea93d2ee 100644 obj-$(CONFIG_SND_SOC_RT1011) += snd-soc-rt1011.o diff --git a/sound/soc/codecs/pcm1794a.c b/sound/soc/codecs/pcm1794a.c new file mode 100644 -index 000000000000..36b5b6c26655 +index 0000000000000..36b5b6c26655a --- /dev/null +++ b/sound/soc/codecs/pcm1794a.c @@ -0,0 +1,69 @@ @@ -108859,10 +108859,10 @@ index 000000000000..36b5b6c26655 2.18.4 -From 1b7b25b3379821d96ba9df790f12dbbafb483ae3 Mon Sep 17 00:00:00 2001 +From 3fd9b49ba49baf4f45c4d643303c50101e462d36 Mon Sep 17 00:00:00 2001 From: Gordon Garrity Date: Sat, 8 Mar 2014 16:56:57 +0000 -Subject: [PATCH 0060/1216] Add IQaudIO Sound Card support for Raspberry Pi +Subject: [PATCH 0060/1224] Add IQaudIO Sound Card support for Raspberry Pi Set a limit of 0dB on Digital Volume Control @@ -108933,7 +108933,7 @@ Signed-off-by: Matthias Reichl diff --git a/sound/soc/bcm/iqaudio-dac.c b/sound/soc/bcm/iqaudio-dac.c new file mode 100644 -index 000000000000..b98232038616 +index 0000000000000..b982320386164 --- /dev/null +++ b/sound/soc/bcm/iqaudio-dac.c @@ -0,0 +1,223 @@ @@ -109164,10 +109164,10 @@ index 000000000000..b98232038616 2.18.4 -From 25bcee76439769d7fde35e3eecfc4010de6524d4 Mon Sep 17 00:00:00 2001 +From 14d381e9949214d0feea528bcf8356bad21654d4 Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Mon, 4 Aug 2014 10:06:56 +0200 -Subject: [PATCH 0061/1216] Added support for HiFiBerry DAC+ +Subject: [PATCH 0061/1224] 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. @@ -109241,7 +109241,7 @@ Signed-off-by: Hui Wang create mode 100644 sound/soc/bcm/hifiberry_dacplus.c diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index c44247d0b83e..98426fa4e1f9 100644 +index c44247d0b83e8..98426fa4e1f92 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -70,6 +70,9 @@ config COMMON_CLK_HI655X @@ -109255,7 +109255,7 @@ index c44247d0b83e..98426fa4e1f9 100644 tristate "Clock driver controlled via SCMI interface" depends on ARM_SCMI_PROTOCOL || COMPILE_TEST diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index 0138fb14e6f8..28ca4781d002 100644 +index 0138fb14e6f88..28ca4781d002d 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_MACH_ASPEED_G6) += clk-ast2600.o @@ -109268,7 +109268,7 @@ index 0138fb14e6f8..28ca4781d002 100644 obj-$(CONFIG_ARCH_MILBEAUT_M10V) += clk-milbeaut.o diff --git a/drivers/clk/clk-hifiberry-dacpro.c b/drivers/clk/clk-hifiberry-dacpro.c new file mode 100644 -index 000000000000..9e2634465823 +index 0000000000000..9e26344658236 --- /dev/null +++ b/drivers/clk/clk-hifiberry-dacpro.c @@ -0,0 +1,160 @@ @@ -109434,7 +109434,7 @@ index 000000000000..9e2634465823 +MODULE_ALIAS("platform:clk-hifiberry-dacpro"); diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c new file mode 100644 -index 000000000000..fdf6e950abd8 +index 0000000000000..fdf6e950abd8c --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplus.c @@ -0,0 +1,352 @@ @@ -109794,10 +109794,10 @@ index 000000000000..fdf6e950abd8 2.18.4 -From 4646e3396900680d5391870cc8f578ee76a6bc77 Mon Sep 17 00:00:00 2001 +From eeaaeefce46c21db1b3756785519bfd1aeca8d74 Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Mon, 4 Aug 2014 11:09:58 +0200 -Subject: [PATCH 0062/1216] Added driver for HiFiBerry Amp amplifier add-on +Subject: [PATCH 0062/1224] Added driver for HiFiBerry Amp amplifier add-on board The driver contains a low-level hardware driver for the TAS5713 and the @@ -109823,7 +109823,7 @@ Some code to load the driver based on device-tree-overlays was missing. This is create mode 100644 sound/soc/codecs/tas5713.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index e4ab7e7b4073..26f2b5b3e968 100644 +index e4ab7e7b40735..26f2b5b3e9682 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -188,6 +188,7 @@ config SND_SOC_ALL_CODECS @@ -109845,7 +109845,7 @@ index e4ab7e7b4073..26f2b5b3e968 100644 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index 3c40ea93d2ee..2cc8bf2c12f6 100644 +index 3c40ea93d2eeb..2cc8bf2c12f67 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -198,6 +198,7 @@ snd-soc-tas5720-objs := tas5720.o @@ -109866,7 +109866,7 @@ index 3c40ea93d2ee..2cc8bf2c12f6 100644 obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI) += snd-soc-tlv320aic23-spi.o diff --git a/sound/soc/codecs/tas5713.c b/sound/soc/codecs/tas5713.c new file mode 100644 -index 000000000000..9c1c92e57bbf +index 0000000000000..9c1c92e57bbfa --- /dev/null +++ b/sound/soc/codecs/tas5713.c @@ -0,0 +1,366 @@ @@ -110238,7 +110238,7 @@ index 000000000000..9c1c92e57bbf +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/tas5713.h b/sound/soc/codecs/tas5713.h new file mode 100644 -index 000000000000..8f019e048987 +index 0000000000000..8f019e0489875 --- /dev/null +++ b/sound/soc/codecs/tas5713.h @@ -0,0 +1,210 @@ @@ -110456,10 +110456,10 @@ index 000000000000..8f019e048987 2.18.4 -From bed85b1608b9bb5d7558c3e8bf80ce77b109643c Mon Sep 17 00:00:00 2001 +From 4c62b1060e4e1d09adcd9e13b9fbc7dd7fed933e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 25 Mar 2015 09:26:17 +0100 -Subject: [PATCH 0063/1216] Add driver for rpi-proto +Subject: [PATCH 0063/1224] 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 @@ -110482,7 +110482,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/rpi-proto.c b/sound/soc/bcm/rpi-proto.c new file mode 100644 -index 000000000000..8f3c2ef170ff +index 0000000000000..8f3c2ef170ff2 --- /dev/null +++ b/sound/soc/bcm/rpi-proto.c @@ -0,0 +1,147 @@ @@ -110637,10 +110637,10 @@ index 000000000000..8f3c2ef170ff 2.18.4 -From b3c4132374c9ffa9c6f1e78f985c67c511c21831 Mon Sep 17 00:00:00 2001 +From 16c21c14b68b5aef115e147280120cd6d72d0fbe Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Thu, 7 Apr 2016 21:26:21 +0100 -Subject: [PATCH 0064/1216] Add Support for JustBoom Audio boards +Subject: [PATCH 0064/1224] Add Support for JustBoom Audio boards justboom-dac: Adjust for ALSA API change @@ -110668,7 +110668,7 @@ Signed-off-by: Matthias Reichl diff --git a/sound/soc/bcm/justboom-dac.c b/sound/soc/bcm/justboom-dac.c new file mode 100644 -index 000000000000..62bd64cc0928 +index 0000000000000..62bd64cc09280 --- /dev/null +++ b/sound/soc/bcm/justboom-dac.c @@ -0,0 +1,147 @@ @@ -110823,10 +110823,10 @@ index 000000000000..62bd64cc0928 2.18.4 -From e396256067f7ae197f084805240cead5fa57adfa Mon Sep 17 00:00:00 2001 +From ffd5336502b45bd31e828d9e0cb3c778e8b4d93b Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Mon, 16 May 2016 21:36:31 +1000 -Subject: [PATCH 0065/1216] New AudioInjector.net Pi soundcard with low jitter +Subject: [PATCH 0065/1224] 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. @@ -110848,7 +110848,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/audioinjector-pi-soundcard.c b/sound/soc/bcm/audioinjector-pi-soundcard.c new file mode 100644 -index 000000000000..21a46551a1c1 +index 0000000000000..21a46551a1c19 --- /dev/null +++ b/sound/soc/bcm/audioinjector-pi-soundcard.c @@ -0,0 +1,187 @@ @@ -111043,10 +111043,10 @@ index 000000000000..21a46551a1c1 2.18.4 -From 2d577f1afd66556f7cefed99dd6bd11b3361d8ab Mon Sep 17 00:00:00 2001 +From cfeee321251e3f5a727d2707a89252adaf1cc48a Mon Sep 17 00:00:00 2001 From: escalator2015 Date: Tue, 24 May 2016 16:20:09 +0100 -Subject: [PATCH 0066/1216] New driver for RRA DigiDAC1 soundcard using WM8741 +Subject: [PATCH 0066/1224] New driver for RRA DigiDAC1 soundcard using WM8741 + WM8804 ASoC: digidac1-soundcard: use modern dai_link style @@ -111059,7 +111059,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/digidac1-soundcard.c b/sound/soc/bcm/digidac1-soundcard.c new file mode 100644 -index 000000000000..5046f88c496b +index 0000000000000..5046f88c496b7 --- /dev/null +++ b/sound/soc/bcm/digidac1-soundcard.c @@ -0,0 +1,421 @@ @@ -111488,10 +111488,10 @@ index 000000000000..5046f88c496b 2.18.4 -From eacddff77cd6a66eca5132157cef9e91dfe31d74 Mon Sep 17 00:00:00 2001 +From 56a4dd59049d8c3a772dc01ca5eceddf048dd930 Mon Sep 17 00:00:00 2001 From: DigitalDreamtime Date: Sat, 2 Jul 2016 16:26:19 +0100 -Subject: [PATCH 0067/1216] Add support for Dion Audio LOCO DAC-AMP HAT +Subject: [PATCH 0067/1224] Add support for Dion Audio LOCO DAC-AMP HAT Using dedicated machine driver and pcm5102a codec driver. @@ -111507,7 +111507,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/dionaudio_loco.c b/sound/soc/bcm/dionaudio_loco.c new file mode 100644 -index 000000000000..06af8363fb0a +index 0000000000000..06af8363fb0ad --- /dev/null +++ b/sound/soc/bcm/dionaudio_loco.c @@ -0,0 +1,117 @@ @@ -111632,10 +111632,10 @@ index 000000000000..06af8363fb0a 2.18.4 -From 490c7e76db60b6964f66e19f35939414597be6d1 Mon Sep 17 00:00:00 2001 +From cb75566131fb9b5fd21677086a75d478c86a199b Mon Sep 17 00:00:00 2001 From: Clive Messer Date: Mon, 19 Sep 2016 14:01:04 +0100 -Subject: [PATCH 0068/1216] Allo Piano DAC boards: Initial 2 channel (stereo) +Subject: [PATCH 0068/1224] 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, @@ -111672,7 +111672,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/allo-piano-dac.c b/sound/soc/bcm/allo-piano-dac.c new file mode 100644 -index 000000000000..61640fb95431 +index 0000000000000..61640fb954314 --- /dev/null +++ b/sound/soc/bcm/allo-piano-dac.c @@ -0,0 +1,122 @@ @@ -111802,10 +111802,10 @@ index 000000000000..61640fb95431 2.18.4 -From 31c071f683979f814f237531da3931090dfbcdae Mon Sep 17 00:00:00 2001 +From 12b8d87d86c1318f016aaa289572265369d589d2 Mon Sep 17 00:00:00 2001 From: Raashid Muhammed Date: Mon, 27 Mar 2017 12:35:00 +0530 -Subject: [PATCH 0069/1216] Add support for Allo Piano DAC 2.1 plus add-on +Subject: [PATCH 0069/1224] 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 @@ -111866,7 +111866,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/allo-piano-dac-plus.c b/sound/soc/bcm/allo-piano-dac-plus.c new file mode 100644 -index 000000000000..e910d4a4546d +index 0000000000000..e910d4a4546dc --- /dev/null +++ b/sound/soc/bcm/allo-piano-dac-plus.c @@ -0,0 +1,1013 @@ @@ -112887,10 +112887,10 @@ index 000000000000..e910d4a4546d 2.18.4 -From 094205e6dab0754ce2044e943399605728a37251 Mon Sep 17 00:00:00 2001 +From 2e9d3c220017bdec1125088d7e2c9b918623654a Mon Sep 17 00:00:00 2001 From: BabuSubashChandar Date: Tue, 28 Mar 2017 20:04:42 +0530 -Subject: [PATCH 0070/1216] Add support for Allo Boss DAC add-on board for +Subject: [PATCH 0070/1224] Add support for Allo Boss DAC add-on board for Raspberry Pi. (#1924) Signed-off-by: Baswaraj K @@ -112930,7 +112930,7 @@ Signed-off-by: Hui Wang create mode 100644 sound/soc/bcm/allo-boss-dac.c diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index 28ca4781d002..e01d58346f8a 100644 +index 28ca4781d002d..e01d58346f8a8 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -18,6 +18,7 @@ endif @@ -112943,7 +112943,7 @@ index 28ca4781d002..e01d58346f8a 100644 obj-$(CONFIG_ARCH_AXXIA) += clk-axm5516.o diff --git a/drivers/clk/clk-allo-dac.c b/drivers/clk/clk-allo-dac.c new file mode 100644 -index 000000000000..a9844cb9454b +index 0000000000000..a9844cb9454bd --- /dev/null +++ b/drivers/clk/clk-allo-dac.c @@ -0,0 +1,161 @@ @@ -113110,7 +113110,7 @@ index 000000000000..a9844cb9454b +MODULE_ALIAS("platform:clk-allo-dac"); diff --git a/sound/soc/bcm/allo-boss-dac.c b/sound/soc/bcm/allo-boss-dac.c new file mode 100644 -index 000000000000..cd47413f870c +index 0000000000000..cd47413f870c3 --- /dev/null +++ b/sound/soc/bcm/allo-boss-dac.c @@ -0,0 +1,456 @@ @@ -113574,10 +113574,10 @@ index 000000000000..cd47413f870c 2.18.4 -From cf940544197ae0565a064321f1fb0ea5ef5487da Mon Sep 17 00:00:00 2001 +From 02d89377f88ec7702aa01f56304b3ca54717f42f Mon Sep 17 00:00:00 2001 From: gtrainavicius Date: Sun, 23 Oct 2016 12:06:53 +0300 -Subject: [PATCH 0071/1216] Support for Blokas Labs pisound board +Subject: [PATCH 0071/1224] Support for Blokas Labs pisound board Pisound dynamic overlay (#1760) @@ -113647,7 +113647,7 @@ Signed-off-by: Hui Wang diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt new file mode 100644 -index 000000000000..f8d32547195b +index 0000000000000..f8d32547195b3 --- /dev/null +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -0,0 +1,463 @@ @@ -114115,7 +114115,7 @@ index 000000000000..f8d32547195b +zte ZTE Corp. +zyxel ZyXEL Communications Corp. diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index 967e78c5ec0a..c91a9702fda7 100644 +index 967e78c5ec0a1..c91a9702fda75 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -143,6 +143,8 @@ patternProperties: @@ -114129,7 +114129,7 @@ index 967e78c5ec0a..c91a9702fda7 100644 "^bosch,.*": diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c new file mode 100644 -index 000000000000..6af9921b55c7 +index 0000000000000..6af9921b55c71 --- /dev/null +++ b/sound/soc/bcm/pisound.c @@ -0,0 +1,1201 @@ @@ -115338,10 +115338,10 @@ index 000000000000..6af9921b55c7 2.18.4 -From 83ee1711ad0b6e7dc35e51c08d03ec02fc196b3e Mon Sep 17 00:00:00 2001 +From 5e3c45ab369caa95ac57387936d00175dab5576a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 22 Jan 2017 12:49:37 +0100 -Subject: [PATCH 0072/1216] ASoC: Add driver for Cirrus Logic Audio Card +Subject: [PATCH 0072/1224] 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 @@ -115360,7 +115360,7 @@ Signed-off-by: Matthias Reichl diff --git a/sound/soc/bcm/rpi-cirrus.c b/sound/soc/bcm/rpi-cirrus.c new file mode 100644 -index 000000000000..a0a460f787d1 +index 0000000000000..a0a460f787d1b --- /dev/null +++ b/sound/soc/bcm/rpi-cirrus.c @@ -0,0 +1,1035 @@ @@ -116403,10 +116403,10 @@ index 000000000000..a0a460f787d1 2.18.4 -From 1368b88215a86cdb1bc7c3ca128710ecfe26d5bb Mon Sep 17 00:00:00 2001 +From 71ca5e7586c16766d66efa961acde55afbecfb57 Mon Sep 17 00:00:00 2001 From: Miquel Date: Fri, 24 Feb 2017 20:51:06 +0100 -Subject: [PATCH 0073/1216] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT +Subject: [PATCH 0073/1224] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT Signed-off-by: Miquel Blauw @@ -116429,7 +116429,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/dionaudio_loco-v2.c b/sound/soc/bcm/dionaudio_loco-v2.c new file mode 100644 -index 000000000000..ca48aef621b6 +index 0000000000000..ca48aef621b66 --- /dev/null +++ b/sound/soc/bcm/dionaudio_loco-v2.c @@ -0,0 +1,117 @@ @@ -116554,10 +116554,10 @@ index 000000000000..ca48aef621b6 2.18.4 -From 5b652c0d93278932a2059ae999f45baa3950942d Mon Sep 17 00:00:00 2001 +From 73bab37dcff9fb18bf162a3e3667e7ce7f44940d Mon Sep 17 00:00:00 2001 From: Fe-Pi Date: Wed, 1 Mar 2017 04:42:43 -0700 -Subject: [PATCH 0074/1216] Add support for Fe-Pi audio sound card. (#1867) +Subject: [PATCH 0074/1224] 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. @@ -116575,7 +116575,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/fe-pi-audio.c b/sound/soc/bcm/fe-pi-audio.c new file mode 100644 -index 000000000000..a58a215820b7 +index 0000000000000..a58a215820b73 --- /dev/null +++ b/sound/soc/bcm/fe-pi-audio.c @@ -0,0 +1,154 @@ @@ -116737,10 +116737,10 @@ index 000000000000..a58a215820b7 2.18.4 -From c394f780546cb4b5c6e10f5e5120f3c06ab22750 Mon Sep 17 00:00:00 2001 +From 824f9edebdef22df234322884db658bc39a74402 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Wed, 8 Mar 2017 20:04:13 +1100 -Subject: [PATCH 0075/1216] Add support for the AudioInjector.net Octo sound +Subject: [PATCH 0075/1224] Add support for the AudioInjector.net Octo sound card AudioInjector Octo: sample rates, regulators, reset @@ -116802,7 +116802,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/audioinjector-octo-soundcard.c b/sound/soc/bcm/audioinjector-octo-soundcard.c new file mode 100644 -index 000000000000..02434e8a43c6 +index 0000000000000..02434e8a43c6c --- /dev/null +++ b/sound/soc/bcm/audioinjector-octo-soundcard.c @@ -0,0 +1,341 @@ @@ -117148,7 +117148,7 @@ index 000000000000..02434e8a43c6 +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:audioinjector-octo-soundcard"); diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c -index 0214e3ab9da0..a4586ea4acf6 100644 +index 0214e3ab9da00..a4586ea4acf6e 100644 --- a/sound/soc/codecs/cs42xx8-i2c.c +++ b/sound/soc/codecs/cs42xx8-i2c.c @@ -45,6 +45,13 @@ static struct i2c_device_id cs42xx8_i2c_id[] = { @@ -117166,7 +117166,7 @@ index 0214e3ab9da0..a4586ea4acf6 100644 .driver = { .name = "cs42xx8", diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c -index 94b1adb088fd..203e3f368bd5 100644 +index 94b1adb088fde..203e3f368bd54 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -516,8 +516,10 @@ const struct of_device_id cs42xx8_of_match[] = { @@ -117184,10 +117184,10 @@ index 94b1adb088fd..203e3f368bd5 100644 2.18.4 -From 6776927dbbbe1ce7cb0cdf6d8a096126945f7608 Mon Sep 17 00:00:00 2001 +From b9de927cccca8a6f7eeb90affecaac5e842ded70 Mon Sep 17 00:00:00 2001 From: Peter Malkin Date: Mon, 27 Mar 2017 16:38:21 -0700 -Subject: [PATCH 0076/1216] Driver support for Google voiceHAT soundcard. +Subject: [PATCH 0076/1224] Driver support for Google voiceHAT soundcard. ASoC: googlevoicehat-codec: Use correct device when grabbing GPIO @@ -117223,7 +117223,7 @@ Signed-off-by: Dave Stevenson diff --git a/sound/soc/bcm/googlevoicehat-codec.c b/sound/soc/bcm/googlevoicehat-codec.c new file mode 100644 -index 000000000000..871a25aa498e +index 0000000000000..871a25aa498e7 --- /dev/null +++ b/sound/soc/bcm/googlevoicehat-codec.c @@ -0,0 +1,214 @@ @@ -117445,10 +117445,10 @@ index 000000000000..871a25aa498e 2.18.4 -From de7c8c0035ea34394f458846b9045f346dd335e7 Mon Sep 17 00:00:00 2001 +From cda4155f010772bbe9cfea69eb9aa394c7297061 Mon Sep 17 00:00:00 2001 From: allocom Date: Thu, 19 Apr 2018 12:12:26 +0530 -Subject: [PATCH 0077/1216] Driver and overlay for Allo Katana DAC +Subject: [PATCH 0077/1224] Driver and overlay for Allo Katana DAC Allo Katana DAC: Updated default values @@ -117470,7 +117470,7 @@ Signed-off-by: Sudeep Kumar diff --git a/sound/soc/bcm/allo-katana-codec.c b/sound/soc/bcm/allo-katana-codec.c new file mode 100644 -index 000000000000..b0aebd40fe5e +index 0000000000000..b0aebd40fe5ea --- /dev/null +++ b/sound/soc/bcm/allo-katana-codec.c @@ -0,0 +1,388 @@ @@ -117866,10 +117866,10 @@ index 000000000000..b0aebd40fe5e 2.18.4 -From e817764b033ecf225396d705358fd5f862e4416f Mon Sep 17 00:00:00 2001 +From ffc9880705391d7071b7f7b4e00ba22167139fe3 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Wed, 27 Jun 2018 15:59:12 +0100 -Subject: [PATCH 0078/1216] ASoC: Add generic RPI driver for simple soundcards. +Subject: [PATCH 0078/1224] 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 @@ -117901,7 +117901,7 @@ Signed-off-by: Hui Wang diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c new file mode 100644 -index 000000000000..2023b0a18a2c +index 0000000000000..2023b0a18a2c6 --- /dev/null +++ b/sound/soc/bcm/rpi-simple-soundcard.c @@ -0,0 +1,288 @@ @@ -118197,10 +118197,10 @@ index 000000000000..2023b0a18a2c 2.18.4 -From ccf595d4532e9752a69e363b61b21eb2488385d6 Mon Sep 17 00:00:00 2001 +From 1d3c9599fb6f7bb36e9abc7cf36215bd0cb66419 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Sep 2018 17:00:36 +0100 -Subject: [PATCH 0079/1216] ASoC: Add Kconfig and Makefile for sound/soc/bcm +Subject: [PATCH 0079/1224] ASoC: Add Kconfig and Makefile for sound/soc/bcm Signed-off-by: popcornmix --- @@ -118209,7 +118209,7 @@ Signed-off-by: popcornmix 2 files changed, 241 insertions(+) diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index 0037e96aa228..ff5742759a38 100644 +index 0037e96aa228f..ff5742759a389 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -17,3 +17,202 @@ config SND_SOC_CYGNUS @@ -118416,7 +118416,7 @@ index 0037e96aa228..ff5742759a38 100644 + Say Y or M if you want to add support for the Raspberry Pi + generic driver for WM8804 based soundcards. diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index b81fa421ec27..522fc73571e4 100644 +index b81fa421ec272..522fc73571e4b 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -9,3 +9,45 @@ snd-soc-cygnus-objs := cygnus-pcm.o cygnus-ssp.o @@ -118469,10 +118469,10 @@ index b81fa421ec27..522fc73571e4 100644 2.18.4 -From 693a40888dcad19b3e7d12f6c0197c2978eabf0c Mon Sep 17 00:00:00 2001 +From 32b1be84bb209c79c19285d71e39f8a8d21d290c Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Sat, 21 Jul 2018 20:07:46 +0100 -Subject: [PATCH 0080/1216] ASoC: Create a generic Pi Hat WM8804 driver +Subject: [PATCH 0080/1224] 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. @@ -118528,7 +118528,7 @@ Signed-off-by: Phil Elwell diff --git a/sound/soc/bcm/rpi-wm8804-soundcard.c b/sound/soc/bcm/rpi-wm8804-soundcard.c new file mode 100644 -index 000000000000..b3c3c4ea1e75 +index 0000000000000..b3c3c4ea1e75b --- /dev/null +++ b/sound/soc/bcm/rpi-wm8804-soundcard.c @@ -0,0 +1,410 @@ @@ -118946,10 +118946,10 @@ index 000000000000..b3c3c4ea1e75 2.18.4 -From 739483b490f70cb9e29447851f9204df988cb5a0 Mon Sep 17 00:00:00 2001 +From 7b7ae5e9c160377d8d036c29793aa9511c94aeaf Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 21 Oct 2015 14:55:21 +0100 -Subject: [PATCH 0081/1216] rpi_display: add backlight driver and overlay +Subject: [PATCH 0081/1224] 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 @@ -118971,7 +118971,7 @@ Signed-off-by: Alex Riesen create mode 100644 drivers/video/backlight/rpi_backlight.c diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig -index 40676be2e46a..e809c651b7c4 100644 +index 40676be2e46aa..e809c651b7c43 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -248,6 +248,13 @@ config BACKLIGHT_PWM @@ -118989,7 +118989,7 @@ index 40676be2e46a..e809c651b7c4 100644 tristate "Backlight Driver for DA9030/DA9034 using WLED" depends on PMIC_DA903X diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile -index 63c507c07437..98f1271fb9c4 100644 +index 63c507c07437d..98f1271fb9c4a 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile @@ -50,6 +50,7 @@ obj-$(CONFIG_BACKLIGHT_PANDORA) += pandora_bl.o @@ -119002,7 +119002,7 @@ index 63c507c07437..98f1271fb9c4 100644 obj-$(CONFIG_BACKLIGHT_TOSA) += tosa_bl.o diff --git a/drivers/video/backlight/rpi_backlight.c b/drivers/video/backlight/rpi_backlight.c new file mode 100644 -index 000000000000..14a0d9b03739 +index 0000000000000..14a0d9b037395 --- /dev/null +++ b/drivers/video/backlight/rpi_backlight.c @@ -0,0 +1,119 @@ @@ -119129,10 +119129,10 @@ index 000000000000..14a0d9b03739 2.18.4 -From 0cec3159eed1d43b056dc9a81b6e8b1a538d3448 Mon Sep 17 00:00:00 2001 +From eb73dcd26136709a32d23bcc23cd40a8bd2774c0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 23 Feb 2016 19:56:04 +0000 -Subject: [PATCH 0082/1216] bcm2835-virtgpio: Virtual GPIO driver +Subject: [PATCH 0082/1224] bcm2835-virtgpio: Virtual GPIO driver Add a virtual GPIO driver that uses the firmware mailbox interface to request that the VPU toggles LEDs. @@ -119144,7 +119144,7 @@ request that the VPU toggles LEDs. create mode 100644 drivers/gpio/gpio-bcm-virt.c diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index f9263426af03..a4fe9a954b88 100644 +index f9263426af030..a4fe9a954b882 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -147,6 +147,12 @@ config GPIO_BCM_KONA @@ -119161,7 +119161,7 @@ index f9263426af03..a4fe9a954b88 100644 tristate "BRCMSTB GPIO support" default y if (ARCH_BRCMSTB || BMIPS_GENERIC) diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index d2fd19c15bae..86edbc79e595 100644 +index d2fd19c15bae3..86edbc79e5956 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o @@ -119174,7 +119174,7 @@ index d2fd19c15bae..86edbc79e595 100644 obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o diff --git a/drivers/gpio/gpio-bcm-virt.c b/drivers/gpio/gpio-bcm-virt.c new file mode 100644 -index 000000000000..49e28ad9760e +index 0000000000000..49e28ad9760e0 --- /dev/null +++ b/drivers/gpio/gpio-bcm-virt.c @@ -0,0 +1,214 @@ @@ -119396,10 +119396,10 @@ index 000000000000..49e28ad9760e 2.18.4 -From bd476037a19d22b88e499202dce13b95aa55b6d7 Mon Sep 17 00:00:00 2001 +From bb0b4487d8a4e99f06441e5e467cd0cc0299d79b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Sep 2012 17:10:23 +0100 -Subject: [PATCH 0083/1216] net: Add non-mainline source for rtl8192cu wlan +Subject: [PATCH 0083/1224] net: Add non-mainline source for rtl8192cu wlan We are now syncing with version from: https://github.com/pvaret/rtl8192cu-fixes @@ -119753,7 +119753,7 @@ https://github.com/pvaret/rtl8192cu-fixes create mode 100755 drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp diff --git a/drivers/net/wireless/realtek/Kconfig b/drivers/net/wireless/realtek/Kconfig -index 8ea2d8d7e356..1ed17f043e33 100644 +index 8ea2d8d7e356d..1ed17f043e331 100644 --- a/drivers/net/wireless/realtek/Kconfig +++ b/drivers/net/wireless/realtek/Kconfig @@ -14,6 +14,7 @@ if WLAN_VENDOR_REALTEK @@ -119765,7 +119765,7 @@ index 8ea2d8d7e356..1ed17f043e33 100644 source "drivers/net/wireless/realtek/rtw88/Kconfig" diff --git a/drivers/net/wireless/realtek/Makefile b/drivers/net/wireless/realtek/Makefile -index 888b5d594e79..bfa7a1c3df27 100644 +index 888b5d594e797..bfa7a1c3df275 100644 --- a/drivers/net/wireless/realtek/Makefile +++ b/drivers/net/wireless/realtek/Makefile @@ -6,6 +6,7 @@ @@ -119778,7 +119778,7 @@ index 888b5d594e79..bfa7a1c3df27 100644 diff --git a/drivers/net/wireless/realtek/rtl8192cu/Kconfig b/drivers/net/wireless/realtek/rtl8192cu/Kconfig new file mode 100644 -index 000000000000..cd7830bb9d5d +index 0000000000000..cd7830bb9d5de --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/Kconfig @@ -0,0 +1,9 @@ @@ -119793,7 +119793,7 @@ index 000000000000..cd7830bb9d5d + diff --git a/drivers/net/wireless/realtek/rtl8192cu/Makefile b/drivers/net/wireless/realtek/rtl8192cu/Makefile new file mode 100644 -index 000000000000..c399011a3e37 +index 0000000000000..c399011a3e377 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/Makefile @@ -0,0 +1,616 @@ @@ -120415,7 +120415,7 @@ index 000000000000..c399011a3e37 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/clean b/drivers/net/wireless/realtek/rtl8192cu/clean new file mode 100644 -index 000000000000..87664218b889 +index 0000000000000..87664218b8891 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/clean @@ -0,0 +1,5 @@ @@ -120426,7 +120426,7 @@ index 000000000000..87664218b889 +rmmod 8192de diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c b/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c new file mode 100755 -index 000000000000..3d341accc9aa +index 0000000000000..3d341accc9aa7 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c @@ -0,0 +1,1147 @@ @@ -121579,7 +121579,7 @@ index 000000000000..3d341accc9aa + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c new file mode 100755 -index 000000000000..14576dd191f3 +index 0000000000000..14576dd191f3d --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c @@ -0,0 +1,2943 @@ @@ -124528,7 +124528,7 @@ index 000000000000..14576dd191f3 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c new file mode 100755 -index 000000000000..2f84a38e2fdb +index 0000000000000..2f84a38e2fdb8 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c @@ -0,0 +1,1700 @@ @@ -126234,7 +126234,7 @@ index 000000000000..2f84a38e2fdb +#endif // CONFIG_BR_EXT diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c new file mode 100755 -index 000000000000..f906eb3489d1 +index 0000000000000..f906eb3489d1e --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c @@ -0,0 +1,3035 @@ @@ -129275,7 +129275,7 @@ index 000000000000..f906eb3489d1 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c new file mode 100755 -index 000000000000..f70fcb7b2cd1 +index 0000000000000..f70fcb7b2cd13 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c @@ -0,0 +1,1337 @@ @@ -130618,7 +130618,7 @@ index 000000000000..f70fcb7b2cd1 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c new file mode 100755 -index 000000000000..fd07d64d8724 +index 0000000000000..fd07d64d8724a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c @@ -0,0 +1,423 @@ @@ -131047,7 +131047,7 @@ index 000000000000..fd07d64d8724 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c new file mode 100755 -index 000000000000..f89ce4a00323 +index 0000000000000..f89ce4a003233 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c @@ -0,0 +1,1916 @@ @@ -132969,7 +132969,7 @@ index 000000000000..f89ce4a00323 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c new file mode 100755 -index 000000000000..4ffaa50d3c5d +index 0000000000000..4ffaa50d3c5df --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c @@ -0,0 +1,464 @@ @@ -133439,7 +133439,7 @@ index 000000000000..4ffaa50d3c5d + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c new file mode 100755 -index 000000000000..06018867e34d +index 0000000000000..06018867e34dd --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c @@ -0,0 +1,196 @@ @@ -133641,7 +133641,7 @@ index 000000000000..06018867e34d + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c new file mode 100755 -index 000000000000..31b4704d4347 +index 0000000000000..31b4704d43478 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c @@ -0,0 +1,1031 @@ @@ -134678,7 +134678,7 @@ index 000000000000..31b4704d4347 +//************** oid_rtl_seg_03_00 section end ************** diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c new file mode 100755 -index 000000000000..564ff6eaebec +index 0000000000000..564ff6eaebec8 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c @@ -0,0 +1,1494 @@ @@ -136178,7 +136178,7 @@ index 000000000000..564ff6eaebec + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c new file mode 100755 -index 000000000000..872cc4234fc4 +index 0000000000000..872cc4234fc4d --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c @@ -0,0 +1,263 @@ @@ -136447,7 +136447,7 @@ index 000000000000..872cc4234fc4 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c new file mode 100755 -index 000000000000..00edd9cc6955 +index 0000000000000..00edd9cc69551 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c @@ -0,0 +1,3967 @@ @@ -140420,7 +140420,7 @@ index 000000000000..00edd9cc6955 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme_ext.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme_ext.c new file mode 100755 -index 000000000000..e20c116a9cf8 +index 0000000000000..e20c116a9cf8c --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme_ext.c @@ -0,0 +1,13600 @@ @@ -154026,7 +154026,7 @@ index 000000000000..e20c116a9cf8 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp.c new file mode 100755 -index 000000000000..9af42cdc980a +index 0000000000000..9af42cdc980a8 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp.c @@ -0,0 +1,1324 @@ @@ -155356,7 +155356,7 @@ index 000000000000..9af42cdc980a + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp_ioctl.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp_ioctl.c new file mode 100755 -index 000000000000..b941e2ce72db +index 0000000000000..b941e2ce72dbf --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp_ioctl.c @@ -0,0 +1,2954 @@ @@ -158316,7 +158316,7 @@ index 000000000000..b941e2ce72db + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_p2p.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_p2p.c new file mode 100755 -index 000000000000..18a1b772cd95 +index 0000000000000..18a1b772cd957 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_p2p.c @@ -0,0 +1,5370 @@ @@ -163692,7 +163692,7 @@ index 000000000000..18a1b772cd95 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_pwrctrl.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_pwrctrl.c new file mode 100755 -index 000000000000..e2329fb23535 +index 0000000000000..e2329fb235355 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_pwrctrl.c @@ -0,0 +1,1551 @@ @@ -165249,7 +165249,7 @@ index 000000000000..e2329fb23535 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_recv.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_recv.c new file mode 100755 -index 000000000000..edf85b205b3f +index 0000000000000..edf85b205b3f5 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_recv.c @@ -0,0 +1,4306 @@ @@ -169561,7 +169561,7 @@ index 000000000000..edf85b205b3f + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_rf.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_rf.c new file mode 100755 -index 000000000000..7ae86351b9f0 +index 0000000000000..7ae86351b9f04 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_rf.c @@ -0,0 +1,95 @@ @@ -169662,7 +169662,7 @@ index 000000000000..7ae86351b9f0 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c new file mode 100755 -index 000000000000..8fa8ed51b721 +index 0000000000000..8fa8ed51b721c --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c @@ -0,0 +1,3115 @@ @@ -172783,7 +172783,7 @@ index 000000000000..8fa8ed51b721 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sreset.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sreset.c new file mode 100755 -index 000000000000..e08b1f739735 +index 0000000000000..e08b1f7397354 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sreset.c @@ -0,0 +1,352 @@ @@ -173141,7 +173141,7 @@ index 000000000000..e08b1f739735 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sta_mgt.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sta_mgt.c new file mode 100755 -index 000000000000..a2f1c975f9bc +index 0000000000000..a2f1c975f9bcd --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sta_mgt.c @@ -0,0 +1,848 @@ @@ -173995,7 +173995,7 @@ index 000000000000..a2f1c975f9bc + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_tdls.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_tdls.c new file mode 100755 -index 000000000000..e8c4d4cc7a73 +index 0000000000000..e8c4d4cc7a73a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_tdls.c @@ -0,0 +1,2941 @@ @@ -176942,7 +176942,7 @@ index 000000000000..e8c4d4cc7a73 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_wlan_util.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_wlan_util.c new file mode 100755 -index 000000000000..051445cba2f0 +index 0000000000000..051445cba2f04 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_wlan_util.c @@ -0,0 +1,2305 @@ @@ -179253,7 +179253,7 @@ index 000000000000..051445cba2f0 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_xmit.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_xmit.c new file mode 100755 -index 000000000000..c080fbf59e17 +index 0000000000000..c080fbf59e177 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_xmit.c @@ -0,0 +1,4156 @@ @@ -183415,7 +183415,7 @@ index 000000000000..c080fbf59e17 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/HalPwrSeqCmd.c b/drivers/net/wireless/realtek/rtl8192cu/hal/HalPwrSeqCmd.c new file mode 100755 -index 000000000000..c59bb664de93 +index 0000000000000..c59bb664de934 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/HalPwrSeqCmd.c @@ -0,0 +1,177 @@ @@ -183598,7 +183598,7 @@ index 000000000000..c59bb664de93 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/dm.c b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.c new file mode 100755 -index 000000000000..465ca826c9fd +index 0000000000000..465ca826c9fd6 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.c @@ -0,0 +1,314 @@ @@ -183918,7 +183918,7 @@ index 000000000000..465ca826c9fd + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/dm.h b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.h new file mode 100755 -index 000000000000..dd9a57d9d8f4 +index 0000000000000..dd9a57d9d8f4c --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.h @@ -0,0 +1,30 @@ @@ -183954,7 +183954,7 @@ index 000000000000..dd9a57d9d8f4 +#endif /* __DM_H__ */ diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/hal_com.c b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_com.c new file mode 100755 -index 000000000000..4dcafd656eae +index 0000000000000..4dcafd656eaea --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_com.c @@ -0,0 +1,371 @@ @@ -184331,7 +184331,7 @@ index 000000000000..4dcafd656eae + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/hal_intf.c b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_intf.c new file mode 100755 -index 000000000000..6c56e72d2588 +index 0000000000000..6c56e72d2588d --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_intf.c @@ -0,0 +1,546 @@ @@ -184883,7 +184883,7 @@ index 000000000000..6c56e72d2588 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c new file mode 100755 -index 000000000000..33921e2ed5ab +index 0000000000000..33921e2ed5abc --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c @@ -0,0 +1,1159 @@ @@ -186048,7 +186048,7 @@ index 000000000000..33921e2ed5ab + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c new file mode 100755 -index 000000000000..8a4c15307fbf +index 0000000000000..8a4c15307fbfc --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c @@ -0,0 +1,5058 @@ @@ -191112,7 +191112,7 @@ index 000000000000..8a4c15307fbf + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c new file mode 100755 -index 000000000000..b9e91d70ce21 +index 0000000000000..b9e91d70ce21c --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c @@ -0,0 +1,3628 @@ @@ -194746,7 +194746,7 @@ index 000000000000..b9e91d70ce21 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c new file mode 100755 -index 000000000000..a4194c4cbe7f +index 0000000000000..a4194c4cbe7f7 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c @@ -0,0 +1,1207 @@ @@ -195959,7 +195959,7 @@ index 000000000000..a4194c4cbe7f +#endif // CONFIG_MP_INCLUDE diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c new file mode 100755 -index 000000000000..1bae6dad889d +index 0000000000000..1bae6dad889da --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c @@ -0,0 +1,4841 @@ @@ -200806,7 +200806,7 @@ index 000000000000..1bae6dad889d + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c new file mode 100755 -index 000000000000..b1af006d055b +index 0000000000000..b1af006d055b5 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c @@ -0,0 +1,1031 @@ @@ -201843,7 +201843,7 @@ index 000000000000..b1af006d055b + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c new file mode 100755 -index 000000000000..3e0d795ed27a +index 0000000000000..3e0d795ed27ac --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c @@ -0,0 +1,876 @@ @@ -202725,7 +202725,7 @@ index 000000000000..3e0d795ed27a + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c new file mode 100755 -index 000000000000..1368d66ac686 +index 0000000000000..1368d66ac686d --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c @@ -0,0 +1,94 @@ @@ -202825,7 +202825,7 @@ index 000000000000..1368d66ac686 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c new file mode 100755 -index 000000000000..2cfd851a1793 +index 0000000000000..2cfd851a1793a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c @@ -0,0 +1,63 @@ @@ -202894,7 +202894,7 @@ index 000000000000..2cfd851a1793 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c new file mode 100755 -index 000000000000..b49486b45fb6 +index 0000000000000..b49486b45fb63 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c @@ -0,0 +1,8758 @@ @@ -211658,7 +211658,7 @@ index 000000000000..b49486b45fb6 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c new file mode 100755 -index 000000000000..66970f1c0799 +index 0000000000000..66970f1c07998 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c @@ -0,0 +1,2564 @@ @@ -214228,7 +214228,7 @@ index 000000000000..66970f1c0799 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c new file mode 100755 -index 000000000000..4d4a395c12c8 +index 0000000000000..4d4a395c12c83 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c @@ -0,0 +1,2680 @@ @@ -216914,7 +216914,7 @@ index 000000000000..4d4a395c12c8 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c new file mode 100755 -index 000000000000..1119cf81bcdc +index 0000000000000..1119cf81bcdc6 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c @@ -0,0 +1,229 @@ @@ -217149,7 +217149,7 @@ index 000000000000..1119cf81bcdc + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c new file mode 100755 -index 000000000000..3a4137b9ae19 +index 0000000000000..3a4137b9ae199 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c @@ -0,0 +1,1150 @@ @@ -218305,7 +218305,7 @@ index 000000000000..3a4137b9ae19 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c new file mode 100755 -index 000000000000..ff894732ba90 +index 0000000000000..ff894732ba900 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c @@ -0,0 +1,6261 @@ @@ -224572,7 +224572,7 @@ index 000000000000..ff894732ba90 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c new file mode 100755 -index 000000000000..9523337622b8 +index 0000000000000..9523337622b85 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c @@ -0,0 +1,1207 @@ @@ -225785,7 +225785,7 @@ index 000000000000..9523337622b8 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c new file mode 100755 -index 000000000000..2d627d303122 +index 0000000000000..2d627d303122a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c @@ -0,0 +1,1536 @@ @@ -227327,7 +227327,7 @@ index 000000000000..2d627d303122 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c new file mode 100755 -index 000000000000..32ff645aecf3 +index 0000000000000..32ff645aecf38 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c @@ -0,0 +1,1265 @@ @@ -228598,7 +228598,7 @@ index 000000000000..32ff645aecf3 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/ifcfg-wlan0 b/drivers/net/wireless/realtek/rtl8192cu/ifcfg-wlan0 new file mode 100755 -index 000000000000..7ecb7ae62c7f +index 0000000000000..7ecb7ae62c7fb --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/ifcfg-wlan0 @@ -0,0 +1,4 @@ @@ -228609,7 +228609,7 @@ index 000000000000..7ecb7ae62c7f \ No newline at end of file diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CEHWImg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CEHWImg.h new file mode 100755 -index 000000000000..4ae36300d8b7 +index 0000000000000..4ae36300d8b7a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CEHWImg.h @@ -0,0 +1,85 @@ @@ -228700,7 +228700,7 @@ index 000000000000..4ae36300d8b7 +#endif //__INC_HAL8192CE_FW_IMG_H diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyCfg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyCfg.h new file mode 100755 -index 000000000000..3afb292c71a7 +index 0000000000000..3afb292c71a74 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyCfg.h @@ -0,0 +1,428 @@ @@ -229134,7 +229134,7 @@ index 000000000000..3afb292c71a7 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyReg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyReg.h new file mode 100755 -index 000000000000..6364166d68cf +index 0000000000000..6364166d68cf4 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyReg.h @@ -0,0 +1,1123 @@ @@ -230263,7 +230263,7 @@ index 000000000000..6364166d68cf + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg.h new file mode 100755 -index 000000000000..ba3c282f6348 +index 0000000000000..ba3c282f63486 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg.h @@ -0,0 +1,105 @@ @@ -230374,7 +230374,7 @@ index 000000000000..ba3c282f6348 +#endif //__INC_HAL8192CU_FW_IMG_H diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg_wowlan.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg_wowlan.h new file mode 100755 -index 000000000000..47d4d2fc4273 +index 0000000000000..47d4d2fc42732 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg_wowlan.h @@ -0,0 +1,34 @@ @@ -230414,7 +230414,7 @@ index 000000000000..47d4d2fc4273 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DEHWImg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DEHWImg.h new file mode 100755 -index 000000000000..06397752a28d +index 0000000000000..06397752a28d7 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DEHWImg.h @@ -0,0 +1,66 @@ @@ -230486,7 +230486,7 @@ index 000000000000..06397752a28d +#endif //__INC_HAL8192CU_FW_IMG_H diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyCfg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyCfg.h new file mode 100755 -index 000000000000..624fbda6d486 +index 0000000000000..624fbda6d486a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyCfg.h @@ -0,0 +1,528 @@ @@ -231020,7 +231020,7 @@ index 000000000000..624fbda6d486 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyReg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyReg.h new file mode 100755 -index 000000000000..f28aa033bbe0 +index 0000000000000..f28aa033bbe03 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyReg.h @@ -0,0 +1,1171 @@ @@ -232197,7 +232197,7 @@ index 000000000000..f28aa033bbe0 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg.h new file mode 100755 -index 000000000000..d6c66d993b46 +index 0000000000000..d6c66d993b46c --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg.h @@ -0,0 +1,66 @@ @@ -232269,7 +232269,7 @@ index 000000000000..d6c66d993b46 +#endif //__INC_HAL8192CU_FW_IMG_H diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg_wowlan.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg_wowlan.h new file mode 100755 -index 000000000000..cc27a776ea40 +index 0000000000000..cc27a776ea403 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg_wowlan.h @@ -0,0 +1,30 @@ @@ -232305,7 +232305,7 @@ index 000000000000..cc27a776ea40 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/HalPwrSeqCmd.h b/drivers/net/wireless/realtek/rtl8192cu/include/HalPwrSeqCmd.h new file mode 100755 -index 000000000000..e5d151cfdfba +index 0000000000000..e5d151cfdfba6 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/HalPwrSeqCmd.h @@ -0,0 +1,137 @@ @@ -232448,7 +232448,7 @@ index 000000000000..e5d151cfdfba +#endif diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/autoconf.h b/drivers/net/wireless/realtek/rtl8192cu/include/autoconf.h new file mode 100755 -index 000000000000..0a77785954f8 +index 0000000000000..0a77785954f82 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/autoconf.h @@ -0,0 +1,336 @@ @@ -232790,7 +232790,7 @@ index 000000000000..0a77785954f8 +//#define CONFIG_BUSY_TRAFFIC_SKIP_PWR_TRACK diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/basic_types.h b/drivers/net/wireless/realtek/rtl8192cu/include/basic_types.h new file mode 100755 -index 000000000000..f76e68ffe96a +index 0000000000000..f76e68ffe96a5 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/basic_types.h @@ -0,0 +1,321 @@ @@ -233117,7 +233117,7 @@ index 000000000000..f76e68ffe96a + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/big_endian.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/big_endian.h new file mode 100755 -index 000000000000..eca68a6569f6 +index 0000000000000..eca68a6569f69 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/big_endian.h @@ -0,0 +1,87 @@ @@ -233210,7 +233210,7 @@ index 000000000000..eca68a6569f6 +#endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/generic.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/generic.h new file mode 100755 -index 000000000000..7c8d4d7047bc +index 0000000000000..7c8d4d7047bc1 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/generic.h @@ -0,0 +1,212 @@ @@ -233428,7 +233428,7 @@ index 000000000000..7c8d4d7047bc +#endif /* _LINUX_BYTEORDER_GENERIC_H */ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/little_endian.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/little_endian.h new file mode 100755 -index 000000000000..433045e46939 +index 0000000000000..433045e469390 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/little_endian.h @@ -0,0 +1,89 @@ @@ -233523,7 +233523,7 @@ index 000000000000..433045e46939 +#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swab.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swab.h new file mode 100755 -index 000000000000..a3ca9eaecb95 +index 0000000000000..a3ca9eaecb956 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swab.h @@ -0,0 +1,140 @@ @@ -233669,7 +233669,7 @@ index 000000000000..a3ca9eaecb95 +#endif /* _LINUX_BYTEORDER_SWAB_H */ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swabb.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swabb.h new file mode 100755 -index 000000000000..7e2a118c2122 +index 0000000000000..7e2a118c21221 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swabb.h @@ -0,0 +1,156 @@ @@ -233831,7 +233831,7 @@ index 000000000000..7e2a118c2122 +#endif /* _LINUX_BYTEORDER_SWABB_H */ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/circ_buf.h b/drivers/net/wireless/realtek/rtl8192cu/include/circ_buf.h new file mode 100755 -index 000000000000..1bd4704a7c33 +index 0000000000000..1bd4704a7c33a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/circ_buf.h @@ -0,0 +1,27 @@ @@ -233864,7 +233864,7 @@ index 000000000000..1bd4704a7c33 +#endif //_CIRC_BUF_H_ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/cmd_osdep.h b/drivers/net/wireless/realtek/rtl8192cu/include/cmd_osdep.h new file mode 100755 -index 000000000000..077efa731f9a +index 0000000000000..077efa731f9a7 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/cmd_osdep.h @@ -0,0 +1,36 @@ @@ -233906,7 +233906,7 @@ index 000000000000..077efa731f9a + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_conf.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_conf.h new file mode 100755 -index 000000000000..13176879f666 +index 0000000000000..13176879f666b --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_conf.h @@ -0,0 +1,78 @@ @@ -233990,7 +233990,7 @@ index 000000000000..13176879f666 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types.h new file mode 100755 -index 000000000000..0ac34f21e33e +index 0000000000000..0ac34f21e33ec --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types.h @@ -0,0 +1,662 @@ @@ -234658,7 +234658,7 @@ index 000000000000..0ac34f21e33e + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_ce.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_ce.h new file mode 100755 -index 000000000000..be0459dcb219 +index 0000000000000..be0459dcb2195 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_ce.h @@ -0,0 +1,92 @@ @@ -234756,7 +234756,7 @@ index 000000000000..be0459dcb219 +#endif diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_linux.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_linux.h new file mode 100755 -index 000000000000..db1c585690ff +index 0000000000000..db1c585690ff8 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_linux.h @@ -0,0 +1,25 @@ @@ -234787,7 +234787,7 @@ index 000000000000..db1c585690ff + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_sdio.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_sdio.h new file mode 100755 -index 000000000000..fd467ca6ddfd +index 0000000000000..fd467ca6ddfda --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_sdio.h @@ -0,0 +1,70 @@ @@ -234863,7 +234863,7 @@ index 000000000000..fd467ca6ddfd + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_xp.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_xp.h new file mode 100755 -index 000000000000..2d51b1db13b0 +index 0000000000000..2d51b1db13b09 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_xp.h @@ -0,0 +1,95 @@ @@ -234964,7 +234964,7 @@ index 000000000000..2d51b1db13b0 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ethernet.h b/drivers/net/wireless/realtek/rtl8192cu/include/ethernet.h new file mode 100755 -index 000000000000..36e29c060d3f +index 0000000000000..36e29c060d3f7 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ethernet.h @@ -0,0 +1,41 @@ @@ -235011,7 +235011,7 @@ index 000000000000..36e29c060d3f +#endif // #ifndef __INC_ETHERNET_H diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/h2clbk.h b/drivers/net/wireless/realtek/rtl8192cu/include/h2clbk.h new file mode 100755 -index 000000000000..359c9e7a8f24 +index 0000000000000..359c9e7a8f249 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/h2clbk.h @@ -0,0 +1,35 @@ @@ -235052,7 +235052,7 @@ index 000000000000..359c9e7a8f24 +void h2c_event_callback(unsigned char *dev, unsigned char *pbuf); diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/hal_com.h b/drivers/net/wireless/realtek/rtl8192cu/include/hal_com.h new file mode 100755 -index 000000000000..42aae0e057b1 +index 0000000000000..42aae0e057b15 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/hal_com.h @@ -0,0 +1,146 @@ @@ -235204,7 +235204,7 @@ index 000000000000..42aae0e057b1 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/hal_intf.h b/drivers/net/wireless/realtek/rtl8192cu/include/hal_intf.h new file mode 100755 -index 000000000000..dd8266229edd +index 0000000000000..dd8266229eddb --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/hal_intf.h @@ -0,0 +1,432 @@ @@ -235642,7 +235642,7 @@ index 000000000000..dd8266229edd + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211.h b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211.h new file mode 100755 -index 000000000000..e283a5f25d4c +index 0000000000000..e283a5f25d4c9 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211.h @@ -0,0 +1,1580 @@ @@ -237228,7 +237228,7 @@ index 000000000000..e283a5f25d4c + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211_ext.h b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211_ext.h new file mode 100755 -index 000000000000..3e55305e1d98 +index 0000000000000..3e55305e1d981 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211_ext.h @@ -0,0 +1,477 @@ @@ -237711,7 +237711,7 @@ index 000000000000..3e55305e1d98 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/if_ether.h b/drivers/net/wireless/realtek/rtl8192cu/include/if_ether.h new file mode 100755 -index 000000000000..9e36d7fadb25 +index 0000000000000..9e36d7fadb258 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/if_ether.h @@ -0,0 +1,112 @@ @@ -237829,7 +237829,7 @@ index 000000000000..9e36d7fadb25 +#endif /* _LINUX_IF_ETHER_H */ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ioctl_cfg80211.h b/drivers/net/wireless/realtek/rtl8192cu/include/ioctl_cfg80211.h new file mode 100755 -index 000000000000..f182fb0f349e +index 0000000000000..f182fb0f349e4 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ioctl_cfg80211.h @@ -0,0 +1,184 @@ @@ -238019,7 +238019,7 @@ index 000000000000..f182fb0f349e + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ip.h b/drivers/net/wireless/realtek/rtl8192cu/include/ip.h new file mode 100755 -index 000000000000..d7f723d26528 +index 0000000000000..d7f723d265281 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ip.h @@ -0,0 +1,141 @@ @@ -238166,7 +238166,7 @@ index 000000000000..d7f723d26528 +#endif /* _LINUX_IP_H */ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/linux/wireless.h b/drivers/net/wireless/realtek/rtl8192cu/include/linux/wireless.h new file mode 100755 -index 000000000000..24a22d63d696 +index 0000000000000..24a22d63d696b --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/linux/wireless.h @@ -0,0 +1,90 @@ @@ -238262,7 +238262,7 @@ index 000000000000..24a22d63d696 +#endif /* _LINUX_WIRELESS_H */ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/mlme_osdep.h b/drivers/net/wireless/realtek/rtl8192cu/include/mlme_osdep.h new file mode 100755 -index 000000000000..75754db1accd +index 0000000000000..75754db1accd6 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/mlme_osdep.h @@ -0,0 +1,40 @@ @@ -238308,7 +238308,7 @@ index 000000000000..75754db1accd + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/mp_custom_oid.h b/drivers/net/wireless/realtek/rtl8192cu/include/mp_custom_oid.h new file mode 100755 -index 000000000000..5f8673811fb5 +index 0000000000000..5f8673811fb58 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/mp_custom_oid.h @@ -0,0 +1,353 @@ @@ -238667,7 +238667,7 @@ index 000000000000..5f8673811fb5 +#endif //#ifndef __CUSTOM_OID_H diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/nic_spec.h b/drivers/net/wireless/realtek/rtl8192cu/include/nic_spec.h new file mode 100755 -index 000000000000..18e7b2c09671 +index 0000000000000..18e7b2c096715 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/nic_spec.h @@ -0,0 +1,47 @@ @@ -238720,7 +238720,7 @@ index 000000000000..18e7b2c09671 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/osdep_ce_service.h b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_ce_service.h new file mode 100755 -index 000000000000..e374077fdb34 +index 0000000000000..e374077fdb342 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_ce_service.h @@ -0,0 +1,171 @@ @@ -238897,7 +238897,7 @@ index 000000000000..e374077fdb34 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/osdep_intf.h b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_intf.h new file mode 100755 -index 000000000000..3cd165969f2f +index 0000000000000..3cd165969f2f7 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_intf.h @@ -0,0 +1,155 @@ @@ -239058,7 +239058,7 @@ index 000000000000..3cd165969f2f + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/osdep_service.h b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_service.h new file mode 100755 -index 000000000000..a6dcdff1d1b7 +index 0000000000000..a6dcdff1d1b73 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_service.h @@ -0,0 +1,1821 @@ @@ -240885,7 +240885,7 @@ index 000000000000..a6dcdff1d1b7 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/pci_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/pci_hal.h new file mode 100755 -index 000000000000..1ee0ee2c226b +index 0000000000000..1ee0ee2c226ba --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/pci_hal.h @@ -0,0 +1,168 @@ @@ -241059,7 +241059,7 @@ index 000000000000..1ee0ee2c226b + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/pci_ops.h b/drivers/net/wireless/realtek/rtl8192cu/include/pci_ops.h new file mode 100755 -index 000000000000..9404ff44b628 +index 0000000000000..9404ff44b6286 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/pci_ops.h @@ -0,0 +1,60 @@ @@ -241125,7 +241125,7 @@ index 000000000000..9404ff44b628 +#endif diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/pci_osintf.h b/drivers/net/wireless/realtek/rtl8192cu/include/pci_osintf.h new file mode 100755 -index 000000000000..09715af43781 +index 0000000000000..09715af43781b --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/pci_osintf.h @@ -0,0 +1,33 @@ @@ -241164,7 +241164,7 @@ index 000000000000..09715af43781 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/recv_osdep.h b/drivers/net/wireless/realtek/rtl8192cu/include/recv_osdep.h new file mode 100755 -index 000000000000..536ed3100ae2 +index 0000000000000..536ed3100ae2c --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/recv_osdep.h @@ -0,0 +1,58 @@ @@ -241228,7 +241228,7 @@ index 000000000000..536ed3100ae2 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_cmd.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_cmd.h new file mode 100755 -index 000000000000..c54cc31334e3 +index 0000000000000..c54cc31334e3a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_cmd.h @@ -0,0 +1,153 @@ @@ -241387,7 +241387,7 @@ index 000000000000..c54cc31334e3 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_dm.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_dm.h new file mode 100755 -index 000000000000..9d065405ecbc +index 0000000000000..9d065405ecbc3 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_dm.h @@ -0,0 +1,516 @@ @@ -241909,7 +241909,7 @@ index 000000000000..9d065405ecbc + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_event.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_event.h new file mode 100755 -index 000000000000..1013f74a0be3 +index 0000000000000..1013f74a0be3f --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_event.h @@ -0,0 +1,28 @@ @@ -241943,7 +241943,7 @@ index 000000000000..1013f74a0be3 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_hal.h new file mode 100755 -index 000000000000..3348971c8018 +index 0000000000000..3348971c8018d --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_hal.h @@ -0,0 +1,937 @@ @@ -242886,7 +242886,7 @@ index 000000000000..3348971c8018 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_led.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_led.h new file mode 100755 -index 000000000000..1ccf93596896 +index 0000000000000..1ccf935968964 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_led.h @@ -0,0 +1,42 @@ @@ -242934,7 +242934,7 @@ index 000000000000..1ccf93596896 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_recv.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_recv.h new file mode 100755 -index 000000000000..d5656f5ebd8f +index 0000000000000..d5656f5ebd8f5 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_recv.h @@ -0,0 +1,184 @@ @@ -243124,7 +243124,7 @@ index 000000000000..d5656f5ebd8f + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_rf.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_rf.h new file mode 100755 -index 000000000000..26c678a8da43 +index 0000000000000..26c678a8da437 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_rf.h @@ -0,0 +1,92 @@ @@ -243222,7 +243222,7 @@ index 000000000000..26c678a8da43 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_spec.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_spec.h new file mode 100755 -index 000000000000..8ff13a7e1210 +index 0000000000000..8ff13a7e12106 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_spec.h @@ -0,0 +1,1865 @@ @@ -245093,7 +245093,7 @@ index 000000000000..8ff13a7e1210 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_sreset.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_sreset.h new file mode 100755 -index 000000000000..20e88b5017cb +index 0000000000000..20e88b5017cbf --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_sreset.h @@ -0,0 +1,32 @@ @@ -245131,7 +245131,7 @@ index 000000000000..20e88b5017cb +#endif diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_xmit.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_xmit.h new file mode 100755 -index 000000000000..7d2059dfc3ac +index 0000000000000..7d2059dfc3ac8 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_xmit.h @@ -0,0 +1,129 @@ @@ -245266,7 +245266,7 @@ index 000000000000..7d2059dfc3ac + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_cmd.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_cmd.h new file mode 100755 -index 000000000000..ad7e7838e870 +index 0000000000000..ad7e7838e870b --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_cmd.h @@ -0,0 +1,142 @@ @@ -245414,7 +245414,7 @@ index 000000000000..ad7e7838e870 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_dm.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_dm.h new file mode 100755 -index 000000000000..ab5e5f79597d +index 0000000000000..ab5e5f79597d3 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_dm.h @@ -0,0 +1,420 @@ @@ -245840,7 +245840,7 @@ index 000000000000..ab5e5f79597d +#endif //__HAL8190PCIDM_H__ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h new file mode 100755 -index 000000000000..1ab5f9825915 +index 0000000000000..1ab5f98259159 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h @@ -0,0 +1,1126 @@ @@ -246972,7 +246972,7 @@ index 000000000000..1ab5f9825915 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_led.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_led.h new file mode 100755 -index 000000000000..d736bda4e935 +index 0000000000000..d736bda4e9357 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_led.h @@ -0,0 +1,43 @@ @@ -247021,7 +247021,7 @@ index 000000000000..d736bda4e935 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_recv.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_recv.h new file mode 100755 -index 000000000000..36cc2322be76 +index 0000000000000..36cc2322be768 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_recv.h @@ -0,0 +1,187 @@ @@ -247214,7 +247214,7 @@ index 000000000000..36cc2322be76 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_rf.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_rf.h new file mode 100755 -index 000000000000..0b439a3f0dd7 +index 0000000000000..0b439a3f0dd7b --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_rf.h @@ -0,0 +1,97 @@ @@ -247317,7 +247317,7 @@ index 000000000000..0b439a3f0dd7 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_spec.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_spec.h new file mode 100755 -index 000000000000..bef7184e27c0 +index 0000000000000..bef7184e27c0f --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_spec.h @@ -0,0 +1,1841 @@ @@ -249164,7 +249164,7 @@ index 000000000000..bef7184e27c0 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_xmit.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_xmit.h new file mode 100755 -index 000000000000..d01fb4a76caa +index 0000000000000..d01fb4a76caa6 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_xmit.h @@ -0,0 +1,145 @@ @@ -249315,7 +249315,7 @@ index 000000000000..d01fb4a76caa + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_android.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_android.h new file mode 100755 -index 000000000000..f9214c2d8a05 +index 0000000000000..f9214c2d8a050 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_android.h @@ -0,0 +1,90 @@ @@ -249411,7 +249411,7 @@ index 000000000000..f9214c2d8a05 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ap.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ap.h new file mode 100755 -index 000000000000..42be4c67b508 +index 0000000000000..42be4c67b5085 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ap.h @@ -0,0 +1,64 @@ @@ -249481,7 +249481,7 @@ index 000000000000..42be4c67b508 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_br_ext.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_br_ext.h new file mode 100755 -index 000000000000..9da3fddc4965 +index 0000000000000..9da3fddc4965e --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_br_ext.h @@ -0,0 +1,76 @@ @@ -249563,7 +249563,7 @@ index 000000000000..9da3fddc4965 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_byteorder.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_byteorder.h new file mode 100755 -index 000000000000..0f06b7acb3aa +index 0000000000000..0f06b7acb3aab --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_byteorder.h @@ -0,0 +1,40 @@ @@ -249609,7 +249609,7 @@ index 000000000000..0f06b7acb3aa + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_cmd.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_cmd.h new file mode 100755 -index 000000000000..ab115c5f6a23 +index 0000000000000..ab115c5f6a234 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_cmd.h @@ -0,0 +1,1167 @@ @@ -250782,7 +250782,7 @@ index 000000000000..ab115c5f6a23 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_debug.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_debug.h new file mode 100755 -index 000000000000..44537363a76b +index 0000000000000..44537363a76bf --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_debug.h @@ -0,0 +1,538 @@ @@ -251326,7 +251326,7 @@ index 000000000000..44537363a76b + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_eeprom.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_eeprom.h new file mode 100755 -index 000000000000..ce834dd19aef +index 0000000000000..ce834dd19aef8 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_eeprom.h @@ -0,0 +1,152 @@ @@ -251484,7 +251484,7 @@ index 000000000000..ce834dd19aef +#endif //__RTL871X_EEPROM_H__ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_efuse.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_efuse.h new file mode 100755 -index 000000000000..224aa4f92bd7 +index 0000000000000..224aa4f92bd77 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_efuse.h @@ -0,0 +1,124 @@ @@ -251614,7 +251614,7 @@ index 000000000000..224aa4f92bd7 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_event.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_event.h new file mode 100755 -index 000000000000..4299ddcf9cd0 +index 0000000000000..4299ddcf9cd0f --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_event.h @@ -0,0 +1,154 @@ @@ -251774,7 +251774,7 @@ index 000000000000..4299ddcf9cd0 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ht.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ht.h new file mode 100755 -index 000000000000..3cd904df9c7c +index 0000000000000..3cd904df9c7c3 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ht.h @@ -0,0 +1,50 @@ @@ -251830,7 +251830,7 @@ index 000000000000..3cd904df9c7c + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_io.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_io.h new file mode 100755 -index 000000000000..c66845c86b01 +index 0000000000000..c66845c86b016 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_io.h @@ -0,0 +1,504 @@ @@ -252340,7 +252340,7 @@ index 000000000000..c66845c86b01 +#endif //_RTL8711_IO_H_ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl.h new file mode 100755 -index 000000000000..c4da30199b52 +index 0000000000000..c4da30199b521 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl.h @@ -0,0 +1,269 @@ @@ -252615,7 +252615,7 @@ index 000000000000..c4da30199b52 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_query.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_query.h new file mode 100755 -index 000000000000..5b6018af5653 +index 0000000000000..5b6018af5653a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_query.h @@ -0,0 +1,36 @@ @@ -252657,7 +252657,7 @@ index 000000000000..5b6018af5653 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_rtl.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_rtl.h new file mode 100755 -index 000000000000..3bff766513bd +index 0000000000000..3bff766513bde --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_rtl.h @@ -0,0 +1,83 @@ @@ -252746,7 +252746,7 @@ index 000000000000..3bff766513bd +#endif diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_set.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_set.h new file mode 100755 -index 000000000000..31d9cf66aee9 +index 0000000000000..31d9cf66aee9b --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_set.h @@ -0,0 +1,79 @@ @@ -252831,7 +252831,7 @@ index 000000000000..31d9cf66aee9 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_iol.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_iol.h new file mode 100755 -index 000000000000..45fa5a22554e +index 0000000000000..45fa5a22554ed --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_iol.h @@ -0,0 +1,89 @@ @@ -252926,7 +252926,7 @@ index 000000000000..45fa5a22554e +#endif //__RTW_IOL_H_ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_led.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_led.h new file mode 100755 -index 000000000000..b5365ba3743d +index 0000000000000..b5365ba3743d2 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_led.h @@ -0,0 +1,217 @@ @@ -253149,7 +253149,7 @@ index 000000000000..b5365ba3743d + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme.h new file mode 100755 -index 000000000000..60e2ad649168 +index 0000000000000..60e2ad6491682 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme.h @@ -0,0 +1,850 @@ @@ -254005,7 +254005,7 @@ index 000000000000..60e2ad649168 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme_ext.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme_ext.h new file mode 100755 -index 000000000000..5cddca4dc7c6 +index 0000000000000..5cddca4dc7c60 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme_ext.h @@ -0,0 +1,963 @@ @@ -254974,7 +254974,7 @@ index 000000000000..5cddca4dc7c6 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp.h new file mode 100755 -index 000000000000..0ebb1ba62575 +index 0000000000000..0ebb1ba62575c --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp.h @@ -0,0 +1,712 @@ @@ -255692,7 +255692,7 @@ index 000000000000..0ebb1ba62575 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_ioctl.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_ioctl.h new file mode 100755 -index 000000000000..962bc38eee7f +index 0000000000000..962bc38eee7f7 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_ioctl.h @@ -0,0 +1,596 @@ @@ -256294,7 +256294,7 @@ index 000000000000..962bc38eee7f + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_phy_regdef.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_phy_regdef.h new file mode 100755 -index 000000000000..0b47cb5c546f +index 0000000000000..0b47cb5c546f2 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_phy_regdef.h @@ -0,0 +1,1097 @@ @@ -257397,7 +257397,7 @@ index 000000000000..0b47cb5c546f + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_p2p.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_p2p.h new file mode 100755 -index 000000000000..4249bc96cda9 +index 0000000000000..4249bc96cda9e --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_p2p.h @@ -0,0 +1,161 @@ @@ -257564,7 +257564,7 @@ index 000000000000..4249bc96cda9 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_pwrctrl.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_pwrctrl.h new file mode 100755 -index 000000000000..a4cb292e1aea +index 0000000000000..a4cb292e1aeaf --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_pwrctrl.h @@ -0,0 +1,362 @@ @@ -257932,7 +257932,7 @@ index 000000000000..a4cb292e1aea +#endif //__RTL871X_PWRCTRL_H_ diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_qos.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_qos.h new file mode 100755 -index 000000000000..a359c5feb574 +index 0000000000000..a359c5feb5742 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_qos.h @@ -0,0 +1,40 @@ @@ -257978,7 +257978,7 @@ index 000000000000..a359c5feb574 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_recv.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_recv.h new file mode 100755 -index 000000000000..3a4b14bb91c4 +index 0000000000000..3a4b14bb91c4f --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_recv.h @@ -0,0 +1,731 @@ @@ -258715,7 +258715,7 @@ index 000000000000..3a4b14bb91c4 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_rf.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_rf.h new file mode 100755 -index 000000000000..697dd4e5d463 +index 0000000000000..697dd4e5d4630 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_rf.h @@ -0,0 +1,152 @@ @@ -258873,7 +258873,7 @@ index 000000000000..697dd4e5d463 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_security.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_security.h new file mode 100755 -index 000000000000..835677c37c48 +index 0000000000000..835677c37c488 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_security.h @@ -0,0 +1,447 @@ @@ -259326,7 +259326,7 @@ index 000000000000..835677c37c48 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_sreset.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_sreset.h new file mode 100755 -index 000000000000..45dd2bfbf1e2 +index 0000000000000..45dd2bfbf1e21 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_sreset.h @@ -0,0 +1,74 @@ @@ -259406,7 +259406,7 @@ index 000000000000..45dd2bfbf1e2 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_tdls.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_tdls.h new file mode 100755 -index 000000000000..1005331cc459 +index 0000000000000..1005331cc4592 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_tdls.h @@ -0,0 +1,143 @@ @@ -259555,14 +259555,14 @@ index 000000000000..1005331cc459 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_version.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_version.h new file mode 100644 -index 000000000000..4fb9dd437109 +index 0000000000000..4fb9dd4371094 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_version.h @@ -0,0 +1 @@ +#define DRIVERVERSION "v4.0.2_9000.20130911" diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_xmit.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_xmit.h new file mode 100755 -index 000000000000..f7eaf4a68b11 +index 0000000000000..f7eaf4a68b119 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_xmit.h @@ -0,0 +1,754 @@ @@ -260322,7 +260322,7 @@ index 000000000000..f7eaf4a68b11 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/sta_info.h b/drivers/net/wireless/realtek/rtl8192cu/include/sta_info.h new file mode 100755 -index 000000000000..4f563b558d78 +index 0000000000000..4f563b558d786 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/sta_info.h @@ -0,0 +1,432 @@ @@ -260760,7 +260760,7 @@ index 000000000000..4f563b558d78 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_hal.h new file mode 100755 -index 000000000000..d765b82076b9 +index 0000000000000..d765b82076b9a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_hal.h @@ -0,0 +1,37 @@ @@ -260803,7 +260803,7 @@ index 000000000000..d765b82076b9 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops.h new file mode 100755 -index 000000000000..8bbec2d8e39c +index 0000000000000..8bbec2d8e39c3 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops.h @@ -0,0 +1,110 @@ @@ -260919,7 +260919,7 @@ index 000000000000..8bbec2d8e39c + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops_linux.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops_linux.h new file mode 100755 -index 000000000000..d418ba26c924 +index 0000000000000..d418ba26c924a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops_linux.h @@ -0,0 +1,63 @@ @@ -260988,7 +260988,7 @@ index 000000000000..d418ba26c924 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_osintf.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_osintf.h new file mode 100755 -index 000000000000..753013dd0a54 +index 0000000000000..753013dd0a544 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_osintf.h @@ -0,0 +1,38 @@ @@ -261032,7 +261032,7 @@ index 000000000000..753013dd0a54 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_vendor_req.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_vendor_req.h new file mode 100755 -index 000000000000..f33e98258385 +index 0000000000000..f33e98258385c --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_vendor_req.h @@ -0,0 +1,59 @@ @@ -261097,7 +261097,7 @@ index 000000000000..f33e98258385 +#endif diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/wifi.h b/drivers/net/wireless/realtek/rtl8192cu/include/wifi.h new file mode 100755 -index 000000000000..c5a5f2f28fba +index 0000000000000..c5a5f2f28fbaf --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/wifi.h @@ -0,0 +1,1248 @@ @@ -262351,7 +262351,7 @@ index 000000000000..c5a5f2f28fba + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/wlan_bssdef.h b/drivers/net/wireless/realtek/rtl8192cu/include/wlan_bssdef.h new file mode 100755 -index 000000000000..1cf93dca46a1 +index 0000000000000..1cf93dca46a1f --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/wlan_bssdef.h @@ -0,0 +1,703 @@ @@ -263060,7 +263060,7 @@ index 000000000000..1cf93dca46a1 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/xmit_osdep.h b/drivers/net/wireless/realtek/rtl8192cu/include/xmit_osdep.h new file mode 100755 -index 000000000000..e5848ece14d8 +index 0000000000000..e5848ece14d86 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/include/xmit_osdep.h @@ -0,0 +1,95 @@ @@ -263161,7 +263161,7 @@ index 000000000000..e5848ece14d8 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_cfg80211.c new file mode 100755 -index 000000000000..28807e914857 +index 0000000000000..28807e9148579 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_cfg80211.c @@ -0,0 +1,5589 @@ @@ -268756,7 +268756,7 @@ index 000000000000..28807e914857 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_linux.c new file mode 100755 -index 000000000000..9adbeaf16cf8 +index 0000000000000..9adbeaf16cf85 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_linux.c @@ -0,0 +1,11909 @@ @@ -280671,7 +280671,7 @@ index 000000000000..9adbeaf16cf8 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/mlme_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/mlme_linux.c new file mode 100755 -index 000000000000..0ec8d05958cf +index 0000000000000..0ec8d05958cf3 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/mlme_linux.c @@ -0,0 +1,653 @@ @@ -281330,7 +281330,7 @@ index 000000000000..0ec8d05958cf + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c new file mode 100755 -index 000000000000..c93e32f133e3 +index 0000000000000..c93e32f133e36 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c @@ -0,0 +1,2771 @@ @@ -284107,7 +284107,7 @@ index 000000000000..c93e32f133e3 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_intf.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_intf.c new file mode 100755 -index 000000000000..5bf576f1a3e3 +index 0000000000000..5bf576f1a3e3e --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_intf.c @@ -0,0 +1,1997 @@ @@ -286110,7 +286110,7 @@ index 000000000000..5bf576f1a3e3 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_ops_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_ops_linux.c new file mode 100755 -index 000000000000..7d671df3932c +index 0000000000000..7d671df3932c2 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_ops_linux.c @@ -0,0 +1,24 @@ @@ -286140,7 +286140,7 @@ index 000000000000..7d671df3932c + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/recv_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/recv_linux.c new file mode 100755 -index 000000000000..628abdf7832b +index 0000000000000..628abdf7832bc --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/recv_linux.c @@ -0,0 +1,461 @@ @@ -286607,7 +286607,7 @@ index 000000000000..628abdf7832b + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/rtw_android.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/rtw_android.c new file mode 100755 -index 000000000000..2908c5169294 +index 0000000000000..2908c51692946 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/rtw_android.c @@ -0,0 +1,843 @@ @@ -287456,7 +287456,7 @@ index 000000000000..2908c5169294 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_intf.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_intf.c new file mode 100755 -index 000000000000..de044435d5ec +index 0000000000000..de044435d5eca --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_intf.c @@ -0,0 +1,1662 @@ @@ -289124,7 +289124,7 @@ index 000000000000..de044435d5ec + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_ops_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_ops_linux.c new file mode 100755 -index 000000000000..f54cfb4283d4 +index 0000000000000..f54cfb4283d46 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_ops_linux.c @@ -0,0 +1,649 @@ @@ -289779,7 +289779,7 @@ index 000000000000..f54cfb4283d4 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/xmit_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/xmit_linux.c new file mode 100755 -index 000000000000..9105e293eb3c +index 0000000000000..9105e293eb3c8 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/xmit_linux.c @@ -0,0 +1,421 @@ @@ -290206,7 +290206,7 @@ index 000000000000..9105e293eb3c + diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/osdep_service.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/osdep_service.c new file mode 100755 -index 000000000000..1dc4c3a1cb8b +index 0000000000000..1dc4c3a1cb8b3 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/osdep_service.c @@ -0,0 +1,2300 @@ @@ -292512,7 +292512,7 @@ index 000000000000..1dc4c3a1cb8b + diff --git a/drivers/net/wireless/realtek/rtl8192cu/runwpa b/drivers/net/wireless/realtek/rtl8192cu/runwpa new file mode 100755 -index 000000000000..f825e8bdb123 +index 0000000000000..f825e8bdb123a --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/runwpa @@ -0,0 +1,20 @@ @@ -292538,7 +292538,7 @@ index 000000000000..f825e8bdb123 + diff --git a/drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp b/drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp new file mode 100755 -index 000000000000..24ab3720bef6 +index 0000000000000..24ab3720bef62 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp @@ -0,0 +1,15 @@ @@ -292561,10 +292561,10 @@ index 000000000000..24ab3720bef6 2.18.4 -From 4cc07cf449bd37eaf1fb85562ca40895a6e8d4fa Mon Sep 17 00:00:00 2001 +From dca3c1fff01b7a50f83d034744ebea9cb20e73ad Mon Sep 17 00:00:00 2001 From: Pantelis Antoniou Date: Wed, 3 Dec 2014 13:23:28 +0200 -Subject: [PATCH 0084/1216] OF: DT-Overlay configfs interface +Subject: [PATCH 0084/1224] 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. @@ -292619,7 +292619,7 @@ configfs: New of_overlay API diff --git a/Documentation/devicetree/configfs-overlays.txt b/Documentation/devicetree/configfs-overlays.txt new file mode 100644 -index 000000000000..5fa43e064307 +index 0000000000000..5fa43e0643072 --- /dev/null +++ b/Documentation/devicetree/configfs-overlays.txt @@ -0,0 +1,31 @@ @@ -292655,7 +292655,7 @@ index 000000000000..5fa43e064307 +intended to be used by hardware managers in the kernel, while the copy interface +make sense for developers (since it avoids problems with namespaces). diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig -index d91618641be6..f6643624c8e3 100644 +index d91618641be69..f6643624c8e32 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -107,4 +107,11 @@ config OF_DMA_DEFAULT_COHERENT @@ -292671,7 +292671,7 @@ index d91618641be6..f6643624c8e3 100644 + endif # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile -index 663a4af0cccd..b00a95adf519 100644 +index 663a4af0cccd5..b00a95adf5199 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -1,6 +1,7 @@ @@ -292684,7 +292684,7 @@ index 663a4af0cccd..b00a95adf519 100644 obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c new file mode 100644 -index 000000000000..178f0629b0f0 +index 0000000000000..178f0629b0f01 --- /dev/null +++ b/drivers/of/configfs.c @@ -0,0 +1,310 @@ @@ -293002,10 +293002,10 @@ index 000000000000..178f0629b0f0 2.18.4 -From b28061efe7d2dc3ec239a2d7b792616e97f69077 Mon Sep 17 00:00:00 2001 +From 2aa0d0302437844ce54994dc86156443226b151b Mon Sep 17 00:00:00 2001 From: Cheong2K Date: Fri, 26 Feb 2016 18:20:10 +0800 -Subject: [PATCH 0085/1216] brcm: adds support for BCM43341 wifi +Subject: [PATCH 0085/1224] brcm: adds support for BCM43341 wifi brcmfmac: Disable power management @@ -293051,7 +293051,7 @@ Signed-off-by: Phil Elwell 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 4ca50353538e..4b97dfcda3cd 100644 +index 4ca50353538ef..4b97dfcda3cd3 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -2769,6 +2769,8 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev, @@ -293103,7 +293103,7 @@ index 4ca50353538e..4b97dfcda3cd 100644 ccreq->country_abbrev[1] = alpha2[1]; ccreq->country_abbrev[2] = 0; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -index dec25e415619..5c2a03d629e4 100644 +index dec25e4156199..5c2a03d629e48 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -59,7 +59,7 @@ static int brcmf_fcmode; @@ -293116,7 +293116,7 @@ index dec25e415619..5c2a03d629e4 100644 MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine"); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index ef5521b9b357..0c9f5b5791e9 100644 +index ef5521b9b3577..0c9f5b5791e93 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -604,6 +604,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); @@ -293140,10 +293140,10 @@ index ef5521b9b357..0c9f5b5791e9 100644 2.18.4 -From 6441d5a683e1b70915e0bce382ef5f16b0bd497c Mon Sep 17 00:00:00 2001 +From c09e09ea4b2c2a78e189b723d9f6c5690a1aed7f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 17 Dec 2015 13:37:07 +0000 -Subject: [PATCH 0086/1216] hci_h5: Don't send conf_req when ACTIVE +Subject: [PATCH 0086/1224] hci_h5: Don't send conf_req when ACTIVE Without this patch, a modem and kernel can continuously bombard each other with conf_req and conf_rsp messages, in a demented game of tag. @@ -293152,10 +293152,10 @@ other with conf_req and conf_rsp messages, in a demented game of tag. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c -index 17b0f1b793ec..58308dd6acf3 100644 +index e11af747395dd..c29c8c4c462ce 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c -@@ -346,7 +346,8 @@ static void h5_handle_internal_rx(struct hci_uart *hu) +@@ -342,7 +342,8 @@ static void h5_handle_internal_rx(struct hci_uart *hu) h5_link_control(hu, conf_req, 3); } else if (memcmp(data, conf_req, 2) == 0) { h5_link_control(hu, conf_rsp, 2); @@ -293169,10 +293169,10 @@ index 17b0f1b793ec..58308dd6acf3 100644 2.18.4 -From 000b5c81c03702b9b3b39d1adca5bb2dae4e9c82 Mon Sep 17 00:00:00 2001 +From 20fb181c868504f2308bae953efd23d6146787ea Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 13 Apr 2015 17:16:29 +0100 -Subject: [PATCH 0087/1216] config: Add default configs +Subject: [PATCH 0087/1224] config: Add default configs --- arch/arm/configs/bcm2709_defconfig | 1444 +++++++++++++++++++++++++ @@ -293189,7 +293189,7 @@ Subject: [PATCH 0087/1216] config: Add default configs diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig new file mode 100644 -index 000000000000..fbaccfbd0ed3 +index 0000000000000..fbaccfbd0ed3a --- /dev/null +++ b/arch/arm/configs/bcm2709_defconfig @@ -0,0 +1,1444 @@ @@ -294639,7 +294639,7 @@ index 000000000000..fbaccfbd0ed3 +CONFIG_KDB_KEYBOARD=y diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig new file mode 100644 -index 000000000000..ec25f919fe4b +index 0000000000000..ec25f919fe4b9 --- /dev/null +++ b/arch/arm/configs/bcm2711_defconfig @@ -0,0 +1,1439 @@ @@ -296084,7 +296084,7 @@ index 000000000000..ec25f919fe4b +CONFIG_KDB_KEYBOARD=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig new file mode 100644 -index 000000000000..b4f93d8fd86f +index 0000000000000..b4f93d8fd86f3 --- /dev/null +++ b/arch/arm/configs/bcmrpi_defconfig @@ -0,0 +1,1454 @@ @@ -297544,7 +297544,7 @@ index 000000000000..b4f93d8fd86f +CONFIG_KDB_KEYBOARD=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig new file mode 100644 -index 000000000000..4719d38c4b4e +index 0000000000000..4719d38c4b4e5 --- /dev/null +++ b/arch/arm64/configs/bcm2711_defconfig @@ -0,0 +1,1465 @@ @@ -299015,7 +299015,7 @@ index 000000000000..4719d38c4b4e +CONFIG_KDB_KEYBOARD=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig new file mode 100644 -index 000000000000..ca7668f549bc +index 0000000000000..ca7668f549bcd --- /dev/null +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -0,0 +1,1243 @@ @@ -300266,10 +300266,10 @@ index 000000000000..ca7668f549bc 2.18.4 -From a7efd4f0ac8995181b4c3796636072d1fa141151 Mon Sep 17 00:00:00 2001 +From 61cd12e1b914a23f4ef274afe5daab6ce42b1293 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 14 Jan 2017 21:43:57 -0800 -Subject: [PATCH 0088/1216] ARM64: Round-Robin dispatch IRQs between CPUs. +Subject: [PATCH 0088/1224] 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 @@ -300282,7 +300282,7 @@ Signed-off-by: Michael Zoran 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index ff7b998579c1..93878d725f26 100644 +index ff7b998579c1e..93878d725f260 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -153,10 +153,23 @@ static void armctrl_unmask_irq(struct irq_data *d) @@ -300311,7 +300311,7 @@ index ff7b998579c1..93878d725f26 100644 static int armctrl_xlate(struct irq_domain *d, struct device_node *ctrlr, diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c -index 49642bcd0b75..d8ef8f7fee5b 100644 +index 49642bcd0b75c..d8ef8f7fee5bb 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -86,6 +86,27 @@ static void bcm2836_arm_irqchip_unmask_gpu_irq(struct irq_data *d) @@ -300346,10 +300346,10 @@ index 49642bcd0b75..d8ef8f7fee5b 100644 2.18.4 -From a497dc6189cb4cb9d420bfa398dfc777e91a772a Mon Sep 17 00:00:00 2001 +From cbfc9173012ca7dd33bffe54e93135a5aca00477 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 11 Feb 2017 01:18:31 -0800 -Subject: [PATCH 0089/1216] ARM64: Force hardware emulation of deprecated +Subject: [PATCH 0089/1224] ARM64: Force hardware emulation of deprecated instructions. --- @@ -300357,7 +300357,7 @@ Subject: [PATCH 0089/1216] ARM64: Force hardware emulation of deprecated 1 file changed, 5 insertions(+) diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c -index bcb14d11232f..bfa3a069cbf1 100644 +index bcb14d11232f9..bfa3a069cbf1e 100644 --- a/arch/arm64/kernel/armv8_deprecated.c +++ b/arch/arm64/kernel/armv8_deprecated.c @@ -182,10 +182,15 @@ static void __init register_insn_emulation(struct insn_emulation_ops *ops) @@ -300380,10 +300380,10 @@ index bcb14d11232f..bfa3a069cbf1 100644 2.18.4 -From 633a93d54c2328bcda62deece75850926b15a118 Mon Sep 17 00:00:00 2001 +From 71e6e8706734c5735bdea575552add85cf27efe1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 10 Feb 2017 17:57:08 -0800 -Subject: [PATCH 0090/1216] build/arm64: Add rules for .dtbo files for dts +Subject: [PATCH 0090/1224] build/arm64: Add rules for .dtbo files for dts overlays We now create overlays as .dtbo files. @@ -300394,7 +300394,7 @@ Signed-off-by: Khem Raj 1 file changed, 14 insertions(+) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index cd8f3cdabfd0..8e9bc1497a59 100644 +index cd8f3cdabfd07..8e9bc1497a59a 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -143,6 +143,20 @@ Image.%: Image @@ -300422,10 +300422,10 @@ index cd8f3cdabfd0..8e9bc1497a59 100644 2.18.4 -From 2cf0e8b6585e8d04297b14bd08d592be767dab27 Mon Sep 17 00:00:00 2001 +From 72da7c069a4d1f7a630516053a6a88c650b916ac Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Nov 2018 21:01:18 +0000 -Subject: [PATCH 0091/1216] Revert "build/arm64: Add rules for .dtbo files for +Subject: [PATCH 0091/1224] Revert "build/arm64: Add rules for .dtbo files for dts overlays" DT build rules are now in the common top-level Makefile. @@ -300436,7 +300436,7 @@ This reverts commit dce5b0fbdd2174f7fc9b27f4e89877a33169239a. 1 file changed, 14 deletions(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 8e9bc1497a59..cd8f3cdabfd0 100644 +index 8e9bc1497a59a..cd8f3cdabfd07 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -143,20 +143,6 @@ Image.%: Image @@ -300464,10 +300464,10 @@ index 8e9bc1497a59..cd8f3cdabfd0 100644 2.18.4 -From 6a05547fcf66f546180f9301aedf11fdaede1ffa Mon Sep 17 00:00:00 2001 +From 73b8c900fd6509c3652f80cd55c58a1271680cc5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 25 Aug 2017 19:18:13 +0100 -Subject: [PATCH 0092/1216] cache: export clean and invalidate +Subject: [PATCH 0092/1224] cache: export clean and invalidate hack: cache: Fix linker error --- @@ -300476,7 +300476,7 @@ hack: cache: Fix linker error 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S -index f0f65eb073e4..868011801521 100644 +index f0f65eb073e48..8680118015219 100644 --- a/arch/arm/mm/cache-v6.S +++ b/arch/arm/mm/cache-v6.S @@ -198,7 +198,7 @@ ENTRY(v6_flush_kern_dcache_area) @@ -300498,7 +300498,7 @@ index f0f65eb073e4..868011801521 100644 1: #ifdef CONFIG_DMA_CACHE_RWFO diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S -index 0ee8fc4b4672..8acb1857ff67 100644 +index 0ee8fc4b4672c..8acb1857ff679 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S @@ -363,7 +363,8 @@ ENDPROC(v7_flush_kern_dcache_area) @@ -300525,10 +300525,10 @@ index 0ee8fc4b4672..8acb1857ff67 100644 2.18.4 -From 20badee896c48906941d3534d95f35ddd4175fdd Mon Sep 17 00:00:00 2001 +From 55343459001e6aff869c7b584515f5d342e5a1f5 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 14 Nov 2017 15:13:15 +0000 -Subject: [PATCH 0093/1216] AXI performance monitor driver (#2222) +Subject: [PATCH 0093/1224] AXI performance monitor driver (#2222) Uses the debugfs I/F to provide access to the AXI bus performance monitors. @@ -300553,7 +300553,7 @@ Signed-off-by: Matteo Croce create mode 100644 drivers/perf/raspberrypi_axi_monitor.c diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig -index 09ae8a970880..6b49f81903cd 100644 +index 09ae8a970880f..6b49f81903cda 100644 --- a/drivers/perf/Kconfig +++ b/drivers/perf/Kconfig @@ -129,4 +129,11 @@ config ARM_SPE_PMU @@ -300569,7 +300569,7 @@ index 09ae8a970880..6b49f81903cd 100644 + you want to build it as a module. endmenu diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile -index 2ebb4de17815..23e4cd681386 100644 +index 2ebb4de178151..23e4cd6813860 100644 --- a/drivers/perf/Makefile +++ b/drivers/perf/Makefile @@ -12,3 +12,4 @@ obj-$(CONFIG_QCOM_L3_PMU) += qcom_l3_pmu.o @@ -300579,7 +300579,7 @@ index 2ebb4de17815..23e4cd681386 100644 +obj-$(CONFIG_RPI_AXIPERF) += raspberrypi_axi_monitor.o diff --git a/drivers/perf/raspberrypi_axi_monitor.c b/drivers/perf/raspberrypi_axi_monitor.c new file mode 100644 -index 000000000000..5ae2bdaa88b4 +index 0000000000000..5ae2bdaa88b41 --- /dev/null +++ b/drivers/perf/raspberrypi_axi_monitor.c @@ -0,0 +1,637 @@ @@ -301224,10 +301224,10 @@ index 000000000000..5ae2bdaa88b4 2.18.4 -From 94a3bc6a46c578a2ea8c0141f936f35811f1a732 Mon Sep 17 00:00:00 2001 +From 5d8aaf1cddc7738eab0b79ab6bfc8ee8a0374b97 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Nov 2017 17:14:54 +0000 -Subject: [PATCH 0094/1216] cgroup: Disable cgroup "memory" by default +Subject: [PATCH 0094/1224] cgroup: Disable cgroup "memory" by default Some Raspberry Pis have limited RAM and most users won't use the cgroup memory support so it is disabled by default. Enable with: @@ -301242,7 +301242,7 @@ Signed-off-by: Phil Elwell 1 file changed, 30 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c -index 35faf082a709..9f97b287891b 100644 +index 35faf082a709c..9f97b287891b6 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5720,6 +5720,8 @@ int __init cgroup_init_early(void) @@ -301300,10 +301300,10 @@ index 35faf082a709..9f97b287891b 100644 2.18.4 -From 18574d2fcde5f3bb7f378db5b76286e75e2dc666 Mon Sep 17 00:00:00 2001 +From 5b6f3667faf5bbd1da4afab07718f0f120583d7b 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/1216] ARM: bcm2835: Set Serial number and Revision +Subject: [PATCH 0095/1224] ARM: bcm2835: Set Serial number and Revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -301328,7 +301328,7 @@ Signed-off-by: Noralf Trønnes 1 file changed, 14 insertions(+) diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index bfc556f76720..73ec2427fbcf 100644 +index bfc556f767203..73ec2427fbcfb 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -6,12 +6,25 @@ @@ -301369,10 +301369,10 @@ index bfc556f76720..73ec2427fbcf 100644 2.18.4 -From 2a374a6a970b86d0955860d6606c340407e608f7 Mon Sep 17 00:00:00 2001 +From ae5fb1aea928caba362118be29e6394862ece8b6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 16 Jul 2018 14:40:13 +0100 -Subject: [PATCH 0096/1216] dwc-otg: FIQ: Fix "bad mode in data abort handler" +Subject: [PATCH 0096/1224] 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 @@ -301387,7 +301387,7 @@ Signed-off-by: Floris Bos 1 file changed, 69 insertions(+) diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 73ec2427fbcf..9b6c921106b5 100644 +index 73ec2427fbcfb..9b6c921106b56 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -6,6 +6,7 @@ @@ -301491,10 +301491,10 @@ index 73ec2427fbcf..9b6c921106b5 100644 2.18.4 -From 9789ef7eb53f7adc6d0be997db6e8ece96b2f14c Mon Sep 17 00:00:00 2001 +From ebbb17ba3803b1944059ed222db3a23d89232cd5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Dec 2017 09:18:32 +0000 -Subject: [PATCH 0097/1216] ARM: Activate FIQs to avoid __irq_startup warnings +Subject: [PATCH 0097/1224] 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. @@ -301508,7 +301508,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c -index cd1234c103fc..a0f96e3b8898 100644 +index cd1234c103fcd..a0f96e3b88981 100644 --- a/arch/arm/kernel/fiq.c +++ b/arch/arm/kernel/fiq.c @@ -56,6 +56,8 @@ @@ -301533,10 +301533,10 @@ index cd1234c103fc..a0f96e3b8898 100644 2.18.4 -From fd1e54aaf08afb4bcf7208bd62a68cd7106cc3d8 Mon Sep 17 00:00:00 2001 +From bfcaba14bb76247e0f48bccf5b9a98c1e065c157 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 22 Jan 2018 17:26:38 +0000 -Subject: [PATCH 0098/1216] serial: 8250: bcm2835aux - suppress EPROBE_DEFER +Subject: [PATCH 0098/1224] serial: 8250: bcm2835aux - suppress EPROBE_DEFER Signed-off-by: Phil Elwell --- @@ -301544,7 +301544,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c -index 4997c519ebb3..33da68341c3a 100644 +index 4997c519ebb3a..33da68341c3a7 100644 --- a/drivers/tty/serial/8250/8250_bcm2835aux.c +++ b/drivers/tty/serial/8250/8250_bcm2835aux.c @@ -50,7 +50,8 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev) @@ -301561,10 +301561,10 @@ index 4997c519ebb3..33da68341c3a 100644 2.18.4 -From 9b9f023418a5a19aa6a94b9d2996a6476e4df161 Mon Sep 17 00:00:00 2001 +From 10f9c35c69d075bc0129e93caf0e8b211eb0a0f5 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 14 Sep 2016 09:16:19 +0100 -Subject: [PATCH 0099/1216] raspberrypi-firmware: Export the general +Subject: [PATCH 0099/1224] raspberrypi-firmware: Export the general transaction function. The vc4-firmware-kms module is going to be doing the MBOX FB call. @@ -301575,7 +301575,7 @@ Signed-off-by: Eric Anholt 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index 7162f6d6649c..7947e65a22da 100644 +index 7162f6d6649c6..7947e65a22da9 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -43,7 +43,7 @@ static void response_callback(struct mbox_client *cl, void *msg) @@ -301599,10 +301599,10 @@ index 7162f6d6649c..7947e65a22da 100644 2.18.4 -From 401ec59b75633b0fee33024c1e6bda1802e1eddb Mon Sep 17 00:00:00 2001 +From 39c77eaf67aa99632788f8be1da400084f2ba0bc Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 14 Sep 2016 08:39:33 +0100 -Subject: [PATCH 0100/1216] drm/vc4: Add a mode for using the closed firmware +Subject: [PATCH 0100/1224] drm/vc4: Add a mode for using the closed firmware for display. Signed-off-by: Eric Anholt @@ -301616,7 +301616,7 @@ Signed-off-by: Eric Anholt create mode 100644 drivers/gpu/drm/vc4/vc4_firmware_kms.c diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile -index b303703bc7f3..e90c6304775a 100644 +index b303703bc7f37..e90c6304775ab 100644 --- a/drivers/gpu/drm/vc4/Makefile +++ b/drivers/gpu/drm/vc4/Makefile @@ -9,6 +9,7 @@ vc4-y := \ @@ -301628,7 +301628,7 @@ index b303703bc7f3..e90c6304775a 100644 vc4_gem.o \ vc4_hdmi.o \ diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index f1f0a7c87771..9e51a4e937df 100644 +index f1f0a7c877713..9e51a4e937dfc 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -97,6 +97,9 @@ bool vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id, @@ -301674,7 +301674,7 @@ index f1f0a7c87771..9e51a4e937df 100644 } diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c -index 0d78ba017a29..af8df6d328b9 100644 +index 0d78ba017a29b..af8df6d328b9b 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -346,6 +346,7 @@ static struct platform_driver *const component_drivers[] = { @@ -301686,7 +301686,7 @@ index 0d78ba017a29..af8df6d328b9 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 6627b20c99e9..fbcdb44ccf01 100644 +index 6627b20c99e9c..fbcdb44ccf010 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -71,6 +71,9 @@ struct vc4_perfmon { @@ -301712,7 +301712,7 @@ index 6627b20c99e9..fbcdb44ccf01 100644 void vc4_gem_destroy(struct drm_device *dev); diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c new file mode 100644 -index 000000000000..78c343059355 +index 0000000000000..78c3430593550 --- /dev/null +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -0,0 +1,656 @@ @@ -302376,10 +302376,10 @@ index 000000000000..78c343059355 2.18.4 -From 3d05872be5e232386b6baa14886076d1a7211f55 Mon Sep 17 00:00:00 2001 +From 2d2a391a56fab60de18a516978103f92dffd8aa8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 1 Feb 2017 17:09:18 -0800 -Subject: [PATCH 0101/1216] drm/vc4: Name the primary and cursor planes in +Subject: [PATCH 0101/1224] drm/vc4: Name the primary and cursor planes in fkms. This makes debugging nicer, compared to trying to remember what the @@ -302391,7 +302391,7 @@ Signed-off-by: Eric Anholt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 78c343059355..d9a5551d01a2 100644 +index 78c3430593550..d9a5551d01a21 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -265,7 +265,7 @@ static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev, @@ -302407,10 +302407,10 @@ index 78c343059355..d9a5551d01a2 100644 2.18.4 -From d15bca68f0064fe078f016a925d81bcce2d1843e Mon Sep 17 00:00:00 2001 +From 8570594b338072c276f5d5d6a48a01352a9f09e7 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 1 Feb 2017 17:10:09 -0800 -Subject: [PATCH 0102/1216] drm/vc4: Add DRM_DEBUG_ATOMIC for the insides of +Subject: [PATCH 0102/1224] drm/vc4: Add DRM_DEBUG_ATOMIC for the insides of fkms. Trying to debug weston on fkms involved figuring out what calls I was @@ -302422,7 +302422,7 @@ Signed-off-by: Eric Anholt 1 file changed, 26 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index d9a5551d01a2..e372666af011 100644 +index d9a5551d01a21..e372666af0119 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -101,6 +101,11 @@ static int vc4_plane_set_primary_blank(struct drm_plane *plane, bool blank) @@ -302483,10 +302483,10 @@ index d9a5551d01a2..e372666af011 100644 2.18.4 -From 175df8e9b08bb4c775a8a0c922e8c7ec81683857 Mon Sep 17 00:00:00 2001 +From 7e3160c4096d141f9bd18046134770786a33653d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 Feb 2017 09:42:18 -0800 -Subject: [PATCH 0103/1216] drm/vc4: Fix sending of page flip completion events +Subject: [PATCH 0103/1224] 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 @@ -302502,7 +302502,7 @@ Signed-off-by: Eric Anholt 1 file changed, 15 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index e372666af011..4d7b7f218cbb 100644 +index e372666af0119..4d7b7f218cbbc 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -336,6 +336,21 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc, @@ -302531,10 +302531,10 @@ index e372666af011..4d7b7f218cbb 100644 2.18.4 -From 50e4ab9137bbe4b8a919592b826f2520a446dedb Mon Sep 17 00:00:00 2001 +From 213022f5230df97de8ee6e47f50dd0f5cfc88c21 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 6 Jul 2017 11:45:48 -0700 -Subject: [PATCH 0104/1216] drm/vc4: Add support for setting DPMS in +Subject: [PATCH 0104/1224] drm/vc4: Add support for setting DPMS in firmwarekms. This ensures that the screen goes blank during DPMS (screensaver), @@ -302548,7 +302548,7 @@ Signed-off-by: Eric Anholt 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 4d7b7f218cbb..809437cf3215 100644 +index 4d7b7f218cbbc..809437cf32158 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -36,6 +36,8 @@ struct vc4_crtc { @@ -302641,10 +302641,10 @@ index 4d7b7f218cbb..809437cf3215 100644 2.18.4 -From b425f91a2afae5b78ef1ff23bb3830bc8a67cd6b Mon Sep 17 00:00:00 2001 +From f51321196a1a738b92986c63db914d12a4c64ca8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 7 Jun 2017 14:39:49 -0700 -Subject: [PATCH 0105/1216] drm/vc4: Add FB modifier support to firmwarekms. +Subject: [PATCH 0105/1224] drm/vc4: Add FB modifier support to firmwarekms. Signed-off-by: Eric Anholt (cherry picked from commit 11752d73488e08aaeb65fe8289a9c016acde26c2) @@ -302653,7 +302653,7 @@ Signed-off-by: Eric Anholt 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 809437cf3215..d5066f395b62 100644 +index 809437cf32158..d5066f395b621 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -17,6 +17,7 @@ @@ -302679,10 +302679,10 @@ index 809437cf3215..d5066f395b62 100644 2.18.4 -From 7e1a0279591083e53765fc40e52f91c840e66d93 Mon Sep 17 00:00:00 2001 +From decc7ddf01470a75a3a25723b0d298fb70e47b4a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 30 Jan 2018 14:21:02 -0800 -Subject: [PATCH 0106/1216] drm/vc4: Add missing enable/disable vblank handlers +Subject: [PATCH 0106/1224] drm/vc4: Add missing enable/disable vblank handlers in fkms. Fixes hang at boot in 4.14. @@ -302694,7 +302694,7 @@ Signed-off-by: Eric Anholt 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 9e51a4e937df..7b22d4f2ae57 100644 +index 9e51a4e937dfc..7b22d4f2ae573 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -767,15 +767,8 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc, @@ -302730,7 +302730,7 @@ index 9e51a4e937df..7b22d4f2ae57 100644 } diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index d5066f395b62..e3dfc20c404c 100644 +index d5066f395b621..e3dfc20c404ca 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -433,6 +433,19 @@ static int vc4_page_flip(struct drm_crtc *crtc, @@ -302766,10 +302766,10 @@ index d5066f395b62..e3dfc20c404c 100644 2.18.4 -From e5ba1934e9d447c164e2e664bffc25ffcfd1c0df Mon Sep 17 00:00:00 2001 +From f4833c7225a9c5d674a5d832cc130954ae03c4d5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Apr 2017 21:43:46 +0100 -Subject: [PATCH 0107/1216] vc4_fkms: Apply firmware overscan offset to +Subject: [PATCH 0107/1224] vc4_fkms: Apply firmware overscan offset to hardware cursor --- @@ -302777,7 +302777,7 @@ Subject: [PATCH 0107/1216] vc4_fkms: Apply firmware overscan offset to 1 file changed, 17 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index e3dfc20c404c..7edb38953a6a 100644 +index e3dfc20c404ca..7edb38953a6a2 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -42,6 +42,7 @@ struct vc4_crtc { @@ -302829,10 +302829,10 @@ index e3dfc20c404c..7edb38953a6a 100644 2.18.4 -From 8ddaf8571f47c377ae6c1831658122bde4bc26ec Mon Sep 17 00:00:00 2001 +From b4db876edac270dd1ba3c35cab0cbfd672d14301 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:01:02 +0000 -Subject: [PATCH 0108/1216] drm/vc4: Fix warning about vblank interrupts before +Subject: [PATCH 0108/1224] 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 @@ -302847,7 +302847,7 @@ Signed-off-by: Eric Anholt 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 7edb38953a6a..967a0bf5886b 100644 +index 7edb38953a6a2..967a0bf5886b7 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -43,6 +43,7 @@ struct vc4_crtc { @@ -302885,10 +302885,10 @@ index 7edb38953a6a..967a0bf5886b 100644 2.18.4 -From c1c51c0b3f34f346134dd450def0cafed26f5061 Mon Sep 17 00:00:00 2001 +From e2d36a4e48aa5ba2200d11742eb87dc01ff45ae8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:02:30 +0000 -Subject: [PATCH 0109/1216] drm/vc4: Skip SET_CURSOR_INFO when the cursor +Subject: [PATCH 0109/1224] drm/vc4: Skip SET_CURSOR_INFO when the cursor contents didn't change. Signed-off-by: Eric Anholt @@ -302897,7 +302897,7 @@ Signed-off-by: Eric Anholt 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 967a0bf5886b..462d9084ce53 100644 +index 967a0bf5886b7..462d9084ce53d 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -204,10 +204,6 @@ static void vc4_cursor_plane_atomic_update(struct drm_plane *plane, @@ -302948,10 +302948,10 @@ index 967a0bf5886b..462d9084ce53 100644 2.18.4 -From 53507f416e5ef152fbf6fe0e76e3bc485b76701e Mon Sep 17 00:00:00 2001 +From 126093d4a44bac5d67bc7ddc15c5239885e5137a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:22:03 +0000 -Subject: [PATCH 0110/1216] drm/vc4: Remove duplicate primary/cursor fields +Subject: [PATCH 0110/1224] drm/vc4: Remove duplicate primary/cursor fields from FKMS driver. The CRTC has those fields and we can just use them. @@ -302962,7 +302962,7 @@ Signed-off-by: Eric Anholt 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 462d9084ce53..60e9d8fa5511 100644 +index 462d9084ce53d..60e9d8fa55113 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -37,8 +37,6 @@ struct vc4_crtc { @@ -303025,17 +303025,17 @@ index 462d9084ce53..60e9d8fa5511 100644 2.18.4 -From 34a66d0ab8fd62614823019d13fec96319191b22 Mon Sep 17 00:00:00 2001 +From c1921da42db10b64c6fc3f151384e5225d1a4131 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 17 Jun 2018 13:22:07 +0100 -Subject: [PATCH 0111/1216] vc4_firmware_kms: fix build +Subject: [PATCH 0111/1224] vc4_firmware_kms: fix build --- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 60e9d8fa5511..1584f90face0 100644 +index 60e9d8fa55113..1584f90face03 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -18,6 +18,7 @@ @@ -303090,10 +303090,10 @@ index 60e9d8fa5511..1584f90face0 100644 2.18.4 -From bf405eb22edb9a970ea63e0c2f79361b451aa49c Mon Sep 17 00:00:00 2001 +From 85a8eb7b80e74af0709d7866062dea9bbff3ed07 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Feb 2019 15:06:31 +0000 -Subject: [PATCH 0112/1216] gpu:vc4-fkms: Update driver to not use plane->crtc. +Subject: [PATCH 0112/1224] gpu:vc4-fkms: Update driver to not use plane->crtc. Following on from commit 2f958af7fc248 ("drm/vc4: Stop updating plane->fb/crtc") @@ -303106,7 +303106,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 1584f90face0..347ad72682dc 100644 +index 1584f90face03..347ad72682dc2 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -194,8 +194,8 @@ static void vc4_cursor_plane_atomic_update(struct drm_plane *plane, @@ -303132,10 +303132,10 @@ index 1584f90face0..347ad72682dc 100644 2.18.4 -From de63c2d9a763d389fa701c00cae8432d1420c21c Mon Sep 17 00:00:00 2001 +From ef5b049af7c76dd897d8ed421069e4338a1d7f3e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:53:18 +0000 -Subject: [PATCH 0113/1216] drm/vc4: Don't wait for vblank on fkms cursor +Subject: [PATCH 0113/1224] 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, @@ -303149,7 +303149,7 @@ Signed-off-by: Eric Anholt 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 78d4fb0499e3..75d3e8c6b650 100644 +index 78d4fb0499e39..75d3e8c6b6507 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -240,7 +240,8 @@ static int vc4_atomic_commit(struct drm_device *dev, @@ -303166,10 +303166,10 @@ index 78d4fb0499e3..75d3e8c6b650 100644 2.18.4 -From 4a47428ffaf13cbfc32b014178015ffc0f1ce880 Mon Sep 17 00:00:00 2001 +From cf3b4d273f64b78dbaa7e1fc82c76d43b71c37b6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 20 Feb 2018 10:07:27 +0000 -Subject: [PATCH 0114/1216] i2c-gpio: Also set bus numbers from reg property +Subject: [PATCH 0114/1224] 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 @@ -303189,7 +303189,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c -index a4a6825c8758..cfbcf3952ddc 100644 +index a4a6825c87583..cfbcf3952ddc9 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -445,7 +445,9 @@ static int i2c_gpio_probe(struct platform_device *pdev) @@ -303207,10 +303207,10 @@ index a4a6825c8758..cfbcf3952ddc 100644 2.18.4 -From a408971e1845a73701a9352e1d2e98d990fcb81f Mon Sep 17 00:00:00 2001 +From 505104f4f0eff7709d1e558aed4f61f29ae6846a Mon Sep 17 00:00:00 2001 From: hdoverobinson Date: Tue, 13 Mar 2018 06:58:39 -0400 -Subject: [PATCH 0115/1216] added capture_clear option to pps-gpio via +Subject: [PATCH 0115/1224] added capture_clear option to pps-gpio via dtoverlay (#2433) --- @@ -303218,7 +303218,7 @@ Subject: [PATCH 0115/1216] added capture_clear option to pps-gpio via 1 file changed, 2 insertions(+) diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c -index e0de1df2ede0..ee7d8f4e7f2e 100644 +index e0de1df2ede07..ee7d8f4e7f2e2 100644 --- a/drivers/pps/clients/pps-gpio.c +++ b/drivers/pps/clients/pps-gpio.c @@ -145,6 +145,8 @@ static int pps_gpio_setup(struct platform_device *pdev) @@ -303234,10 +303234,10 @@ index e0de1df2ede0..ee7d8f4e7f2e 100644 2.18.4 -From 6a67867f19ae30bdf4a8c2018018028ed6d1ab14 Mon Sep 17 00:00:00 2001 +From 66d6410970dd908f91b7f8255ced48eb93fc450d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Mar 2018 12:01:00 +0000 -Subject: [PATCH 0116/1216] lan78xx: Read initial EEE status from DT +Subject: [PATCH 0116/1224] lan78xx: Read initial EEE status from DT Add two new DT properties: * microchip,eee-enabled - a boolean to enable EEE @@ -303250,7 +303250,7 @@ Signed-off-by: Phil Elwell 1 file changed, 16 insertions(+) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index ba42568316f1..e266ca2191ed 100644 +index ba42568316f1b..e266ca2191ed3 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2643,6 +2643,22 @@ static int lan78xx_open(struct net_device *net) @@ -303280,10 +303280,10 @@ index ba42568316f1..e266ca2191ed 100644 2.18.4 -From fb55764d681927668425a979be535ff3fac6dbff Mon Sep 17 00:00:00 2001 +From 38ee846e1b70c5850c4d237193165d07d0ef40aa Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 14 Jul 2014 22:02:09 +0100 -Subject: [PATCH 0117/1216] hid: Reduce default mouse polling interval to 60Hz +Subject: [PATCH 0117/1224] hid: Reduce default mouse polling interval to 60Hz Reduces overhead when using X --- @@ -303291,7 +303291,7 @@ Reduces overhead when using X 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c -index 17a638f15082..ce8ef6930795 100644 +index 17a638f150824..ce8ef69307951 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -45,7 +45,7 @@ @@ -303318,10 +303318,10 @@ index 17a638f15082..ce8ef6930795 100644 2.18.4 -From 93d96d7ac4639a21f2a4b3dc28d6c8f2c8a5808f Mon Sep 17 00:00:00 2001 +From 9c489086b89f30bfc81a8fed179839a4ee56f460 Mon Sep 17 00:00:00 2001 From: Nick Bulleid Date: Thu, 10 May 2018 21:57:02 +0100 -Subject: [PATCH 0118/1216] Add ability to export gpio used by gpio-poweroff +Subject: [PATCH 0118/1224] Add ability to export gpio used by gpio-poweroff Signed-off-by: Nick Bulleid @@ -303334,7 +303334,7 @@ Signed-off-by: Nick Bulleid 2 files changed, 10 insertions(+) diff --git a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt -index 3e56c1b34a4c..76dd7b06e26a 100644 +index 3e56c1b34a4c9..76dd7b06e26a1 100644 --- a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt +++ b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt @@ -31,6 +31,7 @@ Optional properties: @@ -303346,7 +303346,7 @@ index 3e56c1b34a4c..76dd7b06e26a 100644 Examples: diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c -index beb1df358c8d..608d78f0514a 100644 +index beb1df358c8da..608d78f0514a0 100644 --- a/drivers/power/reset/gpio-poweroff.c +++ b/drivers/power/reset/gpio-poweroff.c @@ -51,6 +51,7 @@ static int gpio_poweroff_probe(struct platform_device *pdev) @@ -303383,10 +303383,10 @@ index beb1df358c8d..608d78f0514a 100644 2.18.4 -From f455a66a96292ecdfe9952a2e33d502900dbee7f Mon Sep 17 00:00:00 2001 +From 2a927682617386302d60ab81a26e8e101c71fdb6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 12 May 2018 21:35:43 +0100 -Subject: [PATCH 0119/1216] firmware/raspberrypi: Notify firmware of a reboot +Subject: [PATCH 0119/1224] firmware/raspberrypi: Notify firmware of a reboot Register for reboot notifications, sending RPI_FIRMWARE_NOTIFY_REBOOT over the mailbox interface on reception. @@ -303397,7 +303397,7 @@ Signed-off-by: Phil Elwell 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index 7947e65a22da..9ad10f7e019b 100644 +index 7947e65a22da9..9ad10f7e019b8 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -12,6 +12,7 @@ @@ -303473,10 +303473,10 @@ index 7947e65a22da..9ad10f7e019b 100644 2.18.4 -From 1cd70567ef45a56c81cc11b01e389638e120fa00 Mon Sep 17 00:00:00 2001 +From 42d9b363c7eac43007451b1962a4628a80114715 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 11:21:04 +0100 -Subject: [PATCH 0120/1216] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time +Subject: [PATCH 0120/1224] 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 @@ -303502,7 +303502,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 93878d725f26..40c1b38d5db5 100644 +index 93878d725f260..40c1b38d5db5c 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -73,8 +73,6 @@ @@ -303545,10 +303545,10 @@ index 93878d725f26..40c1b38d5db5 100644 2.18.4 -From e304ee44b8804bac8c3cbd0d3891d8fd977874e4 Mon Sep 17 00:00:00 2001 +From a0d469981d89169f99cb92c165663658cd6a9de5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 15:07:26 +0100 -Subject: [PATCH 0121/1216] of: configfs: Use of_overlay_fdt_apply API call +Subject: [PATCH 0121/1224] 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 @@ -303562,7 +303562,7 @@ Signed-off-by: Phil Elwell 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c -index 178f0629b0f0..ac04301dabe1 100644 +index 178f0629b0f01..ac04301dabe13 100644 --- a/drivers/of/configfs.c +++ b/drivers/of/configfs.c @@ -40,41 +40,6 @@ struct cfs_overlay_item { @@ -303665,10 +303665,10 @@ index 178f0629b0f0..ac04301dabe1 100644 2.18.4 -From 3d839e388c7aee35a5ea06167a2a0557868c4731 Mon Sep 17 00:00:00 2001 +From aa694ad96df741364931c200429f199f2a47b3be Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Jun 2018 15:21:10 +0100 -Subject: [PATCH 0122/1216] net: lan78xx: Disable TCP Segmentation Offload +Subject: [PATCH 0122/1224] net: lan78xx: Disable TCP Segmentation Offload (TSO) TSO seems to be having issues when packets are dropped and the @@ -303688,7 +303688,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index e266ca2191ed..3b904c55a21a 100644 +index e266ca2191ed3..3b904c55a21aa 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -425,6 +425,15 @@ static int msg_level = -1; @@ -303728,10 +303728,10 @@ index e266ca2191ed..3b904c55a21a 100644 2.18.4 -From b0ef359b251ff699784bfdb491aeb2b1930519e4 Mon Sep 17 00:00:00 2001 +From ace8453026d971919e0bdbd67f7745fc2f468793 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 Jun 2018 12:20:01 +0100 -Subject: [PATCH 0123/1216] brcmfmac: Re-enable firmware roaming support +Subject: [PATCH 0123/1224] 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 @@ -303747,7 +303747,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -index 5c2a03d629e4..dec25e415619 100644 +index 5c2a03d629e48..dec25e4156199 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -59,7 +59,7 @@ static int brcmf_fcmode; @@ -303763,10 +303763,10 @@ index 5c2a03d629e4..dec25e415619 100644 2.18.4 -From 3dedbb3f1deb7a97d2102b2560abca554d2a8c5b Mon Sep 17 00:00:00 2001 +From 5e1b9f386def9806ba88b8fc5d96c94b7346af43 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Apr 2018 14:46:11 +0100 -Subject: [PATCH 0124/1216] lan78xx: Move enabling of EEE into PHY init code +Subject: [PATCH 0124/1224] 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 @@ -303780,7 +303780,7 @@ Signed-off-by: Phil Elwell 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 3b904c55a21a..3bf87542c2ec 100644 +index 3b904c55a21aa..3bf87542c2ec9 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2175,6 +2175,22 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) @@ -303833,10 +303833,10 @@ index 3b904c55a21a..3bf87542c2ec 100644 2.18.4 -From fa94e304e0929c8c3dfeebed154c63e3b02faca0 Mon Sep 17 00:00:00 2001 +From 42c24860a5dde0121b7a257f3347cb4f354f0afa Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 9 Jul 2018 12:54:25 +0100 -Subject: [PATCH 0125/1216] Add rpi-poe-fan driver +Subject: [PATCH 0125/1224] Add rpi-poe-fan driver Signed-off-by: Serge Schneider @@ -303867,7 +303867,7 @@ Signed-off-by: Serge Schneider diff --git a/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt b/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt new file mode 100644 -index 000000000000..c71f8569a4dc +index 0000000000000..c71f8569a4dc9 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt @@ -0,0 +1,55 @@ @@ -303928,7 +303928,7 @@ index 000000000000..c71f8569a4dc + }; diff --git a/Documentation/hwmon/rpi-poe-fan b/Documentation/hwmon/rpi-poe-fan new file mode 100644 -index 000000000000..9182ab633993 +index 0000000000000..9182ab6339933 --- /dev/null +++ b/Documentation/hwmon/rpi-poe-fan @@ -0,0 +1,15 @@ @@ -303948,7 +303948,7 @@ index 000000000000..9182ab633993 +the commands to the board over I2C on the ID_EEPROM pins. The driver exposes +the fan to the user space through the hwmon sysfs interface. diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig -index 13a6b4afb4b3..753e58923a85 100644 +index 13a6b4afb4b36..753e58923a855 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1346,6 +1346,17 @@ config SENSORS_RASPBERRYPI_HWMON @@ -303970,7 +303970,7 @@ index 13a6b4afb4b3..753e58923a85 100644 tristate "Sensiron humidity and temperature sensors. SHT15 and compat." depends on GPIOLIB || COMPILE_TEST diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile -index 40c036ea45e6..4607ea5e1d5d 100644 +index 40c036ea45e6b..4607ea5e1d5d3 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -144,6 +144,7 @@ obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o @@ -303983,7 +303983,7 @@ index 40c036ea45e6..4607ea5e1d5d 100644 obj-$(CONFIG_SENSORS_SCH5627) += sch5627.o diff --git a/drivers/hwmon/rpi-poe-fan.c b/drivers/hwmon/rpi-poe-fan.c new file mode 100644 -index 000000000000..3effaf2eb86d +index 0000000000000..3effaf2eb86db --- /dev/null +++ b/drivers/hwmon/rpi-poe-fan.c @@ -0,0 +1,436 @@ @@ -304427,10 +304427,10 @@ index 000000000000..3effaf2eb86d 2.18.4 -From ce76b7168fe061fa5d735327af9458af4caee895 Mon Sep 17 00:00:00 2001 +From 6a766423d16465bf6043149abca6289eb67078a8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 17 Sep 2018 17:31:18 +0100 -Subject: [PATCH 0126/1216] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 +Subject: [PATCH 0126/1224] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT --- @@ -304438,7 +304438,7 @@ Subject: [PATCH 0126/1216] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 1 file changed, 1 insertion(+) diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig -index bcc49cb47de6..2068f4b9fc37 100644 +index bcc49cb47de63..2068f4b9fc376 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -23,6 +23,7 @@ menu "Media SPI Adapters" @@ -304453,10 +304453,10 @@ index bcc49cb47de6..2068f4b9fc37 100644 2.18.4 -From 7ab42116f7a0014aba736fcb3ae7579cefb91d3c Mon Sep 17 00:00:00 2001 +From 84c00774980d37ead1707a2bfe6139cb1aee6cb5 Mon Sep 17 00:00:00 2001 From: detule Date: Tue, 2 Oct 2018 04:10:08 -0400 -Subject: [PATCH 0127/1216] vchiq_2835_arm: Implement a DMA pool for small bulk +Subject: [PATCH 0127/1224] vchiq_2835_arm: Implement a DMA pool for small bulk transfers (#2699) During a bulk transfer we request a DMA allocation to hold the @@ -304475,7 +304475,7 @@ Signed-off-by: Oliver Gjoneski 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c -index 8dc730cfe7a6..dc13c7df8c1c 100644 +index 8dc730cfe7a63..dc13c7df8c1c0 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -7,6 +7,7 @@ @@ -304583,10 +304583,10 @@ index 8dc730cfe7a6..dc13c7df8c1c 100644 2.18.4 -From 26c6bf26777629f5ca4118ef855854849cc3cd09 Mon Sep 17 00:00:00 2001 +From 24d8efa341949205b60d2ed151816e5fcb8b9452 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 6 Oct 2018 16:46:18 +0200 -Subject: [PATCH 0128/1216] hwmon: raspberrypi: Prevent voltage low warnings +Subject: [PATCH 0128/1224] hwmon: raspberrypi: Prevent voltage low warnings from filling log Although the correct fix for low voltage warnings is to @@ -304602,7 +304602,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c -index d3a64a35f7a9..db3b03438dd0 100644 +index d3a64a35f7a9a..db3b03438dd05 100644 --- a/drivers/hwmon/raspberrypi-hwmon.c +++ b/drivers/hwmon/raspberrypi-hwmon.c @@ -15,6 +15,36 @@ @@ -304664,10 +304664,10 @@ index d3a64a35f7a9..db3b03438dd0 100644 2.18.4 -From dbde378f1d1b444a89a922f71c83fffc911e6d01 Mon Sep 17 00:00:00 2001 +From 0693b201262383e75be08d07a715dd8758363165 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 13:31:21 +0200 -Subject: [PATCH 0129/1216] firmware: raspberrypi: Add backward compatible +Subject: [PATCH 0129/1224] firmware: raspberrypi: Add backward compatible get_throttled Avoid a hard userspace ABI change by adding a compatible get_throttled @@ -304681,7 +304681,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 33 insertions(+) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index 9ad10f7e019b..e834e300bb6f 100644 +index 9ad10f7e019b8..e834e300bb6f6 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -28,6 +28,7 @@ struct rpi_firmware { @@ -304749,10 +304749,10 @@ index 9ad10f7e019b..e834e300bb6f 100644 2.18.4 -From 00a5db8877d738ec36fd9f1474343127edc6d0e5 Mon Sep 17 00:00:00 2001 +From 1fd2db367d2d5c92f35d535743ae4d31cfb75fe2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 6 Nov 2018 12:57:48 +0000 -Subject: [PATCH 0130/1216] sc16is7xx: Don't spin if no data received +Subject: [PATCH 0130/1224] sc16is7xx: Don't spin if no data received See: https://github.com/raspberrypi/linux/issues/2676 @@ -304762,7 +304762,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c -index 7d3ae31cc720..fe486498530d 100644 +index 7d3ae31cc7204..fe486498530da 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -696,6 +696,8 @@ static bool sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno) @@ -304778,10 +304778,10 @@ index 7d3ae31cc720..fe486498530d 100644 2.18.4 -From 8b0db2ffbbc74a1cbda23c724bdee87ec02cfc81 Mon Sep 17 00:00:00 2001 +From d0a7a703702ba5e5b5f8acac434cf769e676e627 Mon Sep 17 00:00:00 2001 From: Ram Chandrasekar Date: Mon, 7 May 2018 11:54:08 -0600 -Subject: [PATCH 0131/1216] drivers: thermal: step_wise: add support for +Subject: [PATCH 0131/1224] drivers: thermal: step_wise: add support for hysteresis Step wise governor increases the mitigation level when the temperature @@ -304802,7 +304802,7 @@ Signed-off-by: Lina Iyer 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c -index 6e051cbd824f..7d30b8d928ab 100644 +index 6e051cbd824ff..7d30b8d928ab2 100644 --- a/drivers/thermal/step_wise.c +++ b/drivers/thermal/step_wise.c @@ -24,7 +24,7 @@ @@ -304878,10 +304878,10 @@ index 6e051cbd824f..7d30b8d928ab 100644 2.18.4 -From 991ff48f6810c223aececacabf17066f01a38635 Mon Sep 17 00:00:00 2001 +From 998dd8e215938014be20ce8b9d815bfc65d92ddb Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 2 Oct 2018 11:14:15 +0100 -Subject: [PATCH 0132/1216] drivers: thermal: step_wise: avoid throttling at +Subject: [PATCH 0132/1224] drivers: thermal: step_wise: avoid throttling at hysteresis temperature after dropping below it Signed-off-by: Serge Schneider @@ -304890,7 +304890,7 @@ Signed-off-by: Serge Schneider 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c -index 7d30b8d928ab..c481ed33810c 100644 +index 7d30b8d928ab2..c481ed33810cd 100644 --- a/drivers/thermal/step_wise.c +++ b/drivers/thermal/step_wise.c @@ -155,7 +155,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip) @@ -304906,10 +304906,10 @@ index 7d30b8d928ab..c481ed33810c 100644 2.18.4 -From f0161ba39f61750e0760f1aa36edf0cf4485fd1c Mon Sep 17 00:00:00 2001 +From 23b1ad7a0ba34e63912c139185d908bfa39d981e Mon Sep 17 00:00:00 2001 From: James Hughes Date: Fri, 2 Nov 2018 11:55:49 +0000 -Subject: [PATCH 0133/1216] Update issue templates (#2736) +Subject: [PATCH 0133/1224] Update issue templates (#2736) --- .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++++++++++ @@ -304918,7 +304918,7 @@ Subject: [PATCH 0133/1216] Update issue templates (#2736) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 -index 000000000000..09bdc4a96838 +index 0000000000000..09bdc4a968383 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,34 @@ @@ -304960,10 +304960,10 @@ index 000000000000..09bdc4a96838 2.18.4 -From ccbba997f39f47b3d41a1b9e1f80e44a548128e2 Mon Sep 17 00:00:00 2001 +From 6c568f38cb5508ccd4a7a8cb74da22edf9b7d065 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 24 Apr 2018 14:42:27 +0100 -Subject: [PATCH 0134/1216] gpiolib: Don't prevent IRQ usage of output GPIOs +Subject: [PATCH 0134/1224] 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 @@ -304978,7 +304978,7 @@ Signed-off-by: Phil Elwell 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c -index abdf448b11a3..1e6bc8ecb5dc 100644 +index abdf448b11a3d..1e6bc8ecb5dc6 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -55,6 +55,8 @@ @@ -305016,10 +305016,10 @@ index abdf448b11a3..1e6bc8ecb5dc 100644 2.18.4 -From db833e38266c664baa11c200ec39c15fff674b59 Mon Sep 17 00:00:00 2001 +From 5c9e6c6d2ab02a677ca2273ea640cb4921795de7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Nov 2018 19:46:58 +0000 -Subject: [PATCH 0135/1216] net: lan78xx: Support auto-downshift to 100Mb/s +Subject: [PATCH 0135/1224] 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 @@ -305036,7 +305036,7 @@ Signed-off-by: Phil Elwell 3 files changed, 38 insertions(+) diff --git a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt -index 11a679530ae6..104768b85bbc 100644 +index 11a679530ae65..104768b85bbc5 100644 --- a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt +++ b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt @@ -14,6 +14,9 @@ Optional properties of the embedded PHY: @@ -305050,7 +305050,7 @@ index 11a679530ae6..104768b85bbc 100644 Example: diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c -index a644e8e5071c..15e0a7383f68 100644 +index a644e8e5071c3..15e0a7383f688 100644 --- a/drivers/net/phy/microchip.c +++ b/drivers/net/phy/microchip.c @@ -217,6 +217,7 @@ static int lan88xx_probe(struct phy_device *phydev) @@ -305095,7 +305095,7 @@ index a644e8e5071c..15e0a7383f68 100644 priv->chip_id = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_ID); priv->chip_rev = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_REV); diff --git a/include/linux/microchipphy.h b/include/linux/microchipphy.h -index 517288da19fd..626c450d71f4 100644 +index 517288da19fd3..626c450d71f45 100644 --- a/include/linux/microchipphy.h +++ b/include/linux/microchipphy.h @@ -61,6 +61,14 @@ @@ -305117,10 +305117,10 @@ index 517288da19fd..626c450d71f4 100644 2.18.4 -From 5c44eee236e5f4609ade33159d8b6341309c89cb Mon Sep 17 00:00:00 2001 +From ac4bde3bca7dcdb3643bcae483e3ae511e82dff0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 14:21:04 +0000 -Subject: [PATCH 0136/1216] staging: bcm2835-camera: Ensure H264 header bytes +Subject: [PATCH 0136/1224] staging: bcm2835-camera: Ensure H264 header bytes get a sensible timestamp H264 header come from VC with 0 timestamps, which means they get a @@ -305138,7 +305138,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -index d4d1e44b16b2..e5f651f78441 100644 +index d4d1e44b16b2c..e5f651f78441a 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -364,7 +364,12 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, @@ -305199,7 +305199,7 @@ index d4d1e44b16b2..e5f651f78441 100644 /* enable the camera port */ dev->capture.port->cb_ctx = dev; diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h -index b5fce38de038..dcb1b8e1f4e0 100644 +index b5fce38de038c..dcb1b8e1f4e00 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h @@ -93,6 +93,8 @@ struct bm2835_mmal_dev { @@ -305215,10 +305215,10 @@ index b5fce38de038..dcb1b8e1f4e0 100644 2.18.4 -From c9127058a468b2b10d3b67ee03ccbcef7710912d Mon Sep 17 00:00:00 2001 +From 8da3993140b61115985644e00bf9d9ddaa0cdab0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 10 Jan 2019 17:58:06 +0000 -Subject: [PATCH 0137/1216] firmware: raspberrypi: Report the fw variant during +Subject: [PATCH 0137/1224] firmware: raspberrypi: Report the fw variant during probe The driver already reported the firmware build date during probe. @@ -305243,7 +305243,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index e834e300bb6f..6ab3bec57532 100644 +index e834e300bb6f6..6ab3bec57532e 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -229,21 +229,55 @@ static const struct attribute_group rpi_firmware_dev_group = { @@ -305318,7 +305318,7 @@ index e834e300bb6f..6ab3bec57532 100644 rpi_register_clk_driver(dev); diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index 25fca695f903..9c6027fc25da 100644 +index 25fca695f9039..9c6027fc25dae 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -38,6 +38,8 @@ struct rpi_firmware_property_tag_header { @@ -305334,10 +305334,10 @@ index 25fca695f903..9c6027fc25da 100644 2.18.4 -From c752b0b81d393b8d2a507c744bb646c5172c1c39 Mon Sep 17 00:00:00 2001 +From cf79b8f9c788b29c9ebdec00d718e87f9200be36 Mon Sep 17 00:00:00 2001 From: Joshua Emele Date: Wed, 7 Nov 2018 16:07:40 -0800 -Subject: [PATCH 0138/1216] lan78xx: Debounce link events to minimize poll +Subject: [PATCH 0138/1224] lan78xx: Debounce link events to minimize poll storm The bInterval is set to 4 (i.e. 8 microframes => 1ms) and the only bit @@ -305352,7 +305352,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 3bf87542c2ec..3ce3c651d158 100644 +index 3bf87542c2ec9..3ce3c651d1580 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -434,6 +434,11 @@ static bool enable_tso; @@ -305386,10 +305386,10 @@ index 3bf87542c2ec..3ce3c651d158 100644 2.18.4 -From 2b735e1f4c1d2beb600bdf8eb95617cc78fb6cfd Mon Sep 17 00:00:00 2001 +From 3c4c9bacf8497ec996ee7652a4189cd2b6a6bb11 Mon Sep 17 00:00:00 2001 From: b-ak Date: Thu, 3 Jan 2019 00:01:08 +0530 -Subject: [PATCH 0139/1216] ASoC: Add support for AudioSense-Pi add-on +Subject: [PATCH 0139/1224] ASoC: Add support for AudioSense-Pi add-on soundcard AudioSense-Pi is a RPi HAT based on a TI's TLV320AIC32x4 stereo codec @@ -305429,7 +305429,7 @@ Signed-off-by: Hui Wang create mode 100644 sound/soc/bcm/audiosense-pi.c diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index ff5742759a38..c5c5a75782e0 100644 +index ff5742759a389..c5c5a75782e06 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -132,6 +132,13 @@ config SND_AUDIOINJECTOR_OCTO_SOUNDCARD @@ -305447,7 +305447,7 @@ index ff5742759a38..c5c5a75782e0 100644 tristate "Support for Red Rocks Audio DigiDAC1" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index 522fc73571e4..d90d2bba7547 100644 +index 522fc73571e4b..d90d2bba75470 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -20,6 +20,7 @@ snd-soc-rpi-proto-objs := rpi-proto.o @@ -305468,7 +305468,7 @@ index 522fc73571e4..d90d2bba7547 100644 obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2) += snd-soc-dionaudio-loco-v2.o diff --git a/sound/soc/bcm/audiosense-pi.c b/sound/soc/bcm/audiosense-pi.c new file mode 100644 -index 000000000000..d247ee8e6127 +index 0000000000000..d247ee8e61272 --- /dev/null +++ b/sound/soc/bcm/audiosense-pi.c @@ -0,0 +1,248 @@ @@ -305724,10 +305724,10 @@ index 000000000000..d247ee8e6127 2.18.4 -From ff4588fc671f27781dd0bcfb1917e6225b696422 Mon Sep 17 00:00:00 2001 +From 6740d62b71d57282f3c9d394005cf24cdfbdc2f6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Jan 2019 12:39:50 +0000 -Subject: [PATCH 0140/1216] spi: spi-bcm2835: Re-enable HW CS +Subject: [PATCH 0140/1224] spi: spi-bcm2835: Re-enable HW CS Signed-off-by: Phil Elwell --- @@ -305735,7 +305735,7 @@ Signed-off-by: Phil Elwell 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c -index 56ee84e85bee..b5efa2236b61 100644 +index 56ee84e85bee2..b5efa2236b614 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -1169,9 +1169,57 @@ static void bcm2835_spi_handle_err(struct spi_controller *ctlr, @@ -305810,10 +305810,10 @@ index 56ee84e85bee..b5efa2236b61 100644 2.18.4 -From c39d27c7135d04b8c322b60d5fa6a9222b23a3ee Mon Sep 17 00:00:00 2001 +From caa237a4947d61b0f609b47e94452efadfbd365a Mon Sep 17 00:00:00 2001 From: HiFiBerry Date: Mon, 8 Oct 2018 18:10:12 +0200 -Subject: [PATCH 0141/1216] Added driver for the HiFiBerry DAC+ ADC (#2694) +Subject: [PATCH 0141/1224] Added driver for the HiFiBerry DAC+ ADC (#2694) Signed-off-by: Daniel Matuschek @@ -305846,7 +305846,7 @@ Signed-off-by: Matthias Reichl create mode 100644 sound/soc/bcm/hifiberry_dacplusadc.c diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index c5c5a75782e0..604923282cef 100644 +index c5c5a75782e06..604923282cefd 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -41,6 +41,15 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS @@ -305866,7 +305866,7 @@ index c5c5a75782e0..604923282cef 100644 tristate "Support for HifiBerry Digi" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index d90d2bba7547..c276724de2a5 100644 +index d90d2bba75470..c276724de2a56 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -14,6 +14,7 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o @@ -305887,7 +305887,7 @@ index d90d2bba7547..c276724de2a5 100644 obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o diff --git a/sound/soc/bcm/hifiberry_dacplusadc.c b/sound/soc/bcm/hifiberry_dacplusadc.c new file mode 100644 -index 000000000000..ab454f2ecb17 +index 0000000000000..ab454f2ecb17b --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplusadc.c @@ -0,0 +1,390 @@ @@ -306285,10 +306285,10 @@ index 000000000000..ab454f2ecb17 2.18.4 -From fcb3b463b0f1f6171d61dd4709dd26698624db97 Mon Sep 17 00:00:00 2001 +From 4da4fe1d2bd0f74cba6f6a77d9857ec4c4fce00a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 7 Feb 2019 18:16:25 +0000 -Subject: [PATCH 0142/1216] configs: Enable the AD193x codecs +Subject: [PATCH 0142/1224] configs: Enable the AD193x codecs See: https://github.com/raspberrypi/linux/issues/2850 @@ -306298,7 +306298,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 26f2b5b3e968..eea92595d5e1 100644 +index 26f2b5b3e9682..eea92595d5e15 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -320,11 +320,11 @@ config SND_SOC_AD193X @@ -306319,10 +306319,10 @@ index 26f2b5b3e968..eea92595d5e1 100644 2.18.4 -From 22bc17fd43352f6e50d30248dfccb0157cd71ef0 Mon Sep 17 00:00:00 2001 +From 233a1cae70fab00e127e7d4da11792f94ce3516e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 Mar 2019 09:51:22 +0000 -Subject: [PATCH 0143/1216] lan78xx: EEE support is now a PHY property +Subject: [PATCH 0143/1224] 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. @@ -306335,7 +306335,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 3ce3c651d158..8a197006eb6e 100644 +index 3ce3c651d1580..8a197006eb6ef 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2180,7 +2180,7 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) @@ -306351,10 +306351,10 @@ index 3ce3c651d158..8a197006eb6e 100644 2.18.4 -From 4efbe8764725117204b8b8eeb15cbd21734cbcc7 Mon Sep 17 00:00:00 2001 +From 699df0f662d6828d5f244898b9ffac22a1bf9174 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 Mar 2019 16:28:09 +0000 -Subject: [PATCH 0144/1216] Revert "staging: vchiq: delete vchiq_killable.h" +Subject: [PATCH 0144/1224] Revert "staging: vchiq: delete vchiq_killable.h" This reverts commit 2da56630b1cc422f58408033102b8f91ae97bc91. --- @@ -306368,7 +306368,7 @@ This reverts commit 2da56630b1cc422f58408033102b8f91ae97bc91. create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c -index dc13c7df8c1c..2722e73fe0fa 100644 +index dc13c7df8c1c0..2722e73fe0fa3 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -19,6 +19,7 @@ @@ -306380,7 +306380,7 @@ index dc13c7df8c1c..2722e73fe0fa 100644 #define MAX_FRAGMENTS (VCHIQ_NUM_CURRENT_BULKS * 2) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index eb76cc2cbfd8..d927c67012b0 100644 +index eb76cc2cbfd8c..d927c67012b0b 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -28,6 +28,7 @@ @@ -306392,7 +306392,7 @@ index eb76cc2cbfd8..d927c67012b0 100644 #define DEVICE_NAME "vchiq" diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c -index 1640906e3929..a462eb37d930 100644 +index 1640906e3929f..a462eb37d9305 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c @@ -3,6 +3,7 @@ @@ -306404,7 +306404,7 @@ index 1640906e3929..a462eb37d930 100644 #include diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c -index 56a23a297fa4..4299715d85d7 100644 +index 56a23a297fa44..4299715d85d70 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -2,6 +2,7 @@ @@ -306417,7 +306417,7 @@ index 56a23a297fa4..4299715d85d7 100644 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h new file mode 100644 -index 000000000000..778063ba312a +index 0000000000000..778063ba312af --- /dev/null +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h @@ -0,0 +1,55 @@ @@ -306477,7 +306477,7 @@ index 000000000000..778063ba312a + +#endif diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c -index 5e6d3035dc05..7b38afd4739d 100644 +index 5e6d3035dc058..7b38afd4739df 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c @@ -2,6 +2,7 @@ @@ -306492,10 +306492,10 @@ index 5e6d3035dc05..7b38afd4739d 100644 2.18.4 -From 53f1b436a50e52e15f3163a589880edd2d4dda5f Mon Sep 17 00:00:00 2001 +From be76f55838cee71a07dd291a752e4dad90df8167 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 15 Mar 2019 21:11:10 +0000 -Subject: [PATCH 0145/1216] Revert "staging: bcm2835-audio: Drop DT dependency" +Subject: [PATCH 0145/1224] Revert "staging: bcm2835-audio: Drop DT dependency" This reverts commit b7491a9fca2dc2535b9dc922550a37c5baae9d3d. --- @@ -306503,7 +306503,7 @@ This reverts commit b7491a9fca2dc2535b9dc922550a37c5baae9d3d. 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index cf5f80f5ca6b..86b921030db7 100644 +index cf5f80f5ca6b0..86b921030db7b 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -6,13 +6,13 @@ @@ -306594,10 +306594,10 @@ index cf5f80f5ca6b..86b921030db7 100644 2.18.4 -From c8c34c9b1018ae114636f046435a879e32093c24 Mon Sep 17 00:00:00 2001 +From 12cca2a40c467a79e55a7f8f94191fa2235462c4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 28 Jan 2019 14:40:16 +0000 -Subject: [PATCH 0146/1216] gpu: vc4_firmware_kms: Fix up 64 bit compile +Subject: [PATCH 0146/1224] gpu: vc4_firmware_kms: Fix up 64 bit compile warnings. Resolve two build warnings with regard using incorrectly @@ -306609,7 +306609,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 347ad72682dc..85e273665836 100644 +index 347ad72682dc2..85e273665836d 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -161,14 +161,14 @@ static void vc4_primary_plane_atomic_update(struct drm_plane *plane, @@ -306666,10 +306666,10 @@ index 347ad72682dc..85e273665836 100644 2.18.4 -From 2f4dafed7e66426035542b3aa75d40294d198544 Mon Sep 17 00:00:00 2001 +From d97a8f46e5b16bb0fa9d21ea119321cdc10765f9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 20 Jul 2018 22:03:41 +0100 -Subject: [PATCH 0147/1216] bcm2835-dma: Add support for per-channel flags +Subject: [PATCH 0147/1224] 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 @@ -306682,7 +306682,7 @@ Signed-off-by: Phil Elwell 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 6860131b02d9..1e5d6f1bed4e 100644 +index 6860131b02d9a..1e5d6f1bed4ec 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -141,6 +141,10 @@ struct bcm2835_desc { @@ -306720,10 +306720,10 @@ index 6860131b02d9..1e5d6f1bed4e 100644 2.18.4 -From 5fccb6ec494d94a43fb9878bd73fdf04016dd350 Mon Sep 17 00:00:00 2001 +From 969d7fc15fde191f6545b77f8f20cd0e35957322 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Feb 2019 15:18:25 +0000 -Subject: [PATCH 0148/1216] drm: vc4: Programming the CTM is conditional on +Subject: [PATCH 0148/1224] drm: vc4: Programming the CTM is conditional on running full KMS vc4_ctm_commit writes to HVS registers, so this is only applicable @@ -306735,7 +306735,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 75d3e8c6b650..57124fe94247 100644 +index 75d3e8c6b6507..57124fe942472 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -166,7 +166,8 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) @@ -306752,10 +306752,10 @@ index 75d3e8c6b650..57124fe94247 100644 2.18.4 -From 66e35934a0084f115ab2b65f490c8256e409b28f Mon Sep 17 00:00:00 2001 +From 7b169e02e86f32b58caa549893f57c2511d82b98 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 29 Mar 2019 10:53:14 +0000 -Subject: [PATCH 0149/1216] rtc: rv3028: Add backup switchover mode support +Subject: [PATCH 0149/1224] rtc: rv3028: Add backup switchover mode support Signed-off-by: Phil Howard --- @@ -306763,7 +306763,7 @@ Signed-off-by: Phil Howard 1 file changed, 17 insertions(+) diff --git a/drivers/rtc/rtc-rv3028.c b/drivers/rtc/rtc-rv3028.c -index bbdfebd70644..8b2446909a1b 100644 +index bbdfebd706442..8b2446909a1bb 100644 --- a/drivers/rtc/rtc-rv3028.c +++ b/drivers/rtc/rtc-rv3028.c @@ -73,6 +73,7 @@ @@ -306808,10 +306808,10 @@ index bbdfebd70644..8b2446909a1b 100644 2.18.4 -From 7f0b0ba31785e35951821e74a0a1c8340daeb8da Mon Sep 17 00:00:00 2001 +From 800dd57c0be01968f320b32b542dad9192f7ba95 Mon Sep 17 00:00:00 2001 From: FERHAT Nicolas Date: Fri, 5 Apr 2019 13:06:42 +0100 -Subject: [PATCH 0150/1216] Audiophonics I-Sabre 9038Q2M DAC driver +Subject: [PATCH 0150/1224] Audiophonics I-Sabre 9038Q2M DAC driver Signed-off-by: Audiophonics @@ -306832,7 +306832,7 @@ Signed-off-by: Hui Wang create mode 100644 sound/soc/codecs/i-sabre-codec.h diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index 604923282cef..fde6b15e30b5 100644 +index 604923282cefd..fde6b15e30b57 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -119,6 +119,13 @@ config SND_BCM2708_SOC_IQAUDIO_DIGI @@ -306850,7 +306850,7 @@ index 604923282cef..fde6b15e30b5 100644 tristate "Support for ADAU1977 ADC" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index c276724de2a5..66c62edafb84 100644 +index c276724de2a56..66c62edafb844 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -19,6 +19,7 @@ snd-soc-justboom-dac-objs := justboom-dac.o @@ -306871,7 +306871,7 @@ index c276724de2a5..66c62edafb84 100644 obj-$(CONFIG_SND_AUDIOSENSE_PI) += snd-soc-audiosense-pi.o diff --git a/sound/soc/bcm/i-sabre-q2m.c b/sound/soc/bcm/i-sabre-q2m.c new file mode 100644 -index 000000000000..aee2527dfad5 +index 0000000000000..aee2527dfad51 --- /dev/null +++ b/sound/soc/bcm/i-sabre-q2m.c @@ -0,0 +1,158 @@ @@ -307034,7 +307034,7 @@ index 000000000000..aee2527dfad5 +MODULE_AUTHOR("Audiophonics "); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index eea92595d5e1..2cc56e9a0e84 100644 +index eea92595d5e15..2cc56e9a0e84c 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -97,6 +97,7 @@ config SND_SOC_ALL_CODECS @@ -307055,7 +307055,7 @@ index eea92595d5e1..2cc56e9a0e84 100644 + endmenu diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index 2cc8bf2c12f6..9b201db7a150 100644 +index 2cc8bf2c12f67..9b201db7a1502 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -92,6 +92,7 @@ snd-soc-hdac-hda-objs := hdac_hda.o @@ -307076,7 +307076,7 @@ index 2cc8bf2c12f6..9b201db7a150 100644 obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o diff --git a/sound/soc/codecs/i-sabre-codec.c b/sound/soc/codecs/i-sabre-codec.c new file mode 100644 -index 000000000000..f6e5b68eb8f1 +index 0000000000000..f6e5b68eb8f1f --- /dev/null +++ b/sound/soc/codecs/i-sabre-codec.c @@ -0,0 +1,392 @@ @@ -307474,7 +307474,7 @@ index 000000000000..f6e5b68eb8f1 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/i-sabre-codec.h b/sound/soc/codecs/i-sabre-codec.h new file mode 100644 -index 000000000000..9cac5a2446b9 +index 0000000000000..9cac5a2446b9e --- /dev/null +++ b/sound/soc/codecs/i-sabre-codec.h @@ -0,0 +1,42 @@ @@ -307524,10 +307524,10 @@ index 000000000000..9cac5a2446b9 2.18.4 -From 2906b50836979107b57f1a310dc51a3bd6a70f6f Mon Sep 17 00:00:00 2001 +From b50fce8d6dae29859631937b20d273d944baffbc Mon Sep 17 00:00:00 2001 From: P33M Date: Thu, 2 May 2019 11:53:45 +0100 -Subject: [PATCH 0151/1216] lan78xx: use default alignment for rx buffers +Subject: [PATCH 0151/1224] 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 @@ -307537,7 +307537,7 @@ in both dwc_otg and in ipv6 processing. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 8a197006eb6e..f72ab25e7d06 100644 +index 8a197006eb6ef..f72ab25e7d06c 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -3169,7 +3169,7 @@ static int rx_submit(struct lan78xx_net *dev, struct urb *urb, gfp_t flags) @@ -307553,10 +307553,10 @@ index 8a197006eb6e..f72ab25e7d06 100644 2.18.4 -From e8c9a255087ad0e0c8ae8511cef57aed5a888581 Mon Sep 17 00:00:00 2001 +From 3d235253c9f3a4cd294b551577122ab0ea6d9a74 Mon Sep 17 00:00:00 2001 From: IQaudIO Date: Mon, 13 May 2019 21:53:05 +0100 -Subject: [PATCH 0152/1216] Added IQaudIO Pi-Codec board support (#2969) +Subject: [PATCH 0152/1224] Added IQaudIO Pi-Codec board support (#2969) Add support for the IQaudIO Pi-Codec board. @@ -307575,7 +307575,7 @@ Signed-off-by: Hui Wang create mode 100644 sound/soc/bcm/iqaudio-codec.c diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index fde6b15e30b5..e6d1c6b3fb5b 100644 +index fde6b15e30b57..e6d1c6b3fb5be 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -104,6 +104,13 @@ config SND_BCM2708_SOC_JUSTBOOM_DIGI @@ -307593,7 +307593,7 @@ index fde6b15e30b5..e6d1c6b3fb5b 100644 tristate "Support for IQaudIO-DAC" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index 66c62edafb84..e0e2645d7658 100644 +index 66c62edafb844..e0e2645d76584 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -18,6 +18,7 @@ snd-soc-hifiberry-dacplusadc-objs := hifiberry_dacplusadc.o @@ -307614,7 +307614,7 @@ index 66c62edafb84..e0e2645d7658 100644 obj-$(CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD) += snd-soc-audioinjector-pi-soundcard.o diff --git a/sound/soc/bcm/iqaudio-codec.c b/sound/soc/bcm/iqaudio-codec.c new file mode 100644 -index 000000000000..83f2dba1f5d6 +index 0000000000000..83f2dba1f5d63 --- /dev/null +++ b/sound/soc/bcm/iqaudio-codec.c @@ -0,0 +1,274 @@ @@ -307896,10 +307896,10 @@ index 000000000000..83f2dba1f5d6 2.18.4 -From 87b2a89609feb7e421a6f51053888db6f647ca5b Mon Sep 17 00:00:00 2001 +From b18a3d2950a379de097dea0cbac21bb80a20c6a5 Mon Sep 17 00:00:00 2001 From: Klaus Schulz Date: Thu, 16 May 2019 13:35:32 +0200 -Subject: [PATCH 0153/1216] sound: pcm512x-codec: Adding 352.8kHz samplerate +Subject: [PATCH 0153/1224] sound: pcm512x-codec: Adding 352.8kHz samplerate support --- @@ -307907,7 +307907,7 @@ Subject: [PATCH 0153/1216] sound: pcm512x-codec: Adding 352.8kHz samplerate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c -index 4cbef9affffd..604b405c81ac 100644 +index 4cbef9affffda..604b405c81ac9 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -534,7 +534,7 @@ static unsigned long pcm512x_ncp_target(struct pcm512x_priv *pcm512x, @@ -307923,10 +307923,10 @@ index 4cbef9affffd..604b405c81ac 100644 2.18.4 -From ec8a79fad0da024402c9344616c010e0e6329424 Mon Sep 17 00:00:00 2001 +From 16e2b1b558c353a7020952b4dc431522b9ee732e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:55:37 +0000 -Subject: [PATCH 0154/1216] media: ov5647: Add set_fmt and get_fmt calls. +Subject: [PATCH 0154/1224] media: ov5647: Add set_fmt and get_fmt calls. There's no way to query the subdevice for the supported resolutions. @@ -307938,7 +307938,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 22 insertions(+) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index e7d2e5b4ad4b..3e587eb0a30e 100644 +index e7d2e5b4ad4b9..3e587eb0a30e6 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -463,8 +463,30 @@ static int ov5647_enum_mbus_code(struct v4l2_subdev *sd, @@ -307976,10 +307976,10 @@ index e7d2e5b4ad4b..3e587eb0a30e 100644 2.18.4 -From 771db8898662b42a4c0f0c07bab449ef586f7764 Mon Sep 17 00:00:00 2001 +From 264972047eb9133751690ac17e4077d89eb9d55c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:55:59 +0000 -Subject: [PATCH 0155/1216] [media] Documentation: DT: add device tree for PWDN +Subject: [PATCH 0155/1224] [media] Documentation: DT: add device tree for PWDN control Add optional GPIO pwdn to connect to the PWDN line on the sensor. @@ -307990,7 +307990,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/media/i2c/ov5647.txt b/Documentation/devicetree/bindings/media/i2c/ov5647.txt -index 22e44945b661..70f06c24f470 100644 +index 22e44945b6610..70f06c24f4709 100644 --- a/Documentation/devicetree/bindings/media/i2c/ov5647.txt +++ b/Documentation/devicetree/bindings/media/i2c/ov5647.txt @@ -10,6 +10,9 @@ Required properties: @@ -308015,10 +308015,10 @@ index 22e44945b661..70f06c24f470 100644 2.18.4 -From 39015b06cd565d033942a221c83123959c2138c9 Mon Sep 17 00:00:00 2001 +From 2568a2a8c059416f4f4011ec90df7c66beee9eea Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:33 +0000 -Subject: [PATCH 0156/1216] media: ov5647: Add support for PWDN GPIO. +Subject: [PATCH 0156/1224] media: ov5647: Add support for PWDN GPIO. Add support for an optional GPIO connected to PWDN on the sensor. @@ -308028,7 +308028,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 28 insertions(+) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 3e587eb0a30e..c39e3d20e3ef 100644 +index 3e587eb0a30e6..c39e3d20e3efd 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -21,6 +21,7 @@ @@ -308113,10 +308113,10 @@ index 3e587eb0a30e..c39e3d20e3ef 100644 2.18.4 -From 53c5c29ba208fd69489a6f7d2626d29970215bad Mon Sep 17 00:00:00 2001 +From ef25052089db59d3cc8c71206bb2839a84c12d0e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:47 +0000 -Subject: [PATCH 0157/1216] media: ov5647: Add support for non-continuous clock +Subject: [PATCH 0157/1224] media: ov5647: Add support for non-continuous clock mode The driver was only supporting continuous clock mode @@ -308130,7 +308130,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index c39e3d20e3ef..8a1a515388e0 100644 +index c39e3d20e3efd..8a1a515388e0e 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -44,6 +44,7 @@ @@ -308198,10 +308198,10 @@ index c39e3d20e3ef..8a1a515388e0 100644 2.18.4 -From 0e144b5def21baf645373e6174a82fa87dde0ee1 Mon Sep 17 00:00:00 2001 +From 69d29ed69d9694fc99e230952ea28eef8def1806 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:59 +0000 -Subject: [PATCH 0158/1216] media: tc358743: Increase FIFO level to 374. +Subject: [PATCH 0158/1224] 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 @@ -308219,7 +308219,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c -index cff99cf61ed4..5b40de02f0d1 100644 +index cff99cf61ed4d..5b40de02f0d14 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -1949,7 +1949,7 @@ static int tc358743_probe_of(struct tc358743_state *state) @@ -308235,10 +308235,10 @@ index cff99cf61ed4..5b40de02f0d1 100644 2.18.4 -From 61e983afffc956d1a67f3044414b7a7cc87c4673 Mon Sep 17 00:00:00 2001 +From cd05dc8586311a24d83542b735b4dd8c25d1ff5c Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 21 Sep 2017 17:30:24 +0200 -Subject: [PATCH 0159/1216] media: tc358743: fix connected/active CSI-2 lane +Subject: [PATCH 0159/1224] media: tc358743: fix connected/active CSI-2 lane reporting g_mbus_config was supposed to indicate all supported lane numbers, not @@ -308260,7 +308260,7 @@ Signed-off-by: Philipp Zabel 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c -index 5b40de02f0d1..98cee67005cb 100644 +index 5b40de02f0d14..98cee67005cbc 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -1608,11 +1608,20 @@ static int tc358743_g_mbus_config(struct v4l2_subdev *sd, @@ -308295,7 +308295,7 @@ index 5b40de02f0d1..98cee67005cb 100644 err = tc358743_probe_of(state); if (err == -ENODEV) diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h -index c072ed141811..c90b6a7535b5 100644 +index c072ed1418113..c90b6a7535b5b 100644 --- a/include/media/v4l2-mediabus.h +++ b/include/media/v4l2-mediabus.h @@ -67,6 +67,14 @@ @@ -308317,10 +308317,10 @@ index c072ed141811..c90b6a7535b5 100644 2.18.4 -From 213620fdfff0954f4a7a3ee541ad38fba63c9b95 Mon Sep 17 00:00:00 2001 +From 2660b1be4475b32730e3baf7961885c5fc9b4543 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:21 +0000 -Subject: [PATCH 0160/1216] media: tc358743: Add support for 972Mbit/s link +Subject: [PATCH 0160/1224] media: tc358743: Add support for 972Mbit/s link freq. Adds register setups for running the CSI lanes at 972Mbit/s, @@ -308332,7 +308332,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c -index 98cee67005cb..4a6de85326bf 100644 +index 98cee67005cbc..4a6de85326bfa 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -1978,6 +1978,7 @@ static int tc358743_probe_of(struct tc358743_state *state) @@ -308403,10 +308403,10 @@ index 98cee67005cb..4a6de85326bf 100644 2.18.4 -From 0cee29ccb5dcb51cd0e9646e30d297fe981ad234 Mon Sep 17 00:00:00 2001 +From ac3508b94ecd959d0fa4f6c6643485361d361cf7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:34 +0000 -Subject: [PATCH 0161/1216] media: tc358743: Check I2C succeeded during probe. +Subject: [PATCH 0161/1224] 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. @@ -308424,7 +308424,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c -index 4a6de85326bf..843f341a7eab 100644 +index 4a6de85326bfa..843f341a7eab6 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -110,7 +110,7 @@ static inline struct tc358743_state *to_state(struct v4l2_subdev *sd) @@ -308507,10 +308507,10 @@ index 4a6de85326bf..843f341a7eab 100644 2.18.4 -From 8494c67773bdb8b0022b1550db8fe189fbfcb924 Mon Sep 17 00:00:00 2001 +From 83de5cfdc90f8d7584e663507183e30016b33eeb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:46 +0000 -Subject: [PATCH 0162/1216] media: adv7180: Default to the first valid input +Subject: [PATCH 0162/1224] media: adv7180: Default to the first valid input The hardware default is differential CVBS on AIN1 & 2, which isn't very useful. @@ -308524,7 +308524,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 13 insertions(+) diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c -index e780969cc2f2..43229fccf83a 100644 +index e780969cc2f26..43229fccf83a3 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -1246,6 +1246,7 @@ static const struct adv7180_chip_info adv7282_m_info = { @@ -308558,10 +308558,10 @@ index e780969cc2f2..43229fccf83a 100644 2.18.4 -From 190924f9e947fa70ea8fd7bece82ef7835fe0444 Mon Sep 17 00:00:00 2001 +From 75730294be8095bfd557920607e8067f044a441c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:56 +0000 -Subject: [PATCH 0163/1216] media: adv7180: Add YPrPb support for ADV7282M +Subject: [PATCH 0163/1224] 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 @@ -308573,7 +308573,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c -index 43229fccf83a..8e3cf751a5a1 100644 +index 43229fccf83a3..8e3cf751a5a1d 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -1235,6 +1235,7 @@ static const struct adv7180_chip_info adv7282_m_info = { @@ -308588,10 +308588,10 @@ index 43229fccf83a..8e3cf751a5a1 100644 2.18.4 -From 61d8a18206c24de3c046ee270dd1e309f4fcdc5e Mon Sep 17 00:00:00 2001 +From ecb96bd9272c80ccdbe1ff58425d4dda07381b5e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:58:08 +0000 -Subject: [PATCH 0164/1216] media: videodev2: Add helper defines for printing +Subject: [PATCH 0164/1224] media: videodev2: Add helper defines for printing FOURCCs New helper defines that allow printing of a FOURCC using @@ -308603,7 +308603,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 5 insertions(+) diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 3210b3c82a4a..456dfa847ccb 100644 +index 3210b3c82a4a2..456dfa847ccb1 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -82,6 +82,11 @@ @@ -308622,10 +308622,10 @@ index 3210b3c82a4a..456dfa847ccb 100644 2.18.4 -From 977a4866e07e6a3d94e7b895f9b52bc40ff95190 Mon Sep 17 00:00:00 2001 +From 299da3fa15dd526b57288c47dd2db5c97773d1fa Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:06 +0000 -Subject: [PATCH 0165/1216] dt-bindings: Document BCM283x CSI2/CCP2 receiver +Subject: [PATCH 0165/1224] dt-bindings: Document BCM283x CSI2/CCP2 receiver Document the DT bindings for the CSI2/CCP2 receiver peripheral (known as Unicam) on BCM283x SoCs. @@ -308639,7 +308639,7 @@ Acked-by: Rob Herring diff --git a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt new file mode 100644 -index 000000000000..7714fb374b34 +index 0000000000000..7714fb374b34d --- /dev/null +++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt @@ -0,0 +1,85 @@ @@ -308732,10 +308732,10 @@ index 000000000000..7714fb374b34 2.18.4 -From e6d3b6cffc0de41bc974035efde298fd36aadf2b Mon Sep 17 00:00:00 2001 +From 981b7a694383d6e449c4f950689a21b612e9430f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:40 +0000 -Subject: [PATCH 0166/1216] MAINTAINERS: Add entry for BCM2835 Unicam driver +Subject: [PATCH 0166/1224] MAINTAINERS: Add entry for BCM2835 Unicam driver Adds entry for the new BCM2835 Unicam (CSI-2 receiver) driver @@ -308745,7 +308745,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS -index 1407008df749..b7685777a806 100644 +index 1407008df7491..b7685777a8061 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3198,6 +3198,13 @@ N: bcm2711 @@ -308766,10 +308766,10 @@ index 1407008df749..b7685777a806 100644 2.18.4 -From bdcc92788c6bd35897e680839e473c6d7865df6b Mon Sep 17 00:00:00 2001 +From 7239e930505e041f94f3653adf859aad2c1bc4ff Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 22 Nov 2018 17:31:06 +0000 -Subject: [PATCH 0167/1216] media: tc358743: Return an appropriate colorspace +Subject: [PATCH 0167/1224] media: tc358743: Return an appropriate colorspace from tc358743_set_fmt When calling tc358743_set_fmt, the code was calling tc358743_get_fmt @@ -308793,7 +308793,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c -index 843f341a7eab..01e255aede50 100644 +index 843f341a7eab6..01e255aede504 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -1690,12 +1690,23 @@ static int tc358743_enum_mbus_code(struct v4l2_subdev *sd, @@ -308870,10 +308870,10 @@ index 843f341a7eab..01e255aede50 100644 2.18.4 -From e440dbd5fdf9a0a808d4d1343476ef09a1ddb234 Mon Sep 17 00:00:00 2001 +From 3ecc6aa60848e1fab027d7ffd547ed76f09371af Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 20:51:23 +0200 -Subject: [PATCH 0168/1216] staging: vchiq_arm: Fix platform device +Subject: [PATCH 0168/1224] staging: vchiq_arm: Fix platform device unregistration In error case platform_device_register_data would return an ERR_PTR @@ -308886,7 +308886,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index d927c67012b0..006566ae2775 100644 +index d927c67012b0b..006566ae27754 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -3259,7 +3259,8 @@ static int vchiq_probe(struct platform_device *pdev) @@ -308903,10 +308903,10 @@ index d927c67012b0..006566ae2775 100644 2.18.4 -From 3b08a7910cb5ded42b2a3729a6038dde8982ca0a Mon Sep 17 00:00:00 2001 +From 80f6bf34ed362dd2033344f3e20bd05750da0f8f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 15:48:54 +0000 -Subject: [PATCH 0169/1216] staging: bcm2835-camera: Fix logical continuation +Subject: [PATCH 0169/1224] staging: bcm2835-camera: Fix logical continuation splits Fix checkpatch errors for "Logical continuations should be @@ -308918,7 +308918,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -index e5f651f78441..d220b2051891 100644 +index e5f651f78441a..d220b20518913 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -1114,8 +1114,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, @@ -308936,10 +308936,10 @@ index e5f651f78441..d220b2051891 100644 2.18.4 -From 949f9728ffc00e081a45cf1fcf4d8a4b7586cadc Mon Sep 17 00:00:00 2001 +From 4b19d2b8a8241fabd2637b318db6d7d63c038081 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 24 Jul 2018 12:08:29 +0100 -Subject: [PATCH 0170/1216] staging: bcm2835-camera: Ensure timestamps never go +Subject: [PATCH 0170/1224] staging: bcm2835-camera: Ensure timestamps never go backwards. There is an awkward situation with H264 header bytes. Currently @@ -308961,7 +308961,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 5 insertions(+) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -index d220b2051891..74b7db3204ec 100644 +index d220b20518913..74b7db3204eca 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -380,6 +380,11 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, @@ -308980,10 +308980,10 @@ index d220b2051891..74b7db3204ec 100644 2.18.4 -From 8962fc98479e61d68a364fa385175cc3eb0e7bc2 Mon Sep 17 00:00:00 2001 +From aeade17652a7dafb5b6438a0170afb0dfd994391 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:30:37 +0100 -Subject: [PATCH 0171/1216] staging: vc04_services: Split vchiq-mmal into a +Subject: [PATCH 0171/1224] staging: vc04_services: Split vchiq-mmal into a module In preparation for adding a video codec V4L2 module which also @@ -309024,7 +309024,7 @@ Signed-off-by: Dave Stevenson rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-vchiq.h (100%) diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig -index 6baf9dd57f1f..3777e1fe3d2e 100644 +index 6baf9dd57f1f2..3777e1fe3d2e6 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -22,6 +22,7 @@ config BCM2835_VCHIQ @@ -309036,7 +309036,7 @@ index 6baf9dd57f1f..3777e1fe3d2e 100644 endif diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile -index afe43fa5a6d7..91fa00347eb7 100644 +index afe43fa5a6d7c..91fa00347eb79 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -12,6 +12,7 @@ vchiq-objs := \ @@ -309048,7 +309048,7 @@ index afe43fa5a6d7..91fa00347eb7 100644 ccflags-y += -Idrivers/staging/vc04_services -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/bcm2835-camera/Kconfig b/drivers/staging/vc04_services/bcm2835-camera/Kconfig -index c81baf2c111e..a0d80ff03b1c 100644 +index c81baf2c111e8..a0d80ff03b1cd 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/Kconfig +++ b/drivers/staging/vc04_services/bcm2835-camera/Kconfig @@ -3,7 +3,7 @@ config VIDEO_BCM2835 @@ -309061,7 +309061,7 @@ index c81baf2c111e..a0d80ff03b1c 100644 select BTREE help diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile -index 472f21e1f2a1..a6cb6eebef2e 100644 +index 472f21e1f2a18..a6cb6eebef2ec 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/Makefile +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile @@ -1,11 +1,12 @@ @@ -309081,7 +309081,7 @@ index 472f21e1f2a1..a6cb6eebef2e 100644 -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/staging/vc04_services/vchiq-mmal/Kconfig new file mode 100644 -index 000000000000..2288a95273e2 +index 0000000000000..2288a95273e27 --- /dev/null +++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig @@ -0,0 +1,7 @@ @@ -309094,7 +309094,7 @@ index 000000000000..2288a95273e2 + majority of the multimedia services on VideoCore. diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile new file mode 100644 -index 000000000000..f1647fc72afa +index 0000000000000..f1647fc72afaa --- /dev/null +++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile @@ -0,0 +1,8 @@ @@ -309138,7 +309138,7 @@ diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers similarity index 98% rename from drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c rename to drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 1c180ead4a20..ea3d60210a6b 100644 +index 1c180ead4a20b..ea3d60210a6b9 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -17,6 +17,7 @@ @@ -309294,10 +309294,10 @@ rename to drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h 2.18.4 -From 78866756a2f6cb8111840cd1d6ffd534bc421763 Mon Sep 17 00:00:00 2001 +From 45151d9292ff559e63897cfa52d5554b0798dbf0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:51:13 +0100 -Subject: [PATCH 0172/1216] staging: mmal-vchiq: Allocate and free components +Subject: [PATCH 0172/1224] staging: mmal-vchiq: Allocate and free components as required The existing code assumed that there would only ever be 4 components, @@ -309311,7 +309311,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index ea3d60210a6b..f619697b09a1 100644 +index ea3d60210a6b9..f619697b09a17 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -37,8 +37,11 @@ MODULE_AUTHOR("Dave Stevenson, "); @@ -309394,7 +309394,7 @@ index ea3d60210a6b..f619697b09a1 100644 return ret; diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -index 47897e81ec58..4e34728d87e5 100644 +index 47897e81ec586..4e34728d87e53 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h @@ -82,6 +82,7 @@ struct vchiq_mmal_port { @@ -309409,10 +309409,10 @@ index 47897e81ec58..4e34728d87e5 100644 2.18.4 -From 43674d6becdd0fc1e41e8155c5b5204af1860269 Mon Sep 17 00:00:00 2001 +From 7eb60781239b6facfe434da4ad4108433780dad5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 16:20:46 +0000 -Subject: [PATCH 0173/1216] staging: mmal-vchiq: Avoid use of bool in +Subject: [PATCH 0173/1224] staging: mmal-vchiq: Avoid use of bool in structures Fixes up a checkpatch error "Avoid using bool structure members @@ -309424,7 +309424,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index f619697b09a1..38db20d42e42 100644 +index f619697b09a17..38db20d42e42a 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -1759,7 +1759,7 @@ int vchiq_mmal_component_enable(struct vchiq_mmal_instance *instance, @@ -309440,10 +309440,10 @@ index f619697b09a1..38db20d42e42 100644 2.18.4 -From d011c86b5ec628c5f8297423b023d36597e4b6e3 Mon Sep 17 00:00:00 2001 +From 7fdf9845178380bcecfa666dd974e4d43883ad54 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:57:09 +0100 -Subject: [PATCH 0174/1216] staging: mmal-vchiq: Make timeout a defined +Subject: [PATCH 0174/1224] staging: mmal-vchiq: Make timeout a defined parameter The timeout period for VPU communications is a useful thing @@ -309456,7 +309456,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 38db20d42e42..9aeb5ac08683 100644 +index 38db20d42e42a..9aeb5ac086835 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -43,6 +43,12 @@ MODULE_VERSION("0.0.1"); @@ -309485,10 +309485,10 @@ index 38db20d42e42..9aeb5ac08683 100644 2.18.4 -From dce9055bc0c24eaaeabcb460803bd125fe630868 Mon Sep 17 00:00:00 2001 +From 51c6c527285b9dac4a704910e80f5d1b8aaf8791 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 17:33:37 +0100 -Subject: [PATCH 0175/1216] staging: mmal-vchiq: Make a mmal_buf struct for +Subject: [PATCH 0175/1224] staging: mmal-vchiq: Make a mmal_buf struct for passing parameters The callback from vchi_mmal to the client was growing lots of extra @@ -309507,7 +309507,7 @@ Signed-off-by: Dave Stevenson 4 files changed, 63 insertions(+), 34 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -index 74b7db3204ec..4317bf595477 100644 +index 74b7db3204eca..4317bf5954774 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -72,6 +72,12 @@ static const struct v4l2_fract @@ -309688,7 +309688,7 @@ index 74b7db3204ec..4317bf595477 100644 q->mem_ops = &vb2_vmalloc_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h -index ff5398737b4a..a635389208fc 100644 +index ff5398737b4a2..a635389208fc5 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h @@ -49,6 +49,11 @@ struct mmal_buffer { @@ -309704,7 +309704,7 @@ index ff5398737b4a..a635389208fc 100644 /* */ diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 9aeb5ac08683..0dca66e45af8 100644 +index 9aeb5ac086835..0dca66e45af88 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -258,17 +258,25 @@ static void buffer_work_cb(struct work_struct *work) @@ -309758,7 +309758,7 @@ index 9aeb5ac08683..0dca66e45af8 100644 spin_unlock_irqrestore(&port->slock, flags); diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -index 4e34728d87e5..cca7289761c2 100644 +index 4e34728d87e53..cca7289761c2a 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h @@ -44,8 +44,7 @@ struct vchiq_mmal_port; @@ -309775,10 +309775,10 @@ index 4e34728d87e5..cca7289761c2 100644 2.18.4 -From f54669072b602527c2bad3a605f0d6c5f4bed2d9 Mon Sep 17 00:00:00 2001 +From 8fc9c4b407612b1d00fbb04a14e30d643703dc24 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:15:38 +0100 -Subject: [PATCH 0176/1216] staging: mmal-vchiq: Add support for event +Subject: [PATCH 0176/1224] staging: mmal-vchiq: Add support for event callbacks. (Preparation for the codec driver). @@ -309797,7 +309797,7 @@ Signed-off-by: Dave Stevenson 4 files changed, 196 insertions(+), 14 deletions(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h -index a635389208fc..b78c180e0c79 100644 +index a635389208fc5..b78c180e0c79f 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h @@ -50,6 +50,7 @@ struct mmal_buffer { @@ -309809,7 +309809,7 @@ index a635389208fc..b78c180e0c79 100644 u32 mmal_flags; s64 dts; diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h -index 43cc59316f90..607ea384f715 100644 +index 43cc59316f90a..607ea384f715c 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h @@ -346,6 +346,41 @@ struct mmal_msg_port_parameter_get_reply { @@ -309855,7 +309855,7 @@ index 43cc59316f90..607ea384f715 100644 u32 client_component; /* component context */ diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 0dca66e45af8..f66d28ed7c84 100644 +index 0dca66e45af88..f66d28ed7c840 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -150,6 +150,8 @@ struct mmal_msg_context { @@ -310126,7 +310126,7 @@ index 0dca66e45af8..f66d28ed7c84 100644 return ret; diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -index cca7289761c2..eeef5ee9467a 100644 +index cca7289761c2a..eeef5ee9467a3 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h @@ -78,6 +78,10 @@ struct vchiq_mmal_port { @@ -310144,10 +310144,10 @@ index cca7289761c2..eeef5ee9467a 100644 2.18.4 -From 84e16ce163855535898cd1af3d55e5e81a161796 Mon Sep 17 00:00:00 2001 +From adf1d8c00a147d718dbc5fb6e9a1ffbb850cd7b0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:26:02 +0100 -Subject: [PATCH 0177/1216] staging: vc04_services: Support sending data to +Subject: [PATCH 0177/1224] staging: vc04_services: Support sending data to MMAL ports Add the ability to send data to ports. This only supports @@ -310160,7 +310160,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index f66d28ed7c84..a75e9fd8cbe1 100644 +index f66d28ed7c840..a75e9fd8cbe1d 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -427,11 +427,19 @@ buffer_from_host(struct vchiq_mmal_instance *instance, @@ -310192,10 +310192,10 @@ index f66d28ed7c84..a75e9fd8cbe1 100644 2.18.4 -From 94240b8e7249e770a8f2456011dd2e172d18c16c Mon Sep 17 00:00:00 2001 +From f68e559ec390d3098a3f67103cd4b93fcf4eb72b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 16:57:40 +0100 -Subject: [PATCH 0178/1216] staging: vc04_services: Fixup vchiq-mmal include +Subject: [PATCH 0178/1224] staging: vc04_services: Fixup vchiq-mmal include ordering There were dependencies on including the headers in the correct @@ -310209,7 +310209,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 2 insertions(+) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h -index 607ea384f715..bd83159403e5 100644 +index 607ea384f715c..bd83159403e51 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h @@ -38,6 +38,7 @@ @@ -310221,7 +310221,7 @@ index 607ea384f715..bd83159403e5 100644 enum mmal_msg_type { MMAL_MSG_TYPE_QUIT = 1, diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -index eeef5ee9467a..7a490f29737a 100644 +index eeef5ee9467a3..7a490f29737ac 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h @@ -16,6 +16,7 @@ @@ -310236,10 +310236,10 @@ index eeef5ee9467a..7a490f29737a 100644 2.18.4 -From f564479d2fd37d3d87b869f817500e266f872e2f Mon Sep 17 00:00:00 2001 +From 9b6ac99313bf768b08749a72183a8f179c8c65fd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 10:27:11 +0100 -Subject: [PATCH 0179/1216] staging: vc04_services: Add new vc-sm-cma driver +Subject: [PATCH 0179/1224] staging: vc04_services: Add new vc-sm-cma driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -310455,7 +310455,7 @@ Signed-off-by: popcornmix create mode 100644 include/linux/broadcom/vc_sm_cma_ioctl.h diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig -index 3777e1fe3d2e..697f3548879f 100644 +index 3777e1fe3d2e6..697f3548879f1 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -23,6 +23,7 @@ source "drivers/staging/vc04_services/bcm2835-audio/Kconfig" @@ -310467,7 +310467,7 @@ index 3777e1fe3d2e..697f3548879f 100644 endif diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile -index 91fa00347eb7..c90ad85db4fb 100644 +index 91fa00347eb79..c90ad85db4fb9 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -13,6 +13,7 @@ vchiq-objs := \ @@ -310479,7 +310479,7 @@ index 91fa00347eb7..c90ad85db4fb 100644 ccflags-y += -Idrivers/staging/vc04_services -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile -index a6cb6eebef2e..b18e32df01ae 100644 +index a6cb6eebef2ec..b18e32df01ae1 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/Makefile +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile @@ -7,6 +7,6 @@ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o @@ -310493,7 +310493,7 @@ index a6cb6eebef2e..b18e32df01ae 100644 -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/vc-sm-cma/Kconfig b/drivers/staging/vc04_services/vc-sm-cma/Kconfig new file mode 100644 -index 000000000000..bbd296f5826b +index 0000000000000..bbd296f5826b4 --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/Kconfig @@ -0,0 +1,10 @@ @@ -310509,7 +310509,7 @@ index 000000000000..bbd296f5826b + running on VideoCore. diff --git a/drivers/staging/vc04_services/vc-sm-cma/Makefile b/drivers/staging/vc04_services/vc-sm-cma/Makefile new file mode 100644 -index 000000000000..5a0bc5f235e7 +index 0000000000000..5a0bc5f235e7a --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/Makefile @@ -0,0 +1,8 @@ @@ -310523,14 +310523,14 @@ index 000000000000..5a0bc5f235e7 +obj-$(CONFIG_BCM_VC_SM_CMA) += vc-sm-cma.o diff --git a/drivers/staging/vc04_services/vc-sm-cma/TODO b/drivers/staging/vc04_services/vc-sm-cma/TODO new file mode 100644 -index 000000000000..ac9b5f8a7389 +index 0000000000000..ac9b5f8a73895 --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/TODO @@ -0,0 +1 @@ +No currently outstanding tasks except some clean-up. diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c new file mode 100644 -index 000000000000..8cbe2b3522c6 +index 0000000000000..8cbe2b3522c65 --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c @@ -0,0 +1,1774 @@ @@ -312310,7 +312310,7 @@ index 000000000000..8cbe2b3522c6 +MODULE_ALIAS("platform:vcsm-cma"); diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h new file mode 100644 -index 000000000000..f1c7b95b14ce +index 0000000000000..f1c7b95b14cee --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h @@ -0,0 +1,84 @@ @@ -312400,7 +312400,7 @@ index 000000000000..f1c7b95b14ce +#endif diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c new file mode 100644 -index 000000000000..83110c55f440 +index 0000000000000..83110c55f4402 --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c @@ -0,0 +1,505 @@ @@ -312911,7 +312911,7 @@ index 000000000000..83110c55f440 +} diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h new file mode 100644 -index 000000000000..05509efcdfcd +index 0000000000000..05509efcdfcda --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h @@ -0,0 +1,63 @@ @@ -312980,7 +312980,7 @@ index 000000000000..05509efcdfcd +#endif /* __VC_SM_CMA_VCHI_H__INCLUDED__ */ diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h new file mode 100644 -index 000000000000..8a0d1f6dbfe8 +index 0000000000000..8a0d1f6dbfe89 --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h @@ -0,0 +1,300 @@ @@ -313286,7 +313286,7 @@ index 000000000000..8a0d1f6dbfe8 +#endif /* __VC_SM_DEFS_H__INCLUDED__ */ diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h new file mode 100644 -index 000000000000..988fdd967922 +index 0000000000000..988fdd967922b --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h @@ -0,0 +1,28 @@ @@ -313319,7 +313319,7 @@ index 000000000000..988fdd967922 + +#endif /* __VC_SM_KNL_H__INCLUDED__ */ diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile -index f1647fc72afa..8aef25fbd3b9 100644 +index f1647fc72afaa..8aef25fbd3b99 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/Makefile +++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile @@ -4,5 +4,5 @@ bcm2835-mmal-vchiq-objs := mmal-vchiq.o @@ -313331,7 +313331,7 @@ index f1647fc72afa..8aef25fbd3b9 100644 -D__VCCOREVER__=0x04000000 diff --git a/include/linux/broadcom/vc_sm_cma_ioctl.h b/include/linux/broadcom/vc_sm_cma_ioctl.h new file mode 100644 -index 000000000000..107460ad1be3 +index 0000000000000..107460ad1be34 --- /dev/null +++ b/include/linux/broadcom/vc_sm_cma_ioctl.h @@ -0,0 +1,114 @@ @@ -313453,10 +313453,10 @@ index 000000000000..107460ad1be3 2.18.4 -From b7afe35137eccb71a821ee3f48a391e866e03902 Mon Sep 17 00:00:00 2001 +From c07cc02356c1620e143a23e939fdf97a318765ad Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 16:07:55 +0100 -Subject: [PATCH 0180/1216] staging: vc04_services: Use vc-sm-cma to support +Subject: [PATCH 0180/1224] 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 @@ -313485,7 +313485,7 @@ Signed-off-by: Dave Stevenson 4 files changed, 70 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/staging/vc04_services/vchiq-mmal/Kconfig -index 2288a95273e2..ff4d34eb45cc 100644 +index 2288a95273e27..ff4d34eb45cc2 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/Kconfig +++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig @@ -2,6 +2,7 @@ config BCM2835_VCHIQ_MMAL @@ -313497,7 +313497,7 @@ index 2288a95273e2..ff4d34eb45cc 100644 Enables the MMAL API over VCHIQ as used for the majority of the multimedia services on VideoCore. diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h -index b78c180e0c79..3893a280fcfa 100644 +index b78c180e0c79f..3893a280fcfa8 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h @@ -50,6 +50,10 @@ struct mmal_buffer { @@ -313512,7 +313512,7 @@ index b78c180e0c79..3893a280fcfa 100644 unsigned long length; u32 mmal_flags; diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index a75e9fd8cbe1..8be5b72b6ece 100644 +index a75e9fd8cbe1d..8be5b72b6ece1 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -26,9 +26,12 @@ @@ -313627,7 +313627,7 @@ index a75e9fd8cbe1..8be5b72b6ece 100644 } EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup); diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -index 7a490f29737a..ae6c69ba16ee 100644 +index 7a490f29737ac..ae6c69ba16ee9 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h @@ -49,6 +49,7 @@ typedef void (*vchiq_mmal_buffer_cb)( @@ -313642,10 +313642,10 @@ index 7a490f29737a..ae6c69ba16ee 100644 2.18.4 -From 5a8d32aa2139caf4deeca0666728283a2570b2ba Mon Sep 17 00:00:00 2001 +From 8a6cdbe4916b8b7bcfebb01ca6fe0a4a0a1e98e9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 17:57:45 +0000 -Subject: [PATCH 0181/1216] media: videobuf2: Allow exporting of a struct +Subject: [PATCH 0181/1224] media: videobuf2: Allow exporting of a struct dmabuf videobuf2 only allowed exporting a dmabuf as a file descriptor, @@ -313663,7 +313663,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c -index 4489744fbbd9..a04bbc073c61 100644 +index 4489744fbbd95..a04bbc073c61a 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -2073,12 +2073,12 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off, @@ -313705,7 +313705,7 @@ index 4489744fbbd9..a04bbc073c61 100644 if (ret < 0) { dprintk(3, "buffer %d, plane %d failed to export (%d)\n", diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h -index 640aabe69450..d86d888247a1 100644 +index 640aabe69450c..d86d888247a15 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -869,6 +869,21 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type); @@ -313734,10 +313734,10 @@ index 640aabe69450..d86d888247a1 100644 2.18.4 -From 3354b47b9b976c4a051ca4be8dcad2432482466e Mon Sep 17 00:00:00 2001 +From 532edfe81989132448132304d71ffe3d71022423 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 14:53:49 +0100 -Subject: [PATCH 0182/1216] staging: vc04_services: Add a V4L2 M2M codec driver +Subject: [PATCH 0182/1224] 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 @@ -313759,7 +313759,7 @@ Signed-off-by: Dave Stevenson create mode 100644 drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig -index 697f3548879f..0db67350a1f1 100644 +index 697f3548879f1..0db67350a1f17 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -24,6 +24,7 @@ source "drivers/staging/vc04_services/bcm2835-audio/Kconfig" @@ -313771,7 +313771,7 @@ index 697f3548879f..0db67350a1f1 100644 endif diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile -index c90ad85db4fb..709185d002e1 100644 +index c90ad85db4fb9..709185d002e11 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -10,10 +10,11 @@ vchiq-objs := \ @@ -313792,7 +313792,7 @@ index c90ad85db4fb..709185d002e1 100644 diff --git a/drivers/staging/vc04_services/bcm2835-codec/Kconfig b/drivers/staging/vc04_services/bcm2835-codec/Kconfig new file mode 100644 -index 000000000000..951971b39ce0 +index 0000000000000..951971b39ce0e --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-codec/Kconfig @@ -0,0 +1,11 @@ @@ -313809,7 +313809,7 @@ index 000000000000..951971b39ce0 + to a service running on VideoCore. diff --git a/drivers/staging/vc04_services/bcm2835-codec/Makefile b/drivers/staging/vc04_services/bcm2835-codec/Makefile new file mode 100644 -index 000000000000..5820ec1f89ec +index 0000000000000..5820ec1f89ece --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-codec/Makefile @@ -0,0 +1,8 @@ @@ -313823,7 +313823,7 @@ index 000000000000..5820ec1f89ec + -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/bcm2835-codec/TODO b/drivers/staging/vc04_services/bcm2835-codec/TODO new file mode 100644 -index 000000000000..ea9a7b7a88e2 +index 0000000000000..ea9a7b7a88e2f --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-codec/TODO @@ -0,0 +1,24 @@ @@ -313854,7 +313854,7 @@ index 000000000000..ea9a7b7a88e2 \ No newline at end of file diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c new file mode 100644 -index 000000000000..4e4e4fb69ade +index 0000000000000..4e4e4fb69ade1 --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -0,0 +1,2359 @@ @@ -316221,10 +316221,10 @@ index 000000000000..4e4e4fb69ade 2.18.4 -From 42668eaa4e567fba3b101bee6c2fb426191e01a0 Mon Sep 17 00:00:00 2001 +From c1ec8624f91d6fda06afe99ab3c33199b324f3a7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 22 Jan 2019 12:04:09 +0000 -Subject: [PATCH 0183/1216] staging: mmal-vchiq: Fix client_component for 64 +Subject: [PATCH 0183/1224] staging: mmal-vchiq: Fix client_component for 64 bit kernel The MMAL client_component field is used with the event @@ -316244,7 +316244,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 8be5b72b6ece..9416cbeae3a3 100644 +index 8be5b72b6ece1..9416cbeae3a34 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -472,9 +472,9 @@ buffer_from_host(struct vchiq_mmal_instance *instance, @@ -316282,7 +316282,7 @@ index 8be5b72b6ece..9416cbeae3a3 100644 if (ret < 0) { pr_err("%s: failed to create component %d (Not enough GPU mem?)\n", diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -index ae6c69ba16ee..247521fbcc1d 100644 +index ae6c69ba16ee9..247521fbcc1d8 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h @@ -97,6 +97,7 @@ struct vchiq_mmal_component { @@ -316297,10 +316297,10 @@ index ae6c69ba16ee..247521fbcc1d 100644 2.18.4 -From 5797bcc3c2c6ee67c58c709a4d44773ed5b345d8 Mon Sep 17 00:00:00 2001 +From ff8637fd8bfcc8031e859c5e91282a654096ba74 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 15:09:28 +0000 -Subject: [PATCH 0184/1216] clk: clk-bcm2835: Use %zd when printing size_t +Subject: [PATCH 0184/1224] 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". @@ -316311,7 +316311,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index db1df40271c0..d4bf9e376318 100644 +index db1df40271c08..d4bf9e376318c 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -2354,7 +2354,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev) @@ -316327,10 +316327,10 @@ index db1df40271c0..d4bf9e376318 100644 2.18.4 -From 3002c2ec313bc6b4fb465137e1732f62646a76a5 Mon Sep 17 00:00:00 2001 +From d8fa4529efa0ec84ecb2ae73c974435a295ccb05 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Sep 2018 11:08:51 +0100 -Subject: [PATCH 0185/1216] media: ov5647: Use gpiod_set_value_cansleep +Subject: [PATCH 0185/1224] 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 @@ -316346,7 +316346,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 8a1a515388e0..07550377be2e 100644 +index 8a1a515388e0e..07550377be2ef 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -373,7 +373,7 @@ static int ov5647_sensor_power(struct v4l2_subdev *sd, int on) @@ -316387,10 +316387,10 @@ index 8a1a515388e0..07550377be2e 100644 2.18.4 -From 58f4bc39fd1abc28e15e9ee7332cc0a7f6d29331 Mon Sep 17 00:00:00 2001 +From 6df7261e8fae11d6f458bffa4c7e7818d8e298e3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 16:40:01 +0000 -Subject: [PATCH 0186/1216] staging: bcm2835-codec: variable vb2 may be used +Subject: [PATCH 0186/1224] staging: bcm2835-codec: variable vb2 may be used uninitialised In op_buffer_cb, the failure path checked whether there was @@ -316403,7 +316403,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 insertions(+), 3 deletions(-) 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 4e4e4fb69ade..4ef16379f216 100644 +index 4e4e4fb69ade1..4ef16379f2161 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -634,6 +634,9 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance, @@ -316430,10 +316430,10 @@ index 4e4e4fb69ade..4ef16379f216 100644 2.18.4 -From 97f8f974451ed7f1496437ab1feb95e5902f112c Mon Sep 17 00:00:00 2001 +From 7d8b8741f952e1b9e6b4f1b5deedd2875118af70 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 16:36:19 +0000 -Subject: [PATCH 0187/1216] staging: bcm2835-codec: Fix potentially +Subject: [PATCH 0187/1224] staging: bcm2835-codec: Fix potentially uninitialised vars src_m2m_buf and dst_m2m_buf were printed in log messages @@ -316445,7 +316445,7 @@ Signed-off-by: Dave Stevenson 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 4ef16379f216..c26760faae2d 100644 +index 4ef16379f2161..c26760faae2d6 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -743,7 +743,7 @@ static void device_run(void *priv) @@ -316461,10 +316461,10 @@ index 4ef16379f216..c26760faae2d 100644 2.18.4 -From 7edff1ea6719caf4890a3ae5c3c0c26b0a0f2641 Mon Sep 17 00:00:00 2001 +From 0f4d69e310db5516c0f10ca70bd2f3cdb29a8a5a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:33:29 +0000 -Subject: [PATCH 0188/1216] staging: mmal_vchiq: Add in the Bayer encoding +Subject: [PATCH 0188/1224] staging: mmal_vchiq: Add in the Bayer encoding formats The list of formats was copied before Bayer support was added. @@ -316477,7 +316477,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 27 insertions(+) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h -index 2be9941a1f30..44ba91aa6d47 100644 +index 2be9941a1f30e..44ba91aa6d479 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h @@ -69,6 +69,33 @@ @@ -316518,10 +316518,10 @@ index 2be9941a1f30..44ba91aa6d47 100644 2.18.4 -From 3d3d37e9c8c8f731424688a444951171fb23c05c Mon Sep 17 00:00:00 2001 +From 4d7dd255d214f9a2b472064f10367d6e437854d8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:36:56 +0000 -Subject: [PATCH 0189/1216] staging: mmal-vchiq: Always return the param size +Subject: [PATCH 0189/1224] staging: mmal-vchiq: Always return the param size from param_get mmal-vchiq is a reimplementation of the userland library for MMAL. @@ -316541,7 +316541,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 9416cbeae3a3..59a4d2414069 100644 +index 9416cbeae3a34..59a4d24140693 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -1412,11 +1412,12 @@ static int port_parameter_get(struct vchiq_mmal_instance *instance, @@ -316562,10 +316562,10 @@ index 9416cbeae3a3..59a4d2414069 100644 2.18.4 -From ff6f387358a1cbe1f5994b8e38b3f22485edf241 Mon Sep 17 00:00:00 2001 +From 87dd677addb930cd6e74cb40500ac819070216d6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:51:03 +0000 -Subject: [PATCH 0190/1216] staging: mmal-vchiq: If the VPU returns an error, +Subject: [PATCH 0190/1224] 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. @@ -316580,7 +316580,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 59a4d2414069..cfc861d0a214 100644 +index 59a4d24140693..cfc861d0a214e 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -1400,7 +1400,8 @@ static int port_parameter_get(struct vchiq_mmal_instance *instance, @@ -316597,10 +316597,10 @@ index 59a4d2414069..cfc861d0a214 100644 2.18.4 -From 6df00bf18368dd4068b80b88f1a35a197a88ea76 Mon Sep 17 00:00:00 2001 +From 77a2d720ddfd1ac4f7515c811c9f1f7bc410d178 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 13:44:00 +0000 -Subject: [PATCH 0191/1216] staging: bcm2835_codec: Query supported formats +Subject: [PATCH 0191/1224] staging: bcm2835_codec: Query supported formats from the component The driver was previously working with hard coded tables of @@ -316615,7 +316615,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 327 insertions(+), 128 deletions(-) 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 c26760faae2d..7b8de26ca43b 100644 +index c26760faae2d6..7b8de26ca43b5 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -88,17 +88,12 @@ struct bcm2835_codec_fmt { @@ -317330,10 +317330,10 @@ index c26760faae2d..7b8de26ca43b 100644 2.18.4 -From 3b510cc353b4b1f6f5ef4fc96011a4134fdf03d2 Mon Sep 17 00:00:00 2001 +From 8358d51e8f106a12db5c752fc1483a845147d1ee Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 14:07:52 +0000 -Subject: [PATCH 0192/1216] staging: bcm2835_codec: Add support for the ISP as +Subject: [PATCH 0192/1224] staging: bcm2835_codec: Add support for the ISP as an M2M device The MMAL ISP component can also use this same V4L2 wrapper to @@ -317349,7 +317349,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 92 insertions(+), 40 deletions(-) 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 7b8de26ca43b..f9fd5e8ac914 100644 +index 7b8de26ca43b5..f9fd5e8ac9141 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -54,10 +54,26 @@ static int encode_video_nr = 11; @@ -317720,10 +317720,10 @@ index 7b8de26ca43b..f9fd5e8ac914 100644 2.18.4 -From d9ea908fc3ed6be84990d07ec835e1eb6b8721fe Mon Sep 17 00:00:00 2001 +From 8c1bbd67a9eccacd6838eb1eb7de2c92c166ae9f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 Feb 2019 11:36:14 +0000 -Subject: [PATCH 0193/1216] staging: bcm2835_codec: Add an option for ignoring +Subject: [PATCH 0193/1224] staging: bcm2835_codec: Add an option for ignoring Bayer formats. This is a workaround for GStreamer currently not identifying Bayer @@ -317736,7 +317736,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 28 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 f9fd5e8ac914..5141034835ca 100644 +index f9fd5e8ac9141..5141034835ca9 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -58,6 +58,15 @@ static int isp_video_nr = 12; @@ -317905,10 +317905,10 @@ index f9fd5e8ac914..5141034835ca 100644 2.18.4 -From 9936c73ca22454a88e4aac2513a1b9943ba55bb2 Mon Sep 17 00:00:00 2001 +From 24b548ecc9e794b5285826982f76b78fbff770be Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 Feb 2019 11:38:45 +0000 -Subject: [PATCH 0194/1216] staging: bcm2835_codec: Fix handling of +Subject: [PATCH 0194/1224] staging: bcm2835_codec: Fix handling of VB2_MEMORY_DMABUF buffers If the queue is configured as VB2_MEMORY_DMABUF then vb2_core_expbuf @@ -317925,7 +317925,7 @@ Signed-off-by: Dave Stevenson 3 files changed, 73 insertions(+), 30 deletions(-) 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 5141034835ca..67d42bf6251b 100644 +index 5141034835ca9..67d42bf6251b1 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1852,6 +1852,18 @@ static int bcm2835_codec_queue_setup(struct vb2_queue *vq, @@ -318045,7 +318045,7 @@ index 5141034835ca..67d42bf6251b 100644 /* If both ports disabled, then disable the component */ diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index cfc861d0a214..2018c28daf68 100644 +index cfc861d0a214e..2018c28daf686 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -1784,13 +1784,9 @@ int mmal_vchi_buffer_init(struct vchiq_mmal_instance *instance, @@ -318085,7 +318085,7 @@ index cfc861d0a214..2018c28daf68 100644 } EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup); diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -index 247521fbcc1d..0a75c96f6d58 100644 +index 247521fbcc1d8..0a75c96f6d586 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h @@ -167,6 +167,8 @@ int vchiq_mmal_submit_buffer(struct vchiq_mmal_instance *instance, @@ -318101,10 +318101,10 @@ index 247521fbcc1d..0a75c96f6d58 100644 2.18.4 -From 46925413133dabd62ef905ad2adeab718597c814 Mon Sep 17 00:00:00 2001 +From 27ae3de4c0c6756a88f2114b38517b2590e09799 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 18 Feb 2019 15:52:29 +0000 -Subject: [PATCH 0195/1216] staging: mmal-vchiq: Update mmal_parameters.h with +Subject: [PATCH 0195/1224] staging: mmal-vchiq: Update mmal_parameters.h with recently defined params mmal_parameters.h hasn't been updated to reflect additions made @@ -318117,7 +318117,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h -index 80a99128f5f3..926392d754c7 100644 +index 80a99128f5f3e..926392d754c76 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h @@ -580,7 +580,37 @@ enum mmal_parameter_video_type { @@ -318163,10 +318163,10 @@ index 80a99128f5f3..926392d754c7 100644 2.18.4 -From f08caaef0790d5d1a259db84e35aa0dc6415807e Mon Sep 17 00:00:00 2001 +From 2640015b72431485693d201ebea46127cda2eaa0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 18 Feb 2019 15:56:42 +0000 -Subject: [PATCH 0196/1216] staging: bcm2835_codec: Include timing info in SPS +Subject: [PATCH 0196/1224] staging: bcm2835_codec: Include timing info in SPS headers Inserting timing information into the VUI block of the SPS is @@ -318180,7 +318180,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 12 insertions(+) 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 67d42bf6251b..eb5c07bc73d0 100644 +index 67d42bf6251b1..eb5c07bc73d06 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1785,6 +1785,8 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx) @@ -318213,10 +318213,10 @@ index 67d42bf6251b..eb5c07bc73d0 100644 2.18.4 -From ae9383d5b7f36076973cbc801c0fbf4da07a2a9d Mon Sep 17 00:00:00 2001 +From e686b70949411ae252f7b8bbdc4da98612d78243 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Mar 2019 17:55:09 +0000 -Subject: [PATCH 0197/1216] staging: bcm2835-codec: NULL component handle on +Subject: [PATCH 0197/1224] staging: bcm2835-codec: NULL component handle on queue_setup failure queue_setup tries creating the relevant MMAL component and configures @@ -318232,7 +318232,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 13 insertions(+), 2 deletions(-) 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 eb5c07bc73d0..ad555ceb8f63 100644 +index eb5c07bc73d06..ad555ceb8f63e 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1776,13 +1776,21 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx) @@ -318278,10 +318278,10 @@ index eb5c07bc73d0..ad555ceb8f63 100644 2.18.4 -From ac01cf41e1ea3899e404dc593cde2bf4da4a1124 Mon Sep 17 00:00:00 2001 +From 6232c66559be282223876d04b15fc297bacd7277 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 11:26:00 +0000 -Subject: [PATCH 0198/1216] staging: bcm2835_codec: Clean up logging on +Subject: [PATCH 0198/1224] staging: bcm2835_codec: Clean up logging on unloading the driver The log line was missing a closing \n, so wasn't added to the @@ -318295,7 +318295,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 8 insertions(+), 2 deletions(-) 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 ad555ceb8f63..837fbec5ab4f 100644 +index ad555ceb8f63e..837fbec5ab4f8 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -77,6 +77,12 @@ enum bcm2835_codec_role { @@ -318333,10 +318333,10 @@ index ad555ceb8f63..837fbec5ab4f 100644 2.18.4 -From f1253335942337b7c0fef8945dbd9853405b3334 Mon Sep 17 00:00:00 2001 +From 872ca7af45883d7726313387108b058d9638167c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 20 Mar 2019 10:06:51 +0000 -Subject: [PATCH 0199/1216] staging: bcm2835-codec: Refactor default resolution +Subject: [PATCH 0199/1224] staging: bcm2835-codec: Refactor default resolution code The default resolution code was different for each role @@ -318352,7 +318352,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 40 insertions(+), 63 deletions(-) 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 837fbec5ab4f..4b67c9ea73e1 100644 +index 837fbec5ab4f8..4b67c9ea73e13 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -578,10 +578,17 @@ static void job_abort(void *priv) @@ -318493,10 +318493,10 @@ index 837fbec5ab4f..4b67c9ea73e1 100644 2.18.4 -From 9264c78b2abe42e8105f79fb4107fa07c90f1713 Mon Sep 17 00:00:00 2001 +From dabe62b9f4695f52f931c35812c9609a4bd3ec10 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 14:30:24 +0100 -Subject: [PATCH 0200/1216] staging: bcm2835-codec: Correct port width calc for +Subject: [PATCH 0200/1224] staging: bcm2835-codec: Correct port width calc for truncation The calculation converting from V4L2 bytesperline to MMAL @@ -318510,7 +318510,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 2 deletions(-) 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 4b67c9ea73e1..97b1f2b953ec 100644 +index 4b67c9ea73e13..97b1f2b953eca 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -605,8 +605,8 @@ static void setup_mmal_port_format(struct bcm2835_codec_ctx *ctx, @@ -318528,10 +318528,10 @@ index 4b67c9ea73e1..97b1f2b953ec 100644 2.18.4 -From 2858662b1bb09fdb3c2f73735fcc89aece042123 Mon Sep 17 00:00:00 2001 +From 35454cbe531c1ceecf0954a7eb42698481993549 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 14:32:21 +0100 -Subject: [PATCH 0201/1216] staging: bcm2835-codec: Remove height padding for +Subject: [PATCH 0201/1224] staging: bcm2835-codec: Remove height padding for ISP role The ISP has no need for heights to be a multiple of macroblock @@ -318544,7 +318544,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 8 insertions(+), 5 deletions(-) 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 97b1f2b953ec..22588f78287e 100644 +index 97b1f2b953eca..22588f78287e5 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1015,7 +1015,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, @@ -318595,10 +318595,10 @@ index 97b1f2b953ec..22588f78287e 100644 2.18.4 -From 8b83d60f590582e482de9e8279ed17bcef957276 Mon Sep 17 00:00:00 2001 +From 67b275f34074106b28f9ec3058ac0295c355d806 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 May 2019 13:27:23 +0100 -Subject: [PATCH 0202/1216] staging: mmal-vchiq: Free the event context for +Subject: [PATCH 0202/1224] staging: mmal-vchiq: Free the event context for control ports vchiq_mmal_component_init calls init_event_context for the @@ -318613,7 +318613,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 2018c28daf68..4d9d7beb9144 100644 +index 2018c28daf686..4d9d7beb91446 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -1981,6 +1981,8 @@ int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, @@ -318629,10 +318629,10 @@ index 2018c28daf68..4d9d7beb9144 100644 2.18.4 -From 83c3204382f4c5cd918d229f21abeda6f2c6b438 Mon Sep 17 00:00:00 2001 +From db6dfe1808eabf268d0e0a8586b72a68518d5113 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 15:50:01 +0100 -Subject: [PATCH 0203/1216] staging: mmal-vchiq: Fix memory leak in error path +Subject: [PATCH 0203/1224] staging: mmal-vchiq: Fix memory leak in error path On error, vchiq_mmal_component_init could leave the event context allocated for ports. @@ -318644,7 +318644,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 4d9d7beb9144..61a3593cdcfc 100644 +index 4d9d7beb91446..61a3593cdcfc3 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -1847,9 +1847,26 @@ static void free_event_context(struct vchiq_mmal_port *port) @@ -318711,10 +318711,10 @@ index 4d9d7beb9144..61a3593cdcfc 100644 2.18.4 -From 21b7e4fe7d2a4ddbe6568b6819d54316c1c8200e Mon Sep 17 00:00:00 2001 +From 3ba606d5a329294a1c9ab82f5259996e1918c1cf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2019 14:11:58 +0100 -Subject: [PATCH 0204/1216] staging: bcm2835-codec: Convert V4L2 nsec +Subject: [PATCH 0204/1224] staging: bcm2835-codec: Convert V4L2 nsec timestamps to MMAL usec V4L2 uses nsecs, whilst MMAL uses usecs, but the code wasn't converting @@ -318726,7 +318726,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+), 2 deletions(-) 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 22588f78287e..5c7fc39cd921 100644 +index 22588f78287e5..5c7fc39cd9218 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -823,7 +823,8 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance, @@ -318763,10 +318763,10 @@ index 22588f78287e..5c7fc39cd921 100644 2.18.4 -From 0136a5a3cf2b9ab6d7ec875e1f04316b46de5faf Mon Sep 17 00:00:00 2001 +From 761a1009d4bdd05cd7917a6343b1aecd6e4db3de Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2019 14:13:11 +0100 -Subject: [PATCH 0205/1216] staging: bcm2835-codec: Add support for setting +Subject: [PATCH 0205/1224] staging: bcm2835-codec: Add support for setting S_PARM and G_PARM Video encode can use the frame rate for rate control calculations, @@ -318778,7 +318778,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 48 insertions(+), 4 deletions(-) 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 5c7fc39cd921..708f76b7aa92 100644 +index 5c7fc39cd9218..708f76b7aa92b 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -447,6 +447,8 @@ struct bcm2835_codec_ctx { @@ -318887,10 +318887,10 @@ index 5c7fc39cd921..708f76b7aa92 100644 2.18.4 -From 1b6a0ac582b93cde4fd0ec2e2bb98069f89a361a Mon Sep 17 00:00:00 2001 +From 8d8e7bbb00d917c43f2a7d5435e3c42dcec11049 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Jun 2019 17:15:05 +0100 -Subject: [PATCH 0206/1216] w1: w1-gpio: Make GPIO an output for strong pullup +Subject: [PATCH 0206/1224] 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 @@ -318904,7 +318904,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c -index d4632aace402..4832cd8c2596 100644 +index d4632aace4022..4832cd8c2596a 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c @@ -30,7 +30,7 @@ static u8 w1_gpio_set_pullup(void *data, int delay) @@ -318920,10 +318920,10 @@ index d4632aace402..4832cd8c2596 100644 2.18.4 -From 819742c4e8ee04572fa9ffb3b542cf48c7884642 Mon Sep 17 00:00:00 2001 +From c8511e3ed09babfc67c5ecb3eee47cecc012e7bf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 Feb 2019 08:49:39 +0000 -Subject: [PATCH 0207/1216] arm: bcm2835: Fix FIQ early ioremap +Subject: [PATCH 0207/1224] arm: bcm2835: Fix FIQ early ioremap The ioremapping creates mappings within the vmalloc area. The equivalent early function, create_mapping, now checks that the @@ -318938,7 +318938,7 @@ Signed-off-by: Phil Elwell 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 9b6c921106b5..9bd9842da59f 100644 +index 9b6c921106b56..9bd9842da59fa 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -5,17 +5,20 @@ @@ -318999,10 +318999,10 @@ index 9b6c921106b5..9bd9842da59f 100644 2.18.4 -From c73eb2f5470611d6cbabf2be4c7953202a74da49 Mon Sep 17 00:00:00 2001 +From f970ad445dc60cf7fcb3c279995b7ccc33a9b2b0 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 14 Mar 2019 10:16:02 +0000 -Subject: [PATCH 0208/1216] Fix copy_from_user if BCM2835_FAST_MEMCPY=n +Subject: [PATCH 0208/1224] 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 @@ -319017,7 +319017,7 @@ ARM processors. 1 file changed, 6 insertions(+) diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c -index 296c2985ac17..ab150e8281f3 100644 +index 296c2985ac176..ab150e8281f3e 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -254,6 +254,7 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -319044,10 +319044,10 @@ index 296c2985ac17..ab150e8281f3 100644 2.18.4 -From 16afdf97fb56dda0774f384931ac0f7768dc2153 Mon Sep 17 00:00:00 2001 +From a2e24fd800aabf198333e2281eea1a252f547f0d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0209/1216] PCI: brcmstb: Add Broadcom STB PCIe host controller +Subject: [PATCH 0209/1224] PCI: brcmstb: Add Broadcom STB PCIe host controller driver This commit adds the basic Broadcom STB PCIe controller. Missing is @@ -319072,7 +319072,7 @@ Signed-off-by: Jim Quinlan create mode 100644 include/soc/brcmstb/memory_api.h diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig -index 70e078238899..e57bbd0ec9a7 100644 +index 70e078238899f..e57bbd0ec9a71 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -288,5 +288,14 @@ config PCI_HYPERV_INTERFACE @@ -319091,7 +319091,7 @@ index 70e078238899..e57bbd0ec9a7 100644 source "drivers/pci/controller/dwc/Kconfig" endmenu diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile -index a2a22c9d91af..66c36e20f329 100644 +index a2a22c9d91afc..66c36e20f3291 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -29,11 +29,11 @@ obj-$(CONFIG_PCIE_ROCKCHIP_HOST) += pcie-rockchip-host.o @@ -319109,7 +319109,7 @@ index a2a22c9d91af..66c36e20f329 100644 # They contain MCFG quirks to replace the generic ECAM accessors with diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c new file mode 100644 -index 000000000000..babef9191e88 +index 0000000000000..babef9191e88c --- /dev/null +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -0,0 +1,1097 @@ @@ -320212,7 +320212,7 @@ index 000000000000..babef9191e88 +MODULE_AUTHOR("Broadcom"); diff --git a/include/soc/brcmstb/memory_api.h b/include/soc/brcmstb/memory_api.h new file mode 100644 -index 000000000000..d92290679067 +index 0000000000000..d922906790671 --- /dev/null +++ b/include/soc/brcmstb/memory_api.h @@ -0,0 +1,25 @@ @@ -320245,10 +320245,10 @@ index 000000000000..d92290679067 2.18.4 -From 6b02a7792f410aeff3673f529a1581d54f87443b Mon Sep 17 00:00:00 2001 +From 5cf6f8ad04fa4aff282cffab326544a46fb51588 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0210/1216] PCI: brcmstb: Add dma-range mapping for inbound +Subject: [PATCH 0210/1224] PCI: brcmstb: Add dma-range mapping for inbound traffic The Broadcom STB PCIe host controller is intimately related to the @@ -320324,7 +320324,7 @@ Signed-off-by: Jim Quinlan 1 file changed, 411 insertions(+), 9 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index babef9191e88..27bcf83c99d7 100644 +index babef9191e88c..27bcf83c99d7e 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -4,6 +4,7 @@ @@ -320820,10 +320820,10 @@ index babef9191e88..27bcf83c99d7 100644 2.18.4 -From d1ba7fe05db407dadc6c2f52b10660e5078dba57 Mon Sep 17 00:00:00 2001 +From 6b48f56646a3a662f3750092a1fc22f3e4c4eb04 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0211/1216] PCI: brcmstb: Add MSI capability +Subject: [PATCH 0211/1224] 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 @@ -320841,7 +320841,7 @@ Signed-off-by: Jim Quinlan 1 file changed, 353 insertions(+), 21 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 27bcf83c99d7..b028d4be81a2 100644 +index 27bcf83c99d7e..b028d4be81a23 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1,6 +1,7 @@ @@ -321369,10 +321369,10 @@ index 27bcf83c99d7..b028d4be81a2 100644 2.18.4 -From 0a94d1f1e1eb50fab16684542305a5d8624c597f Mon Sep 17 00:00:00 2001 +From 76091ef33e9f902f70619eb693aa64614969e93a Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 15 Jan 2018 18:28:39 -0500 -Subject: [PATCH 0212/1216] dt-bindings: pci: Add DT docs for Brcmstb PCIe +Subject: [PATCH 0212/1224] dt-bindings: pci: Add DT docs for Brcmstb PCIe device The DT bindings description of the Brcmstb PCIe device is described. This @@ -321387,7 +321387,7 @@ Signed-off-by: Jim Quinlan diff --git a/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt new file mode 100644 -index 000000000000..a1a9ad5e70ca +index 0000000000000..a1a9ad5e70cab --- /dev/null +++ b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt @@ -0,0 +1,59 @@ @@ -321454,10 +321454,10 @@ index 000000000000..a1a9ad5e70ca 2.18.4 -From d158ae18e75e1380b6dd4e64a80ed3dc29a8be16 Mon Sep 17 00:00:00 2001 +From ffcc2c70823bbf058467973515512d95af618948 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 0213/1216] pcie-brcmstb: Changes for BCM2711 +Subject: [PATCH 0213/1224] pcie-brcmstb: Changes for BCM2711 The initial brcmstb PCIe driver - originally taken from the V3(?) patch set - has been modified significantly for the BCM2711. @@ -321477,7 +321477,7 @@ Signed-off-by: Phil Elwell create mode 100644 drivers/soc/bcm/brcmstb/memory.c diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 1e5d6f1bed4e..f59b099233dc 100644 +index 1e5d6f1bed4ec..f59b099233dc0 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -64,6 +64,17 @@ struct bcm2835_dma_cb { @@ -321616,7 +321616,7 @@ index 1e5d6f1bed4e..f59b099233dc 100644 for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) { /* skip masked out channels */ diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile -index 66c36e20f329..be98ebfdb173 100644 +index 66c36e20f3291..be98ebfdb1737 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -30,6 +30,10 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o @@ -321632,7 +321632,7 @@ index 66c36e20f329..be98ebfdb173 100644 obj-y += dwc/ diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c new file mode 100644 -index 000000000000..d8007631a54c +index 0000000000000..d8007631a54cf --- /dev/null +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c @@ -0,0 +1,558 @@ @@ -322196,7 +322196,7 @@ index 000000000000..d8007631a54c +MODULE_LICENSE("GPL"); diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h new file mode 100644 -index 000000000000..5d07f679dc71 +index 0000000000000..5d07f679dc71b --- /dev/null +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h @@ -0,0 +1,32 @@ @@ -322233,7 +322233,7 @@ index 000000000000..5d07f679dc71 + +#endif /* _PCIE_BRCMSTB_BOUNCE_H */ diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index b028d4be81a2..782725e3adad 100644 +index b028d4be81a23..782725e3adad5 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -29,6 +29,7 @@ @@ -322727,7 +322727,7 @@ index b028d4be81a2..782725e3adad 100644 .pm = &brcm_pcie_pm_ops, }, diff --git a/drivers/soc/bcm/brcmstb/Makefile b/drivers/soc/bcm/brcmstb/Makefile -index fe5c43d26dce..28b3a3be0ee3 100644 +index fe5c43d26dce3..28b3a3be0ee36 100644 --- a/drivers/soc/bcm/brcmstb/Makefile +++ b/drivers/soc/bcm/brcmstb/Makefile @@ -1,3 +1,3 @@ @@ -322737,7 +322737,7 @@ index fe5c43d26dce..28b3a3be0ee3 100644 obj-$(CONFIG_BRCMSTB_PM) += pm/ diff --git a/drivers/soc/bcm/brcmstb/memory.c b/drivers/soc/bcm/brcmstb/memory.c new file mode 100644 -index 000000000000..254783d1065f +index 0000000000000..254783d1065f7 --- /dev/null +++ b/drivers/soc/bcm/brcmstb/memory.c @@ -0,0 +1,158 @@ @@ -322903,10 +322903,10 @@ index 000000000000..254783d1065f 2.18.4 -From 4e7cc4e21ced4f52216e59f7674e9b9447000992 Mon Sep 17 00:00:00 2001 +From e55872c077f8f0e01ceacddda9610ec698e391f8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 May 2019 15:47:42 +0100 -Subject: [PATCH 0214/1216] arm: bcm2835: DMA can only address 1GB +Subject: [PATCH 0214/1224] 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. @@ -322917,7 +322917,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 9bd9842da59f..7d59a9364175 100644 +index 9bd9842da59fa..7d59a93641757 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -114,6 +114,9 @@ static const char * const bcm2835_compat[] = { @@ -322934,10 +322934,10 @@ index 9bd9842da59f..7d59a9364175 100644 2.18.4 -From 4cdc972ba4c8e651bf5f194f4d4326683c45c3ad Mon Sep 17 00:00:00 2001 +From 8ff9e19fd952805ca992097ad2479af7ce6f408d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Sep 2018 16:24:05 +0100 -Subject: [PATCH 0215/1216] mmc: sdhci: Mask "spurious" interrupts +Subject: [PATCH 0215/1224] mmc: sdhci: Mask "spurious" interrupts Add a filter for "spurious" Transfer Complete interrupts, attempting to make it as specific as possible: @@ -322951,7 +322951,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index a1aeb2e10564..c140c8dfd56e 100644 +index a1aeb2e105641..c140c8dfd56ef 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3106,6 +3106,10 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) @@ -322969,10 +322969,10 @@ index a1aeb2e10564..c140c8dfd56e 100644 2.18.4 -From f6fa97d1aadc98c2b4f0a301bfb58d4663814558 Mon Sep 17 00:00:00 2001 +From 470b66533832fc2f52a7f3d1ab236a8b3968e39c Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 4 May 2019 17:06:15 +0200 -Subject: [PATCH 0216/1216] hwrng: iproc-rng200: Add BCM2838 support +Subject: [PATCH 0216/1224] 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. @@ -322984,7 +322984,7 @@ Signed-off-by: Stefan Wahren 2 files changed, 79 insertions(+), 6 deletions(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig -index 59f25286befe..31e243fc6c77 100644 +index 59f25286befef..31e243fc6c77f 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -90,11 +90,11 @@ config HW_RANDOM_BCM2835 @@ -323002,7 +323002,7 @@ index 59f25286befe..31e243fc6c77 100644 To compile this driver as a module, choose M here: the module will be called iproc-rng200 diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c -index 92be1c0ab99f..f971a4cb8951 100644 +index 92be1c0ab99f3..f971a4cb8951c 100644 --- a/drivers/char/hw_random/iproc-rng200.c +++ b/drivers/char/hw_random/iproc-rng200.c @@ -29,6 +29,7 @@ @@ -323135,10 +323135,10 @@ index 92be1c0ab99f..f971a4cb8951 100644 2.18.4 -From 42ef9872c884b38ecd2624a1a854c159cb2b7921 Mon Sep 17 00:00:00 2001 +From 587261299e991de4be5c4631e26ac857d119add0 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 18 May 2019 12:26:11 +0200 -Subject: [PATCH 0217/1216] thermal: brcmstb_thermal: Add BCM2838 support +Subject: [PATCH 0217/1224] 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 ). @@ -323150,7 +323150,7 @@ Signed-off-by: Stefan Wahren 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig -index cf43e1520de9..54a9748feac5 100644 +index cf43e1520de9f..54a9748feac5d 100644 --- a/drivers/thermal/broadcom/Kconfig +++ b/drivers/thermal/broadcom/Kconfig @@ -9,7 +9,7 @@ config BCM2835_THERMAL @@ -323163,7 +323163,7 @@ index cf43e1520de9..54a9748feac5 100644 Enable this driver if you have a Broadcom STB SoC and would like thermal framework support. diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c -index 680f1a070606..7a7c6ad7b8a0 100644 +index 680f1a0706065..7a7c6ad7b8a04 100644 --- a/drivers/thermal/broadcom/brcmstb_thermal.c +++ b/drivers/thermal/broadcom/brcmstb_thermal.c @@ -10,6 +10,7 @@ @@ -323295,10 +323295,10 @@ index 680f1a070606..7a7c6ad7b8a0 100644 2.18.4 -From 42a7229f8307d0c306604c837b4c88ca99ba8bf9 Mon Sep 17 00:00:00 2001 +From aaf3fe2045d950f710ef1382028f1a26b44a2ec7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 1 Nov 2018 17:31:37 +0000 -Subject: [PATCH 0218/1216] vchiq: Add 36-bit address support +Subject: [PATCH 0218/1224] 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 @@ -323312,7 +323312,7 @@ Signed-off-by: Phil Elwell 3 files changed, 75 insertions(+), 22 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c -index 2722e73fe0fa..230e1b1144a9 100644 +index 2722e73fe0fa3..230e1b1144a9d 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -16,6 +16,8 @@ @@ -323462,7 +323462,7 @@ index 2722e73fe0fa..230e1b1144a9 100644 /* Partial cache lines (fragments) require special measures */ diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 006566ae2775..4e684ccd9346 100644 +index 006566ae27754..4e684ccd9346a 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -149,6 +149,11 @@ static struct vchiq_drvdata bcm2836_drvdata = { @@ -323486,7 +323486,7 @@ index 006566ae2775..4e684ccd9346 100644 }; MODULE_DEVICE_TABLE(of, vchiq_of_match); diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h -index b424323e9613..5448918f0f36 100644 +index b424323e96134..5448918f0f364 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h @@ -97,6 +97,7 @@ struct vchiq_arm_state { @@ -323501,17 +323501,17 @@ index b424323e9613..5448918f0f36 100644 2.18.4 -From 2560889c2b03738397f2e650f4eab8573e94a7ae Mon Sep 17 00:00:00 2001 +From 609f22e830d3ecada941639f864dfd58948752de Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 30 Apr 2019 19:15:30 +0100 -Subject: [PATCH 0219/1216] bcm2835-pcm.c: Support multichannel audio +Subject: [PATCH 0219/1224] bcm2835-pcm.c: Support multichannel audio --- .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c -index 826016c3431a..e4603ba742e4 100644 +index 826016c3431a1..e4603ba742e45 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c @@ -14,9 +14,9 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_hw = { @@ -323553,17 +323553,17 @@ index 826016c3431a..e4603ba742e4 100644 2.18.4 -From c0e8704143ae84a7f531624fe19e726041d454a4 Mon Sep 17 00:00:00 2001 +From cb1d05f8905b3fecc90f95100190abe9bd551575 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 12 Sep 2018 14:44:53 +0100 -Subject: [PATCH 0220/1216] bcmgenet: constrain max DMA burst length +Subject: [PATCH 0220/1224] bcmgenet: constrain max DMA burst length --- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h -index 5b7c2f9241d0..e59f53c582ca 100644 +index 5b7c2f9241d0f..e59f53c582ca5 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -29,7 +29,7 @@ @@ -323579,10 +323579,10 @@ index 5b7c2f9241d0..e59f53c582ca 100644 2.18.4 -From dbf223374c15fe7f909ab31f7e8c09a07d548142 Mon Sep 17 00:00:00 2001 +From 354fd4c6d65cbb896adec4cc3769f260ea5f0b4b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 27 Mar 2019 13:45:46 +0000 -Subject: [PATCH 0221/1216] bcmgenet: Better coalescing parameter defaults +Subject: [PATCH 0221/1224] bcmgenet: Better coalescing parameter defaults Set defaults for TX and RX packet coalescing to be equivalent to: @@ -323598,7 +323598,7 @@ Signed-off-by: Phil Elwell 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index b27da024aa9d..8cd9d5a9e7f5 100644 +index b27da024aa9d9..8cd9d5a9e7f5b 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2149,7 +2149,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv, @@ -323628,10 +323628,10 @@ index b27da024aa9d..8cd9d5a9e7f5 100644 2.18.4 -From 54d3edb663b1011f9f874fc8bf330e8097a92884 Mon Sep 17 00:00:00 2001 +From bd27cb29a13afafb17ed853404a832952dcdcd65 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:17:59 +0100 -Subject: [PATCH 0222/1216] net: genet: enable link energy detect powerdown for +Subject: [PATCH 0222/1224] net: genet: enable link energy detect powerdown for external PHYs There are several warts surrounding bcmgenet_mii_probe() as this @@ -323649,7 +323649,7 @@ Signed-off-by: Jonathan Bell 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c -index dbe18cdf6c1b..3ba733295718 100644 +index dbe18cdf6c1b8..3ba7332957186 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -316,6 +316,8 @@ int bcmgenet_mii_probe(struct net_device *dev) @@ -323665,10 +323665,10 @@ index dbe18cdf6c1b..3ba733295718 100644 2.18.4 -From cdce67dfa3520a670ec31e2c058140126700b16b Mon Sep 17 00:00:00 2001 +From 9fdc070ec7f8e31615e7adc2f51d1c5f5dea6c69 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:00:41 +0100 -Subject: [PATCH 0223/1216] phy: broadcom: split out the BCM54213PE from the +Subject: [PATCH 0223/1224] phy: broadcom: split out the BCM54213PE from the BCM54210E IDs The last nibble is a revision ID, and the 54213pe is a later rev @@ -323682,7 +323682,7 @@ Signed-off-by: Jonathan Bell 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 5e956089bf52..e7a4cbb66e1f 100644 +index 5e956089bf525..e7a4cbb66e1fd 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -213,7 +213,8 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) @@ -323728,7 +323728,7 @@ index 5e956089bf52..e7a4cbb66e1f 100644 { PHY_ID_BCM54612E, 0xfffffff0 }, { PHY_ID_BCM54616S, 0xfffffff0 }, diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h -index 6db2d9a6e503..bfb37218f435 100644 +index 6db2d9a6e5031..bfb37218f435c 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -20,6 +20,7 @@ @@ -323743,10 +323743,10 @@ index 6db2d9a6e503..bfb37218f435 100644 2.18.4 -From be7a91762b5d3ca617179a83419a6c195682b81b Mon Sep 17 00:00:00 2001 +From 4432abd93bb92306f0ff1bf8fe8e5854476c3c16 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Fri, 17 May 2019 13:31:21 +0100 -Subject: [PATCH 0224/1216] phy: bcm54213pe: configure the LED outputs to be +Subject: [PATCH 0224/1224] phy: bcm54213pe: configure the LED outputs to be more user-friendly The default state was both LEDs indicating link speed. @@ -323762,7 +323762,7 @@ Signed-off-by: Jonathan Bell 2 files changed, 21 insertions(+) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index e7a4cbb66e1f..f5881fb95a5b 100644 +index e7a4cbb66e1fd..f5881fb95a5bf 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -43,6 +43,21 @@ static int bcm54210e_config_init(struct phy_device *phydev) @@ -323797,7 +323797,7 @@ index e7a4cbb66e1f..f5881fb95a5b 100644 err = bcm54612e_config_init(phydev); if (err) diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h -index bfb37218f435..d7ebafbb3221 100644 +index bfb37218f435c..d7ebafbb32218 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -185,6 +185,10 @@ @@ -323815,10 +323815,10 @@ index bfb37218f435..d7ebafbb3221 100644 2.18.4 -From ee602ea8d4e6788c14206c8e848ddad0d7ac3348 Mon Sep 17 00:00:00 2001 +From 5d24b76ed6b8346f5e04e4bc770d5202edd3f2c8 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 22 Mar 2019 09:47:14 +0000 -Subject: [PATCH 0225/1216] usb: xhci: Disable the XHCI 5 second timeout +Subject: [PATCH 0225/1224] usb: xhci: Disable the XHCI 5 second timeout If the VL805 EEPROM has not been programmed then boot will hang for five seconds. The timeout seems to be arbitrary and is an unecessary @@ -323832,7 +323832,7 @@ on the first boot. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index 7123ab44671b..1754f9e6248f 100644 +index 70aa3055c41e7..3b4e5b7798952 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -196,8 +196,9 @@ int xhci_reset(struct xhci_hcd *xhci) @@ -323850,10 +323850,10 @@ index 7123ab44671b..1754f9e6248f 100644 2.18.4 -From ecd235cd460ecab2a80f8c070637d5586810d452 Mon Sep 17 00:00:00 2001 +From 21df0da44969cec04b1bcdd59ff14947f8690dd9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 23 May 2019 15:08:30 +0100 -Subject: [PATCH 0226/1216] usb: xhci: Show that the VIA VL805 supports LPM +Subject: [PATCH 0226/1224] usb: xhci: Show that the VIA VL805 supports LPM Signed-off-by: Phil Elwell --- @@ -323861,7 +323861,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index d08b0079eecb..e7fecc34aaa1 100644 +index d08b0079eecb1..e7fecc34aaa13 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -254,6 +254,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) @@ -323879,10 +323879,10 @@ index d08b0079eecb..e7fecc34aaa1 100644 2.18.4 -From 2ad21a40beb6d2b7db4378ce7463d00330ef9f11 Mon Sep 17 00:00:00 2001 +From f7f5bd3a7fe9e068900ccdca35c05b069b46da72 Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Mon, 13 May 2019 11:05:27 +0000 -Subject: [PATCH 0227/1216] spi: bcm2835: enable shared interrupt support +Subject: [PATCH 0227/1224] spi: bcm2835: enable shared interrupt support Add shared interrupt support for this driver. @@ -323892,7 +323892,7 @@ Signed-off-by: Martin Sperl 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c -index b5efa2236b61..7ac3563f458b 100644 +index b5efa2236b614..7ac3563f458b1 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -379,6 +379,10 @@ static irqreturn_t bcm2835_spi_interrupt(int irq, void *dev_id) @@ -323920,10 +323920,10 @@ index b5efa2236b61..7ac3563f458b 100644 2.18.4 -From 6148f54f57455db2b3d1b35b146e5170c7842790 Mon Sep 17 00:00:00 2001 +From 78b28b1186f8b382464acccde2d1eaca0b957bbd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 23 Jan 2019 16:11:50 +0000 -Subject: [PATCH 0228/1216] clk-bcm2835: Don't wait for pllh lock +Subject: [PATCH 0228/1224] clk-bcm2835: Don't wait for pllh lock Signed-off-by: Phil Elwell --- @@ -323931,7 +323931,7 @@ Signed-off-by: Phil Elwell 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index d4bf9e376318..b83a963eceab 100644 +index d4bf9e376318c..b83a963eceab6 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -643,15 +643,17 @@ static int bcm2835_pll_on(struct clk_hw *hw) @@ -323964,10 +323964,10 @@ index d4bf9e376318..b83a963eceab 100644 2.18.4 -From 8d53c1876e25a026c18259871f03782e517232c5 Mon Sep 17 00:00:00 2001 +From 76b65133205978df0d2c5f905dfa7ae4bc765821 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 11 Jan 2019 17:31:07 -0800 -Subject: [PATCH 0229/1216] soc: bcm: bcm2835-pm: Add support for 2711. +Subject: [PATCH 0229/1224] 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 @@ -323985,7 +323985,7 @@ Signed-off-by: Eric Anholt 3 files changed, 34 insertions(+) diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c -index 42fe67f1538e..ab1e9cbc50b1 100644 +index 42fe67f1538e7..ab1e9cbc50b1b 100644 --- a/drivers/mfd/bcm2835-pm.c +++ b/drivers/mfd/bcm2835-pm.c @@ -50,6 +50,17 @@ static int bcm2835_pm_probe(struct platform_device *pdev) @@ -324007,7 +324007,7 @@ index 42fe67f1538e..ab1e9cbc50b1 100644 * bcm2835-pm binding as the key for whether we can reference * the full PM register range and support power domains. diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c -index 1e0041ec8132..c0618a9c26fa 100644 +index 1e0041ec81323..c0618a9c26fac 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -143,6 +143,8 @@ struct bcm2835_power { @@ -324061,7 +324061,7 @@ index 1e0041ec8132..c0618a9c26fa 100644 if (id != 0x62726467 /* "BRDG" */) { dev_err(dev, "ASB register ID returned 0x%08x\n", id); diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h -index ed37dc40e82a..b2d157091e12 100644 +index ed37dc40e82a8..b2d157091e12b 100644 --- a/include/linux/mfd/bcm2835-pm.h +++ b/include/linux/mfd/bcm2835-pm.h @@ -9,6 +9,7 @@ struct bcm2835_pm { @@ -324076,10 +324076,10 @@ index ed37dc40e82a..b2d157091e12 100644 2.18.4 -From 2180a99f7d83b48e6d450cc3ec8d7264ee9c1b1b Mon Sep 17 00:00:00 2001 +From f4ad6cfbac46d22ca9fe9cc20e85cd797a877049 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Sep 2018 11:50:25 +0100 -Subject: [PATCH 0230/1216] config: Permit LPAE and PCIE_BRCMSTB on BCM2835 +Subject: [PATCH 0230/1224] config: Permit LPAE and PCIE_BRCMSTB on BCM2835 --- arch/arm/mach-bcm/Kconfig | 4 ++++ @@ -324087,7 +324087,7 @@ Subject: [PATCH 0230/1216] config: Permit LPAE and PCIE_BRCMSTB on BCM2835 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig -index 5742092f8c09..e25dfc949446 100644 +index 5742092f8c09e..e25dfc9494462 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -161,6 +161,7 @@ config ARCH_BCM2835 @@ -324109,7 +324109,7 @@ index 5742092f8c09..e25dfc949446 100644 This enables support for the Broadcom BCM2835 and BCM2836 SoCs. This SoC is used in the Raspberry Pi and Roku 2 devices. diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig -index e57bbd0ec9a7..650b3b56153c 100644 +index e57bbd0ec9a71..650b3b56153cb 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -290,9 +290,9 @@ config PCI_HYPERV_INTERFACE @@ -324128,10 +324128,10 @@ index e57bbd0ec9a7..650b3b56153c 100644 2.18.4 -From 83856cd45c312d1ed6b1aebd1192fbca017d86db Mon Sep 17 00:00:00 2001 +From 2cf771b9883f85bc43596041747614698edb983c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:11:05 -0700 -Subject: [PATCH 0231/1216] clk: bcm2835: Add support for setting leaf clock +Subject: [PATCH 0231/1224] 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 @@ -324143,7 +324143,7 @@ Signed-off-by: Eric Anholt 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index b83a963eceab..47ead0f239d6 100644 +index b83a963eceab6..47ead0f239d68 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1114,15 +1114,19 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw, @@ -324187,10 +324187,10 @@ index b83a963eceab..47ead0f239d6 100644 2.18.4 -From f3ca8f9c147afb5ca2e214492c6be84c7080fd79 Mon Sep 17 00:00:00 2001 +From d91672c18c85221e6a26c88d79c94c8d270d3fe4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:24:04 -0700 -Subject: [PATCH 0232/1216] clk: bcm2835: Allow reparenting leaf clocks while +Subject: [PATCH 0232/1224] clk: bcm2835: Allow reparenting leaf clocks while they're running. This falls under the same "we can reprogram glitch-free as long as we @@ -324203,7 +324203,7 @@ Signed-off-by: Eric Anholt 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 47ead0f239d6..079748e68686 100644 +index 47ead0f239d68..079748e686863 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1103,8 +1103,10 @@ static int bcm2835_clock_on(struct clk_hw *hw) @@ -324264,10 +324264,10 @@ index 47ead0f239d6..079748e68686 100644 2.18.4 -From 56123d411449c8a0a8ad34548889dacafb53b5d6 Mon Sep 17 00:00:00 2001 +From 0de024a4df4de0c6ec02980fa793db24a39672c9 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 10:55:00 +0100 -Subject: [PATCH 0233/1216] usb: add plumbing for updating interrupt endpoint +Subject: [PATCH 0233/1224] usb: add plumbing for updating interrupt endpoint interval state xHCI caches device and endpoint data after the interface is configured, @@ -324292,7 +324292,7 @@ Signed-off-by: Jonathan Bell 4 files changed, 34 insertions(+) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index d0f45600b669..4d6cff941445 100644 +index d0f45600b6698..4d6cff941445c 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1941,6 +1941,16 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev, @@ -324313,7 +324313,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 61d9e2a1a4e5..9940558a0c03 100644 +index 61d9e2a1a4e5a..9940558a0c038 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) @@ -324339,7 +324339,7 @@ index 61d9e2a1a4e5..9940558a0c03 100644 * usb_disable_endpoint -- Disable an endpoint by address * @dev: the device whose endpoint is being disabled diff --git a/include/linux/usb.h b/include/linux/usb.h -index e656e7b4b1e4..3ac4b26b12ff 100644 +index e656e7b4b1e44..3ac4b26b12fff 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1816,6 +1816,8 @@ extern int usb_clear_halt(struct usb_device *dev, int pipe); @@ -324352,7 +324352,7 @@ index e656e7b4b1e4..3ac4b26b12ff 100644 /* this request isn't really synchronous, but it belongs with the others */ extern int usb_driver_set_configuration(struct usb_device *udev, int config); diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h -index 712b2a603645..879b59e4f013 100644 +index 712b2a603645f..879b59e4f013c 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -382,6 +382,11 @@ struct hc_driver { @@ -324380,10 +324380,10 @@ index 712b2a603645..879b59e4f013 100644 2.18.4 -From ef30b54c34892232d01d596d600c0ded6edba287 Mon Sep 17 00:00:00 2001 +From 4a80b5cec54b4593eaec9dcb47b5770247c3f0da Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:33:39 +0100 -Subject: [PATCH 0234/1216] xhci: implement xhci_fixup_endpoint for interval +Subject: [PATCH 0234/1224] xhci: implement xhci_fixup_endpoint for interval adjustments Must be called in a non-atomic context, after the endpoint @@ -324396,7 +324396,7 @@ Signed-off-by: Jonathan Bell 1 file changed, 98 insertions(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index 1754f9e6248f..e9f02fc28a26 100644 +index 3b4e5b7798952..3fbbb2a33eeb5 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1455,6 +1455,103 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, @@ -324515,10 +324515,10 @@ index 1754f9e6248f..e9f02fc28a26 100644 2.18.4 -From 3f7456d6f8cecff9980245cd57ef833af78b8eae Mon Sep 17 00:00:00 2001 +From b0d81f77786f0551f667bbc0834515ac6d0c3e50 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:42:03 +0100 -Subject: [PATCH 0235/1216] usbhid: call usb_fixup_endpoint after mangling +Subject: [PATCH 0235/1224] usbhid: call usb_fixup_endpoint after mangling intervals Lets the mousepoll override mechanism work with xhci. @@ -324529,7 +324529,7 @@ Signed-off-by: Jonathan Bell 1 file changed, 1 insertion(+) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c -index ce8ef6930795..4b73a15fdfae 100644 +index ce8ef69307951..4b73a15fdfae3 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1128,6 +1128,7 @@ static int usbhid_start(struct hid_device *hid) @@ -324544,10 +324544,10 @@ index ce8ef6930795..4b73a15fdfae 100644 2.18.4 -From 1476c742bfc2766e7d2dbc13c69b5f336c2fa3e7 Mon Sep 17 00:00:00 2001 +From 04a2c43efcdd45965fd41216d33d32fbc34b06c8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 11 Jun 2019 17:38:28 +0100 -Subject: [PATCH 0236/1216] arm: bcm2835: Add bcm2838 compatible string. +Subject: [PATCH 0236/1224] arm: bcm2835: Add bcm2838 compatible string. Signed-off-by: Phil Elwell --- @@ -324555,7 +324555,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 7d59a9364175..282a023027fc 100644 +index 7d59a93641757..282a023027fc0 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -109,6 +109,7 @@ static const char * const bcm2835_compat[] = { @@ -324570,10 +324570,10 @@ index 7d59a9364175..282a023027fc 100644 2.18.4 -From e721587451726082937e10fcdb24845c82bbb2c1 Mon Sep 17 00:00:00 2001 +From 4d2dd36d523843e9874001e0433a1e4fd5f7b054 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 4 Mar 2019 11:59:34 -0800 -Subject: [PATCH 0237/1216] drm/vc4: Fix oops at boot with firmwarekms on 4.19. +Subject: [PATCH 0237/1224] drm/vc4: Fix oops at boot with firmwarekms on 4.19. Signed-off-by: Eric Anholt --- @@ -324581,7 +324581,7 @@ Signed-off-by: Eric Anholt 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 57124fe94247..92aafec3d57a 100644 +index 57124fe942472..92aafec3d57af 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -116,6 +116,9 @@ vc4_ctm_commit(struct vc4_dev *vc4, struct drm_atomic_state *state) @@ -324598,10 +324598,10 @@ index 57124fe94247..92aafec3d57a 100644 2.18.4 -From 389bf9f1516d34f47d6353cc8adbe96fb3d66e64 Mon Sep 17 00:00:00 2001 +From 87ef1c06ad74309a547c2e14aea3730887444623 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 4 Oct 2018 17:22:43 -0700 -Subject: [PATCH 0238/1216] drm/v3d: Add support for 2711. +Subject: [PATCH 0238/1224] drm/v3d: Add support for 2711. Signed-off-by: Eric Anholt --- @@ -324609,7 +324609,7 @@ Signed-off-by: Eric Anholt 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index 3506ae2723ae..cb60018f799e 100644 +index 3506ae2723ae1..cb60018f799ea 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -221,6 +221,7 @@ static struct drm_driver v3d_drm_driver = { @@ -324624,10 +324624,10 @@ index 3506ae2723ae..cb60018f799e 100644 2.18.4 -From b3e26e6f68892e69d380b42dcc76037a630db280 Mon Sep 17 00:00:00 2001 +From 2baea522b86491ddd5466f6cfef42d834142988f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 12:35:43 -0800 -Subject: [PATCH 0239/1216] drm/v3d: Skip MMU flush if the device is currently +Subject: [PATCH 0239/1224] 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 @@ -324641,7 +324641,7 @@ Signed-off-by: Eric Anholt 1 file changed, 13 insertions(+) diff --git a/drivers/gpu/drm/v3d/v3d_mmu.c b/drivers/gpu/drm/v3d/v3d_mmu.c -index 395e81d97163..6cc67cab320e 100644 +index 395e81d971632..6cc67cab320ea 100644 --- a/drivers/gpu/drm/v3d/v3d_mmu.c +++ b/drivers/gpu/drm/v3d/v3d_mmu.c @@ -18,6 +18,8 @@ @@ -324682,10 +324682,10 @@ index 395e81d97163..6cc67cab320e 100644 2.18.4 -From ff8a802a41981c59f3e12cce0694a0ca8ec7a4cb Mon Sep 17 00:00:00 2001 +From 4b1b618989ba45a0541f7e173a9e5940dec8ee3e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 14:47:57 -0800 -Subject: [PATCH 0240/1216] drm/v3d: Hook up the runtime PM ops. +Subject: [PATCH 0240/1224] 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 @@ -324698,7 +324698,7 @@ Signed-off-by: Eric Anholt 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index cb60018f799e..d225152e7e36 100644 +index cb60018f799ea..d225152e7e36e 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -69,7 +69,7 @@ static int v3d_runtime_resume(struct device *dev) @@ -324722,10 +324722,10 @@ index cb60018f799e..d225152e7e36 100644 2.18.4 -From 8d85d0780f5e3dc481b97742aad7df6e03b8d88b Mon Sep 17 00:00:00 2001 +From c98d45550461016cbaa0a078bf5cd7aae98bec17 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 28 Mar 2019 11:58:51 -0700 -Subject: [PATCH 0241/1216] drm/vc4: Fix synchronization firmwarekms against GL +Subject: [PATCH 0241/1224] drm/vc4: Fix synchronization firmwarekms against GL rendering. We would present the framebuffer immediately without waiting for @@ -324739,7 +324739,7 @@ Signed-off-by: Eric Anholt 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 85e273665836..ee0e6afa211b 100644 +index 85e273665836d..ee0e6afa211b9 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -15,6 +15,7 @@ @@ -324772,10 +324772,10 @@ index 85e273665836..ee0e6afa211b 100644 2.18.4 -From b3d75da901b3d718434607d506a80c3304058d07 Mon Sep 17 00:00:00 2001 +From 39cfcfc1e9041bf8969f5ceea928f61dc29680b9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 18 Mar 2019 16:38:32 -0700 -Subject: [PATCH 0242/1216] drm/vc4: Expose the format modifiers for firmware +Subject: [PATCH 0242/1224] drm/vc4: Expose the format modifiers for firmware kms. This should technically not expose VC4_T_TILED on pi4. However, if we @@ -324790,7 +324790,7 @@ Signed-off-by: Eric Anholt 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index ee0e6afa211b..93bf71f98313 100644 +index ee0e6afa211b9..93bf71f983139 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -281,6 +281,27 @@ static void vc4_plane_destroy(struct drm_plane *plane) @@ -324858,10 +324858,10 @@ index ee0e6afa211b..93bf71f98313 100644 2.18.4 -From c166c9980e7de5c0d41bb5e74f090ad49cf61278 Mon Sep 17 00:00:00 2001 +From d587c84236a2fec92319d64cc1bb3c09320aa7b6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Apr 2019 13:29:00 -0700 -Subject: [PATCH 0243/1216] drm/vc4: Fix vblank timestamping for firmwarekms. +Subject: [PATCH 0243/1224] 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 @@ -324877,7 +324877,7 @@ Signed-off-by: Eric Anholt 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 7b22d4f2ae57..f1f0a7c87771 100644 +index 7b22d4f2ae573..f1f0a7c877713 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -97,9 +97,6 @@ bool vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id, @@ -324891,7 +324891,7 @@ index 7b22d4f2ae57..f1f0a7c87771 100644 /* Get optional system timestamp before query. */ diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 93bf71f98313..eb5eb67b70f5 100644 +index 93bf71f983139..eb5eb67b70f5d 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -20,6 +20,7 @@ @@ -324919,10 +324919,10 @@ index 93bf71f98313..eb5eb67b70f5 100644 2.18.4 -From 2c335bdb7bcaacc73396cb898100fbff4aaf0b36 Mon Sep 17 00:00:00 2001 +From 443238af3a7850486c9e32e0cae1eac5983abdfb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 26 Mar 2019 14:43:06 +0000 -Subject: [PATCH 0244/1216] gpu: vc4-fkms: Switch to the newer mailbox frame +Subject: [PATCH 0244/1224] gpu: vc4-fkms: Switch to the newer mailbox frame buffer API. The old mailbox FB API was ideally deprecated but still used by @@ -324938,7 +324938,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index eb5eb67b70f5..512036c82db0 100644 +index eb5eb67b70f5d..512036c82db0a 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -30,6 +30,25 @@ @@ -325104,10 +325104,10 @@ index eb5eb67b70f5..512036c82db0 100644 2.18.4 -From 038f2b448e4f1c24b227810e653744d6d580793f Mon Sep 17 00:00:00 2001 +From 187aa19300df18144a895578bb9174e8022199c7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 27 Mar 2019 17:45:01 +0000 -Subject: [PATCH 0245/1216] drm: vc4: Add an overlay plane to vc4-firmware-kms +Subject: [PATCH 0245/1224] 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. @@ -325126,7 +325126,7 @@ Signed-off-by: Dave Stevenson create mode 100644 drivers/gpu/drm/vc4/vc_image_types.h diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 512036c82db0..54bb885a86dc 100644 +index 512036c82db0a..54bb885a86dc2 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -28,8 +28,46 @@ @@ -325793,7 +325793,7 @@ index 512036c82db0..54bb885a86dc 100644 dev_err(dev, "failed to construct cursor plane\n"); ret = PTR_ERR(cursor_plane); diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 92aafec3d57a..cd3720969442 100644 +index 92aafec3d57af..cd37209694428 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -542,6 +542,7 @@ int vc4_kms_load(struct drm_device *dev) @@ -325806,7 +325806,7 @@ index 92aafec3d57a..cd3720969442 100644 diff --git a/drivers/gpu/drm/vc4/vc_image_types.h b/drivers/gpu/drm/vc4/vc_image_types.h new file mode 100644 -index 000000000000..669a70fdb891 +index 0000000000000..669a70fdb8913 --- /dev/null +++ b/drivers/gpu/drm/vc4/vc_image_types.h @@ -0,0 +1,143 @@ @@ -325954,7 +325954,7 @@ index 000000000000..669a70fdb891 + VC_IMAGE_FORCE_ENUM_16BIT = 0xffff, +}; diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index 9c6027fc25da..f0c15eefa3aa 100644 +index 9c6027fc25dae..f0c15eefa3aa2 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -147,6 +147,8 @@ enum rpi_firmware_property_tag { @@ -325970,10 +325970,10 @@ index 9c6027fc25da..f0c15eefa3aa 100644 2.18.4 -From 6e1fe5fa87bd9e50ed8a7f53abaa89b8677dda76 Mon Sep 17 00:00:00 2001 +From eff1059ebcda3fb958714550a28d2ca1a56f6e23 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Apr 2019 15:20:05 +0100 -Subject: [PATCH 0246/1216] drm: vc4: Increase max screen size to 4096x4096. +Subject: [PATCH 0246/1224] drm: vc4: Increase max screen size to 4096x4096. We now should support 4k screens, therefore this limit needs to be increased. @@ -325984,7 +325984,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index cd3720969442..9e20e1ac77f8 100644 +index cd37209694428..9e20e1ac77f8a 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -536,8 +536,8 @@ int vc4_kms_load(struct drm_device *dev) @@ -326002,10 +326002,10 @@ index cd3720969442..9e20e1ac77f8 100644 2.18.4 -From a4f142916a8318905cab51bc0f718a7a0f74a9e6 Mon Sep 17 00:00:00 2001 +From 09596e25d996070e9f5d9632d6971dbf31113e24 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Apr 2019 17:15:45 +0100 -Subject: [PATCH 0247/1216] drm: vc4: Add support for multiple displays to fkms +Subject: [PATCH 0247/1224] 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 @@ -326017,7 +326017,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 113 insertions(+), 49 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 54bb885a86dc..d8e278a0b789 100644 +index 54bb885a86dc2..d8e278a0b7892 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -31,6 +31,8 @@ @@ -326290,10 +326290,10 @@ index 54bb885a86dc..d8e278a0b789 100644 2.18.4 -From 46903df8a3c392ad8c98ba3a3e69968c567aaa32 Mon Sep 17 00:00:00 2001 +From eafef3a4fdfe923d676fd3ac42feea2f5a51cf3a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:21:56 +0100 -Subject: [PATCH 0248/1216] drm: vc4: Fix build warning +Subject: [PATCH 0248/1224] drm: vc4: Fix build warning Signed-off-by: Dave Stevenson --- @@ -326301,7 +326301,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index d8e278a0b789..b952f27e4168 100644 +index d8e278a0b7892..b952f27e41682 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -933,8 +933,6 @@ static int vc4_fkms_create_screen(struct device *dev, struct drm_device *drm, @@ -326317,10 +326317,10 @@ index d8e278a0b789..b952f27e4168 100644 2.18.4 -From 290680b0b8d317b4791dfe7407e1b198bf65caf6 Mon Sep 17 00:00:00 2001 +From 0d6479f617d1ff5533a8909daefc7bdd84557691 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:23:15 +0100 -Subject: [PATCH 0249/1216] drm: vc4: Select display to blank during +Subject: [PATCH 0249/1224] drm: vc4: Select display to blank during initialisation Otherwise the rainbow splash screen remained in the display list @@ -326331,7 +326331,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index b952f27e4168..099124575435 100644 +index b952f27e41682..099124575435b 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -89,6 +89,13 @@ struct fb_alloc_tags { @@ -326377,10 +326377,10 @@ index b952f27e4168..099124575435 100644 2.18.4 -From e02d85caceeae073b19f07c9ea5b3bb630ed9f2f Mon Sep 17 00:00:00 2001 +From 7e18d574973a736730586ba3fdad53dbdee2f115 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:24:20 +0100 -Subject: [PATCH 0250/1216] drm: vc4: Remove now unused structure. +Subject: [PATCH 0250/1224] drm: vc4: Remove now unused structure. Cleaning up structure that was unused after fbb59a2 drm: vc4: Add an overlay plane to vc4-firmware-kms @@ -326391,7 +326391,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 19 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 099124575435..1155680fdfc6 100644 +index 099124575435b..1155680fdfc69 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -70,25 +70,6 @@ struct mailbox_set_plane { @@ -326424,10 +326424,10 @@ index 099124575435..1155680fdfc6 100644 2.18.4 -From 96f13d695b2a3125701f2be32577f15c4db56cc6 Mon Sep 17 00:00:00 2001 +From 7d8401b8630e4a6803734f7d534e84cd9c76e04f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 12:37:28 +0100 -Subject: [PATCH 0251/1216] drm: vc4: Query the display ID for each display in +Subject: [PATCH 0251/1224] drm: vc4: Query the display ID for each display in FKMS Replace the hard coded list of display IDs for a mailbox call @@ -326441,7 +326441,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 1155680fdfc6..38b09f5ad2b2 100644 +index 1155680fdfc69..38b09f5ad2b27 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -944,7 +944,7 @@ static int vc4_fkms_bind(struct device *dev, struct device *master, void *data) @@ -326475,7 +326475,7 @@ index 1155680fdfc6..38b09f5ad2b2 100644 if (ret) DRM_ERROR("Oh dear, failed to create display %u\n", diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index f0c15eefa3aa..10f5dc53fd34 100644 +index f0c15eefa3aa2..10f5dc53fd34d 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -114,6 +114,7 @@ enum rpi_firmware_property_tag { @@ -326490,10 +326490,10 @@ index f0c15eefa3aa..10f5dc53fd34 100644 2.18.4 -From a0e00606079c0cef0ac4c8e85cab4abc77a0669d Mon Sep 17 00:00:00 2001 +From e2fc80ee75a2d51076faaf0fd4351b5102abfc6e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 14:00:07 +0100 -Subject: [PATCH 0252/1216] drm/vc4: Set the display number when querying the +Subject: [PATCH 0252/1224] drm/vc4: Set the display number when querying the display resolution Without this the two displays got set to the same resolution. @@ -326505,7 +326505,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 38b09f5ad2b2..b15c001621d8 100644 +index 38b09f5ad2b27..b15c001621d84 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -77,6 +77,13 @@ struct mailbox_blank_display { @@ -326599,10 +326599,10 @@ index 38b09f5ad2b2..b15c001621d8 100644 2.18.4 -From 28d3c9c507cbc78d185f426d1cbd9e16fb175467 Mon Sep 17 00:00:00 2001 +From b48a29af8fcd09ed1c9eb13a3ecfe7a9661596e4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 18:14:44 +0100 -Subject: [PATCH 0253/1216] drm: vc4: Need to call drm_crtc_vblank_[on|off] +Subject: [PATCH 0253/1224] 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 @@ -326617,7 +326617,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index b15c001621d8..b86c9d98df4d 100644 +index b15c001621d84..b86c9d98df4d5 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -21,6 +21,7 @@ @@ -326659,10 +326659,10 @@ index b15c001621d8..b86c9d98df4d 100644 2.18.4 -From 1abe50fc95821804671f9c7a5cde6df4f38e6f50 Mon Sep 17 00:00:00 2001 +From 1dfb14274cc74840c1a6c5634b80d85327bc90ed Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 17:19:51 +0100 -Subject: [PATCH 0254/1216] drm: vc4: Add support for H & V flips on each plane +Subject: [PATCH 0254/1224] drm: vc4: Add support for H & V flips on each plane for FKMS They are near zero cost options for the HVS, therefore they @@ -326675,7 +326675,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 36 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index b86c9d98df4d..bb98a8a71555 100644 +index b86c9d98df4d5..bb98a8a71555b 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -64,8 +64,21 @@ struct set_plane { @@ -326751,10 +326751,10 @@ index b86c9d98df4d..bb98a8a71555 100644 2.18.4 -From c7ed17c8e4fea1060525484fac9dff5c500530b4 Mon Sep 17 00:00:00 2001 +From 8b7423563839fa39446d53ff518b3a6f72c4a0d5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:35:05 +0100 -Subject: [PATCH 0255/1216] drm: vc4: Remove unused vc4_fkms_cancel_page_flip +Subject: [PATCH 0255/1224] drm: vc4: Remove unused vc4_fkms_cancel_page_flip function "32a3dbe drm/vc4: Nuke preclose hook" removed vc4_cancel_page_flip, @@ -326769,7 +326769,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 21 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index fbcdb44ccf01..b582ed26924f 100644 +index fbcdb44ccf010..b582ed26924f3 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -795,7 +795,6 @@ extern const struct dma_fence_ops vc4_fence_ops; @@ -326781,7 +326781,7 @@ index fbcdb44ccf01..b582ed26924f 100644 /* vc4_gem.c */ void vc4_gem_init(struct drm_device *dev); diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index bb98a8a71555..fe966ebb045a 100644 +index bb98a8a71555b..fe966ebb045af 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -741,26 +741,6 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { @@ -326815,10 +326815,10 @@ index bb98a8a71555..fe966ebb045a 100644 2.18.4 -From ecff5e8cefcb64429d831624cb039d7c9a8c0d91 Mon Sep 17 00:00:00 2001 +From 3b65e6d1c3e21fa81044fc648dd9d07b4224dbd9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:42:37 +0100 -Subject: [PATCH 0256/1216] drm: vc4: Iterate over all planes in +Subject: [PATCH 0256/1224] drm: vc4: Iterate over all planes in vc4_crtc_[dis|en]able Fixes a FIXME where the overlay plane wouldn't be restored. @@ -326829,7 +326829,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index fe966ebb045a..81afd7782f65 100644 +index fe966ebb045af..81afd7782f65e 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -600,6 +600,8 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -326878,10 +326878,10 @@ index fe966ebb045a..81afd7782f65 100644 2.18.4 -From 8a6814e59ee84e4f6f97f8cd0355ed67d4db46c9 Mon Sep 17 00:00:00 2001 +From c8711256a3012c5eb2093e62076173e7862d38f5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:43:57 +0100 -Subject: [PATCH 0257/1216] drm: vc4: Bring fkms into line with kms in blocking +Subject: [PATCH 0257/1224] drm: vc4: Bring fkms into line with kms in blocking doublescan modes Implement vc4_crtc_mode_valid so that it blocks doublescan modes @@ -326892,7 +326892,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 81afd7782f65..97ab24d0cbde 100644 +index 81afd7782f65e..97ab24d0cbde4 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -627,7 +627,17 @@ static void vc4_crtc_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_st @@ -326931,10 +326931,10 @@ index 81afd7782f65..97ab24d0cbde 100644 2.18.4 -From 05a558a52d5b81ad625c5109b4d5ee9d760cb3c5 Mon Sep 17 00:00:00 2001 +From 724cdfa0a610c2c23f5db606a3b1b845b5d47a35 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Apr 2019 18:45:00 +0100 -Subject: [PATCH 0258/1216] drm: vc4: Increase max_width/height to 7680. +Subject: [PATCH 0258/1224] 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 @@ -326946,7 +326946,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 9e20e1ac77f8..8b4bec771a14 100644 +index 9e20e1ac77f8a..8b4bec771a146 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -536,8 +536,8 @@ int vc4_kms_load(struct drm_device *dev) @@ -326964,10 +326964,10 @@ index 9e20e1ac77f8..8b4bec771a14 100644 2.18.4 -From 1b279d48fd871993322b31f5284d7298ce459ab3 Mon Sep 17 00:00:00 2001 +From 1cdb76521125ad3cd9bf36b13c34f01f43799b6f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 18:23:41 +0100 -Subject: [PATCH 0259/1216] drm: vc4: FKMS reads the EDID from fw, and supports +Subject: [PATCH 0259/1224] drm: vc4: FKMS reads the EDID from fw, and supports mode setting This extends FKMS to read the EDID from the display, and support @@ -326980,7 +326980,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 302 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 97ab24d0cbde..e4b978ce85ef 100644 +index 97ab24d0cbde4..e4b978ce85efd 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -91,11 +91,60 @@ struct mailbox_blank_display { @@ -327506,7 +327506,7 @@ index 97ab24d0cbde..e4b978ce85ef 100644 ret = PTR_ERR(vc4_crtc->connector); goto err_destroy_encoder; diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index 10f5dc53fd34..1a5dd091dfd9 100644 +index 10f5dc53fd34d..1a5dd091dfd96 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -75,6 +75,7 @@ enum rpi_firmware_property_tag { @@ -327529,10 +327529,10 @@ index 10f5dc53fd34..1a5dd091dfd9 100644 2.18.4 -From f987456f2b153d9da889e432c890dceb4f6dacc1 Mon Sep 17 00:00:00 2001 +From 7539650ec301f39122d4a852f76e2e388d437785 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 May 2019 13:58:03 +0100 -Subject: [PATCH 0260/1216] drm: vc4-firmware-kms: Remove incorrect overscan +Subject: [PATCH 0260/1224] drm: vc4-firmware-kms: Remove incorrect overscan support. The overscan support was required for the old mailbox API @@ -327547,7 +327547,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 15 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index e4b978ce85ef..71889e0e334a 100644 +index e4b978ce85efd..71889e0e334aa 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -235,7 +235,6 @@ struct vc4_crtc { @@ -327590,10 +327590,10 @@ index e4b978ce85ef..71889e0e334a 100644 2.18.4 -From cc8f681d8281e848c7bdb25d80288129d46fbdd3 Mon Sep 17 00:00:00 2001 +From 5b9c371fcb24d5e5e19b2e9ee28ada75aa898391 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 May 2019 12:13:34 +0100 -Subject: [PATCH 0261/1216] drm: vc4: Log flags in fkms mode set +Subject: [PATCH 0261/1224] 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. @@ -327604,7 +327604,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 71889e0e334a..b18cb9d5e345 100644 +index 71889e0e334aa..b18cb9d5e3456 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -687,12 +687,13 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -327627,10 +327627,10 @@ index 71889e0e334a..b18cb9d5e345 100644 2.18.4 -From 931a68858bdccc9e99b77417f3c9bcf722b6c8cb Mon Sep 17 00:00:00 2001 +From 19c8bf367635dcc2e20b86fc8d8286adc03ef2d4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 16 May 2019 17:49:42 +0100 -Subject: [PATCH 0262/1216] drm: vc4-firmware-kms: Fix DSI display support +Subject: [PATCH 0262/1224] drm: vc4-firmware-kms: Fix DSI display support The mode was incorrectly listed as interlaced, which was then rejected. @@ -327642,7 +327642,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index b18cb9d5e345..9fbdcd3538b3 100644 +index b18cb9d5e3456..9fbdcd3538b31 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -1005,7 +1005,7 @@ static const struct drm_display_mode lcd_mode = { @@ -327658,10 +327658,10 @@ index b18cb9d5e345..9fbdcd3538b3 100644 2.18.4 -From e0ee12192beff99c1dbfb17ef002b04d9e6195be Mon Sep 17 00:00:00 2001 +From 5ce19adbf96c6f892658e217b4c65407db74057c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 May 2019 11:50:00 +0100 -Subject: [PATCH 0263/1216] drm: vc4: Probe DPI/DSI timings from the firmware +Subject: [PATCH 0263/1224] 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. @@ -327677,7 +327677,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 9fbdcd3538b3..0b0a155bc3b5 100644 +index 9fbdcd3538b31..0b0a155bc3b56 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -248,7 +248,6 @@ static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc) @@ -327789,7 +327789,7 @@ index 9fbdcd3538b3..0b0a155bc3b5 100644 DRM_ERROR("Failed to create a new display mode\n"); return -ENOMEM; diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index 1a5dd091dfd9..ca1344c957ea 100644 +index 1a5dd091dfd96..ca1344c957eae 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -150,6 +150,7 @@ enum rpi_firmware_property_tag { @@ -327804,10 +327804,10 @@ index 1a5dd091dfd9..ca1344c957ea 100644 2.18.4 -From e5e6a118d63eb9689f0a03a0b101249e4a0a6188 Mon Sep 17 00:00:00 2001 +From 61345da112c2324cbe091993a3b85ebe00c849b4 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 28 May 2019 13:56:06 +0100 -Subject: [PATCH 0264/1216] drm: vc4: handle the case where there are no +Subject: [PATCH 0264/1224] drm: vc4: handle the case where there are no available displays It's reasonable for the firmware to return zero as the number of @@ -327820,7 +327820,7 @@ Signed-off-by: Jonathan Bell 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 0b0a155bc3b5..04b929a6cb0f 100644 +index 0b0a155bc3b56..04b929a6cb0fc 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -1303,13 +1303,13 @@ static int vc4_fkms_bind(struct device *dev, struct device *master, void *data) @@ -327877,10 +327877,10 @@ index 0b0a155bc3b5..04b929a6cb0f 100644 2.18.4 -From 5312d2c8fe1f64e47857a5602fb917e266015331 Mon Sep 17 00:00:00 2001 +From c5ecf1c071131d1f25fcafa8cfee0f531bb1e6ee Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 May 2019 17:59:01 +0100 -Subject: [PATCH 0265/1216] drm/vc4: Support the VEC in FKMS +Subject: [PATCH 0265/1224] drm/vc4: Support the VEC in FKMS Extends the DPI/DSI support to also report the VEC output which supports interlacing too. @@ -327891,7 +327891,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 04b929a6cb0f..f1306752da3d 100644 +index 04b929a6cb0fc..f1306752da3dc 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -128,6 +128,7 @@ struct set_timings { @@ -327945,10 +327945,10 @@ index 04b929a6cb0f..f1306752da3d 100644 2.18.4 -From fa32e9b818dce45065544acee728e8d0f802b85f Mon Sep 17 00:00:00 2001 +From 6d8f0edd75ae0da0a745a511ac2a54193d37e1ad Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 May 2019 15:00:02 +0100 -Subject: [PATCH 0266/1216] drm: vc4: Fixup typo when setting HDMI aspect ratio +Subject: [PATCH 0266/1224] drm: vc4: Fixup typo when setting HDMI aspect ratio Assignment was to the wrong structure. @@ -327958,7 +327958,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index f1306752da3d..1081878ecfdd 100644 +index f1306752da3dc..1081878ecfdd7 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -718,19 +718,19 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -327990,10 +327990,10 @@ index f1306752da3d..1081878ecfdd 100644 2.18.4 -From aae983d453012f48a2d0444a4f79159e2952bf41 Mon Sep 17 00:00:00 2001 +From 7a268f317477af50e2c62036a57d9cd2232c0509 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 May 2019 15:44:11 +0100 -Subject: [PATCH 0267/1216] drm/vc4: Correct SAND support for FKMS. +Subject: [PATCH 0267/1224] 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 @@ -328005,7 +328005,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 1081878ecfdd..3b9dc3e892bb 100644 +index 1081878ecfdd7..3b9dc3e892bb7 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -546,7 +546,6 @@ static bool vc4_fkms_format_mod_supported(struct drm_plane *plane, @@ -328036,10 +328036,10 @@ index 1081878ecfdd..3b9dc3e892bb 100644 2.18.4 -From 2bec4715896bf668f27c1747b03a50670fe741b4 Mon Sep 17 00:00:00 2001 +From a2ce983164b73c7d9a3cd1c4e42f08536dcc6f3b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 May 2019 13:56:15 +0100 -Subject: [PATCH 0268/1216] drm/vc4: fkms to query the VPU for HDMI clock +Subject: [PATCH 0268/1224] drm/vc4: fkms to query the VPU for HDMI clock limits The VPU has configured clocks for 4k (or not) via config.txt, @@ -328055,7 +328055,7 @@ Signed-off-by: Dave Stevenson 3 files changed, 50 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index b582ed26924f..308f0473592a 100644 +index b582ed26924f3..308f0473592a6 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -81,6 +81,7 @@ struct vc4_dev { @@ -328067,7 +328067,7 @@ index b582ed26924f..308f0473592a 100644 struct vc4_hang_state *hang_state; diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 3b9dc3e892bb..cb2f24dece9f 100644 +index 3b9dc3e892bb7..cb2f24dece9f5 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -32,6 +32,14 @@ @@ -328166,7 +328166,7 @@ index 3b9dc3e892bb..cb2f24dece9f 100644 return 0; diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index ca1344c957ea..102c2e5dd2f2 100644 +index ca1344c957eae..102c2e5dd2f2c 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -152,6 +152,7 @@ enum rpi_firmware_property_tag { @@ -328181,10 +328181,10 @@ index ca1344c957ea..102c2e5dd2f2 100644 2.18.4 -From da2ae79672e0882d350cc66ce8b2fc8aa4ea37dd Mon Sep 17 00:00:00 2001 +From 6c8dca934b43150617f346f4ef1d75ddd6d95f58 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 May 2019 15:55:15 +0100 -Subject: [PATCH 0269/1216] drm/vc4: Max resolution of 7680 is conditional on +Subject: [PATCH 0269/1224] drm/vc4: Max resolution of 7680 is conditional on being Pi4 The max resolution had been increased from 2048 to 7680 for all @@ -328201,7 +328201,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 8b4bec771a14..7e31e2ca726c 100644 +index 8b4bec771a146..7e31e2ca726c1 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -18,6 +18,7 @@ @@ -328233,10 +328233,10 @@ index 8b4bec771a14..7e31e2ca726c 100644 2.18.4 -From d843bc825e344549e93564d570ae7d1165c5409c Mon Sep 17 00:00:00 2001 +From d4bf11f2256518dce9bcb56c5c2fd230407b0371 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 7 Jun 2019 11:31:21 +0100 -Subject: [PATCH 0270/1216] drm/vc4: Fix T-format modifiers in FKMS. +Subject: [PATCH 0270/1224] drm/vc4: Fix T-format modifiers in FKMS. The wrong vc_image formats were being checked for in the switch statement. Correct these. @@ -328247,7 +328247,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index cb2f24dece9f..339c8768f446 100644 +index cb2f24dece9f5..339c8768f4464 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -460,10 +460,10 @@ static void vc4_plane_atomic_update(struct drm_plane *plane, @@ -328267,10 +328267,10 @@ index cb2f24dece9f..339c8768f446 100644 2.18.4 -From a9ea6f1f287dd24fd5a7b37331b80f68528bf127 Mon Sep 17 00:00:00 2001 +From 548be42b0cf0041bd657d14541378ecd2905f480 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 10 Jun 2019 16:32:51 +0100 -Subject: [PATCH 0271/1216] drm/vc4: Remove 340MHz clock limit from FKMS now +Subject: [PATCH 0271/1224] drm/vc4: Remove 340MHz clock limit from FKMS now scrambling issues resolved Firmware TMDS scrambling is now being correctly configured, so @@ -328282,7 +328282,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 339c8768f446..fdbd1d1cf796 100644 +index 339c8768f4464..fdbd1d1cf7965 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -831,12 +831,6 @@ vc4_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode) @@ -328302,10 +328302,10 @@ index 339c8768f446..fdbd1d1cf796 100644 2.18.4 -From 57a7d80f58175d0ea4ebec47b49cbad16a128e9a Mon Sep 17 00:00:00 2001 +From d6b43077f25959ae678c939ce9199f7f2c49c49f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 4 Jun 2019 12:14:30 +0100 -Subject: [PATCH 0272/1216] drm: vc4: Add status of which display is updated +Subject: [PATCH 0272/1224] drm: vc4: Add status of which display is updated through vblank Previously multiple displays were slaved off the same SMI @@ -328324,7 +328324,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index fdbd1d1cf796..8ca9cb202f5e 100644 +index fdbd1d1cf7965..8ca9cb202f5e8 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -233,8 +233,13 @@ static const struct vc_image_format *vc4_get_vc_image_fmt(u32 drm_format) @@ -328393,10 +328393,10 @@ index fdbd1d1cf796..8ca9cb202f5e 100644 2.18.4 -From ca9f60ecdc20d27c31ef70240e676e799ab7d7d1 Mon Sep 17 00:00:00 2001 +From adf4e31a49d0785cf849aaf0cf75650a3ae3df4e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 12 Jun 2019 17:13:21 +0100 -Subject: [PATCH 0273/1216] drm/vc4: In FKMS look at the modifiers correctly +Subject: [PATCH 0273/1224] drm/vc4: In FKMS look at the modifiers correctly for SAND Incorrect masking was used in the switch for the modifier, @@ -328409,7 +328409,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 8ca9cb202f5e..4fd2629e430a 100644 +index 8ca9cb202f5e8..4fd2629e430a3 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -462,7 +462,7 @@ static void vc4_plane_atomic_update(struct drm_plane *plane, @@ -328435,10 +328435,10 @@ index 8ca9cb202f5e..4fd2629e430a 100644 2.18.4 -From 31c0b4137e0060a59741d9a0569799dc26f6e323 Mon Sep 17 00:00:00 2001 +From 8b8519e735a79ca6f01b02647cb2e1d2376203e9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Jun 2019 21:37:45 +0100 -Subject: [PATCH 0274/1216] drm/vc4: Limit fkms to modes <= 85Hz +Subject: [PATCH 0274/1224] drm/vc4: Limit fkms to modes <= 85Hz Selecting 1080p100 and 120 has very limited gain, but don't want to block VGA85 and similar. @@ -328449,7 +328449,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 4fd2629e430a..b97798c82371 100644 +index 4fd2629e430a3..b97798c823710 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -823,6 +823,10 @@ vc4_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode) @@ -328467,10 +328467,10 @@ index 4fd2629e430a..b97798c82371 100644 2.18.4 -From 0b537ad22d0050bb09d9fc550031f2a28d5fd3cf Mon Sep 17 00:00:00 2001 +From 12ca71647c87bf516783cec9fa551735d3bf54e7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 19 Jul 2019 14:29:28 +0100 -Subject: [PATCH 0275/1216] drm/vc4: Ignore HVS unless initialised +Subject: [PATCH 0275/1224] 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 @@ -328488,7 +328488,7 @@ Signed-off-by: Phil Elwell 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index f1f0a7c87771..d00756635257 100644 +index f1f0a7c877713..d00756635257e 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -801,7 +801,8 @@ static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc) @@ -328502,7 +328502,7 @@ index f1f0a7c87771..d00756635257 100644 spin_unlock_irqrestore(&dev->event_lock, flags); } diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 7e31e2ca726c..1b921e114c03 100644 +index 7e31e2ca726c1..1b921e114c034 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -156,7 +156,7 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) @@ -328518,10 +328518,10 @@ index 7e31e2ca726c..1b921e114c03 100644 2.18.4 -From c7d08c0568b4db36df80eb2c3a21c3740df4be79 Mon Sep 17 00:00:00 2001 +From 6a6163ed9e6b5b3c691b55db6075f1ce112e3853 Mon Sep 17 00:00:00 2001 From: Chris Miller Date: Wed, 26 Jun 2019 10:40:30 +0100 -Subject: [PATCH 0276/1216] drm: vc4_dsi: Fix DMA channel and memory leak in +Subject: [PATCH 0276/1224] drm: vc4_dsi: Fix DMA channel and memory leak in vc4 (#3012) Signed-off-by: Chris G Miller @@ -328530,7 +328530,7 @@ Signed-off-by: Chris G Miller 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c -index c78fa8144776..3448b314d361 100644 +index c78fa8144776e..3448b314d3617 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -1485,9 +1485,11 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) @@ -328659,10 +328659,10 @@ index c78fa8144776..3448b314d361 100644 2.18.4 -From c9fe70e8f4b025d7922b5343388d274622dea417 Mon Sep 17 00:00:00 2001 +From f5b110dcdc937b8fc4832e221767922c8409fec8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Jun 2019 02:29:40 +0100 -Subject: [PATCH 0277/1216] drm/vc4: Add support for color encoding on YUV +Subject: [PATCH 0277/1224] drm/vc4: Add support for color encoding on YUV planes Adds signalling for BT601/709/2020, and limited/full range @@ -328675,7 +328675,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index b97798c82371..862e89b8c478 100644 +index b97798c823710..862e89b8c4789 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -69,7 +69,7 @@ struct set_plane { @@ -328732,7 +328732,7 @@ index b97798c82371..862e89b8c478 100644 /* * Default frame buffer setup is with FB on -127, and raspistill etc diff --git a/drivers/gpu/drm/vc4/vc_image_types.h b/drivers/gpu/drm/vc4/vc_image_types.h -index 669a70fdb891..0bdffe5dd1e9 100644 +index 669a70fdb8913..0bdffe5dd1e9a 100644 --- a/drivers/gpu/drm/vc4/vc_image_types.h +++ b/drivers/gpu/drm/vc4/vc_image_types.h @@ -4,6 +4,8 @@ @@ -328778,10 +328778,10 @@ index 669a70fdb891..0bdffe5dd1e9 100644 2.18.4 -From d5b0ae75a723bf8dcb0316823c8d49a8dcde3d9d Mon Sep 17 00:00:00 2001 +From 29aea2add4037be63027a82f44f36353782f8938 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jul 2019 13:13:39 +0100 -Subject: [PATCH 0278/1216] tty: amba-pl011: Make TX optimisation conditional +Subject: [PATCH 0278/1224] 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 @@ -328813,7 +328813,7 @@ Signed-off-by: Phil Elwell 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index ba2029bf1e63..83676bc79a19 100644 +index ba2029bf1e639..83676bc79a195 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -270,6 +270,7 @@ struct uart_amba_port { @@ -328869,10 +328869,10 @@ index ba2029bf1e63..83676bc79a19 100644 2.18.4 -From 830d3dc2ce8199d8fab2ce00898af99df780fc66 Mon Sep 17 00:00:00 2001 +From 34b22b281862917031d1e50f9eeee6b01bc82b21 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 11 Jul 2019 17:55:43 +0100 -Subject: [PATCH 0279/1216] xhci: add quirk for host controllers that don't +Subject: [PATCH 0279/1224] 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 @@ -328893,7 +328893,7 @@ Signed-off-by: Jonathan Bell 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index e7fecc34aaa1..73600f6b2c1b 100644 +index e7fecc34aaa13..73600f6b2c1b8 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -255,8 +255,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) @@ -328909,7 +328909,7 @@ index e7fecc34aaa1..73600f6b2c1b 100644 if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index 49894541ea9a..d99e636f3844 100644 +index 52e156c018042..32939242ec170 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -527,7 +527,10 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, @@ -328954,7 +328954,7 @@ index 49894541ea9a..d99e636f3844 100644 /* diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index b483317bcb17..4ded7bc60d99 100644 +index b483317bcb17b..4ded7bc60d99f 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1873,6 +1873,7 @@ struct xhci_hcd { @@ -328969,10 +328969,10 @@ index b483317bcb17..4ded7bc60d99 100644 2.18.4 -From 423c4ce051a7f7431d1f069aa21cbd0c88369c87 Mon Sep 17 00:00:00 2001 +From 49252a71364bc68f1471153292ebfa00cffdabc9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 15:38:35 +0100 -Subject: [PATCH 0280/1216] i2c: bcm2835: Set clock-stretch timeout to 35ms +Subject: [PATCH 0280/1224] 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 @@ -328989,7 +328989,7 @@ Signed-off-by: Phil Elwell 1 file changed, 12 insertions(+) diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c -index beb67afa6a3c..9f4f4964a507 100644 +index beb67afa6a3c6..9f4f4964a5076 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -188,6 +188,7 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate, @@ -329022,10 +329022,10 @@ index beb67afa6a3c..9f4f4964a507 100644 2.18.4 -From 3be770b01fe532c28fdf7165d63f04da49dea30a Mon Sep 17 00:00:00 2001 +From b467fafdfd2686516e7d5ad69fc08fa32686cbcf Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 16 Jul 2019 13:28:22 +0100 -Subject: [PATCH 0281/1216] arm64/mm: Limit the DMA zone for arm64 +Subject: [PATCH 0281/1224] arm64/mm: Limit the DMA zone for arm64 On RaspberryPi, only the first 1Gb can be used for DMA[1]. @@ -329037,10 +329037,10 @@ Signed-off-by: Andrei Gherzan 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 45c00a54909c..1b15656c96db 100644 +index 602bd19630ff8..798cface99928 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -177,7 +177,7 @@ static void __init reserve_elfcorehdr(void) +@@ -171,7 +171,7 @@ static void __init reserve_elfcorehdr(void) static phys_addr_t __init max_zone_dma_phys(void) { phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, 32); @@ -329053,10 +329053,10 @@ index 45c00a54909c..1b15656c96db 100644 2.18.4 -From 5b6fc14eedc5762283e7ea0dd5eadb239bf8e7cc Mon Sep 17 00:00:00 2001 +From 5295fd2fbff70b58e39a7eb3498451e53e74fd22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= Date: Sat, 3 Aug 2019 14:34:59 +0200 -Subject: [PATCH 0282/1216] staging: vc04_services: fix compiling in separate +Subject: [PATCH 0282/1224] staging: vc04_services: fix compiling in separate directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -329073,7 +329073,7 @@ Signed-off-by: Marek Behún 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/bcm2835-codec/Makefile b/drivers/staging/vc04_services/bcm2835-codec/Makefile -index 5820ec1f89ec..7fb908d824b2 100644 +index 5820ec1f89ece..7fb908d824b2f 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/Makefile +++ b/drivers/staging/vc04_services/bcm2835-codec/Makefile @@ -4,5 +4,5 @@ bcm2835-codec-objs := bcm2835-v4l2-codec.o @@ -329087,10 +329087,10 @@ index 5820ec1f89ec..7fb908d824b2 100644 2.18.4 -From 0f044ce255d0af28902bf9ffbabd8396fce3397d Mon Sep 17 00:00:00 2001 +From 16bb4abc691dab2d81e416b159ba52e2697183f0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Apr 2019 13:33:47 +0100 -Subject: [PATCH 0283/1216] bcm2835-dma: Add proper 40-bit DMA support +Subject: [PATCH 0283/1224] 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 @@ -329105,7 +329105,7 @@ Signed-off-by: Phil Elwell 4 files changed, 369 insertions(+), 126 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index f59b099233dc..87fd58272e95 100644 +index f59b099233dc0..87fd58272e95f 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -38,6 +38,11 @@ @@ -329851,7 +329851,7 @@ index f59b099233dc..87fd58272e95 100644 return 0; diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c -index d8007631a54c..fa81a98f6a81 100644 +index d8007631a54cf..fa81a98f6a813 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c @@ -91,7 +91,7 @@ struct dmabounce_device_info { @@ -329936,7 +329936,7 @@ index d8007631a54c..fa81a98f6a81 100644 MODULE_AUTHOR("Phil Elwell "); MODULE_DESCRIPTION("Dedicate DMA bounce support for pcie-brcmstb"); diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h -index 5d07f679dc71..2fe20a14d035 100644 +index 5d07f679dc71b..2fe20a14d0352 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h @@ -8,21 +8,26 @@ @@ -329975,7 +329975,7 @@ index 5d07f679dc71..2fe20a14d035 100644 return 0; } diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 782725e3adad..746cfb405ad3 100644 +index 782725e3adad5..746cfb405ad38 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -644,6 +644,7 @@ static void brcm_set_dma_ops(struct device *dev) @@ -330043,10 +330043,10 @@ index 782725e3adad..746cfb405ad3 100644 2.18.4 -From 6d3ccc2411363fae646bfb7c320b6fbe2a8c8048 Mon Sep 17 00:00:00 2001 +From 49bb2fdc3e132478535afbe800e07a7959350d74 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 6 Aug 2019 15:23:14 +0100 -Subject: [PATCH 0284/1216] clk-bcm2835: Avoid null pointer exception +Subject: [PATCH 0284/1224] clk-bcm2835: Avoid null pointer exception clk_desc_array[BCM2835_PLLB] doesn't exist so we dereference null when iterating @@ -330056,7 +330056,7 @@ Signed-off-by: popcornmix 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 079748e68686..f1d73d83ee16 100644 +index 079748e686863..f1d73d83ee16b 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -2280,9 +2280,11 @@ static bool bcm2835_clk_is_claimed(const char *name) @@ -330078,10 +330078,10 @@ index 079748e68686..f1d73d83ee16 100644 2.18.4 -From 2fd7c3e8f85af4351037bf73325ca5958ae612dd Mon Sep 17 00:00:00 2001 +From 612ac25ad7083e76edee7def2fbaefbfcca438ce Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 7 Aug 2019 17:19:33 +0100 -Subject: [PATCH 0285/1216] pcie-brcmstb: Don't set DMA ops for root complex +Subject: [PATCH 0285/1224] 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 @@ -330094,7 +330094,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 746cfb405ad3..87fd40ae3140 100644 +index 746cfb405ad38..87fd40ae31400 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -665,8 +665,8 @@ static int brcmstb_platform_notifier(struct notifier_block *nb, @@ -330111,10 +330111,10 @@ index 746cfb405ad3..87fd40ae3140 100644 2.18.4 -From e8e140a484869d17f6d6297c01025e6b07c7f186 Mon Sep 17 00:00:00 2001 +From b08c83215f6450ad9b0df6f8c0777cfc872cd400 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 15 Aug 2019 08:39:08 +0100 -Subject: [PATCH 0286/1216] drm/vc4: Prevent load tracking from breaking FKMS +Subject: [PATCH 0286/1224] 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 @@ -330131,7 +330131,7 @@ Signed-off-by: Phil Elwell 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 862e89b8c478..ff96ba01144d 100644 +index 862e89b8c4789..ff96ba01144d6 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -561,6 +561,20 @@ static int vc4_plane_atomic_check(struct drm_plane *plane, @@ -330191,10 +330191,10 @@ index 862e89b8c478..ff96ba01144d 100644 2.18.4 -From aa8bd2f7f1267e9e7fc2b1c8ae922895c4b196bf Mon Sep 17 00:00:00 2001 +From 033b41aec45da3b5192d36560f594636c9dd369c Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 22 Aug 2019 23:32:46 +0800 -Subject: [PATCH 0287/1216] rtl8192cu: Let it support to build in the non-src +Subject: [PATCH 0287/1224] rtl8192cu: Let it support to build in the non-src folder If we build the kernel with "-O=$non-src-folder", this driver will @@ -330206,7 +330206,7 @@ Signed-off-by: Hui Wang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtl8192cu/Makefile b/drivers/net/wireless/realtek/rtl8192cu/Makefile -index c399011a3e37..ef6156c0f368 100644 +index c399011a3e377..ef6156c0f3687 100644 --- a/drivers/net/wireless/realtek/rtl8192cu/Makefile +++ b/drivers/net/wireless/realtek/rtl8192cu/Makefile @@ -16,7 +16,7 @@ EXTRA_CFLAGS += -Wno-unused @@ -330222,10 +330222,10 @@ index c399011a3e37..ef6156c0f368 100644 2.18.4 -From 9a58cbb63c2affee4f0368f33064a316b0d4df98 Mon Sep 17 00:00:00 2001 +From 1084460af78120c0a595837e23bfdc22f164584b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 15:13:17 -0800 -Subject: [PATCH 0288/1216] drm/v3d: HACK: gut runtime pm for now. +Subject: [PATCH 0288/1224] 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 @@ -330240,7 +330240,7 @@ Signed-off-by: Eric Anholt 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c -index 9e953ce64ef7..449317371795 100644 +index 9e953ce64ef75..449317371795e 100644 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c @@ -4,7 +4,6 @@ @@ -330296,7 +330296,7 @@ index 9e953ce64ef7..449317371795 100644 return 0; } diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index d225152e7e36..15a5f92aa7b4 100644 +index d225152e7e36e..15a5f92aa7b4e 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -78,7 +78,6 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, @@ -330339,10 +330339,10 @@ index d225152e7e36..15a5f92aa7b4 100644 2.18.4 -From ebfa45fa5322372d0db90690c411fd7a34540150 Mon Sep 17 00:00:00 2001 +From bd46b29fb1bf6a5f72f77d3e0f370a43d08ff5f3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 13:22:53 -0700 -Subject: [PATCH 0289/1216] drm/v3d: Clock V3D down when not in use. +Subject: [PATCH 0289/1224] 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. @@ -330355,7 +330355,7 @@ Signed-off-by: Eric Anholt 3 files changed, 72 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index 15a5f92aa7b4..00e4419dc208 100644 +index 15a5f92aa7b4e..00e4419dc208e 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -282,6 +282,21 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) @@ -330391,7 +330391,7 @@ index 15a5f92aa7b4..00e4419dc208 100644 irq_disable: diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h -index 9a35c555ec52..15bc4e28b6cc 100644 +index 9a35c555ec522..15bc4e28b6ccd 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -54,6 +54,12 @@ struct v3d_dev { @@ -330408,7 +330408,7 @@ index 9a35c555ec52..15bc4e28b6cc 100644 /* Virtual and DMA addresses of the single shared page table. */ diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c -index 19c092d75266..28f8eb664a58 100644 +index 19c092d75266b..28f8eb664a581 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -4,6 +4,7 @@ @@ -330510,10 +330510,10 @@ index 19c092d75266..28f8eb664a58 100644 2.18.4 -From ccfe3b7dd0a9c8b6075428ac8123d14ca134982b Mon Sep 17 00:00:00 2001 +From ba90f4b137082dbf0c6f5e82c294b8d025247a71 Mon Sep 17 00:00:00 2001 From: Hermann Lauer Date: Thu, 8 Aug 2019 15:40:37 +0200 -Subject: [PATCH 0290/1216] According to 5713 pdf doc CLOCK_CTRL is a readonly +Subject: [PATCH 0290/1224] According to 5713 pdf doc CLOCK_CTRL is a readonly status register, and it behaves so. Remove useless setting --- @@ -330521,7 +330521,7 @@ Subject: [PATCH 0290/1216] According to 5713 pdf doc CLOCK_CTRL is a readonly 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/codecs/tas5713.c b/sound/soc/codecs/tas5713.c -index 9c1c92e57bbf..53acd2b355d6 100644 +index 9c1c92e57bbfa..53acd2b355d63 100644 --- a/sound/soc/codecs/tas5713.c +++ b/sound/soc/codecs/tas5713.c @@ -190,10 +190,6 @@ static int tas5713_probe(struct snd_soc_component *component) @@ -330547,10 +330547,10 @@ index 9c1c92e57bbf..53acd2b355d6 100644 2.18.4 -From 411acd4af9ef6156b1eeca4a070934ff458f97ac Mon Sep 17 00:00:00 2001 +From 94637e677394dfabe4a09d3be5aedcf11a65f5b0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 28 Jun 2018 15:57:25 +0100 -Subject: [PATCH 0291/1216] staging: bcm2835_camera: Ensure all buffers are +Subject: [PATCH 0291/1224] staging: bcm2835_camera: Ensure all buffers are returned on disable With the recent change to match MMAL and V4L2 buffers there @@ -330564,7 +330564,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 61a3593cdcfc..341594ab669f 100644 +index 61a3593cdcfc3..341594ab669f3 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -268,6 +268,8 @@ static void buffer_work_cb(struct work_struct *work) @@ -330580,10 +330580,10 @@ index 61a3593cdcfc..341594ab669f 100644 2.18.4 -From 6bb04ec38110265de534703fbbf3d0bdf9f2244b Mon Sep 17 00:00:00 2001 +From d5471008a1876573fdc3b0f671bc9657a5fb1c95 Mon Sep 17 00:00:00 2001 From: yaroslavros Date: Wed, 14 Aug 2019 15:22:55 +0100 -Subject: [PATCH 0292/1216] Ported pcie-brcmstb bounce buffer implementation to +Subject: [PATCH 0292/1224] Ported pcie-brcmstb bounce buffer implementation to ARM64. (#3144) Ported pcie-brcmstb bounce buffer implementation to ARM64. @@ -330600,7 +330600,7 @@ Signed-off-by: Yaroslav Rosomakho create mode 100644 drivers/pci/controller/pcie-brcmstb-bounce64.c diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c -index 9239416e93d4..e17e3b2f11c6 100644 +index 9239416e93d4e..e17e3b2f11c6e 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -31,6 +31,35 @@ void arch_dma_prep_coherent(struct page *page, size_t size) @@ -330640,7 +330640,7 @@ index 9239416e93d4..e17e3b2f11c6 100644 { dev->dma_ops = NULL; diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile -index be98ebfdb173..d52bf54d579f 100644 +index be98ebfdb1737..d52bf54d579f3 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -33,6 +33,9 @@ obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o @@ -330654,7 +330654,7 @@ index be98ebfdb173..d52bf54d579f 100644 obj-$(CONFIG_VMD) += vmd.o # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h -index 2fe20a14d035..7caa0781329b 100644 +index 2fe20a14d0352..7caa0781329b5 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h @@ -6,7 +6,7 @@ @@ -330668,7 +330668,7 @@ index 2fe20a14d035..7caa0781329b 100644 dma_addr_t threshold); diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c new file mode 100644 -index 000000000000..6a872975ba9e +index 0000000000000..6a872975ba9e1 --- /dev/null +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c @@ -0,0 +1,569 @@ @@ -331242,7 +331242,7 @@ index 000000000000..6a872975ba9e +MODULE_DESCRIPTION("Dedicate DMA bounce support for pcie-brcmstb"); +MODULE_LICENSE("GPL"); diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 87fd40ae3140..e8c8b355548a 100644 +index 87fd40ae31400..e8c8b355548a5 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -611,28 +611,6 @@ static const struct dma_map_ops brcm_dma_ops = { @@ -331308,10 +331308,10 @@ index 87fd40ae3140..e8c8b355548a 100644 2.18.4 -From ddd9ec821b0ce9a4060d87eee316fb44fe9f7793 Mon Sep 17 00:00:00 2001 +From 8e1799060b738cea81dded2343c7debea5473331 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Jul 2019 17:44:53 +0100 -Subject: [PATCH 0293/1216] drm/vc4: Query firmware for custom HDMI mode +Subject: [PATCH 0293/1224] drm/vc4: Query firmware for custom HDMI mode Allow custom HDMI modes to be specified from config.txt, and these then override EDID parsing. @@ -331322,7 +331322,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 75 insertions(+), 55 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index ff96ba01144d..3ea7974a4ed3 100644 +index ff96ba01144d6..3ea7974a4ed3a 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -1066,6 +1066,56 @@ vc4_fkms_connector_detect(struct drm_connector *connector, bool force) @@ -331493,10 +331493,10 @@ index ff96ba01144d..3ea7974a4ed3 100644 2.18.4 -From feb1c55a0cf4319d4ecaf00759cbf4b1c7f2fae0 Mon Sep 17 00:00:00 2001 +From 8af7cfa359741f9faaae6442295758c320ff82b4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 15:12:05 +0100 -Subject: [PATCH 0294/1216] drm/vc4: Pass the drm vrefresh to the firmware on +Subject: [PATCH 0294/1224] drm/vc4: Pass the drm vrefresh to the firmware on mode set More for completeness than need, but use drm_mode_vrefresh @@ -331509,7 +331509,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 3ea7974a4ed3..6bf51f45cadb 100644 +index 3ea7974a4ed3a..6bf51f45cadbb 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -768,8 +768,8 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -331536,10 +331536,10 @@ index 3ea7974a4ed3..6bf51f45cadb 100644 2.18.4 -From ccdfdac1c61acf5e5dab89fa619be0ac573a1ddd Mon Sep 17 00:00:00 2001 +From 81de30523033619d2c37cdb265208260ec6fcbba Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 19 Jul 2019 15:35:13 +0100 -Subject: [PATCH 0295/1216] drm/vc4: Add support for margins to fkms +Subject: [PATCH 0295/1224] 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 @@ -331551,7 +331551,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 190 insertions(+), 51 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 6bf51f45cadb..5526b7dd52ee 100644 +index 6bf51f45cadbb..5526b7dd52ee5 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -259,6 +259,23 @@ static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc) @@ -331870,10 +331870,10 @@ index 6bf51f45cadb..5526b7dd52ee 100644 2.18.4 -From ad7836c11867467b2a910970a71cebf03924a135 Mon Sep 17 00:00:00 2001 +From 7fcaf45dce5b20716d4eb74598b722c171f50d2d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 19 Jul 2019 17:49:00 +0100 -Subject: [PATCH 0296/1216] drm/vc4: Ensure zpos is always initialised +Subject: [PATCH 0296/1224] 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 @@ -331887,7 +331887,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 5526b7dd52ee..653c9f6d5ce5 100644 +index 5526b7dd52ee5..653c9f6d5ce5c 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -804,6 +804,7 @@ static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev, @@ -331902,10 +331902,10 @@ index 5526b7dd52ee..653c9f6d5ce5 100644 2.18.4 -From d5cfedde6105b670041e61261ca780b724f4c0ef Mon Sep 17 00:00:00 2001 +From e16bd544b3590a9285d03c658ab9eec5a85e61b6 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Tue, 23 Jul 2019 16:57:35 +0200 -Subject: [PATCH 0297/1216] adds the Hifiberry DAC+ADC PRO version +Subject: [PATCH 0297/1224] 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 @@ -331917,7 +331917,7 @@ Signed-off-by: Joerg Schambacher joerg@i2audio.com create mode 100644 sound/soc/bcm/hifiberry_dacplusadcpro.c diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index e6d1c6b3fb5b..4c38298df04b 100644 +index e6d1c6b3fb5be..4c38298df04b9 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -38,6 +38,7 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS @@ -331944,7 +331944,7 @@ index e6d1c6b3fb5b..4c38298df04b 100644 tristate "Support for HifiBerry Digi" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index e0e2645d7658..0e8b60f61b31 100644 +index e0e2645d76584..0e8b60f61b31a 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -15,6 +15,7 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o @@ -331965,7 +331965,7 @@ index e0e2645d7658..0e8b60f61b31 100644 obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c new file mode 100644 -index 000000000000..ed080b24eb49 +index 0000000000000..ed080b24eb494 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c @@ -0,0 +1,538 @@ @@ -332511,10 +332511,10 @@ index 000000000000..ed080b24eb49 2.18.4 -From 202ba25b0ddfcf11f74a7b9c9339a5549064e270 Mon Sep 17 00:00:00 2001 +From b44d80e0ccc574797aceceb76aa021a5cdd4a9a5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 31 Jul 2019 17:36:34 +0100 -Subject: [PATCH 0298/1216] drm/vc4: A present but empty dmas disables audio +Subject: [PATCH 0298/1224] 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 @@ -332528,7 +332528,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 54435b72b761..d59fd8714c5d 100644 +index 54435b72b7611..d59fd8714c5d8 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) @@ -332550,10 +332550,10 @@ index 54435b72b761..d59fd8714c5d 100644 2.18.4 -From 1597983e27ecc4282251538706d5df96ee2f2226 Mon Sep 17 00:00:00 2001 +From 5cad4a8feebaf6bead1c4ea263dd2dea4f4fe25b Mon Sep 17 00:00:00 2001 From: James Hughes Date: Mon, 29 Jul 2019 12:02:59 +0100 -Subject: [PATCH 0299/1216] Fixup FKMS interrupt handing for non-existent +Subject: [PATCH 0299/1224] Fixup FKMS interrupt handing for non-existent display If an errant interrupt flag was received from a non-existent display, @@ -332564,7 +332564,7 @@ second display is present prior to checking the interrupt flags. 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 653c9f6d5ce5..14d660add41c 100644 +index 653c9f6d5ce5c..14d660add41c8 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -1087,14 +1087,17 @@ static irqreturn_t vc4_crtc_irq_handler(int irq, void *data) @@ -332596,10 +332596,10 @@ index 653c9f6d5ce5..14d660add41c 100644 2.18.4 -From cbf97ab95f99a8a0e2581cfad8b2e4ca66519ec3 Mon Sep 17 00:00:00 2001 +From bd49fb33de1aca12284a6d8d1f556df58052c7dd Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 9 May 2019 14:30:37 +0100 -Subject: [PATCH 0300/1216] drivers: char: add chardev for mmap'ing the RPiVid +Subject: [PATCH 0300/1224] drivers: char: add chardev for mmap'ing the RPiVid control registers Based on the gpiomem driver, allow mapping of the decoder register @@ -332619,7 +332619,7 @@ Signed-off-by: Jonathan Bell create mode 100644 drivers/char/broadcom/rpivid-mem.c diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig -index cffd17df6a1b..6f9b37bf6b8a 100644 +index cffd17df6a1b6..6f9b37bf6b8a9 100644 --- a/drivers/char/broadcom/Kconfig +++ b/drivers/char/broadcom/Kconfig @@ -49,3 +49,11 @@ config BCM2835_SMI_DEV @@ -332635,7 +332635,7 @@ index cffd17df6a1b..6f9b37bf6b8a 100644 + so userspace tools can access the control and status registers of the + Raspberry Pi RPiVid video decoder hardware. diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile -index 7d9cb3e0b1c3..e06026539719 100644 +index 7d9cb3e0b1c3c..e060265397193 100644 --- a/drivers/char/broadcom/Makefile +++ b/drivers/char/broadcom/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_BCM_VC_SM) += vc_sm/ @@ -332645,7 +332645,7 @@ index 7d9cb3e0b1c3..e06026539719 100644 +obj-$(CONFIG_RPIVID_MEM) += rpivid-mem.o diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c new file mode 100644 -index 000000000000..e4e5fb1fb820 +index 0000000000000..e4e5fb1fb8209 --- /dev/null +++ b/drivers/char/broadcom/rpivid-mem.c @@ -0,0 +1,286 @@ @@ -332936,7 +332936,7 @@ index 000000000000..e4e5fb1fb820 +MODULE_DESCRIPTION("Driver for accessing RPiVid decoder registers from userspace"); +MODULE_AUTHOR("Jonathan Bell "); diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c -index ab1e9cbc50b1..f66f92fe28c3 100644 +index ab1e9cbc50b1b..f66f92fe28c34 100644 --- a/drivers/mfd/bcm2835-pm.c +++ b/drivers/mfd/bcm2835-pm.c @@ -50,14 +50,14 @@ static int bcm2835_pm_probe(struct platform_device *pdev) @@ -332961,7 +332961,7 @@ index ab1e9cbc50b1..f66f92fe28c3 100644 } diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c -index c0618a9c26fa..6059210170bc 100644 +index c0618a9c26fac..6059210170bc6 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -637,15 +637,15 @@ static int bcm2835_power_probe(struct platform_device *pdev) @@ -332984,7 +332984,7 @@ index c0618a9c26fa..6059210170bc 100644 } diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h -index b2d157091e12..f70a810c55f7 100644 +index b2d157091e12b..f70a810c55f7d 100644 --- a/include/linux/mfd/bcm2835-pm.h +++ b/include/linux/mfd/bcm2835-pm.h @@ -9,7 +9,7 @@ struct bcm2835_pm { @@ -333000,10 +333000,10 @@ index b2d157091e12..f70a810c55f7 100644 2.18.4 -From 315e5858018dbe7afb5a54834a2d469d12a6a7a7 Mon Sep 17 00:00:00 2001 +From a702c6e0eeb0f0736b2dae1bd2e75f75039db721 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 1 Aug 2019 16:41:20 +0100 -Subject: [PATCH 0301/1216] hid: usb: Add device quirks for Freeway Airmouse T3 +Subject: [PATCH 0301/1224] hid: usb: Add device quirks for Freeway Airmouse T3 and MX3 These wireless mouse/keyboard combo remote control devices specify @@ -333024,7 +333024,7 @@ Signed-off-by: Jonathan Bell 2 files changed, 8 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 2aa810665a78..8acacdd477cb 100644 +index 33183933337af..f41a18a3b0abb 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -223,6 +223,9 @@ @@ -333037,7 +333037,7 @@ index 2aa810665a78..8acacdd477cb 100644 #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1253,6 +1256,9 @@ +@@ -1254,6 +1257,9 @@ #define USB_VENDOR_ID_XAT 0x2505 #define USB_DEVICE_ID_XAT_CSR 0x0220 @@ -333048,7 +333048,7 @@ index 2aa810665a78..8acacdd477cb 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 60d188a704e5..3f4b7416dcbf 100644 +index 60d188a704e5e..3f4b7416dcbfc 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[] = { @@ -333071,10 +333071,10 @@ index 60d188a704e5..3f4b7416dcbf 100644 2.18.4 -From 34a8369a4cd2d26ecb5b0493f3eab1317d7b511d Mon Sep 17 00:00:00 2001 +From 2996c035c7f7d695adbf07a9f4ab29d54609041e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 14 Jun 2019 10:12:07 +0100 -Subject: [PATCH 0302/1216] drm/vc4: Add "Broadcast RGB" connector property +Subject: [PATCH 0302/1224] 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 @@ -333091,7 +333091,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 177 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 14d660add41c..bf882b38830a 100644 +index 14d660add41c8..bf882b38830a8 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -287,6 +287,13 @@ to_vc4_fkms_encoder(struct drm_encoder *encoder) @@ -333379,10 +333379,10 @@ index 14d660add41c..bf882b38830a 100644 2.18.4 -From 211f036e6c397d431f3c69f9d2dcc198502bd2f6 Mon Sep 17 00:00:00 2001 +From 7c69a61dbb08b4dcef45b02db9a6a0152dfc1d5d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jul 2019 11:09:26 +0100 -Subject: [PATCH 0303/1216] drm/vc4: fkms: Set default state margin at reset +Subject: [PATCH 0303/1224] 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 @@ -333394,7 +333394,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index bf882b38830a..fa8a538f5d66 100644 +index bf882b38830a8..fa8a538f5d669 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -1481,10 +1481,17 @@ int vc4_connector_atomic_set_property(struct drm_connector *connector, @@ -333419,10 +333419,10 @@ index bf882b38830a..fa8a538f5d66 100644 2.18.4 -From f6742510f98dbd80e3580edf851476e2ad9184fb Mon Sep 17 00:00:00 2001 +From a4f1805f2a55375b3b96f05e526401de32109039 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 18 Jul 2019 17:07:05 +0800 -Subject: [PATCH 0304/1216] staging: bcm2835-codec: switch to multi-planar API +Subject: [PATCH 0304/1224] 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 @@ -333443,7 +333443,7 @@ Signed-off-by: Chen-Yu Tsai 1 file changed, 74 insertions(+), 67 deletions(-) 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 708f76b7aa92..0ecf3e5c59a8 100644 +index 708f76b7aa92b..0ecf3e5c59a85 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -504,7 +504,7 @@ static struct bcm2835_codec_fmt *find_format(struct v4l2_format *f, @@ -333772,10 +333772,10 @@ index 708f76b7aa92..0ecf3e5c59a8 100644 2.18.4 -From cc2659ba6c9e862a27f2561dc5e3f5130399bd93 Mon Sep 17 00:00:00 2001 +From 254efc58b8c8d775bfa0ae243a5a17fac4f1280d Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Mon, 22 Jul 2019 22:13:30 +0800 -Subject: [PATCH 0305/1216] staging: bcm2835-codec: implement +Subject: [PATCH 0305/1224] staging: bcm2835-codec: implement V4L2_CID_MIN_BUFFERS_FOR_CAPTURE The stateful decoder specification shows an optional step for retrieving @@ -333798,7 +333798,7 @@ Signed-off-by: Chen-Yu Tsai 1 file changed, 12 insertions(+) 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 0ecf3e5c59a8..d515bc75d5cb 100644 +index 0ecf3e5c59a85..d515bc75d5cb0 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -2357,6 +2357,18 @@ static int bcm2835_codec_open(struct file *file) @@ -333824,10 +333824,10 @@ index 0ecf3e5c59a8..d515bc75d5cb 100644 2.18.4 -From dc4f347463bf87b7be698cad4d465be5d3a45553 Mon Sep 17 00:00:00 2001 +From dbd6f4b3e4a8323a9b97faa889c2e710092c087e Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Mon, 22 Jul 2019 22:20:55 +0800 -Subject: [PATCH 0306/1216] staging: bcm2835-codec: set device_caps in struct +Subject: [PATCH 0306/1224] staging: bcm2835-codec: set device_caps in struct video_device Instead of filling in the struct v4l2_capability device_caps @@ -333846,7 +333846,7 @@ Signed-off-by: Chen-Yu Tsai 1 file changed, 1 insertion(+), 2 deletions(-) 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 d515bc75d5cb..47e79a0f0c3e 100644 +index d515bc75d5cb0..47e79a0f0c3e8 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -945,8 +945,6 @@ static int vidioc_querycap(struct file *file, void *priv, @@ -333870,10 +333870,10 @@ index d515bc75d5cb..47e79a0f0c3e 100644 2.18.4 -From ae8580262a6dbb4d6f205fd1866b241aa74555a2 Mon Sep 17 00:00:00 2001 +From 5e8626775d7b4819b5fc56a7b5f811d7182dca4b Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 16 Jul 2019 12:18:21 +0100 -Subject: [PATCH 0307/1216] Add HDMI1 facility to the driver. +Subject: [PATCH 0307/1224] Add HDMI1 facility to the driver. For generic ALSA, all you need is the bcm2835.h change, but have also added structures for IEC958 HDMI. Not sure how to @@ -333884,7 +333884,7 @@ test those. 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index 86b921030db7..4d5b99d8ae9d 100644 +index 86b921030db7b..4d5b99d8ae9dc 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -79,7 +79,11 @@ static int bcm2835_audio_alsa_newpcm(struct bcm2835_chip *chip, @@ -333945,7 +333945,7 @@ index 86b921030db7..4d5b99d8ae9d 100644 }, { diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h -index ed0feb34b6c8..1a25cdad94dc 100644 +index ed0feb34b6c88..1a25cdad94dcd 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h @@ -33,7 +33,9 @@ enum { @@ -333963,10 +333963,10 @@ index ed0feb34b6c8..1a25cdad94dc 100644 2.18.4 -From 6227e03af9fd142a82199573a0f8db47abef7cdb Mon Sep 17 00:00:00 2001 +From 2f1e490ec7174323d5dc6484473e1aff4d8d35d4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jul 2019 17:27:44 +0100 -Subject: [PATCH 0308/1216] drm/vc4: Resolve the vblank warnings on mode +Subject: [PATCH 0308/1224] drm/vc4: Resolve the vblank warnings on mode switching The details over when and how a driver is to service the @@ -333984,7 +333984,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index fa8a538f5d66..d9779b993c39 100644 +index fa8a538f5d669..d9779b993c392 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -964,6 +964,7 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -334069,10 +334069,10 @@ index fa8a538f5d66..d9779b993c39 100644 2.18.4 -From b2dadd48b3431db5ab242aaadab34118bdb81cb0 Mon Sep 17 00:00:00 2001 +From e97a21aca329098e0043fca2c5523eb696c2f82f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jul 2019 17:34:29 +0100 -Subject: [PATCH 0309/1216] drm/vc4: Remove unused mode variable +Subject: [PATCH 0309/1224] 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, @@ -334087,7 +334087,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index d9779b993c39..8b1838919377 100644 +index d9779b993c392..8b18389193777 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -525,7 +525,6 @@ static int vc4_plane_to_mb(struct drm_plane *plane, @@ -334102,10 +334102,10 @@ index d9779b993c39..8b1838919377 100644 2.18.4 -From 9bf1566b5890a6bd2677a96a274cd90af070bc8f Mon Sep 17 00:00:00 2001 +From d79b71261c7fda83a0c3b35212c7fba57050dee0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 14:57:09 +0100 -Subject: [PATCH 0310/1216] staging:bcm2835-codec: Expand logging on format +Subject: [PATCH 0310/1224] staging:bcm2835-codec: Expand logging on format setting Adds some more useful logging during format changed events and @@ -334118,7 +334118,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+), 3 deletions(-) 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 47e79a0f0c3e..eadc0fab2fb9 100644 +index 47e79a0f0c3e8..eadc0fab2fb9c 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -753,6 +753,10 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx, @@ -334150,10 +334150,10 @@ index 47e79a0f0c3e..eadc0fab2fb9 100644 2.18.4 -From 5ba2e491caffe95a96f1e91c49c4e9041819a588 Mon Sep 17 00:00:00 2001 +From 58ede83cb650ec442e9122463e0da787c72404de Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 14:58:35 +0100 -Subject: [PATCH 0311/1216] staging: bcm2835-codec: Correct bytesperline on +Subject: [PATCH 0311/1224] staging: bcm2835-codec: Correct bytesperline on format changed The handling of format changed events incorrectly set bytesperline @@ -334168,7 +334168,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 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 eadc0fab2fb9..24a8e7cc7de7 100644 +index eadc0fab2fb9c..24a8e7cc7de7e 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -759,7 +759,9 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx, @@ -334186,10 +334186,10 @@ index eadc0fab2fb9..24a8e7cc7de7 100644 2.18.4 -From da73cbed5892891a5f14f4d4d34a95a045b8900f Mon Sep 17 00:00:00 2001 +From d3b7ff308975c129a9ccb99115cb5480a016aad9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 7 Aug 2019 11:31:08 +0100 -Subject: [PATCH 0312/1216] drm/vc4: Add missing NULL check to +Subject: [PATCH 0312/1224] drm/vc4: Add missing NULL check to vc4_crtc_consume_event vc4_crtc_consume_event wasn't checking crtc->state->event was @@ -334203,7 +334203,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 8b1838919377..004a0bce94ac 100644 +index 8b18389193777..004a0bce94acb 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -1000,6 +1000,9 @@ static void vc4_crtc_consume_event(struct drm_crtc *crtc) @@ -334220,10 +334220,10 @@ index 8b1838919377..004a0bce94ac 100644 2.18.4 -From 8686aef9397ec6d08c374489e72bbe63fc5df5d9 Mon Sep 17 00:00:00 2001 +From 0dacc3c34828b8ecabce5150e79fefc253889810 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Aug 2019 08:51:43 +0100 -Subject: [PATCH 0313/1216] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail +Subject: [PATCH 0313/1224] 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 @@ -334248,7 +334248,7 @@ Signed-off-by: Phil Elwell 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 8cd9d5a9e7f5..35816fe2ffd9 100644 +index 8cd9d5a9e7f5b..35816fe2ffd95 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -71,6 +71,9 @@ @@ -334277,10 +334277,10 @@ index 8cd9d5a9e7f5..35816fe2ffd9 100644 2.18.4 -From 23f17e15acca2ed5a9df163f51df3689325d6c01 Mon Sep 17 00:00:00 2001 +From 5c86d0dd5fa189554bfba5ff5ff4df80aef559d3 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 13 Aug 2019 15:53:29 +0100 -Subject: [PATCH 0314/1216] xhci: Use more event ring segment table entries +Subject: [PATCH 0314/1224] 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 @@ -334300,7 +334300,7 @@ Signed-off-by: Jonathan Bell 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c -index 9764122c9cdf..ff6004b3f6b9 100644 +index 9764122c9cdf2..ff6004b3f6b9b 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -2503,9 +2503,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) @@ -334327,7 +334327,7 @@ index 9764122c9cdf..ff6004b3f6b9 100644 "// Write ERST size = %i to ir_set 0 (some bits preserved)", val); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 4ded7bc60d99..1bd165cbd74f 100644 +index 4ded7bc60d99f..1bd165cbd74f0 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1649,8 +1649,8 @@ struct urb_priv { @@ -334345,10 +334345,10 @@ index 4ded7bc60d99..1bd165cbd74f 100644 2.18.4 -From c82c724e1b40f8aa15e5804c23339512429148ee Mon Sep 17 00:00:00 2001 +From d8dd39a1c1fd5c3a8fb08f405368f73e302507ca Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 15 Aug 2019 12:02:34 +0100 -Subject: [PATCH 0315/1216] configs: arm64/bcm2711: Enable V3D +Subject: [PATCH 0315/1224] configs: arm64/bcm2711: Enable V3D Enable the V3D driver, which depends on BCM2835_POWER. @@ -334364,7 +334364,7 @@ Signed-off-by: Phil Elwell 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 4719d38c4b4e..33686cf34ff9 100644 +index 4719d38c4b4e5..33686cf34ff9c 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1303,6 +1303,7 @@ CONFIG_VIDEO_CODEC_BCM2835=m @@ -334376,7 +334376,7 @@ index 4719d38c4b4e..33686cf34ff9 100644 CONFIG_EXTCON=m CONFIG_EXTCON_ARIZONA=m diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig -index 9a5c44606337..b0e048697964 100644 +index 9a5c44606337e..b0e0486979642 100644 --- a/drivers/gpu/drm/v3d/Kconfig +++ b/drivers/gpu/drm/v3d/Kconfig @@ -1,7 +1,7 @@ @@ -334392,10 +334392,10 @@ index 9a5c44606337..b0e048697964 100644 2.18.4 -From 1cf41995de3b9e8c67b0bf525fb92d35919dd7d6 Mon Sep 17 00:00:00 2001 +From 57a86626ebe8d1609a182265a5440eb64194fa58 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Thu, 22 Aug 2019 22:31:37 +0000 -Subject: [PATCH 0316/1216] staging: bcm2835-codec: add support for +Subject: [PATCH 0316/1224] staging: bcm2835-codec: add support for V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME fixes #3171 @@ -334406,7 +334406,7 @@ Signed-off-by: Aman Gupta 1 file changed, 18 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 24a8e7cc7de7..1a384e70eb98 100644 +index 24a8e7cc7de7e..1a384e70eb98e 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1587,6 +1587,20 @@ static int bcm2835_codec_s_ctrl(struct v4l2_ctrl *ctrl) @@ -334453,10 +334453,10 @@ index 24a8e7cc7de7..1a384e70eb98 100644 2.18.4 -From 83b22336fa49469b5d5bcd32d6976182d65ce42d Mon Sep 17 00:00:00 2001 +From 9570f943878f33c1659593d9cee4002c450f29ad Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Fri, 23 Aug 2019 16:29:07 -0700 -Subject: [PATCH 0317/1216] staging: bcm2835-codec: remove unnecessary padding +Subject: [PATCH 0317/1224] staging: bcm2835-codec: remove unnecessary padding on encoder input The ISP and ENCODE roles have the same underlying hardware. Neither requires vertical alignment. @@ -334467,7 +334467,7 @@ Signed-off-by: Aman Gupta 1 file changed, 2 insertions(+), 2 deletions(-) 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 1a384e70eb98..a82d7345389d 100644 +index 1a384e70eb98e..a82d7345389db 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1050,12 +1050,12 @@ static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f, @@ -334489,10 +334489,10 @@ index 1a384e70eb98..a82d7345389d 100644 2.18.4 -From 110e62bc7712ae666f1b9b98773fa4d75b5dc65c Mon Sep 17 00:00:00 2001 +From 43f4c39ac911ceb39e77be8e8175990ae3251070 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:16:56 +0100 -Subject: [PATCH 0318/1216] arch/arm: Add model string to cpuinfo +Subject: [PATCH 0318/1224] arch/arm: Add model string to cpuinfo Signed-off-by: Phil Elwell --- @@ -334500,7 +334500,7 @@ Signed-off-by: Phil Elwell 1 file changed, 10 insertions(+) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index d0a464e317ea..d658d022f6a7 100644 +index d0a464e317eac..d658d022f6a7c 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -1240,6 +1240,8 @@ static int c_show(struct seq_file *m, void *v) @@ -334531,10 +334531,10 @@ index d0a464e317ea..d658d022f6a7 100644 2.18.4 -From 5d427ed4e0c97c1eb09a6c46be52041fb81e6246 Mon Sep 17 00:00:00 2001 +From 90a8f8412cb346f3669590e8e2803de6f3c8c5f3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:17:25 +0100 -Subject: [PATCH 0319/1216] arch/arm64: Add Revision, Serial, Model to cpuinfo +Subject: [PATCH 0319/1224] arch/arm64: Add Revision, Serial, Model to cpuinfo Signed-off-by: Phil Elwell --- @@ -334542,7 +334542,7 @@ Signed-off-by: Phil Elwell 1 file changed, 25 insertions(+) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 05933c065732..86bbf8762dc9 100644 +index 05933c065732b..86bbf8762dc95 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -17,6 +17,7 @@ @@ -334595,10 +334595,10 @@ index 05933c065732..86bbf8762dc9 100644 2.18.4 -From 674e13b435ae03dc421759ea97281fcca499f108 Mon Sep 17 00:00:00 2001 +From 37c525802379c777e3793efe67f105e3f86677ef Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:34:30 +0100 -Subject: [PATCH 0320/1216] media: dt-bindings: Add binding for the Sony IMX219 +Subject: [PATCH 0320/1224] media: dt-bindings: Add binding for the Sony IMX219 sensor The IMX219 is an 8MPix CSI2 sensor, supporting 2 or 4 data lanes. @@ -334612,7 +334612,7 @@ Signed-off-by: Dave Stevenson diff --git a/Documentation/devicetree/bindings/media/i2c/imx219.txt b/Documentation/devicetree/bindings/media/i2c/imx219.txt new file mode 100644 -index 000000000000..a02f1ce1e120 +index 0000000000000..a02f1ce1e1204 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx219.txt @@ -0,0 +1,59 @@ @@ -334679,10 +334679,10 @@ index 000000000000..a02f1ce1e120 2.18.4 -From 1f7bd97b775c07104290f547c847154859b32909 Mon Sep 17 00:00:00 2001 +From fc39030b3652bc68aa2ad6d28241a4032ea4fb05 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:34:49 +0100 -Subject: [PATCH 0321/1216] media: i2c: Add driver for Sony IMX219 sensor +Subject: [PATCH 0321/1224] 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 @@ -334700,7 +334700,7 @@ Tested-by: Kieran Bingham create mode 100644 drivers/media/i2c/imx219.c diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index fcffcc31d168..b28b82953e69 100644 +index fcffcc31d168a..b28b82953e692 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -578,6 +578,17 @@ config VIDEO_IMX214 @@ -334722,7 +334722,7 @@ index fcffcc31d168..b28b82953e69 100644 tristate "Sony IMX258 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index beb170b002dc..f461e6694f06 100644 +index beb170b002dc9..f461e6694f064 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -110,6 +110,7 @@ obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o @@ -334735,7 +334735,7 @@ index beb170b002dc..f461e6694f06 100644 obj-$(CONFIG_VIDEO_IMX319) += imx319.o diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c new file mode 100644 -index 000000000000..682397a48492 +index 0000000000000..682397a484922 --- /dev/null +++ b/drivers/media/i2c/imx219.c @@ -0,0 +1,1093 @@ @@ -335836,10 +335836,10 @@ index 000000000000..682397a48492 2.18.4 -From d8fa8d7662d022cab1ef33afcbf48ce91ba2e0f1 Mon Sep 17 00:00:00 2001 +From bb98504e64f696bde7d5c1e562a2e3b58d8b75be Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Sun, 28 Apr 2019 12:15:35 +0200 -Subject: [PATCH 0322/1216] staging: bcm2835-codec: Fix non-documentation +Subject: [PATCH 0322/1224] staging: bcm2835-codec: Fix non-documentation comment block The job_ready comment is incorrectly using the documentation prefix @@ -335853,7 +335853,7 @@ Signed-off-by: Kieran Bingham 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 a82d7345389d..4c69087328c0 100644 +index a82d7345389db..4c69087328c00 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -557,7 +557,7 @@ static struct vchiq_mmal_port *get_port_data(struct bcm2835_codec_ctx *ctx, @@ -335869,10 +335869,10 @@ index a82d7345389d..4c69087328c0 100644 2.18.4 -From 74013fc168fbbdaf8cac522c718435f684839770 Mon Sep 17 00:00:00 2001 +From 19c656ea909c7a67e4162aacab1a3886b7fccc67 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:42:39 +0000 -Subject: [PATCH 0323/1216] staging: bcm2835-codec: Fix declaration of roles +Subject: [PATCH 0323/1224] 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. @@ -335885,7 +335885,7 @@ Signed-off-by: Kieran Bingham 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 4c69087328c0..1a00c8d25370 100644 +index 4c69087328c00..1a00c8d253700 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -77,7 +77,7 @@ enum bcm2835_codec_role { @@ -335901,10 +335901,10 @@ index 4c69087328c0..1a00c8d25370 100644 2.18.4 -From 855994e2fe91047f08e91e744e123d9293dbcc5e Mon Sep 17 00:00:00 2001 +From 132075a68e4c33463af2400e58a3e83ebb207dac Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:55:43 +0000 -Subject: [PATCH 0324/1216] staging: bcm2835-codec: Add role to device name +Subject: [PATCH 0324/1224] 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 @@ -335922,7 +335922,7 @@ Signed-off-by: Kieran Bingham 1 file changed, 5 insertions(+), 3 deletions(-) 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 1a00c8d25370..46b8dd782c46 100644 +index 1a00c8d253700..46b8dd782c465 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -947,8 +947,10 @@ static void device_run(void *priv) @@ -335952,10 +335952,10 @@ index 1a00c8d25370..46b8dd782c46 100644 2.18.4 -From 2a85e3b16bbed16b3fe55adc366946490378cbb3 Mon Sep 17 00:00:00 2001 +From a32478ba549b3e950da354d788a14e13c17afed3 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:35:26 +0000 -Subject: [PATCH 0325/1216] staging: bcm2835-codec: Pass driver context to +Subject: [PATCH 0325/1224] staging: bcm2835-codec: Pass driver context to create entities Pass the bcm2835_codec_driver driver context directly into the @@ -335969,7 +335969,7 @@ Signed-off-by: Kieran Bingham 1 file changed, 9 insertions(+), 4 deletions(-) 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 46b8dd782c46..a08a75d3ff88 100644 +index 46b8dd782c465..a08a75d3ff88c 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -457,6 +457,8 @@ struct bcm2835_codec_ctx { @@ -336019,10 +336019,10 @@ index 46b8dd782c46..a08a75d3ff88 100644 2.18.4 -From 54769fa36ae3d84ad4ccd640f2887aaf29184068 Mon Sep 17 00:00:00 2001 +From 3f9a5054a5f78f6aad465c8b008f93227bf9e4b8 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 12:54:15 +0000 -Subject: [PATCH 0326/1216] staging: bcm2835-codec: add media controller +Subject: [PATCH 0326/1224] staging: bcm2835-codec: add media controller support Provide a single media device to contain all of the bcm2835_codec @@ -336035,7 +336035,7 @@ Signed-off-by: Kieran Bingham 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-codec/Kconfig b/drivers/staging/vc04_services/bcm2835-codec/Kconfig -index 951971b39ce0..c104be9ad6da 100644 +index 951971b39ce0e..c104be9ad6da5 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/Kconfig +++ b/drivers/staging/vc04_services/bcm2835-codec/Kconfig @@ -1,6 +1,6 @@ @@ -336047,7 +336047,7 @@ index 951971b39ce0..c104be9ad6da 100644 select BCM2835_VCHIQ_MMAL select VIDEOBUF2_DMA_CONTIG 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 a08a75d3ff88..fb99bfb5bc1d 100644 +index a08a75d3ff88c..fb99bfb5bc1df 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -458,6 +458,7 @@ struct bcm2835_codec_ctx { @@ -336191,10 +336191,10 @@ index a08a75d3ff88..fb99bfb5bc1d 100644 2.18.4 -From 0f4856f5d02611c2c4fa32b927ce35b0eb8cd672 Mon Sep 17 00:00:00 2001 +From 2d9cdf1a3a71eaaa280f642ef177003134fe7a36 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:04:51 +0100 -Subject: [PATCH 0327/1216] v4l2: Add a Greyworld AWB mode. +Subject: [PATCH 0327/1224] v4l2: Add a Greyworld AWB mode. Adds a simple greyworld white balance preset, mainly for use with cameras without an IR filter (eg Raspberry Pi NoIR) @@ -336206,7 +336206,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 2 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index cd84dbbf6a89..c7bf6f51ccdd 100644 +index cd84dbbf6a890..c7bf6f51ccddd 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -271,6 +271,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) @@ -336218,7 +336218,7 @@ index cd84dbbf6a89..c7bf6f51ccdd 100644 }; static const char * const camera_iso_sensitivity_auto[] = { diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h -index a2669b79b294..616a7c64c4d2 100644 +index a2669b79b2949..616a7c64c4d20 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -850,6 +850,7 @@ enum v4l2_auto_n_preset_white_balance { @@ -336233,10 +336233,10 @@ index a2669b79b294..616a7c64c4d2 100644 2.18.4 -From 0040c68164bb03c523d4e17831bc62ab25d44f3b Mon Sep 17 00:00:00 2001 +From c49240d8f4e52ff3d6860c4cc15635419b83902b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:13:06 +0100 -Subject: [PATCH 0328/1216] staging: bcm2835-camera: Add greyworld AWB mode +Subject: [PATCH 0328/1224] 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. @@ -336248,7 +336248,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c -index 89786c264867..296d0db6aa51 100644 +index 89786c2648679..296d0db6aa512 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c @@ -477,6 +477,10 @@ static int ctrl_set_awb_mode(struct bm2835_mmal_dev *dev, @@ -336274,7 +336274,7 @@ index 89786c264867..296d0db6aa51 100644 ctrl_set_awb_mode, false diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h -index 926392d754c7..d3d7828d1e56 100644 +index 926392d754c76..d3d7828d1e56c 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h @@ -313,6 +313,7 @@ enum mmal_parameter_awbmode { @@ -336289,10 +336289,10 @@ index 926392d754c7..d3d7828d1e56 100644 2.18.4 -From b606e48b7f38b2e2843fd33956207f4c6ae4e070 Mon Sep 17 00:00:00 2001 +From 3955ea5ba0b45d027a31eada9b44b4510d8a7f1f Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 11 Sep 2019 14:57:18 +0100 -Subject: [PATCH 0329/1216] drm/vc4: Fix for margins in composite/SDTV mode +Subject: [PATCH 0329/1224] drm/vc4: Fix for margins in composite/SDTV mode (#3223) Margins were incorrectly assumed to be setup in SDTV mode, but were @@ -336304,7 +336304,7 @@ Signed-off-by: James Hughes 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 004a0bce94ac..a487fcf1eaf3 100644 +index 004a0bce94acb..a487fcf1eaf39 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -1612,14 +1612,9 @@ vc4_fkms_connector_init(struct drm_device *dev, struct drm_encoder *encoder, @@ -336329,11 +336329,11 @@ index 004a0bce94ac..a487fcf1eaf3 100644 2.18.4 -From 3fa0203674d7236262ac0e4824d77e10b4715ddf Mon Sep 17 00:00:00 2001 +From 3eef8fe3625f0cfa3eca370b334e84aca55b3676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?= Date: Thu, 12 Sep 2019 14:57:32 +0200 -Subject: [PATCH 0330/1216] Add Hifiberry DAC+DSP soundcard driver (#3224) +Subject: [PATCH 0330/1224] 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. @@ -336349,7 +336349,7 @@ Signed-off-by: Joerg Schambacher create mode 100644 sound/soc/bcm/hifiberry_dacplusdsp.c diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index 4c38298df04b..8d50e52c1ebb 100644 +index 4c38298df04b9..8d50e52c1ebb2 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -59,6 +59,13 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO @@ -336367,7 +336367,7 @@ index 4c38298df04b..8d50e52c1ebb 100644 tristate "Support for HifiBerry Digi" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index 0e8b60f61b31..4c0486c6da0d 100644 +index 0e8b60f61b31a..4c0486c6da0da 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -16,6 +16,7 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o @@ -336387,7 +336387,7 @@ index 0e8b60f61b31..4c0486c6da0d 100644 obj-$(CONFIG_SND_BCM2708_SOC_RPI_CIRRUS) += snd-soc-rpi-cirrus.o obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c -index ed080b24eb49..cc33d4174839 100644 +index ed080b24eb494..cc33d41748396 100644 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c @@ -445,29 +445,21 @@ static struct snd_soc_ops snd_rpi_hifiberry_dacplusadcpro_ops = { @@ -336443,7 +336443,7 @@ index ed080b24eb49..cc33d4174839 100644 } diff --git a/sound/soc/bcm/hifiberry_dacplusdsp.c b/sound/soc/bcm/hifiberry_dacplusdsp.c new file mode 100644 -index 000000000000..cda7ee519093 +index 0000000000000..cda7ee5190930 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplusdsp.c @@ -0,0 +1,90 @@ @@ -336538,7 +336538,7 @@ index 000000000000..cda7ee519093 +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+DSP"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c -index 2023b0a18a2c..133b6d98f515 100644 +index 2023b0a18a2c6..133b6d98f515f 100644 --- a/sound/soc/bcm/rpi-simple-soundcard.c +++ b/sound/soc/bcm/rpi-simple-soundcard.c @@ -144,6 +144,27 @@ static struct snd_rpi_simple_drvdata drvdata_googlevoicehat = { @@ -336582,10 +336582,10 @@ index 2023b0a18a2c..133b6d98f515 100644 2.18.4 -From 71f2fa045a9aff2b29e6e6c410f2bcccb745513b Mon Sep 17 00:00:00 2001 +From 0842bfa8c90301b1051eecf9a5b345b4c5402690 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 17:24:55 +0100 -Subject: [PATCH 0331/1216] staging: bcm2835-codec: Allow height of 1920. +Subject: [PATCH 0331/1224] 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 @@ -336599,7 +336599,7 @@ Signed-off-by: Dave Stevenson 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 fb99bfb5bc1d..19d046767dbb 100644 +index fb99bfb5bc1df..19d046767dbbd 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -92,7 +92,7 @@ static const char * const components[] = { @@ -336615,10 +336615,10 @@ index fb99bfb5bc1d..19d046767dbb 100644 2.18.4 -From 358dc78259362e6f55e4c5c0aa813ec47f66a942 Mon Sep 17 00:00:00 2001 +From 8aca44c47e41e9d0fb9a4a2b19d7ab3ffda1bd4d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 15:11:47 +0100 -Subject: [PATCH 0332/1216] staging: bcm2835-codec: Correct g/s_selection API +Subject: [PATCH 0332/1224] staging: bcm2835-codec: Correct g/s_selection API MPLANE support The g_selection and s_selection API is messed up and requires @@ -336633,7 +336633,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 47 insertions(+), 20 deletions(-) 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 19d046767dbb..ce6364322266 100644 +index 19d046767dbbd..ce63643222667 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1260,17 +1260,30 @@ static int vidioc_g_selection(struct file *file, void *priv, @@ -336728,10 +336728,10 @@ index 19d046767dbb..ce6364322266 100644 2.18.4 -From 6c5e46bcb736f8c5dcf3ec4ac2c36291e5c62e90 Mon Sep 17 00:00:00 2001 +From 4c109d1a1876b7a1b89756d7155065046bf3eb90 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Sep 2019 17:22:36 +0100 -Subject: [PATCH 0333/1216] drm/v3d: Delete pm_runtime support +Subject: [PATCH 0333/1224] drm/v3d: Delete pm_runtime support The pm_runtime was blocking changelist submission, so delete it as a temporary workaround. @@ -336743,7 +336743,7 @@ Signed-off-by: Phil Elwell 2 files changed, 16 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c -index 28f8eb664a58..e6a079f4b50d 100644 +index 28f8eb664a581..e6a079f4b50db 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -478,10 +478,6 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, @@ -336766,7 +336766,7 @@ index 28f8eb664a58..e6a079f4b50d 100644 } diff --git a/drivers/gpu/drm/v3d/v3d_mmu.c b/drivers/gpu/drm/v3d/v3d_mmu.c -index 6cc67cab320e..5294dd884867 100644 +index 6cc67cab320ea..5294dd884867a 100644 --- a/drivers/gpu/drm/v3d/v3d_mmu.c +++ b/drivers/gpu/drm/v3d/v3d_mmu.c @@ -36,14 +36,6 @@ static int v3d_mmu_flush_all(struct v3d_dev *v3d) @@ -336798,10 +336798,10 @@ index 6cc67cab320e..5294dd884867 100644 2.18.4 -From 269fd409b77fbb8d8e7de29ab49a842727a41b4e Mon Sep 17 00:00:00 2001 +From 6d1b770b81acb022a8d4ad9e51c6ff91230b3efb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 19 Sep 2019 13:39:15 +0100 -Subject: [PATCH 0334/1216] configs: Regenerate defconfigs +Subject: [PATCH 0334/1224] configs: Regenerate defconfigs Signed-off-by: Phil Elwell --- @@ -336809,7 +336809,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 33686cf34ff9..4719d38c4b4e 100644 +index 33686cf34ff9c..4719d38c4b4e5 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1303,7 +1303,6 @@ CONFIG_VIDEO_CODEC_BCM2835=m @@ -336824,10 +336824,10 @@ index 33686cf34ff9..4719d38c4b4e 100644 2.18.4 -From 62cd8262fd4fc27c9444aa2352a418a0f5a2094a Mon Sep 17 00:00:00 2001 +From 2df1afb3e90e61ca31e80749f2793763b160ded7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Sep 2019 09:02:10 +0100 -Subject: [PATCH 0335/1216] dts: Add DTS for Pi 2B rev 1.2 with BCM2837 (#3235) +Subject: [PATCH 0335/1224] dts: Add DTS for Pi 2B rev 1.2 with BCM2837 (#3235) Signed-off-by: Phil Elwell --- @@ -336837,7 +336837,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index 1004a9fb8bf4..c3eaf8d63ee4 100644 +index 1004a9fb8bf45..c3eaf8d63ee4a 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -3,7 +3,9 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-a-plus.dtb \ @@ -336852,7 +336852,7 @@ index 1004a9fb8bf4..c3eaf8d63ee4 100644 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts new file mode 100644 -index 000000000000..116cdbf94b9b +index 0000000000000..116cdbf94b9b0 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts @@ -0,0 +1,3 @@ @@ -336863,10 +336863,10 @@ index 000000000000..116cdbf94b9b 2.18.4 -From 5c51ebe9cd05a785d942b4f551c31b4f76436418 Mon Sep 17 00:00:00 2001 +From 55d709d2587ef35df03db646e3ff3d62b676782f Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 3 Sep 2019 08:45:24 +0200 -Subject: [PATCH 0336/1216] drm/v3d: clean caches at the end of render jobs on +Subject: [PATCH 0336/1224] 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 @@ -336891,7 +336891,7 @@ Signed-off-by: Iago Toral Quiroga 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index 00e4419dc208..72da17e4963e 100644 +index 00e4419dc208e..72da17e4963ee 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -120,6 +120,9 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, @@ -336905,7 +336905,7 @@ index 00e4419dc208..72da17e4963e 100644 DRM_DEBUG("Unknown parameter %d\n", args->param); return -EINVAL; diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c -index e6a079f4b50d..035de14066d0 100644 +index e6a079f4b50db..035de14066d0b 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -565,13 +565,16 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, @@ -337003,7 +337003,7 @@ index e6a079f4b50d..035de14066d0 100644 return ret; } diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h -index 58fbe48c91e9..b8c6f9d90942 100644 +index 58fbe48c91e90..b8c6f9d909424 100644 --- a/include/uapi/drm/v3d_drm.h +++ b/include/uapi/drm/v3d_drm.h @@ -48,6 +48,8 @@ extern "C" { @@ -337037,10 +337037,10 @@ index 58fbe48c91e9..b8c6f9d90942 100644 2.18.4 -From 90e19971d96f5a117455558d519aa142f4596bf5 Mon Sep 17 00:00:00 2001 +From 4988fd3b482940c8591ac225e8a09ac93d63d7a8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 23 Sep 2019 09:26:41 +0100 -Subject: [PATCH 0337/1216] kbuild: Allow .dtbo overlays to be built piecemeal +Subject: [PATCH 0337/1224] kbuild: Allow .dtbo overlays to be built piecemeal Before 4.20, it was possible to build an arbitrary overlay by copying it to arm/boot/dts/overlays/mytest-overlay.dts and running: @@ -337062,7 +337062,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile -index 450ebe152806..1fddee1ede06 100644 +index 7a47a2594f957..f67764a2f8693 100644 --- a/Makefile +++ b/Makefile @@ -1267,6 +1267,9 @@ ifneq ($(dtstree),) @@ -337079,10 +337079,10 @@ index 450ebe152806..1fddee1ede06 100644 2.18.4 -From ff89cde627da6b9621466c7a479c998ea0ef14d5 Mon Sep 17 00:00:00 2001 +From 61c1df9f21c2422172d258330ce0174a33c5786a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 25 Sep 2019 09:49:58 +0100 -Subject: [PATCH 0338/1216] dma-direct: Temporary DMA fix on arm64 +Subject: [PATCH 0338/1224] dma-direct: Temporary DMA fix on arm64 See: https://github.com/raspberrypi/linux/issues/3251 @@ -337092,7 +337092,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c -index 0a093a675b63..d2b462835469 100644 +index 0a093a675b632..d2b4628354698 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -398,7 +398,7 @@ int dma_direct_supported(struct device *dev, u64 mask) @@ -337108,10 +337108,10 @@ index 0a093a675b63..d2b462835469 100644 2.18.4 -From 57d8d417bb1ad72c47d36f5b82006f4ea0276d3f Mon Sep 17 00:00:00 2001 +From c7af8adaf295a1a119544bec2e77c845f4b7025c Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 19 Sep 2019 20:45:30 +0200 -Subject: [PATCH 0339/1216] ARM: bcm: Switch board, clk and pinctrl to bcm2711 +Subject: [PATCH 0339/1224] ARM: bcm: Switch board, clk and pinctrl to bcm2711 compatible After the decision to use bcm2711 compatible for upstream, we should @@ -337124,7 +337124,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 282a023027fc..e538e0f899a5 100644 +index 282a023027fc0..e538e0f899a58 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -109,7 +109,7 @@ static const char * const bcm2835_compat[] = { @@ -337140,10 +337140,10 @@ index 282a023027fc..e538e0f899a5 100644 2.18.4 -From c15ce6260f6f4dc1735156e027238da825acc94a Mon Sep 17 00:00:00 2001 +From ac92454a5aaaa36d3d983520245c97a3d0b55326 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 21 Jul 2019 16:01:36 +0200 -Subject: [PATCH 0340/1216] pinctrl: bcm2835: Add support for BCM2711 pull-up +Subject: [PATCH 0340/1224] pinctrl: bcm2835: Add support for BCM2711 pull-up functionality commit e38a9a437fb93ddafab5030165e4c6a3a5021669 upstream. @@ -337166,7 +337166,7 @@ Acked-by: Eric Anholt 1 file changed, 6 insertions(+) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -index 76fad11f2ad8..3cd4c4f1a47c 100644 +index 76fad11f2ad82..3cd4c4f1a47c2 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -1168,6 +1168,12 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) @@ -337186,10 +337186,10 @@ index 76fad11f2ad8..3cd4c4f1a47c 100644 2.18.4 -From b2f485ee6f92ed19c7de1df1f1201a586a108f5d Mon Sep 17 00:00:00 2001 +From 20e2bb2304e1a80a31155fbc6ebf119ea7e9ca05 Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Sun, 6 Oct 2019 03:23:15 +0200 -Subject: [PATCH 0341/1216] vchiq_2835_arm: suppress warning +Subject: [PATCH 0341/1224] vchiq_2835_arm: suppress warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -337208,7 +337208,7 @@ Signed-off-by: Matteo Croce 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c -index 230e1b1144a9..2dfdee1f814f 100644 +index 230e1b1144a9d..2dfdee1f814f1 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -255,7 +255,7 @@ vchiq_prepare_bulk_data(struct vchiq_bulk *bulk, void *offset, int size, @@ -337224,10 +337224,10 @@ index 230e1b1144a9..2dfdee1f814f 100644 2.18.4 -From 8a6eba15997de13430fdb850205cfd2c3918d104 Mon Sep 17 00:00:00 2001 +From cfeb64b06e54b2ab4e9372fb7532fa519be68d4c Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 24 Sep 2019 18:26:55 +0100 -Subject: [PATCH 0342/1216] Rename HDMI ALSA device names, check for enable +Subject: [PATCH 0342/1224] Rename HDMI ALSA device names, check for enable state HDMI Alsa devices renamed to match names used by DRM, to @@ -337247,7 +337247,7 @@ Signed-off-by: James Hughes 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index 4d5b99d8ae9d..2f465dba54bf 100644 +index 4d5b99d8ae9dc..2f465dba54bfc 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -9,8 +9,9 @@ @@ -337370,10 +337370,10 @@ index 4d5b99d8ae9d..2f465dba54bf 100644 2.18.4 -From 6824d4c9fbcf77c1d9ced9380a282a02a56ecb2e Mon Sep 17 00:00:00 2001 +From 96fb54f6618ad2b255f15a009945ec918305ae30 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Fri, 4 Oct 2019 16:41:30 +0200 -Subject: [PATCH 0343/1216] pcie-brcmstb-bounce64.c: dev_err() -> dev_info() +Subject: [PATCH 0343/1224] pcie-brcmstb-bounce64.c: dev_err() -> dev_info() for info messages "dmabounce: initialised" is not an error, so do not log it as such. @@ -337385,7 +337385,7 @@ Closes #3266 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c -index 6a872975ba9e..ac8dde3c030b 100644 +index 6a872975ba9e1..ac8dde3c030b7 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c @@ -517,7 +517,7 @@ int brcm_pcie_bounce_init(struct device *dev, @@ -337401,10 +337401,10 @@ index 6a872975ba9e..ac8dde3c030b 100644 2.18.4 -From 22f1e19212519dd36330c98a9f53a4d45ca4b58a Mon Sep 17 00:00:00 2001 +From 35a691552beb78c8f2a557def752425a2c5a8429 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Sep 2019 18:28:17 +0100 -Subject: [PATCH 0344/1216] drm/vc4: Add support for YUV color encodings and +Subject: [PATCH 0344/1224] drm/vc4: Add support for YUV color encodings and ranges The BT601/BT709 color encoding and limited vs full @@ -337420,7 +337420,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 5e5f90810aca..1c5eef3ac441 100644 +index 5e5f90810acaf..1c5eef3ac4415 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -577,6 +577,53 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state) @@ -337516,7 +337516,7 @@ index 5e5f90810aca..1c5eef3ac441 100644 return plane; } diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h -index b5a6b4cdd332..8416fdaf2ec4 100644 +index b5a6b4cdd3328..8416fdaf2ec47 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -950,6 +950,7 @@ enum hvs_pixel_format { @@ -337547,10 +337547,10 @@ index b5a6b4cdd332..8416fdaf2ec4 100644 2.18.4 -From f8c38c204be08c18b50702e3f6bd52dfa138090c Mon Sep 17 00:00:00 2001 +From 935f37e6837a05bfb76d732a18a78b26d3445915 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Sep 2019 18:36:32 +0100 -Subject: [PATCH 0345/1216] drm/vc4: Add support for H & V flips +Subject: [PATCH 0345/1224] drm/vc4: Add support for H & V flips The HVS supports horizontal and vertical flips whilst composing. @@ -337562,7 +337562,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 1c5eef3ac441..f21c03f550e5 100644 +index 1c5eef3ac4415..f21c03f550e58 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -637,6 +637,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, @@ -337659,10 +337659,10 @@ index 1c5eef3ac441..f21c03f550e5 100644 2.18.4 -From fd352b403b661513664446dee5b7be77eab5b78d Mon Sep 17 00:00:00 2001 +From 1a2ba80072d667adc4391d19fd0b5dfed81b25da Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 18 Sep 2019 15:49:13 +0100 -Subject: [PATCH 0346/1216] drm/vc4: Correct handling of rotation parameter in +Subject: [PATCH 0346/1224] drm/vc4: Correct handling of rotation parameter in fkms One bit within DRM_MODE_ROTATE_MASK will always be set to @@ -337678,7 +337678,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index a487fcf1eaf3..f3ec265a9798 100644 +index a487fcf1eaf39..f3ec265a9798d 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -82,11 +82,6 @@ struct set_plane { @@ -337751,10 +337751,10 @@ index a487fcf1eaf3..f3ec265a9798 100644 2.18.4 -From a8e3d268a782b8cc7c6ffaea0941fd53453e2427 Mon Sep 17 00:00:00 2001 +From 9af8c5d615462865b7474ce7715ca3c7426d0c0a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 9 Oct 2019 17:22:07 +0100 -Subject: [PATCH 0347/1216] bcm2711: Retain support for old dtbs +Subject: [PATCH 0347/1224] 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 @@ -337771,7 +337771,7 @@ Signed-off-by: Phil Elwell 3 files changed, 9 insertions(+) diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index e538e0f899a5..0ec49d857134 100644 +index e538e0f899a58..0ec49d8571340 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -110,6 +110,8 @@ static const char * const bcm2835_compat[] = { @@ -337784,7 +337784,7 @@ index e538e0f899a5..0ec49d857134 100644 NULL }; diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index f1d73d83ee16..3921480d89fd 100644 +index f1d73d83ee16b..3921480d89fdd 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -2391,6 +2391,8 @@ static const struct cprman_plat_data cprman_bcm2711_plat_data = { @@ -337797,7 +337797,7 @@ index f1d73d83ee16..3921480d89fd 100644 }; MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match); diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -index 3cd4c4f1a47c..e77c3ea15fde 100644 +index 3cd4c4f1a47c2..e77c3ea15fdea 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -1078,6 +1078,11 @@ static const struct of_device_id bcm2835_pinctrl_match[] = { @@ -337816,10 +337816,10 @@ index 3cd4c4f1a47c..e77c3ea15fde 100644 2.18.4 -From 1fc4c84fed178544797699dcacbf65c3bea333d0 Mon Sep 17 00:00:00 2001 +From 8e89efb2400e30bcb09a32da27a57f796385a471 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Thu, 10 Oct 2019 19:12:08 +0200 -Subject: [PATCH 0348/1216] dt-bindings: Add binding for the Infineon IRS1125 +Subject: [PATCH 0348/1224] dt-bindings: Add binding for the Infineon IRS1125 sensor Adds a binding for the Infineon IRS1125 time-of-flight depth @@ -337833,7 +337833,7 @@ Signed-off-by: Markus Proeller diff --git a/Documentation/devicetree/bindings/media/i2c/irs1125.txt b/Documentation/devicetree/bindings/media/i2c/irs1125.txt new file mode 100644 -index 000000000000..25a48028c957 +index 0000000000000..25a48028c9577 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/irs1125.txt @@ -0,0 +1,48 @@ @@ -337889,10 +337889,10 @@ index 000000000000..25a48028c957 2.18.4 -From 9468ad3d08cd6af2b52bbd2978770be6e20d302a Mon Sep 17 00:00:00 2001 +From 1217c65764878cc001ac7e8503bb14ca6a506409 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Thu, 10 Oct 2019 19:12:36 +0200 -Subject: [PATCH 0349/1216] media: i2c: Add a driver for the Infineon IRS1125 +Subject: [PATCH 0349/1224] media: i2c: Add a driver for the Infineon IRS1125 depth sensor The Infineon IRS1125 is a time of flight depth sensor that @@ -337911,7 +337911,7 @@ Signed-off-by: Markus Proeller create mode 100644 drivers/media/i2c/irs1125.h diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index b28b82953e69..e57406240288 100644 +index b28b82953e692..e57406240288d 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -850,6 +850,18 @@ config VIDEO_OV13858 @@ -337934,7 +337934,7 @@ index b28b82953e69..e57406240288 100644 tristate "ST VS6624 sensor support" depends on VIDEO_V4L2 && I2C diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index f461e6694f06..52e4c4026307 100644 +index f461e6694f064..52e4c40263075 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -82,6 +82,7 @@ obj-$(CONFIG_VIDEO_OV8856) += ov8856.o @@ -337947,7 +337947,7 @@ index f461e6694f06..52e4c4026307 100644 obj-$(CONFIG_VIDEO_MT9M111) += mt9m111.o diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c new file mode 100644 -index 000000000000..25e1dd5a08ef +index 0000000000000..25e1dd5a08efa --- /dev/null +++ b/drivers/media/i2c/irs1125.c @@ -0,0 +1,1112 @@ @@ -339065,7 +339065,7 @@ index 000000000000..25e1dd5a08ef + diff --git a/drivers/media/i2c/irs1125.h b/drivers/media/i2c/irs1125.h new file mode 100644 -index 000000000000..dccaca23aa76 +index 0000000000000..dccaca23aa76a --- /dev/null +++ b/drivers/media/i2c/irs1125.h @@ -0,0 +1,61 @@ @@ -339134,10 +339134,10 @@ index 000000000000..dccaca23aa76 2.18.4 -From 26dc97e0ba9a3564aff3e103520cf8698e0f6620 Mon Sep 17 00:00:00 2001 +From d28ef16111bf1422c74be6a63d90f777377cdabd Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 17:19:33 +0100 -Subject: [PATCH 0350/1216] staging:bcm2835-codec: Add support for +Subject: [PATCH 0350/1224] staging:bcm2835-codec: Add support for ENUM_FRAMESIZES Required for compliance testing for the encoder. @@ -339148,7 +339148,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 44 insertions(+), 4 deletions(-) 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 ce6364322266..09d662d1dee3 100644 +index ce63643222667..09d662d1dee33 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -496,9 +496,10 @@ struct bcm2835_codec_fmt *get_default_format(struct bcm2835_codec_dev *dev, @@ -339238,10 +339238,10 @@ index ce6364322266..09d662d1dee3 100644 2.18.4 -From 141a27780b035f764cce0da042903bb322f62a3c Mon Sep 17 00:00:00 2001 +From d8e733dd739ebf1d4b8b07d6d5dc86f881d8409d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 17:22:08 +0100 -Subject: [PATCH 0351/1216] staging: bcm2835-codec: Correct buffer type check +Subject: [PATCH 0351/1224] staging: bcm2835-codec: Correct buffer type check on G_PARM The output queue buffer type is now OUTPUT_MPLANE. @@ -339253,7 +339253,7 @@ Signed-off-by: Dave Stevenson 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 09d662d1dee3..a0d4b0d006c6 100644 +index 09d662d1dee33..a0d4b0d006c64 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1438,7 +1438,7 @@ static int vidioc_g_parm(struct file *file, void *priv, @@ -339269,10 +339269,10 @@ index 09d662d1dee3..a0d4b0d006c6 100644 2.18.4 -From 0d9fc88e5862ee621cc387c41665c98ea26550b2 Mon Sep 17 00:00:00 2001 +From 309cdf513ec1002dfd796fa905263ef6c4f897e9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 17:23:26 +0100 -Subject: [PATCH 0352/1216] staging: bcm2835-codec: Set default and error check +Subject: [PATCH 0352/1224] staging: bcm2835-codec: Set default and error check timeperframe G_PARM default was invalid as 0/0, and the driver didn't check @@ -339284,7 +339284,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+) 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 a0d4b0d006c6..41fca575b395 100644 +index a0d4b0d006c64..41fca575b3952 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1423,6 +1423,10 @@ static int vidioc_s_parm(struct file *file, void *priv, @@ -339312,10 +339312,10 @@ index a0d4b0d006c6..41fca575b395 100644 2.18.4 -From 2f315235a9f9fce4e79abf90931cdcf5385b00b9 Mon Sep 17 00:00:00 2001 +From 3b57a3583152d7e6e65a283fa4c4ad47928f940b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 7 Oct 2019 14:02:57 +0100 -Subject: [PATCH 0353/1216] staging: bcm2835-codec: Fix imbalance in +Subject: [PATCH 0353/1224] staging: bcm2835-codec: Fix imbalance in dma_buf_get/dma_buf_put When represented with a dmabuf buffer that had previously been @@ -339329,7 +339329,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 5 insertions(+) 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 41fca575b395..f5adaac765cd 100644 +index 41fca575b3952..f5adaac765cdf 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -2112,6 +2112,11 @@ static int bcm2835_codec_buf_prepare(struct vb2_buffer *vb) @@ -339348,10 +339348,10 @@ index 41fca575b395..f5adaac765cd 100644 2.18.4 -From e4bc0f4aace8ca7b1b9f92c5e0e756b3f7b3aa59 Mon Sep 17 00:00:00 2001 +From 8a9390691ad3c802d4214072ce7ccae64b860723 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 16 Oct 2019 14:49:23 +0100 -Subject: [PATCH 0354/1216] drm:vc4 Added calls for firmware display +Subject: [PATCH 0354/1224] drm:vc4 Added calls for firmware display blank/unblank Requires new display power mailbox call to be present. @@ -339363,7 +339363,7 @@ Signed-off-by: James Hughes 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index f3ec265a9798..b0c1096efbe5 100644 +index f3ec265a9798d..b0c1096efbe59 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -94,6 +94,12 @@ struct mailbox_blank_display { @@ -339428,7 +339428,7 @@ index f3ec265a9798..b0c1096efbe5 100644 drm_encoder_init(drm, &vc4_encoder->base, &vc4_fkms_encoder_funcs, diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index 102c2e5dd2f2..ae71820af8e5 100644 +index 102c2e5dd2f2c..ae71820af8e59 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -153,7 +153,7 @@ enum rpi_firmware_property_tag { @@ -339444,17 +339444,17 @@ index 102c2e5dd2f2..ae71820af8e5 100644 2.18.4 -From ee99983436db2675fc7713a369b12c1c762fa68b Mon Sep 17 00:00:00 2001 +From 47ede0b7c0aee8639d69fdb21f835ad4705a2269 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 4 Nov 2019 00:52:35 +0000 -Subject: [PATCH 0355/1216] configs: Rebuild with savedefconfig +Subject: [PATCH 0355/1224] configs: Rebuild with savedefconfig --- arch/arm/configs/bcm2711_defconfig | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index ec25f919fe4b..0775637872ca 100644 +index ec25f919fe4b9..0775637872ca7 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -403,7 +403,6 @@ CONFIG_DEVTMPFS=y @@ -339518,10 +339518,10 @@ index ec25f919fe4b..0775637872ca 100644 2.18.4 -From 8706aa1f0d032e677a52b83045b4ed05ecd1b8ae Mon Sep 17 00:00:00 2001 +From 8f75c14d23c305b970f774b04df8fed953614cb7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 Nov 2019 11:28:19 +0000 -Subject: [PATCH 0356/1216] Revert "pinctrl: bcm2835: Pass irqchip when adding +Subject: [PATCH 0356/1224] Revert "pinctrl: bcm2835: Pass irqchip when adding gpiochip" This reverts commit 73345a18d464b1b945b29f54f630ace6873344e2. @@ -339530,7 +339530,7 @@ This reverts commit 73345a18d464b1b945b29f54f630ace6873344e2. 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -index e77c3ea15fde..4ce2dd704c13 100644 +index e77c3ea15fdea..4ce2dd704c130 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -78,6 +78,7 @@ @@ -339631,10 +339631,10 @@ index e77c3ea15fde..4ce2dd704c13 100644 2.18.4 -From 88d8a41cc41d20ce41ca40935608d3e1d15eabdd Mon Sep 17 00:00:00 2001 +From 568cb2bce3e0e83b1d6b628d67d82426c0056893 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Nov 2019 14:01:41 +0000 -Subject: [PATCH 0357/1216] drm/v3d: Don't clear MMU control bits on exception +Subject: [PATCH 0357/1224] 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 @@ -339652,7 +339652,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c -index 662e67279a7b..fe2060c6b495 100644 +index 662e67279a7bb..fe2060c6b495a 100644 --- a/drivers/gpu/drm/v3d/v3d_irq.c +++ b/drivers/gpu/drm/v3d/v3d_irq.c @@ -178,10 +178,7 @@ v3d_hub_irq(int irq, void *arg) @@ -339671,10 +339671,10 @@ index 662e67279a7b..fe2060c6b495 100644 2.18.4 -From 3af9cc7a2d394fe8c1175d9893fec6818888e01b Mon Sep 17 00:00:00 2001 +From 8c296ab6e56447b0b576c94e4aa824ef39588d33 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Nov 2019 20:18:08 +0000 -Subject: [PATCH 0358/1216] drm/v3d: Suppress all but the first MMU error +Subject: [PATCH 0358/1224] 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. @@ -339685,7 +339685,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c -index fe2060c6b495..7dde90d846f1 100644 +index fe2060c6b495a..7dde90d846f19 100644 --- a/drivers/gpu/drm/v3d/v3d_irq.c +++ b/drivers/gpu/drm/v3d/v3d_irq.c @@ -177,6 +177,7 @@ v3d_hub_irq(int irq, void *arg) @@ -339716,10 +339716,10 @@ index fe2060c6b495..7dde90d846f1 100644 2.18.4 -From 44dff2f69edd944bb3a9b5774548046f538e5103 Mon Sep 17 00:00:00 2001 +From 5649796126f1fdfeadcebbe237df962fde0e424c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 Nov 2019 16:41:21 +0000 -Subject: [PATCH 0359/1216] drm/v3d: Plug dma_fence leak +Subject: [PATCH 0359/1224] 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 @@ -339733,7 +339733,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c -index 035de14066d0..8b5dc2b20e38 100644 +index 035de14066d0b..8b5dc2b20e387 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -410,6 +410,9 @@ v3d_job_free(struct kref *ref) @@ -339750,10 +339750,10 @@ index 035de14066d0..8b5dc2b20e38 100644 2.18.4 -From 79973a7f6a736d2195c2e0de946636a254658ca0 Mon Sep 17 00:00:00 2001 +From baa2aacf729eb924f070f62ce97b970ee0046fcc Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:57:48 +0000 -Subject: [PATCH 0360/1216] staging: vchiq_arm: Register vcsm-cma as a platform +Subject: [PATCH 0360/1224] staging: vchiq_arm: Register vcsm-cma as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, @@ -339765,7 +339765,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 insertions(+) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 4e684ccd9346..2b859b98e17b 100644 +index 4e684ccd9346a..2b859b98e17ba 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -140,6 +140,7 @@ static struct class *vchiq_class; @@ -339796,10 +339796,10 @@ index 4e684ccd9346..2b859b98e17b 100644 2.18.4 -From 587304b36f2436fbc5724bbf2a74b0058ad72daa Mon Sep 17 00:00:00 2001 +From d2f0af0dc3b74deac2184689a73330e0a9d057ac Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:57:58 +0000 -Subject: [PATCH 0361/1216] staging: vchiq_arm: Register bcm2835-codec as a +Subject: [PATCH 0361/1224] staging: vchiq_arm: Register bcm2835-codec as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, @@ -339811,7 +339811,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 insertions(+) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 2b859b98e17b..1e8b2c460783 100644 +index 2b859b98e17ba..1e8b2c460783c 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -140,6 +140,7 @@ static struct class *vchiq_class; @@ -339842,10 +339842,10 @@ index 2b859b98e17b..1e8b2c460783 100644 2.18.4 -From 89fbdd780b626b6a18b9ea7e0e0dd2bb322bee4b Mon Sep 17 00:00:00 2001 +From f91a5f474a8037447a01e3075ee5cb6842e4d68f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:58:08 +0000 -Subject: [PATCH 0362/1216] staging: bcm2835-codec: Fix potential memory leak +Subject: [PATCH 0362/1224] staging: bcm2835-codec: Fix potential memory leak of isp instance "d867785 staging: bcm2835-codec: add media controller support" added @@ -339859,7 +339859,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+) 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 f5adaac765cd..50395795c3db 100644 +index f5adaac765cdf..50395795c3dba 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -2841,6 +2841,10 @@ static int bcm2835_codec_probe(struct platform_device *pdev) @@ -339877,10 +339877,10 @@ index f5adaac765cd..50395795c3db 100644 2.18.4 -From 2b063bce2dd64fa22c7cdad0dc26d7941ec8c0ff Mon Sep 17 00:00:00 2001 +From 902c5d41066e191d49690eff0ee3cb2702a8eb81 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 Nov 2019 13:58:18 +0000 -Subject: [PATCH 0363/1216] staging: vchiq_arm: Unify the unload handling of +Subject: [PATCH 0363/1224] staging: vchiq_arm: Unify the unload handling of platform devs A helper function vchiq_register_child was added to deal with @@ -339895,7 +339895,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 1e8b2c460783..d9492e24e07d 100644 +index 1e8b2c460783c..d9492e24e07d0 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -3269,8 +3269,7 @@ static int vchiq_probe(struct platform_device *pdev) @@ -339912,10 +339912,10 @@ index 1e8b2c460783..d9492e24e07d 100644 2.18.4 -From 44630555970ab34243f0a16caaf1bb09acfbb876 Mon Sep 17 00:00:00 2001 +From d6c77371176b15bedf94576852175ff7a27454c4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Nov 2019 11:59:01 +0000 -Subject: [PATCH 0364/1216] net: bcmgenet: The second IRQ is optional +Subject: [PATCH 0364/1224] 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. @@ -339926,7 +339926,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c -index 7dde90d846f1..586fb850f00f 100644 +index 7dde90d846f19..586fb850f00fe 100644 --- a/drivers/gpu/drm/v3d/v3d_irq.c +++ b/drivers/gpu/drm/v3d/v3d_irq.c @@ -217,7 +217,7 @@ v3d_irq_init(struct v3d_dev *v3d) @@ -339942,10 +339942,10 @@ index 7dde90d846f1..586fb850f00f 100644 2.18.4 -From 3e2bc771fcd52ac36ac8ba0d6f514e53282a6e32 Mon Sep 17 00:00:00 2001 +From ac10d17bfef8e5e7afc52115765c6f2d8748c9c8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Nov 2019 12:00:43 +0000 -Subject: [PATCH 0365/1216] drm/v3d: The third IRQ is optional +Subject: [PATCH 0365/1224] 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. @@ -339956,7 +339956,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 35816fe2ffd9..aba145a144b4 100644 +index 35816fe2ffd95..aba145a144b46 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3473,7 +3473,7 @@ static int bcmgenet_probe(struct platform_device *pdev) @@ -339972,10 +339972,10 @@ index 35816fe2ffd9..aba145a144b4 100644 2.18.4 -From f848b52748c5afba986132b0fec2546bb2d4ea62 Mon Sep 17 00:00:00 2001 +From 78f526821c09b9f0a1f3146ee0e4f300cb702165 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 15 Nov 2019 08:48:08 +0000 -Subject: [PATCH 0366/1216] dwc_otg: Declare DMA capability with HCD_DMA flag +Subject: [PATCH 0366/1224] 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 @@ -339989,7 +339989,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c -index 9a150d6fdeb4..70cce7abfb8d 100644 +index 9a150d6fdeb43..70cce7abfb8d8 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c @@ -138,7 +138,7 @@ static struct hc_driver dwc_otg_hc_driver = { @@ -340005,10 +340005,10 @@ index 9a150d6fdeb4..70cce7abfb8d 100644 2.18.4 -From 25b7802fe15de0ec9bde8a55aa6757e51ba0e3a3 Mon Sep 17 00:00:00 2001 +From 7c27a355bb269b6134549979f18af85f2a22c095 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 31 Oct 2019 13:37:16 +0000 -Subject: [PATCH 0367/1216] rpi-poe-fan: fix def_pwm1 writes +Subject: [PATCH 0367/1224] rpi-poe-fan: fix def_pwm1 writes Signed-off-by: Serge Schneider --- @@ -340016,7 +340016,7 @@ Signed-off-by: Serge Schneider 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwmon/rpi-poe-fan.c b/drivers/hwmon/rpi-poe-fan.c -index 3effaf2eb86d..c9654e9e9f2d 100644 +index 3effaf2eb86db..c9654e9e9f2d0 100644 --- a/drivers/hwmon/rpi-poe-fan.c +++ b/drivers/hwmon/rpi-poe-fan.c @@ -110,7 +110,7 @@ static int __set_def_pwm(struct rpi_poe_fan_ctx *ctx, u32 def_pwm) @@ -340032,10 +340032,10 @@ index 3effaf2eb86d..c9654e9e9f2d 100644 2.18.4 -From b5bf87d3b39f89ad72c445805e58b782ae13cbbb Mon Sep 17 00:00:00 2001 +From 21b06dfb4c20490e13ad73a9e1d95e16968f6525 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 31 Oct 2019 14:39:44 +0000 -Subject: [PATCH 0368/1216] net:phy:2711 Allow ethernet LED mode to be set via +Subject: [PATCH 0368/1224] net:phy:2711 Allow ethernet LED mode to be set via device tree Add device tree entries and code to allow the specification of @@ -340050,7 +340050,7 @@ Signed-off-by: James Hughes 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index ccdc274665c0..6ce9a58a6ed5 100644 +index ccdc274665c09..6ce9a58a6ed57 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -334,5 +334,8 @@ @@ -340063,7 +340063,7 @@ index ccdc274665c0..6ce9a58a6ed5 100644 }; }; diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index a8614cc3ad6a..88615a5afdb6 100644 +index a8614cc3ad6ae..88615a5afdb65 100644 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -380,6 +380,7 @@ @@ -340075,7 +340075,7 @@ index a8614cc3ad6a..88615a5afdb6 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 8ce8cf05a2c8..00a70a49a352 100644 +index 8ce8cf05a2c86..00a70a49a3524 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -102,26 +102,38 @@ Params: @@ -340126,7 +340126,7 @@ index 8ce8cf05a2c8..00a70a49a352 100644 i2c_arm Set to "on" to enable the ARM's i2c interface (default "off") diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index f5881fb95a5b..8f26eaf2280c 100644 +index f5881fb95a5bf..8f26eaf2280c9 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -283,6 +283,9 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) @@ -340163,10 +340163,10 @@ index f5881fb95a5b..8f26eaf2280c 100644 2.18.4 -From b6756f2633cf84392d65a9eed647c5d792d4e566 Mon Sep 17 00:00:00 2001 +From f85a908f494e0b27c94c84ff5b5937f18759fb9b Mon Sep 17 00:00:00 2001 From: Pierre-jean Texier Date: Wed, 6 Nov 2019 10:00:43 +0100 -Subject: [PATCH 0369/1216] overlays: smi: fix typo in comment (#3320) +Subject: [PATCH 0369/1224] overlays: smi: fix typo in comment (#3320) 5 represent alt1 function not alt0. @@ -340176,7 +340176,7 @@ Signed-off-by: Pierre-Jean Texier 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/smi-overlay.dts b/arch/arm/boot/dts/overlays/smi-overlay.dts -index 70104c11627c..bb8c7830df23 100644 +index 70104c11627cf..bb8c7830df23f 100644 --- a/arch/arm/boot/dts/overlays/smi-overlay.dts +++ b/arch/arm/boot/dts/overlays/smi-overlay.dts @@ -24,7 +24,7 @@ @@ -340192,10 +340192,10 @@ index 70104c11627c..bb8c7830df23 100644 2.18.4 -From f365a233572122be9e79fa5af7cfe62ddd0439b9 Mon Sep 17 00:00:00 2001 +From 339bb6af3f93b823e0a6df80f885479fce9d1609 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 7 Nov 2019 14:59:59 +0000 -Subject: [PATCH 0370/1216] net:phy:2711 Change the default ethernet LED +Subject: [PATCH 0370/1224] net:phy:2711 Change the default ethernet LED actions This should return default behaviour back to that of previous @@ -340205,7 +340205,7 @@ releases. 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 8f26eaf2280c..ed394d48ea24 100644 +index 8f26eaf2280c9..ed394d48ea247 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -284,7 +284,7 @@ static int bcm54xx_config_init(struct phy_device *phydev) @@ -340232,10 +340232,10 @@ index 8f26eaf2280c..ed394d48ea24 100644 2.18.4 -From 2c4850b06f360baf669d0395a533364bc35b29f1 Mon Sep 17 00:00:00 2001 +From d100dd9248b7fd00da060232c6ca7a92e7eef78f Mon Sep 17 00:00:00 2001 From: Michael Kaplan Date: Fri, 8 Nov 2019 10:35:57 +0100 -Subject: [PATCH 0371/1216] overlays: Add apds9960 overlay +Subject: [PATCH 0371/1224] 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. @@ -340249,7 +340249,7 @@ Signed-off-by: Michael Kaplan create mode 100644 arch/arm/boot/dts/overlays/apds9960-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index e9cd9722bb94..f7f5f0c3d464 100644 +index e9cd9722bb94b..f7f5f0c3d4640 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -15,6 +15,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -340261,7 +340261,7 @@ index e9cd9722bb94..f7f5f0c3d464 100644 at86rf233.dtbo \ audioinjector-addons.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 00a70a49a352..bacebaaac9d3 100644 +index 00a70a49a3524..bacebaaac9d3e 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -441,6 +441,14 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec @@ -340281,7 +340281,7 @@ index 00a70a49a352..bacebaaac9d3 100644 Load: dtoverlay=applepi-dac diff --git a/arch/arm/boot/dts/overlays/apds9960-overlay.dts b/arch/arm/boot/dts/overlays/apds9960-overlay.dts new file mode 100644 -index 000000000000..c216932278ab +index 0000000000000..c216932278ab7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/apds9960-overlay.dts @@ -0,0 +1,57 @@ @@ -340346,10 +340346,10 @@ index 000000000000..c216932278ab 2.18.4 -From 3b42e2417610597976b29ce5c9b65dfb8f9127a1 Mon Sep 17 00:00:00 2001 +From d723532cf3f7ecb37c07fb7f19f0c75dccc5ebe8 Mon Sep 17 00:00:00 2001 From: Michael Kaplan Date: Fri, 8 Nov 2019 11:13:25 +0100 -Subject: [PATCH 0372/1216] configs: apds9960: add module to defconfigs +Subject: [PATCH 0372/1224] configs: apds9960: add module to defconfigs Signed-off-by: Michael Kaplan --- @@ -340361,7 +340361,7 @@ Signed-off-by: Michael Kaplan 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index fbaccfbd0ed3..1e5ac31fc8cb 100644 +index fbaccfbd0ed3a..1e5ac31fc8cb6 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1294,6 +1294,7 @@ CONFIG_DHT11=m @@ -340373,7 +340373,7 @@ index fbaccfbd0ed3..1e5ac31fc8cb 100644 CONFIG_VEML6070=m CONFIG_BMP280=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 0775637872ca..5f08fcdb02b1 100644 +index 0775637872ca7..5f08fcdb02b19 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1280,6 +1280,7 @@ CONFIG_DHT11=m @@ -340385,7 +340385,7 @@ index 0775637872ca..5f08fcdb02b1 100644 CONFIG_VEML6070=m CONFIG_BMP280=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index b4f93d8fd86f..75530fd19685 100644 +index b4f93d8fd86f3..75530fd19685e 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1304,6 +1304,7 @@ CONFIG_DHT11=m @@ -340397,7 +340397,7 @@ index b4f93d8fd86f..75530fd19685 100644 CONFIG_VEML6070=m CONFIG_BMP280=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 4719d38c4b4e..3878dede1c51 100644 +index 4719d38c4b4e5..3878dede1c515 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1315,6 +1315,7 @@ CONFIG_DHT11=m @@ -340409,7 +340409,7 @@ index 4719d38c4b4e..3878dede1c51 100644 CONFIG_VEML6070=m CONFIG_BMP280=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index ca7668f549bc..d87831d79a03 100644 +index ca7668f549bcd..d87831d79a03d 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1094,13 +1094,12 @@ CONFIG_RASPBERRYPI_POWER=y @@ -340431,10 +340431,10 @@ index ca7668f549bc..d87831d79a03 100644 2.18.4 -From 41a54764304ad952494842e96ae30a3dd2c54fec Mon Sep 17 00:00:00 2001 +From 7e1e9145d5f67c935ff9b40c7bad57f5b4129052 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Oct 2019 10:19:50 +0100 -Subject: [PATCH 0373/1216] overlays: Remove hack from uart0 overlay +Subject: [PATCH 0373/1224] 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 @@ -340451,7 +340451,7 @@ Signed-off-by: Phil Elwell 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/overlays/uart0-overlay.dts b/arch/arm/boot/dts/overlays/uart0-overlay.dts -index 57ba7745d023..73d563bbaabf 100755 +index 57ba7745d0233..73d563bbaabfa 100755 --- a/arch/arm/boot/dts/overlays/uart0-overlay.dts +++ b/arch/arm/boot/dts/overlays/uart0-overlay.dts @@ -17,17 +17,16 @@ @@ -340482,10 +340482,10 @@ index 57ba7745d023..73d563bbaabf 100755 2.18.4 -From f050cc356db34ef34c6f72d3bfcdf16adfef7375 Mon Sep 17 00:00:00 2001 +From 45393bacca8931185fb10569f5bc2ab8d279dced Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 Nov 2019 16:28:10 +0000 -Subject: [PATCH 0374/1216] Revert "brcmfmac: Disable power management" +Subject: [PATCH 0374/1224] 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 @@ -340502,7 +340502,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 4b97dfcda3cd..4beef16e328f 100644 +index 4b97dfcda3cd3..4beef16e328ff 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -2769,8 +2769,6 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev, @@ -340527,10 +340527,10 @@ index 4b97dfcda3cd..4beef16e328f 100644 2.18.4 -From 5c318dee59032c8f25b83f978af82ecc0e2b5e4b Mon Sep 17 00:00:00 2001 +From 22feb6b2eca74c94e13c36974412a23d31d9cf37 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Nov 2019 16:20:24 +0000 -Subject: [PATCH 0375/1216] arm: dts: overlays: pitft35-resistive: add upstream +Subject: [PATCH 0375/1224] arm: dts: overlays: pitft35-resistive: add upstream compatible The upstream hx8357d driver uses "adafruit,yx350hv15" for the compatible @@ -340544,7 +340544,7 @@ Signed-off-by: Peter Robinson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts -index a69b6c2c7608..37629f18a740 100644 +index a69b6c2c76081..37629f18a7400 100644 --- a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts +++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts @@ -49,7 +49,7 @@ @@ -340560,10 +340560,10 @@ index a69b6c2c7608..37629f18a740 100644 2.18.4 -From b613d1472d7501b84dfecf56458160d33b646bee Mon Sep 17 00:00:00 2001 +From ffd65780799fc0da3531206a78d51fdda10f4b2a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 23 Aug 2019 16:34:38 +0100 -Subject: [PATCH 0376/1216] v3d_drv: Handle missing clock more gracefully +Subject: [PATCH 0376/1224] v3d_drv: Handle missing clock more gracefully Signed-off-by: popcornmix --- @@ -340571,7 +340571,7 @@ Signed-off-by: popcornmix 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index 72da17e4963e..8b08ad828fe7 100644 +index 72da17e4963ee..8b08ad828fe72 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -286,9 +286,9 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) @@ -340591,10 +340591,10 @@ index 72da17e4963e..8b08ad828fe7 100644 2.18.4 -From 516fd7d53c3fb129376c85b55458a345b039d786 Mon Sep 17 00:00:00 2001 +From 4a994850d6e14f15486a2dd31f855d7ce62bf798 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 23:50:44 +0100 -Subject: [PATCH 0377/1216] v3d_drv: Allow clock retrieval by name +Subject: [PATCH 0377/1224] v3d_drv: Allow clock retrieval by name Signed-off-by: Phil Elwell --- @@ -340602,7 +340602,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index 8b08ad828fe7..2f50268c0159 100644 +index 8b08ad828fe72..2f50268c0159c 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -285,7 +285,9 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) @@ -340620,10 +340620,10 @@ index 8b08ad828fe7..2f50268c0159 100644 2.18.4 -From 6eb513240150dc772cb3fb4b07f7cbee912d3097 Mon Sep 17 00:00:00 2001 +From 827697d15c4c5a2699f667bbffc1acf58880e44e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 5 Sep 2019 17:59:14 +0100 -Subject: [PATCH 0378/1216] v3d_gem: Kick the clock so firmware knows we are +Subject: [PATCH 0378/1224] 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 @@ -340635,7 +340635,7 @@ Signed-off-by: popcornmix 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c -index 8b5dc2b20e38..2d0626a52706 100644 +index 8b5dc2b20e387..2d0626a527063 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -918,6 +918,10 @@ v3d_gem_init(struct drm_device *dev) @@ -340653,10 +340653,10 @@ index 8b5dc2b20e38..2d0626a52706 100644 2.18.4 -From f3369a1dd4e9880de932ff426b2a50e1f6f03025 Mon Sep 17 00:00:00 2001 +From fa17e8cd84ee79b586a89eb9abe0227d0ec0feeb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 15:49:56 +0100 -Subject: [PATCH 0379/1216] clk-raspberrypi: Allow cpufreq driver to also +Subject: [PATCH 0379/1224] clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks For performance/power it is beneficial to adjust gpu clocks with arm clock. @@ -340668,7 +340668,7 @@ Signed-off-by: popcornmix 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 1654fd0eedc9..e4e139240340 100644 +index 1654fd0eedc94..e4e1392403406 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -70,7 +70,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware, u32 tag, @@ -340684,10 +340684,10 @@ index 1654fd0eedc9..e4e139240340 100644 2.18.4 -From ed6ee768fe165921c8e8173f5b18b9918161a922 Mon Sep 17 00:00:00 2001 +From 14abbeeb9eccd5a136e462bc04515b1791442841 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 21 Aug 2019 14:55:56 +0100 -Subject: [PATCH 0380/1216] clk-raspberrypi: Also support v3d clock +Subject: [PATCH 0380/1224] clk-raspberrypi: Also support v3d clock Signed-off-by: popcornmix --- @@ -340695,7 +340695,7 @@ Signed-off-by: popcornmix 1 file changed, 412 insertions(+), 89 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index e4e139240340..8daf26df5430 100644 +index e4e1392403406..8daf26df54308 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -15,33 +15,103 @@ @@ -341337,10 +341337,10 @@ index e4e139240340..8daf26df5430 100644 2.18.4 -From fa454b51348c28a81511adeb8d4312ea496d44b4 Mon Sep 17 00:00:00 2001 +From 300cccb2b3a80e105c9f99d9422327e646570bd7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 3 Sep 2019 20:28:00 +0100 -Subject: [PATCH 0381/1216] clk-bcm2835: Disable v3d clock +Subject: [PATCH 0381/1224] clk-bcm2835: Disable v3d clock This is controlled by firmware, see clk-raspberrypi.c @@ -341350,7 +341350,7 @@ Signed-off-by: popcornmix 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 3921480d89fd..8175ecea0fd9 100644 +index 3921480d89fdd..8175ecea0fd9f 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1734,16 +1734,12 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { @@ -341401,10 +341401,10 @@ index 3921480d89fd..8175ecea0fd9 100644 2.18.4 -From 54cb0a61986e7633b2b087138760c427d20d5642 Mon Sep 17 00:00:00 2001 +From 7725220135b0bee580f60001f5bcdc7a8c205b3a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 20 Aug 2019 17:53:47 +0100 -Subject: [PATCH 0382/1216] config: Switch to upstream cpufreq driver +Subject: [PATCH 0382/1224] config: Switch to upstream cpufreq driver Signed-off-by: popcornmix --- @@ -341412,7 +341412,7 @@ Signed-off-by: popcornmix 1 file changed, 4 insertions(+) diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 5f08fcdb02b1..3d437a331698 100644 +index 5f08fcdb02b19..3d437a331698a 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -50,6 +50,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y @@ -341437,10 +341437,10 @@ index 5f08fcdb02b1..3d437a331698 100644 2.18.4 -From e2998ba0cb903370327e60f84d107103bf51c43d Mon Sep 17 00:00:00 2001 +From b16172b28f75fd5a4460cfee0d3dad80df87037f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 13 Sep 2019 13:45:11 +0100 -Subject: [PATCH 0383/1216] raspberrypi-cpufreq: Only report integer pll +Subject: [PATCH 0383/1224] raspberrypi-cpufreq: Only report integer pll divisor frequencies --- @@ -341448,7 +341448,7 @@ Subject: [PATCH 0383/1216] raspberrypi-cpufreq: Only report integer pll 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/raspberrypi-cpufreq.c b/drivers/cpufreq/raspberrypi-cpufreq.c -index 2bc7d9734272..8bcfab2749a8 100644 +index 2bc7d9734272a..8bcfab2749a8d 100644 --- a/drivers/cpufreq/raspberrypi-cpufreq.c +++ b/drivers/cpufreq/raspberrypi-cpufreq.c @@ -8,6 +8,7 @@ @@ -341483,10 +341483,10 @@ index 2bc7d9734272..8bcfab2749a8 100644 2.18.4 -From 1e9b691caf7367fffd565070bf2ffa92ba34d202 Mon Sep 17 00:00:00 2001 +From 2b2b5ded6285c91323d8ccef5ae592d3352b411f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 11:38:09 +0000 -Subject: [PATCH 0384/1216] configs: Regenerate defconfigs +Subject: [PATCH 0384/1224] configs: Regenerate defconfigs Signed-off-by: Phil Elwell --- @@ -341497,7 +341497,7 @@ Signed-off-by: Phil Elwell 4 files changed, 29 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 1e5ac31fc8cb..909de3fdfc6b 100644 +index 1e5ac31fc8cb6..909de3fdfc6bf 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -435,7 +435,6 @@ CONFIG_DEVTMPFS=y @@ -341558,7 +341558,7 @@ index 1e5ac31fc8cb..909de3fdfc6b 100644 CONFIG_SND_BCM2835=m CONFIG_VIDEO_BCM2835=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 75530fd19685..2fbd60cbea04 100644 +index 75530fd19685e..2fbd60cbea04c 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -428,7 +428,6 @@ CONFIG_DEVTMPFS=y @@ -341619,7 +341619,7 @@ index 75530fd19685..2fbd60cbea04 100644 CONFIG_SND_BCM2835=m CONFIG_VIDEO_BCM2835=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 3878dede1c51..edab9acd21c8 100644 +index 3878dede1c515..edab9acd21c8b 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -435,7 +435,6 @@ CONFIG_DEVTMPFS=y @@ -341680,7 +341680,7 @@ index 3878dede1c51..edab9acd21c8 100644 CONFIG_SND_BCM2835=m CONFIG_VIDEO_BCM2835=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index d87831d79a03..7a29553d08d6 100644 +index d87831d79a03d..7a29553d08d66 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -728,7 +728,6 @@ CONFIG_VIDEO_EM28XX_V4L2=m @@ -341720,10 +341720,10 @@ index d87831d79a03..7a29553d08d6 100644 2.18.4 -From 1eff84869b2ea2d4845cf5b4f07385e3e35a4074 Mon Sep 17 00:00:00 2001 +From c66dba8c47e96a8d84ba66e3a5b441b2e3cfbd09 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 11:44:30 +0000 -Subject: [PATCH 0385/1216] configs:2711: Add V3D clock support on arm64 +Subject: [PATCH 0385/1224] 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 @@ -341736,7 +341736,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index edab9acd21c8..cbdad7c47bf3 100644 +index edab9acd21c8b..cbdad7c47bf33 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -53,6 +53,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y @@ -341759,10 +341759,10 @@ index edab9acd21c8..cbdad7c47bf3 100644 2.18.4 -From 6321dd62f553e430fea4da8ec0cc2523578ddc53 Mon Sep 17 00:00:00 2001 +From 8389c7b5437deb6f9ead57980ea0cfc3ef54f2cd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 15:08:25 +0000 -Subject: [PATCH 0386/1216] arm/dts: Correct Pi 4B LED values +Subject: [PATCH 0386/1224] 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 @@ -341777,7 +341777,7 @@ Signed-off-by: Phil Elwell 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index 88615a5afdb6..41a31cacdffe 100644 +index 88615a5afdb65..41a31cacdffed 100644 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -380,7 +380,7 @@ @@ -341790,7 +341790,7 @@ index 88615a5afdb6..41a31cacdffe 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index bacebaaac9d3..d9a09e129656 100644 +index bacebaaac9d3e..d9a09e1296569 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -128,7 +128,7 @@ Params: @@ -341806,10 +341806,10 @@ index bacebaaac9d3..d9a09e129656 100644 2.18.4 -From e1a0cebd541fa53a7d42622e1cdb7686fe30334f Mon Sep 17 00:00:00 2001 +From 281c99865aeb0e215536b5e0d1af2de10a40e289 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 16:23:32 +0000 -Subject: [PATCH 0387/1216] drm/v3d: Set dma_mask as well as coherent_dma_mask +Subject: [PATCH 0387/1224] 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 @@ -341821,7 +341821,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index 2f50268c0159..87ce683f3c04 100644 +index 2f50268c0159c..87ce683f3c04d 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -259,8 +259,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) @@ -341839,10 +341839,10 @@ index 2f50268c0159..87ce683f3c04 100644 2.18.4 -From 282a429cfe7bd3474db82fa76bcecbe2aa1c7487 Mon Sep 17 00:00:00 2001 +From 48ad9346cb4dc4d10e088d73fbd164ef26aa5b5c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 28 Nov 2019 15:49:08 +0000 -Subject: [PATCH 0388/1216] arm/dts: 2711: Add 'pcie0' alias +Subject: [PATCH 0388/1224] 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" @@ -341854,7 +341854,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 6ce9a58a6ed5..a967a7b86f2c 100644 +index 6ce9a58a6ed57..a967a7b86f2c1 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -30,6 +30,7 @@ @@ -341869,10 +341869,10 @@ index 6ce9a58a6ed5..a967a7b86f2c 100644 2.18.4 -From 2311d77256d338753d78cb3d634edeede54558a6 Mon Sep 17 00:00:00 2001 +From e64f582f2f30934fd011059475e5a85685101b17 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 28 Nov 2019 15:51:58 +0000 -Subject: [PATCH 0389/1216] Revert "drm/vc4: Add support for H & V flips" +Subject: [PATCH 0389/1224] Revert "drm/vc4: Add support for H & V flips" This reverts commit 3293cb5284bf7c80217cba8e7c3f67fba1953e1d. This functionality has already been added via @@ -341886,7 +341886,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index f21c03f550e5..1c5eef3ac441 100644 +index f21c03f550e58..1c5eef3ac4415 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -637,7 +637,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, @@ -341983,10 +341983,10 @@ index f21c03f550e5..1c5eef3ac441 100644 2.18.4 -From 528ad26640ce50c4dec74660c8d47746edd5cb78 Mon Sep 17 00:00:00 2001 +From f2eee09ddbd832f0d8466cceb287e8c3f01efcd9 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 30 Nov 2019 23:10:26 +0100 -Subject: [PATCH 0390/1216] rpi-cirrus-wm5102-overlay: fix pinctrl +Subject: [PATCH 0390/1224] rpi-cirrus-wm5102-overlay: fix pinctrl configuration Separate GPIOs connected to wm5102 and wm8804 into 2 pinctrl @@ -342002,7 +342002,7 @@ Signed-off-by: Matthias Reichl 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts -index e2c25a0535e6..1cbf5812af35 100644 +index e2c25a0535e68..1cbf5812af35e 100644 --- a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts @@ -18,19 +18,31 @@ @@ -342113,10 +342113,10 @@ index e2c25a0535e6..1cbf5812af35 100644 2.18.4 -From f375e5df6d73ab5c07cdac1487af596021a497e4 Mon Sep 17 00:00:00 2001 +From 33484cf35250cbd9076ac729c1d1fcc6e8746364 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Jan 2019 16:13:25 +0000 -Subject: [PATCH 0391/1216] staging: vchiq_arm: Set up dma ranges on child +Subject: [PATCH 0391/1224] staging: vchiq_arm: Set up dma ranges on child devices The VCHIQ driver now loads the audio, camera, codec, and vc-sm @@ -342132,7 +342132,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 6 insertions(+) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index d9492e24e07d..d556f42f575a 100644 +index d9492e24e07d0..d556f42f575a1 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -3195,6 +3195,12 @@ vchiq_register_child(struct platform_device *pdev, const char *name) @@ -342152,10 +342152,10 @@ index d9492e24e07d..d556f42f575a 100644 2.18.4 -From 4119e56fe05b40f2be200e732557c33122ac467d Mon Sep 17 00:00:00 2001 +From 131332988984c828e08bc95ec1ed7c68ec55ba74 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Jun 2019 12:15:50 +0100 -Subject: [PATCH 0392/1216] staging: vchiq: Use the old dma controller for OF +Subject: [PATCH 0392/1224] 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 @@ -342170,7 +342170,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index d556f42f575a..d84f7324fe14 100644 +index d556f42f575a1..d84f7324fe148 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -3181,6 +3181,7 @@ vchiq_register_child(struct platform_device *pdev, const char *name) @@ -342209,10 +342209,10 @@ index d556f42f575a..d84f7324fe14 100644 2.18.4 -From 3b3d1e3d6a56ae8a2a1b7460732ab93005fe5776 Mon Sep 17 00:00:00 2001 +From 5b0555cb028850a582b4184eecf32b2b587027ca Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 5 Dec 2019 16:34:39 +0000 -Subject: [PATCH 0393/1216] Revert "staging: bcm2835_camera: Ensure all buffers +Subject: [PATCH 0393/1224] Revert "staging: bcm2835_camera: Ensure all buffers are returned on disable" This reverts commit d70c57a7c6a069977a0d827e1d5e2de53fb87e6d. @@ -342226,7 +342226,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 deletions(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 341594ab669f..61a3593cdcfc 100644 +index 341594ab669f3..61a3593cdcfc3 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -268,8 +268,6 @@ static void buffer_work_cb(struct work_struct *work) @@ -342242,10 +342242,10 @@ index 341594ab669f..61a3593cdcfc 100644 2.18.4 -From 784e6fafb386fb24fcaef9e1ae3bcb20e86cf9fc Mon Sep 17 00:00:00 2001 +From c086b83f958bd7616fd86f046f3218b91adbc977 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Sun, 17 Nov 2019 10:31:46 +0800 -Subject: [PATCH 0394/1216] dwc_otg: checking the urb->transfer_buffer too +Subject: [PATCH 0394/1224] dwc_otg: checking the urb->transfer_buffer too early (#3332) After enable the HIGHMEM and VMSPLIT_3G, the dwc_otg driver doesn't @@ -342275,7 +342275,7 @@ Signed-off-by: Hui Wang 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c -index 70cce7abfb8d..eda7a33908b3 100644 +index 70cce7abfb8d8..eda7a33908b33 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c @@ -821,10 +821,6 @@ static int dwc_otg_urb_enqueue(struct usb_hcd *hcd, @@ -342307,10 +342307,10 @@ index 70cce7abfb8d..eda7a33908b3 100644 2.18.4 -From 63be623e421719e5c859005de2f2bbdf7f1f7c76 Mon Sep 17 00:00:00 2001 +From 8dc7ed993176bc71c98e3e02c4d2a9fb26f6cead Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Dec 2019 12:32:20 +0000 -Subject: [PATCH 0395/1216] overlays: Make mcp342x run-time compatible +Subject: [PATCH 0395/1224] 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 @@ -342326,7 +342326,7 @@ Signed-off-by: Phil Elwell 1 file changed, 102 insertions(+), 31 deletions(-) diff --git a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts -index 7bbb528f804f..714eca5a4b5e 100644 +index 7bbb528f804f5..714eca5a4b5e0 100644 --- a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts +++ b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts @@ -8,14 +8,15 @@ @@ -342522,10 +342522,10 @@ index 7bbb528f804f..714eca5a4b5e 100644 2.18.4 -From a016bd3ef971f57ecff0d6801f9a792dce53875d Mon Sep 17 00:00:00 2001 +From 71597d2503de5f7f2ea4ef0525c57ce1147f0b5f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 29 Nov 2019 16:37:26 +0000 -Subject: [PATCH 0396/1216] config: arm64: Switch to upstream cpufreq driver +Subject: [PATCH 0396/1224] config: arm64: Switch to upstream cpufreq driver Signed-off-by: popcornmix --- @@ -342533,7 +342533,7 @@ Signed-off-by: popcornmix 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index cbdad7c47bf3..7c14f88445a8 100644 +index cbdad7c47bf33..7c14f88445a84 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -53,7 +53,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y @@ -342550,10 +342550,10 @@ index cbdad7c47bf3..7c14f88445a8 100644 2.18.4 -From 1c28d4e55e13496c12e8bee67482667a7309c0d5 Mon Sep 17 00:00:00 2001 +From 72f636a4c5173ed4b2f1e5408b0336cac975f6bf Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 16 Dec 2019 23:25:44 +0100 -Subject: [PATCH 0397/1216] rpi-cirrus-wm5102-overlay: use reset-gpios instead +Subject: [PATCH 0397/1224] rpi-cirrus-wm5102-overlay: use reset-gpios instead of wlf,reset wlf,reset has been deprecated in favour of the standard reset-gpios @@ -342566,7 +342566,7 @@ Signed-off-by: Matthias Reichl 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts -index 1cbf5812af35..ed0c2745399f 100644 +index 1cbf5812af35e..ed0c2745399f6 100644 --- a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts @@ -104,7 +104,7 @@ @@ -342582,10 +342582,10 @@ index 1cbf5812af35..ed0c2745399f 100644 2.18.4 -From c6c0ec9e21e5aa58abddb1e31d434a8b888916e0 Mon Sep 17 00:00:00 2001 +From 4a146b44206c2502d2c62f0c1bd68cefd1d7b944 Mon Sep 17 00:00:00 2001 From: Johannes Krude Date: Sat, 16 Nov 2019 12:41:06 +0100 -Subject: [PATCH 0398/1216] sound/soc: only first codec is master in multicodec +Subject: [PATCH 0398/1224] sound/soc: only first codec is master in multicodec setup When using multiple codecs, at most one codec should generate the master @@ -342598,7 +342598,7 @@ Signed-off-by: Johannes Krude 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c -index 0b9f9a06bdb5..dd7fdb53cd64 100644 +index 0b9f9a06bdb52..dd7fdb53cd643 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1656,7 +1656,15 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, @@ -342622,10 +342622,10 @@ index 0b9f9a06bdb5..dd7fdb53cd64 100644 2.18.4 -From 8553a3bf356368c7877addfc26c14e3ce3819f8d Mon Sep 17 00:00:00 2001 +From e405868905ea60cc607a849b3f2c10354cdf14a7 Mon Sep 17 00:00:00 2001 From: Johannes Krude Date: Sat, 16 Nov 2019 13:14:43 +0100 -Subject: [PATCH 0399/1216] Allow simultaneous use of JustBoom DAC and Digi +Subject: [PATCH 0399/1224] Allow simultaneous use of JustBoom DAC and Digi Signed-off-by: Johannes Krude --- @@ -342645,7 +342645,7 @@ Signed-off-by: Johannes Krude create mode 100644 sound/soc/bcm/justboom-both.c diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index f7f5f0c3d464..e149956a45d3 100644 +index f7f5f0c3d4640..e149956a45d3c 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -86,6 +86,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -342657,7 +342657,7 @@ index f7f5f0c3d464..e149956a45d3 100644 justboom-digi.dtbo \ ltc294x.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index d9a09e129656..26b0b9bf559d 100644 +index d9a09e1296569..26b0b9bf559db 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1388,6 +1388,26 @@ Params: flash-spi- Enables flash device on SPI, CS#. @@ -342689,7 +342689,7 @@ index d9a09e129656..26b0b9bf559d 100644 cards diff --git a/arch/arm/boot/dts/overlays/justboom-both-overlay.dts b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts new file mode 100644 -index 000000000000..9c42670631c0 +index 0000000000000..9c42670631c0e --- /dev/null +++ b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts @@ -0,0 +1,65 @@ @@ -342759,7 +342759,7 @@ index 000000000000..9c42670631c0 + }; +}; diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 909de3fdfc6b..75ec875028ff 100644 +index 909de3fdfc6bf..75ec875028ffa 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -957,6 +957,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m @@ -342771,7 +342771,7 @@ index 909de3fdfc6b..75ec875028ff 100644 CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 3d437a331698..8b57f1e1a54d 100644 +index 3d437a331698a..8b57f1e1a54da 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -933,6 +933,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m @@ -342783,7 +342783,7 @@ index 3d437a331698..8b57f1e1a54d 100644 CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 2fbd60cbea04..428fa1cb5aaf 100644 +index 2fbd60cbea04c..428fa1cb5aaf8 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -949,6 +949,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m @@ -342795,7 +342795,7 @@ index 2fbd60cbea04..428fa1cb5aaf 100644 CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 7c14f88445a8..b5bd18c6e07d 100644 +index 7c14f88445a84..b5bd18c6e07db 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -960,6 +960,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m @@ -342807,7 +342807,7 @@ index 7c14f88445a8..b5bd18c6e07d 100644 CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 7a29553d08d6..cfef51db953a 100644 +index 7a29553d08d66..cfef51db953ab 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -799,6 +799,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m @@ -342819,7 +342819,7 @@ index 7a29553d08d6..cfef51db953a 100644 CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index 8d50e52c1ebb..57efe06bac74 100644 +index 8d50e52c1ebb2..57efe06bac746 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -105,6 +105,18 @@ config SND_BCM2708_SOC_RPI_PROTO @@ -342842,7 +342842,7 @@ index 8d50e52c1ebb..57efe06bac74 100644 tristate "Support for JustBoom DAC" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index 4c0486c6da0d..53909a7f3397 100644 +index 4c0486c6da0da..53909a7f33975 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -17,6 +17,7 @@ snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o @@ -342863,7 +342863,7 @@ index 4c0486c6da0d..53909a7f3397 100644 obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o diff --git a/sound/soc/bcm/justboom-both.c b/sound/soc/bcm/justboom-both.c new file mode 100644 -index 000000000000..3d0194c1cab8 +index 0000000000000..3d0194c1cab8b --- /dev/null +++ b/sound/soc/bcm/justboom-both.c @@ -0,0 +1,266 @@ @@ -343137,10 +343137,10 @@ index 000000000000..3d0194c1cab8 2.18.4 -From bfac38799b130f83e0f732c02c296f7f0b9a3c67 Mon Sep 17 00:00:00 2001 +From 0354cf1d2d0cc14c14812df77c8440bc803306f8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Dec 2019 10:41:33 +0000 -Subject: [PATCH 0400/1216] overlays: dht11: Allow multiple instantiation +Subject: [PATCH 0400/1224] 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. @@ -343151,7 +343151,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/dht11-overlay.dts b/arch/arm/boot/dts/overlays/dht11-overlay.dts -index 8de67527e317..6feeeb402493 100644 +index 8de67527e3179..6feeeb402493e 100644 --- a/arch/arm/boot/dts/overlays/dht11-overlay.dts +++ b/arch/arm/boot/dts/overlays/dht11-overlay.dts @@ -24,7 +24,7 @@ @@ -343177,10 +343177,10 @@ index 8de67527e317..6feeeb402493 100644 2.18.4 -From 5cb95af05461e61008ec41a2cd4c81611fd210f1 Mon Sep 17 00:00:00 2001 +From 7f5aeb01f89b132dfdcd6b793701d1934a52d859 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 20 Dec 2019 15:50:19 +0000 -Subject: [PATCH 0401/1216] configs: Add CONFIG_NET_SCH_CAKE=m +Subject: [PATCH 0401/1224] configs: Add CONFIG_NET_SCH_CAKE=m See: https://github.com/raspberrypi/linux/issues/3180 @@ -343194,7 +343194,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 75ec875028ff..375b13b5590a 100644 +index 75ec875028ffa..375b13b5590a7 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -352,6 +352,7 @@ CONFIG_NET_SCH_CHOKE=m @@ -343206,7 +343206,7 @@ index 75ec875028ff..375b13b5590a 100644 CONFIG_NET_SCH_HHF=m CONFIG_NET_SCH_PIE=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 8b57f1e1a54d..a4ee29493bab 100644 +index 8b57f1e1a54da..a4ee29493baba 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -318,6 +318,7 @@ CONFIG_NET_SCH_CHOKE=m @@ -343218,7 +343218,7 @@ index 8b57f1e1a54d..a4ee29493bab 100644 CONFIG_NET_SCH_HHF=m CONFIG_NET_SCH_PIE=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 428fa1cb5aaf..552cfe30f9c2 100644 +index 428fa1cb5aaf8..552cfe30f9c23 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -345,6 +345,7 @@ CONFIG_NET_SCH_CHOKE=m @@ -343230,7 +343230,7 @@ index 428fa1cb5aaf..552cfe30f9c2 100644 CONFIG_NET_SCH_HHF=m CONFIG_NET_SCH_PIE=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index b5bd18c6e07d..7016eff0d4ea 100644 +index b5bd18c6e07db..7016eff0d4ea2 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -353,6 +353,7 @@ CONFIG_NET_SCH_CHOKE=m @@ -343242,7 +343242,7 @@ index b5bd18c6e07d..7016eff0d4ea 100644 CONFIG_NET_SCH_HHF=m CONFIG_NET_SCH_PIE=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index cfef51db953a..10cf5ac4b833 100644 +index cfef51db953ab..10cf5ac4b833c 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -305,6 +305,7 @@ CONFIG_NET_SCH_CHOKE=m @@ -343257,10 +343257,10 @@ index cfef51db953a..10cf5ac4b833 100644 2.18.4 -From 67b57a2b2aa93dd31c9acb15dd6e33d0c837dfe1 Mon Sep 17 00:00:00 2001 +From 252496746e193bfeef3bfad5b6781903fd053d75 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sun, 22 Dec 2019 15:13:37 +0000 -Subject: [PATCH 0402/1216] configs: Add RTS_DRV_PCF85363 +Subject: [PATCH 0402/1224] configs: Add RTS_DRV_PCF85363 See: https://github.com/raspberrypi/firmware/issues/1309 @@ -343274,7 +343274,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 375b13b5590a..6ac0eccf7094 100644 +index 375b13b5590a7..6ac0eccf7094f 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1201,6 +1201,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -343286,7 +343286,7 @@ index 375b13b5590a..6ac0eccf7094 100644 CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index a4ee29493bab..79c5c0d9ff61 100644 +index a4ee29493baba..79c5c0d9ff61a 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1198,6 +1198,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -343298,7 +343298,7 @@ index a4ee29493bab..79c5c0d9ff61 100644 CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 552cfe30f9c2..5e9a2a59c875 100644 +index 552cfe30f9c23..5e9a2a59c8757 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1211,6 +1211,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -343310,7 +343310,7 @@ index 552cfe30f9c2..5e9a2a59c875 100644 CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 7016eff0d4ea..9ee06bd5932e 100644 +index 7016eff0d4ea2..9ee06bd5932e7 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1225,6 +1225,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -343322,7 +343322,7 @@ index 7016eff0d4ea..9ee06bd5932e 100644 CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 10cf5ac4b833..d8efa2d79d10 100644 +index 10cf5ac4b833c..d8efa2d79d10a 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1016,6 +1016,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -343337,10 +343337,10 @@ index 10cf5ac4b833..d8efa2d79d10 100644 2.18.4 -From 877ba12b5e190c87f8ae9501d79cd1d9ed9051b3 Mon Sep 17 00:00:00 2001 +From be0fbc709b99f2aeef0309ac769425fbccd541c2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sun, 22 Dec 2019 15:29:40 +0000 -Subject: [PATCH 0403/1216] overlays: i2c-rtc: Add pcf85363 support +Subject: [PATCH 0403/1224] overlays: i2c-rtc: Add pcf85363 support See: https://github.com/raspberrypi/firmware/issues/1309 @@ -343351,7 +343351,7 @@ Signed-off-by: Phil Elwell 2 files changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 26b0b9bf559d..e40ab828022c 100644 +index 26b0b9bf559db..e40ab828022cb 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1078,6 +1078,8 @@ Params: abx80x Select one of the ABx80x family: @@ -343364,7 +343364,7 @@ index 26b0b9bf559d..e40ab828022c 100644 rv3028 Select the Micro Crystal RV3028 device diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts -index af5ca042de75..5df390b52a7b 100644 +index af5ca042de75a..5df390b52a7bb 100644 --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts @@ -188,6 +188,21 @@ @@ -343401,10 +343401,10 @@ index af5ca042de75..5df390b52a7b 100644 2.18.4 -From 82dbf23d77e7f1a2629aafa411842ef0591eea8f Mon Sep 17 00:00:00 2001 +From 690e1b2eb6b6c5ccb44a122c118a9399c183702b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jan 2020 16:04:30 +0000 -Subject: [PATCH 0404/1216] pinctrl: bcm2835: Remove gpiochip on error +Subject: [PATCH 0404/1224] 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. @@ -343416,7 +343416,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -index 4ce2dd704c13..c8db202f239d 100644 +index 4ce2dd704c130..c8db202f239da 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -1140,7 +1140,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) @@ -343432,10 +343432,10 @@ index 4ce2dd704c13..c8db202f239d 100644 2.18.4 -From 998aad47c978bb19660987c10f556f3a49e17b7b Mon Sep 17 00:00:00 2001 +From 8ff23d41091e193c6f83b8cf850d3b160254027f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jan 2020 14:05:42 +0000 -Subject: [PATCH 0405/1216] pinctrl: bcm2835: Change init order for gpio hogs +Subject: [PATCH 0405/1224] 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 @@ -343455,7 +343455,7 @@ Signed-off-by: Phil Elwell 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -index c8db202f239d..cf308212feca 100644 +index c8db202f239da..cf308212fecab 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -1140,9 +1140,25 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) @@ -343526,10 +343526,10 @@ index c8db202f239d..cf308212feca 100644 2.18.4 -From e5c2faaac53f0ed84f47c387ac2c9398e53d41bc Mon Sep 17 00:00:00 2001 +From 291ed023bad196beb148a918f1c046b224994667 Mon Sep 17 00:00:00 2001 From: Giedrius Date: Tue, 7 Jan 2020 11:04:21 +0200 -Subject: [PATCH 0406/1216] Pisound: MIDI communication fixes for scaled down +Subject: [PATCH 0406/1224] Pisound: MIDI communication fixes for scaled down CPU. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -343546,7 +343546,7 @@ Signed-off-by: Giedrius Trainavičius 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c -index 6af9921b55c7..c9a881cf8f7c 100644 +index 6af9921b55c71..c9a881cf8f7c7 100644 --- a/sound/soc/bcm/pisound.c +++ b/sound/soc/bcm/pisound.c @@ -1,6 +1,6 @@ @@ -343632,10 +343632,10 @@ index 6af9921b55c7..c9a881cf8f7c 100644 2.18.4 -From 38beb0a2fd6b91947cc7b4dc561eefe0b2b1d94f Mon Sep 17 00:00:00 2001 +From a05222750f0e288c1738dd43007c675c266fe5e9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Jan 2020 17:21:09 +0000 -Subject: [PATCH 0407/1216] pcie-brcmstb: Eliminate arch_dma_ops error message +Subject: [PATCH 0407/1224] 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 @@ -343649,7 +343649,7 @@ Signed-off-by: Phil Elwell 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index e8c8b355548a..e646818ff21c 100644 +index e8c8b355548a5..e646818ff21c3 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -633,16 +633,17 @@ static int brcmstb_platform_notifier(struct notifier_block *nb, @@ -343786,10 +343786,10 @@ index e8c8b355548a..e646818ff21c 100644 2.18.4 -From 0c39bfa759e02653212bb52c95c2d8c2059604df Mon Sep 17 00:00:00 2001 +From fad59ef5048812820c323de59393bc73b62f48e5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Jan 2020 14:15:39 +0000 -Subject: [PATCH 0408/1216] brcmfmac: Disable power management +Subject: [PATCH 0408/1224] brcmfmac: Disable power management Disable power management in the brcmfmac driver again as it is still causing problems for some users. @@ -343798,7 +343798,7 @@ causing problems for some users. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 4beef16e328f..4b97dfcda3cd 100644 +index 4beef16e328ff..4b97dfcda3cd3 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -2769,6 +2769,8 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev, @@ -343823,10 +343823,10 @@ index 4beef16e328f..4b97dfcda3cd 100644 2.18.4 -From 3fb81afada2d5bf7b343a48bba545c1a31e80e92 Mon Sep 17 00:00:00 2001 +From 7db06cba57bf2e641641d8411ab0b40340147667 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 8 Dec 2019 14:45:14 +0100 -Subject: [PATCH 0409/1216] Revert "mmc: sdhci: Mask "spurious" interrupts" +Subject: [PATCH 0409/1224] Revert "mmc: sdhci: Mask "spurious" interrupts" This reverts commit adac895210b88770190e9a501462f2100ab40ac8, because this issue is already addressed by commit 19ec6bb80290e496021488084944b77f03a87dd7. @@ -343837,7 +343837,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 4 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index c140c8dfd56e..a1aeb2e10564 100644 +index c140c8dfd56ef..a1aeb2e105641 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3106,10 +3106,6 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) @@ -343855,10 +343855,10 @@ index c140c8dfd56e..a1aeb2e10564 100644 2.18.4 -From a9f024d8b90923c0cb94b96dab48c085763ea43f Mon Sep 17 00:00:00 2001 +From 71f0b07054d8cf052be4f2bb591b7ac14f65d641 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 16 Aug 2019 22:32:02 +0200 -Subject: [PATCH 0410/1216] ARM: dts: bcm283x: Remove simple-bus from fixed +Subject: [PATCH 0410/1224] ARM: dts: bcm283x: Remove simple-bus from fixed clocks commit 4b2d24662126b1e2a6b95c9dfe9e9044e105e5bd upstream. @@ -343880,7 +343880,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index f0dbd6af90fa..701123c5f6ee 100644 +index f0dbd6af90fae..701123c5f6ee2 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -635,22 +635,16 @@ @@ -343912,10 +343912,10 @@ index f0dbd6af90fa..701123c5f6ee 100644 2.18.4 -From 27574428c565da3465b0e7c35f9a0aed0dc65d61 Mon Sep 17 00:00:00 2001 +From a926b083f4be303174e3d3e50f0219010945728a Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:15:00 +0100 -Subject: [PATCH 0411/1216] ARM: dts: bcm283x: Move system timer back to +Subject: [PATCH 0411/1224] ARM: dts: bcm283x: Move system timer back to bcm283x.dtsi During Raspberry Pi 4 upstream discussion Tim Gover confirmed that the @@ -343930,7 +343930,7 @@ Signed-off-by: Stefan Wahren 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi -index eceb170fd5b7..c0f389ee010b 100644 +index eceb170fd5b7b..c0f389ee010b6 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -6,17 +6,6 @@ @@ -343952,7 +343952,7 @@ index eceb170fd5b7..c0f389ee010b 100644 compatible = "brcm,bcm2835-armctrl-ic"; reg = <0x7e00b200 0x200>; diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index 41a31cacdffe..7c5334c848b7 100644 +index 41a31cacdffed..7c5334c848b72 100644 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -711,6 +711,13 @@ @@ -343970,7 +343970,7 @@ index 41a31cacdffe..7c5334c848b7 100644 interrupts = ; }; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 701123c5f6ee..c9f405a0f5ec 100644 +index 701123c5f6ee2..c9f405a0f5ecb 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -56,6 +56,17 @@ @@ -343995,10 +343995,10 @@ index 701123c5f6ee..c9f405a0f5ec 100644 2.18.4 -From 4ce4d6666588fcf8479cc2fab00fc872eda706f0 Mon Sep 17 00:00:00 2001 +From ed76f92bcb8fed11d27d62929a2982078fa096b9 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 16:06:13 +0100 -Subject: [PATCH 0412/1216] ARM: dts: bcm283x: Move pixelvalve to +Subject: [PATCH 0412/1224] ARM: dts: bcm283x: Move pixelvalve to bcm2835-common.dtsi According to Eric Anholt the pixelvalves doesn't exists on BCM2711. @@ -344012,7 +344012,7 @@ Signed-off-by: Stefan Wahren 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi -index c0f389ee010b..96ca0660dce1 100644 +index c0f389ee010b6..96ca0660dce16 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -13,6 +13,18 @@ @@ -344048,7 +344048,7 @@ index c0f389ee010b..96ca0660dce1 100644 compatible = "brcm,bcm2835-v3d"; reg = <0x7ec00000 0x1000>; diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index 7c5334c848b7..f7b64e077043 100644 +index 7c5334c848b72..f7b64e0770431 100644 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -188,14 +188,6 @@ @@ -344078,7 +344078,7 @@ index 7c5334c848b7..f7b64e077043 100644 arm-pmu { diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index c9f405a0f5ec..1a78bd08c19e 100644 +index c9f405a0f5ecb..1a78bd08c19ee 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -432,18 +432,6 @@ @@ -344117,10 +344117,10 @@ index c9f405a0f5ec..1a78bd08c19e 100644 2.18.4 -From 449857454f8cb07558012cf389828f550964d1d2 Mon Sep 17 00:00:00 2001 +From 995ebc3146c431f455e4471d668c8239ea3b8a90 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 15:32:29 +0100 -Subject: [PATCH 0413/1216] ARM: dts: bcm2838-rpi-4-b: Fix memory node +Subject: [PATCH 0413/1224] 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 @@ -344132,7 +344132,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts -index 7170a97bd3e4..35502763882e 100644 +index 7170a97bd3e4f..35502763882e0 100644 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts @@ -14,7 +14,8 @@ @@ -344149,10 +344149,10 @@ index 7170a97bd3e4..35502763882e 100644 2.18.4 -From d9263100a694742073ad45f7f6a02bdf6191b300 Mon Sep 17 00:00:00 2001 +From c73c928c50bf5dfabff0cf51de23a09fba4906ee Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 15:43:41 +0100 -Subject: [PATCH 0414/1216] ARM: dts: bcm2838-rpi-4-b: Backport BT part from +Subject: [PATCH 0414/1224] 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 @@ -344165,7 +344165,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts -index 35502763882e..e65f924e1fd2 100644 +index 35502763882e0..e65f924e1fd29 100644 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts @@ -101,7 +101,8 @@ @@ -344182,10 +344182,10 @@ index 35502763882e..e65f924e1fd2 100644 2.18.4 -From 4467bdc519f2900a7665c11b0ec7fd9b52a838d2 Mon Sep 17 00:00:00 2001 +From f4fa7637922fbf9590c338efd7657f5ff8407ca4 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 15:55:29 +0100 -Subject: [PATCH 0415/1216] ARM: dts: bcm2838: Backport node names from +Subject: [PATCH 0415/1224] ARM: dts: bcm2838: Backport node names from upstream According to devicetree specification the node name should describe @@ -344197,7 +344197,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index f7b64e077043..9b6edd6af4f2 100644 +index f7b64e0770431..9b6edd6af4f27 100644 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -27,7 +27,7 @@ @@ -344231,10 +344231,10 @@ index f7b64e077043..9b6edd6af4f2 100644 2.18.4 -From c5b5912a85215d2cb1095e86403e9fa2d9220437 Mon Sep 17 00:00:00 2001 +From 458d46a1ff481a83dc404048f4946ed41202be4a Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 18:01:57 +0100 -Subject: [PATCH 0416/1216] ARM: dts: bcm283x: Move intc label to +Subject: [PATCH 0416/1224] 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. @@ -344247,7 +344247,7 @@ Signed-off-by: Stefan Wahren 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi -index 96ca0660dce1..dc67679a3a04 100644 +index 96ca0660dce16..dc67679a3a041 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -5,6 +5,8 @@ @@ -344260,7 +344260,7 @@ index 96ca0660dce1..dc67679a3a04 100644 intc: interrupt-controller@7e00b200 { compatible = "brcm,bcm2835-armctrl-ic"; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 1a78bd08c19e..3706a795b586 100644 +index 1a78bd08c19ee..3706a795b586c 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -18,7 +18,6 @@ @@ -344275,10 +344275,10 @@ index 1a78bd08c19e..3706a795b586 100644 2.18.4 -From 6ee8b06d289a7a019f11edfdc8f653a32ccb08f6 Mon Sep 17 00:00:00 2001 +From 8323c79d5b071a171925a10fd64201ceb1cc66b2 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 18:19:28 +0100 -Subject: [PATCH 0417/1216] ARM: dts: bcm2838: Remove always-on from +Subject: [PATCH 0417/1224] ARM: dts: bcm2838: Remove always-on from armv7-timer After moving bcm2835-system-timer to bcm283x.dtsi there is no need for @@ -344290,7 +344290,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index 9b6edd6af4f2..bfde2a2ad3d0 100644 +index 9b6edd6af4f27..bfde2a2ad3d00 100644 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -231,7 +231,6 @@ @@ -344305,10 +344305,10 @@ index 9b6edd6af4f2..bfde2a2ad3d0 100644 2.18.4 -From 73349467eb1f7fd0aa55a9a232df2f900f265e52 Mon Sep 17 00:00:00 2001 +From 2d8f7dcfd9069ce37afd5b50d4363a19487b7366 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 13:48:08 +0100 -Subject: [PATCH 0418/1216] Revert "phy: bcm54213pe: configure the LED outputs +Subject: [PATCH 0418/1224] Revert "phy: bcm54213pe: configure the LED outputs to be more user-friendly" This reverts commit 0f6693225eee62ee01c479c86fff76442979f906. @@ -344318,7 +344318,7 @@ This reverts commit 0f6693225eee62ee01c479c86fff76442979f906. 2 files changed, 21 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index ed394d48ea24..405f5ff394be 100644 +index ed394d48ea247..405f5ff394be6 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -43,21 +43,6 @@ static int bcm54210e_config_init(struct phy_device *phydev) @@ -344353,7 +344353,7 @@ index ed394d48ea24..405f5ff394be 100644 err = bcm54612e_config_init(phydev); if (err) diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h -index d7ebafbb3221..bfb37218f435 100644 +index d7ebafbb32218..bfb37218f435c 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -185,10 +185,6 @@ @@ -344371,10 +344371,10 @@ index d7ebafbb3221..bfb37218f435 100644 2.18.4 -From 4515d8b94662230031bdc9112a24ba6dcf43a8c2 Mon Sep 17 00:00:00 2001 +From 94bd9be35f254e8e26cbe6680db8536ed2ed29ec Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 13:48:32 +0100 -Subject: [PATCH 0419/1216] Revert "phy: broadcom: split out the BCM54213PE +Subject: [PATCH 0419/1224] Revert "phy: broadcom: split out the BCM54213PE from the BCM54210E IDs" This reverts commit a377688aa4f69ebfe75c9dfc986e7d19605eb39f. @@ -344384,7 +344384,7 @@ This reverts commit a377688aa4f69ebfe75c9dfc986e7d19605eb39f. 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 405f5ff394be..56f029579b24 100644 +index 405f5ff394be6..56f029579b24d 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -213,8 +213,7 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) @@ -344430,7 +344430,7 @@ index 405f5ff394be..56f029579b24 100644 { PHY_ID_BCM54612E, 0xfffffff0 }, { PHY_ID_BCM54616S, 0xfffffff0 }, diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h -index bfb37218f435..6db2d9a6e503 100644 +index bfb37218f435c..6db2d9a6e5031 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -20,7 +20,6 @@ @@ -344445,10 +344445,10 @@ index bfb37218f435..6db2d9a6e503 100644 2.18.4 -From 0e9455ab935868ef52410a31d86201cbf6acf864 Mon Sep 17 00:00:00 2001 +From a09aa24ee44e0a078947fb13b531d8134af1d4f1 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 16:35:54 +0100 -Subject: [PATCH 0420/1216] net: bcmgenet: Add RGMII_RXID support +Subject: [PATCH 0420/1224] 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. @@ -344459,7 +344459,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c -index 3ba733295718..0516d14f4703 100644 +index 3ba7332957186..0516d14f47035 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -274,10 +274,11 @@ int bcmgenet_mii_config(struct net_device *dev, bool init) @@ -344479,10 +344479,10 @@ index 3ba733295718..0516d14f4703 100644 2.18.4 -From f722cd0c326a2360231aecbb78a7e4cad543f121 Mon Sep 17 00:00:00 2001 +From f7924ab0a508a2f86a37abd9859e5d37fc61d89a Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 25 Dec 2019 16:40:47 +0100 -Subject: [PATCH 0421/1216] ARM: dts: bcm2838: Backport genet from upstream +Subject: [PATCH 0421/1224] ARM: dts: bcm2838: Backport genet from upstream This backport all genet differences (different compatible, right PHY mode, board specific stuff) from upstream. @@ -344495,7 +344495,7 @@ Signed-off-by: Stefan Wahren 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index a967a7b86f2c..78273ec873ff 100644 +index a967a7b86f2c1..78273ec873ffe 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -134,6 +134,20 @@ @@ -344520,7 +344520,7 @@ index a967a7b86f2c..78273ec873ff 100644 act_led: act { label = "led0"; diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts -index e65f924e1fd2..7c3fc83fe66e 100644 +index e65f924e1fd29..7c3fc83fe66eb 100644 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts @@ -98,6 +98,20 @@ @@ -344545,7 +344545,7 @@ index e65f924e1fd2..7c3fc83fe66e 100644 &uart0 { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index bfde2a2ad3d0..e6c79a2949e5 100644 +index bfde2a2ad3d00..e6c79a2949e55 100644 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -346,29 +346,20 @@ @@ -344586,10 +344586,10 @@ index bfde2a2ad3d0..e6c79a2949e5 100644 2.18.4 -From 1130e4ff62723ca2b5759472704cb1df77d940df Mon Sep 17 00:00:00 2001 +From bac29a8f32d0a3f151c9708782bf3941d5d22394 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:40:56 +0100 -Subject: [PATCH 0422/1216] ARM: bcm: Backport BCM2711 support from upstream +Subject: [PATCH 0422/1224] ARM: bcm: Backport BCM2711 support from upstream Make the BCM2711 a different machine, but keep it in board_bcm2835. @@ -344601,7 +344601,7 @@ Signed-off-by: Stefan Wahren 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig -index e25dfc949446..6ff7c5694bd9 100644 +index e25dfc9494462..6ff7c5694bd97 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -161,7 +161,7 @@ config ARCH_BCM2835 @@ -344623,7 +344623,7 @@ index e25dfc949446..6ff7c5694bd9 100644 config ARCH_BCM_53573 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 0ec49d857134..b7491ddb6841 100644 +index 0ec49d8571340..b7491ddb68412 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -109,6 +109,19 @@ static const char * const bcm2835_compat[] = { @@ -344662,7 +344662,7 @@ index 0ec49d857134..b7491ddb6841 100644 .smp = smp_ops(bcm2836_smp_ops), MACHINE_END diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms -index 9dccf4db319b..a65d89ff6a37 100644 +index 9dccf4db319b1..a65d89ff6a374 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -37,11 +37,12 @@ config ARCH_BCM2835 @@ -344684,10 +344684,10 @@ index 9dccf4db319b..a65d89ff6a37 100644 2.18.4 -From a90fdb3f9216b207294b5e4b6b40e270fec2476f Mon Sep 17 00:00:00 2001 +From 90838fddfee49dfb579a834d8256e00109a4a114 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 11:55:59 +0100 -Subject: [PATCH 0423/1216] hwrng: iproc-rng200 - Add support for BCM2711 +Subject: [PATCH 0423/1224] hwrng: iproc-rng200 - Add support for BCM2711 commit 0f95b09a5f624964d520c8f6a2674090fb98ae25 upstream. @@ -344704,7 +344704,7 @@ Signed-off-by: Herbert Xu 1 file changed, 1 insertion(+) diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c -index f971a4cb8951..7b6966b7f602 100644 +index f971a4cb8951c..7b6966b7f6028 100644 --- a/drivers/char/hw_random/iproc-rng200.c +++ b/drivers/char/hw_random/iproc-rng200.c @@ -292,6 +292,7 @@ static int iproc_rng200_probe(struct platform_device *pdev) @@ -344719,10 +344719,10 @@ index f971a4cb8951..7b6966b7f602 100644 2.18.4 -From 3c8e52abe0d7a7aa61fd52eef85641ce06a4e206 Mon Sep 17 00:00:00 2001 +From 545aefa25e53ac28dcd37febf2418abe6d23eac9 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 27 Dec 2019 12:01:17 +0100 -Subject: [PATCH 0424/1216] ARM: dts: bcm2838: Add upstream RNG compatible +Subject: [PATCH 0424/1224] 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. @@ -344733,7 +344733,7 @@ Signed-off-by: Stefan Wahren 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index e6c79a2949e5..60c706b4def0 100644 +index e6c79a2949e55..60c706b4def06 100644 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -682,7 +682,7 @@ @@ -344749,10 +344749,10 @@ index e6c79a2949e5..60c706b4def0 100644 2.18.4 -From 5de484cfbef60c2f60b2d8019a6da1a887a106c8 Mon Sep 17 00:00:00 2001 +From c44e78e19003ab432ae8b9fbed256c710d14f5bc Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 13:59:57 +0000 -Subject: [PATCH 0425/1216] driver: char: rpivid: Destroy the legacy device on +Subject: [PATCH 0425/1224] driver: char: rpivid: Destroy the legacy device on remove The legacy name support created a new device that was never destroyed. @@ -344766,7 +344766,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c -index e4e5fb1fb820..f69047d6f964 100644 +index e4e5fb1fb8209..f69047d6f9644 100644 --- a/drivers/char/broadcom/rpivid-mem.c +++ b/drivers/char/broadcom/rpivid-mem.c @@ -233,6 +233,7 @@ static int rpivid_mem_remove(struct platform_device *pdev) @@ -344781,10 +344781,10 @@ index e4e5fb1fb820..f69047d6f964 100644 2.18.4 -From e19e57bef78f5ab0369c9e3f31e654f793b91a49 Mon Sep 17 00:00:00 2001 +From 256495fb5f9a71f799fb8d0ce42685aba37a07b0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 Jan 2020 16:24:45 +0000 -Subject: [PATCH 0426/1216] driver: char: rpivid: Clean up error handling use +Subject: [PATCH 0426/1224] driver: char: rpivid: Clean up error handling use of ERR_PTR/IS_ERR The driver used an unnecessary intermediate void* variable so it @@ -344799,7 +344799,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c -index f69047d6f964..ab42526ea8cf 100644 +index f69047d6f9644..ab42526ea8cf7 100644 --- a/drivers/char/broadcom/rpivid-mem.c +++ b/drivers/char/broadcom/rpivid-mem.c @@ -130,10 +130,8 @@ static const struct of_device_id rpivid_mem_of_match[]; @@ -344849,10 +344849,10 @@ index f69047d6f964..ab42526ea8cf 100644 2.18.4 -From 44ec5a3e16c47c2ccbff5d0e9efcb88b45e45d26 Mon Sep 17 00:00:00 2001 +From cbc5e17da0887572ca8abbf3ad90f78f3362023f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 14:02:43 +0000 -Subject: [PATCH 0427/1216] driver: char: rpivid: Add error handling to the +Subject: [PATCH 0427/1224] driver: char: rpivid: Add error handling to the legacy device load The return value from device_create for the legacy device was never @@ -344864,7 +344864,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c -index ab42526ea8cf..331e2e72aa4b 100644 +index ab42526ea8cf7..331e2e72aa4b1 100644 --- a/drivers/char/broadcom/rpivid-mem.c +++ b/drivers/char/broadcom/rpivid-mem.c @@ -201,9 +201,14 @@ static int rpivid_mem_probe(struct platform_device *pdev) @@ -344897,10 +344897,10 @@ index ab42526ea8cf..331e2e72aa4b 100644 2.18.4 -From f8f151fdadf005b98738f78add1c4daa5ee56be9 Mon Sep 17 00:00:00 2001 +From beded161cb59daed41d789cb2b359ea099440851 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 14:05:45 +0000 -Subject: [PATCH 0428/1216] driver: char: rpivid: Fix coding style whitespace +Subject: [PATCH 0428/1224] driver: char: rpivid: Fix coding style whitespace issues. Makes checkpatch happier. @@ -344911,7 +344911,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c -index 331e2e72aa4b..432fb05944f2 100644 +index 331e2e72aa4b1..432fb05944f2a 100644 --- a/drivers/char/broadcom/rpivid-mem.c +++ b/drivers/char/broadcom/rpivid-mem.c @@ -66,6 +66,7 @@ static int rpivid_mem_open(struct inode *inode, struct file *file) @@ -344934,10 +344934,10 @@ index 331e2e72aa4b..432fb05944f2 100644 2.18.4 -From 4299156d4a3dddc02d02f5070605ba470ab66557 Mon Sep 17 00:00:00 2001 +From daf1060ae4ea6c100d98b267acaa28cbbd895af1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 15 Jan 2020 14:07:16 +0000 -Subject: [PATCH 0429/1216] driver: char: rpimem: Add SPDX licence header. +Subject: [PATCH 0429/1224] driver: char: rpimem: Add SPDX licence header. Stops checkpatch complaining. @@ -344947,7 +344947,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c -index 432fb05944f2..fa97649b86c0 100644 +index 432fb05944f2a..fa97649b86c0b 100644 --- a/drivers/char/broadcom/rpivid-mem.c +++ b/drivers/char/broadcom/rpivid-mem.c @@ -1,3 +1,4 @@ @@ -344959,10 +344959,10 @@ index 432fb05944f2..fa97649b86c0 100644 2.18.4 -From 46ec713bf34741257a2505352de8ca8d536224bf Mon Sep 17 00:00:00 2001 +From c39eb015059d7bca4cb8d58e7d5b7d9dec9f2a41 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 Jan 2020 16:44:14 +0000 -Subject: [PATCH 0430/1216] driver: char: rpivid: Fix access to freed memory +Subject: [PATCH 0430/1224] 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. @@ -344976,7 +344976,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c -index fa97649b86c0..fbf3d4f3fe0c 100644 +index fa97649b86c0b..fbf3d4f3fe0cb 100644 --- a/drivers/char/broadcom/rpivid-mem.c +++ b/drivers/char/broadcom/rpivid-mem.c @@ -229,7 +229,7 @@ static int rpivid_mem_probe(struct platform_device *pdev) @@ -344992,10 +344992,10 @@ index fa97649b86c0..fbf3d4f3fe0c 100644 2.18.4 -From bd0a377129e4b74f89a6a3e42f6fc3fb28706658 Mon Sep 17 00:00:00 2001 +From 657c1b9029545abe4fc799ee733825f72ecd816a Mon Sep 17 00:00:00 2001 From: Willem Remie Date: Thu, 9 Jan 2020 21:16:49 +0100 -Subject: [PATCH 0431/1216] add BME680 to i2c-sensor overlay +Subject: [PATCH 0431/1224] add BME680 to i2c-sensor overlay --- arch/arm/boot/dts/overlays/README | 7 +++++-- @@ -345003,7 +345003,7 @@ Subject: [PATCH 0431/1216] add BME680 to i2c-sensor overlay 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index e40ab828022c..917ce600b4f4 100644 +index e40ab828022cb..917ce600b4f44 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1159,12 +1159,15 @@ Name: i2c-sensor @@ -345025,7 +345025,7 @@ index e40ab828022c..917ce600b4f4 100644 bmp180 Select the Bosch Sensortronic BMP180 diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts -index 777e4a68190a..40881d72a157 100644 +index 777e4a68190a4..40881d72a1574 100644 --- a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts @@ -216,10 +216,26 @@ @@ -345067,10 +345067,10 @@ index 777e4a68190a..40881d72a157 100644 2.18.4 -From 063d11f0aa8df7074b9a2d468e659330a3de400f Mon Sep 17 00:00:00 2001 +From 6e724d5b71180aab1c148db385c7539d36b03ae3 Mon Sep 17 00:00:00 2001 From: Willem Remie Date: Thu, 9 Jan 2020 21:54:11 +0100 -Subject: [PATCH 0432/1216] configs: Add BME680 +Subject: [PATCH 0432/1224] configs: Add BME680 --- arch/arm/configs/bcm2709_defconfig | 1 + @@ -345081,7 +345081,7 @@ Subject: [PATCH 0432/1216] configs: Add BME680 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 6ac0eccf7094..d45d8ce83729 100644 +index 6ac0eccf7094f..d45d8ce837299 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1285,6 +1285,7 @@ CONFIG_IIO_BUFFER_CB=m @@ -345093,7 +345093,7 @@ index 6ac0eccf7094..d45d8ce83729 100644 CONFIG_HDC100X=m CONFIG_HTU21=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 79c5c0d9ff61..5dc016474008 100644 +index 79c5c0d9ff61a..5dc0164740085 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1283,6 +1283,7 @@ CONFIG_IIO_BUFFER_CB=m @@ -345105,7 +345105,7 @@ index 79c5c0d9ff61..5dc016474008 100644 CONFIG_HDC100X=m CONFIG_HTU21=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 5e9a2a59c875..b1d7a3bb1ca0 100644 +index 5e9a2a59c8757..b1d7a3bb1ca0a 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1295,6 +1295,7 @@ CONFIG_IIO_BUFFER_CB=m @@ -345117,7 +345117,7 @@ index 5e9a2a59c875..b1d7a3bb1ca0 100644 CONFIG_HDC100X=m CONFIG_HTU21=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 9ee06bd5932e..acab5c6121f9 100644 +index 9ee06bd5932e7..acab5c6121f99 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1310,6 +1310,7 @@ CONFIG_IIO_BUFFER_CB=m @@ -345129,7 +345129,7 @@ index 9ee06bd5932e..acab5c6121f9 100644 CONFIG_HDC100X=m CONFIG_HTU21=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index d8efa2d79d10..48eb2e6e342b 100644 +index d8efa2d79d10a..48eb2e6e342b9 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1095,6 +1095,7 @@ CONFIG_IIO=m @@ -345144,10 +345144,10 @@ index d8efa2d79d10..48eb2e6e342b 100644 2.18.4 -From a84d8965799f471f5676766895d3377e0b4341c0 Mon Sep 17 00:00:00 2001 +From 552d06886e092a9dc705ec899b8250d7f005fbcc Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 7 Jan 2020 10:08:19 +0000 -Subject: [PATCH 0433/1216] dwc_otg: constrain endpoint max packet and transfer +Subject: [PATCH 0433/1224] dwc_otg: constrain endpoint max packet and transfer size on split IN The hcd would unconditionally set the transfer length to the endpoint @@ -345168,7 +345168,7 @@ Signed-off-by: Jonathan Bell 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c -index 9f2cd510c301..cba2aa07e8b8 100644 +index 9f2cd510c3015..cba2aa07e8b87 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c @@ -1813,7 +1813,7 @@ int fiq_fsm_queue_split_transaction(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh) @@ -345193,10 +345193,10 @@ index 9f2cd510c301..cba2aa07e8b8 100644 2.18.4 -From 38d450992f2894767cf71d4edd697a27fba3fd23 Mon Sep 17 00:00:00 2001 +From 1c9cb4aa5771ca280949846eeb9237b87f854480 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 8 Jan 2020 12:48:09 +0000 -Subject: [PATCH 0434/1216] dwc_otg: fiq_fsm: pause when cancelling split +Subject: [PATCH 0434/1224] dwc_otg: fiq_fsm: pause when cancelling split transactions Non-periodic splits will DMA to/from the driver-provided transfer_buffer, @@ -345214,7 +345214,7 @@ Signed-off-by: Jonathan Bell 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c -index cba2aa07e8b8..0f6645e2383c 100644 +index cba2aa07e8b87..0f6645e2383c0 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c @@ -175,6 +175,7 @@ static void kill_urbs_in_qh_list(dwc_otg_hcd_t * hcd, dwc_list_link_t * qh_list) @@ -345281,7 +345281,7 @@ index cba2aa07e8b8..0f6645e2383c 100644 dwc_otg_hc_halt(hcd->core_if, qh->channel, DWC_OTG_HC_XFER_URB_DEQUEUE); diff --git a/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h -index 0e9a34fe3a5c..7a77977c9ddf 100644 +index 0e9a34fe3a5c8..7a77977c9ddf9 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h +++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h @@ -27,6 +27,7 @@ @@ -345296,10 +345296,10 @@ index 0e9a34fe3a5c..7a77977c9ddf 100644 2.18.4 -From b841ab4848b92951f38c93840fdf778c5bae2e5e Mon Sep 17 00:00:00 2001 +From c0fd833b98df26bfe190d9bcdb5e470178896093 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Mon, 13 Jan 2020 15:54:55 +0000 -Subject: [PATCH 0435/1216] dwc_otg: fiq_fsm: add a barrier on entry into FIQ +Subject: [PATCH 0435/1224] dwc_otg: fiq_fsm: add a barrier on entry into FIQ handler(s) On BCM2835, there is no hardware guarantee that multiple outstanding @@ -345324,7 +345324,7 @@ Signed-off-by: Jonathan Bell 1 file changed, 6 insertions(+) diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c -index a86d8ed77140..490a7801e737 100644 +index a86d8ed771409..490a7801e737e 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c @@ -1259,6 +1259,9 @@ void notrace dwc_otg_fiq_fsm(struct fiq_state *state, int num_channels) @@ -345351,10 +345351,10 @@ index a86d8ed77140..490a7801e737 100644 2.18.4 -From af4b54e2c603c2f3e3106213a01e0471bdb6d6ae Mon Sep 17 00:00:00 2001 +From 6957a9930f419c335c65d004a018643426b07ffd Mon Sep 17 00:00:00 2001 From: Ed Spiridonov Date: Tue, 10 Dec 2019 22:45:04 +0300 -Subject: [PATCH 0436/1216] Add universal device tree overlay for SPI devices +Subject: [PATCH 0436/1224] 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! @@ -345375,7 +345375,7 @@ Signed-off-by: Ed Spiridonov create mode 100755 arch/arm/boot/dts/overlays/anyspi-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index e149956a45d3..c2c4834f0722 100644 +index e149956a45d3c..c2c4834f07225 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -15,6 +15,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -345387,7 +345387,7 @@ index e149956a45d3..c2c4834f0722 100644 applepi-dac.dtbo \ at86rf233.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 917ce600b4f4..c19139d7ed0d 100644 +index 917ce600b4f44..c19139d7ed0d5 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -441,6 +441,29 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec @@ -345422,7 +345422,7 @@ index 917ce600b4f4..c19139d7ed0d 100644 gesture sensor diff --git a/arch/arm/boot/dts/overlays/anyspi-overlay.dts b/arch/arm/boot/dts/overlays/anyspi-overlay.dts new file mode 100755 -index 000000000000..87523dcca318 +index 0000000000000..87523dcca318c --- /dev/null +++ b/arch/arm/boot/dts/overlays/anyspi-overlay.dts @@ -0,0 +1,205 @@ @@ -345635,11 +345635,11 @@ index 000000000000..87523dcca318 2.18.4 -From 9bbd87800ac28850ff58fb7108bc2e2f8554cff1 Mon Sep 17 00:00:00 2001 +From 3fb612689292d00cdce6cbc908b1511ce4c4eb57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?= Date: Tue, 21 Jan 2020 15:58:39 +0100 -Subject: [PATCH 0437/1216] sound: Add the HiFiBerry DAC+HD version +Subject: [PATCH 0437/1224] 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. @@ -345666,7 +345666,7 @@ Signed-off-by: Joerg Schambacher create mode 100644 sound/soc/bcm/hifiberry_dacplushd.c diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index c2c4834f0722..e5e7183d2cdb 100644 +index c2c4834f07225..e5e7183d2cdbe 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -57,6 +57,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -345678,7 +345678,7 @@ index c2c4834f0722..e5e7183d2cdb 100644 hifiberry-digi-pro.dtbo \ hy28a.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index c19139d7ed0d..aacdbb4ca735 100644 +index c19139d7ed0d5..aacdbb4ca735a 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -956,6 +956,12 @@ Load: dtoverlay=hifiberry-dacplusdsp @@ -345696,7 +345696,7 @@ index c19139d7ed0d..aacdbb4ca735 100644 Load: dtoverlay=hifiberry-digi diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts new file mode 100644 -index 000000000000..7bf0317ea83b +index 0000000000000..7bf0317ea83bd --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts @@ -0,0 +1,106 @@ @@ -345807,7 +345807,7 @@ index 000000000000..7bf0317ea83b + +}; diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index d45d8ce83729..c17a505f9da5 100644 +index d45d8ce837299..c17a505f9da52 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -950,6 +950,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m @@ -345819,7 +345819,7 @@ index d45d8ce83729..c17a505f9da5 100644 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 5dc016474008..6cb1124733bc 100644 +index 5dc0164740085..6cb1124733bc3 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -926,6 +926,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m @@ -345831,7 +345831,7 @@ index 5dc016474008..6cb1124733bc 100644 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index b1d7a3bb1ca0..dddf9b16d463 100644 +index b1d7a3bb1ca0a..dddf9b16d463b 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -942,6 +942,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m @@ -345843,7 +345843,7 @@ index b1d7a3bb1ca0..dddf9b16d463 100644 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index acab5c6121f9..a0605e2480af 100644 +index acab5c6121f99..a0605e2480afc 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -953,6 +953,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m @@ -345855,7 +345855,7 @@ index acab5c6121f9..a0605e2480af 100644 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 48eb2e6e342b..3adf9e47b802 100644 +index 48eb2e6e342b9..3adf9e47b802c 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -796,6 +796,7 @@ CONFIG_SND_SOC=m @@ -345867,7 +345867,7 @@ index 48eb2e6e342b..3adf9e47b802 100644 CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m CONFIG_SND_BCM2708_SOC_RPI_DAC=m diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index 98426fa4e1f9..53247319b0da 100644 +index 98426fa4e1f92..53247319b0da7 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -70,6 +70,9 @@ config COMMON_CLK_HI655X @@ -345881,7 +345881,7 @@ index 98426fa4e1f9..53247319b0da 100644 tristate diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index e01d58346f8a..ed32a1e569f6 100644 +index e01d58346f8a8..ed32a1e569f66 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o @@ -345894,7 +345894,7 @@ index e01d58346f8a..ed32a1e569f6 100644 obj-$(CONFIG_ARCH_MILBEAUT_M10V) += clk-milbeaut.o diff --git a/drivers/clk/clk-hifiberry-dachd.c b/drivers/clk/clk-hifiberry-dachd.c new file mode 100644 -index 000000000000..ec528a0aef36 +index 0000000000000..ec528a0aef36e --- /dev/null +++ b/drivers/clk/clk-hifiberry-dachd.c @@ -0,0 +1,333 @@ @@ -346232,7 +346232,7 @@ index 000000000000..ec528a0aef36 +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:clk-hifiberry-dachd"); diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index 57efe06bac74..0067bae41e48 100644 +index 57efe06bac746..0067bae41e48f 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -42,6 +42,14 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS @@ -346259,7 +346259,7 @@ index 57efe06bac74..0067bae41e48 100644 Say Y or M if you want to add support for HifiBerry DAC+ADC PRO. diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index 53909a7f3397..6ab480dc2566 100644 +index 53909a7f33975..6ab480dc25661 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -14,6 +14,7 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o @@ -346280,7 +346280,7 @@ index 53909a7f3397..6ab480dc2566 100644 obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP) += snd-soc-hifiberry-dacplusdsp.o diff --git a/sound/soc/bcm/hifiberry_dacplushd.c b/sound/soc/bcm/hifiberry_dacplushd.c new file mode 100644 -index 000000000000..79436dd0e06d +index 0000000000000..79436dd0e06da --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplushd.c @@ -0,0 +1,238 @@ @@ -346526,10 +346526,10 @@ index 000000000000..79436dd0e06d 2.18.4 -From ab3c5cdde46f3871332efb890c023f8eaa5ff903 Mon Sep 17 00:00:00 2001 +From 503ab294120e4987db80257365a8179923577e2e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Jan 2020 15:02:05 +0000 -Subject: [PATCH 0438/1216] configs: Add missing HIFIBERRYs to +Subject: [PATCH 0438/1224] configs: Add missing HIFIBERRYs to bcmrpi3_defconfig Signed-off-by: Phil Elwell @@ -346538,7 +346538,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 3adf9e47b802..ff65bc543f61 100644 +index 3adf9e47b802c..ff65bc543f61f 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -797,6 +797,9 @@ CONFIG_SND_BCM2835_SOC_I2S=m @@ -346555,10 +346555,10 @@ index 3adf9e47b802..ff65bc543f61 100644 2.18.4 -From 379e9d448c6df80f49750842276ddbb2eb35b368 Mon Sep 17 00:00:00 2001 +From ea703c7bd69db8fbd346c1b4bf8b260e70ccac8b Mon Sep 17 00:00:00 2001 From: Luke Hinds <7058938+lukehinds@users.noreply.github.com> Date: Wed, 22 Jan 2020 16:03:00 +0000 -Subject: [PATCH 0439/1216] Initialise rpi-firmware before clk-bcm2835 +Subject: [PATCH 0439/1224] 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 @@ -346581,7 +346581,7 @@ Co-authored-by: Phil Elwell 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 8175ecea0fd9..b12c63aa2b0b 100644 +index 8175ecea0fd9f..b12c63aa2b0b3 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -2403,7 +2403,7 @@ static int __init __bcm2835_clk_driver_init(void) @@ -346594,7 +346594,7 @@ index 8175ecea0fd9..b12c63aa2b0b 100644 MODULE_AUTHOR("Eric Anholt "); MODULE_DESCRIPTION("BCM2835 clock driver"); diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index 6ab3bec57532..4f3ab14d275a 100644 +index 6ab3bec57532e..4f3ab14d275a2 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -416,7 +416,7 @@ static int __init rpi_firmware_init(void) @@ -346610,11 +346610,11 @@ index 6ab3bec57532..4f3ab14d275a 100644 2.18.4 -From a8cdf5a86179cc96d7fc60c8764f3ee02e42d5cb Mon Sep 17 00:00:00 2001 +From fce9871adfbf136361d234d5e1e181885b216087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?= Date: Thu, 23 Jan 2020 13:32:13 +0100 -Subject: [PATCH 0440/1216] Fix master mode settings of HiFiBerry DAC+ADC PRO +Subject: [PATCH 0440/1224] Fix master mode settings of HiFiBerry DAC+ADC PRO card (#3424) This patch fixes the board DAI setting when in master-mode. @@ -346626,7 +346626,7 @@ Signed-off-by: Joerg Schambacher 1 file changed, 2 insertions(+) diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c -index cc33d4174839..06e0b6a8fda6 100644 +index cc33d41748396..06e0b6a8fda62 100644 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c @@ -285,6 +285,8 @@ static int snd_rpi_hifiberry_dacplusadcpro_init(struct snd_soc_pcm_runtime *rtd) @@ -346642,10 +346642,10 @@ index cc33d4174839..06e0b6a8fda6 100644 2.18.4 -From a4cb2c74b35c0a08ea27624bb6581d43cd467ea0 Mon Sep 17 00:00:00 2001 +From 400faf9ba6e3cb70f076dff9e1c6f404e5244442 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Jan 2020 09:02:37 +0000 -Subject: [PATCH 0441/1216] overlays: Use preferred compatible strings +Subject: [PATCH 0441/1224] overlays: Use preferred compatible strings Make sure all overlays have correct compatible strings before enabling the automated checking. @@ -346660,7 +346660,7 @@ Signed-off-by: Phil Elwell 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts -index 00e5d450a88b..07e70ab62cd4 100644 +index 00e5d450a88b1..07e70ab62cd48 100644 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts @@ -3,7 +3,7 @@ @@ -346673,7 +346673,7 @@ index 00e5d450a88b..07e70ab62cd4 100644 fragment@0 { target-path = "/clocks"; diff --git a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts -index ff3ef3942c6c..9110f5d34298 100644 +index ff3ef3942c6c0..9110f5d342988 100644 --- a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts +++ b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts @@ -3,7 +3,7 @@ @@ -346686,7 +346686,7 @@ index ff3ef3942c6c..9110f5d34298 100644 fragment@0 { target = <&i2s>; diff --git a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts -index abdeddd0f2c8..4ddbbfa04065 100644 +index abdeddd0f2c87..4ddbbfa040658 100644 --- a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts +++ b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts @@ -17,6 +17,8 @@ N.B.: @@ -346699,7 +346699,7 @@ index abdeddd0f2c8..4ddbbfa04065 100644 target = <&gpio>; __overlay__ { diff --git a/arch/arm/boot/dts/overlays/pwm-overlay.dts b/arch/arm/boot/dts/overlays/pwm-overlay.dts -index 27809e8dc746..92876ab3bc8c 100644 +index 27809e8dc7466..92876ab3bc8c5 100644 --- a/arch/arm/boot/dts/overlays/pwm-overlay.dts +++ b/arch/arm/boot/dts/overlays/pwm-overlay.dts @@ -15,6 +15,8 @@ N.B.: @@ -346712,7 +346712,7 @@ index 27809e8dc746..92876ab3bc8c 100644 target = <&gpio>; __overlay__ { diff --git a/arch/arm/boot/dts/overlays/smi-dev-overlay.dts b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts -index b610d8283608..bafab6c92506 100644 +index b610d82836081..bafab6c92506d 100644 --- a/arch/arm/boot/dts/overlays/smi-dev-overlay.dts +++ b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts @@ -5,6 +5,8 @@ @@ -346728,10 +346728,10 @@ index b610d8283608..bafab6c92506 100644 2.18.4 -From 16d706b2387bae19fdfc31e9c663c2f36eea072d Mon Sep 17 00:00:00 2001 +From 860ccc1915b30e398f41c19a004c5c1986b394ae Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Jan 2020 11:38:28 +0000 -Subject: [PATCH 0442/1216] tty: amba-pl011: Add un/throttle support +Subject: [PATCH 0442/1224] 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 @@ -346746,7 +346746,7 @@ Signed-off-by: Phil Elwell 1 file changed, 28 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index 83676bc79a19..6d90ee44036b 100644 +index 83676bc79a195..6d90ee44036b3 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1326,6 +1326,32 @@ static void pl011_start_tx(struct uart_port *port) @@ -346795,17 +346795,17 @@ index 83676bc79a19..6d90ee44036b 100644 2.18.4 -From 94541e04d170ac5f345771a9ce661c73c16b9e1c Mon Sep 17 00:00:00 2001 +From 8209de102ea7ededc96238d5636b21e376fd6496 Mon Sep 17 00:00:00 2001 From: MikeDK Date: Sun, 26 Jan 2020 23:33:54 +0100 -Subject: [PATCH 0443/1216] Fix i2c-pwm-pca9685a overlay +Subject: [PATCH 0443/1224] Fix i2c-pwm-pca9685a overlay --- arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts -index 108165df165e..9bb16465a50e 100644 +index 108165df165ef..9bb16465a50e7 100644 --- a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts @@ -13,7 +13,7 @@ @@ -346821,10 +346821,10 @@ index 108165df165e..9bb16465a50e 100644 2.18.4 -From 75e3aa4be32101574894e845b515d95a51daf9f8 Mon Sep 17 00:00:00 2001 +From 3952eece2224a75df530cd60fd19996c821f2b70 Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Mon, 27 Jan 2020 17:45:51 +0100 -Subject: [PATCH 0444/1216] adds LED OFF feature to HiFiBerry DAC+ADC PRO sound +Subject: [PATCH 0444/1224] adds LED OFF feature to HiFiBerry DAC+ADC PRO sound card This adds a DT overlay parameter 'leds_off' which allows @@ -346839,7 +346839,7 @@ Signed-off-by: Joerg Schambacher 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index aacdbb4ca735..e4f7055898b2 100644 +index aacdbb4ca735a..e4f7055898b20 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -948,6 +948,8 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec @@ -346852,7 +346852,7 @@ index aacdbb4ca735..e4f7055898b2 100644 Name: hifiberry-dacplusdsp diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts -index 07e70ab62cd4..70a79bb1ec7d 100644 +index 07e70ab62cd48..70a79bb1ec7da 100644 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts @@ -60,5 +60,6 @@ @@ -346863,7 +346863,7 @@ index 07e70ab62cd4..70a79bb1ec7d 100644 }; }; diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c -index 06e0b6a8fda6..2883c3ce9488 100644 +index 06e0b6a8fda62..2883c3ce9488b 100644 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c @@ -54,6 +54,7 @@ struct pcm512x_priv { @@ -346920,10 +346920,10 @@ index 06e0b6a8fda6..2883c3ce9488 100644 2.18.4 -From e400ca5f5c9308048ea0d56f605084f80cdc0e4a Mon Sep 17 00:00:00 2001 +From 91ae3e4db4f27a1bbfd038ac423f9a1ec40c4bd9 Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Mon, 27 Jan 2020 20:37:34 +0100 -Subject: [PATCH 0445/1216] adds LED OFF feature to HiFiBerry DAC+ADC sound +Subject: [PATCH 0445/1224] adds LED OFF feature to HiFiBerry DAC+ADC sound card This adds a DT overlay parameter 'leds_off' which allows @@ -346938,7 +346938,7 @@ Signed-off-by: Joerg Schambacher 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index e4f7055898b2..d1dde84ebc6a 100644 +index e4f7055898b20..d1dde84ebc6a5 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -927,6 +927,8 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec @@ -346951,7 +346951,7 @@ index e4f7055898b2..d1dde84ebc6a 100644 Name: hifiberry-dacplusadcpro diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts -index 09adcea8fd37..308a9b4df6f5 100644 +index 09adcea8fd377..308a9b4df6f50 100644 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts @@ -67,5 +67,6 @@ @@ -346962,7 +346962,7 @@ index 09adcea8fd37..308a9b4df6f5 100644 }; }; diff --git a/sound/soc/bcm/hifiberry_dacplusadc.c b/sound/soc/bcm/hifiberry_dacplusadc.c -index ab454f2ecb17..ca763fea1d82 100644 +index ab454f2ecb17b..ca763fea1d823 100644 --- a/sound/soc/bcm/hifiberry_dacplusadc.c +++ b/sound/soc/bcm/hifiberry_dacplusadc.c @@ -54,6 +54,7 @@ struct pcm512x_priv { @@ -347007,10 +347007,10 @@ index ab454f2ecb17..ca763fea1d82 100644 2.18.4 -From 56c80b9ac64a74c63088d9ea87376021be9ae3b4 Mon Sep 17 00:00:00 2001 +From 463aa962ab9fdfd352238b184934493b47d059c3 Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Mon, 27 Jan 2020 20:58:24 +0100 -Subject: [PATCH 0446/1216] adds LED OFF feature to HiFiBerry DAC+/DAC+PRO +Subject: [PATCH 0446/1224] adds LED OFF feature to HiFiBerry DAC+/DAC+PRO sound cards This adds a DT overlay parameter 'leds_off' which allows @@ -347025,7 +347025,7 @@ Signed-off-by: Joerg Schambacher 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index d1dde84ebc6a..3f324380a9f2 100644 +index d1dde84ebc6a5..3f324380a9f2d 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -906,6 +906,8 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec @@ -347038,7 +347038,7 @@ index d1dde84ebc6a..3f324380a9f2 100644 Name: hifiberry-dacplusadc diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts -index 5cd14aac3e45..9d6b8ebdf11e 100644 +index 5cd14aac3e45f..9d6b8ebdf11e2 100644 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts @@ -55,5 +55,6 @@ @@ -347049,7 +347049,7 @@ index 5cd14aac3e45..9d6b8ebdf11e 100644 }; }; diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c -index fdf6e950abd8..4cde60a5b6f6 100644 +index fdf6e950abd8c..4cde60a5b6f6a 100644 --- a/sound/soc/bcm/hifiberry_dacplus.c +++ b/sound/soc/bcm/hifiberry_dacplus.c @@ -50,6 +50,7 @@ struct pcm512x_priv { @@ -347094,10 +347094,10 @@ index fdf6e950abd8..4cde60a5b6f6 100644 2.18.4 -From cc41f897362970f3a7d4d49e2636cb0a1e9f7e90 Mon Sep 17 00:00:00 2001 +From db44ad654688e43743a53e4b8ea26fd752ee28b6 Mon Sep 17 00:00:00 2001 From: gtrainavicius Date: Tue, 28 Jan 2020 14:16:37 +0200 -Subject: [PATCH 0447/1216] pisound: Added reading Pisound board hardware +Subject: [PATCH 0447/1224] 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: @@ -347110,7 +347110,7 @@ Signed-off-by: Giedrius 1 file changed, 59 insertions(+), 27 deletions(-) diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c -index c9a881cf8f7c..3d0861082c83 100644 +index c9a881cf8f7c7..3d0861082c83d 100644 --- a/sound/soc/bcm/pisound.c +++ b/sound/soc/bcm/pisound.c @@ -51,7 +51,8 @@ static void pisnd_spi_set_callback(pisnd_spi_recv_cb cb, void *data); @@ -347301,10 +347301,10 @@ index c9a881cf8f7c..3d0861082c83 100644 2.18.4 -From 2eae59ea358b9491236b342881a7a10b07d97819 Mon Sep 17 00:00:00 2001 +From 83de33f8ab5dfb30e541a9147e4b094235a51875 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 2 Aug 2019 15:20:11 +0100 -Subject: [PATCH 0448/1216] mmc: sdhci-iproc: Fix vmmc regulators on iProc +Subject: [PATCH 0448/1224] 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 @@ -347320,7 +347320,7 @@ Signed-off-by: Phil Elwell 1 file changed, 12 insertions(+) diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c -index f4f5f0a70cda..203940fd2900 100644 +index f4f5f0a70cda8..203940fd2900b 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -173,6 +173,17 @@ static unsigned int sdhci_iproc_get_max_clock(struct sdhci_host *host) @@ -347353,10 +347353,10 @@ index f4f5f0a70cda..203940fd2900 100644 2.18.4 -From 4b9f9a47125bec0e84eb4f1fa4da4c68af5caab7 Mon Sep 17 00:00:00 2001 +From f0321789209164a1f8bdc2ba417b0832938490eb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 30 Jul 2019 12:37:02 +0100 -Subject: [PATCH 0449/1216] ARM: dts: Declare RPi 4B SD card power regulator +Subject: [PATCH 0449/1224] 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 @@ -347370,7 +347370,7 @@ Signed-off-by: Phil Elwell 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 78273ec873ff..84915c8c3930 100644 +index 78273ec873ffe..84915c8c3930c 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -122,6 +122,16 @@ @@ -347399,7 +347399,7 @@ index 78273ec873ff..84915c8c3930 100644 &genet { diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 6cb1124733bc..32d3f6454578 100644 +index 6cb1124733bc3..32d3f64545782 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -696,7 +696,7 @@ CONFIG_MFD_ARIZONA_I2C=m @@ -347412,7 +347412,7 @@ index 6cb1124733bc..32d3f6454578 100644 CONFIG_REGULATOR_ARIZONA_MICSUPP=m CONFIG_REGULATOR_GPIO=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index a0605e2480af..315576a5b957 100644 +index a0605e2480afc..315576a5b9579 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -723,7 +723,7 @@ CONFIG_MFD_ARIZONA_I2C=m @@ -347428,10 +347428,10 @@ index a0605e2480af..315576a5b957 100644 2.18.4 -From dde515c746984d4fb221a121280fafd38cf51ef1 Mon Sep 17 00:00:00 2001 +From 8d3840ef137446f5f30b0ea08ce2cf18b26d5d4f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 11:41:25 +0100 -Subject: [PATCH 0450/1216] pcie-brcmstb: Bounce buffer support is for +Subject: [PATCH 0450/1224] pcie-brcmstb: Bounce buffer support is for BCM2711B0 Add a new compatible string to identify BCM2711B0, as later revisions @@ -347443,7 +347443,7 @@ Signed-off-by: Phil Elwell 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index e646818ff21c..fb777a4e4750 100644 +index e646818ff21c3..fb777a4e47502 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -206,6 +206,8 @@ enum pcie_type { @@ -347523,10 +347523,10 @@ index e646818ff21c..fb777a4e4750 100644 2.18.4 -From 98c7f3184ce899b13367c027d06de417d3bd23ef Mon Sep 17 00:00:00 2001 +From 1fa9ea2bc9e8098501ecd5bec0ec0b76ff4f5049 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 11:43:03 +0100 -Subject: [PATCH 0451/1216] bcm2838.dtsi: Use BCM2711 PCIe compatible string +Subject: [PATCH 0451/1224] 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 @@ -347541,7 +347541,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi -index 60c706b4def0..847dc7e35c94 100644 +index 60c706b4def06..847dc7e35c945 100644 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ b/arch/arm/boot/dts/bcm2838.dtsi @@ -314,7 +314,8 @@ @@ -347558,10 +347558,10 @@ index 60c706b4def0..847dc7e35c94 100644 2.18.4 -From 975e1bc16d66848c23131c435af0a4cbdd7436c5 Mon Sep 17 00:00:00 2001 +From af8b7ba7aac9f16e87b91989d6e7bec8ebeaa50d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 11:29:06 +0000 -Subject: [PATCH 0452/1216] ARM: dts: Remove bcm2838-rpi-4-b.dts +Subject: [PATCH 0452/1224] 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. @@ -347574,7 +347574,7 @@ Signed-off-by: Phil Elwell delete mode 100644 arch/arm/boot/dts/bcm2838-rpi-4-b.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index e6832866849d..75436a5fc812 100644 +index e6832866849dd..75436a5fc8121 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -97,7 +97,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -347587,7 +347587,7 @@ index e6832866849d..75436a5fc812 100644 dtb-$(CONFIG_ARCH_BCM_5301X) += \ diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts deleted file mode 100644 -index 7c3fc83fe66e..000000000000 +index 7c3fc83fe66eb..0000000000000 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts +++ /dev/null @@ -1,134 +0,0 @@ @@ -347729,10 +347729,10 @@ index 7c3fc83fe66e..000000000000 2.18.4 -From 70d8e641ead6377060fc514caa12f367957faea1 Mon Sep 17 00:00:00 2001 +From 350f2761b28be1e82c49a21775367953d45b27fc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 09:35:19 +0000 -Subject: [PATCH 0453/1216] tty: amba-pl011: Avoid rare write-when-full error +Subject: [PATCH 0453/1224] 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 @@ -347759,7 +347759,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index 6d90ee44036b..3cd3028827d2 100644 +index 6d90ee44036b3..3cd3028827d23 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1447,6 +1447,10 @@ static bool pl011_tx_chars(struct uart_amba_port *uap, bool from_irq) @@ -347777,10 +347777,10 @@ index 6d90ee44036b..3cd3028827d2 100644 2.18.4 -From 82bbde7b70e49bf9e007a46315d6c50c2886c8a0 Mon Sep 17 00:00:00 2001 +From cfd87be35784b34adedd30ca7a82f9f223488a6c Mon Sep 17 00:00:00 2001 From: Tim Gover <990920+timg236@users.noreply.github.com> Date: Wed, 15 Jan 2020 11:26:19 +0000 -Subject: [PATCH 0454/1216] usb: xhci: Raspberry Pi FW loader for VIA VL805 +Subject: [PATCH 0454/1224] 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 @@ -347797,7 +347797,7 @@ Signed-off-by: Tim Gover 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c -index f6d04491df60..702d7015dfd1 100644 +index f6d04491df608..702d7015dfd15 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c @@ -18,7 +18,7 @@ @@ -347853,7 +347853,7 @@ index f6d04491df60..702d7015dfd1 100644 /* Wait for the host controller to be ready before writing any diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index ae71820af8e5..05c6989ec4c6 100644 +index ae71820af8e59..05c6989ec4c66 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -95,7 +95,7 @@ enum rpi_firmware_property_tag { @@ -347869,10 +347869,10 @@ index ae71820af8e5..05c6989ec4c6 100644 2.18.4 -From 29ee19d5113265b4a6330acd90eb5db1dca462fc Mon Sep 17 00:00:00 2001 +From 3075fe49eae127f27dba8e095faba5799e41271c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jan 2020 14:32:51 +0000 -Subject: [PATCH 0455/1216] overlays: Correct the eth_led* colour assignments +Subject: [PATCH 0455/1224] overlays: Correct the eth_led* colour assignments See: https://github.com/raspberrypi/firmware/issues/1311 @@ -347882,7 +347882,7 @@ Signed-off-by: Phil Elwell 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 3f324380a9f2..4032e1120d03 100644 +index 3f324380a9f2d..4032e1120d037 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -109,27 +109,28 @@ Params: @@ -347926,10 +347926,10 @@ index 3f324380a9f2..4032e1120d03 100644 2.18.4 -From ab6ba1821d72a6f075499004cb878af6d9af5ee5 Mon Sep 17 00:00:00 2001 +From d91f91143aeb50324dc19992ca8836bc31177bfb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 30 Jan 2020 12:42:07 +0000 -Subject: [PATCH 0456/1216] Revert "staging: vchiq_arm: Register a platform +Subject: [PATCH 0456/1224] Revert "staging: vchiq_arm: Register a platform device for audio" This reverts commit 25c7597af20d2b1d042bafd9be84eaa69c1690b7. @@ -347938,7 +347938,7 @@ This reverts commit 25c7597af20d2b1d042bafd9be84eaa69c1690b7. 1 file changed, 2 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index d84f7324fe14..7a9de9d0193c 100644 +index d84f7324fe148..7a9de9d0193c2 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -139,7 +139,6 @@ static struct vchiq_state g_state; @@ -347961,10 +347961,10 @@ index d84f7324fe14..7a9de9d0193c 100644 2.18.4 -From f18af1621bd0c57080e1dbc1b9e110ae4a9b306f Mon Sep 17 00:00:00 2001 +From 2f483ae71e9e48332902cfff839fa32cca1e6cbb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jan 2020 09:47:00 +0000 -Subject: [PATCH 0457/1216] ARM: dts: Add sd_poll_once dtparam to bcm283x/2711 +Subject: [PATCH 0457/1224] 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 @@ -347985,7 +347985,7 @@ Signed-off-by: Phil Elwell 3 files changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi -index ce9795dad99f..65a47168f1b6 100644 +index ce9795dad99f3..65a47168f1b6e 100644 --- a/arch/arm/boot/dts/bcm2708-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi @@ -92,6 +92,7 @@ @@ -347997,7 +347997,7 @@ index ce9795dad99f..65a47168f1b6 100644 sd_pio_limit = <&sdhost>,"brcm,pio-limit:0"; sd_debug = <&sdhost>,"brcm,debug"; diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 84915c8c3930..ccdabb503953 100644 +index 84915c8c3930c..ccdabb5039534 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -363,5 +363,7 @@ @@ -348009,7 +348009,7 @@ index 84915c8c3930..ccdabb503953 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 4032e1120d03..699bf9a2fa85 100644 +index 4032e1120d037..699bf9a2fa858 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -165,6 +165,13 @@ Params: @@ -348030,10 +348030,10 @@ index 4032e1120d03..699bf9a2fa85 100644 2.18.4 -From 16d0a3ce1485a6e4afacc0d8d53e7d58e34cc32d Mon Sep 17 00:00:00 2001 +From aa8e81fb6a51ceae686a4e4915903f01eea51b16 Mon Sep 17 00:00:00 2001 From: MikeDK Date: Fri, 31 Jan 2020 10:57:21 +0100 -Subject: [PATCH 0458/1216] overlays: Add ssd1306-spi, ssh1106-spi, +Subject: [PATCH 0458/1224] overlays: Add ssd1306-spi, ssh1106-spi, ssd-1351-spi Add overlays for SSD1306, SH1106 and SSD1351 based OLED displays. @@ -348055,7 +348055,7 @@ Signed-off-by: Michael Kaplan create mode 100644 arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index e5e7183d2cdb..724229c38632 100644 +index e5e7183d2cdbe..724229c386323 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -145,6 +145,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -348076,7 +348076,7 @@ index e5e7183d2cdb..724229c38632 100644 sx150x.dtbo \ tc358743.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 699bf9a2fa85..96994067a2a3 100644 +index 699bf9a2fa858..96994067a2a3b 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2145,6 +2145,18 @@ Params: overclock_50 Clock (in MHz) to use when the MMC framework @@ -348130,7 +348130,7 @@ index 699bf9a2fa85..96994067a2a3 100644 Load: dtoverlay=superaudioboard,= diff --git a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts new file mode 100644 -index 000000000000..70d7bb6faee9 +index 0000000000000..70d7bb6faee94 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts @@ -0,0 +1,84 @@ @@ -348220,7 +348220,7 @@ index 000000000000..70d7bb6faee9 +}; diff --git a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts new file mode 100644 -index 000000000000..74635705273e +index 0000000000000..74635705273eb --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts @@ -0,0 +1,84 @@ @@ -348310,7 +348310,7 @@ index 000000000000..74635705273e +}; diff --git a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts new file mode 100644 -index 000000000000..0eb1451b36c0 +index 0000000000000..0eb1451b36c07 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts @@ -0,0 +1,83 @@ @@ -348401,10 +348401,10 @@ index 000000000000..0eb1451b36c0 2.18.4 -From 38294b6a371c87df994af77bd7e4224aa758c019 Mon Sep 17 00:00:00 2001 +From e4421b96c350a26c587e4eee100c563d7c9adb3b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 12:42:27 +0000 -Subject: [PATCH 0459/1216] configs: Add NFS 4.2 support +Subject: [PATCH 0459/1224] configs: Add NFS 4.2 support See: https://github.com/raspberrypi/linux/issues/3397 @@ -348418,7 +348418,7 @@ Signed-off-by: Phil Elwell 5 files changed, 6 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index c17a505f9da5..74a2a8ceb011 100644 +index c17a505f9da52..74a2a8ceb011c 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1356,6 +1356,7 @@ CONFIG_NFS_V3_ACL=y @@ -348430,7 +348430,7 @@ index c17a505f9da5..74a2a8ceb011 100644 CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 32d3f6454578..5956da1236dc 100644 +index 32d3f64545782..5956da1236dcf 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1355,6 +1355,7 @@ CONFIG_NFS_V3_ACL=y @@ -348442,7 +348442,7 @@ index 32d3f6454578..5956da1236dc 100644 CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index dddf9b16d463..83647007447a 100644 +index dddf9b16d463b..83647007447a0 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1366,6 +1366,7 @@ CONFIG_NFS_V3_ACL=y @@ -348454,7 +348454,7 @@ index dddf9b16d463..83647007447a 100644 CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 315576a5b957..6b4eae39fee6 100644 +index 315576a5b9579..6b4eae39fee66 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1382,6 +1382,7 @@ CONFIG_NFS_V3_ACL=y @@ -348466,7 +348466,7 @@ index 315576a5b957..6b4eae39fee6 100644 CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index ff65bc543f61..4688da5d2e64 100644 +index ff65bc543f61f..4688da5d2e645 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1162,6 +1162,8 @@ CONFIG_NFS_FS=y @@ -348482,10 +348482,10 @@ index ff65bc543f61..4688da5d2e64 100644 2.18.4 -From 937c545c4ac157644c49dcd91bf01c3fd01bb16f Mon Sep 17 00:00:00 2001 +From fe5ade74c00812b3d0fe9c4a274a639544349b3f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 13:03:21 +0000 -Subject: [PATCH 0460/1216] overlays: dwc2: Increase RX FIFO size +Subject: [PATCH 0460/1224] 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 @@ -348507,7 +348507,7 @@ Signed-off-by: Phil Elwell 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/dwc2-overlay.dts b/arch/arm/boot/dts/overlays/dwc2-overlay.dts -index 732adbe3faaf..0d83e344ad97 100644 +index 732adbe3faaf9..0d83e344ad973 100644 --- a/arch/arm/boot/dts/overlays/dwc2-overlay.dts +++ b/arch/arm/boot/dts/overlays/dwc2-overlay.dts @@ -12,7 +12,7 @@ @@ -348520,7 +348520,7 @@ index 732adbe3faaf..0d83e344ad97 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts -index 6112640837fc..96837d962188 100644 +index 6112640837fc0..96837d962188c 100644 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts @@ -123,7 +123,7 @@ @@ -348536,10 +348536,10 @@ index 6112640837fc..96837d962188 100644 2.18.4 -From 7be6070d188c8aa118f42224d4ebda5c71ebf1e2 Mon Sep 17 00:00:00 2001 +From e465ea00686540f595c77af701dbd171e20b7734 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 15:22:55 +0000 -Subject: [PATCH 0461/1216] overlays: Fix mcp23017's addr parameter +Subject: [PATCH 0461/1224] 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 @@ -348558,7 +348558,7 @@ Signed-off-by: Phil Elwell 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts -index 16af971c3bdb..c546d8ba7e6d 100644 +index 16af971c3bdb7..c546d8ba7e6d2 100644 --- a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts +++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts @@ -48,15 +48,13 @@ @@ -348588,10 +348588,10 @@ index 16af971c3bdb..c546d8ba7e6d 100644 2.18.4 -From 31d2f3b03a2b7dabd33b8d1de519a32b5a8f3c75 Mon Sep 17 00:00:00 2001 +From cf639b37e4be7962de95d398759a4c2b27dd0d1f Mon Sep 17 00:00:00 2001 From: Michael Kaplan Date: Wed, 5 Feb 2020 10:27:23 +0100 -Subject: [PATCH 0462/1216] overlays: add hdmi-backlight-hwhack-gpio-overlay +Subject: [PATCH 0462/1224] overlays: add hdmi-backlight-hwhack-gpio-overlay This is a Devicetree overlay for GPIO based backlight on/off capability. @@ -348612,7 +348612,7 @@ Signed-off-by: Michael Kaplan create mode 100644 arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 724229c38632..66f5be258aa5 100644 +index 724229c386323..66f5be258aa5c 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -51,6 +51,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -348624,7 +348624,7 @@ index 724229c38632..66f5be258aa5 100644 hifiberry-dac.dtbo \ hifiberry-dacplus.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 96994067a2a3..ac1f69c9e4e2 100644 +index 96994067a2a3b..ac1f69c9e4e23 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -883,6 +883,20 @@ Params: pin_d4 GPIO pin for data pin D4 (default 6) @@ -348650,7 +348650,7 @@ index 96994067a2a3..ac1f69c9e4e2 100644 Load: dtoverlay=hifiberry-amp diff --git a/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts new file mode 100644 -index 000000000000..50b9a2665c80 +index 0000000000000..50b9a2665c80b --- /dev/null +++ b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts @@ -0,0 +1,47 @@ @@ -348705,10 +348705,10 @@ index 000000000000..50b9a2665c80 2.18.4 -From e38ab4ef0bedc1ccf6dd5e8a4d89d2e68b822732 Mon Sep 17 00:00:00 2001 +From a4de1a16c8c7216838d09f344eb0570e2e540ba3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 Nov 2019 16:28:10 +0000 -Subject: [PATCH 0463/1216] Revert "brcmfmac: Disable power management" +Subject: [PATCH 0463/1224] 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 @@ -348725,7 +348725,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 4b97dfcda3cd..4beef16e328f 100644 +index 4b97dfcda3cd3..4beef16e328ff 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -2769,8 +2769,6 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev, @@ -348750,10 +348750,10 @@ index 4b97dfcda3cd..4beef16e328f 100644 2.18.4 -From e113390a8861f181c7a5afc97baa5892c22bfc58 Mon Sep 17 00:00:00 2001 +From d2520cfe768f1fd66e9f0a23b20001d006f3cac5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 09:32:22 +0000 -Subject: [PATCH 0464/1216] brcmfmac: Increase power saving delay to 2s +Subject: [PATCH 0464/1224] 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, @@ -348765,7 +348765,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 4beef16e328f..16bfcbe191c2 100644 +index 4beef16e328ff..16bfcbe191c2d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -2782,7 +2782,7 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev, @@ -348781,10 +348781,10 @@ index 4beef16e328f..16bfcbe191c2 100644 2.18.4 -From f8eb910274633944a7db90306b72b7bb6e0e7f3a Mon Sep 17 00:00:00 2001 +From 9e6373b66474b5e599d31331156512280fcb0ff2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jan 2020 11:39:39 +0000 -Subject: [PATCH 0465/1216] ARM: dts: Revert all changes to upstream dts files +Subject: [PATCH 0465/1224] 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. @@ -348808,7 +348808,7 @@ Signed-off-by: Phil Elwell 14 files changed, 1068 insertions(+), 511 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index ccdabb503953..b693304cc0e5 100644 +index ccdabb5039534..b693304cc0e56 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -1,54 +1,57 @@ @@ -349218,7 +349218,7 @@ index ccdabb503953..b693304cc0e5 100644 / { diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index f134aba2badb..e2f6ffb00aa9 100644 +index f134aba2badbc..e2f6ffb00aa94 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -1,44 +1,890 @@ @@ -350134,7 +350134,7 @@ index f134aba2badb..e2f6ffb00aa9 100644 + interrupts = ; }; diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi -index dc67679a3a04..fe1ab40c7f22 100644 +index dc67679a3a041..fe1ab40c7f224 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -8,6 +8,47 @@ @@ -350310,7 +350310,7 @@ index dc67679a3a04..fe1ab40c7f22 100644 + dma-names = "tx", "rx"; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts -index 0cc6355a8c06..6c8ce39833bf 100644 +index 0cc6355a8c06e..6c8ce39833bf6 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -3,7 +3,6 @@ @@ -350322,7 +350322,7 @@ index 0cc6355a8c06..6c8ce39833bf 100644 / { compatible = "raspberrypi,model-a-plus", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts -index 21593978e851..17fdd48346ff 100644 +index 21593978e8513..17fdd48346ffb 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -3,7 +3,6 @@ @@ -350334,7 +350334,7 @@ index 21593978e851..17fdd48346ff 100644 / { compatible = "raspberrypi,model-a", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts -index 7c63ba90b827..b0355c229cdc 100644 +index 7c63ba90b827c..b0355c229cdc2 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -4,7 +4,6 @@ @@ -350346,7 +350346,7 @@ index 7c63ba90b827..b0355c229cdc 100644 / { compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts -index 83e54a5fa3b4..33b3b5c02521 100644 +index 83e54a5fa3b40..33b3b5c025219 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -4,7 +4,6 @@ @@ -350358,7 +350358,7 @@ index 83e54a5fa3b4..33b3b5c02521 100644 / { compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts -index c9d04b1f14fd..2b69957e0113 100644 +index c9d04b1f14fd1..2b69957e0113e 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -4,7 +4,6 @@ @@ -350370,7 +350370,7 @@ index c9d04b1f14fd..2b69957e0113 100644 / { compatible = "raspberrypi,model-b", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts -index 42ce8b606354..6dd93c6f4966 100644 +index 42ce8b6063547..6dd93c6f49666 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -7,7 +7,6 @@ @@ -350382,7 +350382,7 @@ index 42ce8b606354..6dd93c6f4966 100644 / { compatible = "raspberrypi,model-zero", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index c77971e27175..394c8a71b13b 100644 +index c77971e27175a..394c8a71b13be 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -29,22 +29,6 @@ @@ -350445,7 +350445,7 @@ index c77971e27175..394c8a71b13b 100644 - power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>; -}; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts -index 6b0a6d5d5ca4..0455a680394a 100644 +index 6b0a6d5d5ca42..0455a680394a2 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -4,7 +4,6 @@ @@ -350457,7 +350457,7 @@ index 6b0a6d5d5ca4..0455a680394a 100644 / { compatible = "raspberrypi,2-model-b", "brcm,bcm2836"; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index 3d03e7d0fbf0..054ecaa355c9 100644 +index 3d03e7d0fbf0d..054ecaa355c9a 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -4,7 +4,6 @@ @@ -350469,7 +350469,7 @@ index 3d03e7d0fbf0..054ecaa355c9 100644 / { compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi -index 7c6c054459b7..70bece63f9a7 100644 +index 7c6c054459b72..70bece63f9a74 100644 --- a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi @@ -29,9 +29,6 @@ @@ -350499,7 +350499,7 @@ index 7c6c054459b7..70bece63f9a7 100644 - }; -}; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 3706a795b586..202a61f574c7 100644 +index 3706a795b586c..202a61f574c73 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -35,8 +35,6 @@ @@ -350742,10 +350742,10 @@ index 3706a795b586..202a61f574c7 100644 2.18.4 -From 9498910356b2c043506015bdcc369f567511fe9a Mon Sep 17 00:00:00 2001 +From f7bf1e94b992d8b5cfdcca601d93f294b01135cb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 16:53:13 +0000 -Subject: [PATCH 0466/1216] ARM: dts: Clean out downstream BCM2711/2838 files +Subject: [PATCH 0466/1224] ARM: dts: Clean out downstream BCM2711/2838 files Signed-off-by: Phil Elwell --- @@ -350763,7 +350763,7 @@ Signed-off-by: Phil Elwell diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts deleted file mode 100644 -index b693304cc0e5..000000000000 +index b693304cc0e56..0000000000000 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ /dev/null @@ -1,157 +0,0 @@ @@ -350926,7 +350926,7 @@ index b693304cc0e5..000000000000 -}; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi deleted file mode 100644 -index d8ffaab8e86a..000000000000 +index d8ffaab8e86aa..0000000000000 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ /dev/null @@ -1,7 +0,0 @@ @@ -350939,7 +350939,7 @@ index d8ffaab8e86a..000000000000 -}; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi deleted file mode 100644 -index e2f6ffb00aa9..000000000000 +index e2f6ffb00aa94..0000000000000 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ /dev/null @@ -1,890 +0,0 @@ @@ -351835,7 +351835,7 @@ index e2f6ffb00aa9..000000000000 -}; diff --git a/arch/arm/boot/dts/bcm2838-rpi.dtsi b/arch/arm/boot/dts/bcm2838-rpi.dtsi deleted file mode 100644 -index 140cfa312d1a..000000000000 +index 140cfa312d1ae..0000000000000 --- a/arch/arm/boot/dts/bcm2838-rpi.dtsi +++ /dev/null @@ -1,25 +0,0 @@ @@ -351866,7 +351866,7 @@ index 140cfa312d1a..000000000000 -}; diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi deleted file mode 100644 -index 847dc7e35c94..000000000000 +index 847dc7e35c945..0000000000000 --- a/arch/arm/boot/dts/bcm2838.dtsi +++ /dev/null @@ -1,733 +0,0 @@ @@ -352607,10 +352607,10 @@ index 847dc7e35c94..000000000000 2.18.4 -From 1e75702c6f04f236d12ef93d4533a4d475484441 Mon Sep 17 00:00:00 2001 +From 0b0a05311947e8225c6ca222f4f4475f47bc2f03 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 6 Oct 2019 15:41:25 +0200 -Subject: [PATCH 0467/1216] ARM: dts: Add minimal Raspberry Pi 4 support +Subject: [PATCH 0467/1224] 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 @@ -352639,7 +352639,7 @@ Acked-by: Florian Fanelli create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 75436a5fc812..54f3c1d1e9f5 100644 +index 75436a5fc8121..54f3c1d1e9f58 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -97,6 +97,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -352652,7 +352652,7 @@ index 75436a5fc812..54f3c1d1e9f5 100644 dtb-$(CONFIG_ARCH_BCM_5301X) += \ diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts new file mode 100644 -index 000000000000..cccc1ccd19be +index 0000000000000..cccc1ccd19be5 --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -0,0 +1,123 @@ @@ -352781,7 +352781,7 @@ index 000000000000..cccc1ccd19be +}; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi new file mode 100644 -index 000000000000..ac83dac2e6ba +index 0000000000000..ac83dac2e6ba6 --- /dev/null +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -0,0 +1,844 @@ @@ -353631,7 +353631,7 @@ index 000000000000..ac83dac2e6ba +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi new file mode 100644 -index 000000000000..0ff0e9e25327 +index 0000000000000..0ff0e9e253272 --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi @@ -0,0 +1,7 @@ @@ -353646,10 +353646,10 @@ index 000000000000..0ff0e9e25327 2.18.4 -From de5e3746d809cb82825d5bf123ba9c5bdaac5f2a Mon Sep 17 00:00:00 2001 +From d07fcf610118ad3a6517c0f14ed2df11ad24f7a8 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 6 Nov 2019 10:59:44 +0100 -Subject: [PATCH 0468/1216] ARM: dts: bcm2711: force CMA into first GB of +Subject: [PATCH 0468/1224] ARM: dts: bcm2711: force CMA into first GB of memory arm64 places the CMA in ZONE_DMA32, which is not good enough for the @@ -353664,7 +353664,7 @@ Signed-off-by: Florian Fainelli 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index ac83dac2e6ba..34d24fe272e2 100644 +index ac83dac2e6ba6..34d24fe272e27 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -12,6 +12,26 @@ @@ -353698,10 +353698,10 @@ index ac83dac2e6ba..34d24fe272e2 100644 2.18.4 -From 97b77307d216250e78c07c14d7335d223bfc1c7c Mon Sep 17 00:00:00 2001 +From 36ad4620f448c4caca15d2af9e62a721f1b06d76 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 11 Nov 2019 20:49:26 +0100 -Subject: [PATCH 0469/1216] ARM: dts: bcm2711-rpi-4: Enable GENET support +Subject: [PATCH 0469/1224] 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 @@ -353717,7 +353717,7 @@ Signed-off-by: Florian Fainelli 2 files changed, 43 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index cccc1ccd19be..1b5a835f66bd 100644 +index cccc1ccd19be5..1b5a835f66bd3 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -19,6 +19,10 @@ @@ -353752,7 +353752,7 @@ index cccc1ccd19be..1b5a835f66bd 100644 &uart0 { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 34d24fe272e2..961bed832755 100644 +index 34d24fe272e27..961bed832755b 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -325,6 +325,32 @@ @@ -353792,10 +353792,10 @@ index 34d24fe272e2..961bed832755 100644 2.18.4 -From a85f43d98700c37efb7b1cf5779bce0a2ba00a23 Mon Sep 17 00:00:00 2001 +From 70596204d20d09bc7592f293b556da28dd226ca0 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 4 Dec 2019 13:56:33 +0100 -Subject: [PATCH 0470/1216] ARM: dts: bcm2711: fix soc's node dma-ranges +Subject: [PATCH 0470/1224] 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 @@ -353822,7 +353822,7 @@ Signed-off-by: Florian Fainelli 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 961bed832755..e2f6ffb00aa9 100644 +index 961bed832755b..e2f6ffb00aa94 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -43,7 +43,7 @@ @@ -353838,10 +353838,10 @@ index 961bed832755..e2f6ffb00aa9 100644 2.18.4 -From 603530c9d58de6a021b6d0dfbeb4d6c422a9f450 Mon Sep 17 00:00:00 2001 +From 711288010f3bcc2fc73a6b5f1f2df20a0c1448cf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jan 2020 15:48:00 +0000 -Subject: [PATCH 0471/1216] ARM: dts: Rebuild downstream DTS files +Subject: [PATCH 0471/1224] 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 @@ -353863,7 +353863,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm/boot/dts/bcm2711-rpi.dtsi diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi -index 65a47168f1b6..2c440e596bed 100644 +index 65a47168f1b6e..2c440e596bed9 100644 --- a/arch/arm/boot/dts/bcm2708-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi @@ -1,6 +1,7 @@ @@ -354029,7 +354029,7 @@ index 65a47168f1b6..2c440e596bed 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi -index 16a637363b5d..a32ff21613ed 100644 +index 16a637363b5df..a32ff21613eda 100644 --- a/arch/arm/boot/dts/bcm2708.dtsi +++ b/arch/arm/boot/dts/bcm2708.dtsi @@ -8,3 +8,7 @@ @@ -354041,7 +354041,7 @@ index 16a637363b5d..a32ff21613ed 100644 + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi -index 8bc67c0aaff1..68eafc1b281a 100644 +index 8bc67c0aaff17..68eafc1b281a5 100644 --- a/arch/arm/boot/dts/bcm2709.dtsi +++ b/arch/arm/boot/dts/bcm2709.dtsi @@ -16,3 +16,7 @@ @@ -354054,7 +354054,7 @@ index 8bc67c0aaff1..68eafc1b281a 100644 +}; diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi new file mode 100644 -index 000000000000..b7bf36061623 +index 0000000000000..b7bf360616235 --- /dev/null +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi @@ -0,0 +1,139 @@ @@ -354198,7 +354198,7 @@ index 000000000000..b7bf36061623 + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi -index 9eb6becfbe41..04669f512b4c 100644 +index 9eb6becfbe411..04669f512b4c9 100644 --- a/arch/arm/boot/dts/bcm270x.dtsi +++ b/arch/arm/boot/dts/bcm270x.dtsi @@ -17,32 +17,8 @@ @@ -354328,7 +354328,7 @@ index 9eb6becfbe41..04669f512b4c 100644 + dma-names = "tx", "rx"; }; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -index 55420ac94dcf..0c36c64aaeef 100644 +index 55420ac94dcfa..0c36c64aaeeff 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -170,6 +170,12 @@ @@ -354358,7 +354358,7 @@ index 55420ac94dcf..0c36c64aaeef 100644 }; }; diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi -index 5c45ded273fe..4e47480dd933 100644 +index 5c45ded273fe3..4e47480dd9338 100644 --- a/arch/arm/boot/dts/bcm2710.dtsi +++ b/arch/arm/boot/dts/bcm2710.dtsi @@ -23,3 +23,7 @@ @@ -354370,7 +354370,7 @@ index 5c45ded273fe..4e47480dd933 100644 + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 1b5a835f66bd..2013cf832567 100644 +index 1b5a835f66bd3..2013cf8325679 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -2,7 +2,6 @@ @@ -354708,7 +354708,7 @@ index 1b5a835f66bd..2013cf832567 100644 +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi new file mode 100644 -index 000000000000..6c8b26388229 +index 0000000000000..6c8b263882291 --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -0,0 +1,222 @@ @@ -354938,10 +354938,10 @@ index 000000000000..6c8b26388229 2.18.4 -From e2d9d1dfaee4805fa91600043208f7d67bbd72b4 Mon Sep 17 00:00:00 2001 +From a44b8e76beaedd2cdd840286b7766badeb879633 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 15:47:43 +0000 -Subject: [PATCH 0472/1216] Revert "bcm2711: Retain support for old dtbs" +Subject: [PATCH 0472/1224] Revert "bcm2711: Retain support for old dtbs" This reverts commit 61a505c739150c8dbb57a73db5c6c720d5160157. --- @@ -354951,7 +354951,7 @@ This reverts commit 61a505c739150c8dbb57a73db5c6c720d5160157. 3 files changed, 9 deletions(-) diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index b7491ddb6841..91a758c61f48 100644 +index b7491ddb68412..91a758c61f484 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -123,8 +123,6 @@ MACHINE_END @@ -354964,7 +354964,7 @@ index b7491ddb6841..91a758c61f48 100644 NULL }; diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index b12c63aa2b0b..a592fe8ec07d 100644 +index b12c63aa2b0b3..a592fe8ec07d2 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -2385,8 +2385,6 @@ static const struct cprman_plat_data cprman_bcm2711_plat_data = { @@ -354977,7 +354977,7 @@ index b12c63aa2b0b..a592fe8ec07d 100644 }; MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match); diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -index cf308212feca..43e3127e25cd 100644 +index cf308212fecab..43e3127e25cda 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -1079,11 +1079,6 @@ static const struct of_device_id bcm2835_pinctrl_match[] = { @@ -354996,10 +354996,10 @@ index cf308212feca..43e3127e25cd 100644 2.18.4 -From b8de26e3a463226202e9391f7761df643238a00d Mon Sep 17 00:00:00 2001 +From 0918288c4a016f1c103b9137e78159fca3aa76ed Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:26:18 +0000 -Subject: [PATCH 0473/1216] staging/vchiq_arm: Fix bcm2711 compatible string +Subject: [PATCH 0473/1224] staging/vchiq_arm: Fix bcm2711 compatible string Fixes: "vchiq: Add 36-bit address support" @@ -355009,7 +355009,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 7a9de9d0193c..3a120f3b33ad 100644 +index 7a9de9d0193c2..3a120f3b33ad4 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -150,7 +150,7 @@ static struct vchiq_drvdata bcm2836_drvdata = { @@ -355034,10 +355034,10 @@ index 7a9de9d0193c..3a120f3b33ad 100644 2.18.4 -From 4f1bbd69a8bb28467b8eecb5e13e06d62daaa323 Mon Sep 17 00:00:00 2001 +From a5d421feab233b9cf6a75977a2e42d79b17bff1a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:28:57 +0000 -Subject: [PATCH 0474/1216] bcm2835-dma: Correct SoC name +Subject: [PATCH 0474/1224] bcm2835-dma: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355047,7 +355047,7 @@ Fixes: "bcm2835-dma: Add proper 40-bit DMA support" 1 file changed, 137 insertions(+), 137 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 87fd58272e95..8d7c80536aa4 100644 +index 87fd58272e95f..8d7c80536aa42 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -38,7 +38,7 @@ @@ -355529,10 +355529,10 @@ index 87fd58272e95..8d7c80536aa4 100644 2.18.4 -From 5738015c7172070a0c572dcc213523206f6e657e Mon Sep 17 00:00:00 2001 +From a635907a0aa7b6f74b8b6fae95237c0813dc170c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:33:40 +0000 -Subject: [PATCH 0475/1216] thermal: brcmstb_thermal: Correct SoC name +Subject: [PATCH 0475/1224] thermal: brcmstb_thermal: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355544,7 +355544,7 @@ Signed-off-by: Phil Elwell 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c -index 7a7c6ad7b8a0..08f71fec5152 100644 +index 7a7c6ad7b8a04..08f71fec51520 100644 --- a/drivers/thermal/broadcom/brcmstb_thermal.c +++ b/drivers/thermal/broadcom/brcmstb_thermal.c @@ -290,7 +290,7 @@ static const struct thermal_zone_of_device_ops bcm7445_thermal_of_ops = { @@ -355582,10 +355582,10 @@ index 7a7c6ad7b8a0..08f71fec5152 100644 2.18.4 -From 140ae78b2ccec78b8acc88300a54b753f9966dac Mon Sep 17 00:00:00 2001 +From 12fde8b86743b2b19495a92f7f127ad553f3cb91 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:36:57 +0000 -Subject: [PATCH 0476/1216] hwrng: iproc-rng200: Correct SoC name +Subject: [PATCH 0476/1224] hwrng: iproc-rng200: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355598,7 +355598,7 @@ Signed-off-by: Phil Elwell 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig -index 31e243fc6c77..3b4e33fde141 100644 +index 31e243fc6c77f..3b4e33fde141b 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -94,7 +94,7 @@ config HW_RANDOM_IPROC_RNG200 @@ -355611,7 +355611,7 @@ index 31e243fc6c77..3b4e33fde141 100644 To compile this driver as a module, choose M here: the module will be called iproc-rng200 diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c -index 7b6966b7f602..857dacd49c3b 100644 +index 7b6966b7f6028..857dacd49c3b2 100644 --- a/drivers/char/hw_random/iproc-rng200.c +++ b/drivers/char/hw_random/iproc-rng200.c @@ -174,7 +174,7 @@ static int iproc_rng200_init(struct hwrng *rng) @@ -355657,10 +355657,10 @@ index 7b6966b7f602..857dacd49c3b 100644 2.18.4 -From 69bb5daf347580dd5c73908a6c33d8b273db4bb7 Mon Sep 17 00:00:00 2001 +From c2ebb6b7d56eb0180b3a9580dfa24dffd98ee66a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 09:39:40 +0000 -Subject: [PATCH 0477/1216] pcie-brcmstb: Correct SoC name +Subject: [PATCH 0477/1224] pcie-brcmstb: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355674,7 +355674,7 @@ Signed-off-by: Phil Elwell 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c -index fa81a98f6a81..3c148b0e82c1 100644 +index fa81a98f6a813..3c148b0e82c1d 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c @@ -91,8 +91,8 @@ struct dmabounce_device_info { @@ -355716,7 +355716,7 @@ index fa81a98f6a81..3c148b0e82c1 100644 return ret; diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c -index ac8dde3c030b..dec65992902e 100644 +index ac8dde3c030b7..dec65992902e4 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c @@ -93,8 +93,8 @@ struct dmabounce_device_info { @@ -355761,10 +355761,10 @@ index ac8dde3c030b..dec65992902e 100644 2.18.4 -From fbd4d97120a2070918829797d5cb1ecfce7938fe Mon Sep 17 00:00:00 2001 +From 4d64a5161ed0321b8eba6571b19d2a57c6d78810 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 31 Jan 2020 15:24:59 +0000 -Subject: [PATCH 0478/1216] ARM: dts: Correct SoC name +Subject: [PATCH 0478/1224] ARM: dts: Correct SoC name The Pi 4 SoC is called BCM2711, not BCM2838. @@ -355774,7 +355774,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 6c8b26388229..29e7aa15d5a3 100644 +index 6c8b263882291..29e7aa15d5a37 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -42,7 +42,7 @@ @@ -355817,10 +355817,10 @@ index 6c8b26388229..29e7aa15d5a3 100644 2.18.4 -From bff9fc43465f7f8b61205785c66e5301f0e0d21c Mon Sep 17 00:00:00 2001 +From bf20c265c8922aa240cf526541296d858af1862f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 1 Feb 2020 08:58:11 +0000 -Subject: [PATCH 0479/1216] ARM: dts: Remove CMA allocation from Pi 4 dts +Subject: [PATCH 0479/1224] 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. @@ -355837,7 +355837,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 2013cf832567..f5bd44ea2bf1 100644 +index 2013cf8325679..f5bd44ea2bf19 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -167,6 +167,10 @@ @@ -355855,10 +355855,10 @@ index 2013cf832567..f5bd44ea2bf1 100644 2.18.4 -From 27aced61e608f9c6243be3596145204661a9ab0e Mon Sep 17 00:00:00 2001 +From f8d830a803f9dbbc2c3cbb48483dbba59731e8cd Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 6 Dec 2018 19:28:55 +0100 -Subject: [PATCH 0480/1216] staging: vchiq_arm: Register a platform device for +Subject: [PATCH 0480/1224] staging: vchiq_arm: Register a platform device for audio Following Eric's commit 37b7b3087a2f ("staging/vc04_services: Register a @@ -355873,7 +355873,7 @@ Signed-off-by: Greg Kroah-Hartman 1 file changed, 2 insertions(+) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 3a120f3b33ad..57867b75d61a 100644 +index 3a120f3b33ad4..57867b75d61a2 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -139,6 +139,7 @@ static struct vchiq_state g_state; @@ -355896,10 +355896,10 @@ index 3a120f3b33ad..57867b75d61a 100644 2.18.4 -From 2885336508826a7b226ff80fa849e0755eb376d2 Mon Sep 17 00:00:00 2001 +From 6bbcf9fa31a01854a1feae900670ce162d87d1c6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 17:30:46 +0000 -Subject: [PATCH 0481/1216] staging: vchiq_arm: Give vchiq children DT nodes +Subject: [PATCH 0481/1224] 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 @@ -355913,7 +355913,7 @@ Signed-off-by: Phil Elwell 1 file changed, 8 insertions(+) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 57867b75d61a..a3fcb1830995 100644 +index 57867b75d61a2..a3fcb1830995c 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -3190,12 +3190,20 @@ vchiq_register_child(struct platform_device *pdev, const char *name) @@ -355941,10 +355941,10 @@ index 57867b75d61a..a3fcb1830995 100644 2.18.4 -From aef6e55fb1e76c8bbdaab2ecc511892d9466cd64 Mon Sep 17 00:00:00 2001 +From 4613136c281ae0ecd654c30bfc2c7895b4fef36e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 3 Feb 2020 17:03:29 +0000 -Subject: [PATCH 0482/1216] ARM: dts: Move audio node under the vchiq parent +Subject: [PATCH 0482/1224] 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 @@ -355962,7 +355962,7 @@ Signed-off-by: Phil Elwell 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi -index b7bf36061623..be11a4436279 100644 +index b7bf360616235..be11a44362799 100644 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi @@ -70,13 +70,6 @@ @@ -355993,7 +355993,7 @@ index b7bf36061623..be11a4436279 100644 + }; +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 29e7aa15d5a3..a71b2eb74723 100644 +index 29e7aa15d5a37..a71b2eb74723f 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -55,6 +55,8 @@ @@ -356028,10 +356028,10 @@ index 29e7aa15d5a3..a71b2eb74723 100644 2.18.4 -From 9f506b21ffd5153c8216ada4eb46d00fb79257a7 Mon Sep 17 00:00:00 2001 +From 7dc4d38685fe7471a93671e7478330e74b0daf03 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Feb 2020 13:34:08 +0000 -Subject: [PATCH 0483/1216] ARM: dts: bcm283x: Restore simple-bus to /clocks +Subject: [PATCH 0483/1224] 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 @@ -356051,7 +356051,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 202a61f574c7..18a95aaca191 100644 +index 202a61f574c73..18a95aaca1912 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -479,6 +479,10 @@ @@ -356069,10 +356069,10 @@ index 202a61f574c7..18a95aaca191 100644 2.18.4 -From 2e859294c8f9182f2af9ecc8f75706f78abfd93e Mon Sep 17 00:00:00 2001 +From 7b7ef6a752a4cfac5e47d0aa5d410a340ee2adbc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Feb 2020 10:22:48 +0000 -Subject: [PATCH 0484/1216] Revert "ARM: dts: bcm283x: Restore simple-bus to +Subject: [PATCH 0484/1224] Revert "ARM: dts: bcm283x: Restore simple-bus to /clocks" This reverts commit 894dece014e4df68c9f6a11a0761fba1fcfc844f. @@ -356081,7 +356081,7 @@ This reverts commit 894dece014e4df68c9f6a11a0761fba1fcfc844f. 1 file changed, 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 18a95aaca191..202a61f574c7 100644 +index 18a95aaca1912..202a61f574c73 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -479,10 +479,6 @@ @@ -356099,10 +356099,10 @@ index 18a95aaca191..202a61f574c7 100644 2.18.4 -From bcc43bfdb8cc223525dd935945bd297a18d3da8b Mon Sep 17 00:00:00 2001 +From d71598fa796262159d886fe01e688e3f64cf1675 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Feb 2020 11:22:40 +0000 -Subject: [PATCH 0485/1216] ARM: dts: overlays: Create custom clocks in / +Subject: [PATCH 0485/1224] 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. @@ -356124,7 +356124,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts -index dd69916fcb3c..873cb2fab52b 100644 +index dd69916fcb3c1..873cb2fab52ba 100644 --- a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts +++ b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts @@ -9,7 +9,7 @@ @@ -356137,7 +356137,7 @@ index dd69916fcb3c..873cb2fab52b 100644 boss_osc: boss_osc { compatible = "allo,dac-clk"; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts -index 9d6b8ebdf11e..2ca3d886ebb7 100644 +index 9d6b8ebdf11e2..2ca3d886ebb7a 100644 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts @@ -6,7 +6,7 @@ @@ -356150,7 +356150,7 @@ index 9d6b8ebdf11e..2ca3d886ebb7 100644 dacpro_osc: dacpro_osc { compatible = "hifiberry,dacpro-clk"; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts -index 308a9b4df6f5..540563dec10f 100644 +index 308a9b4df6f50..540563dec10f2 100644 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts @@ -6,7 +6,7 @@ @@ -356163,7 +356163,7 @@ index 308a9b4df6f5..540563dec10f 100644 dacpro_osc: dacpro_osc { compatible = "hifiberry,dacpro-clk"; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts -index 70a79bb1ec7d..cafa2ccd7ff7 100644 +index 70a79bb1ec7da..cafa2ccd7ff71 100644 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts @@ -6,7 +6,7 @@ @@ -356176,7 +356176,7 @@ index 70a79bb1ec7d..cafa2ccd7ff7 100644 dacpro_osc: dacpro_osc { compatible = "hifiberry,dacpro-clk"; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts -index 7bf0317ea83b..c5583e010339 100644 +index 7bf0317ea83bd..c5583e010339e 100644 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts @@ -8,7 +8,7 @@ @@ -356192,10 +356192,10 @@ index 7bf0317ea83b..c5583e010339 100644 2.18.4 -From 3a21d21f90206cb03658696db909ae709b1c3019 Mon Sep 17 00:00:00 2001 +From 015c7cc059fec4867d8b081885c3a9d7e9a5f1f2 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 30 Jan 2020 12:35:44 +0000 -Subject: [PATCH 0486/1216] staging: vc04_services: Fix vcsm overflow bug when +Subject: [PATCH 0486/1224] staging: vc04_services: Fix vcsm overflow bug when counting transactions The response block and local state were using u16 and u32 respectively @@ -356208,7 +356208,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c -index 83110c55f440..c87b964abb31 100644 +index 83110c55f4402..c87b964abb315 100644 --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c @@ -34,7 +34,7 @@ struct sm_cmd_rsp_blk { @@ -356224,10 +356224,10 @@ index 83110c55f440..c87b964abb31 100644 2.18.4 -From f5209e0d95cb68b1328d78248fd090e53ebf954a Mon Sep 17 00:00:00 2001 +From 71b7891805dcaac852a0d2d4db4d320f8eb67b8b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 7 Feb 2020 09:51:31 +0000 -Subject: [PATCH 0487/1216] overlays: Add timeout_ms parameter to gpio-poweroff +Subject: [PATCH 0487/1224] 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. @@ -356239,7 +356239,7 @@ Signed-off-by: Phil Elwell 2 files changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index ac1f69c9e4e2..572edc7818ea 100644 +index ac1f69c9e4e23..572edc7818ea7 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -821,6 +821,8 @@ Params: gpiopin GPIO for signalling (default 26) @@ -356252,7 +356252,7 @@ index ac1f69c9e4e2..572edc7818ea 100644 Name: gpio-shutdown diff --git a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts -index bb8cd3bf264d..416aa2bc797a 100644 +index bb8cd3bf264d1..416aa2bc797a3 100644 --- a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts +++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts @@ -32,5 +32,6 @@ @@ -356266,10 +356266,10 @@ index bb8cd3bf264d..416aa2bc797a 100644 2.18.4 -From 80da15fff04e60317ded0d226fa5c1333bdd19ae Mon Sep 17 00:00:00 2001 +From 4542c8966f0d44e5094958c8edaffe656257cc6b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 10 Feb 2020 15:47:07 +0100 -Subject: [PATCH 0488/1216] defconfigs: enable CONFIG_BPF_LIRC_MODE2 +Subject: [PATCH 0488/1224] defconfigs: enable CONFIG_BPF_LIRC_MODE2 This enables support for IR decoding via BPF programs. @@ -356282,7 +356282,7 @@ Signed-off-by: Matthias Reichl 4 files changed, 4 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 74a2a8ceb011..3d4a0756c251 100644 +index 74a2a8ceb011c..3d4a0756c2517 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -727,6 +727,7 @@ CONFIG_REGULATOR_ARIZONA_LDO1=m @@ -356294,7 +356294,7 @@ index 74a2a8ceb011..3d4a0756c251 100644 CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 5956da1236dc..d79bbff58f31 100644 +index 5956da1236dcf..d79bbff58f31e 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -702,6 +702,7 @@ CONFIG_REGULATOR_ARIZONA_MICSUPP=m @@ -356306,7 +356306,7 @@ index 5956da1236dc..d79bbff58f31 100644 CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 83647007447a..9402e472ce64 100644 +index 83647007447a0..9402e472ce641 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -719,6 +719,7 @@ CONFIG_REGULATOR_ARIZONA_LDO1=m @@ -356318,7 +356318,7 @@ index 83647007447a..9402e472ce64 100644 CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 6b4eae39fee6..894168aeef61 100644 +index 6b4eae39fee66..894168aeef610 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -729,6 +729,7 @@ CONFIG_REGULATOR_ARIZONA_MICSUPP=m @@ -356333,10 +356333,10 @@ index 6b4eae39fee6..894168aeef61 100644 2.18.4 -From b0d9b64760e36c047f80e5526fc5523bcb7b4b26 Mon Sep 17 00:00:00 2001 +From 6bb278001735ea315fcd032a696e2b50defaf86f Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 10 Feb 2020 18:21:02 +0100 -Subject: [PATCH 0489/1216] bcmrpi3_defconfig: align RC config with +Subject: [PATCH 0489/1224] bcmrpi3_defconfig: align RC config with bcm2711_defconfig Signed-off-by: Matthias Reichl @@ -356345,7 +356345,7 @@ Signed-off-by: Matthias Reichl 1 file changed, 26 insertions(+) diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 4688da5d2e64..1dad7bcb579a 100644 +index 4688da5d2e645..1dad7bcb579ab 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -641,6 +641,32 @@ CONFIG_STMPE_SPI=y @@ -356385,10 +356385,10 @@ index 4688da5d2e64..1dad7bcb579a 100644 2.18.4 -From 450d31abf708da2beec73c9cb3b3aefda6815f4e Mon Sep 17 00:00:00 2001 +From 43fe7cca0f1f3d3ebfc8d0b4eb171dc5ae0a02c9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 6 Feb 2020 12:23:15 +0000 -Subject: [PATCH 0490/1216] of: overlay: Correct symbol path fixups +Subject: [PATCH 0490/1224] 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 @@ -356412,7 +356412,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c -index 1688f576ee8a..bef83edca195 100644 +index 1688f576ee8ac..bef83edca195b 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -245,6 +245,8 @@ static struct property *dup_and_fixup_symbol_prop( @@ -356428,10 +356428,10 @@ index 1688f576ee8a..bef83edca195 100644 2.18.4 -From c20539b5e87468bf40f804817c075015730f465e Mon Sep 17 00:00:00 2001 +From f429d5646ed1b9e794674eaf6abe4a8799259f05 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 24 Feb 2020 11:13:09 +0000 -Subject: [PATCH 0491/1216] configs: Add CONFIG_HID_STEAM=m +Subject: [PATCH 0491/1224] configs: Add CONFIG_HID_STEAM=m See: https://github.com/raspberrypi/linux/issues/3344 @@ -356445,7 +356445,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 3d4a0756c251..6cc8d3ebe9ae 100644 +index 3d4a0756c2517..6cc8d3ebe9ae0 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1039,6 +1039,7 @@ CONFIG_HID_SAMSUNG=m @@ -356457,7 +356457,7 @@ index 3d4a0756c251..6cc8d3ebe9ae 100644 CONFIG_HID_GREENASIA=m CONFIG_HID_SMARTJOYPLUS=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index d79bbff58f31..9409be09fedc 100644 +index d79bbff58f31e..9409be09fedc6 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1015,6 +1015,7 @@ CONFIG_HID_SAMSUNG=m @@ -356469,7 +356469,7 @@ index d79bbff58f31..9409be09fedc 100644 CONFIG_HID_GREENASIA=m CONFIG_HID_SMARTJOYPLUS=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 9402e472ce64..7cf9f2f9e1cc 100644 +index 9402e472ce641..7cf9f2f9e1cc6 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1031,6 +1031,7 @@ CONFIG_HID_SAMSUNG=m @@ -356481,7 +356481,7 @@ index 9402e472ce64..7cf9f2f9e1cc 100644 CONFIG_HID_GREENASIA=m CONFIG_HID_SMARTJOYPLUS=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 894168aeef61..9015acacf035 100644 +index 894168aeef610..9015acacf0355 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1042,6 +1042,7 @@ CONFIG_HID_SAMSUNG=m @@ -356493,7 +356493,7 @@ index 894168aeef61..9015acacf035 100644 CONFIG_HID_GREENASIA=m CONFIG_HID_SMARTJOYPLUS=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 1dad7bcb579a..fa691991528f 100644 +index 1dad7bcb579ab..fa691991528fb 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -896,6 +896,7 @@ CONFIG_HID_ROCCAT=m @@ -356508,10 +356508,10 @@ index 1dad7bcb579a..fa691991528f 100644 2.18.4 -From 57c03d02bd2f21a5e45fc01127dc4ff5e6a2239d Mon Sep 17 00:00:00 2001 +From f7619ee25c87f9b982bf2f9a1327bc0a09488196 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Feb 2020 11:23:09 +0000 -Subject: [PATCH 0492/1216] configs: Add CONFIG_EXT4_ENCRYPTION=y +Subject: [PATCH 0492/1224] 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 @@ -356529,7 +356529,7 @@ Signed-off-by: Phil Elwell 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 6cc8d3ebe9ae..9131effbfa0c 100644 +index 6cc8d3ebe9ae0..9131effbfa0c8 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1303,6 +1303,7 @@ CONFIG_RPI_AXIPERF=m @@ -356551,7 +356551,7 @@ index 6cc8d3ebe9ae..9131effbfa0c 100644 CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 9409be09fedc..5fe23a0bf27f 100644 +index 9409be09fedc6..5fe23a0bf27fe 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1302,6 +1302,7 @@ CONFIG_RPI_AXIPERF=m @@ -356573,7 +356573,7 @@ index 9409be09fedc..5fe23a0bf27f 100644 CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 9015acacf035..6be7a169eac1 100644 +index 9015acacf0355..6be7a169eac1a 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1329,6 +1329,7 @@ CONFIG_RPI_AXIPERF=m @@ -356595,7 +356595,7 @@ index 9015acacf035..6be7a169eac1 100644 CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index fa691991528f..b40477e1553b 100644 +index fa691991528fb..b40477e1553be 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1135,6 +1135,7 @@ CONFIG_PWM_PCA9685=m @@ -356620,10 +356620,10 @@ index fa691991528f..b40477e1553b 100644 2.18.4 -From 8a68407483cd15fca9fb62a4f31a1e4f376a48a6 Mon Sep 17 00:00:00 2001 +From def283294db405c6a585930afae314af362babce Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Feb 2020 17:25:52 +0000 -Subject: [PATCH 0493/1216] configs: Add KVM support to arm64 bcm2711_defconfig +Subject: [PATCH 0493/1224] configs: Add KVM support to arm64 bcm2711_defconfig See: https://github.com/raspberrypi/linux/issues/3035 @@ -356633,7 +356633,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 6be7a169eac1..bf0551437fd7 100644 +index 6be7a169eac1a..bf0551437fd7f 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -57,6 +57,10 @@ CONFIG_CPUFREQ_DT=y @@ -356651,10 +356651,10 @@ index 6be7a169eac1..bf0551437fd7 100644 2.18.4 -From 476bdbfff7403f88023d1455d34a0b1848817baa Mon Sep 17 00:00:00 2001 +From 325543e987e4ac05a3bffe751368f1bae0cdb054 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Mar 2020 09:43:41 +0000 -Subject: [PATCH 0494/1216] overlays: sc16ic750-i2c: Fix xtal parameter +Subject: [PATCH 0494/1224] overlays: sc16ic750-i2c: Fix xtal parameter The xtal parameter is targetting the wrong node - fix it. @@ -356666,7 +356666,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts -index 5fbff2e6c02d..16fe0d08cef1 100644 +index 5fbff2e6c02df..16fe0d08cef1b 100644 --- a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts +++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts @@ -32,7 +32,7 @@ @@ -356682,10 +356682,10 @@ index 5fbff2e6c02d..16fe0d08cef1 100644 2.18.4 -From 6a6f72ac697b1173bee098cbdd1b05ce4eac292c Mon Sep 17 00:00:00 2001 +From 4487c8491a9a2b289fc9f424fc299d55f780529a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:11 +0000 -Subject: [PATCH 0495/1216] Revert "pcie-brcmstb: Correct SoC name" +Subject: [PATCH 0495/1224] Revert "pcie-brcmstb: Correct SoC name" This reverts commit 900b4ad0814df7dbacb01318bf49af5bab605fa0. --- @@ -356694,7 +356694,7 @@ This reverts commit 900b4ad0814df7dbacb01318bf49af5bab605fa0. 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c -index 3c148b0e82c1..fa81a98f6a81 100644 +index 3c148b0e82c1d..fa81a98f6a813 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c @@ -91,8 +91,8 @@ struct dmabounce_device_info { @@ -356736,7 +356736,7 @@ index 3c148b0e82c1..fa81a98f6a81 100644 return ret; diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c -index dec65992902e..ac8dde3c030b 100644 +index dec65992902e4..ac8dde3c030b7 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c @@ -93,8 +93,8 @@ struct dmabounce_device_info { @@ -356781,10 +356781,10 @@ index dec65992902e..ac8dde3c030b 100644 2.18.4 -From b9c9b9885911def5a45285859db68cb67350612c Mon Sep 17 00:00:00 2001 +From 31e6782f7c81aa15dbfe77eaf3af058d36e6b4c4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:23 +0000 -Subject: [PATCH 0496/1216] Revert "pcie-brcmstb: Bounce buffer support is for +Subject: [PATCH 0496/1224] Revert "pcie-brcmstb: Bounce buffer support is for BCM2711B0" This reverts commit 58ac2d4474e531300f9f83773aa4d09e95ee2626. @@ -356793,7 +356793,7 @@ This reverts commit 58ac2d4474e531300f9f83773aa4d09e95ee2626. 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index fb777a4e4750..e646818ff21c 100644 +index fb777a4e47502..e646818ff21c3 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -206,8 +206,6 @@ enum pcie_type { @@ -356873,10 +356873,10 @@ index fb777a4e4750..e646818ff21c 100644 2.18.4 -From 3c23dc77fca0d7cbc89cfd7d805f77d3533ce7d4 Mon Sep 17 00:00:00 2001 +From 1641a0f37516a72599fa80e783220315bcc14819 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:39 +0000 -Subject: [PATCH 0497/1216] Revert "pcie-brcmstb: Eliminate arch_dma_ops error +Subject: [PATCH 0497/1224] Revert "pcie-brcmstb: Eliminate arch_dma_ops error message" This reverts commit 27cf0ad95cdf30f52a5fc6c69014a0d7bf5a1222. @@ -356885,7 +356885,7 @@ This reverts commit 27cf0ad95cdf30f52a5fc6c69014a0d7bf5a1222. 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index e646818ff21c..e8c8b355548a 100644 +index e646818ff21c3..e8c8b355548a5 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -633,17 +633,16 @@ static int brcmstb_platform_notifier(struct notifier_block *nb, @@ -357022,10 +357022,10 @@ index e646818ff21c..e8c8b355548a 100644 2.18.4 -From e016ee1a9e654b292e6be3a79e5a105eded07e38 Mon Sep 17 00:00:00 2001 +From 9850d017ee5f4244c107ec5fbec30d977129b0bd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 16:59:51 +0000 -Subject: [PATCH 0498/1216] Revert "pcie-brcmstb-bounce64.c: dev_err() -> +Subject: [PATCH 0498/1224] Revert "pcie-brcmstb-bounce64.c: dev_err() -> dev_info() for info messages" This reverts commit 2340a88a493d750dc3fcfa48de880fc4b8e479d2. @@ -357034,7 +357034,7 @@ This reverts commit 2340a88a493d750dc3fcfa48de880fc4b8e479d2. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c -index ac8dde3c030b..6a872975ba9e 100644 +index ac8dde3c030b7..6a872975ba9e1 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c @@ -517,7 +517,7 @@ int brcm_pcie_bounce_init(struct device *dev, @@ -357050,10 +357050,10 @@ index ac8dde3c030b..6a872975ba9e 100644 2.18.4 -From abbaa63409dd703229b4e1ac45c9a4a7c1b948b0 Mon Sep 17 00:00:00 2001 +From 4cb6a9aa2895bac0edb313ec985f889edb87733c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 17:00:01 +0000 -Subject: [PATCH 0499/1216] Revert "Ported pcie-brcmstb bounce buffer +Subject: [PATCH 0499/1224] Revert "Ported pcie-brcmstb bounce buffer implementation to ARM64. (#3144)" This reverts commit 60f3db31d4cb785befed715b80c430f60f647701. @@ -357067,7 +357067,7 @@ This reverts commit 60f3db31d4cb785befed715b80c430f60f647701. delete mode 100644 drivers/pci/controller/pcie-brcmstb-bounce64.c diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c -index e17e3b2f11c6..9239416e93d4 100644 +index e17e3b2f11c6e..9239416e93d4e 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -31,35 +31,6 @@ void arch_dma_prep_coherent(struct page *page, size_t size) @@ -357107,7 +357107,7 @@ index e17e3b2f11c6..9239416e93d4 100644 { dev->dma_ops = NULL; diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile -index d52bf54d579f..be98ebfdb173 100644 +index d52bf54d579f3..be98ebfdb1737 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -33,9 +33,6 @@ obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o @@ -357121,7 +357121,7 @@ index d52bf54d579f..be98ebfdb173 100644 obj-$(CONFIG_VMD) += vmd.o # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h -index 7caa0781329b..2fe20a14d035 100644 +index 7caa0781329b5..2fe20a14d0352 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h @@ -6,7 +6,7 @@ @@ -357135,7 +357135,7 @@ index 7caa0781329b..2fe20a14d035 100644 dma_addr_t threshold); diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c deleted file mode 100644 -index 6a872975ba9e..000000000000 +index 6a872975ba9e1..0000000000000 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c +++ /dev/null @@ -1,569 +0,0 @@ @@ -357709,7 +357709,7 @@ index 6a872975ba9e..000000000000 -MODULE_DESCRIPTION("Dedicate DMA bounce support for pcie-brcmstb"); -MODULE_LICENSE("GPL"); diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index e8c8b355548a..87fd40ae3140 100644 +index e8c8b355548a5..87fd40ae31400 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -611,6 +611,28 @@ static const struct dma_map_ops brcm_dma_ops = { @@ -357775,10 +357775,10 @@ index e8c8b355548a..87fd40ae3140 100644 2.18.4 -From 95c52c6f82132a2e627774ea8329163e4d8883b9 Mon Sep 17 00:00:00 2001 +From 0a417e8cbe381f717a0f09f3d53ccefedbb2b168 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Mar 2020 17:00:16 +0000 -Subject: [PATCH 0500/1216] Revert "pcie-brcmstb: Don't set DMA ops for root +Subject: [PATCH 0500/1224] Revert "pcie-brcmstb: Don't set DMA ops for root complex" This reverts commit 510a127017a0aada2734dbf57d25aaa0189198ff. @@ -357787,7 +357787,7 @@ This reverts commit 510a127017a0aada2734dbf57d25aaa0189198ff. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 87fd40ae3140..746cfb405ad3 100644 +index 87fd40ae31400..746cfb405ad38 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -665,8 +665,8 @@ static int brcmstb_platform_notifier(struct notifier_block *nb, @@ -357804,10 +357804,10 @@ index 87fd40ae3140..746cfb405ad3 100644 2.18.4 -From 93a2c470a38c59d3a6bba1507d36cb76a61083a8 Mon Sep 17 00:00:00 2001 +From e32587ca4c007738971f07d0afaf1a434349ecf1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:06:59 +0000 -Subject: [PATCH 0501/1216] Revert "bcm2835-dma: Correct SoC name" +Subject: [PATCH 0501/1224] Revert "bcm2835-dma: Correct SoC name" This reverts commit f498861a16d0b9a189a329080da1aa64d6e9bda7. --- @@ -357815,7 +357815,7 @@ This reverts commit f498861a16d0b9a189a329080da1aa64d6e9bda7. 1 file changed, 137 insertions(+), 137 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 8d7c80536aa4..87fd58272e95 100644 +index 8d7c80536aa42..87fd58272e95f 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -38,7 +38,7 @@ @@ -358297,10 +358297,10 @@ index 8d7c80536aa4..87fd58272e95 100644 2.18.4 -From 31b79c12b36d6d0ff5f8dc6811afd3dbd9e4b2fb Mon Sep 17 00:00:00 2001 +From a9e25fa9e52a6b1cd3c515f1fd41236d9b89a3f8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:07:15 +0000 -Subject: [PATCH 0502/1216] Revert "bcm2835-dma: Add proper 40-bit DMA support" +Subject: [PATCH 0502/1224] Revert "bcm2835-dma: Add proper 40-bit DMA support" This reverts commit 773a2db89ad2785d72b215673d87c0a51d769f61. --- @@ -358311,7 +358311,7 @@ This reverts commit 773a2db89ad2785d72b215673d87c0a51d769f61. 4 files changed, 126 insertions(+), 369 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 87fd58272e95..f59b099233dc 100644 +index 87fd58272e95f..f59b099233dc0 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -38,11 +38,6 @@ @@ -359057,7 +359057,7 @@ index 87fd58272e95..f59b099233dc 100644 return 0; diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c -index fa81a98f6a81..d8007631a54c 100644 +index fa81a98f6a813..d8007631a54cf 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c @@ -91,7 +91,7 @@ struct dmabounce_device_info { @@ -359142,7 +359142,7 @@ index fa81a98f6a81..d8007631a54c 100644 MODULE_AUTHOR("Phil Elwell "); MODULE_DESCRIPTION("Dedicate DMA bounce support for pcie-brcmstb"); diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h -index 2fe20a14d035..5d07f679dc71 100644 +index 2fe20a14d0352..5d07f679dc71b 100644 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h @@ -8,26 +8,21 @@ @@ -359181,7 +359181,7 @@ index 2fe20a14d035..5d07f679dc71 100644 return 0; } diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 746cfb405ad3..782725e3adad 100644 +index 746cfb405ad38..782725e3adad5 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -644,7 +644,6 @@ static void brcm_set_dma_ops(struct device *dev) @@ -359249,10 +359249,10 @@ index 746cfb405ad3..782725e3adad 100644 2.18.4 -From 470e321baf85c01538167569b8486d889c21a06e Mon Sep 17 00:00:00 2001 +From 0910ff5a7cc2f96f3a5dde41438991694feb783f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:07:39 +0000 -Subject: [PATCH 0503/1216] Revert "pcie-brcmstb: Changes for BCM2711" +Subject: [PATCH 0503/1224] Revert "pcie-brcmstb: Changes for BCM2711" This reverts commit 1dab5ded41ed07adc12f26e529aa64209a7c44b6. --- @@ -359269,7 +359269,7 @@ This reverts commit 1dab5ded41ed07adc12f26e529aa64209a7c44b6. delete mode 100644 drivers/soc/bcm/brcmstb/memory.c diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index f59b099233dc..1e5d6f1bed4e 100644 +index f59b099233dc0..1e5d6f1bed4ec 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -64,17 +64,6 @@ struct bcm2835_dma_cb { @@ -359408,7 +359408,7 @@ index f59b099233dc..1e5d6f1bed4e 100644 for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) { /* skip masked out channels */ diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile -index be98ebfdb173..66c36e20f329 100644 +index be98ebfdb1737..66c36e20f3291 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -30,10 +30,6 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o @@ -359424,7 +359424,7 @@ index be98ebfdb173..66c36e20f329 100644 obj-y += dwc/ diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c deleted file mode 100644 -index d8007631a54c..000000000000 +index d8007631a54cf..0000000000000 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c +++ /dev/null @@ -1,558 +0,0 @@ @@ -359988,7 +359988,7 @@ index d8007631a54c..000000000000 -MODULE_LICENSE("GPL"); diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h deleted file mode 100644 -index 5d07f679dc71..000000000000 +index 5d07f679dc71b..0000000000000 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h +++ /dev/null @@ -1,32 +0,0 @@ @@ -360025,7 +360025,7 @@ index 5d07f679dc71..000000000000 - -#endif /* _PCIE_BRCMSTB_BOUNCE_H */ diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 782725e3adad..b028d4be81a2 100644 +index 782725e3adad5..b028d4be81a23 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -29,7 +29,6 @@ @@ -360519,7 +360519,7 @@ index 782725e3adad..b028d4be81a2 100644 .pm = &brcm_pcie_pm_ops, }, diff --git a/drivers/soc/bcm/brcmstb/Makefile b/drivers/soc/bcm/brcmstb/Makefile -index 28b3a3be0ee3..fe5c43d26dce 100644 +index 28b3a3be0ee36..fe5c43d26dce3 100644 --- a/drivers/soc/bcm/brcmstb/Makefile +++ b/drivers/soc/bcm/brcmstb/Makefile @@ -1,3 +1,3 @@ @@ -360529,7 +360529,7 @@ index 28b3a3be0ee3..fe5c43d26dce 100644 obj-$(CONFIG_BRCMSTB_PM) += pm/ diff --git a/drivers/soc/bcm/brcmstb/memory.c b/drivers/soc/bcm/brcmstb/memory.c deleted file mode 100644 -index 254783d1065f..000000000000 +index 254783d1065f7..0000000000000 --- a/drivers/soc/bcm/brcmstb/memory.c +++ /dev/null @@ -1,158 +0,0 @@ @@ -360695,10 +360695,10 @@ index 254783d1065f..000000000000 2.18.4 -From 20db42af5f3c8f3db99017740be902324964ba62 Mon Sep 17 00:00:00 2001 +From cf8ed44134a338fc1a4b7640ab7a9bf4873e2f36 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:08:35 +0000 -Subject: [PATCH 0504/1216] Revert "PCI: brcmstb: Add MSI capability" +Subject: [PATCH 0504/1224] Revert "PCI: brcmstb: Add MSI capability" This reverts commit b1619c83208e7b804e2c3547dbf24bb02b3be239. --- @@ -360706,7 +360706,7 @@ This reverts commit b1619c83208e7b804e2c3547dbf24bb02b3be239. 1 file changed, 21 insertions(+), 353 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index b028d4be81a2..27bcf83c99d7 100644 +index b028d4be81a23..27bcf83c99d7e 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1,7 +1,6 @@ @@ -361234,10 +361234,10 @@ index b028d4be81a2..27bcf83c99d7 100644 2.18.4 -From 40204c37d14307f3bf0e603f3eeda54bde21b854 Mon Sep 17 00:00:00 2001 +From 03168e40862a0f8cf6c957f737dc66ca39ce86f0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:08:49 +0000 -Subject: [PATCH 0505/1216] Revert "PCI: brcmstb: Add dma-range mapping for +Subject: [PATCH 0505/1224] Revert "PCI: brcmstb: Add dma-range mapping for inbound traffic" This reverts commit d45590eb858ac7a2578d477791881ba7ffb1e615. @@ -361246,7 +361246,7 @@ This reverts commit d45590eb858ac7a2578d477791881ba7ffb1e615. 1 file changed, 9 insertions(+), 411 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 27bcf83c99d7..babef9191e88 100644 +index 27bcf83c99d7e..babef9191e88c 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -4,7 +4,6 @@ @@ -361742,10 +361742,10 @@ index 27bcf83c99d7..babef9191e88 100644 2.18.4 -From 1b0ea70f9b0629c9f72c84b35ff2c36db851840f Mon Sep 17 00:00:00 2001 +From 86bc66f74411d20b1e92249feaec876ec3d7efce Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Mar 2020 10:10:54 +0000 -Subject: [PATCH 0506/1216] Revert "PCI: brcmstb: Add Broadcom STB PCIe host +Subject: [PATCH 0506/1224] Revert "PCI: brcmstb: Add Broadcom STB PCIe host controller driver" This reverts commit 79624ca23c53064fefee774a89952a587b72cc01. @@ -361759,7 +361759,7 @@ This reverts commit 79624ca23c53064fefee774a89952a587b72cc01. delete mode 100644 include/soc/brcmstb/memory_api.h diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig -index 650b3b56153c..70e078238899 100644 +index 650b3b56153cb..70e078238899f 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -288,14 +288,5 @@ config PCI_HYPERV_INTERFACE @@ -361778,7 +361778,7 @@ index 650b3b56153c..70e078238899 100644 source "drivers/pci/controller/dwc/Kconfig" endmenu diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile -index 66c36e20f329..a2a22c9d91af 100644 +index 66c36e20f3291..a2a22c9d91afc 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -29,11 +29,11 @@ obj-$(CONFIG_PCIE_ROCKCHIP_HOST) += pcie-rockchip-host.o @@ -361796,7 +361796,7 @@ index 66c36e20f329..a2a22c9d91af 100644 # They contain MCFG quirks to replace the generic ECAM accessors with diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c deleted file mode 100644 -index babef9191e88..000000000000 +index babef9191e88c..0000000000000 --- a/drivers/pci/controller/pcie-brcmstb.c +++ /dev/null @@ -1,1097 +0,0 @@ @@ -362899,7 +362899,7 @@ index babef9191e88..000000000000 -MODULE_AUTHOR("Broadcom"); diff --git a/include/soc/brcmstb/memory_api.h b/include/soc/brcmstb/memory_api.h deleted file mode 100644 -index d92290679067..000000000000 +index d922906790671..0000000000000 --- a/include/soc/brcmstb/memory_api.h +++ /dev/null @@ -1,25 +0,0 @@ @@ -362932,10 +362932,10 @@ index d92290679067..000000000000 2.18.4 -From 31768031c6128f59b476bea8757d1d199d0d7bfb Mon Sep 17 00:00:00 2001 +From ad21f0500daebd98e0826bd5cc9eb89fea175b01 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 12 Mar 2020 12:16:18 +0000 -Subject: [PATCH 0507/1216] Revert "arm64/mm: Limit the DMA zone for arm64" +Subject: [PATCH 0507/1224] Revert "arm64/mm: Limit the DMA zone for arm64" This reverts commit 47fec0dcefa53f44985e95785021447d646daa2b. --- @@ -362943,10 +362943,10 @@ This reverts commit 47fec0dcefa53f44985e95785021447d646daa2b. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 1b15656c96db..45c00a54909c 100644 +index 798cface99928..602bd19630ff8 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -177,7 +177,7 @@ static void __init reserve_elfcorehdr(void) +@@ -171,7 +171,7 @@ static void __init reserve_elfcorehdr(void) static phys_addr_t __init max_zone_dma_phys(void) { phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, 32); @@ -362959,10 +362959,10 @@ index 1b15656c96db..45c00a54909c 100644 2.18.4 -From ad60eab34887c53cda1e7e321d65ef5624044474 Mon Sep 17 00:00:00 2001 +From addded01078402c5fc70a23a726d2669235b53de Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 12 Mar 2020 14:06:04 +0000 -Subject: [PATCH 0508/1216] Revert "dma-direct: check for overflows on 32 bit +Subject: [PATCH 0508/1224] Revert "dma-direct: check for overflows on 32 bit DMA addresses" This reverts commit e44850bd4205a8cf17f23c44668c0f8d28ad40b1. @@ -362971,7 +362971,7 @@ This reverts commit e44850bd4205a8cf17f23c44668c0f8d28ad40b1. 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h -index 6a18a97b76a8..adf993a3bd58 100644 +index 6a18a97b76a87..adf993a3bd580 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -3,11 +3,8 @@ @@ -363009,10 +363009,10 @@ index 6a18a97b76a8..adf993a3bd58 100644 2.18.4 -From cd92a40d6fbcad33998b4bebdefd4d9638fcd08c Mon Sep 17 00:00:00 2001 +From 45510fe0978a9ba3b578789942ea3eaaa965041f Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 3 Jul 2019 18:23:01 +0100 -Subject: [PATCH 0509/1216] of/address: Introduce of_get_next_dma_parent() +Subject: [PATCH 0509/1224] of/address: Introduce of_get_next_dma_parent() helper commit 862ab5578f754117742c8b8c8e5ddf98bdb190ba upstream. @@ -363031,7 +363031,7 @@ Signed-off-by: Rob Herring 1 file changed, 10 insertions(+) diff --git a/drivers/of/address.c b/drivers/of/address.c -index 5abb056b2b51..b2a86049c423 100644 +index 5abb056b2b515..b2a86049c4232 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -695,6 +695,16 @@ static struct device_node *__of_get_dma_parent(const struct device_node *np) @@ -363055,10 +363055,10 @@ index 5abb056b2b51..b2a86049c423 100644 2.18.4 -From 055e974839ad94dcda134e8c2f6166f560044937 Mon Sep 17 00:00:00 2001 +From 980eaec51baf6de23bf6fc1bc3a29b4e42fa71df Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 3 Jul 2019 14:47:31 +0100 -Subject: [PATCH 0510/1216] of: address: Follow DMA parent for "dma-coherent" +Subject: [PATCH 0510/1224] of: address: Follow DMA parent for "dma-coherent" commit c60bf3eb888a362100aa1bdbea351dab681e262a upstream. @@ -363075,7 +363075,7 @@ Signed-off-by: Rob Herring 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/address.c b/drivers/of/address.c -index b2a86049c423..42269c8a308b 100644 +index b2a86049c4232..42269c8a308b2 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -1025,7 +1025,7 @@ bool of_dma_is_coherent(struct device_node *np) @@ -363091,10 +363091,10 @@ index b2a86049c423..42269c8a308b 100644 2.18.4 -From f731184d78543dbbbcea405fcbd80ed56ddf262c Mon Sep 17 00:00:00 2001 +From b4b7f15a7b5e0d55bfc4c990baad84bc6e508fcf Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Tue, 2 Jul 2019 18:42:39 +0100 -Subject: [PATCH 0511/1216] of: Factor out #{addr,size}-cells parsing +Subject: [PATCH 0511/1224] 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 @@ -363118,7 +363118,7 @@ Signed-off-by: Rob Herring 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c -index 42269c8a308b..104617bffcc8 100644 +index 42269c8a308b2..104617bffcc8e 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -14,6 +14,8 @@ @@ -363131,7 +363131,7 @@ index 42269c8a308b..104617bffcc8 100644 #define OF_MAX_ADDR_CELLS 4 #define OF_CHECK_ADDR_COUNT(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) diff --git a/drivers/of/base.c b/drivers/of/base.c -index 1d667eb730e1..db7fbc0c0893 100644 +index 1d667eb730e19..db7fbc0c0893c 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -86,34 +86,46 @@ static bool __of_node_is_type(const struct device_node *np, const char *type) @@ -363192,7 +363192,7 @@ index 1d667eb730e1..db7fbc0c0893 100644 #ifdef CONFIG_NUMA diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h -index 24786818e32e..66294d29942a 100644 +index 24786818e32e5..66294d29942ae 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -158,4 +158,18 @@ extern void __of_sysfs_remove_bin_file(struct device_node *np, @@ -363218,10 +363218,10 @@ index 24786818e32e..66294d29942a 100644 2.18.4 -From 4bdf93b513f73e0697054014cc582d9512a5bcfd Mon Sep 17 00:00:00 2001 +From 2ecd255d7afddfc05f2ea74951ac8a324968a64f Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 4 Sep 2019 11:43:30 +0100 -Subject: [PATCH 0512/1216] of/address: Translate 'dma-ranges' for parent nodes +Subject: [PATCH 0512/1224] of/address: Translate 'dma-ranges' for parent nodes missing 'dma-ranges' commit 81db12ee15cb83926e290a8a3654a2dfebc80935 upstream. @@ -363242,7 +363242,7 @@ Signed-off-by: Rob Herring 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/of/address.c b/drivers/of/address.c -index 104617bffcc8..4e41ab740fc3 100644 +index 104617bffcc8e..4e41ab740fc3b 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -519,9 +519,13 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, @@ -363264,10 +363264,10 @@ index 104617bffcc8..4e41ab740fc3 100644 2.18.4 -From 416985833b421fb522e8d4ee768c653ecd7015f1 Mon Sep 17 00:00:00 2001 +From 2290883b8dae5bc6dae243ddbc67b2c8a2f9c34b Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 3 Jul 2019 18:42:20 +0100 -Subject: [PATCH 0513/1216] of: Make of_dma_get_range() work on bus nodes +Subject: [PATCH 0513/1224] of: Make of_dma_get_range() work on bus nodes commit 951d48855d86e72e0d6de73440fe09d363168064 upstream. @@ -363296,7 +363296,7 @@ Tested-by: Nicolas Saenz Julienne 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c -index 4e41ab740fc3..100b762ac080 100644 +index 4e41ab740fc3b..100b762ac0809 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -940,47 +940,39 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz @@ -363377,10 +363377,10 @@ index 4e41ab740fc3..100b762ac080 100644 2.18.4 -From b81d121a6c33075f0ca15643ec0739a7202ccc1f Mon Sep 17 00:00:00 2001 +From f8196801ba924ebf460458048cf125d7147b8d5b Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:43 +0200 -Subject: [PATCH 0514/1216] arm64: mm: use arm64_dma_phys_limit instead of +Subject: [PATCH 0514/1224] arm64: mm: use arm64_dma_phys_limit instead of calling max_zone_dma_phys() commit ae970dc096b2d39f65f2e18d142e3978dc9ee1c7 upstream. @@ -363397,10 +363397,10 @@ Signed-off-by: Catalin Marinas 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 45c00a54909c..098c0f5bedf6 100644 +index 602bd19630ff8..0b91dc1b825a0 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -187,7 +187,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) +@@ -181,7 +181,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; #ifdef CONFIG_ZONE_DMA32 @@ -363413,10 +363413,10 @@ index 45c00a54909c..098c0f5bedf6 100644 2.18.4 -From c630bddcdca8851f30ac59a79da04fdaf1f02340 Mon Sep 17 00:00:00 2001 +From ccf6ba32add9e6a5fdf43e1342190e2b5d5b95e7 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:44 +0200 -Subject: [PATCH 0515/1216] arm64: rename variables used to calculate +Subject: [PATCH 0515/1224] arm64: rename variables used to calculate ZONE_DMA32's size commit a573cdd7973dedd87e62196c400332896bb236c8 upstream. @@ -363432,19 +363432,19 @@ Signed-off-by: Catalin Marinas 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 098c0f5bedf6..8e9bc64c5878 100644 +index 0b91dc1b825a0..95210411c6ba3 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -56,7 +56,7 @@ EXPORT_SYMBOL(physvirt_offset); - struct page *vmemmap __ro_after_init; - EXPORT_SYMBOL(vmemmap); +@@ -50,7 +50,7 @@ + s64 memstart_addr __ro_after_init = -1; + EXPORT_SYMBOL(memstart_addr); -phys_addr_t arm64_dma_phys_limit __ro_after_init; +phys_addr_t arm64_dma32_phys_limit __ro_after_init; #ifdef CONFIG_KEXEC_CORE /* -@@ -174,7 +174,7 @@ static void __init reserve_elfcorehdr(void) +@@ -168,7 +168,7 @@ static void __init reserve_elfcorehdr(void) * currently assumes that for memory starting above 4G, 32-bit devices will * use a DMA offset. */ @@ -363453,7 +363453,7 @@ index 098c0f5bedf6..8e9bc64c5878 100644 { phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, 32); return min(offset + (1ULL << 32), memblock_end_of_DRAM()); -@@ -187,7 +187,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) +@@ -181,7 +181,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; #ifdef CONFIG_ZONE_DMA32 @@ -363462,7 +363462,7 @@ index 098c0f5bedf6..8e9bc64c5878 100644 #endif max_zone_pfns[ZONE_NORMAL] = max; -@@ -200,16 +200,16 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) +@@ -194,16 +194,16 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) { struct memblock_region *reg; unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; @@ -363483,7 +363483,7 @@ index 098c0f5bedf6..8e9bc64c5878 100644 memcpy(zhole_size, zone_size, sizeof(zhole_size)); -@@ -221,14 +221,14 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) +@@ -215,14 +215,14 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) continue; #ifdef CONFIG_ZONE_DMA32 @@ -363502,7 +363502,7 @@ index 098c0f5bedf6..8e9bc64c5878 100644 zhole_size[ZONE_NORMAL] -= normal_end - normal_start; } } -@@ -420,9 +420,9 @@ void __init arm64_memblock_init(void) +@@ -410,9 +410,9 @@ void __init arm64_memblock_init(void) /* 4GB maximum for 32-bit only capable devices */ if (IS_ENABLED(CONFIG_ZONE_DMA32)) @@ -363514,7 +363514,7 @@ index 098c0f5bedf6..8e9bc64c5878 100644 reserve_crashkernel(); -@@ -430,7 +430,7 @@ void __init arm64_memblock_init(void) +@@ -420,7 +420,7 @@ void __init arm64_memblock_init(void) high_memory = __va(memblock_end_of_DRAM() - 1) + 1; @@ -363523,7 +363523,7 @@ index 098c0f5bedf6..8e9bc64c5878 100644 } void __init bootmem_init(void) -@@ -534,7 +534,7 @@ static void __init free_unused_memmap(void) +@@ -524,7 +524,7 @@ static void __init free_unused_memmap(void) void __init mem_init(void) { if (swiotlb_force == SWIOTLB_FORCE || @@ -363536,10 +363536,10 @@ index 098c0f5bedf6..8e9bc64c5878 100644 2.18.4 -From f98b6b0009a987e824090fe73930eb67c038a48b Mon Sep 17 00:00:00 2001 +From e4511f47c40cf433d9ac505f2300715cdbc2aeb7 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:45 +0200 -Subject: [PATCH 0516/1216] arm64: use both ZONE_DMA and ZONE_DMA32 +Subject: [PATCH 0516/1224] arm64: use both ZONE_DMA and ZONE_DMA32 commit 1a8e1cef7603e218339ac63cb3178b25554524e5 upstream. @@ -363566,7 +363566,7 @@ Signed-off-by: Catalin Marinas 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index a0bc9bbb92f3..1dbeca5e80c9 100644 +index a0bc9bbb92f34..1dbeca5e80c97 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -267,6 +267,10 @@ config GENERIC_CSUM @@ -363581,7 +363581,7 @@ index a0bc9bbb92f3..1dbeca5e80c9 100644 bool "Support DMA32 zone" if EXPERT default y diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h -index d39ddb258a04..7b8c98830101 100644 +index d39ddb258a049..7b8c98830101e 100644 --- a/arch/arm64/include/asm/page.h +++ b/arch/arm64/include/asm/page.h @@ -38,4 +38,6 @@ extern int pfn_valid(unsigned long); @@ -363592,12 +363592,12 @@ index d39ddb258a04..7b8c98830101 100644 + #endif diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 8e9bc64c5878..44f07fdf7a59 100644 +index 95210411c6ba3..501158e47fa2d 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -56,6 +56,13 @@ EXPORT_SYMBOL(physvirt_offset); - struct page *vmemmap __ro_after_init; - EXPORT_SYMBOL(vmemmap); +@@ -50,6 +50,13 @@ + s64 memstart_addr __ro_after_init = -1; + EXPORT_SYMBOL(memstart_addr); +/* + * We create both ZONE_DMA and ZONE_DMA32. ZONE_DMA covers the first 1G of @@ -363609,7 +363609,7 @@ index 8e9bc64c5878..44f07fdf7a59 100644 phys_addr_t arm64_dma32_phys_limit __ro_after_init; #ifdef CONFIG_KEXEC_CORE -@@ -169,15 +176,16 @@ static void __init reserve_elfcorehdr(void) +@@ -163,15 +170,16 @@ static void __init reserve_elfcorehdr(void) { } #endif /* CONFIG_CRASH_DUMP */ @@ -363632,7 +363632,7 @@ index 8e9bc64c5878..44f07fdf7a59 100644 } #ifdef CONFIG_NUMA -@@ -186,6 +194,9 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) +@@ -180,6 +188,9 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) { unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; @@ -363642,7 +363642,7 @@ index 8e9bc64c5878..44f07fdf7a59 100644 #ifdef CONFIG_ZONE_DMA32 max_zone_pfns[ZONE_DMA32] = PFN_DOWN(arm64_dma32_phys_limit); #endif -@@ -201,13 +212,18 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) +@@ -195,13 +206,18 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) struct memblock_region *reg; unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; unsigned long max_dma32 = min; @@ -363663,7 +363663,7 @@ index 8e9bc64c5878..44f07fdf7a59 100644 #endif zone_size[ZONE_NORMAL] = max - max_dma32; -@@ -219,11 +235,17 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) +@@ -213,11 +229,17 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) if (start >= max) continue; @@ -363684,7 +363684,7 @@ index 8e9bc64c5878..44f07fdf7a59 100644 } #endif if (end > max_dma32) { -@@ -418,9 +440,11 @@ void __init arm64_memblock_init(void) +@@ -408,9 +430,11 @@ void __init arm64_memblock_init(void) early_init_fdt_scan_reserved_mem(); @@ -363698,7 +363698,7 @@ index 8e9bc64c5878..44f07fdf7a59 100644 else arm64_dma32_phys_limit = PHYS_MASK + 1; -@@ -430,7 +454,7 @@ void __init arm64_memblock_init(void) +@@ -420,7 +444,7 @@ void __init arm64_memblock_init(void) high_memory = __va(memblock_end_of_DRAM() - 1) + 1; @@ -363707,7 +363707,7 @@ index 8e9bc64c5878..44f07fdf7a59 100644 } void __init bootmem_init(void) -@@ -534,7 +558,7 @@ static void __init free_unused_memmap(void) +@@ -524,7 +548,7 @@ static void __init free_unused_memmap(void) void __init mem_init(void) { if (swiotlb_force == SWIOTLB_FORCE || @@ -363720,10 +363720,10 @@ index 8e9bc64c5878..44f07fdf7a59 100644 2.18.4 -From 3c639e2a4b5c055ab225dc02811f211c949f0013 Mon Sep 17 00:00:00 2001 +From a8f27e2bbe1d26f250fb0e1f8a5bbd55d09cbc74 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 11 Sep 2019 20:25:46 +0200 -Subject: [PATCH 0517/1216] mm: refresh ZONE_DMA and ZONE_DMA32 comments in +Subject: [PATCH 0517/1224] mm: refresh ZONE_DMA and ZONE_DMA32 comments in 'enum zone_type' commit 734f9246e791d8da278957b2c326d7709b2a97c0 upstream. @@ -363741,7 +363741,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 a90aba3d6afb..6d8ea64eeb28 100644 +index a90aba3d6afb4..6d8ea64eeb286 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -358,33 +358,40 @@ struct per_cpu_nodestat { @@ -363808,10 +363808,10 @@ index a90aba3d6afb..6d8ea64eeb28 100644 2.18.4 -From dde3c4928370ba6a835533dcfde222885f169a03 Mon Sep 17 00:00:00 2001 +From 355ae92aaf372e64797c2245028b1a80b9afe67c Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 28 Oct 2019 11:32:32 -0500 -Subject: [PATCH 0518/1216] resource: Add a resource_list_first_type helper +Subject: [PATCH 0518/1224] resource: Add a resource_list_first_type helper commit 494f8b10d832456a96be4ee7317425f6936cabc8 upstream. @@ -363826,7 +363826,7 @@ Signed-off-by: Lorenzo Pieralisi 1 file changed, 12 insertions(+) diff --git a/include/linux/resource_ext.h b/include/linux/resource_ext.h -index 06da59b23b79..ff0339df56af 100644 +index 06da59b23b79d..ff0339df56afc 100644 --- a/include/linux/resource_ext.h +++ b/include/linux/resource_ext.h @@ -66,4 +66,16 @@ resource_list_destroy_entry(struct resource_entry *entry) @@ -363850,10 +363850,10 @@ index 06da59b23b79..ff0339df56af 100644 2.18.4 -From 5a08c44cd18a0bcd56b205da62390df282d8505c Mon Sep 17 00:00:00 2001 +From f9d43c0112b564eec6773f40c19d8aae63ee1544 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Mon, 14 Oct 2019 20:31:03 +0200 -Subject: [PATCH 0519/1216] dma/direct: turn ARCH_ZONE_DMA_BITS into a variable +Subject: [PATCH 0519/1224] dma/direct: turn ARCH_ZONE_DMA_BITS into a variable commit 8b5369ea580964dbc982781bfb9fb93459fc5e8d upstream. @@ -363875,7 +363875,7 @@ Signed-off-by: Catalin Marinas 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h -index 7b8c98830101..d39ddb258a04 100644 +index 7b8c98830101e..d39ddb258a049 100644 --- a/arch/arm64/include/asm/page.h +++ b/arch/arm64/include/asm/page.h @@ -38,6 +38,4 @@ extern int pfn_valid(unsigned long); @@ -363886,7 +363886,7 @@ index 7b8c98830101..d39ddb258a04 100644 - #endif diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 44f07fdf7a59..ddd6a6ce158e 100644 +index 501158e47fa2d..d5733f2d35159 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -20,6 +20,7 @@ @@ -363906,7 +363906,7 @@ index 44f07fdf7a59..ddd6a6ce158e 100644 /* * We need to be able to catch inadvertent references to memstart_addr * that occur (potentially in generic code) before arm64_memblock_init() -@@ -440,8 +443,10 @@ void __init arm64_memblock_init(void) +@@ -430,8 +433,10 @@ void __init arm64_memblock_init(void) early_init_fdt_scan_reserved_mem(); @@ -363920,7 +363920,7 @@ index 44f07fdf7a59..ddd6a6ce158e 100644 if (IS_ENABLED(CONFIG_ZONE_DMA32)) arm64_dma32_phys_limit = max_zone_phys(32); diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h -index 6ba5adb96a3b..d568ce08e3b2 100644 +index 6ba5adb96a3be..d568ce08e3b29 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -334,13 +334,4 @@ struct vm_area_struct; @@ -363938,7 +363938,7 @@ index 6ba5adb96a3b..d568ce08e3b2 100644 - #endif /* _ASM_POWERPC_PAGE_H */ diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c -index c48705c726ac..be4e6141f25b 100644 +index c48705c726ac6..be4e6141f25b8 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -31,6 +31,7 @@ @@ -363985,7 +363985,7 @@ index c48705c726ac..be4e6141f25b 100644 max_zone_pfns[ZONE_NORMAL] = max_low_pfn; #ifdef CONFIG_HIGHMEM diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h -index e399102367af..1019efd85b9d 100644 +index e399102367af0..1019efd85b9dc 100644 --- a/arch/s390/include/asm/page.h +++ b/arch/s390/include/asm/page.h @@ -179,8 +179,6 @@ static inline int devmem_is_allowed(unsigned long pfn) @@ -363998,7 +363998,7 @@ index e399102367af..1019efd85b9d 100644 #include diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c -index c1d96e588152..ac44bd76db4b 100644 +index c1d96e588152b..ac44bd76db4be 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -118,6 +118,7 @@ void __init paging_init(void) @@ -364010,7 +364010,7 @@ index c1d96e588152..ac44bd76db4b 100644 max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS); max_zone_pfns[ZONE_NORMAL] = max_low_pfn; diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h -index adf993a3bd58..d03af3605460 100644 +index adf993a3bd580..d03af3605460f 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -5,6 +5,8 @@ @@ -364023,7 +364023,7 @@ index adf993a3bd58..d03af3605460 100644 #include #else diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c -index d2b462835469..947823f1ccdf 100644 +index d2b4628354698..947823f1ccdfb 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -16,12 +16,11 @@ @@ -364065,10 +364065,10 @@ index d2b462835469..947823f1ccdf 100644 2.18.4 -From fad6412608d7d1ab487f5e9e59aed64ac33fcb74 Mon Sep 17 00:00:00 2001 +From cff555155dd9be3827520a3a0701d46acf3b5119 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 Nov 2019 16:06:44 +0100 -Subject: [PATCH 0520/1216] dma-direct: check for overflows on 32 bit DMA +Subject: [PATCH 0520/1224] 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 @@ -364095,7 +364095,7 @@ Signed-off-by: Christoph Hellwig 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h -index d03af3605460..7aadb776924d 100644 +index d03af3605460f..7aadb776924de 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -3,10 +3,13 @@ @@ -364135,10 +364135,10 @@ index d03af3605460..7aadb776924d 100644 2.18.4 -From 3dbee3b19c3c5a81181f677b6976f225836a8477 Mon Sep 17 00:00:00 2001 +From 0154534393a006cebf01fb54277600e79aa516e8 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 Nov 2019 16:06:45 +0100 -Subject: [PATCH 0521/1216] x86/PCI: sta2x11: use default DMA address +Subject: [PATCH 0521/1224] x86/PCI: sta2x11: use default DMA address translation commit e380a0394c36a3a878c858418d5dd7f5f195b6fc upstream. @@ -364168,7 +364168,7 @@ Signed-off-by: Christoph Hellwig delete mode 100644 arch/x86/include/asm/dma-direct.h diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 8ef85139553f..b49b117bdf0c 100644 +index 8ef85139553f5..b49b117bdf0c0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -708,7 +708,6 @@ config X86_SUPPORTS_MEMORY_FAILURE @@ -364180,7 +364180,7 @@ index 8ef85139553f..b49b117bdf0c 100644 select MFD_STA2X11 select GPIOLIB diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h -index a8f6c809d9b1..5e12c63b47aa 100644 +index a8f6c809d9b13..5e12c63b47aa9 100644 --- a/arch/x86/include/asm/device.h +++ b/arch/x86/include/asm/device.h @@ -6,9 +6,6 @@ struct dev_archdata { @@ -364195,7 +364195,7 @@ index a8f6c809d9b1..5e12c63b47aa 100644 #if defined(CONFIG_X86_DEV_DMA_OPS) && defined(CONFIG_PCI_DOMAINS) diff --git a/arch/x86/include/asm/dma-direct.h b/arch/x86/include/asm/dma-direct.h deleted file mode 100644 -index 1a19251eaac9..000000000000 +index 1a19251eaac90..0000000000000 --- a/arch/x86/include/asm/dma-direct.h +++ /dev/null @@ -1,9 +0,0 @@ @@ -364209,7 +364209,7 @@ index 1a19251eaac9..000000000000 - -#endif /* ASM_X86_DMA_DIRECT_H */ diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c -index 6269a175385d..4a631264b809 100644 +index 6269a175385d4..4a631264b8097 100644 --- a/arch/x86/pci/sta2x11-fixup.c +++ b/arch/x86/pci/sta2x11-fixup.c @@ -30,7 +30,6 @@ struct sta2x11_ahb_regs { /* saved during suspend */ @@ -364407,10 +364407,10 @@ index 6269a175385d..4a631264b809 100644 2.18.4 -From 51d79d30f3e65b699f6b1f2b3b3cc7a565016c8a Mon Sep 17 00:00:00 2001 +From 5fe14cad31024a6ff3f7e2bf6244f669b06d2fd6 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 30 Oct 2019 17:30:57 -0500 -Subject: [PATCH 0522/1216] PCI: of: Add inbound resource parsing to helpers +Subject: [PATCH 0522/1224] 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 @@ -364473,7 +364473,7 @@ Cc: linux-rockchip@lists.infradead.org 19 files changed, 96 insertions(+), 48 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c -index fbcb211cceb4..d421555fc786 100644 +index fbcb211cceb43..d421555fc786e 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -345,12 +345,8 @@ int dw_pcie_host_init(struct pcie_port *pp) @@ -364492,7 +364492,7 @@ index fbcb211cceb4..d421555fc786 100644 return ret; diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c -index d0e60441dc8f..e8c97cdd22bf 100644 +index d0e60441dc8f2..e8c97cdd22bf6 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -1018,7 +1018,8 @@ static int advk_pcie_probe(struct platform_device *pdev) @@ -364506,7 +364506,7 @@ index d0e60441dc8f..e8c97cdd22bf 100644 dev_err(dev, "Failed to parse resources\n"); return ret; diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c -index bf5ece5d9291..e578e9a2d2d0 100644 +index bf5ece5d9291f..e578e9a2d2d05 100644 --- a/drivers/pci/controller/pci-ftpci100.c +++ b/drivers/pci/controller/pci-ftpci100.c @@ -480,8 +480,8 @@ static int faraday_pci_probe(struct platform_device *pdev) @@ -364521,7 +364521,7 @@ index bf5ece5d9291..e578e9a2d2d0 100644 return ret; diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c -index c8cb9c5188a4..250a3fc80ec6 100644 +index c8cb9c5188a41..250a3fc80ec6d 100644 --- a/drivers/pci/controller/pci-host-common.c +++ b/drivers/pci/controller/pci-host-common.c @@ -27,7 +27,7 @@ static struct pci_config_window *gen_pci_init(struct device *dev, @@ -364534,7 +364534,7 @@ index c8cb9c5188a4..250a3fc80ec6 100644 return ERR_PTR(err); diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c -index 9a86bb7448ac..8419daee7ee3 100644 +index 9a86bb7448acf..8419daee7ee37 100644 --- a/drivers/pci/controller/pci-v3-semi.c +++ b/drivers/pci/controller/pci-v3-semi.c @@ -793,12 +793,8 @@ static int v3_pci_probe(struct platform_device *pdev) @@ -364553,7 +364553,7 @@ index 9a86bb7448ac..8419daee7ee3 100644 return ret; diff --git a/drivers/pci/controller/pci-versatile.c b/drivers/pci/controller/pci-versatile.c -index f59ad2728c0b..ca8ec84d0a8f 100644 +index f59ad2728c0b3..ca8ec84d0a8fa 100644 --- a/drivers/pci/controller/pci-versatile.c +++ b/drivers/pci/controller/pci-versatile.c @@ -141,7 +141,8 @@ static int versatile_pci_probe(struct platform_device *pdev) @@ -364567,7 +364567,7 @@ index f59ad2728c0b..ca8ec84d0a8f 100644 return ret; diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c -index ffda3e8b4742..470c6123e518 100644 +index ffda3e8b47426..470c6123e5181 100644 --- a/drivers/pci/controller/pci-xgene.c +++ b/drivers/pci/controller/pci-xgene.c @@ -634,8 +634,8 @@ static int xgene_pcie_probe(struct platform_device *pdev) @@ -364582,7 +364582,7 @@ index ffda3e8b4742..470c6123e518 100644 return ret; diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c -index d2497ca43828..b8ef7f03cb40 100644 +index d2497ca438285..b8ef7f03cb401 100644 --- a/drivers/pci/controller/pcie-altera.c +++ b/drivers/pci/controller/pcie-altera.c @@ -833,9 +833,8 @@ static int altera_pcie_probe(struct platform_device *pdev) @@ -364598,7 +364598,7 @@ index d2497ca43828..b8ef7f03cb40 100644 dev_err(dev, "Failed add resources\n"); return ret; diff --git a/drivers/pci/controller/pcie-cadence-host.c b/drivers/pci/controller/pcie-cadence-host.c -index 0dfc778f40a7..6b236b8c2cb1 100644 +index 0dfc778f40a7a..6b236b8c2cb14 100644 --- a/drivers/pci/controller/pcie-cadence-host.c +++ b/drivers/pci/controller/pcie-cadence-host.c @@ -216,7 +216,7 @@ static int cdns_pcie_host_init(struct device *dev, @@ -364611,7 +364611,7 @@ index 0dfc778f40a7..6b236b8c2cb1 100644 return err; diff --git a/drivers/pci/controller/pcie-iproc-platform.c b/drivers/pci/controller/pcie-iproc-platform.c -index 9ee6200a66f4..c1709521ab14 100644 +index 9ee6200a66f40..c1709521ab14f 100644 --- a/drivers/pci/controller/pcie-iproc-platform.c +++ b/drivers/pci/controller/pcie-iproc-platform.c @@ -97,8 +97,8 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) @@ -364626,7 +364626,7 @@ index 9ee6200a66f4..c1709521ab14 100644 dev_err(dev, "unable to get PCI host bridge resources\n"); return ret; diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c -index 626a7c352dfd..542320fc6bf7 100644 +index 626a7c352dfdf..542320fc6bf74 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -1027,8 +1027,8 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie) @@ -364641,7 +364641,7 @@ index 626a7c352dfd..542320fc6bf7 100644 return err; diff --git a/drivers/pci/controller/pcie-mobiveil.c b/drivers/pci/controller/pcie-mobiveil.c -index 32f37d08d5bc..6d50b610160f 100644 +index 32f37d08d5bc7..6d50b610160f0 100644 --- a/drivers/pci/controller/pcie-mobiveil.c +++ b/drivers/pci/controller/pcie-mobiveil.c @@ -883,8 +883,8 @@ static int mobiveil_pcie_probe(struct platform_device *pdev) @@ -364656,7 +364656,7 @@ index 32f37d08d5bc..6d50b610160f 100644 dev_err(dev, "Getting bridge resources failed\n"); return ret; diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c -index 04114352d0e7..df911a10d99a 100644 +index 04114352d0e7b..df911a10d99a5 100644 --- a/drivers/pci/controller/pcie-rcar.c +++ b/drivers/pci/controller/pcie-rcar.c @@ -1144,7 +1144,8 @@ static int rcar_pcie_probe(struct platform_device *pdev) @@ -364670,7 +364670,7 @@ index 04114352d0e7..df911a10d99a 100644 goto err_free_bridge; diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c -index ef8e677ce9d1..b8c8ea9cdb8b 100644 +index ef8e677ce9d11..b8c8ea9cdb8b7 100644 --- a/drivers/pci/controller/pcie-rockchip-host.c +++ b/drivers/pci/controller/pcie-rockchip-host.c @@ -995,8 +995,8 @@ static int rockchip_pcie_probe(struct platform_device *pdev) @@ -364685,7 +364685,7 @@ index ef8e677ce9d1..b8c8ea9cdb8b 100644 goto err_remove_irq_domain; diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c -index 45c0f344ccd1..63f7832577a4 100644 +index 45c0f344ccd16..63f7832577a41 100644 --- a/drivers/pci/controller/pcie-xilinx-nwl.c +++ b/drivers/pci/controller/pcie-xilinx-nwl.c @@ -845,8 +845,8 @@ static int nwl_pcie_probe(struct platform_device *pdev) @@ -364700,7 +364700,7 @@ index 45c0f344ccd1..63f7832577a4 100644 dev_err(dev, "Getting bridge resources failed\n"); return err; diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c -index 5bf3af3b28e6..cffe5570442c 100644 +index 5bf3af3b28e69..cffe5570442c0 100644 --- a/drivers/pci/controller/pcie-xilinx.c +++ b/drivers/pci/controller/pcie-xilinx.c @@ -647,8 +647,8 @@ static int xilinx_pcie_probe(struct platform_device *pdev) @@ -364715,7 +364715,7 @@ index 5bf3af3b28e6..cffe5570442c 100644 dev_err(dev, "Getting bridge resources failed\n"); return err; diff --git a/drivers/pci/of.c b/drivers/pci/of.c -index 36891e7deee3..033cb8e56f1e 100644 +index 36891e7deee34..033cb8e56f1eb 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -257,14 +257,16 @@ EXPORT_SYMBOL_GPL(of_pci_check_probe_only); @@ -364824,7 +364824,7 @@ index 36891e7deee3..033cb8e56f1e 100644 return err; diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h -index a5adc2e2c351..3dcd031118dd 100644 +index a5adc2e2c351d..3dcd031118dd5 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -637,11 +637,15 @@ static inline void pci_release_bus_of_node(struct pci_bus *bus) { } @@ -364846,7 +364846,7 @@ index a5adc2e2c351..3dcd031118dd 100644 return -EINVAL; } diff --git a/include/linux/pci.h b/include/linux/pci.h -index 6a6a819c5b49..df23d3517545 100644 +index 6a6a819c5b49b..df23d35175455 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2278,6 +2278,7 @@ struct irq_domain; @@ -364876,10 +364876,10 @@ index 6a6a819c5b49..df23d3517545 100644 2.18.4 -From c86ed296d9072c746fc43ad37a8142c93c26c5a9 Mon Sep 17 00:00:00 2001 +From fea11bce6af9e291cd9008f75927e627be9dfeb1 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 12 Nov 2019 17:06:04 +0100 -Subject: [PATCH 0523/1216] dma-direct: unify the dma_capable definitions +Subject: [PATCH 0523/1224] dma-direct: unify the dma_capable definitions commit 130c1ccbf55330b55e82612a6e54eebb82c9d746 upstream. @@ -364901,7 +364901,7 @@ Reviewed-by: Nicolas Saenz Julienne 4 files changed, 1 insertion(+), 37 deletions(-) diff --git a/arch/arm/include/asm/dma-direct.h b/arch/arm/include/asm/dma-direct.h -index b67e5fc1fe43..7c3001a6a775 100644 +index b67e5fc1fe436..7c3001a6a775b 100644 --- a/arch/arm/include/asm/dma-direct.h +++ b/arch/arm/include/asm/dma-direct.h @@ -14,23 +14,4 @@ static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr) @@ -364929,7 +364929,7 @@ index b67e5fc1fe43..7c3001a6a775 100644 - #endif /* ASM_ARM_DMA_DIRECT_H */ diff --git a/arch/mips/include/asm/dma-direct.h b/arch/mips/include/asm/dma-direct.h -index b5c240806e1b..14e352651ce9 100644 +index b5c240806e1bb..14e352651ce94 100644 --- a/arch/mips/include/asm/dma-direct.h +++ b/arch/mips/include/asm/dma-direct.h @@ -2,14 +2,6 @@ @@ -364948,7 +364948,7 @@ index b5c240806e1b..14e352651ce9 100644 phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr); diff --git a/arch/powerpc/include/asm/dma-direct.h b/arch/powerpc/include/asm/dma-direct.h -index a2912b47102c..e29e8a236b8d 100644 +index a2912b47102cf..e29e8a236b8df 100644 --- a/arch/powerpc/include/asm/dma-direct.h +++ b/arch/powerpc/include/asm/dma-direct.h @@ -2,15 +2,6 @@ @@ -364968,7 +364968,7 @@ index a2912b47102c..e29e8a236b8d 100644 { if (!dev) diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h -index 7aadb776924d..9e2e3d37b15c 100644 +index 7aadb776924de..9e2e3d37b15c2 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -26,6 +26,7 @@ static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr) @@ -364991,10 +364991,10 @@ index 7aadb776924d..9e2e3d37b15c 100644 2.18.4 -From f39eb13565b4104d1888571aada38861cee75a39 Mon Sep 17 00:00:00 2001 +From f73b18d947b5c13f2f894a358c208bf5bc64d4fb Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 12 Nov 2019 17:07:43 +0100 -Subject: [PATCH 0524/1216] dma-direct: avoid a forward declaration for +Subject: [PATCH 0524/1224] 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 @@ -365008,7 +365008,7 @@ Reviewed-by: Nicolas Saenz Julienne 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h -index 9e2e3d37b15c..f812ea2459f1 100644 +index 9e2e3d37b15c2..f812ea2459f12 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -8,8 +8,6 @@ @@ -365066,10 +365066,10 @@ index 9e2e3d37b15c..f812ea2459f1 100644 2.18.4 -From f5a1e810691062928b3fb995a1952c2e8e5564c8 Mon Sep 17 00:00:00 2001 +From fdf950a1a4b205b961d071aec2b963337d9e6b23 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 19 Nov 2019 17:38:58 +0100 -Subject: [PATCH 0525/1216] dma-direct: exclude dma_direct_map_resource from +Subject: [PATCH 0525/1224] dma-direct: exclude dma_direct_map_resource from the min_low_pfn check commit 68a33b1794665ba8a1d1ef1d3bfcc7c587d380a6 upstream. @@ -365093,7 +365093,7 @@ Tested-by: Marek Szyprowski 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c -index a6ac3712db8b..5cfab41e8509 100644 +index a6ac3712db8bc..5cfab41e8509c 100644 --- a/arch/x86/kernel/amd_gart_64.c +++ b/arch/x86/kernel/amd_gart_64.c @@ -185,13 +185,13 @@ static void iommu_full(struct device *dev, size_t size, int dir) @@ -365113,7 +365113,7 @@ index a6ac3712db8b..5cfab41e8509 100644 /* Map a single continuous physical area into the IOMMU. diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c -index 06346422f743..f7ab7d4e1f94 100644 +index 06346422f7432..f7ab7d4e1f94c 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -381,7 +381,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, @@ -365135,7 +365135,7 @@ index 06346422f743..f7ab7d4e1f94 100644 attrs | DMA_ATTR_SKIP_CPU_SYNC); return DMA_MAPPING_ERROR; diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h -index f812ea2459f1..46370d9a2cf6 100644 +index f812ea2459f12..46370d9a2cf6a 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -51,14 +51,15 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr) @@ -365157,7 +365157,7 @@ index f812ea2459f1..46370d9a2cf6 100644 return false; diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c -index 947823f1ccdf..803bb857aa1b 100644 +index 947823f1ccdfb..803bb857aa1bf 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -326,7 +326,7 @@ static inline bool dma_direct_possible(struct device *dev, dma_addr_t dma_addr, @@ -365179,7 +365179,7 @@ index 947823f1ccdf..803bb857aa1b 100644 return DMA_MAPPING_ERROR; } diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c -index f99b79d7e123..8d230ee47e12 100644 +index f99b79d7e1235..8d230ee47e120 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -682,7 +682,7 @@ bool swiotlb_map(struct device *dev, phys_addr_t *phys, dma_addr_t *dma_addr, @@ -365195,10 +365195,10 @@ index f99b79d7e123..8d230ee47e12 100644 2.18.4 -From e49709ed45dd775a6204b0b590b6ad434b8fa2c0 Mon Sep 17 00:00:00 2001 +From 9487216533ac9c6e01a0b22343c974e72dc7ae01 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 21 Nov 2019 10:26:44 +0100 -Subject: [PATCH 0526/1216] dma-mapping: treat dev->bus_dma_mask as a DMA limit +Subject: [PATCH 0526/1224] dma-mapping: treat dev->bus_dma_mask as a DMA limit commit a7ba70f1787f977f970cd116076c6fce4b9e01cc upstream. @@ -365239,7 +365239,7 @@ Signed-off-by: Christoph Hellwig 13 files changed, 46 insertions(+), 53 deletions(-) diff --git a/arch/mips/pci/fixup-sb1250.c b/arch/mips/pci/fixup-sb1250.c -index 8a41b359cf90..40efc990cdce 100644 +index 8a41b359cf900..40efc990cdceb 100644 --- a/arch/mips/pci/fixup-sb1250.c +++ b/arch/mips/pci/fixup-sb1250.c @@ -21,22 +21,22 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_PCI, @@ -365292,7 +365292,7 @@ index 8a41b359cf90..40efc990cdce 100644 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_PCI, quirk_sb1250_pci_dac); diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c -index ff0e2b156cb5..617a443d673d 100644 +index ff0e2b156cb5f..617a443d673da 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -115,8 +115,8 @@ static void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev) @@ -365316,7 +365316,7 @@ index ff0e2b156cb5..617a443d673d 100644 } } diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c -index fa4352dce491..3a75d665d43c 100644 +index fa4352dce491c..3a75d665d43c4 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -146,7 +146,7 @@ rootfs_initcall(pci_iommu_init); @@ -365329,7 +365329,7 @@ index fa4352dce491..3a75d665d43c 100644 } diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c -index 9268c12458c8..a03614bd3e1a 100644 +index 9268c12458c84..a03614bd3e1a2 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -367,7 +367,7 @@ bool force_dma_unencrypted(struct device *dev) @@ -365342,7 +365342,7 @@ index 9268c12458c8..a03614bd3e1a 100644 if (dma_dev_mask <= dma_enc_mask) return true; diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c -index 4a631264b809..c313d784efab 100644 +index 4a631264b8097..c313d784efabb 100644 --- a/arch/x86/pci/sta2x11-fixup.c +++ b/arch/x86/pci/sta2x11-fixup.c @@ -143,7 +143,7 @@ static void sta2x11_map_ep(struct pci_dev *pdev) @@ -365355,7 +365355,7 @@ index 4a631264b809..c313d784efab 100644 pci_set_dma_mask(pdev, max_amba_addr); diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c -index bc95a5eebd13..26db870f00e7 100644 +index bc95a5eebd137..26db870f00e78 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1062,8 +1062,8 @@ static int rc_dma_get_range(struct device *dev, u64 *size) @@ -365395,7 +365395,7 @@ index bc95a5eebd13..26db870f00e7 100644 *dev->dma_mask = mask; } diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c -index d33528033042..94b6fbe1b732 100644 +index d33528033042c..94b6fbe1b7322 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -900,7 +900,7 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) @@ -365408,7 +365408,7 @@ index d33528033042..94b6fbe1b732 100644 if (pdev->dma_mask && pdev->dma_mask < DMA_BIT_MASK(32)) return 0; diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c -index 76bd2309e023..a153ba1b8507 100644 +index 76bd2309e0234..a153ba1b8507d 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -404,8 +404,7 @@ static dma_addr_t iommu_dma_alloc_iova(struct iommu_domain *domain, @@ -365422,7 +365422,7 @@ index 76bd2309e023..a153ba1b8507 100644 if (domain->geometry.force_aperture) dma_limit = min(dma_limit, domain->geometry.aperture_end); diff --git a/drivers/of/device.c b/drivers/of/device.c -index da8158392010..e9127db7b067 100644 +index da81583920103..e9127db7b0676 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -93,7 +93,7 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma) @@ -365452,7 +365452,7 @@ index da8158392010..e9127db7b067 100644 coherent = of_dma_is_coherent(np); dev_dbg(dev, "device is%sdma coherent\n", diff --git a/include/linux/device.h b/include/linux/device.h -index 297239a08bb7..e396de656f20 100644 +index 297239a08bb77..e396de656f207 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1186,8 +1186,8 @@ struct dev_links_info { @@ -365476,7 +365476,7 @@ index 297239a08bb7..e396de656f20 100644 struct device_dma_parameters *dma_parms; diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h -index 46370d9a2cf6..dc227ce4102f 100644 +index 46370d9a2cf6a..dc227ce4102f1 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -63,7 +63,7 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size, @@ -365489,7 +365489,7 @@ index 46370d9a2cf6..dc227ce4102f 100644 u64 dma_direct_get_required_mask(struct device *dev); diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h -index 4d450672b7d6..c4d8741264bd 100644 +index 4d450672b7d66..c4d8741264bd0 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -697,7 +697,7 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) @@ -365502,7 +365502,7 @@ index 4d450672b7d6..c4d8741264bd 100644 } diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c -index 803bb857aa1b..085a0db545c7 100644 +index 803bb857aa1bf..085a0db545c74 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -26,10 +26,10 @@ static void report_addr(struct device *dev, dma_addr_t dma_addr, size_t size) @@ -365591,10 +365591,10 @@ index 803bb857aa1b..085a0db545c7 100644 2.18.4 -From 4e115d03d14d700e650e9eda97f6abf6978321de Mon Sep 17 00:00:00 2001 +From 15de927d1351b6585363dbd266aa15d03f97b421 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Mon, 16 Dec 2019 12:01:08 +0100 -Subject: [PATCH 0527/1216] ARM: dts: bcm2711: Enable PCIe controller +Subject: [PATCH 0527/1224] ARM: dts: bcm2711: Enable PCIe controller commit d5c8dc0d4c880fbde5293cc186b1ab23466254c4 upstream. @@ -365608,7 +365608,7 @@ Signed-off-by: Florian Fainelli 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index e2f6ffb00aa9..b56388ce1216 100644 +index e2f6ffb00aa94..b56388ce12163 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -331,7 +331,36 @@ @@ -365653,10 +365653,10 @@ index e2f6ffb00aa9..b56388ce1216 100644 2.18.4 -From 6987d165b7989031e908a1dd67c4df07abe18753 Mon Sep 17 00:00:00 2001 +From 7ea03501c141a30b9acf7dbe12277ea77e55f0ff Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 16 Dec 2019 12:01:09 +0100 -Subject: [PATCH 0528/1216] PCI: brcmstb: Add Broadcom STB PCIe host controller +Subject: [PATCH 0528/1224] PCI: brcmstb: Add Broadcom STB PCIe host controller driver commit c0452137034bda8f686dd9a2e167949bfffd6776 upstream. @@ -365679,7 +365679,7 @@ Reviewed-by: Jeremy Linton create mode 100644 drivers/pci/controller/pcie-brcmstb.c diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig -index 70e078238899..00d791d126a5 100644 +index 70e078238899f..00d791d126a54 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -281,6 +281,14 @@ config VMD @@ -365698,7 +365698,7 @@ index 70e078238899..00d791d126a5 100644 tristate "Hyper-V PCI Interface" depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64 diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile -index a2a22c9d91af..3fc0b0cf5b5b 100644 +index a2a22c9d91afc..3fc0b0cf5b5bf 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o @@ -365711,7 +365711,7 @@ index a2a22c9d91af..3fc0b0cf5b5b 100644 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c new file mode 100644 -index 000000000000..3250a2e6b1b4 +index 0000000000000..3250a2e6b1b41 --- /dev/null +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -0,0 +1,755 @@ @@ -366474,10 +366474,10 @@ index 000000000000..3250a2e6b1b4 2.18.4 -From f561c6fb55b61113860b8b8491377f9b1d0bad19 Mon Sep 17 00:00:00 2001 +From baea018c5b22e84e61dfb09e5a5b0cc0995998d6 Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 16 Dec 2019 12:01:10 +0100 -Subject: [PATCH 0529/1216] PCI: brcmstb: Add MSI support +Subject: [PATCH 0529/1224] PCI: brcmstb: Add MSI support commit 40ca1bf580ef24df30702032ba5e40dfdcaa200b upstream. @@ -366502,7 +366502,7 @@ Reviewed-by: Andrew Murray 2 files changed, 262 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig -index 00d791d126a5..b83d318a5093 100644 +index 00d791d126a54..b83d318a50933 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -285,6 +285,7 @@ config PCIE_BRCMSTB @@ -366514,7 +366514,7 @@ index 00d791d126a5..b83d318a5093 100644 Say Y here to enable PCIe host controller support for Broadcom STB based SoCs, like the Raspberry Pi 4. diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 3250a2e6b1b4..d20aabc26273 100644 +index 3250a2e6b1b41..d20aabc26273c 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -2,6 +2,7 @@ @@ -366865,10 +366865,10 @@ index 3250a2e6b1b4..d20aabc26273 100644 2.18.4 -From b43190bfcbb697354c8c2b5f59596351ad25ca96 Mon Sep 17 00:00:00 2001 +From 1cec46a604d867bfe6c1502701aaab24277c7d9b Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 27 Feb 2020 12:51:46 +0100 -Subject: [PATCH 0530/1216] PCI: brcmstb: Fix build on 32bit ARM platforms with +Subject: [PATCH 0530/1224] PCI: brcmstb: Fix build on 32bit ARM platforms with older compilers commit 73a7a271b3eee7b83f29b13866163776f1cbef89 upstream. @@ -366893,7 +366893,7 @@ Acked-by: Lorenzo Pieralisi 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index d20aabc26273..3a10e678c7f4 100644 +index d20aabc26273c..3a10e678c7f47 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -670,7 +670,7 @@ static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie, @@ -366909,10 +366909,10 @@ index d20aabc26273..3a10e678c7f4 100644 2.18.4 -From f82b056158616414b00a0ddc8b4938493e22dedb Mon Sep 17 00:00:00 2001 +From 66b8271db808c3100f342f1dcbe939c2ffe99f6f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 2 Mar 2020 15:05:25 +0000 -Subject: [PATCH 0531/1216] bcm2711-rpi.dtsi: Use upstream pcie node +Subject: [PATCH 0531/1224] 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. @@ -366924,7 +366924,7 @@ Signed-off-by: Phil Elwell 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index f5bd44ea2bf1..ec2a40447176 100644 +index f5bd44ea2bf19..ec2a40447176c 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -163,7 +163,7 @@ @@ -366937,7 +366937,7 @@ index f5bd44ea2bf1..ec2a40447176 100644 /delete-node/ wifi-pwrseq; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index a71b2eb74723..18ba012413aa 100644 +index a71b2eb74723f..18ba012413aaf 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -66,47 +66,6 @@ @@ -366992,10 +366992,10 @@ index a71b2eb74723..18ba012413aa 100644 2.18.4 -From e7d7538e317822f12e1cd6f2105f6456538e7aab Mon Sep 17 00:00:00 2001 +From 54d2adf3836f016dd6dfb57aeade5e7fbc98dc63 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:14:49 +0000 -Subject: [PATCH 0532/1216] Revert "media: i2c: Add driver for Sony IMX219 +Subject: [PATCH 0532/1224] Revert "media: i2c: Add driver for Sony IMX219 sensor" This reverts commit 39d484cb87cbe5da5035199fbdec1f3c0b71d2ea. @@ -367007,7 +367007,7 @@ This reverts commit 39d484cb87cbe5da5035199fbdec1f3c0b71d2ea. delete mode 100644 drivers/media/i2c/imx219.c diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index e57406240288..656bc361e58c 100644 +index e57406240288d..656bc361e58cc 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -578,17 +578,6 @@ config VIDEO_IMX214 @@ -367029,7 +367029,7 @@ index e57406240288..656bc361e58c 100644 tristate "Sony IMX258 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 52e4c4026307..4ba92c433615 100644 +index 52e4c40263075..4ba92c433615b 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -111,7 +111,6 @@ obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o @@ -367042,7 +367042,7 @@ index 52e4c4026307..4ba92c433615 100644 obj-$(CONFIG_VIDEO_IMX319) += imx319.o diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c deleted file mode 100644 -index 682397a48492..000000000000 +index 682397a484922..0000000000000 --- a/drivers/media/i2c/imx219.c +++ /dev/null @@ -1,1093 +0,0 @@ @@ -368143,10 +368143,10 @@ index 682397a48492..000000000000 2.18.4 -From ca9877c92251007a18a4624fc274af72af6d284d Mon Sep 17 00:00:00 2001 +From e891358739c1e344df0bbe11030b82819e0e4487 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:14:58 +0000 -Subject: [PATCH 0533/1216] Revert "media: dt-bindings: Add binding for the +Subject: [PATCH 0533/1224] Revert "media: dt-bindings: Add binding for the Sony IMX219 sensor" This reverts commit e3dca865875b345a2fa45e8295e32d701c666334. @@ -368157,7 +368157,7 @@ This reverts commit e3dca865875b345a2fa45e8295e32d701c666334. diff --git a/Documentation/devicetree/bindings/media/i2c/imx219.txt b/Documentation/devicetree/bindings/media/i2c/imx219.txt deleted file mode 100644 -index a02f1ce1e120..000000000000 +index a02f1ce1e1204..0000000000000 --- a/Documentation/devicetree/bindings/media/i2c/imx219.txt +++ /dev/null @@ -1,59 +0,0 @@ @@ -368224,10 +368224,10 @@ index a02f1ce1e120..000000000000 2.18.4 -From 189bc708f29f8945c06a0cf0710bc04e3d7c6fc6 Mon Sep 17 00:00:00 2001 +From a5e4e2e0d5c673c534a83880423919cdaafda919 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Mon, 20 Jan 2020 05:15:57 -0300 -Subject: [PATCH 0534/1216] media: dt-bindings: media: i2c: Add IMX219 CMOS +Subject: [PATCH 0534/1224] media: dt-bindings: media: i2c: Add IMX219 CMOS sensor binding Commit 9d730f2cf4c0391785855dd231577d2de2594df9 upstream. @@ -368248,7 +368248,7 @@ Signed-off-by: Mauro Carvalho Chehab diff --git a/Documentation/devicetree/bindings/media/i2c/imx219.yaml b/Documentation/devicetree/bindings/media/i2c/imx219.yaml new file mode 100644 -index 000000000000..32d6b693274f +index 0000000000000..32d6b693274f0 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx219.yaml @@ -0,0 +1,114 @@ @@ -368367,7 +368367,7 @@ index 000000000000..32d6b693274f + +... diff --git a/MAINTAINERS b/MAINTAINERS -index b7685777a806..d99bdf934705 100644 +index b7685777a8061..d99bdf9347058 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15143,6 +15143,14 @@ S: Maintained @@ -368389,10 +368389,10 @@ index b7685777a806..d99bdf934705 100644 2.18.4 -From 8996ebebd205fbbfc3185c3d2843eee960b34974 Mon Sep 17 00:00:00 2001 +From 1ec4f84401d06c7c463b8f8ac4d5e6f1e7f64713 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Jan 2020 05:15:58 -0300 -Subject: [PATCH 0535/1216] media: i2c: Add driver for Sony IMX219 sensor +Subject: [PATCH 0535/1224] media: i2c: Add driver for Sony IMX219 sensor Commit 1283b3b8f82b9004fbb94398cade5c8e797a2c8d upstream. (Currently on linux-media/master, queued for 5.7) @@ -368417,7 +368417,7 @@ Signed-off-by: Mauro Carvalho Chehab create mode 100644 drivers/media/i2c/imx219.c diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 656bc361e58c..7ae2a94bb2ef 100644 +index 656bc361e58cc..7ae2a94bb2ef5 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -578,6 +578,17 @@ config VIDEO_IMX214 @@ -368439,7 +368439,7 @@ index 656bc361e58c..7ae2a94bb2ef 100644 tristate "Sony IMX258 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 4ba92c433615..52e4c4026307 100644 +index 4ba92c433615b..52e4c40263075 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -111,6 +111,7 @@ obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o @@ -368452,7 +368452,7 @@ index 4ba92c433615..52e4c4026307 100644 obj-$(CONFIG_VIDEO_IMX319) += imx319.o diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c new file mode 100644 -index 000000000000..f1effb5a5f66 +index 0000000000000..f1effb5a5f66a --- /dev/null +++ b/drivers/media/i2c/imx219.c @@ -0,0 +1,1312 @@ @@ -369772,10 +369772,10 @@ index 000000000000..f1effb5a5f66 2.18.4 -From 8f2b588c64ec49e7a51463f09e149993c5612c0d Mon Sep 17 00:00:00 2001 +From 421092bd4049cb5c3ed2e64b4ed52a74b8f0ed7c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Mar 2020 12:07:57 +0000 -Subject: [PATCH 0536/1216] overlays: imx219: Correct link frequency to match +Subject: [PATCH 0536/1224] overlays: imx219: Correct link frequency to match the upstream driver The upstream driver is checking the link frequency parameter, and @@ -369787,7 +369787,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts -index 2a1500d07b68..b9e3d9e5730d 100644 +index 2a1500d07b680..b9e3d9e5730d4 100644 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts @@ -40,7 +40,7 @@ @@ -369803,10 +369803,10 @@ index 2a1500d07b68..b9e3d9e5730d 100644 2.18.4 -From 5e571ef13bd2ffde99f35d0a35b0e61f2d6af080 Mon Sep 17 00:00:00 2001 +From 0052e51be6703d8151c03ec96d89ea617ef3d7e6 Mon Sep 17 00:00:00 2001 From: Nataliya Korovkina Date: Thu, 12 Mar 2020 17:22:53 -0400 -Subject: [PATCH 0537/1216] Kbuild: Allow .dtbo overlays to be built, adjust. +Subject: [PATCH 0537/1224] Kbuild: Allow .dtbo overlays to be built, adjust. This is adjustment to commit d368ceaacdccd7732dc97d1d7987bdf7149d62e3 "kbuild: Allow .dtbo overlays to be built piecemeal" @@ -369819,7 +369819,7 @@ Signed-off-by: Nataliya Korovkina 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 1fddee1ede06..84e0410d3d2e 100644 +index f67764a2f8693..0c547f803af5d 100644 --- a/Makefile +++ b/Makefile @@ -1267,7 +1267,7 @@ ifneq ($(dtstree),) @@ -369835,10 +369835,10 @@ index 1fddee1ede06..84e0410d3d2e 100644 2.18.4 -From c1de0ba67c8d16fda6aebbd0b0108d85bd0c1f3f Mon Sep 17 00:00:00 2001 +From 955051bfd24d3ac963a0b6d40d548e19694590fc Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 15 Jan 2020 13:40:38 +0000 -Subject: [PATCH 0538/1216] media: ov5647: Fix return codes from +Subject: [PATCH 0538/1224] media: ov5647: Fix return codes from ov5647_write/ov5647_read functions. Previously they were returning positive non-zero codes for success, @@ -369854,7 +369854,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 07550377be2e..6ecc018ac431 100644 +index 07550377be2ef..6ecc018ac4317 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -214,9 +214,18 @@ static int ov5647_write(struct v4l2_subdev *sd, u16 reg, u8 val) @@ -369915,10 +369915,10 @@ index 07550377be2e..6ecc018ac431 100644 2.18.4 -From 7f00c4ac4527feadef2d0a012744a586bcc3b7ca Mon Sep 17 00:00:00 2001 +From 50d67aa96df20610eaf64f51fe403e3d1a2aeee2 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:30:53 +0000 -Subject: [PATCH 0539/1216] media: ov5647: Add basic support for multiple +Subject: [PATCH 0539/1224] media: ov5647: Add basic support for multiple sensor modes. Specifically: @@ -369940,7 +369940,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 202 insertions(+), 66 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 6ecc018ac431..0d84b7640cf3 100644 +index 6ecc018ac4317..0d84b7640cf39 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -86,13 +86,17 @@ struct regval_list { @@ -370328,10 +370328,10 @@ index 6ecc018ac431..0d84b7640cf3 100644 2.18.4 -From d0e8f0ff808ab0ba93d0895701c5ba0444c6de5a Mon Sep 17 00:00:00 2001 +From 990e104201e11e46d3430360dfb84b594e917c14 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:23 +0000 -Subject: [PATCH 0540/1216] media: ov5647: Add V4L2 controls for analogue gain, +Subject: [PATCH 0540/1224] media: ov5647: Add V4L2 controls for analogue gain, exposure and AWB Added basic v4l2_ctrl_handler infrastructure (there was none @@ -370351,7 +370351,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 174 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 0d84b7640cf3..16cfafc9cf9c 100644 +index 0d84b7640cf39..16cfafc9cf9cb 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -29,11 +29,13 @@ @@ -370611,10 +370611,10 @@ index 0d84b7640cf3..16cfafc9cf9c 100644 2.18.4 -From c9f9101c37915081372eab37501380ac505f9711 Mon Sep 17 00:00:00 2001 +From 9775211ee7b50fff23fb11d56f939c22b8f960ad Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:28 +0000 -Subject: [PATCH 0541/1216] media: ov5647: Add extra 10-bit sensor modes. +Subject: [PATCH 0541/1224] media: ov5647: Add extra 10-bit sensor modes. The 8-bit VGA mode remains, we add the following 10-bit modes: @@ -370634,7 +370634,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 452 insertions(+), 11 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 16cfafc9cf9c..fc6c5d9c4532 100644 +index 16cfafc9cf9cb..fc6c5d9c4532c 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -111,6 +111,7 @@ struct ov5647 { @@ -371166,10 +371166,10 @@ index 16cfafc9cf9c..fc6c5d9c4532 100644 2.18.4 -From 42f4d281a9b8f655b59349448f7f43ddd7e47b78 Mon Sep 17 00:00:00 2001 +From 00af5eb64c36b5c35dd02b6ad4ddb81d8f3a948b Mon Sep 17 00:00:00 2001 From: David Plowman Date: Wed, 29 Jan 2020 15:31:32 +0000 -Subject: [PATCH 0542/1216] media: ov5647: change defaults to better match raw +Subject: [PATCH 0542/1224] media: ov5647: change defaults to better match raw camera applications. Specifically: @@ -371191,7 +371191,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index fc6c5d9c4532..66b3ee5cc190 100644 +index fc6c5d9c4532c..66b3ee5cc1909 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -669,8 +669,8 @@ static struct ov5647_mode supported_modes_10bit[] = { @@ -371231,10 +371231,10 @@ index fc6c5d9c4532..66b3ee5cc190 100644 2.18.4 -From 7c8f39b98a44564d2ba1033f8144968a6daf84fc Mon Sep 17 00:00:00 2001 +From 166380f69a8abd4e09f3f54f2e016e58e3d90ee6 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 15:44:31 +0100 -Subject: [PATCH 0543/1216] drm/vc4: fkms: Change crtc_state structure name to +Subject: [PATCH 0543/1224] drm/vc4: fkms: Change crtc_state structure name to avoid conflict Signed-off-by: Maxime Ripard @@ -371243,7 +371243,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index b0c1096efbe5..2bfa10660fe0 100644 +index b0c1096efbe59..2bfa10660fe09 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -260,7 +260,7 @@ static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc) @@ -371316,10 +371316,10 @@ index b0c1096efbe5..2bfa10660fe0 100644 2.18.4 -From 9d2b1e4097be7e0e088a52a269ca00d3257fbd6f Mon Sep 17 00:00:00 2001 +From 6c1ecf6f7615591e7947fee969c47a7534c25756 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:22:06 +0000 -Subject: [PATCH 0544/1216] drm/fourcc: Add packed 10bit YUV 4:2:0 format +Subject: [PATCH 0544/1224] 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). @@ -371333,7 +371333,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 14 insertions(+) diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c -index c630064ccf41..f64a59f3520d 100644 +index c630064ccf416..f64a59f3520de 100644 --- a/drivers/gpu/drm/drm_fourcc.c +++ b/drivers/gpu/drm/drm_fourcc.c @@ -274,6 +274,9 @@ const struct drm_format_info *__drm_format_info(u32 format) @@ -371347,7 +371347,7 @@ index c630064ccf41..f64a59f3520d 100644 unsigned int i; diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h -index 3feeaa3f987a..9847286609a8 100644 +index 3feeaa3f987a7..9847286609a86 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -265,6 +265,13 @@ extern "C" { @@ -371379,10 +371379,10 @@ index 3feeaa3f987a..9847286609a8 100644 2.18.4 -From 9bfd786ee0e88f68573eab06a87b403830891403 Mon Sep 17 00:00:00 2001 +From 285b8b9e6905485b0efc776a57a202e30e5cbf8b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:24:33 +0000 -Subject: [PATCH 0545/1216] drm/vc4: Add DRM_FORMAT_P030 support to +Subject: [PATCH 0545/1224] drm/vc4: Add DRM_FORMAT_P030 support to firmware-kms Adds support for this format which is 3 10bit samples packed into @@ -371395,7 +371395,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 2bfa10660fe0..6701cd3a0249 100644 +index 2bfa10660fe09..6701cd3a0249a 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -216,6 +216,10 @@ static const struct vc_image_format { @@ -371441,7 +371441,7 @@ index 2bfa10660fe0..6701cd3a0249 100644 case DRM_FORMAT_RGB888: case DRM_FORMAT_BGR888: diff --git a/drivers/gpu/drm/vc4/vc_image_types.h b/drivers/gpu/drm/vc4/vc_image_types.h -index 0bdffe5dd1e9..8e76576733ef 100644 +index 0bdffe5dd1e9a..8e76576733ef4 100644 --- a/drivers/gpu/drm/vc4/vc_image_types.h +++ b/drivers/gpu/drm/vc4/vc_image_types.h @@ -139,6 +139,10 @@ enum { @@ -371459,10 +371459,10 @@ index 0bdffe5dd1e9..8e76576733ef 100644 2.18.4 -From 176093fcdac63074f0206c1c9067ae6aa2f2c28d Mon Sep 17 00:00:00 2001 +From cc9a894ba7916e5be1ffde27871f6dfe9948b757 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 6 Mar 2020 11:08:10 +0100 -Subject: [PATCH 0546/1216] gpio-ir-overlay: add parameter to configure signal +Subject: [PATCH 0546/1224] gpio-ir-overlay: add parameter to configure signal polarity (#3490) Standard IR receivers use inverted / active-low signalling @@ -371482,7 +371482,7 @@ Signed-off-by: Matthias Reichl 2 files changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 572edc7818ea..d2306a2e0b63 100644 +index 572edc7818ea7..d2306a2e0b63c 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -754,6 +754,10 @@ Params: gpio_pin Input pin number. Default is 18. @@ -371497,7 +371497,7 @@ index 572edc7818ea..d2306a2e0b63 100644 ir-keytable), defaults to "rc-rc6-mce" diff --git a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts -index 58f588498d68..162b6ce07dc9 100644 +index 58f588498d68e..162b6ce07dc91 100644 --- a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts +++ b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts @@ -42,6 +42,7 @@ @@ -371512,10 +371512,10 @@ index 58f588498d68..162b6ce07dc9 100644 2.18.4 -From 1ae4958c9724f49ad35d5f989eb19fb94d00f1ae Mon Sep 17 00:00:00 2001 +From 27295be1c56d4f5937541d60077cc8251b9bc78e Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Mon, 24 Feb 2020 22:56:59 +0100 -Subject: [PATCH 0547/1216] Add support for merus-amp soundcard and ma120x0p +Subject: [PATCH 0547/1224] Add support for merus-amp soundcard and ma120x0p codec correct checkpatch warnings and errors @@ -371534,7 +371534,7 @@ Signed-off-by: AMuszkat create mode 100644 sound/soc/codecs/ma120x0p.c diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 66f5be258aa5..85d8249a2f20 100644 +index 66f5be258aa5c..85d8249a2f201 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -103,6 +103,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -371546,7 +371546,7 @@ index 66f5be258aa5..85d8249a2f20 100644 midi-uart1.dtbo \ miniuart-bt.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index d2306a2e0b63..62ad35f78bad 100644 +index d2306a2e0b63c..62ad35f78bada 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1662,6 +1662,12 @@ Params: speed Display SPI bus speed @@ -371564,7 +371564,7 @@ index d2306a2e0b63..62ad35f78bad 100644 31.25kbaud, the frequency required for MIDI diff --git a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts new file mode 100644 -index 000000000000..4501fbdc253d +index 0000000000000..4501fbdc253da --- /dev/null +++ b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts @@ -0,0 +1,60 @@ @@ -371629,7 +371629,7 @@ index 000000000000..4501fbdc253d + }; +}; diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c -index 133b6d98f515..41965c71c912 100644 +index 133b6d98f515f..41965c71c9120 100644 --- a/sound/soc/bcm/rpi-simple-soundcard.c +++ b/sound/soc/bcm/rpi-simple-soundcard.c @@ -16,6 +16,10 @@ @@ -371682,7 +371682,7 @@ index 133b6d98f515..41965c71c912 100644 }; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 2cc56e9a0e84..c4160609a67b 100644 +index 2cc56e9a0e84c..c4160609a67b8 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -103,6 +103,7 @@ config SND_SOC_ALL_CODECS @@ -371708,7 +371708,7 @@ index 2cc56e9a0e84..c4160609a67b 100644 tristate default y if SND_SOC_CS47L15=y diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index 9b201db7a150..02560ad53894 100644 +index 9b201db7a1502..02560ad53894e 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -99,6 +99,7 @@ snd-soc-l3-objs := l3.o @@ -371729,7 +371729,7 @@ index 9b201db7a150..02560ad53894 100644 obj-$(CONFIG_SND_SOC_MAX9768) += snd-soc-max9768.o diff --git a/sound/soc/codecs/ma120x0p.c b/sound/soc/codecs/ma120x0p.c new file mode 100644 -index 000000000000..39c74b17e007 +index 0000000000000..39c74b17e0077 --- /dev/null +++ b/sound/soc/codecs/ma120x0p.c @@ -0,0 +1,1384 @@ @@ -373121,10 +373121,10 @@ index 000000000000..39c74b17e007 2.18.4 -From dd3705832b72831cfb78f11e0499be31b66f9f7b Mon Sep 17 00:00:00 2001 +From e3324f5eb4a5197d711f698cb982972f1da95229 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 17 Mar 2020 16:39:07 +0000 -Subject: [PATCH 0548/1216] ARM: dts: bcm2711: Add 32-bit PMU compatibility +Subject: [PATCH 0548/1224] 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 @@ -373136,7 +373136,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 18ba012413aa..b434b8392e9e 100644 +index 18ba012413aaf..b434b8392e9ef 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -12,6 +12,10 @@ @@ -373154,10 +373154,10 @@ index 18ba012413aa..b434b8392e9e 100644 2.18.4 -From 7c45b6b5294d33397b043ec1f07b61f8b7a3f517 Mon Sep 17 00:00:00 2001 +From a0c9921879c2cda261cb27548ed5d5ae4ad12a3d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 19 Mar 2020 10:04:46 +0000 -Subject: [PATCH 0549/1216] ARM: dts: bcm271x: Use a53 pmu, drop RPI364 +Subject: [PATCH 0549/1224] 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 @@ -373177,7 +373177,7 @@ Signed-off-by: Phil Elwell 6 files changed, 1 insertion(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi -index 4e47480dd933..e7e5c913f1d1 100644 +index 4e47480dd9338..e7e5c913f1d1c 100644 --- a/arch/arm/boot/dts/bcm2710.dtsi +++ b/arch/arm/boot/dts/bcm2710.dtsi @@ -5,11 +5,7 @@ @@ -373194,7 +373194,7 @@ index 4e47480dd933..e7e5c913f1d1 100644 soc { diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts -index 116cdbf94b9b..36ecea71f0ef 100644 +index 116cdbf94b9b0..36ecea71f0ef9 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts @@ -1,3 +1 @@ @@ -373202,7 +373202,7 @@ index 116cdbf94b9b..36ecea71f0ef 100644 - #include "../../../../arm/boot/dts/bcm2710-rpi-2-b.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts -index d9242ff77079..22fc6a82f2a9 100644 +index d9242ff77079c..22fc6a82f2a96 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts @@ -1,3 +1 @@ @@ -373210,7 +373210,7 @@ index d9242ff77079..22fc6a82f2a9 100644 - #include "../../../../arm/boot/dts/bcm2710-rpi-3-b-plus.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts -index deb33441da95..4cacc5b72ae3 100644 +index deb33441da952..4cacc5b72ae3c 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts @@ -1,3 +1 @@ @@ -373218,7 +373218,7 @@ index deb33441da95..4cacc5b72ae3 100644 - #include "../../../../arm/boot/dts/bcm2710-rpi-3-b.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts -index 1c2560017c02..e1e13784cff6 100644 +index 1c2560017c02f..e1e13784cff63 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts @@ -1,3 +1 @@ @@ -373226,7 +373226,7 @@ index 1c2560017c02..e1e13784cff6 100644 - #include "../../../../arm/boot/dts/bcm2710-rpi-cm3.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts -index 1fd86f81f542..bf69a4b0b172 100644 +index 1fd86f81f5426..bf69a4b0b172a 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts @@ -1,3 +1 @@ @@ -373237,10 +373237,10 @@ index 1fd86f81f542..bf69a4b0b172 100644 2.18.4 -From 096662d7e3b1d1a368b6136dfed4af0c2b5739ad Mon Sep 17 00:00:00 2001 +From 6c5683fbf18a8b907b340ace5a3e1eafb1209447 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Tue, 25 Feb 2020 14:11:59 +0100 -Subject: [PATCH 0550/1216] net: bcmgenet: Clear ID_MODE_DIS in +Subject: [PATCH 0550/1224] net: bcmgenet: Clear ID_MODE_DIS in EXT_RGMII_OOB_CTRL when not needed commit 402482a6a78e5c61d8a2ec6311fc5b4aca392cd6 upstream. @@ -373260,7 +373260,7 @@ Signed-off-by: Matthias Reichl 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c -index 0516d14f4703..942ee7cc8266 100644 +index 0516d14f47035..942ee7cc82668 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -292,6 +292,7 @@ int bcmgenet_mii_config(struct net_device *dev, bool init) @@ -373275,10 +373275,10 @@ index 0516d14f4703..942ee7cc8266 100644 2.18.4 -From 0addb861193e8eebba5c461eecd2e2e6a5cde87c Mon Sep 17 00:00:00 2001 +From f4cdff8c476396c1486147043757a824a0af8c70 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:22 +0100 -Subject: [PATCH 0551/1216] drm/modes: parse_cmdline: Fix possible reference +Subject: [PATCH 0551/1224] drm/modes: parse_cmdline: Fix possible reference past end of string Commit 8582e244e5fe72d2e9ace186fa8f3ed3bb4122e1 upstream. @@ -373301,7 +373301,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-1-hdego 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 3fd35e6b9d53..86fb462a8ca1 100644 +index 3fd35e6b9d535..86fb462a8ca12 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1568,11 +1568,34 @@ static int drm_mode_parse_cmdline_res_mode(const char *str, unsigned int length, @@ -373422,10 +373422,10 @@ index 3fd35e6b9d53..86fb462a8ca1 100644 2.18.4 -From 3ec5c66d4254e0fe246bb93c290e2a037ef9a224 Mon Sep 17 00:00:00 2001 +From e8ed4a956ba580017a9351ac40f9bd8197e28ee4 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:23 +0100 -Subject: [PATCH 0552/1216] drm/modes: parse_cmdline: Make various char +Subject: [PATCH 0552/1224] drm/modes: parse_cmdline: Make various char pointers const Commit 83e14ea3a64f00897cc31974d3ae4e27e5a7405b upstream. @@ -373441,7 +373441,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-2-hdego 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 86fb462a8ca1..342fe8076ee7 100644 +index 86fb462a8ca12..342fe8076ee7e 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1591,15 +1591,15 @@ static int drm_mode_parse_cmdline_int(const char *delim, unsigned int *int_ret) @@ -373478,10 +373478,10 @@ index 86fb462a8ca1..342fe8076ee7 100644 2.18.4 -From 7421de91b3431cbad345ac715e27f21786ee3268 Mon Sep 17 00:00:00 2001 +From 25d370763b3d08c8dd37875ca542c435bbf8ea0d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:24 +0100 -Subject: [PATCH 0553/1216] drm/modes: parse_cmdline: Stop parsing extras after +Subject: [PATCH 0553/1224] drm/modes: parse_cmdline: Stop parsing extras after bpp / refresh at ', ' Commit c2ed3e941901810ad3d55ce1935fa22c5007fee4 upstream. @@ -373506,7 +373506,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 342fe8076ee7..6d9324a0d00f 100644 +index 342fe8076ee7e..6d9324a0d00f9 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1728,7 +1728,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, @@ -373534,7 +373534,7 @@ index 342fe8076ee7..6d9324a0d00f 100644 ret = drm_mode_parse_cmdline_extra(extra_ptr, len, false, connector, mode); diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h -index 84e6bc050bf2..2785a38f5864 100644 +index 84e6bc050bf2c..2785a38f58640 100644 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h @@ -61,3 +61,4 @@ cmdline_test(drm_cmdline_test_vmirror) @@ -373543,7 +373543,7 @@ index 84e6bc050bf2..2785a38f5864 100644 cmdline_test(drm_cmdline_test_invalid_option) +cmdline_test(drm_cmdline_test_bpp_extra_and_option) diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c -index 035f86c5d648..7b199acaf292 100644 +index 035f86c5d6482..7b199acaf2926 100644 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c @@ -1003,6 +1003,32 @@ static int drm_cmdline_test_invalid_option(void *ignored) @@ -373583,10 +373583,10 @@ index 035f86c5d648..7b199acaf292 100644 2.18.4 -From 5d9bb5dc1d0a6f14c5b9b9d7052513c923618378 Mon Sep 17 00:00:00 2001 +From 5a1c6f4e99f6e0b6dd3fcb0554ab1515ae8b8926 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:25 +0100 -Subject: [PATCH 0554/1216] drm/modes: parse_cmdline: Accept extras directly +Subject: [PATCH 0554/1224] drm/modes: parse_cmdline: Accept extras directly after mode combined with options Commit cfb0881b8f621b656a9e23b31944a5db94cf5842 upstream. @@ -373611,7 +373611,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-4-hdego 3 files changed, 26 insertions(+) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 6d9324a0d00f..ff9d9daf2631 100644 +index 6d9324a0d00f9..ff9d9daf2631f 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1801,6 +1801,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, @@ -373623,7 +373623,7 @@ index 6d9324a0d00f..ff9d9daf2631 100644 mode_end = strlen(name); parse_extras = true; diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h -index 2785a38f5864..628d11d74d6b 100644 +index 2785a38f58640..628d11d74d6b6 100644 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h @@ -62,3 +62,4 @@ cmdline_test(drm_cmdline_test_margin_options) @@ -373632,7 +373632,7 @@ index 2785a38f5864..628d11d74d6b 100644 cmdline_test(drm_cmdline_test_bpp_extra_and_option) +cmdline_test(drm_cmdline_test_extra_and_option) diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c -index 7b199acaf292..a1210b7bf937 100644 +index 7b199acaf2926..a1210b7bf937c 100644 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c @@ -1029,6 +1029,30 @@ static int drm_cmdline_test_bpp_extra_and_option(void *ignored) @@ -373670,10 +373670,10 @@ index 7b199acaf292..a1210b7bf937 100644 2.18.4 -From 7b5982da835894d13b9b0814ce78ebfe72bfc143 Mon Sep 17 00:00:00 2001 +From eedb4fc7899f41984ea7b31c71036d1ba73a7998 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:26 +0100 -Subject: [PATCH 0555/1216] drm/modes: parse_cmdline: Rework +Subject: [PATCH 0555/1224] drm/modes: parse_cmdline: Rework drm_mode_parse_cmdline_options() Commit 739b200c2edcaaa7a86f37b0c11db57956433dfb upstream. @@ -373693,7 +373693,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-5-hdego 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index ff9d9daf2631..0d7de6f4dec0 100644 +index ff9d9daf2631f..0d7de6f4dec00 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1591,23 +1591,21 @@ static int drm_mode_parse_cmdline_int(const char *delim, unsigned int *int_ret) @@ -373752,10 +373752,10 @@ index ff9d9daf2631..0d7de6f4dec0 100644 2.18.4 -From 59c9c203d6934aa1805a705d37304755be25d748 Mon Sep 17 00:00:00 2001 +From c16f51dd4bd53d87232a76ac9b5d56ebbd61a845 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:27 +0100 -Subject: [PATCH 0556/1216] drm/modes: parse_cmdline: Add freestanding argument +Subject: [PATCH 0556/1224] drm/modes: parse_cmdline: Add freestanding argument to drm_mode_parse_cmdline_options() Commit 99e2716e053734b70434502867be24d20a3e2d84 upstream. @@ -373774,7 +373774,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-6-hdego 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 0d7de6f4dec0..d4b9e7ed6dfe 100644 +index 0d7de6f4dec00..d4b9e7ed6dfeb 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1592,6 +1592,7 @@ static int drm_mode_parse_cmdline_int(const char *delim, unsigned int *int_ret) @@ -373807,10 +373807,10 @@ index 0d7de6f4dec0..d4b9e7ed6dfe 100644 2.18.4 -From d46c09594b07c3554c06755882adb1879aa4119e Mon Sep 17 00:00:00 2001 +From ad8b02342b236f45c8a48009ea7c6b2a37392fb3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:28 +0100 -Subject: [PATCH 0557/1216] drm/modes: parse_cmdline: Set bpp/refresh_specified +Subject: [PATCH 0557/1224] drm/modes: parse_cmdline: Set bpp/refresh_specified after successful parsing Commit 6a2d163756545aa3180d7851d5f8322b865e72be upstream. @@ -373832,7 +373832,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index d4b9e7ed6dfe..7b9f067a8898 100644 +index d4b9e7ed6dfeb..7b9f067a88984 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1778,10 +1778,8 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, @@ -373877,10 +373877,10 @@ index d4b9e7ed6dfe..7b9f067a8898 100644 2.18.4 -From 46d22f762c4ace7ff17732ef0f23f35318c07122 Mon Sep 17 00:00:00 2001 +From 7fa11c97fd8e5c3f3fe3031597619784000428c6 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:29 +0100 -Subject: [PATCH 0558/1216] drm/modes: parse_cmdline: Allow specifying +Subject: [PATCH 0558/1224] drm/modes: parse_cmdline: Allow specifying stand-alone options Commit 7b1cce760afe38b40f0989cdf10b2190dccf9815 upstream. @@ -373905,7 +373905,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego 3 files changed, 86 insertions(+), 58 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 7b9f067a8898..a6814155239c 100644 +index 7b9f067a88984..a6814155239c5 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1684,17 +1684,6 @@ static const char * const drm_named_modes_whitelist[] = { @@ -374059,7 +374059,7 @@ index 7b9f067a8898..a6814155239c 100644 if (ret) return false; diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h -index 628d11d74d6b..fb21f15570f2 100644 +index 628d11d74d6b6..fb21f15570f24 100644 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h @@ -63,3 +63,5 @@ cmdline_test(drm_cmdline_test_multiple_options) @@ -374069,7 +374069,7 @@ index 628d11d74d6b..fb21f15570f2 100644 +cmdline_test(drm_cmdline_test_freestanding_options) +cmdline_test(drm_cmdline_test_freestanding_force_e_and_options) diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c -index a1210b7bf937..9835dd329cfc 100644 +index a1210b7bf937c..9835dd329cfc9 100644 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c @@ -1053,6 +1053,56 @@ static int drm_cmdline_test_extra_and_option(void *ignored) @@ -374133,10 +374133,10 @@ index a1210b7bf937..9835dd329cfc 100644 2.18.4 -From 26a440b4f0531005371f8ce78a00ff96ed9e64d4 Mon Sep 17 00:00:00 2001 +From 566455c471bbbd8ec76af97ea14a9a2b0559b8fb Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:30 +0100 -Subject: [PATCH 0559/1216] drm/modes: parse_cmdline: Add support for +Subject: [PATCH 0559/1224] drm/modes: parse_cmdline: Add support for specifying panel_orientation (v2) Commit 4e7a4a6fbdc669c44e6079f9d5eb25673749455f upstream. @@ -374169,7 +374169,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-9-hdego 5 files changed, 66 insertions(+) diff --git a/Documentation/fb/modedb.rst b/Documentation/fb/modedb.rst -index 9c4e3fd39e6d..624d08fd2856 100644 +index 9c4e3fd39e6d2..624d08fd28562 100644 --- a/Documentation/fb/modedb.rst +++ b/Documentation/fb/modedb.rst @@ -65,6 +65,9 @@ Valid options are:: @@ -374183,7 +374183,7 @@ index 9c4e3fd39e6d..624d08fd2856 100644 ----------------------------------------------------------------------------- diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index a6814155239c..378a915b81dd 100644 +index a6814155239c5..378a915b81dd3 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1591,6 +1591,33 @@ static int drm_mode_parse_cmdline_int(const char *delim, unsigned int *int_ret) @@ -374240,7 +374240,7 @@ index a6814155239c..378a915b81dd 100644 if (!mode_option) mode_option = fb_mode_option; diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h -index fb21f15570f2..29e367db6118 100644 +index fb21f15570f24..29e367db6118b 100644 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h @@ -65,3 +65,4 @@ cmdline_test(drm_cmdline_test_bpp_extra_and_option) @@ -374249,7 +374249,7 @@ index fb21f15570f2..29e367db6118 100644 cmdline_test(drm_cmdline_test_freestanding_force_e_and_options) +cmdline_test(drm_cmdline_test_panel_orientation) diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c -index 9835dd329cfc..d96cd890def6 100644 +index 9835dd329cfc9..d96cd890def6e 100644 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c @@ -1103,6 +1103,28 @@ static int drm_cmdline_test_freestanding_force_e_and_options(void *ignored) @@ -374282,7 +374282,7 @@ index 9835dd329cfc..d96cd890def6 100644 static int __init test_drm_cmdline_init(void) diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h -index 681cb590f952..3fbcf7d3fcaf 100644 +index 681cb590f9521..3fbcf7d3fcafe 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1065,6 +1065,14 @@ struct drm_cmdline_mode { @@ -374304,10 +374304,10 @@ index 681cb590f952..3fbcf7d3fcaf 100644 2.18.4 -From 234c17b905dd3f611a48ff7805348fbb61521906 Mon Sep 17 00:00:00 2001 +From a3c1cfd25ba0598eba7c512ac2b19064ee812435 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:31 +0100 -Subject: [PATCH 0560/1216] drm/modes: parse_cmdline: Remove some unnecessary +Subject: [PATCH 0560/1224] drm/modes: parse_cmdline: Remove some unnecessary code (v2) Commit 5b926617cdef41ce0696e09834991194b1759e28 upstream. @@ -374329,7 +374329,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-10-hdeg 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 378a915b81dd..99149616fce0 100644 +index 378a915b81dd3..99149616fce05 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1754,11 +1754,6 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, @@ -374348,10 +374348,10 @@ index 378a915b81dd..99149616fce0 100644 2.18.4 -From 82af0038f834155cdc2ab83033f511077ba310ab Mon Sep 17 00:00:00 2001 +From a45cf9983524c563737b3ca419ba1a1f5960edc3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 18 Nov 2019 16:51:32 +0100 -Subject: [PATCH 0561/1216] drm/modes: parse_cmdline: Explicitly memset the +Subject: [PATCH 0561/1224] drm/modes: parse_cmdline: Explicitly memset the passed in drm_cmdline_mode struct Commit d1fe276b5115f0d581c3cfe6154633b3547e8aab upstream. @@ -374373,7 +374373,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-11-hdeg 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 99149616fce0..afc0ee99b138 100644 +index 99149616fce05..afc0ee99b1389 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1752,12 +1752,11 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, @@ -374395,10 +374395,10 @@ index 99149616fce0..afc0ee99b138 100644 2.18.4 -From e5330d6ff5a5ab892a499bf4970d895971408cbf Mon Sep 17 00:00:00 2001 +From 56322532c2e1fcddf0c180997232ecbd8b0cb112 Mon Sep 17 00:00:00 2001 From: Yukimasa Sugizaki <4298265+Terminus-IMRC@users.noreply.github.com> Date: Fri, 20 Mar 2020 19:01:23 +0900 -Subject: [PATCH 0562/1216] drm/v3d: Replace wait_for macros to remove use of +Subject: [PATCH 0562/1224] drm/v3d: Replace wait_for macros to remove use of msleep (#3510) commit 9daee6141cc9c75b09659b02b1cb9eeb2f5e16cc upstream. @@ -374427,7 +374427,7 @@ Co-authored-by: James Hughes 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h -index 15bc4e28b6cc..197dd4a8a7e1 100644 +index 15bc4e28b6ccd..197dd4a8a7e1e 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -260,27 +260,42 @@ struct v3d_csd_job { @@ -374490,10 +374490,10 @@ index 15bc4e28b6cc..197dd4a8a7e1 100644 2.18.4 -From e37547af1fd4b5598bfc94932f92b97469d43b83 Mon Sep 17 00:00:00 2001 +From 88847966d49ef97223df049fe70886f05895385e Mon Sep 17 00:00:00 2001 From: Nick B Date: Mon, 9 Mar 2020 09:05:39 -0400 -Subject: [PATCH 0563/1216] Reduce noise from rpi poe hat fan +Subject: [PATCH 0563/1224] 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 @@ -374512,7 +374512,7 @@ Signed-off-by: Nick B 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts -index 21f8fe6f1229..544038b614e1 100644 +index 21f8fe6f12295..544038b614e10 100644 --- a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts @@ -14,9 +14,9 @@ @@ -374592,10 +374592,10 @@ index 21f8fe6f1229..544038b614e1 100644 2.18.4 -From 2e319b2c0fff1f1abb267b5570e95890716948d6 Mon Sep 17 00:00:00 2001 +From bab01e8d8db2d28fbc866817002a335a583a3399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 7 Mar 2020 22:37:52 +0100 -Subject: [PATCH 0564/1216] add Sensirion SPS30 to i2c-sensor overlay +Subject: [PATCH 0564/1224] add Sensirion SPS30 to i2c-sensor overlay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -374610,7 +374610,7 @@ Signed-off-by: Petr Štetiar 2 files changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 62ad35f78bad..0d7d00ac92c4 100644 +index 62ad35f78bada..0d7d00ac92c4b 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1261,6 +1261,9 @@ Params: addr Set the address for the BME280, BME680, BMP280, @@ -374624,7 +374624,7 @@ index 62ad35f78bad..0d7d00ac92c4 100644 Valid addresses 0x48-0x4b, default 0x48 diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts -index 40881d72a157..ce97837b0db5 100644 +index 40881d72a1574..ce97837b0db50 100644 --- a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts @@ -231,6 +231,20 @@ @@ -374659,10 +374659,10 @@ index 40881d72a157..ce97837b0db5 100644 2.18.4 -From 35ca04055e953f667a4646ce70e358d210935e03 Mon Sep 17 00:00:00 2001 +From 81d843737be4bda7de2f08c01d140f4072c9477e Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 7 Oct 2019 12:06:31 -0300 -Subject: [PATCH 0565/1216] media: add V4L2_CTRL_TYPE_AREA control type +Subject: [PATCH 0565/1224] media: add V4L2_CTRL_TYPE_AREA control type Commit d1dc49370f8371b00e682ac409aa1987ce641e93 upstream. @@ -374679,7 +374679,7 @@ Signed-off-by: Mauro Carvalho Chehab 3 files changed, 69 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index c7bf6f51ccdd..665a36f4f6f8 100644 +index c7bf6f51ccddd..665a36f4f6f83 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1673,6 +1673,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, @@ -374732,7 +374732,7 @@ index c7bf6f51ccdd..665a36f4f6f8 100644 struct v4l2_ctrl_handler *main_hdl) { diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h -index 570ff4b0205a..e7f93109e4a4 100644 +index 570ff4b0205a9..e7f93109e4a42 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -50,6 +50,7 @@ struct poll_table_struct; @@ -374799,7 +374799,7 @@ index 570ff4b0205a..e7f93109e4a4 100644 extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 456dfa847ccb..0ffaad82040d 100644 +index 456dfa847ccb1..0ffaad82040d6 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -426,6 +426,11 @@ struct v4l2_fract { @@ -374826,10 +374826,10 @@ index 456dfa847ccb..0ffaad82040d 100644 2.18.4 -From f2bc2e79572bbf6309eee154ef0fe9ff2cf3177d Mon Sep 17 00:00:00 2001 +From 5552c2f10035535eb282e054522248f4697c6bb9 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 7 Oct 2019 12:06:33 -0300 -Subject: [PATCH 0566/1216] media: add V4L2_CID_UNIT_CELL_SIZE control +Subject: [PATCH 0566/1224] media: add V4L2_CID_UNIT_CELL_SIZE control Commit 61fd036d01111679b01e4b92e6bd0cdd33809aea upstream. @@ -374848,7 +374848,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 6 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 665a36f4f6f8..90bc4e490f80 100644 +index 665a36f4f6f83..90bc4e490f800 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -995,6 +995,7 @@ const char *v4l2_ctrl_get_name(u32 id) @@ -374871,7 +374871,7 @@ index 665a36f4f6f8..90bc4e490f80 100644 *type = V4L2_CTRL_TYPE_INTEGER; break; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h -index 616a7c64c4d2..d21ac7545626 100644 +index 616a7c64c4d20..d21ac75456263 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -1035,6 +1035,7 @@ enum v4l2_jpeg_chroma_subsampling { @@ -374886,10 +374886,10 @@ index 616a7c64c4d2..d21ac7545626 100644 2.18.4 -From 0f669ef414f74ba603c1f67284a63014738e34f0 Mon Sep 17 00:00:00 2001 +From a25ae9abe49cbc6cc5d1029ac1f803a66db638f8 Mon Sep 17 00:00:00 2001 From: Benoit Parrot Date: Mon, 7 Oct 2019 12:10:07 -0300 -Subject: [PATCH 0567/1216] media: v4l2-common: add pixel encoding support +Subject: [PATCH 0567/1224] media: v4l2-common: add pixel encoding support Commit d5a897c8428b38053df4b427a4277b1a0722bfa0 upstream. @@ -374913,7 +374913,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 95 insertions(+), 64 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c -index 62f7aa92ac29..09a3915b98a3 100644 +index 62f7aa92ac29f..09a3915b98a33 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -236,77 +236,77 @@ const struct v4l2_format_info *v4l2_format_info(u32 format) @@ -375058,7 +375058,7 @@ index 62f7aa92ac29..09a3915b98a3 100644 unsigned int i; diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h -index c070d8ae11e5..d8c29e089000 100644 +index c070d8ae11e5e..d8c29e0890009 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -456,9 +456,25 @@ int v4l2_s_parm_cap(struct video_device *vdev, @@ -375123,10 +375123,10 @@ index c070d8ae11e5..d8c29e089000 100644 2.18.4 -From b302fae66eda72d8266c22c5b8f6437278bfde8d Mon Sep 17 00:00:00 2001 +From bac05e10378a9214ef35424bf8bc10bb2f991922 Mon Sep 17 00:00:00 2001 From: Benoit Parrot Date: Mon, 7 Oct 2019 12:10:08 -0300 -Subject: [PATCH 0568/1216] media: v4l2-common: add RGB565 and RGB55 to +Subject: [PATCH 0568/1224] media: v4l2-common: add RGB565 and RGB55 to v4l2_format_info Commit b373f84d77e1c409aacb4ff5bb5726c45fc8b166 upstream. @@ -375141,7 +375141,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 2 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c -index 09a3915b98a3..d0e5ebc736f9 100644 +index 09a3915b98a33..d0e5ebc736f9f 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -251,6 +251,8 @@ const struct v4l2_format_info *v4l2_format_info(u32 format) @@ -375157,10 +375157,10 @@ index 09a3915b98a3..d0e5ebc736f9 100644 2.18.4 -From ca3fd530ec7eab3b6c3025975a65959d4421ee50 Mon Sep 17 00:00:00 2001 +From 706ca64e752352b53f4ac231f0e4593f3bded9ac Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:40 -0300 -Subject: [PATCH 0569/1216] media: vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF +Subject: [PATCH 0569/1224] media: vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF This patch adds support for the V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF flag. @@ -375184,7 +375184,7 @@ Signed-off-by: Mauro Carvalho Chehab 6 files changed, 45 insertions(+), 7 deletions(-) diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst -index 1cbd9cde57f3..9149b57728e5 100644 +index 1cbd9cde57f37..9149b57728e54 100644 --- a/Documentation/media/uapi/v4l/buffer.rst +++ b/Documentation/media/uapi/v4l/buffer.rst @@ -607,6 +607,19 @@ Buffer Flags @@ -375208,7 +375208,7 @@ index 1cbd9cde57f3..9149b57728e5 100644 - ``V4L2_BUF_FLAG_LAST`` diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst -index d7faef10e39b..d0c643db477a 100644 +index d7faef10e39ba..d0c643db477aa 100644 --- a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst +++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst @@ -125,6 +125,7 @@ aborting or finishing any DMA in progress, an implicit @@ -375232,7 +375232,7 @@ index d7faef10e39b..d0c643db477a 100644 Return Value ============ diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c -index 5a9ba3846f0a..e652f4318284 100644 +index 5a9ba3846f0a5..e652f43182840 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -49,8 +49,11 @@ module_param(debug, int, 0644); @@ -375276,7 +375276,7 @@ index 5a9ba3846f0a..e652f4318284 100644 if (q->supports_requests) *caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS; diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h -index d86d888247a1..b4034a1034c2 100644 +index d86d888247a15..b4034a1034c28 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -505,6 +505,8 @@ struct vb2_buf_ops { @@ -375297,7 +375297,7 @@ index d86d888247a1..b4034a1034c2 100644 u32 timestamp_flags; gfp_t gfp_flags; diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h -index 8a10889dc2fd..59bf33a12648 100644 +index 8a10889dc2fdf..59bf33a12648b 100644 --- a/include/media/videobuf2-v4l2.h +++ b/include/media/videobuf2-v4l2.h @@ -33,6 +33,7 @@ @@ -375323,7 +375323,7 @@ index 8a10889dc2fd..59bf33a12648 100644 * to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer * */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 0ffaad82040d..a3fc685be514 100644 +index 0ffaad82040d6..a3fc685be5148 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -924,11 +924,12 @@ struct v4l2_requestbuffers { @@ -375357,10 +375357,10 @@ index 0ffaad82040d..a3fc685be514 100644 2.18.4 -From 92bb80746970dc48430fa53eb0d776ec81375feb Mon Sep 17 00:00:00 2001 +From 9a14a4748b29489c4b70b6ff609975fe1339c844 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:41 -0300 -Subject: [PATCH 0570/1216] media: v4l2-mem2mem: support held capture buffers +Subject: [PATCH 0570/1224] media: v4l2-mem2mem: support held capture buffers Commit f8cca8c97a63d77f48334cde81d15014f43530ef upstream. @@ -375382,7 +375382,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 128 insertions(+), 35 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index 3d6a6306cec7..001fee23e9c1 100644 +index 3d6a6306cec77..001fee23e9c11 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -284,7 +284,8 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev) @@ -375564,7 +375564,7 @@ index 3d6a6306cec7..001fee23e9c1 100644 struct v4l2_requestbuffers *reqbufs) { diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h -index 0b9c3a287061..229d9f5d4370 100644 +index 0b9c3a287061e..229d9f5d43708 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -21,7 +21,8 @@ @@ -375625,10 +375625,10 @@ index 0b9c3a287061..229d9f5d4370 100644 2.18.4 -From 96419886dc89e1ea45b0425af55842d4a2bf65aa Mon Sep 17 00:00:00 2001 +From 0eabd705d8524ba86051b25797cdef4f29e54040 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:42 -0300 -Subject: [PATCH 0571/1216] media: videodev2.h: add V4L2_DEC_CMD_FLUSH +Subject: [PATCH 0571/1224] media: videodev2.h: add V4L2_DEC_CMD_FLUSH Add this new V4L2_DEC_CMD_FLUSH decoder command and document it. @@ -375644,7 +375644,7 @@ Signed-off-by: Mauro Carvalho Chehab 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst -index 57f0066f4cff..f1a504836f31 100644 +index 57f0066f4cfff..f1a504836f31e 100644 --- a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst +++ b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst @@ -208,7 +208,15 @@ introduced in Linux 3.3. They are, however, mandatory for stateful mem2mem decod @@ -375665,7 +375665,7 @@ index 57f0066f4cff..f1a504836f31 100644 Return Value ============ diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions -index adeb6b7a15cb..a79028e4d929 100644 +index adeb6b7a15cb3..a79028e4d9296 100644 --- a/Documentation/media/videodev2.h.rst.exceptions +++ b/Documentation/media/videodev2.h.rst.exceptions @@ -434,6 +434,7 @@ replace define V4L2_DEC_CMD_START decoder-cmds @@ -375677,7 +375677,7 @@ index adeb6b7a15cb..a79028e4d929 100644 replace define V4L2_DEC_CMD_START_MUTE_AUDIO decoder-cmds replace define V4L2_DEC_CMD_PAUSE_TO_BLACK decoder-cmds diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index a3fc685be514..05ed1aaf0e9e 100644 +index a3fc685be5148..05ed1aaf0e9e3 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1988,6 +1988,7 @@ struct v4l2_encoder_cmd { @@ -375692,10 +375692,10 @@ index a3fc685be514..05ed1aaf0e9e 100644 2.18.4 -From aba677501e1f501417084d904b6b72e70a2f4fa0 Mon Sep 17 00:00:00 2001 +From 12921d38ca0f626e7992381d371e42c458e46f2a Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 11 Oct 2019 06:32:43 -0300 -Subject: [PATCH 0572/1216] media: v4l2-mem2mem: add +Subject: [PATCH 0572/1224] media: v4l2-mem2mem: add stateless_(try_)decoder_cmd ioctl helpers Commit bef41d93aac64b54c3008ca6170bec54f85784f5 upstream. @@ -375714,7 +375714,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 57 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index 001fee23e9c1..9f8b816d14a0 100644 +index 001fee23e9c11..9f8b816d14a0c 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -1218,6 +1218,59 @@ int v4l2_m2m_ioctl_try_decoder_cmd(struct file *file, void *fh, @@ -375778,7 +375778,7 @@ index 001fee23e9c1..9f8b816d14a0 100644 * v4l2_file_operations helpers. It is assumed here same lock is used * for the output and the capture buffer queue. diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h -index 229d9f5d4370..3d9e48ed8817 100644 +index 229d9f5d43708..3d9e48ed88170 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -701,6 +701,10 @@ int v4l2_m2m_ioctl_try_encoder_cmd(struct file *file, void *fh, @@ -375796,10 +375796,10 @@ index 229d9f5d4370..3d9e48ed8817 100644 2.18.4 -From 8441aa351b1889f50dbfca5cbab8bc49a6dfe7bb Mon Sep 17 00:00:00 2001 +From 92ec5702b1b25a13d5859271595c07f25373453f Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 11 Oct 2019 06:32:44 -0300 -Subject: [PATCH 0573/1216] media: v4l2-mem2mem: add new_frame detection +Subject: [PATCH 0573/1224] media: v4l2-mem2mem: add new_frame detection Commit f07602ac388723233e9e3c5a05b54baf34e0a3e9 upstream. @@ -375816,7 +375816,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index 9f8b816d14a0..5867d81f3d2c 100644 +index 9f8b816d14a0c..5867d81f3d2c6 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -319,8 +319,10 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev, @@ -375845,7 +375845,7 @@ index 9f8b816d14a0..5867d81f3d2c 100644 && (!m2m_dev->m2m_ops->job_ready(m2m_ctx->priv))) { dprintk("Driver not ready\n"); diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h -index 3d9e48ed8817..1d85e24791e4 100644 +index 3d9e48ed88170..1d85e24791e42 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -75,6 +75,11 @@ struct v4l2_m2m_queue_ctx { @@ -375873,10 +375873,10 @@ index 3d9e48ed8817..1d85e24791e4 100644 2.18.4 -From 427b81cc9435e4c39f56c49d66905bb0430dd55f Mon Sep 17 00:00:00 2001 +From e4f0e7c08a5b490146c5aa936494ab5a3b346974 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 7 Oct 2019 12:06:32 -0300 -Subject: [PATCH 0574/1216] media: Documentation: media: Document +Subject: [PATCH 0574/1224] media: Documentation: media: Document V4L2_CTRL_TYPE_AREA Commit 8ae3a0862993c09a8ef0f9abb379553370c517e3 upstream. @@ -375895,7 +375895,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 7 insertions(+) diff --git a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst -index a3d56ffbf4cc..33aff21b7d11 100644 +index a3d56ffbf4cc4..33aff21b7d115 100644 --- a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst +++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst @@ -443,6 +443,12 @@ See also the examples in :ref:`control`. @@ -375912,7 +375912,7 @@ index a3d56ffbf4cc..33aff21b7d11 100644 - n/a - n/a diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions -index a79028e4d929..c23e5ef30c78 100644 +index a79028e4d9296..c23e5ef30c78d 100644 --- a/Documentation/media/videodev2.h.rst.exceptions +++ b/Documentation/media/videodev2.h.rst.exceptions @@ -141,6 +141,7 @@ replace symbol V4L2_CTRL_TYPE_H264_PPS :c:type:`v4l2_ctrl_type` @@ -375927,10 +375927,10 @@ index a79028e4d929..c23e5ef30c78 100644 2.18.4 -From 08d2411e5876a889a664c28d9aa3d2131c5798bb Mon Sep 17 00:00:00 2001 +From a32c6e90aeccba2be6af1aad2c949d7e8360b249 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 22 Oct 2019 12:26:52 -0300 -Subject: [PATCH 0575/1216] media: v4l: Add definitions for HEVC stateless +Subject: [PATCH 0575/1224] media: v4l: Add definitions for HEVC stateless decoding This introduces the required definitions for HEVC decoding support with @@ -375969,7 +375969,7 @@ Signed-off-by: Mauro Carvalho Chehab create mode 100644 include/media/hevc-ctrls.h diff --git a/Documentation/media/uapi/v4l/biblio.rst b/Documentation/media/uapi/v4l/biblio.rst -index ad2ff258afa8..8095f57d3d75 100644 +index ad2ff258afa89..8095f57d3d752 100644 --- a/Documentation/media/uapi/v4l/biblio.rst +++ b/Documentation/media/uapi/v4l/biblio.rst @@ -131,6 +131,15 @@ ITU-T Rec. H.264 Specification (04/2017 Edition) @@ -375989,7 +375989,7 @@ index ad2ff258afa8..8095f57d3d75 100644 JFIF diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst -index bc5dd8e76567..2d011241ff92 100644 +index bc5dd8e76567b..2d011241ff924 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst @@ -1983,9 +1983,9 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - @@ -376557,7 +376557,7 @@ index bc5dd8e76567..2d011241ff92 100644 + to be prefixed by Annex B start codes. According to :ref:`hevc` + valid start codes can be 3-bytes 0x000001 or 4-bytes 0x00000001. diff --git a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst -index 33aff21b7d11..6690928e657b 100644 +index 33aff21b7d115..6690928e657b7 100644 --- a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst +++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst @@ -479,6 +479,24 @@ See also the examples in :ref:`control`. @@ -376586,7 +376586,7 @@ index 33aff21b7d11..6690928e657b 100644 .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}| diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions -index c23e5ef30c78..cb6ccf91776e 100644 +index c23e5ef30c78d..cb6ccf91776e6 100644 --- a/Documentation/media/videodev2.h.rst.exceptions +++ b/Documentation/media/videodev2.h.rst.exceptions @@ -141,6 +141,9 @@ replace symbol V4L2_CTRL_TYPE_H264_PPS :c:type:`v4l2_ctrl_type` @@ -376600,7 +376600,7 @@ index c23e5ef30c78..cb6ccf91776e 100644 # V4L2 capability defines diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 90bc4e490f80..14710e949be3 100644 +index 90bc4e490f800..14710e949be3c 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -567,6 +567,16 @@ const char * const *v4l2_ctrl_get_menu(u32 id) @@ -376776,7 +376776,7 @@ index 90bc4e490f80..14710e949be3 100644 elem_size = sizeof(struct v4l2_area); break; diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 58868d7129eb..6081072b55db 100644 +index 58868d7129ebd..6081072b55db4 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1356,6 +1356,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -376789,7 +376789,7 @@ index 58868d7129eb..6081072b55db 100644 case V4L2_PIX_FMT_CPIA1: descr = "GSPCA CPiA YUV"; break; diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h new file mode 100644 -index 000000000000..1009cf0891cc +index 0000000000000..1009cf0891cc6 --- /dev/null +++ b/include/media/hevc-ctrls.h @@ -0,0 +1,212 @@ @@ -377006,7 +377006,7 @@ index 000000000000..1009cf0891cc + +#endif diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h -index e7f93109e4a4..65575e9b5a2b 100644 +index e7f93109e4a42..65575e9b5a2b1 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -21,6 +21,7 @@ @@ -377041,10 +377041,10 @@ index e7f93109e4a4..65575e9b5a2b 100644 2.18.4 -From d98b8064fa99f25e1e2d752d3e859bbc636558ae Mon Sep 17 00:00:00 2001 +From d35737a5631eeb46e7709f2edaf7362d4c2028b8 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Wed, 6 Nov 2019 08:02:53 +0100 -Subject: [PATCH 0576/1216] media: v4l2-mem2mem: Fix hold buf flag checks +Subject: [PATCH 0576/1224] media: v4l2-mem2mem: Fix hold buf flag checks Commit 1076df3a77b490d33429560a9e0603b3673223e2 upstream. @@ -377059,7 +377059,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index 5867d81f3d2c..cc34c5ab7009 100644 +index 5867d81f3d2c6..cc34c5ab70099 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -335,7 +335,7 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev, @@ -377084,10 +377084,10 @@ index 5867d81f3d2c..cc34c5ab7009 100644 2.18.4 -From 37d6b04fa509f6aa95a8b9beac3338b3115bddac Mon Sep 17 00:00:00 2001 +From af529f2251a10fe40a1e771a9ff4eb4a0159f4ff Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 22 Oct 2019 12:26:53 -0300 -Subject: [PATCH 0577/1216] media: pixfmt: Document the HEVC slice pixel format +Subject: [PATCH 0577/1224] media: pixfmt: Document the HEVC slice pixel format Commit de06f289283298e2938445019999cec46435375c upstream. @@ -377103,7 +377103,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 23 insertions(+) diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/media/uapi/v4l/pixfmt-compressed.rst -index 292fdc116c77..7e9b2b939e59 100644 +index 292fdc116c777..7e9b2b939e594 100644 --- a/Documentation/media/uapi/v4l/pixfmt-compressed.rst +++ b/Documentation/media/uapi/v4l/pixfmt-compressed.rst @@ -188,6 +188,29 @@ Compressed Formats @@ -377140,10 +377140,10 @@ index 292fdc116c77..7e9b2b939e59 100644 2.18.4 -From f1c982482bfa777f77535ab820e06bd6c95860ff Mon Sep 17 00:00:00 2001 +From cb2a2d6c3ec6796f9d34d812772ed770313fdd61 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 13 Dec 2019 17:04:25 +0100 -Subject: [PATCH 0578/1216] media: uapi: hevc: Add scaling matrix control +Subject: [PATCH 0578/1224] media: uapi: hevc: Add scaling matrix control Taken from https://patchwork.linuxtv.org/patch/60728/ Changes (mainly documentation) have been requested. @@ -377159,7 +377159,7 @@ Signed-off-by: Jernej Skrabec 4 files changed, 63 insertions(+) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst -index 2d011241ff92..e3d735f75e65 100644 +index 2d011241ff924..e3d735f75e65d 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst @@ -4174,6 +4174,47 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - @@ -377211,7 +377211,7 @@ index 2d011241ff92..e3d735f75e65 100644 Specifies the decoding mode to use. Currently exposes slice-based and frame-based decoding but new modes might be added later on. diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/media/uapi/v4l/pixfmt-compressed.rst -index 7e9b2b939e59..2069e5fc2b99 100644 +index 7e9b2b939e594..2069e5fc2b995 100644 --- a/Documentation/media/uapi/v4l/pixfmt-compressed.rst +++ b/Documentation/media/uapi/v4l/pixfmt-compressed.rst @@ -203,6 +203,7 @@ Compressed Formats @@ -377223,7 +377223,7 @@ index 7e9b2b939e59..2069e5fc2b99 100644 Buffers associated with this pixel format must contain the appropriate number of macroblocks to decode a full corresponding frame. diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 14710e949be3..4f1533563655 100644 +index 14710e949be3c..4f15335636550 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -974,6 +974,7 @@ const char *v4l2_ctrl_get_name(u32 id) @@ -377265,7 +377265,7 @@ index 14710e949be3..4f1533563655 100644 elem_size = sizeof(struct v4l2_area); break; diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h -index 1009cf0891cc..1592e52c3614 100644 +index 1009cf0891cc6..1592e52c36144 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -19,6 +19,7 @@ @@ -377302,10 +377302,10 @@ index 1009cf0891cc..1592e52c3614 100644 2.18.4 -From de473241efaf1d7c089cc6ff8d158beb0fc28020 Mon Sep 17 00:00:00 2001 +From 0474f3bf3291c695e1279a36209d17597a5ca6f5 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 13 Dec 2019 17:04:27 +0100 -Subject: [PATCH 0579/1216] media: uapi: hevc: Add segment address field +Subject: [PATCH 0579/1224] media: uapi: hevc: Add segment address field From https://patchwork.linuxtv.org/patch/60725/ Changes requested, but mainly docs. @@ -377322,7 +377322,7 @@ Signed-off-by: Jernej Skrabec 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst -index e3d735f75e65..86d185bcb451 100644 +index e3d735f75e65d..86d185bcb4512 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst @@ -3969,6 +3969,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - @@ -377345,7 +377345,7 @@ index e3d735f75e65..86d185bcb451 100644 * - struct :c:type:`v4l2_hevc_dpb_entry` - ``dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]`` diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h -index 1592e52c3614..3e2e32098312 100644 +index 1592e52c36144..3e2e320983128 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -167,6 +167,9 @@ struct v4l2_ctrl_hevc_slice_params { @@ -377371,10 +377371,10 @@ index 1592e52c3614..3e2e32098312 100644 2.18.4 -From 579c9531090d1a6fca4733181b863c4cfa33efe6 Mon Sep 17 00:00:00 2001 +From 40a58800f1e204d167e5581028249c764d91c940 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 23 Mar 2020 18:34:01 +0000 -Subject: [PATCH 0580/1216] media: hevc_ctrls: Add slice param dependent slice +Subject: [PATCH 0580/1224] media: hevc_ctrls: Add slice param dependent slice segment Adds V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT define. @@ -377385,7 +377385,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h -index 3e2e32098312..0ba7735465a2 100644 +index 3e2e320983128..0ba7735465a24 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -162,6 +162,7 @@ struct v4l2_hevc_pred_weight_table { @@ -377400,10 +377400,10 @@ index 3e2e32098312..0ba7735465a2 100644 2.18.4 -From d0c389b058ea8fe5fd7c5b0a804ad6c60e22fdc4 Mon Sep 17 00:00:00 2001 +From 53b1ef3f5eb78dbc3f02cdc91ca19c43f0846f85 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 23 Mar 2020 19:00:17 +0000 -Subject: [PATCH 0581/1216] media: uapi: Add hevc ctrls for WPP decoding +Subject: [PATCH 0581/1224] media: uapi: Add hevc ctrls for WPP decoding WPP can allow greater parallelism within the decode, but needs offset information to be passed in. @@ -377420,7 +377420,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h -index 0ba7735465a2..9c976b3cf092 100644 +index 0ba7735465a24..9c976b3cf0924 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -170,6 +170,7 @@ struct v4l2_ctrl_hevc_slice_params { @@ -377446,10 +377446,10 @@ index 0ba7735465a2..9c976b3cf092 100644 2.18.4 -From fabcb48c1a9458b7c3764fdcd2065fe1d0467f9e Mon Sep 17 00:00:00 2001 +From 198e807a3a234f25f70daa326146a4268ec2a6ea Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:28:21 +0000 -Subject: [PATCH 0582/1216] media: videodev2.h: Add a format for column +Subject: [PATCH 0582/1224] 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 @@ -377468,7 +377468,7 @@ Signed-off-by: Dave Stevenson diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12-col128.rst b/Documentation/media/uapi/v4l/pixfmt-nv12-col128.rst new file mode 100644 -index 000000000000..196ca33a5dff +index 0000000000000..196ca33a5dff8 --- /dev/null +++ b/Documentation/media/uapi/v4l/pixfmt-nv12-col128.rst @@ -0,0 +1,215 @@ @@ -377688,7 +377688,7 @@ index 000000000000..196ca33a5dff + + diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12.rst b/Documentation/media/uapi/v4l/pixfmt-nv12.rst -index b8c021b07fd2..931680e9be44 100644 +index b8c021b07fd2b..931680e9be443 100644 --- a/Documentation/media/uapi/v4l/pixfmt-nv12.rst +++ b/Documentation/media/uapi/v4l/pixfmt-nv12.rst @@ -10,9 +10,9 @@ @@ -377720,7 +377720,7 @@ index b8c021b07fd2..931680e9be44 100644 Each cell is one byte. diff --git a/Documentation/media/uapi/v4l/yuv-formats.rst b/Documentation/media/uapi/v4l/yuv-formats.rst -index 867470e5f9e1..962f5c367ebc 100644 +index 867470e5f9e12..962f5c367ebcd 100644 --- a/Documentation/media/uapi/v4l/yuv-formats.rst +++ b/Documentation/media/uapi/v4l/yuv-formats.rst @@ -57,6 +57,7 @@ to brightness information. @@ -377732,7 +377732,7 @@ index 867470e5f9e1..962f5c367ebc 100644 pixfmt-nv16m pixfmt-nv24 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 6081072b55db..360200ed4f08 100644 +index 6081072b55db4..360200ed4f083 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1258,6 +1258,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -377745,7 +377745,7 @@ index 6081072b55db..360200ed4f08 100644 case V4L2_PIX_FMT_YVU420M: descr = "Planar YVU 4:2:0 (N-C)"; break; case V4L2_PIX_FMT_YUV422M: descr = "Planar YUV 4:2:2 (N-C)"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 05ed1aaf0e9e..5d28d8ef6c0c 100644 +index 05ed1aaf0e9e3..5d28d8ef6c0cc 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -736,6 +736,10 @@ struct v4l2_pix_format { @@ -377763,10 +377763,10 @@ index 05ed1aaf0e9e..5d28d8ef6c0c 100644 2.18.4 -From 3abbe8a273a0da01a17dfba88f66654c01700daa Mon Sep 17 00:00:00 2001 +From ef791656096752929093016fc076db0572d8e013 Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 5 Mar 2020 14:46:54 +0000 -Subject: [PATCH 0583/1216] media: v4l2-mem2mem: allow request job buffer +Subject: [PATCH 0583/1224] media: v4l2-mem2mem: allow request job buffer processing after job finish Allow the capture buffer to be detached from a v4l2 request job such @@ -377782,7 +377782,7 @@ Signed-off-by: John Cox 3 files changed, 149 insertions(+), 6 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index cc34c5ab7009..73d10948d2fe 100644 +index cc34c5ab70099..73d10948d2fee 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -399,15 +399,18 @@ static void v4l2_m2m_cancel_job(struct v4l2_m2m_ctx *m2m_ctx) @@ -377951,7 +377951,7 @@ index cc34c5ab7009..73d10948d2fe 100644 spin_lock_init(&cap_q_ctx->rdy_spinlock); diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h -index 1d85e24791e4..f72ac9a27093 100644 +index 1d85e24791e42..f72ac9a27093f 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -88,6 +88,9 @@ struct v4l2_m2m_queue_ctx { @@ -378023,7 +378023,7 @@ index 1d85e24791e4..f72ac9a27093 100644 * v4l2_m2m_reqbufs() - multi-queue-aware REQBUFS multiplexer * diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h -index 59bf33a12648..b5b5fad97de7 100644 +index 59bf33a12648b..b5b5fad97de72 100644 --- a/include/media/videobuf2-v4l2.h +++ b/include/media/videobuf2-v4l2.h @@ -35,6 +35,8 @@ @@ -378047,10 +378047,10 @@ index 59bf33a12648..b5b5fad97de7 100644 2.18.4 -From d3f56599726bf935125bef4c87dc35e5def6ab8e Mon Sep 17 00:00:00 2001 +From 77d3060bb546bfd0bfb1f46048ec3ae99e049f65 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 17 Mar 2020 10:53:16 +0000 -Subject: [PATCH 0584/1216] media: dt-bindings: media: Add binding for the +Subject: [PATCH 0584/1224] 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. @@ -378064,7 +378064,7 @@ Signed-off-by: Dave Stevenson diff --git a/Documentation/devicetree/bindings/media/rpivid_hevc.yaml b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml new file mode 100644 -index 000000000000..ce6b81a10303 +index 0000000000000..ce6b81a103030 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml @@ -0,0 +1,72 @@ @@ -378141,7 +378141,7 @@ index 000000000000..ce6b81a10303 + +... diff --git a/MAINTAINERS b/MAINTAINERS -index d99bdf934705..9a76a6de3e98 100644 +index d99bdf9347058..9a76a6de3e984 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3198,6 +3198,13 @@ N: bcm2711 @@ -378162,10 +378162,10 @@ index d99bdf934705..9a76a6de3e98 100644 2.18.4 -From 6a38618a0fe451e8b8c2b7c804c1df777d5cf069 Mon Sep 17 00:00:00 2001 +From 0122fdf9f17969a04fedd123a516b5470f07c2be Mon Sep 17 00:00:00 2001 From: John Cox Date: Thu, 5 Mar 2020 18:30:41 +0000 -Subject: [PATCH 0585/1216] staging: media: Add Raspberry Pi V4L2 H265 decoder +Subject: [PATCH 0585/1224] 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. @@ -378200,7 +378200,7 @@ Signed-off-by: John Cox create mode 100644 drivers/staging/media/rpivid/rpivid_video.h diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 5fe23a0bf27f..e4ea63553dc0 100644 +index 5fe23a0bf27fe..e4ea63553dc06 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -731,6 +731,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y @@ -378220,7 +378220,7 @@ index 5fe23a0bf27f..e4ea63553dc0 100644 CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig -index 642adc4c24d2..4aafb150ecb2 100644 +index 642adc4c24d2d..4aafb150ecb20 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -30,6 +30,8 @@ source "drivers/staging/media/meson/vdec/Kconfig" @@ -378233,7 +378233,7 @@ index 642adc4c24d2..4aafb150ecb2 100644 source "drivers/staging/media/tegra-vde/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile -index 2f1711a8aeed..dad2d30a508a 100644 +index 2f1711a8aeed2..dad2d30a508a8 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_VIDEO_ALLEGRO_DVT) += allegro-dvt/ @@ -378246,7 +378246,7 @@ index 2f1711a8aeed..dad2d30a508a 100644 obj-$(CONFIG_VIDEO_HANTRO) += hantro/ diff --git a/drivers/staging/media/rpivid/Kconfig b/drivers/staging/media/rpivid/Kconfig new file mode 100644 -index 000000000000..58b470c80db1 +index 0000000000000..58b470c80db11 --- /dev/null +++ b/drivers/staging/media/rpivid/Kconfig @@ -0,0 +1,16 @@ @@ -378268,7 +378268,7 @@ index 000000000000..58b470c80db1 + diff --git a/drivers/staging/media/rpivid/Makefile b/drivers/staging/media/rpivid/Makefile new file mode 100644 -index 000000000000..990257052b07 +index 0000000000000..990257052b072 --- /dev/null +++ b/drivers/staging/media/rpivid/Makefile @@ -0,0 +1,5 @@ @@ -378279,7 +378279,7 @@ index 000000000000..990257052b07 + rpivid_hw.o rpivid_h265.o diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c new file mode 100644 -index 000000000000..6bbc732ca4eb +index 0000000000000..6bbc732ca4eb5 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid.c @@ -0,0 +1,432 @@ @@ -378717,7 +378717,7 @@ index 000000000000..6bbc732ca4eb +MODULE_DESCRIPTION("Raspberry Pi HEVC V4L2 driver"); diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h new file mode 100644 -index 000000000000..faafe936b878 +index 0000000000000..faafe936b8787 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid.h @@ -0,0 +1,181 @@ @@ -378904,7 +378904,7 @@ index 000000000000..faafe936b878 +#endif diff --git a/drivers/staging/media/rpivid/rpivid_dec.c b/drivers/staging/media/rpivid/rpivid_dec.c new file mode 100644 -index 000000000000..d81aa46de017 +index 0000000000000..d81aa46de017a --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_dec.c @@ -0,0 +1,79 @@ @@ -378989,7 +378989,7 @@ index 000000000000..d81aa46de017 +} diff --git a/drivers/staging/media/rpivid/rpivid_dec.h b/drivers/staging/media/rpivid/rpivid_dec.h new file mode 100644 -index 000000000000..8f15bb6406ab +index 0000000000000..8f15bb6406abc --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_dec.h @@ -0,0 +1,19 @@ @@ -379014,7 +379014,7 @@ index 000000000000..8f15bb6406ab +#endif diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c new file mode 100644 -index 000000000000..47d4de42c584 +index 0000000000000..47d4de42c5844 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_h265.c @@ -0,0 +1,2275 @@ @@ -381295,7 +381295,7 @@ index 000000000000..47d4de42c584 +}; diff --git a/drivers/staging/media/rpivid/rpivid_hw.c b/drivers/staging/media/rpivid/rpivid_hw.c new file mode 100644 -index 000000000000..5f86bbed8c1c +index 0000000000000..5f86bbed8c1c1 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_hw.c @@ -0,0 +1,321 @@ @@ -381622,7 +381622,7 @@ index 000000000000..5f86bbed8c1c + diff --git a/drivers/staging/media/rpivid/rpivid_hw.h b/drivers/staging/media/rpivid/rpivid_hw.h new file mode 100644 -index 000000000000..cf4cc8be8a55 +index 0000000000000..cf4cc8be8a552 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_hw.h @@ -0,0 +1,300 @@ @@ -381928,7 +381928,7 @@ index 000000000000..cf4cc8be8a55 +#endif diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c new file mode 100644 -index 000000000000..3b9e51ca05b3 +index 0000000000000..3b9e51ca05b3f --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_video.c @@ -0,0 +1,593 @@ @@ -382527,7 +382527,7 @@ index 000000000000..3b9e51ca05b3 +} diff --git a/drivers/staging/media/rpivid/rpivid_video.h b/drivers/staging/media/rpivid/rpivid_video.h new file mode 100644 -index 000000000000..9c4f3fb2f9f6 +index 0000000000000..9c4f3fb2f9f6b --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_video.h @@ -0,0 +1,30 @@ @@ -382565,10 +382565,10 @@ index 000000000000..9c4f3fb2f9f6 2.18.4 -From cd897ebc8d8eb392e21580a033acd8645f5dc64e Mon Sep 17 00:00:00 2001 +From f924eddd3c2dbf49490821bec7ba16b9c6b05927 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Mar 2020 16:52:55 +0000 -Subject: [PATCH 0586/1216] dtoverlays: Add overlay to enable the HEVC V4L2 +Subject: [PATCH 0586/1224] dtoverlays: Add overlay to enable the HEVC V4L2 driver This replaces the rpivid_mem register mapping driver. @@ -382585,7 +382585,7 @@ Signed-off-by: Dave Stevenson create mode 100644 arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 85d8249a2f20..9e5e3ff0bf61 100644 +index 85d8249a2f201..9e5e3ff0bf616 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -140,6 +140,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -382597,7 +382597,7 @@ index 85d8249a2f20..9e5e3ff0bf61 100644 sc16is750-i2c.dtbo \ sc16is752-i2c.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 0d7d00ac92c4..4f7790755fd8 100644 +index 0d7d00ac92c4b..4f7790755fd82 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2064,6 +2064,13 @@ Load: dtoverlay=rpi-tv @@ -382616,7 +382616,7 @@ index 0d7d00ac92c4..4f7790755fd8 100644 Load: dtoverlay=rra-digidac1-wm8741-audio diff --git a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts new file mode 100644 -index 000000000000..e6ece0570e90 +index 0000000000000..e6ece0570e90d --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts @@ -0,0 +1,55 @@ @@ -382676,7 +382676,7 @@ index 000000000000..e6ece0570e90 + }; +}; diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index e4ea63553dc0..5fe23a0bf27f 100644 +index e4ea63553dc06..5fe23a0bf27fe 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -731,7 +731,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y @@ -382699,10 +382699,10 @@ index e4ea63553dc0..5fe23a0bf27f 100644 2.18.4 -From 6055df88a70f1c6f08faf6c5f5540bd3c0a59f30 Mon Sep 17 00:00:00 2001 +From 5184a3b2fd941f61eb4aa2ad6981026fc1ecb0e8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Mar 2020 16:55:32 +0000 -Subject: [PATCH 0587/1216] defconfig: Add V4L2 HEVC driver to +Subject: [PATCH 0587/1224] defconfig: Add V4L2 HEVC driver to bcm2711_defconfig This replaces the register mapped driver. @@ -382713,7 +382713,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 5fe23a0bf27f..e4ea63553dc0 100644 +index 5fe23a0bf27fe..e4ea63553dc06 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -731,6 +731,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y @@ -382736,10 +382736,10 @@ index 5fe23a0bf27f..e4ea63553dc0 100644 2.18.4 -From 97b5f5afb573f1ff3e48677da73f98d9206f11a2 Mon Sep 17 00:00:00 2001 +From 364bf1cda9b3e90097d89100c5d1e17db6b0c813 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 6 Dec 2019 13:05:27 +0100 -Subject: [PATCH 0588/1216] mmc: sdhci: Silence MMC warnings +Subject: [PATCH 0588/1224] 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. @@ -382750,7 +382750,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index a1aeb2e10564..86586f08a853 100644 +index a1aeb2e105641..86586f08a853e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -39,7 +39,7 @@ @@ -382784,10 +382784,10 @@ index a1aeb2e10564..86586f08a853 100644 2.18.4 -From 693db412338a3aa8c3a08359aad450fe01a2fcc4 Mon Sep 17 00:00:00 2001 +From 1153701fac4e5cf768623a1b30331f8dea74447c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 17 Feb 2020 16:20:27 +0100 -Subject: [PATCH 0589/1216] Revert "v3d_drv: Allow clock retrieval by name" +Subject: [PATCH 0589/1224] Revert "v3d_drv: Allow clock retrieval by name" This reverts commit 229fbb896ca6e0a40272cc846e41eeb0c29a551f. --- @@ -382795,7 +382795,7 @@ This reverts commit 229fbb896ca6e0a40272cc846e41eeb0c29a551f. 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index 87ce683f3c04..91b0769b69ef 100644 +index 87ce683f3c04d..91b0769b69efe 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -285,9 +285,7 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) @@ -382813,10 +382813,10 @@ index 87ce683f3c04..91b0769b69ef 100644 2.18.4 -From 7275b6169856adeab95f41a6f6046157101581b7 Mon Sep 17 00:00:00 2001 +From 5df737f8a3410584233abc1689eb964b116df939 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 09:33:51 +0100 -Subject: [PATCH 0590/1216] Revert "clk-raspberrypi: Also support v3d clock" +Subject: [PATCH 0590/1224] Revert "clk-raspberrypi: Also support v3d clock" This reverts commit 54354f31352ca1e058b029abd384819435c9ef47. --- @@ -382824,7 +382824,7 @@ This reverts commit 54354f31352ca1e058b029abd384819435c9ef47. 1 file changed, 89 insertions(+), 412 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 8daf26df5430..e4e139240340 100644 +index 8daf26df54308..e4e1392403406 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -15,103 +15,33 @@ @@ -383466,10 +383466,10 @@ index 8daf26df5430..e4e139240340 100644 2.18.4 -From 67a744a8e941ca27f3eb7016fab79b794ff88950 Mon Sep 17 00:00:00 2001 +From 46add86ce734cda37c666c7e310a4af6f237b2ec Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 09:33:59 +0100 -Subject: [PATCH 0591/1216] Revert "clk-raspberrypi: Allow cpufreq driver to +Subject: [PATCH 0591/1224] Revert "clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks" This reverts commit 60dc4841efc8fe97b710b49d37d50bd719e8ca07. @@ -383478,7 +383478,7 @@ This reverts commit 60dc4841efc8fe97b710b49d37d50bd719e8ca07. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index e4e139240340..1654fd0eedc9 100644 +index e4e1392403406..1654fd0eedc94 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -70,7 +70,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware, u32 tag, @@ -383494,10 +383494,10 @@ index e4e139240340..1654fd0eedc9 100644 2.18.4 -From d7de376700af10b4a5ee59833c39b597cd0a5be3 Mon Sep 17 00:00:00 2001 +From abdd098b3a251a3c05cd6b1a8c631b121d6edf0f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 16:55:01 +0100 -Subject: [PATCH 0592/1216] dt-bindings: i2c: brcmstb: Convert the BRCMSTB +Subject: [PATCH 0592/1224] dt-bindings: i2c: brcmstb: Convert the BRCMSTB binding to a schema Switch the DT binding to a YAML schema to enable the DT validation. @@ -383520,7 +383520,7 @@ Signed-off-by: Maxime Ripard diff --git a/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml b/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml new file mode 100644 -index 000000000000..3189d74096e8 +index 0000000000000..3189d74096e89 --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml @@ -0,0 +1,59 @@ @@ -383585,7 +383585,7 @@ index 000000000000..3189d74096e8 +... diff --git a/Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt b/Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt deleted file mode 100644 -index 0380609b177a..000000000000 +index 0380609b177a4..0000000000000 --- a/Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt +++ /dev/null @@ -1,26 +0,0 @@ @@ -383616,7 +383616,7 @@ index 0380609b177a..000000000000 -}; - diff --git a/MAINTAINERS b/MAINTAINERS -index 9a76a6de3e98..faa83d7e339f 100644 +index 9a76a6de3e984..faa83d7e339fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3349,7 +3349,7 @@ L: linux-i2c@vger.kernel.org @@ -383632,10 +383632,10 @@ index 9a76a6de3e98..faa83d7e339f 100644 2.18.4 -From de78295ec791679c47a7dd8d97b2fff6c19e9794 Mon Sep 17 00:00:00 2001 +From 6353ac14372692802967055844c7ba0cd9520c74 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 17 Dec 2019 09:58:34 +0100 -Subject: [PATCH 0593/1216] dt-bindings: i2c: brcmstb: Add BCM2711 BSC/AUTO-I2C +Subject: [PATCH 0593/1224] dt-bindings: i2c: brcmstb: Add BCM2711 BSC/AUTO-I2C binding The HDMI blocks in the BCM2771 have an i2c controller to retrieve the @@ -383664,7 +383664,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml b/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml -index 3189d74096e8..edbca2476128 100644 +index 3189d74096e89..edbca24761283 100644 --- a/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml @@ -15,11 +15,21 @@ allOf: @@ -383734,10 +383734,10 @@ index 3189d74096e8..edbca2476128 100644 2.18.4 -From 32dcfc87d4e36b6e6586f338e2ba961ec1f3e75d Mon Sep 17 00:00:00 2001 +From 983492af321ebae4d639fde2d339bed7566c036b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 17 Dec 2019 09:58:34 +0100 -Subject: [PATCH 0594/1216] i2c: brcmstb: Support BCM2711 HDMI BSC controllers +Subject: [PATCH 0594/1224] i2c: brcmstb: Support BCM2711 HDMI BSC controllers The HDMI blocks in the BCM2771 have an i2c controller to retrieve the EDID. This block is split into two parts, the BSC and the AUTO_I2C, @@ -383766,7 +383766,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 33 insertions(+) diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c -index 506991596b68..169a2836922d 100644 +index 506991596b68d..169a2836922d2 100644 --- a/drivers/i2c/busses/i2c-brcmstb.c +++ b/drivers/i2c/busses/i2c-brcmstb.c @@ -580,6 +580,31 @@ static void brcmstb_i2c_set_bsc_reg_defaults(struct brcmstb_i2c_dev *dev) @@ -383827,10 +383827,10 @@ index 506991596b68..169a2836922d 100644 2.18.4 -From 5f695eaf4ed8f15b90347b4a88b74a72eaac804a Mon Sep 17 00:00:00 2001 +From 7f280c64bd03d2657eab85a79c8286882acf9f64 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 Jan 2020 13:36:42 +0100 -Subject: [PATCH 0595/1216] i2c: brcmstb: Allow to compile it on BCM2835 +Subject: [PATCH 0595/1224] 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. @@ -383846,7 +383846,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index 539f9309f6e6..f82da9d5c0f9 100644 +index 539f9309f6e67..f82da9d5c0f99 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -491,8 +491,8 @@ config I2C_BCM_KONA @@ -383864,10 +383864,10 @@ index 539f9309f6e6..f82da9d5c0f9 100644 2.18.4 -From 1d6f023d6897589559490dceb697c2dd07adbe24 Mon Sep 17 00:00:00 2001 +From 9135d9c6c98cc260d978c00fb273e8439d101bb6 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:51:09 +0100 -Subject: [PATCH 0596/1216] dt-bindings: clock: Add a binding for the RPi +Subject: [PATCH 0596/1224] dt-bindings: clock: Add a binding for the RPi Firmware clocks The firmare running on the RPi VideoCore can be used to discover and @@ -383887,7 +383887,7 @@ Signed-off-by: Maxime Ripard diff --git a/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml new file mode 100644 -index 000000000000..d37bc311321d +index 0000000000000..d37bc311321de --- /dev/null +++ b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml @@ -0,0 +1,39 @@ @@ -383934,10 +383934,10 @@ index 000000000000..d37bc311321d 2.18.4 -From 8936f5962ce5e18eb6ded87328349d48c6391aa8 Mon Sep 17 00:00:00 2001 +From f2fa4e46585d50a51671c8e4af672078d196b43e Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 23 Dec 2019 19:58:08 +0100 -Subject: [PATCH 0597/1216] clk: bcm: rpi: Allow the driver to be probed by DT +Subject: [PATCH 0597/1224] 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. @@ -383959,7 +383959,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 1654fd0eedc9..94870234824c 100644 +index 1654fd0eedc94..94870234824cd 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -255,15 +255,13 @@ static int raspberrypi_clk_probe(struct platform_device *pdev) @@ -384000,10 +384000,10 @@ index 1654fd0eedc9..94870234824c 100644 2.18.4 -From 1e2a50750adb2fab50bc01f7378a14cc7df33800 Mon Sep 17 00:00:00 2001 +From 086e071da96feacd6d494efb7153d35e61308889 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 14:17:54 +0100 -Subject: [PATCH 0598/1216] clk: bcm: rpi: Statically init clk_init_data +Subject: [PATCH 0598/1224] clk: bcm: rpi: Statically init clk_init_data Instead of declaring the clk_init_data and then calling memset on it, just initialise properly. @@ -384018,7 +384018,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 94870234824c..64fd91b5ffe9 100644 +index 94870234824cd..64fd91b5ffe9d 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -175,11 +175,10 @@ static const struct clk_ops raspberrypi_firmware_pll_clk_ops = { @@ -384038,10 +384038,10 @@ index 94870234824c..64fd91b5ffe9 100644 2.18.4 -From c609a09371769a70ceeff20a014000cc22f3c3f0 Mon Sep 17 00:00:00 2001 +From 7249de6c0e4e2bc252ede4566d990570cffadaab Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:40:00 +0100 -Subject: [PATCH 0599/1216] clk: bcm: rpi: Use clk_hw_register for pllb_arm +Subject: [PATCH 0599/1224] 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 @@ -384058,7 +384058,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 64fd91b5ffe9..48cffa44db64 100644 +index 64fd91b5ffe9d..48cffa44db648 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -225,16 +225,28 @@ static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi) @@ -384100,10 +384100,10 @@ index 64fd91b5ffe9..48cffa44db64 100644 2.18.4 -From 6b5e1de756a9770d098939bc4b523b7cf117a602 Mon Sep 17 00:00:00 2001 +From 94d088ef901221e02a7db4dacea4039ece6a27a0 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:41:37 +0100 -Subject: [PATCH 0600/1216] clk: bcm: rpi: Remove global pllb_arm clock pointer +Subject: [PATCH 0600/1224] 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. @@ -384120,7 +384120,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 48cffa44db64..61a942f9a6a2 100644 +index 48cffa44db648..61a942f9a6a2a 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -40,7 +40,6 @@ struct raspberrypi_clk { @@ -384151,10 +384151,10 @@ index 48cffa44db64..61a942f9a6a2 100644 2.18.4 -From 6ce4b5155445f1147a985afa22f27637c34c0aa1 Mon Sep 17 00:00:00 2001 +From 67d1b74a3b6b539e00af316aa4d1284cdad21000 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:42:40 +0100 -Subject: [PATCH 0601/1216] clk: bcm: rpi: Make sure pllb_arm is removed +Subject: [PATCH 0601/1224] 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 @@ -384173,7 +384173,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 61a942f9a6a2..783c8c5e5373 100644 +index 61a942f9a6a2a..783c8c5e53734 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -240,7 +240,7 @@ static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi) @@ -384197,10 +384197,10 @@ index 61a942f9a6a2..783c8c5e5373 100644 2.18.4 -From 8f2b87d34aeab72000bbc5b633129f5454c6503f Mon Sep 17 00:00:00 2001 +From 01a309bb687e7ff8efae75e4f598a606da451706 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:46:24 +0100 -Subject: [PATCH 0602/1216] clk: bcm: rpi: Remove pllb_arm_lookup global +Subject: [PATCH 0602/1224] clk: bcm: rpi: Remove pllb_arm_lookup global pointer The pllb_arm_lookup pointer in the struct raspberrypi_clk is not used for @@ -384219,7 +384219,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 783c8c5e5373..0c1d6c292302 100644 +index 783c8c5e53734..0c1d6c2923029 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -40,7 +40,6 @@ struct raspberrypi_clk { @@ -384255,10 +384255,10 @@ index 783c8c5e5373..0c1d6c292302 100644 2.18.4 -From 35bad4c446979cac70952144a8c5079e8781fe44 Mon Sep 17 00:00:00 2001 +From 52f8bf639221eeafded2500481cc69d01ca8b5e2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 14:21:45 +0100 -Subject: [PATCH 0603/1216] clk: bcm: rpi: Switch to clk_hw_register_clkdev +Subject: [PATCH 0603/1224] 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 @@ -384274,7 +384274,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 0c1d6c292302..b97c7ec61376 100644 +index 0c1d6c2923029..b97c7ec613769 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -237,7 +237,6 @@ static struct clk_fixed_factor raspberrypi_clk_pllb_arm = { @@ -384306,10 +384306,10 @@ index 0c1d6c292302..b97c7ec61376 100644 2.18.4 -From 37bf1eb7a336e55a6c26d7fcece82d1d3efe385f Mon Sep 17 00:00:00 2001 +From 8f01d1b6c2c8d6e6e70b0ed584cda739dfa595cb Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 15:47:13 +0100 -Subject: [PATCH 0604/1216] clk: bcm: rpi: Make sure the clkdev lookup is +Subject: [PATCH 0604/1224] clk: bcm: rpi: Make sure the clkdev lookup is removed The clkdev lookup created for the cpufreq device is never removed if @@ -384328,7 +384328,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index b97c7ec61376..b8b55134ba3f 100644 +index b97c7ec613769..b8b55134ba3fa 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -245,8 +245,9 @@ static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi) @@ -384347,10 +384347,10 @@ index b97c7ec61376..b8b55134ba3f 100644 2.18.4 -From 67879be6e439393a36cb7d20a70c4d9f8cbf86f0 Mon Sep 17 00:00:00 2001 +From 26a3725455d853d777d377637e0cde7164a56aac Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:01:33 +0100 -Subject: [PATCH 0605/1216] clk: bcm: rpi: Create a data structure for the +Subject: [PATCH 0605/1224] clk: bcm: rpi: Create a data structure for the clocks So far the driver has really only been providing a single clock, and stored @@ -384370,7 +384370,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index b8b55134ba3f..964fc8f792cc 100644 +index b8b55134ba3fa..964fc8f792cc7 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -35,11 +35,15 @@ struct raspberrypi_clk { @@ -384480,10 +384480,10 @@ index b8b55134ba3f..964fc8f792cc 100644 2.18.4 -From cac893e438df120047462ee67e28e2e8600e7ed0 Mon Sep 17 00:00:00 2001 +From 87f44318c3a3598bcd7e20b6b29a6fc908908032 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:04:16 +0100 -Subject: [PATCH 0606/1216] clk: bcm: rpi: Add clock id to data +Subject: [PATCH 0606/1224] 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 @@ -384500,7 +384500,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 964fc8f792cc..e796dabbc641 100644 +index 964fc8f792cc7..e796dabbc6415 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -39,6 +39,7 @@ struct raspberrypi_clk { @@ -384572,10 +384572,10 @@ index 964fc8f792cc..e796dabbc641 100644 2.18.4 -From a951d57c95e9ecd5071a7a6ad1d48275a21be77c Mon Sep 17 00:00:00 2001 +From c114a14e89cc3df41bf9349e6fc6aa79facb7c8a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:08:17 +0100 -Subject: [PATCH 0607/1216] clk: bcm: rpi: Pass the clocks data to the firmware +Subject: [PATCH 0607/1224] clk: bcm: rpi: Pass the clocks data to the firmware function The raspberry_clock_property only takes the clock ID as an argument, but @@ -384592,7 +384592,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index e796dabbc641..055dd34c5acc 100644 +index e796dabbc6415..055dd34c5acc1 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -67,11 +67,12 @@ struct raspberrypi_firmware_prop { @@ -384674,10 +384674,10 @@ index e796dabbc641..055dd34c5acc 100644 2.18.4 -From 87a1d6801ee41634a443a86abb0c7d8706211b80 Mon Sep 17 00:00:00 2001 +From eb8e22ed3ad39453d19fdd3b145d387ef2307351 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 20 Feb 2020 12:45:47 +0100 -Subject: [PATCH 0608/1216] clk: bcm: rpi: Rename is_prepared function +Subject: [PATCH 0608/1224] 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. @@ -384695,7 +384695,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 055dd34c5acc..2f10bccf03a5 100644 +index 055dd34c5acc1..2f10bccf03a54 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -87,7 +87,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware, @@ -384720,10 +384720,10 @@ index 055dd34c5acc..2f10bccf03a5 100644 2.18.4 -From fe572b200fec1d143c9a236f6bf36a9ecb699464 Mon Sep 17 00:00:00 2001 +From 368c775fcd556bdda58fad90c164cfbf7a6c1b93 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:14:18 +0100 -Subject: [PATCH 0609/1216] clk: bcm: rpi: Split pllb clock hooks +Subject: [PATCH 0609/1224] 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. @@ -384739,7 +384739,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 2f10bccf03a5..d1b5826c95bb 100644 +index 2f10bccf03a54..d1b5826c95bb2 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -104,8 +104,8 @@ static int raspberrypi_fw_is_prepared(struct clk_hw *hw) @@ -384806,10 +384806,10 @@ index 2f10bccf03a5..d1b5826c95bb 100644 2.18.4 -From e9e94218ea6062d632c2f4d8fffbf6445265d254 Mon Sep 17 00:00:00 2001 +From b8088391cf4bfefbc7acc797efb90ee4042e9510 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 16:30:01 +0100 -Subject: [PATCH 0610/1216] clk: bcm: rpi: Make the PLLB registration function +Subject: [PATCH 0610/1224] clk: bcm: rpi: Make the PLLB registration function return a clk_hw The raspberrypi_register_pllb has been returning an integer so far to @@ -384831,7 +384831,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index d1b5826c95bb..05ed2f2cde31 100644 +index d1b5826c95bb2..05ed2f2cde318 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -190,7 +190,7 @@ static const struct clk_ops raspberrypi_firmware_pll_clk_ops = { @@ -384956,10 +384956,10 @@ index d1b5826c95bb..05ed2f2cde31 100644 2.18.4 -From 48dd18ea66b270ccd9a54eba280e2bff14cf54d3 Mon Sep 17 00:00:00 2001 +From 09bef02e31ff607446f6a4607c5945de0523b4e5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 7 Feb 2020 17:03:46 +0100 -Subject: [PATCH 0611/1216] clk: bcm: rpi: Add DT provider for the clocks +Subject: [PATCH 0611/1224] 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. @@ -384973,7 +384973,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 16 insertions(+) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 05ed2f2cde31..f2fbcef54c9c 100644 +index 05ed2f2cde318..f2fbcef54c9c7 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -31,6 +31,8 @@ @@ -385029,10 +385029,10 @@ index 05ed2f2cde31..f2fbcef54c9c 100644 2.18.4 -From 60e1eb23454b4f333eb2d8c6d0b5fe5eb909ed8e Mon Sep 17 00:00:00 2001 +From da480995cfb8e879408c9c6f1ed9014e8f966120 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 10 Feb 2020 14:06:09 +0100 -Subject: [PATCH 0612/1216] clk: bcm: rpi: Discover the firmware clocks +Subject: [PATCH 0612/1224] 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 @@ -385062,7 +385062,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 97 insertions(+), 12 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index f2fbcef54c9c..86b18f8cc98d 100644 +index f2fbcef54c9c7..86b18f8cc98d8 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -285,6 +285,95 @@ static struct clk_hw *raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi) @@ -385191,7 +385191,7 @@ index f2fbcef54c9c..86b18f8cc98d 100644 ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, clk_data); diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index 05c6989ec4c6..3335c2a2993c 100644 +index 05c6989ec4c66..3335c2a2993c2 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -160,6 +160,11 @@ enum rpi_firmware_property_tag { @@ -385210,10 +385210,10 @@ index 05c6989ec4c6..3335c2a2993c 100644 2.18.4 -From b5a4bba11e9c5c8225b55e09f01d4f93bb426f1b Mon Sep 17 00:00:00 2001 +From 717fc52aa6fd8d635102e979df590185994fcff8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 23 Dec 2019 19:58:30 +0100 -Subject: [PATCH 0613/1216] ARM: dts: bcm2711: Add firmware clocks node +Subject: [PATCH 0613/1224] 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. @@ -385225,7 +385225,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index b434b8392e9e..207c15f37a23 100644 +index b434b8392e9ef..207c15f37a23b 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -33,7 +33,7 @@ @@ -385238,7 +385238,7 @@ index b434b8392e9e..207c15f37a23 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index b56388ce1216..7acd4a3cf1e5 100644 +index b56388ce12163..7acd4a3cf1e55 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -31,6 +31,11 @@ @@ -385257,10 +385257,10 @@ index b56388ce1216..7acd4a3cf1e5 100644 2.18.4 -From 9c2b43439dc43a3d405e6c2ef2990ceb34acddca Mon Sep 17 00:00:00 2001 +From 21d40cd9477ee0bae26c26196bfbb80119053aba Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 09:33:52 +0100 -Subject: [PATCH 0614/1216] reset: Move reset-simple header out of +Subject: [PATCH 0614/1224] reset: Move reset-simple header out of drivers/reset The reset-simple code can be useful for drivers outside of drivers/reset @@ -385279,7 +385279,7 @@ Signed-off-by: Maxime Ripard rename {drivers => include/linux}/reset/reset-simple.h (100%) diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c -index 067e7e7b34f1..c854aa351640 100644 +index 067e7e7b34f12..c854aa3516402 100644 --- a/drivers/reset/reset-simple.c +++ b/drivers/reset/reset-simple.c @@ -18,10 +18,9 @@ @@ -385295,7 +385295,7 @@ index 067e7e7b34f1..c854aa351640 100644 to_reset_simple_data(struct reset_controller_dev *rcdev) { diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c -index 96953992c2bb..bdd984296196 100644 +index 96953992c2bb5..bdd9842961960 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c @@ -11,13 +11,12 @@ @@ -385314,7 +385314,7 @@ index 96953992c2bb..bdd984296196 100644 static int a10_reset_init(struct device_node *np) diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c -index e7f169e57bcf..e752594b6971 100644 +index e7f169e57bcff..e752594b6971c 100644 --- a/drivers/reset/reset-sunxi.c +++ b/drivers/reset/reset-sunxi.c @@ -14,13 +14,12 @@ @@ -385333,7 +385333,7 @@ index e7f169e57bcf..e752594b6971 100644 { struct reset_simple_data *data; diff --git a/drivers/reset/reset-uniphier-glue.c b/drivers/reset/reset-uniphier-glue.c -index a45923f4df6d..fa2a498b0e55 100644 +index a45923f4df6dc..fa2a498b0e55c 100644 --- a/drivers/reset/reset-uniphier-glue.c +++ b/drivers/reset/reset-uniphier-glue.c @@ -9,8 +9,7 @@ @@ -385354,10 +385354,10 @@ rename to include/linux/reset/reset-simple.h 2.18.4 -From 0d4a61121b23c213df31e7e6e04dd9563815d5dc Mon Sep 17 00:00:00 2001 +From 2c0049dfe0728b6ae6444551967586951b7fb53f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 16:22:20 +0100 -Subject: [PATCH 0615/1216] reset: simple: Add reset callback +Subject: [PATCH 0615/1224] 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 @@ -385371,7 +385371,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 30 insertions(+) diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c -index c854aa351640..7e395cb2837d 100644 +index c854aa3516402..7e395cb2837da 100644 --- a/drivers/reset/reset-simple.c +++ b/drivers/reset/reset-simple.c @@ -11,6 +11,7 @@ @@ -385420,7 +385420,7 @@ index c854aa351640..7e395cb2837d 100644 }; EXPORT_SYMBOL_GPL(reset_simple_ops); diff --git a/include/linux/reset/reset-simple.h b/include/linux/reset/reset-simple.h -index 08ccb25a55e6..5eb83625a495 100644 +index 08ccb25a55e65..5eb83625a495f 100644 --- a/include/linux/reset/reset-simple.h +++ b/include/linux/reset/reset-simple.h @@ -27,6 +27,11 @@ @@ -385447,10 +385447,10 @@ index 08ccb25a55e6..5eb83625a495 100644 2.18.4 -From 729a0a11dabec04ab445c2b0352e8ff00c1d3abd Mon Sep 17 00:00:00 2001 +From 087ca5378b0a4d3a8ebd14cc1b4a4a89eed61078 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:50:31 +0100 -Subject: [PATCH 0616/1216] dt-bindings: clock: Add BCM2711 DVP binding +Subject: [PATCH 0616/1224] 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. @@ -385467,7 +385467,7 @@ Signed-off-by: Maxime Ripard diff --git a/Documentation/devicetree/bindings/clock/brcm,bcm2711-dvp.yaml b/Documentation/devicetree/bindings/clock/brcm,bcm2711-dvp.yaml new file mode 100644 -index 000000000000..08543ecbe35b +index 0000000000000..08543ecbe35b2 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/brcm,bcm2711-dvp.yaml @@ -0,0 +1,47 @@ @@ -385522,10 +385522,10 @@ index 000000000000..08543ecbe35b 2.18.4 -From 4607c38fdba52077a08530b523465896de344e15 Mon Sep 17 00:00:00 2001 +From 1faf7a485638179df281cb1f7b06c303a0e2b069 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 09:36:27 +0100 -Subject: [PATCH 0617/1216] clk: bcm: Add BCM2711 DVP driver +Subject: [PATCH 0617/1224] clk: bcm: Add BCM2711 DVP driver The HDMI block has a block that controls clocks and reset signals to the HDMI0 and HDMI1 controllers. @@ -385547,7 +385547,7 @@ Signed-off-by: Maxime Ripard create mode 100644 drivers/clk/bcm/clk-bcm2711-dvp.c diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig -index 8c83977a7dc4..03bbd8040451 100644 +index 8c83977a7dc42..03bbd80404514 100644 --- a/drivers/clk/bcm/Kconfig +++ b/drivers/clk/bcm/Kconfig @@ -4,6 +4,7 @@ config CLK_BCM2835 @@ -385559,7 +385559,7 @@ index 8c83977a7dc4..03bbd8040451 100644 Enable common clock framework support for Broadcom BCM2835 SoCs. diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile -index 0070ddf6cdd2..2c1349062147 100644 +index 0070ddf6cdd24..2c13490621472 100644 --- a/drivers/clk/bcm/Makefile +++ b/drivers/clk/bcm/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o @@ -385572,7 +385572,7 @@ index 0070ddf6cdd2..2c1349062147 100644 obj-$(CONFIG_CLK_RASPBERRYPI) += clk-raspberrypi.o diff --git a/drivers/clk/bcm/clk-bcm2711-dvp.c b/drivers/clk/bcm/clk-bcm2711-dvp.c new file mode 100644 -index 000000000000..bfe4e5b4a148 +index 0000000000000..bfe4e5b4a1482 --- /dev/null +++ b/drivers/clk/bcm/clk-bcm2711-dvp.c @@ -0,0 +1,125 @@ @@ -385705,10 +385705,10 @@ index 000000000000..bfe4e5b4a148 2.18.4 -From cbd995914c373f708365d97573a82fdbcdf8397c Mon Sep 17 00:00:00 2001 +From b129304aafe33e6050462e5ef2b4c900ebd2cfe5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 28 Jan 2020 09:37:06 +0100 -Subject: [PATCH 0618/1216] ARM: dts: bcm2711: Add HDMI DVP +Subject: [PATCH 0618/1224] ARM: dts: bcm2711: Add HDMI DVP Now that we have a driver for the DVP, let's add its DT node. @@ -385718,7 +385718,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 15 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 7acd4a3cf1e5..7cf1a9748f00 100644 +index 7acd4a3cf1e55..7cf1a9748f006 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -31,6 +31,13 @@ @@ -385754,10 +385754,10 @@ index 7acd4a3cf1e5..7cf1a9748f00 100644 2.18.4 -From 775c6a673a024dcb6024184815531967e7809bab Mon Sep 17 00:00:00 2001 +From 4f3093520123b325e9ef961234a1ce67c263dd7f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:42:05 +0100 -Subject: [PATCH 0619/1216] dt-bindings: display: Convert VC4 bindings to +Subject: [PATCH 0619/1224] dt-bindings: display: Convert VC4 bindings to schemas The BCM283x SoCs have a display pipeline composed of several controllers @@ -385800,7 +385800,7 @@ Signed-off-by: Maxime Ripard diff --git a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt deleted file mode 100644 -index 26649b4c4dd8..000000000000 +index 26649b4c4dd8d..0000000000000 --- a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt +++ /dev/null @@ -1,174 +0,0 @@ @@ -385980,7 +385980,7 @@ index 26649b4c4dd8..000000000000 -}; diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml new file mode 100644 -index 000000000000..288494b70e82 +index 0000000000000..288494b70e821 --- /dev/null +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml @@ -0,0 +1,66 @@ @@ -386052,7 +386052,7 @@ index 000000000000..288494b70e82 +... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml new file mode 100644 -index 000000000000..3887675f844e +index 0000000000000..3887675f844ec --- /dev/null +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml @@ -0,0 +1,73 @@ @@ -386131,7 +386131,7 @@ index 000000000000..3887675f844e +... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml new file mode 100644 -index 000000000000..834cc5f1c254 +index 0000000000000..834cc5f1c2546 --- /dev/null +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml @@ -0,0 +1,75 @@ @@ -386212,7 +386212,7 @@ index 000000000000..834cc5f1c254 +... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml new file mode 100644 -index 000000000000..02410f8d6d49 +index 0000000000000..02410f8d6d498 --- /dev/null +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml @@ -0,0 +1,37 @@ @@ -386255,7 +386255,7 @@ index 000000000000..02410f8d6d49 +... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml new file mode 100644 -index 000000000000..e60791db1fa1 +index 0000000000000..e60791db1fa12 --- /dev/null +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml @@ -0,0 +1,40 @@ @@ -386301,7 +386301,7 @@ index 000000000000..e60791db1fa1 +... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml new file mode 100644 -index 000000000000..bb186197e471 +index 0000000000000..bb186197e471e --- /dev/null +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml @@ -0,0 +1,37 @@ @@ -386344,7 +386344,7 @@ index 000000000000..bb186197e471 +... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml new file mode 100644 -index 000000000000..8a73780f573d +index 0000000000000..8a73780f573d3 --- /dev/null +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml @@ -0,0 +1,42 @@ @@ -386392,7 +386392,7 @@ index 000000000000..8a73780f573d +... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml new file mode 100644 -index 000000000000..0dcf0c397375 +index 0000000000000..0dcf0c3973759 --- /dev/null +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml @@ -0,0 +1,34 @@ @@ -386432,7 +386432,7 @@ index 000000000000..0dcf0c397375 +... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml new file mode 100644 -index 000000000000..d900cc57b4ec +index 0000000000000..d900cc57b4ec9 --- /dev/null +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml @@ -0,0 +1,44 @@ @@ -386481,7 +386481,7 @@ index 000000000000..d900cc57b4ec + +... diff --git a/MAINTAINERS b/MAINTAINERS -index faa83d7e339f..b1b23c692186 100644 +index faa83d7e339fe..b1b23c6921865 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5574,7 +5574,7 @@ T: git git://github.com/anholt/linux @@ -386497,10 +386497,10 @@ index faa83d7e339f..b1b23c692186 100644 2.18.4 -From cea11dc0f7f51fcfb0050a8c7a7047b40a503f09 Mon Sep 17 00:00:00 2001 +From 025a5d23b8af68b079c433e5066ca7818c7bacc8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:47:18 +0100 -Subject: [PATCH 0620/1216] dt-bindings: display: vc4: dpi: Add missing +Subject: [PATCH 0620/1224] dt-bindings: display: vc4: dpi: Add missing clock-names property While the device tree and the driver expected a clock-names property, it @@ -386514,7 +386514,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml -index 288494b70e82..58213c564e03 100644 +index 288494b70e821..58213c564e034 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml @@ -21,6 +21,11 @@ properties: @@ -386541,10 +386541,10 @@ index 288494b70e82..58213c564e03 100644 2.18.4 -From 8e4b58df9187dcfd454de646f64f2a22715a6b6c Mon Sep 17 00:00:00 2001 +From 187348e697846a5ea98f169c3e27973cb3bccc30 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:47:18 +0100 -Subject: [PATCH 0621/1216] dt-bindings: display: vc4: dsi: Add missing clock +Subject: [PATCH 0621/1224] dt-bindings: display: vc4: dsi: Add missing clock properties While the device tree and the driver expected a clock-names and a @@ -386559,7 +386559,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 11 insertions(+) diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml -index 3887675f844e..3c643b227a70 100644 +index 3887675f844ec..3c643b227a70c 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml @@ -10,6 +10,9 @@ maintainers: @@ -386601,10 +386601,10 @@ index 3887675f844e..3c643b227a70 100644 2.18.4 -From 02f5aeb838762172f23fc2770e31e47aa62928c3 Mon Sep 17 00:00:00 2001 +From 5af0a796a44cadc1fea6281cc0fc695bc18103a0 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 15:47:18 +0100 -Subject: [PATCH 0622/1216] dt-bindings: display: vc4: hdmi: Add missing +Subject: [PATCH 0622/1224] dt-bindings: display: vc4: hdmi: Add missing clock-names property While the device tree and the driver expected a clock-names property, it @@ -386619,7 +386619,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml -index 834cc5f1c254..52b3cdac0bdf 100644 +index 834cc5f1c2546..52b3cdac0bdf0 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml @@ -23,8 +23,13 @@ properties: @@ -386641,10 +386641,10 @@ index 834cc5f1c254..52b3cdac0bdf 100644 2.18.4 -From cc29d4ba4a20cdef82eb54f53e2ee7807597fa4a Mon Sep 17 00:00:00 2001 +From 106c1159d6d99d3ec91149ad7abeffd6f0ebdd19 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:40:56 +0100 -Subject: [PATCH 0623/1216] dt-bindings: display: vc4: Document BCM2711 VC5 +Subject: [PATCH 0623/1224] dt-bindings: display: vc4: Document BCM2711 VC5 The BCM2711 comes with a new VideoCore. Add a compatible for it. @@ -386656,7 +386656,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml -index 0dcf0c397375..49a5e041aa49 100644 +index 0dcf0c3973759..49a5e041aa493 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml @@ -17,6 +17,7 @@ description: > @@ -386671,10 +386671,10 @@ index 0dcf0c397375..49a5e041aa49 100644 2.18.4 -From 1d4bb6ca6ad8996aef3a5859874d8ea875b69474 Mon Sep 17 00:00:00 2001 +From 4e84299018b5e74fd1bb7ba799fcf0d60be4e905 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 18:08:48 +0100 -Subject: [PATCH 0624/1216] drm/vc4: drv: Add include guards +Subject: [PATCH 0624/1224] 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. @@ -386685,7 +386685,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 308f0473592a..95f7433c8630 100644 +index 308f0473592a6..95f7433c86309 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -2,6 +2,8 @@ @@ -386707,10 +386707,10 @@ index 308f0473592a..95f7433c8630 100644 2.18.4 -From 2a66f774b0e8343f709b0c38eb207529c55d0bee Mon Sep 17 00:00:00 2001 +From c2146d3f464ab79b7dae61a494bed9cd38af5c71 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 15:40:34 +0100 -Subject: [PATCH 0625/1216] drm/vc4: drv: Support BCM2711 +Subject: [PATCH 0625/1224] 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 @@ -386725,7 +386725,7 @@ Signed-off-by: Maxime Ripard 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c -index af8df6d328b9..a726d262a0fa 100644 +index af8df6d328b9b..a726d262a0fac 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -369,6 +369,7 @@ static int vc4_platform_drm_remove(struct platform_device *pdev) @@ -386737,7 +386737,7 @@ index af8df6d328b9..a726d262a0fa 100644 { .compatible = "brcm,cygnus-vc4", }, {}, diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 95f7433c8630..a6777e724f46 100644 +index 95f7433c86309..a6777e724f464 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -205,6 +205,9 @@ struct vc4_dev { @@ -386751,7 +386751,7 @@ index 95f7433c8630..a6777e724f46 100644 bool load_tracker_enabled; diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 1b921e114c03..b82136138370 100644 +index 1b921e114c034..b821361383707 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -421,6 +421,9 @@ static int vc4_load_tracker_atomic_check(struct drm_atomic_state *state) @@ -386809,7 +386809,7 @@ index 1b921e114c03..b82136138370 100644 drm_mode_config_reset(dev); diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 1c5eef3ac441..81ec016a12d8 100644 +index 1c5eef3ac4415..81ec016a12d8f 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -492,6 +492,11 @@ static void vc4_plane_calc_load(struct drm_plane_state *state) @@ -386828,10 +386828,10 @@ index 1c5eef3ac441..81ec016a12d8 100644 2.18.4 -From f42d9f4cf21eb4b738349f12ddb15901513f270e Mon Sep 17 00:00:00 2001 +From 17a2bbccd0ffc64b6cb30584b9a074422d107627 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Aug 2019 17:51:07 +0100 -Subject: [PATCH 0626/1216] drm/vc4: drv: Add support for the BCM2711 HVS5 +Subject: [PATCH 0626/1224] drm/vc4: drv: Add support for the BCM2711 HVS5 The HVS found in the BCM2711 is slightly different from the previous generations. @@ -386850,7 +386850,7 @@ Signed-off-by: Maxime Ripard 5 files changed, 247 insertions(+), 59 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index d00756635257..e7444e30073a 100644 +index d00756635257e..e7444e30073ab 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -550,6 +550,7 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc, @@ -386892,7 +386892,7 @@ index d00756635257..e7444e30073a 100644 /* When feeding the transposer block the pixelvalve is unneeded and * should not be enabled. diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index a6777e724f46..db414d9f7630 100644 +index a6777e724f464..db414d9f7630d 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -336,7 +336,11 @@ struct vc4_hvs { @@ -386908,7 +386908,7 @@ index a6777e724f46..db414d9f7630 100644 struct vc4_plane { diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c -index 9936b15d0bf1..650d4d9a5980 100644 +index 9936b15d0bf1f..650d4d9a5980c 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -223,6 +223,7 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data) @@ -386950,7 +386950,7 @@ index 9936b15d0bf1..650d4d9a5980 100644 /* Upload filter kernels. We only have the one for now, so we * keep it around for the lifetime of the driver. diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 81ec016a12d8..49c16d0e2527 100644 +index 81ec016a12d8f..49c16d0e25278 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -32,45 +32,60 @@ static const struct hvs_format { @@ -387206,7 +387206,7 @@ index 81ec016a12d8..49c16d0e2527 100644 case DRM_FORMAT_YVU422: case DRM_FORMAT_YUV420: diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h -index 8416fdaf2ec4..22b895258545 100644 +index 8416fdaf2ec47..22b8952585451 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -328,6 +328,20 @@ @@ -387339,10 +387339,10 @@ index 8416fdaf2ec4..22b895258545 100644 2.18.4 -From 9b5349b03dc4c89a772794b905b7c1541f3d034b Mon Sep 17 00:00:00 2001 +From 50308dfb94084e8ffa5364bf3b81dd415b61eba5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 11 Feb 2020 16:55:02 +0000 -Subject: [PATCH 0627/1216] drm/vc4: plane: Improve LBM usage +Subject: [PATCH 0627/1224] drm/vc4: plane: Improve LBM usage LBM allocations were always taking the worst case sizing of max(src_width, dst_width) * 16. This is significantly over @@ -387359,7 +387359,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 49c16d0e2527..ed07e25f6b94 100644 +index 49c16d0e25278..ed07e25f6b941 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -142,9 +142,10 @@ static const struct hvs_format *vc4_get_hvs_format(u32 drm_format) @@ -387443,10 +387443,10 @@ index 49c16d0e2527..ed07e25f6b94 100644 2.18.4 -From b6c18089287ef4ca6743d0dddfed40535181cab7 Mon Sep 17 00:00:00 2001 +From d1d706662e58064e14784705e8c48a8098a958bb Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:32:57 +0100 -Subject: [PATCH 0628/1216] drm/vc4: plane: Move planes creation to its own +Subject: [PATCH 0628/1224] drm/vc4: plane: Move planes creation to its own function The planes so far were created as part of the CRTC binding code with @@ -387465,7 +387465,7 @@ Signed-off-by: Maxime Ripard 3 files changed, 44 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index e7444e30073a..9f473af60f02 100644 +index e7444e30073ab..9f473af60f02e 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -1142,7 +1142,7 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) @@ -387516,7 +387516,7 @@ index e7444e30073a..9f473af60f02 100644 vc4_crtc_get_cob_allocation(vc4_crtc); diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index db414d9f7630..7364b266ba5b 100644 +index db414d9f7630d..7364b266ba5b4 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -855,6 +855,8 @@ int vc4_kms_load(struct drm_device *dev); @@ -387529,7 +387529,7 @@ index db414d9f7630..7364b266ba5b 100644 u32 vc4_plane_dlist_size(const struct drm_plane_state *state); void vc4_plane_async_set_fb(struct drm_plane *plane, diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index ed07e25f6b94..940d046b07b6 100644 +index ed07e25f6b941..940d046b07b64 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1437,3 +1437,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, @@ -387578,10 +387578,10 @@ index ed07e25f6b94..940d046b07b6 100644 2.18.4 -From 6fc181c7ced7df3c687a165ed760b54c08ba9eea Mon Sep 17 00:00:00 2001 +From 6ff81c7cf898a1c7446062348e178a41e3e9ec46 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:41:41 +0100 -Subject: [PATCH 0629/1216] drm/vc4: plane: Move additional planes creation to +Subject: [PATCH 0629/1224] drm/vc4: plane: Move additional planes creation to driver So far the plane creation was done when each CRTC was bound, and those @@ -387618,7 +387618,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 9f473af60f02..c570dd09b180 100644 +index 9f473af60f02e..c570dd09b180c 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -1190,10 +1190,6 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) @@ -387633,7 +387633,7 @@ index 9f473af60f02..c570dd09b180 100644 CRTC_WRITE(PV_INTEN, 0); diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c -index a726d262a0fa..3f523e1bee7f 100644 +index a726d262a0fac..3f523e1bee7f1 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -253,6 +253,7 @@ static int vc4_drm_bind(struct device *dev) @@ -387661,10 +387661,10 @@ index a726d262a0fa..3f523e1bee7f 100644 2.18.4 -From ce6d0111a6504287273f5aafb5826099aede6a94 Mon Sep 17 00:00:00 2001 +From ebd80c04a57ffc08ff23958fc10c8db0cade95f7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:46:14 +0100 -Subject: [PATCH 0630/1216] drm/vc4: plane: Register all the planes at once +Subject: [PATCH 0630/1224] 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. @@ -387680,7 +387680,7 @@ Signed-off-by: Maxime Ripard 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c -index 3f523e1bee7f..67235aee3507 100644 +index 3f523e1bee7f1..67235aee35070 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -253,7 +253,6 @@ static int vc4_drm_bind(struct device *dev) @@ -387707,7 +387707,7 @@ index 3f523e1bee7f..67235aee3507 100644 drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false); diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 7364b266ba5b..d2d253a94288 100644 +index 7364b266ba5b4..d2d253a942880 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -855,8 +855,7 @@ int vc4_kms_load(struct drm_device *dev); @@ -387721,7 +387721,7 @@ index 7364b266ba5b..d2d253a94288 100644 u32 vc4_plane_dlist_size(const struct drm_plane_state *state); void vc4_plane_async_set_fb(struct drm_plane *plane, diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 940d046b07b6..603351b4c428 100644 +index 940d046b07b64..603351b4c428f 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1438,39 +1438,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, @@ -387796,10 +387796,10 @@ index 940d046b07b6..603351b4c428 100644 2.18.4 -From 0719f3fd95a45d102b9d63e978540cca2bcd7043 Mon Sep 17 00:00:00 2001 +From 8ff9438e17e72768c62796b43d4203dd90a10d44 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:50:06 +0100 -Subject: [PATCH 0631/1216] drm/vc4: plane: Create overlays for any CRTC +Subject: [PATCH 0631/1224] drm/vc4: plane: Create overlays for any CRTC Now that we have everything in place, we can now register all the overlay planes that can be assigned to all the CRTCs. @@ -387820,7 +387820,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 603351b4c428..744034c41ce2 100644 +index 603351b4c428f..744034c41ce20 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1444,26 +1444,27 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) @@ -387872,10 +387872,10 @@ index 603351b4c428..744034c41ce2 100644 2.18.4 -From c56a785d61c5735594af920f76a0151b9dd0158b Mon Sep 17 00:00:00 2001 +From 40e4aed21dda87fbef22a1ea55884eb8b6adc40f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 14:52:42 +0100 -Subject: [PATCH 0632/1216] drm/vc4: plane: Create more planes +Subject: [PATCH 0632/1224] drm/vc4: plane: Create more planes Let's now create more planes that can be affected to all the CRTCs. @@ -387894,7 +387894,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 744034c41ce2..887ef481e746 100644 +index 744034c41ce20..887ef481e7463 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1453,7 +1453,7 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) @@ -387910,10 +387910,10 @@ index 744034c41ce2..887ef481e746 100644 2.18.4 -From 0bd6000dcb6949519b594d261a6b6c8aef9d2f80 Mon Sep 17 00:00:00 2001 +From e3c46e302637ceed886f47f1fba46a69607c9ac3 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 11:45:04 +0100 -Subject: [PATCH 0633/1216] drm/vc4: crtc: Rename SoC data structures +Subject: [PATCH 0633/1224] 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 @@ -387925,7 +387925,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index c570dd09b180..8e6c6784f9a3 100644 +index c570dd09b180c..8e6c6784f9a3f 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -1056,7 +1056,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { @@ -387972,10 +387972,10 @@ index c570dd09b180..8e6c6784f9a3 100644 2.18.4 -From 31d4b10ca492862464b28d1828cbab7603e4b4ac Mon Sep 17 00:00:00 2001 +From 08b467c4f63f4c44708214e5f1901b7b41adff08 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 15:45:04 +0100 -Subject: [PATCH 0634/1216] drm/vc4: crtc: Move crtc state to common header +Subject: [PATCH 0634/1224] 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 @@ -387987,7 +387987,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 8e6c6784f9a3..16e694bfab0c 100644 +index 8e6c6784f9a3f..16e694bfab0c8 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -44,27 +44,6 @@ @@ -388019,7 +388019,7 @@ index 8e6c6784f9a3..16e694bfab0c 100644 #define CRTC_READ(offset) readl(vc4_crtc->regs + (offset)) diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index d2d253a94288..2703b9d8936b 100644 +index d2d253a942880..2703b9d8936bb 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -488,6 +488,27 @@ to_vc4_crtc(struct drm_crtc *crtc) @@ -388054,10 +388054,10 @@ index d2d253a94288..2703b9d8936b 100644 2.18.4 -From 0d771a0604f7d65264981173c7fb8b737296150d Mon Sep 17 00:00:00 2001 +From 9c1cfd324d182d8fc0e59512977ffdaa39f15855 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 11:36:50 +0100 -Subject: [PATCH 0635/1216] drm/vc4: crtc: Deal with different number of pixel +Subject: [PATCH 0635/1224] drm/vc4: crtc: Deal with different number of pixel per clock Some of the HDMI pixelvalves in vc5 output two pixels per clock cycle. @@ -388071,7 +388071,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 16e694bfab0c..5e94adb4f70b 100644 +index 16e694bfab0c8..5e94adb4f70b4 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -281,6 +281,7 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc) @@ -388131,7 +388131,7 @@ index 16e694bfab0c..5e94adb4f70b 100644 [PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI, [PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC, diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 2703b9d8936b..dabf9951c375 100644 +index 2703b9d8936bb..dabf9951c3750 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -455,6 +455,9 @@ struct vc4_crtc_data { @@ -388148,10 +388148,10 @@ index 2703b9d8936b..dabf9951c375 100644 2.18.4 -From c68b91101cb2ed27aecc87d6c55e79cd3fa2a5ae Mon Sep 17 00:00:00 2001 +From 7f23b970c9e7c0c24e5c5d27e04986b4f524bbff Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 9 Jan 2020 18:40:49 +0100 -Subject: [PATCH 0636/1216] drm/vc4: crtc: Use a shared interrupt +Subject: [PATCH 0636/1224] 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. @@ -388162,7 +388162,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 5e94adb4f70b..4eedaddb8c92 100644 +index 5e94adb4f70b4..4eedaddb8c922 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -1177,7 +1177,9 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) @@ -388180,10 +388180,10 @@ index 5e94adb4f70b..4eedaddb8c92 100644 2.18.4 -From 812a1abd7f12ebb9fda6912650b2fc8cf624f680 Mon Sep 17 00:00:00 2001 +From d2a7eecd494d3abf918b3890989ce7adaca0cf34 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Jan 2020 13:39:32 +0100 -Subject: [PATCH 0637/1216] drm/vc4: crtc: Turn static const variable into a +Subject: [PATCH 0637/1224] 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 @@ -388195,7 +388195,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 4eedaddb8c92..7b08e6fd1fb1 100644 +index 4eedaddb8c922..7b08e6fd1fb1e 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -44,6 +44,8 @@ @@ -388236,10 +388236,10 @@ index 4eedaddb8c92..7b08e6fd1fb1 100644 2.18.4 -From b01ba45b66839d219d9b01f0b16a3b60ee863e68 Mon Sep 17 00:00:00 2001 +From 4910044a1dfa3b3772af123d2732ce38073924f5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 15:48:09 +0100 -Subject: [PATCH 0638/1216] drm/vc4: crtc: Move the cob allocation outside of +Subject: [PATCH 0638/1224] drm/vc4: crtc: Move the cob allocation outside of bind The COB allocation depends on the HVS channel used for a given @@ -388259,7 +388259,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 7b08e6fd1fb1..c800a31b52f8 100644 +index 7b08e6fd1fb1e..c800a31b52f88 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -65,6 +65,23 @@ static const struct debugfs_reg32 crtc_regs[] = { @@ -388338,7 +388338,7 @@ index 7b08e6fd1fb1..c800a31b52f8 100644 CRTC_WRITE(PV_INTSTAT, PV_INT_VFP_START); ret = devm_request_irq(dev, platform_get_irq(pdev, 0), diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index dabf9951c375..a7c9295aecc3 100644 +index dabf9951c3750..a7c9295aecc30 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -477,8 +477,6 @@ struct vc4_crtc { @@ -388354,10 +388354,10 @@ index dabf9951c375..a7c9295aecc3 100644 2.18.4 -From 3841a58347bb62657d8ed2ba1d769681da438708 Mon Sep 17 00:00:00 2001 +From d2b3c8d21ed0ba351d7d707b6b44baf5d8cba270 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 13:49:17 +0100 -Subject: [PATCH 0639/1216] drm/vc4: crtc: Rename HVS channel to output +Subject: [PATCH 0639/1224] 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 @@ -388375,7 +388375,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index c800a31b52f8..8267e38abd5f 100644 +index c800a31b52f88..8267e38abd5ff 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -1057,7 +1057,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { @@ -388424,7 +388424,7 @@ index c800a31b52f8..8267e38abd5f 100644 drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size); diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index a7c9295aecc3..f6fc92663191 100644 +index a7c9295aecc30..f6fc92663191a 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -452,8 +452,8 @@ to_vc4_encoder(struct drm_encoder *encoder) @@ -388442,10 +388442,10 @@ index a7c9295aecc3..f6fc92663191 100644 2.18.4 -From 800576d9b3529a522cd19203d55643d0a4b3791b Mon Sep 17 00:00:00 2001 +From a1d57be5e9077a58ce3d05be496dac0b7218ae28 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 Jan 2020 13:37:27 +0100 -Subject: [PATCH 0640/1216] drm/vc4: crtc: Use local chan variable +Subject: [PATCH 0640/1224] 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. @@ -388456,7 +388456,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 8267e38abd5f..2e1aee1ba05b 100644 +index 8267e38abd5ff..2e1aee1ba05be 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -816,7 +816,7 @@ static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc) @@ -388472,10 +388472,10 @@ index 8267e38abd5f..2e1aee1ba05b 100644 2.18.4 -From 8c7a06f991849bfcf350128260af5464abd1c63b Mon Sep 17 00:00:00 2001 +From 092cb08989703d7791f358969a7b790bbbbb4c64 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 14:34:31 +0100 -Subject: [PATCH 0641/1216] drm/vc4: crtc: Enable and disable the PV in +Subject: [PATCH 0641/1224] 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 @@ -388495,7 +388495,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 2e1aee1ba05b..b394f873b194 100644 +index 2e1aee1ba05be..b394f873b194f 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -374,9 +374,7 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc) @@ -388533,10 +388533,10 @@ index 2e1aee1ba05b..b394f873b194 100644 2.18.4 -From 3d8a7b8fcd27f8689c40c23dd3aad77872ab8686 Mon Sep 17 00:00:00 2001 +From 12602615dba33e1a391ff60e006af8c7d98cdb27 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 17:53:18 +0100 -Subject: [PATCH 0642/1216] drm/vc4: crtc: Assign output to channel +Subject: [PATCH 0642/1224] drm/vc4: crtc: Assign output to channel automatically The HVS found in the BCM2711 has 6 outputs and 3 FIFOs, with each output @@ -388562,7 +388562,7 @@ Signed-off-by: Maxime Ripard 4 files changed, 175 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index b394f873b194..f31aaee416c6 100644 +index b394f873b194f..f31aaee416c64 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -90,6 +90,7 @@ bool vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id, @@ -388747,7 +388747,7 @@ index b394f873b194..f31aaee416c6 100644 drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size); diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index f6fc92663191..8208dfd0cb08 100644 +index f6fc92663191a..8208dfd0cb088 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -452,6 +452,9 @@ to_vc4_encoder(struct drm_encoder *encoder) @@ -388779,7 +388779,7 @@ index f6fc92663191..8208dfd0cb08 100644 struct { unsigned int left; diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index b82136138370..fdd1ed754087 100644 +index b821361383707..fdd1ed7540879 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -11,6 +11,9 @@ @@ -388978,7 +388978,7 @@ index b82136138370..fdd1ed754087 100644 ret = vc4_ctm_atomic_check(dev, state); if (ret < 0) diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h -index 22b895258545..1300198716aa 100644 +index 22b8952585451..1300198716aa6 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -287,9 +287,19 @@ @@ -389005,10 +389005,10 @@ index 22b895258545..1300198716aa 100644 2.18.4 -From 0c2f1730cec8300e84825b4a1cdba7f8b5581e76 Mon Sep 17 00:00:00 2001 +From 1a6c56d6d2c44b649333ebed6a4a14b643dbbacc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Jan 2020 13:39:20 +0100 -Subject: [PATCH 0643/1216] drm/vc4: crtc: Add FIFO depth to vc4_crtc_data +Subject: [PATCH 0643/1224] 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 @@ -389021,7 +389021,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index f31aaee416c6..961da7b2439d 100644 +index f31aaee416c64..961da7b2439d2 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -250,11 +250,20 @@ vc4_crtc_update_gamma_lut(struct drm_crtc *crtc) @@ -389082,7 +389082,7 @@ index f31aaee416c6..961da7b2439d 100644 .encoder_types = { [PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI, diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 8208dfd0cb08..6eb030445419 100644 +index 8208dfd0cb088..6eb030445419f 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -452,6 +452,9 @@ to_vc4_encoder(struct drm_encoder *encoder) @@ -389099,10 +389099,10 @@ index 8208dfd0cb08..6eb030445419 100644 2.18.4 -From b941b87d13ac335a676ebf25b1fc9125f74f28ed Mon Sep 17 00:00:00 2001 +From e6000a3e68915ea4684823220c05b3cfa9234e03 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Jan 2020 13:40:37 +0100 -Subject: [PATCH 0644/1216] drm/vc4: crtc: Add function to compute FIFO level +Subject: [PATCH 0644/1224] drm/vc4: crtc: Add function to compute FIFO level bits The longer FIFOs in vc5 pixelvalves means that the FIFO full level @@ -389116,7 +389116,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 961da7b2439d..81d144fd446d 100644 +index 961da7b2439d2..81d144fd446d1 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -277,6 +277,14 @@ static u32 vc4_get_fifo_full_level(struct vc4_crtc *vc4_crtc, u32 format) @@ -389149,10 +389149,10 @@ index 961da7b2439d..81d144fd446d 100644 2.18.4 -From d8bbb4c45f25dc980a8eb4d318398c99042e2ab0 Mon Sep 17 00:00:00 2001 +From 74b6dc7f694731dcedccfa2f48b8d8efe97e7838 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 9 Jan 2020 18:35:13 +0100 -Subject: [PATCH 0645/1216] drm/vc4: crtc: Rename HDMI encoder type to HDMI0 +Subject: [PATCH 0645/1224] 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 @@ -389166,7 +389166,7 @@ Signed-off-by: Maxime Ripard 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 81d144fd446d..fa68ddfc9360 100644 +index 81d144fd446d1..fa68ddfc93607 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -1110,7 +1110,7 @@ static const struct vc4_crtc_data bcm2835_pv2_data = { @@ -389179,7 +389179,7 @@ index 81d144fd446d..fa68ddfc9360 100644 }, }; diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 6eb030445419..4aed118c7925 100644 +index 6eb030445419f..4aed118c79252 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -431,7 +431,7 @@ to_vc4_plane_state(struct drm_plane_state *state) @@ -389192,7 +389192,7 @@ 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 d59fd8714c5d..821eb9c4dfbf 100644 +index d59fd8714c5d8..821eb9c4dfbf0 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1320,7 +1320,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) @@ -389208,10 +389208,10 @@ index d59fd8714c5d..821eb9c4dfbf 100644 2.18.4 -From 8b2c0fa2d095b4b298956519ac2fa7b5cd0538af Mon Sep 17 00:00:00 2001 +From 2a4347262aa1bed99854872f41ca1cf5818d815a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 9 Jan 2020 18:39:30 +0100 -Subject: [PATCH 0646/1216] drm/vc4: crtc: Add HDMI1 encoder type +Subject: [PATCH 0646/1224] drm/vc4: crtc: Add HDMI1 encoder type The BCM2711 sports a second HDMI controller, so let's add that second HDMI encoder type. @@ -389222,7 +389222,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 4aed118c7925..4a83b8879f1c 100644 +index 4aed118c79252..4a83b8879f1ce 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -432,6 +432,7 @@ to_vc4_plane_state(struct drm_plane_state *state) @@ -389237,10 +389237,10 @@ index 4aed118c7925..4a83b8879f1c 100644 2.18.4 -From 5009e897a9a56df81c5c58bff19891adb725bdc9 Mon Sep 17 00:00:00 2001 +From 93fba6ac35c2440596a78e6f931e57a8c6960eed Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 16:48:19 +0100 -Subject: [PATCH 0647/1216] drm/vc4: crtc: Remove redundant call to +Subject: [PATCH 0647/1224] drm/vc4: crtc: Remove redundant call to drm_crtc_enable_color_mgmt The driver calls the helper to add the color management properties twice, @@ -389252,7 +389252,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index fa68ddfc9360..312077e84f63 100644 +index fa68ddfc93607..312077e84f630 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -1198,7 +1198,6 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) @@ -389267,10 +389267,10 @@ index fa68ddfc9360..312077e84f63 100644 2.18.4 -From 66cc223f0652c99d2d12a0a0b247927bf1a3f8fd Mon Sep 17 00:00:00 2001 +From 4ac9e12f1b13ca443ca3b829d348a619955da217 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 16:54:21 +0100 -Subject: [PATCH 0648/1216] drm/vc4: crtc: Disable color management for HVS5 +Subject: [PATCH 0648/1224] drm/vc4: crtc: Disable color management for HVS5 The HVS5 uses different color matrices. Disable color management support for now. @@ -389281,7 +389281,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 312077e84f63..daf882b7f95e 100644 +index 312077e84f630..daf882b7f95ee 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -441,7 +441,7 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -389327,10 +389327,10 @@ index 312077e84f63..daf882b7f95e 100644 2.18.4 -From 613515984271f64ba36d02af5c2c9abde735a190 Mon Sep 17 00:00:00 2001 +From fcf5ac918206ea2ce166408237cc450b35157296 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 17:07:02 +0100 -Subject: [PATCH 0649/1216] dt-bindings: display: vc4: pv: Add BCM2711 pixel +Subject: [PATCH 0649/1224] dt-bindings: display: vc4: pv: Add BCM2711 pixel valves The BCM2711 comes with other pixelvalves that have different requirements @@ -389344,7 +389344,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml -index e60791db1fa1..4e1ba03f6477 100644 +index e60791db1fa12..4e1ba03f6477f 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml @@ -15,6 +15,11 @@ properties: @@ -389363,10 +389363,10 @@ index e60791db1fa1..4e1ba03f6477 100644 2.18.4 -From 5b2717f08e3be3b7e43f35626f15c22dbbb236cf Mon Sep 17 00:00:00 2001 +From 392238049d991ee3be02f139bbc74f8f8f917bec Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 11:35:58 +0100 -Subject: [PATCH 0650/1216] drm/vc4: crtc: Add BCM2711 pixelvalves +Subject: [PATCH 0650/1224] drm/vc4: crtc: Add BCM2711 pixelvalves The BCM2711 has 5 pixelvalves, so now that our driver is ready, let's add support for them. @@ -389378,7 +389378,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index daf882b7f95e..c230c0abd2c2 100644 +index daf882b7f95ee..c230c0abd2c2d 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -273,6 +273,13 @@ static u32 vc4_get_fifo_full_level(struct vc4_crtc *vc4_crtc, u32 format) @@ -389496,7 +389496,7 @@ index daf882b7f95e..c230c0abd2c2 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h -index 1300198716aa..ca563d373d9d 100644 +index 1300198716aa6..ca563d373d9da 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -130,6 +130,8 @@ @@ -389523,10 +389523,10 @@ index 1300198716aa..ca563d373d9d 100644 2.18.4 -From d61b834090182f229dfedab43b51ce8b080ac15c Mon Sep 17 00:00:00 2001 +From 5454ff4f2311d3492ae2daf318f6b5e4cc4f1cc1 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 Jan 2020 17:24:32 +0100 -Subject: [PATCH 0651/1216] drm/vc4: hdmi: Use debugfs private field +Subject: [PATCH 0651/1224] 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 @@ -389541,7 +389541,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 821eb9c4dfbf..3bcb6ff781ec 100644 +index 821eb9c4dfbf0..3bcb6ff781ecf 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[] = { @@ -389559,10 +389559,10 @@ index 821eb9c4dfbf..3bcb6ff781ec 100644 2.18.4 -From 6e591748adcdb22ed316d00e5b0bc12d8a1002d9 Mon Sep 17 00:00:00 2001 +From 3d0d9bcf4ca0ce10e4aa067c9c51d4513aac41f0 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Dec 2019 18:35:12 +0100 -Subject: [PATCH 0652/1216] drm/vc4: hdmi: Move structure to header +Subject: [PATCH 0652/1224] 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. @@ -389575,7 +389575,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 3bcb6ff781ec..dcbf695c9d46 100644 +index 3bcb6ff781ecf..dcbf695c9d46b 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -48,87 +48,13 @@ @@ -389669,7 +389669,7 @@ index 3bcb6ff781ec..dcbf695c9d46 100644 VC4_REG32(VC4_HDMI_SW_RESET_CONTROL), diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h new file mode 100644 -index 000000000000..5ec5d1f6b1e6 +index 0000000000000..5ec5d1f6b1e60 --- /dev/null +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -0,0 +1,86 @@ @@ -389763,10 +389763,10 @@ index 000000000000..5ec5d1f6b1e6 2.18.4 -From 115cb1a894e104f62d58d3228e30a44d87b987d2 Mon Sep 17 00:00:00 2001 +From cf9c34f1bcea9b8ff7c7c1f61bd852b2dc3e6722 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 17:17:29 +0100 -Subject: [PATCH 0653/1216] drm/vc4: hdmi: rework connectors and encoders +Subject: [PATCH 0653/1224] 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. @@ -389784,7 +389784,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 dcbf695c9d46..e8de9fa499ae 100644 +index dcbf695c9d46b..e8de9fa499ae1 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 = @@ -390029,7 +390029,7 @@ index dcbf695c9d46..e8de9fa499ae 100644 clk_disable_unprepare(hdmi->hsm_clock); pm_runtime_disable(dev); diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 5ec5d1f6b1e6..17079a39f1b1 100644 +index 5ec5d1f6b1e60..17079a39f1b10 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -8,6 +8,36 @@ @@ -390119,10 +390119,10 @@ index 5ec5d1f6b1e6..17079a39f1b1 100644 2.18.4 -From 4781df796d5b16439a990c97a93d047233540dc7 Mon Sep 17 00:00:00 2001 +From 845318111c76bacc5fb2849ca68cbefd412cf388 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:07:05 +0100 -Subject: [PATCH 0654/1216] drm/vc4: hdmi: Rename hdmi to vc4_hdmi +Subject: [PATCH 0654/1224] 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. @@ -390133,7 +390133,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 e8de9fa499ae..45892e16eb04 100644 +index e8de9fa499ae1..45892e16eb04f 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[] = { @@ -390806,10 +390806,10 @@ index e8de9fa499ae..45892e16eb04 100644 2.18.4 -From c017b938310e9695973505c97542fd276309368c Mon Sep 17 00:00:00 2001 +From d8332ea2223833e5f2c5e6f390ed91974fb508c8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:21:44 +0100 -Subject: [PATCH 0655/1216] drm/vc4: hdmi: Move accessors to vc4_hdmi +Subject: [PATCH 0655/1224] 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 @@ -390826,7 +390826,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 45892e16eb04..87b66f528065 100644 +index 45892e16eb04f..87b66f528065c 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) @@ -390945,7 +390945,7 @@ index 45892e16eb04..87b66f528065 100644 unsigned int i; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 17079a39f1b1..cdc9d90f62ac 100644 +index 17079a39f1b10..cdc9d90f62ac5 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -78,9 +78,9 @@ struct vc4_hdmi { @@ -390966,10 +390966,10 @@ index 17079a39f1b1..cdc9d90f62ac 100644 2.18.4 -From c6615b4a9125aaf6ab435bfce273f30ca6595d43 Mon Sep 17 00:00:00 2001 +From 7458a5fa9c3d84303d6ca2c1fa569ab21b2d063a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:44:36 +0100 -Subject: [PATCH 0656/1216] drm/vc4: hdmi: Use local vc4_hdmi directly +Subject: [PATCH 0656/1224] 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 @@ -390983,7 +390983,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 87b66f528065..05a15407ea3a 100644 +index 87b66f528065c..05a15407ea3a5 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) @@ -391017,10 +391017,10 @@ index 87b66f528065..05a15407ea3a 100644 2.18.4 -From 120bf467b62a04319388bc3c76882a6c400f967e Mon Sep 17 00:00:00 2001 +From ae201312ead8ed709031b3e9c913b3a4e1571183 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:45:46 +0100 -Subject: [PATCH 0657/1216] drm/vc4: hdmi: Add container_of macros for encoders +Subject: [PATCH 0657/1224] drm/vc4: hdmi: Add container_of macros for encoders and connectors Whenever the code needs to access the vc4_hdmi structure from a DRM @@ -391041,7 +391041,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 05a15407ea3a..3f0ed00c62df 100644 +index 05a15407ea3a5..3f0ed00c62df8 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) @@ -391146,7 +391146,7 @@ index 05a15407ea3a..3f0ed00c62df 100644 bool hsync_pos = mode->flags & DRM_MODE_FLAG_PHSYNC; bool vsync_pos = mode->flags & DRM_MODE_FLAG_PVSYNC; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index cdc9d90f62ac..749a807cd1f3 100644 +index cdc9d90f62ac5..749a807cd1f3d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -78,6 +78,22 @@ struct vc4_hdmi { @@ -391176,10 +391176,10 @@ index cdc9d90f62ac..749a807cd1f3 100644 2.18.4 -From 68d4545cb2408dd9b12690c39eec9b64e50a5cce Mon Sep 17 00:00:00 2001 +From f4eeda177c4e1774ec8b3b4460baec166e7a6a41 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:47:53 +0100 -Subject: [PATCH 0658/1216] drm/vc4: hdmi: Pass vc4_hdmi to CEC code +Subject: [PATCH 0658/1224] 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 @@ -391194,7 +391194,7 @@ 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 3f0ed00c62df..ed18826dfc2f 100644 +index 3f0ed00c62df8..ed18826dfc2f4 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1044,8 +1044,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) @@ -391289,10 +391289,10 @@ index 3f0ed00c62df..ed18826dfc2f 100644 2.18.4 -From 7d3b548d4d1964f58bb1b45fb89f3c22ae89bb68 Mon Sep 17 00:00:00 2001 +From 2b67fa2963b18d6c547eb4165b934d11922f3965 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:49:11 +0100 -Subject: [PATCH 0659/1216] drm/vc4: hdmi: Remove vc4_dev hdmi pointer +Subject: [PATCH 0659/1224] drm/vc4: hdmi: Remove vc4_dev hdmi pointer Now that we don't have any users anymore, we can kill that pointer. @@ -391303,7 +391303,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 4a83b8879f1c..48d96ae391e0 100644 +index 4a83b8879f1ce..48d96ae391e02 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -76,7 +76,6 @@ struct vc4_dev { @@ -391315,7 +391315,7 @@ 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 ed18826dfc2f..08933446b358 100644 +index ed18826dfc2f4..08933446b358f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1200,7 +1200,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) @@ -391364,10 +391364,10 @@ index ed18826dfc2f..08933446b358 100644 2.18.4 -From b6c4c8484e60d7b0b911b72dd649e1b8f8413ad3 Mon Sep 17 00:00:00 2001 +From 5bcc93563fca2dd14dd85e65d6f3f1da68cae637 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 18:57:16 +0100 -Subject: [PATCH 0660/1216] drm/vc4: hdmi: Remove vc4_hdmi_connector +Subject: [PATCH 0660/1224] 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 @@ -391380,7 +391380,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 08933446b358..9fd13b50df2d 100644 +index 08933446b358f..9fd13b50df2de 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 = @@ -391462,7 +391462,7 @@ index 08933446b358..9fd13b50df2d 100644 clk_disable_unprepare(vc4_hdmi->hsm_clock); diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 749a807cd1f3..88794136d2e4 100644 +index 749a807cd1f3d..88794136d2e4a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -21,23 +21,6 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder) @@ -391513,10 +391513,10 @@ index 749a807cd1f3..88794136d2e4 100644 2.18.4 -From 2c283d4b59b328aecbdd7f26daa792d6cfab1e5a Mon Sep 17 00:00:00 2001 +From c7cad0f2f6f6d05eabf4de250772f26140b51920 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Dec 2019 11:30:54 +0100 -Subject: [PATCH 0661/1216] drm/vc4: hdmi: Introduce resource init and variant +Subject: [PATCH 0661/1224] 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. @@ -391532,7 +391532,7 @@ 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 9fd13b50df2d..31ea26e4eb7d 100644 +index 9fd13b50df2de..31ea26e4eb7df 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1190,38 +1190,23 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { @@ -391641,7 +391641,7 @@ index 9fd13b50df2d..31ea26e4eb7d 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 88794136d2e4..4cd712779ad3 100644 +index 88794136d2e4a..4cd712779ad33 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -21,6 +21,15 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder) @@ -391672,10 +391672,10 @@ index 88794136d2e4..4cd712779ad3 100644 2.18.4 -From 8da68e98d7754954b63fbc7b2b08217e8896e67b Mon Sep 17 00:00:00 2001 +From 4164c8a9017100888051dea868d1e477c87be945 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 18 Dec 2019 19:15:08 +0100 -Subject: [PATCH 0662/1216] drm/vc4: hdmi: Implement a register layout +Subject: [PATCH 0662/1224] drm/vc4: hdmi: Implement a register layout abstraction The HDMI controllers found in the BCM2711 have most of the registers @@ -391699,7 +391699,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 31ea26e4eb7d..7a97104b9625 100644 +index 31ea26e4eb7df..7a97104b9625e 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -49,62 +49,13 @@ @@ -392455,7 +392455,7 @@ index 31ea26e4eb7d..7a97104b9625 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 4cd712779ad3..f7d0ca9447d2 100644 +index 4cd712779ad33..f7d0ca9447d21 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -22,8 +22,15 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder) @@ -392486,7 +392486,7 @@ index 4cd712779ad3..f7d0ca9447d2 100644 #endif /* _VC4_HDMI_H_ */ diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h new file mode 100644 -index 000000000000..5f78da6e25c7 +index 0000000000000..5f78da6e25c7b --- /dev/null +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h @@ -0,0 +1,250 @@ @@ -392741,7 +392741,7 @@ index 000000000000..5f78da6e25c7 + +#endif /* _VC4_HDMI_REGS_H_ */ diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h -index ca563d373d9d..78809866097c 100644 +index ca563d373d9da..78809866097c8 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -493,32 +493,16 @@ @@ -392995,10 +392995,10 @@ index ca563d373d9d..78809866097c 100644 2.18.4 -From b2be24bcaa65e7d93d3f38e707a58b09a62ecb73 Mon Sep 17 00:00:00 2001 +From 2d0a0710e6f29aee64c59fcb9ebe3cc8d0b29d67 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 16:25:26 +0100 -Subject: [PATCH 0663/1216] drm/vc4: hdmi: Add reset callback +Subject: [PATCH 0663/1224] 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. @@ -393010,7 +393010,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 7a97104b9625..da882735a620 100644 +index 7a97104b9625e..da882735a620c 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) @@ -393052,7 +393052,7 @@ index 7a97104b9625..da882735a620 100644 static const struct of_device_id vc4_hdmi_dt_match[] = { diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index f7d0ca9447d2..93695674c2d3 100644 +index f7d0ca9447d21..93695674c2d3f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -35,6 +35,9 @@ struct vc4_hdmi_variant { @@ -393069,10 +393069,10 @@ index f7d0ca9447d2..93695674c2d3 100644 2.18.4 -From eea934a8ff13edc9911c48ed437da7e1cf94dcff Mon Sep 17 00:00:00 2001 +From ded6f7d9037882caa49a519e259c27cd17e13bfa Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 16:53:33 +0100 -Subject: [PATCH 0664/1216] drm/vc4: hdmi: Add PHY init and disable function +Subject: [PATCH 0664/1224] 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. @@ -393089,7 +393089,7 @@ Signed-off-by: Maxime Ripard create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi_phy.c diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile -index e90c6304775a..8281a044834f 100644 +index e90c6304775ab..8281a044834f0 100644 --- a/drivers/gpu/drm/vc4/Makefile +++ b/drivers/gpu/drm/vc4/Makefile @@ -13,6 +13,7 @@ vc4-y := \ @@ -393101,7 +393101,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 da882735a620..90a522d8624b 100644 +index da882735a620c..90a522d8624b1 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) @@ -393140,7 +393140,7 @@ index da882735a620..90a522d8624b 100644 static const struct of_device_id vc4_hdmi_dt_match[] = { diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 93695674c2d3..39ae5273f36b 100644 +index 93695674c2d3f..39ae5273f36b1 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -21,6 +21,8 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder) @@ -393177,7 +393177,7 @@ index 93695674c2d3..39ae5273f36b 100644 #endif /* _VC4_HDMI_H_ */ diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c new file mode 100644 -index 000000000000..26d6ee08edcf +index 0000000000000..26d6ee08edcff --- /dev/null +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c @@ -0,0 +1,25 @@ @@ -393210,10 +393210,10 @@ index 000000000000..26d6ee08edcf 2.18.4 -From dc147f1f9a4a128316d5de3a534327d142b0a758 Mon Sep 17 00:00:00 2001 +From 5f534bec7433e760efe1e0caa94e03ca6cb319e4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 19 Dec 2019 17:22:24 +0100 -Subject: [PATCH 0665/1216] drm/vc4: hdmi: Add PHY RNG enable / disable +Subject: [PATCH 0665/1224] drm/vc4: hdmi: Add PHY RNG enable / disable function Let's continue the implementation of hooks for the parts that change in the @@ -393227,7 +393227,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 90a522d8624b..80d8cdddd39a 100644 +index 90a522d8624b1..80d8cdddd39a8 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, @@ -393267,7 +393267,7 @@ index 90a522d8624b..80d8cdddd39a 100644 static const struct of_device_id vc4_hdmi_dt_match[] = { diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 39ae5273f36b..9ae4d2c5a4f0 100644 +index 39ae5273f36b1..9ae4d2c5a4f09 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -47,6 +47,12 @@ struct vc4_hdmi_variant { @@ -393292,7 +393292,7 @@ index 39ae5273f36b..9ae4d2c5a4f0 100644 #endif /* _VC4_HDMI_H_ */ diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -index 26d6ee08edcf..8fdea621d8b1 100644 +index 26d6ee08edcff..8fdea621d8b13 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c @@ -7,6 +7,7 @@ @@ -393325,10 +393325,10 @@ index 26d6ee08edcf..8fdea621d8b1 100644 2.18.4 -From a197b94f09012017205d9fdb83f9658f99a10f15 Mon Sep 17 00:00:00 2001 +From f2e21c5343f14c6cfbdc1d3eed260b8709a23d75 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 26 Dec 2019 18:41:53 +0100 -Subject: [PATCH 0666/1216] drm/vc4: hdmi: Add a CSC setup callback +Subject: [PATCH 0666/1224] 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. @@ -393340,7 +393340,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 80d8cdddd39a..4871a161bac9 100644 +index 80d8cdddd39a8..4871a161bac9d 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) @@ -393450,7 +393450,7 @@ index 80d8cdddd39a..4871a161bac9 100644 .phy_init = vc4_hdmi_phy_init, .phy_disable = vc4_hdmi_phy_disable, diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 9ae4d2c5a4f0..22669e07b22e 100644 +index 9ae4d2c5a4f09..22669e07b22ee 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -41,6 +41,9 @@ struct vc4_hdmi_variant { @@ -393467,10 +393467,10 @@ index 9ae4d2c5a4f0..22669e07b22e 100644 2.18.4 -From cd1ca249d79c75673f75046e40edb25de5f55901 Mon Sep 17 00:00:00 2001 +From 1bd65afe0fdae16cbb735e576281431920f784f9 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jan 2020 13:43:27 +0100 -Subject: [PATCH 0667/1216] drm/vc4: hdmi: Add a set_timings callback +Subject: [PATCH 0667/1224] 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 @@ -393486,7 +393486,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 4871a161bac9..c0dba5dd93b8 100644 +index 4871a161bac9d..c0dba5dd93b89 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) @@ -393590,7 +393590,7 @@ index 4871a161bac9..c0dba5dd93b8 100644 .phy_disable = vc4_hdmi_phy_disable, .phy_rng_enable = vc4_hdmi_phy_rng_enable, diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 22669e07b22e..4a67d62aef53 100644 +index 22669e07b22ee..4a67d62aef538 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -44,6 +44,10 @@ struct vc4_hdmi_variant { @@ -393608,10 +393608,10 @@ index 22669e07b22e..4a67d62aef53 100644 2.18.4 -From 343929a25bfecc02a2e2b52fb7f683a4bd2fae77 Mon Sep 17 00:00:00 2001 +From 8f24c5f83c3916f757254934344e3db76727b057 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 7 Jan 2020 13:14:07 +0100 -Subject: [PATCH 0668/1216] drm/vc4: hdmi: Add HDMI ID +Subject: [PATCH 0668/1224] 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 @@ -393626,7 +393626,7 @@ 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 c0dba5dd93b8..434240cbfaa6 100644 +index c0dba5dd93b89..434240cbfaa60 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1268,11 +1268,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) @@ -393643,7 +393643,7 @@ index c0dba5dd93b8..434240cbfaa6 100644 ret = variant->init_resources(vc4_hdmi); diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 4a67d62aef53..4d3117de383a 100644 +index 4a67d62aef538..4d3117de383a1 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -27,6 +27,11 @@ struct vc4_hdmi; @@ -393662,10 +393662,10 @@ index 4a67d62aef53..4d3117de383a 100644 2.18.4 -From 8db543ef9c950fef61eb0e06843c2268ef96af2b Mon Sep 17 00:00:00 2001 +From 199550fa10844af4bcf6225bb3d89c6a19df8fc3 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 16 Jan 2020 14:27:56 +0100 -Subject: [PATCH 0669/1216] drm/vc4: hdmi: Deal with multiple debugfs files +Subject: [PATCH 0669/1224] drm/vc4: hdmi: Deal with multiple debugfs files The HDMI driver was registering a single debugfs file so far with the name hdmi_regs. @@ -393682,7 +393682,7 @@ 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 434240cbfaa6..25672d88f8f3 100644 +index 434240cbfaa60..25672d88f8f33 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1381,7 +1381,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) @@ -393701,10 +393701,10 @@ index 434240cbfaa6..25672d88f8f3 100644 2.18.4 -From f63d0099c0505075ae23c70e93e1f69d0e69d9d4 Mon Sep 17 00:00:00 2001 +From c0356fe9af48d78e6f5896b148481464688161ab Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 16:21:45 +0100 -Subject: [PATCH 0670/1216] drm/vc4: hdmi: Add an audio support flag +Subject: [PATCH 0670/1224] 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 @@ -393717,7 +393717,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 25672d88f8f3..b51d3e997e0c 100644 +index 25672d88f8f33..b51d3e997e0c3 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) @@ -393739,7 +393739,7 @@ index 25672d88f8f3..b51d3e997e0c 100644 .num_registers = ARRAY_SIZE(vc4_hdmi_fields), diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 4d3117de383a..f41116507156 100644 +index 4d3117de383a1..f41116507156a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -32,6 +32,9 @@ struct vc4_hdmi_variant { @@ -393756,10 +393756,10 @@ index 4d3117de383a..f41116507156 100644 2.18.4 -From 10e3fb1a5c9e8b63e54c59059a44d7b82ef911e7 Mon Sep 17 00:00:00 2001 +From 18a6582f5bc0509113e8f86cdaff2b38a0b5f446 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 16:22:13 +0100 -Subject: [PATCH 0671/1216] drm/vc4: hdmi: Move CEC init to its own function +Subject: [PATCH 0671/1224] 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 @@ -393771,7 +393771,7 @@ 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 b51d3e997e0c..3fadc534f41a 100644 +index b51d3e997e0c3..3fadc534f41ae 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1179,6 +1179,67 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { @@ -393927,10 +393927,10 @@ index b51d3e997e0c..3fadc534f41a 100644 2.18.4 -From 6f0bad1bf4718c246a867d971e811da7e3791d93 Mon Sep 17 00:00:00 2001 +From de703bb5e9e0759dd805dbf0a7e1dcb0222edb22 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 6 Feb 2020 16:22:50 +0100 -Subject: [PATCH 0672/1216] drm/vc4: hdmi: Add CEC support flag +Subject: [PATCH 0672/1224] 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 @@ -393943,7 +393943,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 3fadc534f41a..8d5848990e4a 100644 +index 3fadc534f41ae..8d5848990e4a2 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1187,6 +1187,9 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) @@ -393965,7 +393965,7 @@ index 3fadc534f41a..8d5848990e4a 100644 .num_registers = ARRAY_SIZE(vc4_hdmi_fields), diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index f41116507156..cbb1d3ab85d7 100644 +index f41116507156a..cbb1d3ab85d7d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -35,6 +35,9 @@ struct vc4_hdmi_variant { @@ -393982,10 +393982,10 @@ index f41116507156..cbb1d3ab85d7 100644 2.18.4 -From e43eb4855b66aa12324a60f2db5fc48dd68c44ee Mon Sep 17 00:00:00 2001 +From 36a096ff8f0e870a25757e748df486042096fc9b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 10 Feb 2020 15:15:47 +0100 -Subject: [PATCH 0673/1216] drm/vc4: hdmi: Remove unused CEC_CLOCK_DIV define +Subject: [PATCH 0673/1224] 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. @@ -393996,7 +393996,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 8d5848990e4a..5a1a6e84b947 100644 +index 8d5848990e4a2..5a1a6e84b947f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -54,7 +54,6 @@ @@ -394011,10 +394011,10 @@ index 8d5848990e4a..5a1a6e84b947 100644 2.18.4 -From 4d1802f555097180c8b68d5c1388a60292d78473 Mon Sep 17 00:00:00 2001 +From 01cb069beda6881a3e0f9b02f42669d476565249 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 12:31:09 +0100 -Subject: [PATCH 0674/1216] drm/vc4: hdmi: Rename drm_encoder pointer in +Subject: [PATCH 0674/1224] 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 @@ -394027,7 +394027,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 5a1a6e84b947..f74200cc878d 100644 +index 5a1a6e84b947f..f74200cc878d9 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) @@ -394043,10 +394043,10 @@ index 5a1a6e84b947..f74200cc878d 100644 2.18.4 -From 4f9829474557a7915c0925b6ce969dfa901f218b Mon Sep 17 00:00:00 2001 +From 4993e6975af104b4e45825a2f2b84d18586f07f2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 10 Feb 2020 15:23:06 +0100 -Subject: [PATCH 0675/1216] drm/vc4: hdmi: Adjust HSM clock rate depending on +Subject: [PATCH 0675/1224] 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 @@ -394071,7 +394071,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 f74200cc878d..8e84f88347f3 100644 +index f74200cc878d9..8e84f88347f39 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -52,7 +52,6 @@ @@ -394197,7 +394197,7 @@ index f74200cc878d..8e84f88347f3 100644 .cec_available = true, .registers = vc4_hdmi_fields, diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index cbb1d3ab85d7..ee9753255b68 100644 +index cbb1d3ab85d7d..ee9753255b68f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -38,6 +38,9 @@ struct vc4_hdmi_variant { @@ -394214,10 +394214,10 @@ index cbb1d3ab85d7..ee9753255b68 100644 2.18.4 -From 1cd58267f340e5785e5f0d52748c2893a0d177b9 Mon Sep 17 00:00:00 2001 +From d7018844c6bdd153826cda767fc5ba42aeca8d4a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 17 Dec 2019 11:48:37 +0100 -Subject: [PATCH 0676/1216] drm/vc4: hdmi: Support the BCM2711 HDMI controllers +Subject: [PATCH 0676/1224] 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. @@ -394231,7 +394231,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 8e84f88347f3..8bebdb45642b 100644 +index 8e84f88347f39..8bebdb45642ba 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -42,6 +42,7 @@ @@ -394540,7 +394540,7 @@ index 8e84f88347f3..8bebdb45642b 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index ee9753255b68..7a43abbe0cfa 100644 +index ee9753255b68f..7a43abbe0cfae 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -26,6 +26,13 @@ struct drm_display_mode; @@ -394612,7 +394612,7 @@ index ee9753255b68..7a43abbe0cfa 100644 + #endif /* _VC4_HDMI_H_ */ diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -index 8fdea621d8b1..a436fabbc128 100644 +index 8fdea621d8b13..a436fabbc1289 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c @@ -10,6 +10,123 @@ @@ -395096,7 +395096,7 @@ index 8fdea621d8b1..a436fabbc128 100644 + VC4_HDMI_TX_PHY_POWERDOWN_CTL_RNDGEN_PWRDN); +} diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h -index 5f78da6e25c7..ea948ffaa69b 100644 +index 5f78da6e25c7b..ea948ffaa69bc 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h @@ -18,6 +18,12 @@ enum vc4_hdmi_regs { @@ -395357,10 +395357,10 @@ index 5f78da6e25c7..ea948ffaa69b 100644 2.18.4 -From cf33d60c341a3676b32966b672b65649c09becbd Mon Sep 17 00:00:00 2001 +From 5d0156c2308caee6b0a2fe360963b26a4e217962 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 13 Feb 2020 16:45:24 +0100 -Subject: [PATCH 0677/1216] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI +Subject: [PATCH 0677/1224] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI controllers bindings The HDMI controllers found in the BCM2711 SoC need some adjustments to the @@ -395375,7 +395375,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 109 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml -index 52b3cdac0bdf..a9d24e1cf684 100644 +index 52b3cdac0bdf0..a9d24e1cf684d 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml @@ -11,24 +11,58 @@ maintainers: @@ -395537,10 +395537,10 @@ index 52b3cdac0bdf..a9d24e1cf684 100644 2.18.4 -From b98777054b7e2b928455119c530ed1a3f32e8d94 Mon Sep 17 00:00:00 2001 +From c5bf524a9f010450e9a1f79b1b87f282be3ee6ce Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Feb 2020 12:26:40 +0100 -Subject: [PATCH 0678/1216] ARM: dts: bcm2711: Enable the display pipeline +Subject: [PATCH 0678/1224] 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. @@ -395552,7 +395552,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 150 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index ec2a40447176..f75167a77a8e 100644 +index ec2a40447176c..f75167a77a8e3 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -138,6 +138,46 @@ @@ -395603,7 +395603,7 @@ index ec2a40447176..f75167a77a8e 100644 // Downstream rpi- changes diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 7cf1a9748f00..10f14e897eb1 100644 +index 7cf1a9748f006..10f14e897eb16 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -31,6 +31,11 @@ @@ -395755,10 +395755,10 @@ index 7cf1a9748f00..10f14e897eb1 100644 2.18.4 -From 98efd1f51aab59460f9a1d47cc250e5e68e0f28e Mon Sep 17 00:00:00 2001 +From 7639cbc7fbdb57b219dcac86270e627832d52fc5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 21 Feb 2020 17:10:45 +0100 -Subject: [PATCH 0679/1216] [DOWNSTREAM] ARM: dts: rpi4: Disable KMS driver by +Subject: [PATCH 0679/1224] [DOWNSTREAM] ARM: dts: rpi4: Disable KMS driver by default Signed-off-by: Maxime Ripard @@ -395768,7 +395768,7 @@ Signed-off-by: Maxime Ripard 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index f75167a77a8e..83a8431d9e5f 100644 +index f75167a77a8e3..83a8431d9e5fd 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -182,6 +182,14 @@ @@ -395834,7 +395834,7 @@ index f75167a77a8e..83a8431d9e5f 100644 __overrides__ { act_led_gpio = <&act_led>,"gpios:4"; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 207c15f37a23..e8b1e9279c67 100644 +index 207c15f37a23b..e8b1e9279c671 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -55,11 +55,6 @@ @@ -395853,10 +395853,10 @@ index 207c15f37a23..e8b1e9279c67 100644 2.18.4 -From 42e30b422702c9b70474ab4120495a024a9494d1 Mon Sep 17 00:00:00 2001 +From f2887b4184134e620f28180d9b2706891e49e21f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 20 Sep 2019 17:20:01 +0100 -Subject: [PATCH 0680/1216] dtoverlays: Add Pi4 version of vc4-kms-v3d +Subject: [PATCH 0680/1224] 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 @@ -395876,7 +395876,7 @@ Signed-off-by: Dave Stevenson create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 9e5e3ff0bf61..e19ec0b0b106 100644 +index 9e5e3ff0bf616..e19ec0b0b106a 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -191,6 +191,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -395888,7 +395888,7 @@ index 9e5e3ff0bf61..e19ec0b0b106 100644 w1-gpio.dtbo \ w1-gpio-pullup.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 4f7790755fd8..03f6224d6f8d 100644 +index 4f7790755fd82..03f6224d6f8d0 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2684,6 +2684,20 @@ Params: cma-256 CMA is 256MB (needs 1GB) @@ -395914,7 +395914,7 @@ index 4f7790755fd8..03f6224d6f8d 100644 This uses GPIOs 2-21 (so no I2C), and activates the output 2-3 seconds diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts new file mode 100644 -index 000000000000..7d59a30a3662 +index 0000000000000..7d59a30a3662a --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts @@ -0,0 +1,183 @@ @@ -396105,10 +396105,10 @@ index 000000000000..7d59a30a3662 2.18.4 -From 81b9ce2d3ad85145677714772c055fc4a548ec21 Mon Sep 17 00:00:00 2001 +From 64c35417a4ea4610fb95b0fd3c6e31c094006503 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 27 Jan 2020 10:22:44 +0000 -Subject: [PATCH 0681/1216] drm: Checking of the pitch is only valid for linear +Subject: [PATCH 0681/1224] drm: Checking of the pitch is only valid for linear formats framebuffer_check was computing a minimum pitch value and ensuring @@ -396121,7 +396121,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c -index 57564318ceea..fa54768fe4d2 100644 +index 57564318ceeac..fa54768fe4d26 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -217,12 +217,16 @@ static int framebuffer_check(struct drm_device *dev, @@ -396151,10 +396151,10 @@ index 57564318ceea..fa54768fe4d2 100644 2.18.4 -From 7b63c154abe5382bfa71f09fac3c34c926cee770 Mon Sep 17 00:00:00 2001 +From 0d5cfa93238899374b5edfca642538c063078353 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 Jan 2020 14:25:41 +0000 -Subject: [PATCH 0682/1216] drm/vc4: Add support for DRM_FORMAT_P030 to vc4 +Subject: [PATCH 0682/1224] drm/vc4: Add support for DRM_FORMAT_P030 to vc4 planes This currently doesn't handle non-zero source rectangles correctly, @@ -396169,7 +396169,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 59 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 887ef481e746..e01bea748c77 100644 +index 887ef481e7463..e01bea748c77b 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -33,6 +33,7 @@ static const struct hvs_format { @@ -396331,10 +396331,10 @@ index 887ef481e746..e01bea748c77 100644 2.18.4 -From c1bffe2704027f245d7ad1f7076f435e5749d98b Mon Sep 17 00:00:00 2001 +From 06a1160cfd0262a244cd3ba3e967071d199b872d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Feb 2020 17:35:10 +0000 -Subject: [PATCH 0683/1216] Fixup P030 support +Subject: [PATCH 0683/1224] Fixup P030 support I got the logic wrong for enabling pixel formats, resulting in Pi0-3 only getting a single, invalid, format (P030 SAND). @@ -396347,7 +396347,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index e01bea748c77..d0957d618167 100644 +index e01bea748c77b..d0957d6181679 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1441,7 +1441,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, @@ -396363,10 +396363,10 @@ index e01bea748c77..d0957d618167 100644 2.18.4 -From e3b13c475c3dddae8df0fb0f0004b49fb62b3768 Mon Sep 17 00:00:00 2001 +From 364dab789fd09a68d2366890c8010974f65fce2b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 11 Feb 2020 15:36:59 +0000 -Subject: [PATCH 0684/1216] drm/vc4: The check for assigned HVS channels is not +Subject: [PATCH 0684/1224] drm/vc4: The check for assigned HVS channels is not applicable firmware_kms Channel assignments is only in full KMS, so skip the check @@ -396378,7 +396378,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index fdd1ed754087..0dea148852d5 100644 +index fdd1ed7540879..0dea148852d58 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -579,6 +579,7 @@ static int @@ -396402,10 +396402,10 @@ index fdd1ed754087..0dea148852d5 100644 2.18.4 -From afa1ef8d27596d21de8181c6af7656f779ccdd34 Mon Sep 17 00:00:00 2001 +From 4393ffbc9e3a4f73fba87f51b4c6bcd3c70b47c5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 17 Feb 2020 11:37:21 +0000 -Subject: [PATCH 0685/1216] dt: Update v3d to use firmware_clocks. +Subject: [PATCH 0685/1224] 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. @@ -396416,7 +396416,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index e8b1e9279c67..b113ca5bfbf6 100644 +index e8b1e9279c671..b113ca5bfbf6b 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -34,6 +34,7 @@ @@ -396431,10 +396431,10 @@ index e8b1e9279c67..b113ca5bfbf6 100644 2.18.4 -From a286443bbbf23aa862da3b1a7f3b5d6edf54006a Mon Sep 17 00:00:00 2001 +From b451ad1fb4bbf97341cdea277ac00cf5b250eeed Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:01:04 +0000 -Subject: [PATCH 0686/1216] drm/vc4: Reset audio infoframe on encoder_enable if +Subject: [PATCH 0686/1224] drm/vc4: Reset audio infoframe on encoder_enable if previously streaming If the encoder is disabled and re-enabled (eg mode change) all infoframes @@ -396449,7 +396449,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 8bebdb45642b..9c972433e894 100644 +index 8bebdb45642ba..9c972433e894a 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) @@ -396495,7 +396495,7 @@ index 8bebdb45642b..9c972433e894 100644 default: break; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 7a43abbe0cfa..6a775ec7616f 100644 +index 7a43abbe0cfae..6a775ec7616fc 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -101,6 +101,8 @@ struct vc4_hdmi_audio { @@ -396511,10 +396511,10 @@ index 7a43abbe0cfa..6a775ec7616f 100644 2.18.4 -From b4ce1dce4d573d7de8f1b42761012ec9f21e4754 Mon Sep 17 00:00:00 2001 +From 34dfe7da5b4e6af7f7dfecb9234e7e99ebdf49d0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:03:42 +0000 -Subject: [PATCH 0687/1216] drm/vc4: Set the b-frame marker to the match ALSA's +Subject: [PATCH 0687/1224] drm/vc4: Set the b-frame marker to the match ALSA's default. ALSA's iec958 plugin by default sets the block start preamble @@ -396528,7 +396528,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 9c972433e894..abf25910d843 100644 +index 9c972433e894a..abf25910d8434 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, @@ -396548,10 +396548,10 @@ index 9c972433e894..abf25910d843 100644 2.18.4 -From a8bc820061fceee4d593e9a2e27f08c96afc0f96 Mon Sep 17 00:00:00 2001 +From 74f8c858b256892c99949e9869d38959953a84b7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:07:19 +0000 -Subject: [PATCH 0688/1216] dts: Add reg-names for the HDMI registers on +Subject: [PATCH 0688/1224] dts: Add reg-names for the HDMI registers on bcm2835 Pi4 is requiring many more register configs in the HDMI @@ -396566,7 +396566,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi -index fe1ab40c7f22..e269e75f0f57 100644 +index fe1ab40c7f224..e269e75f0f57d 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -110,6 +110,8 @@ @@ -396582,10 +396582,10 @@ index fe1ab40c7f22..e269e75f0f57 100644 2.18.4 -From 4a5cd9f6d91602cd6701e156d28b2ca3dcdb02ee Mon Sep 17 00:00:00 2001 +From a5f44166f4310e76103f502ae129ed1696a4027b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:08:39 +0000 -Subject: [PATCH 0689/1216] dt: Add HDMI audio dma values to bcm2711.dtsi +Subject: [PATCH 0689/1224] dt: Add HDMI audio dma values to bcm2711.dtsi Adds the relevant DMA settings for HDMI audio to work. @@ -396595,7 +396595,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 10f14e897eb1..141d9403fe27 100644 +index 10f14e897eb16..141d9403fe275 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -348,6 +348,8 @@ @@ -396620,10 +396620,10 @@ index 10f14e897eb1..141d9403fe27 100644 2.18.4 -From c3a30f9609cba60064e63b82261bed26e85e4dec Mon Sep 17 00:00:00 2001 +From 3ef6261fa5440c8fde77bacd2acb39368d77df9c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:11:41 +0000 -Subject: [PATCH 0690/1216] drm/vc4: Use reg-names to configure HDMI audio. +Subject: [PATCH 0690/1224] drm/vc4: Use reg-names to configure HDMI audio. HDMI audio configuration was using fixed index numbers to load in DT register settings. @@ -396635,7 +396635,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 abf25910d843..6a5e06314cae 100644 +index abf25910d8434..6a5e06314caea 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) @@ -396661,10 +396661,10 @@ index abf25910d843..6a5e06314cae 100644 2.18.4 -From 3f36d1a5e9ad7b70bed46820e7b3f3633442a5a1 Mon Sep 17 00:00:00 2001 +From 943ee0bac82166f95b9e16bc3edf843ef93e3712 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:16:14 +0000 -Subject: [PATCH 0691/1216] drm/vc4: Add audio initialisation for Pi4. +Subject: [PATCH 0691/1224] drm/vc4: Add audio initialisation for Pi4. The audio configuration has changed for Pi4, so support the configuration functions via the variant tables. @@ -396676,7 +396676,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 6a5e06314cae..6757863e465d 100644 +index 6a5e06314caea..6757863e465d7 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 = { @@ -396776,7 +396776,7 @@ index 6a5e06314cae..6757863e465d 100644 static const struct of_device_id vc4_hdmi_dt_match[] = { diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 6a775ec7616f..9b80f9401d58 100644 +index 6a775ec7616fc..9b80f9401d583 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -88,6 +88,12 @@ struct vc4_hdmi_variant { @@ -396796,10 +396796,10 @@ index 6a775ec7616f..9b80f9401d58 100644 2.18.4 -From 72220f921d87c72d12068888675bd3ee5e476b4b Mon Sep 17 00:00:00 2001 +From cb5cedd3161074e4160973abf786ee783c8c1dc2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:18:45 +0000 -Subject: [PATCH 0692/1216] drm/vc4: Enable audio on Pi4. +Subject: [PATCH 0692/1224] 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. @@ -396810,7 +396810,7 @@ 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 6757863e465d..a5f0ee70625c 100644 +index 6757863e465d7..a5f0ee70625c2 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1751,6 +1751,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { @@ -396833,10 +396833,10 @@ index 6757863e465d..a5f0ee70625c 100644 2.18.4 -From e550a26b3d57dc0c3f84d9fd9fb2e65002ed89fd Mon Sep 17 00:00:00 2001 +From 463f11708cb377eec29553a9469b75121edb5189 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 25 Mar 2020 18:22:40 +0000 -Subject: [PATCH 0693/1216] drm/vc4: Alter the HDMI state machine clock calc to +Subject: [PATCH 0693/1224] drm/vc4: Alter the HDMI state machine clock calc to allow for 1920x1200 Whilst the documentation for BCM2835 states that the HDMI state machine @@ -396854,7 +396854,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 a5f0ee70625c..0e394d6b1200 100644 +index a5f0ee70625c2..0e394d6b1200e 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) @@ -396885,10 +396885,10 @@ index a5f0ee70625c..0e394d6b1200 100644 2.18.4 -From 65e4e1f15c73be0dcd9c076779e5bb5d5e6884c6 Mon Sep 17 00:00:00 2001 +From 56c5443672a75d8d0d1bd57f520ee6974182b46c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 26 Mar 2020 11:51:55 +0000 -Subject: [PATCH 0694/1216] dtoverlays: Remove comment about vc4-kms-v3d +Subject: [PATCH 0694/1224] 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 @@ -396901,7 +396901,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 03f6224d6f8d..88aa213e693f 100644 +index 03f6224d6f8d0..88aa213e693f7 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2672,9 +2672,7 @@ Params: @@ -396919,10 +396919,10 @@ index 03f6224d6f8d..88aa213e693f 100644 2.18.4 -From 3e1a03157c58076c8ea86b1a7962fd104c3ed257 Mon Sep 17 00:00:00 2001 +From 9c32744601dc73995264bb69565cc280d3a658e4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 26 Mar 2020 15:32:19 +0000 -Subject: [PATCH 0695/1216] drm/vc4: Kick the core clock up during a mode +Subject: [PATCH 0695/1224] drm/vc4: Kick the core clock up during a mode change Experimental commit to kick the core clock up during mode @@ -396938,7 +396938,7 @@ Signed-off-by: Dave Stevenson 4 files changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 141d9403fe27..5f3c9313d9a7 100644 +index 141d9403fe275..5f3c9313d9a73 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -306,6 +306,7 @@ @@ -396950,7 +396950,7 @@ index 141d9403fe27..5f3c9313d9a7 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 48d96ae391e0..9e825c81ad0c 100644 +index 48d96ae391e02..9e825c81ad0cd 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -326,6 +326,8 @@ struct vc4_hvs { @@ -396963,7 +396963,7 @@ index 48d96ae391e0..9e825c81ad0c 100644 * list. Units are dwords. */ diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c -index 650d4d9a5980..59198019aa1d 100644 +index 650d4d9a5980c..59198019aa1d9 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -19,6 +19,7 @@ @@ -396988,7 +396988,7 @@ index 650d4d9a5980..59198019aa1d 100644 if (hvs_version >= 0x40) hvs->hvs5 = true; diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 0dea148852d5..20b328d7e43b 100644 +index 0dea148852d58..20b328d7e43ba 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -13,6 +13,7 @@ @@ -397029,10 +397029,10 @@ index 0dea148852d5..20b328d7e43b 100644 2.18.4 -From d805b831661701c025aac8beab9da9ac3860ae8f Mon Sep 17 00:00:00 2001 +From 6fbe0b99ba7002a3746bbbb54749a6bd16b20ad8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 30 Mar 2020 12:52:26 +0100 -Subject: [PATCH 0696/1216] drm/vc4: Fixup for firmware KMS +Subject: [PATCH 0696/1224] 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 @@ -397044,7 +397044,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index 20b328d7e43b..7f857af77898 100644 +index 20b328d7e43ba..7f857af77898e 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -239,7 +239,8 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state) @@ -397071,10 +397071,10 @@ index 20b328d7e43b..7f857af77898 100644 2.18.4 -From 3fd81d3e272ad99cee0883ecec65333ef9c908f4 Mon Sep 17 00:00:00 2001 +From 14f8e75c6b0b426026966fb0a17723def6fb6a78 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 30 Mar 2020 18:25:10 +0100 -Subject: [PATCH 0697/1216] drm/vc4: Fixup plane init within firmware-kms +Subject: [PATCH 0697/1224] 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 @@ -397086,7 +397086,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c -index 67235aee3507..68f9db6c4c87 100644 +index 67235aee35070..68f9db6c4c878 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -291,9 +291,11 @@ static int vc4_drm_bind(struct device *dev) @@ -397108,10 +397108,10 @@ index 67235aee3507..68f9db6c4c87 100644 2.18.4 -From 12ce2650d0824cf3c2735898b4ebbcd3f44e0944 Mon Sep 17 00:00:00 2001 +From 61b0ec4646e6c21af31d14ef1f98b4e2409bfdc3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 31 Mar 2020 16:21:45 +0100 -Subject: [PATCH 0698/1216] drm/vc4-hdmi: Give the HDMI audio instances +Subject: [PATCH 0698/1224] drm/vc4-hdmi: Give the HDMI audio instances different names The debugfs usage within asoc gets confused if multiple interfaces @@ -397124,7 +397124,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 0e394d6b1200..6621eb3e01c6 100644 +index 0e394d6b1200e..6621eb3e01c6e 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) @@ -397140,10 +397140,10 @@ index 0e394d6b1200..6621eb3e01c6 100644 2.18.4 -From 6a4227b51d944cb2623a3c15d2ead6ffa6c31de4 Mon Sep 17 00:00:00 2001 +From d384c7aaaf56a38db75b2f2f9b5a3033f5c37a0b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 31 Mar 2020 16:23:11 +0100 -Subject: [PATCH 0699/1216] i2c: brcmstb: The interrupt line is optional, so +Subject: [PATCH 0699/1224] i2c: brcmstb: The interrupt line is optional, so use platform_get_irq_optional If there is no interrupt defined then an error is logged due @@ -397157,7 +397157,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c -index 169a2836922d..d4e0a0f6732a 100644 +index 169a2836922d2..d4e0a0f6732ae 100644 --- a/drivers/i2c/busses/i2c-brcmstb.c +++ b/drivers/i2c/busses/i2c-brcmstb.c @@ -647,20 +647,22 @@ static int brcmstb_i2c_probe(struct platform_device *pdev) @@ -397196,10 +397196,10 @@ index 169a2836922d..d4e0a0f6732a 100644 2.18.4 -From 5d6d1e452954073439aee6aab5ea5e0c3910b43b Mon Sep 17 00:00:00 2001 +From b93d5c6b2e892c3fa255f0c0a180820a925091d7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 31 Mar 2020 17:54:08 +0100 -Subject: [PATCH 0700/1216] dt: Drop I2C for Pi4 HDMI interfaces to 97.5kHz. +Subject: [PATCH 0700/1224] 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 @@ -397212,7 +397212,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 5f3c9313d9a7..3ecff12736ad 100644 +index 5f3c9313d9a73..3ecff12736adc 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -358,7 +358,7 @@ @@ -397237,10 +397237,10 @@ index 5f3c9313d9a7..3ecff12736ad 100644 2.18.4 -From 6cca4d95b371af762c18853503ae44bd7ee48a62 Mon Sep 17 00:00:00 2001 +From c0d317600bd2f903bfc923db592f1ffc82333c69 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 27 Mar 2020 13:49:25 +0000 -Subject: [PATCH 0701/1216] overlays: Add missing rpi-poe parameters +Subject: [PATCH 0701/1224] overlays: Add missing rpi-poe parameters The rpi-poe fan overlay has gained two more fan speeds and adjusted the thresholds and hystereses. @@ -397251,7 +397251,7 @@ Signed-off-by: Phil Elwell 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 88aa213e693f..5832c5f00230 100644 +index 88aa213e693f7..5832c5f00230f 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2037,12 +2037,20 @@ Name: rpi-poe @@ -397282,10 +397282,10 @@ index 88aa213e693f..5832c5f00230 100644 2.18.4 -From 5ab5fc469de4799e2eea988fe04ba334f2ed17a8 Mon Sep 17 00:00:00 2001 +From 4888a6799dbcef7f3d89e97910ba72394480da9f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 2 Apr 2020 16:46:31 +0100 -Subject: [PATCH 0702/1216] vc4_hdmi_phy: Fix offset calculation +Subject: [PATCH 0702/1224] vc4_hdmi_phy: Fix offset calculation The original firmware code worked with float and did offset = ((vco_freq / fref * 2) * (1 << 22)); @@ -397301,7 +397301,7 @@ Signed-off-by: popcornmix 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -index a436fabbc128..732d8a0e5a1c 100644 +index a436fabbc1289..732d8a0e5a1cd 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c @@ -192,8 +192,8 @@ static u32 phy_get_rm_offset(unsigned long long vco_freq) @@ -397318,10 +397318,10 @@ index a436fabbc128..732d8a0e5a1c 100644 2.18.4 -From ce0b8724dfa49c38b8bb0e6198706ec71b037564 Mon Sep 17 00:00:00 2001 +From f5f1834e602b69eaed45db601535f4ea7a059b88 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Apr 2020 15:09:42 +0100 -Subject: [PATCH 0703/1216] overlays: Add overlay_map +Subject: [PATCH 0703/1224] overlays: Add overlay_map The overlay map permits platform-specific overlays, with deprecation and renaming. @@ -397336,7 +397336,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm/boot/dts/overlays/overlay_map.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index e19ec0b0b106..e351ac0ab12c 100644 +index e19ec0b0b106a..e351ac0ab12c2 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -1,5 +1,7 @@ @@ -397349,7 +397349,7 @@ index e19ec0b0b106..e351ac0ab12c 100644 adau1977-adc.dtbo \ diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts new file mode 100644 -index 000000000000..e9b04b954d55 +index 0000000000000..e9b04b954d55c --- /dev/null +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -0,0 +1,71 @@ @@ -397428,10 +397428,10 @@ index 000000000000..e9b04b954d55 2.18.4 -From 2a4489a592d1dac631e86c1b0dbb284f95dfbbd0 Mon Sep 17 00:00:00 2001 +From 6c89c98b9aab3555f63b32c9054dbe2e73dcd306 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Apr 2020 17:24:15 +0100 -Subject: [PATCH 0704/1216] overlays: Formally rename/deprecate old overlays +Subject: [PATCH 0704/1224] overlays: Formally rename/deprecate old overlays Take advantage of the overlay_map to rename or deprecate some obsolete overlays. @@ -397458,7 +397458,7 @@ Signed-off-by: Phil Elwell delete mode 100644 arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index e351ac0ab12c..dbc525d69fe3 100644 +index e351ac0ab12c2..dbc525d69fe3a 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -27,7 +27,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -397491,7 +397491,7 @@ index e351ac0ab12c..dbc525d69fe3 100644 piglow.dtbo \ piscreen.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 5832c5f00230..7ff74b155827 100644 +index 5832c5f00230f..7ff74b1558279 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1288,11 +1288,8 @@ Params: pins_0_1 Use pins 0 and 1 (default) @@ -397524,7 +397524,7 @@ index 5832c5f00230..7ff74b155827 100644 Name: i2c3 diff --git a/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts deleted file mode 100644 -index 26dbbdd03ce5..000000000000 +index 26dbbdd03ce5a..0000000000000 --- a/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts +++ /dev/null @@ -1,23 +0,0 @@ @@ -397553,7 +397553,7 @@ index 26dbbdd03ce5..000000000000 -}; diff --git a/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts deleted file mode 100644 -index 02f7dca9b71e..000000000000 +index 02f7dca9b71e6..0000000000000 --- a/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts +++ /dev/null @@ -1,14 +0,0 @@ @@ -397573,7 +397573,7 @@ index 02f7dca9b71e..000000000000 -}; diff --git a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts deleted file mode 100644 -index 09d8b16a6256..000000000000 +index 09d8b16a6256d..0000000000000 --- a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts +++ /dev/null @@ -1,9 +0,0 @@ @@ -397587,7 +397587,7 @@ index 09d8b16a6256..000000000000 - }; -}; diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts -index e9b04b954d55..113098ea6908 100644 +index e9b04b954d55c..113098ea69083 100644 --- a/arch/arm/boot/dts/overlays/overlay_map.dts +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -1,6 +1,18 @@ @@ -397655,28 +397655,28 @@ index e9b04b954d55..113098ea6908 100644 }; diff --git a/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts b/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts deleted file mode 100644 -index aedfc90e8a31..000000000000 +index aedfc90e8a31d..0000000000000 --- a/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts +++ /dev/null @@ -1 +0,0 @@ -#include "act-led-overlay.dts" diff --git a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts deleted file mode 100644 -index e09a49295236..000000000000 +index e09a49295236b..0000000000000 --- a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts +++ /dev/null @@ -1 +0,0 @@ -#include "disable-bt-overlay.dts" diff --git a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts deleted file mode 100644 -index b61b69c14f37..000000000000 +index b61b69c14f37c..0000000000000 --- a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts +++ /dev/null @@ -1 +0,0 @@ -#include "disable-wifi-overlay.dts" diff --git a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts deleted file mode 100644 -index 94c14267716e..000000000000 +index 94c14267716eb..0000000000000 --- a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts +++ /dev/null @@ -1 +0,0 @@ @@ -397685,10 +397685,10 @@ index 94c14267716e..000000000000 2.18.4 -From df31ce090341056c29b8632e99cb04e85a7e89fa Mon Sep 17 00:00:00 2001 +From ee0f0ff34a9174b6ad3e1b5b9de6bde0da6d4274 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Apr 2020 15:51:56 +0100 -Subject: [PATCH 0705/1216] overlays: Add vc4-kms-v3d-pi4 to overlay_map +Subject: [PATCH 0705/1224] overlays: Add vc4-kms-v3d-pi4 to overlay_map Signed-off-by: Phil Elwell --- @@ -397696,7 +397696,7 @@ Signed-off-by: Phil Elwell 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts -index 113098ea6908..c4f7f33fb5da 100644 +index 113098ea69083..c4f7f33fb5da5 100644 --- a/arch/arm/boot/dts/overlays/overlay_map.dts +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -108,4 +108,13 @@ @@ -397717,10 +397717,10 @@ index 113098ea6908..c4f7f33fb5da 100644 2.18.4 -From d7818ea6557533a7feaeabd4ad6de2490a4cef57 Mon Sep 17 00:00:00 2001 +From b276622c82e387a824d3e4a808f8ed3008d41ac2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Apr 2020 09:47:42 +0100 -Subject: [PATCH 0706/1216] Add upstream and upstream-pi4 to overlay_map +Subject: [PATCH 0706/1224] 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. @@ -397735,7 +397735,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index dbc525d69fe3..658fca1dc68e 100644 +index dbc525d69fe3a..658fca1dc68e2 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -183,6 +183,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -397747,7 +397747,7 @@ index dbc525d69fe3..658fca1dc68e 100644 vc4-kms-kippah-7inch.dtbo \ vc4-kms-v3d.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 7ff74b155827..0db75e63f6e1 100644 +index 7ff74b1558279..0db75e63f6e16 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2653,6 +2653,13 @@ Info: This overlay has been deprecated and removed because it is no longer @@ -397765,7 +397765,7 @@ index 7ff74b155827..0db75e63f6e1 100644 Info: Enable Eric Anholt's DRM VC4 V3D driver on top of the dispmanx display stack. diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts -index c4f7f33fb5da..a20c0e079cc8 100644 +index c4f7f33fb5da5..a20c0e079cc86 100644 --- a/arch/arm/boot/dts/overlays/overlay_map.dts +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -105,10 +105,19 @@ @@ -397790,7 +397790,7 @@ index c4f7f33fb5da..a20c0e079cc8 100644 bcm2711 = "vc4-kms-v3d-pi4"; diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts new file mode 100644 -index 000000000000..2db343ef2237 +index 0000000000000..2db343ef2237f --- /dev/null +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts @@ -0,0 +1,161 @@ @@ -397959,10 +397959,10 @@ index 000000000000..2db343ef2237 2.18.4 -From d495a2a998dad575cda2cbb0facf65cf653de5cd Mon Sep 17 00:00:00 2001 +From d2f4bd2affc8ae3b29630a3f7e3727bb517e9c08 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 9 Sep 2019 15:49:56 +0100 -Subject: [PATCH 0707/1216] clk-raspberrypi: Allow cpufreq driver to also +Subject: [PATCH 0707/1224] clk-raspberrypi: Allow cpufreq driver to also adjust gpu clocks For performance/power it is beneficial to adjust gpu clocks with arm clock. @@ -397974,7 +397974,7 @@ Signed-off-by: popcornmix 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 86b18f8cc98d..eb1844148af9 100644 +index 86b18f8cc98d8..eb1844148af96 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -76,7 +76,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware, @@ -397990,10 +397990,10 @@ index 86b18f8cc98d..eb1844148af9 100644 2.18.4 -From 148b923fab51a21ec2209e3b978647dcd80bf890 Mon Sep 17 00:00:00 2001 +From ddc6358d2c3f0f415a60ba14c08912b3423e602f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 09:48:29 +0100 -Subject: [PATCH 0708/1216] configs: FS_ENCRYPTION replaces EXT4_ENCRYPTION +Subject: [PATCH 0708/1224] configs: FS_ENCRYPTION replaces EXT4_ENCRYPTION The filesystem-specific encryption options have been replaced by a generic FS_ENCRYPTION option. @@ -398007,7 +398007,7 @@ Signed-off-by: Phil Elwell 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 9131effbfa0c..0dbec1e55c90 100644 +index 9131effbfa0c8..0dbec1e55c900 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1303,7 +1303,6 @@ CONFIG_RPI_AXIPERF=m @@ -398027,7 +398027,7 @@ index 9131effbfa0c..0dbec1e55c90 100644 CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index e4ea63553dc0..ffe4065ba694 100644 +index e4ea63553dc06..ffe4065ba6943 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1304,7 +1304,6 @@ CONFIG_RPI_AXIPERF=m @@ -398047,7 +398047,7 @@ index e4ea63553dc0..ffe4065ba694 100644 CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index bf0551437fd7..bd631b897a38 100644 +index bf0551437fd7f..bd631b897a386 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1333,7 +1333,6 @@ CONFIG_RPI_AXIPERF=m @@ -398067,7 +398067,7 @@ index bf0551437fd7..bd631b897a38 100644 CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index b40477e1553b..544c16a75b34 100644 +index b40477e1553be..544c16a75b344 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1135,7 +1135,6 @@ CONFIG_PWM_PCA9685=m @@ -398090,10 +398090,10 @@ index b40477e1553b..544c16a75b34 100644 2.18.4 -From d539fbe71258b7b6d2897edd8ce837454db2585d Mon Sep 17 00:00:00 2001 +From 88ecf677027b5700b310388f1b051180cd6e92f7 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Wed, 8 Apr 2020 20:00:30 +1000 -Subject: [PATCH 0709/1216] Add support for the AudioInjector.net Isolated +Subject: [PATCH 0709/1224] Add support for the AudioInjector.net Isolated sound card This patch adds support for the Audio Injector Isolated sound card. @@ -398116,7 +398116,7 @@ Signed-off-by: Matt Flax create mode 100644 sound/soc/bcm/audioinjector-isolated-soundcard.c diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 658fca1dc68e..3f60596cdbeb 100644 +index 658fca1dc68e2..3f60596cdbeb2 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -22,6 +22,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -398128,7 +398128,7 @@ index 658fca1dc68e..3f60596cdbeb 100644 audioinjector-wm8731-audio.dtbo \ audiosense-pi.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 0db75e63f6e1..38459f67ddcf 100644 +index 0db75e63f6e16..38459f67ddcf7 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -505,6 +505,12 @@ Params: non-stop-clocks Keeps the clocks running even when the stream @@ -398146,7 +398146,7 @@ index 0db75e63f6e1..38459f67ddcf 100644 Load: dtoverlay=audioinjector-ultra diff --git a/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts new file mode 100644 -index 000000000000..63e05cf9665d +index 0000000000000..63e05cf9665d6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts @@ -0,0 +1,55 @@ @@ -398206,7 +398206,7 @@ index 000000000000..63e05cf9665d + }; +}; diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 0dbec1e55c90..12ea7ed48087 100644 +index 0dbec1e55c900..12ea7ed480878 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -970,6 +970,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m @@ -398226,7 +398226,7 @@ index 0dbec1e55c90..12ea7ed48087 100644 CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_WM8804_I2C=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index ffe4065ba694..13d386f7f512 100644 +index ffe4065ba6943..13d386f7f5127 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -947,6 +947,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m @@ -398246,7 +398246,7 @@ index ffe4065ba694..13d386f7f512 100644 CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_WM8804_I2C=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 7cf9f2f9e1cc..414daa6205a3 100644 +index 7cf9f2f9e1cc6..414daa6205a3f 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -962,6 +962,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m @@ -398266,7 +398266,7 @@ index 7cf9f2f9e1cc..414daa6205a3 100644 CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_WM8804_I2C=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index bd631b897a38..24260d0d445a 100644 +index bd631b897a386..24260d0d445a0 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -977,6 +977,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m @@ -398286,7 +398286,7 @@ index bd631b897a38..24260d0d445a 100644 CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_WM8804_I2C=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 544c16a75b34..a24cbb4837b8 100644 +index 544c16a75b344..a24cbb4837b8f 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -839,6 +839,7 @@ CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m @@ -398306,7 +398306,7 @@ index 544c16a75b34..a24cbb4837b8 100644 CONFIG_SND_SOC_WM8804_I2C=m CONFIG_SND_SIMPLE_CARD=m diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index 0067bae41e48..fdaccbfd79ce 100644 +index 0067bae41e48f..fdaccbfd79ce5 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -192,6 +192,13 @@ config SND_AUDIOINJECTOR_OCTO_SOUNDCARD @@ -398324,7 +398324,7 @@ index 0067bae41e48..fdaccbfd79ce 100644 tristate "Support for AudioSense Add-On Soundcard" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index 6ab480dc2566..cab392690974 100644 +index 6ab480dc25661..cab3926909740 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -27,6 +27,7 @@ snd-soc-iqaudio-dac-objs := iqaudio-dac.o @@ -398345,7 +398345,7 @@ index 6ab480dc2566..cab392690974 100644 obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO) += snd-soc-dionaudio-loco.o diff --git a/sound/soc/bcm/audioinjector-isolated-soundcard.c b/sound/soc/bcm/audioinjector-isolated-soundcard.c new file mode 100644 -index 000000000000..652464658fef +index 0000000000000..652464658fef9 --- /dev/null +++ b/sound/soc/bcm/audioinjector-isolated-soundcard.c @@ -0,0 +1,183 @@ @@ -398536,10 +398536,10 @@ index 000000000000..652464658fef 2.18.4 -From ae7fde9cb88b7470ea431b68619010e335997c69 Mon Sep 17 00:00:00 2001 +From 66aa5a812a2607ad863370945af8b08fcc0c2416 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 11:59:39 +0100 -Subject: [PATCH 0710/1216] overlays: Fix dtc warnings in i2c-gpio +Subject: [PATCH 0710/1224] overlays: Fix dtc warnings in i2c-gpio Better late than never. @@ -398549,7 +398549,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts -index 39e7bc5fa9d8..e94053b55610 100644 +index 39e7bc5fa9d88..e94053b55610a 100644 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts @@ -9,6 +9,9 @@ @@ -398566,10 +398566,10 @@ index 39e7bc5fa9d8..e94053b55610 100644 2.18.4 -From 6154788f376f7b73b4c893714e5e76b8189091b2 Mon Sep 17 00:00:00 2001 +From f355cfbb86f870b674e8f1a3478bc7db02294805 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Apr 2020 15:23:56 +0100 -Subject: [PATCH 0711/1216] kbuild: Disable gcc plugins +Subject: [PATCH 0711/1224] 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 @@ -398586,7 +398586,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+) diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh -index d3caefe53eab..6ee109e5d266 100755 +index d3caefe53eab9..6ee109e5d266d 100755 --- a/scripts/gcc-plugin.sh +++ b/scripts/gcc-plugin.sh @@ -1,5 +1,6 @@ @@ -398600,10 +398600,10 @@ index d3caefe53eab..6ee109e5d266 100755 2.18.4 -From c8b08120c0f9dfc51af27af9a1e291bc846d9629 Mon Sep 17 00:00:00 2001 +From f4ff5aab721c265cbe8decff5558903a7444e7b7 Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Wed, 8 Apr 2020 09:31:39 +0200 -Subject: [PATCH 0712/1216] configs: add MA120X0P codec +Subject: [PATCH 0712/1224] configs: add MA120X0P codec Signed-off-by: AMuszkat --- @@ -398615,7 +398615,7 @@ Signed-off-by: AMuszkat 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 12ea7ed48087..030e57d27fbe 100644 +index 12ea7ed480878..030e57d27fbe6 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -989,6 +989,7 @@ CONFIG_SND_SOC_ADAU7002=m @@ -398627,7 +398627,7 @@ index 12ea7ed48087..030e57d27fbe 100644 CONFIG_SND_SOC_WM8804_I2C=m CONFIG_SND_SIMPLE_CARD=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 13d386f7f512..ca5ca0917390 100644 +index 13d386f7f5127..ca5ca09173906 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -966,6 +966,7 @@ CONFIG_SND_SOC_ADAU7002=m @@ -398639,7 +398639,7 @@ index 13d386f7f512..ca5ca0917390 100644 CONFIG_SND_SOC_WM8804_I2C=m CONFIG_SND_SIMPLE_CARD=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 414daa6205a3..d610d48707a3 100644 +index 414daa6205a3f..d610d48707a34 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -981,6 +981,7 @@ CONFIG_SND_SOC_ADAU7002=m @@ -398651,7 +398651,7 @@ index 414daa6205a3..d610d48707a3 100644 CONFIG_SND_SOC_WM8804_I2C=m CONFIG_SND_SIMPLE_CARD=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 24260d0d445a..818e84acbf53 100644 +index 24260d0d445a0..818e84acbf539 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -996,6 +996,7 @@ CONFIG_SND_SOC_ADAU7002=m @@ -398663,7 +398663,7 @@ index 24260d0d445a..818e84acbf53 100644 CONFIG_SND_SOC_WM8804_I2C=m CONFIG_SND_SIMPLE_CARD=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index a24cbb4837b8..34aa78d5d814 100644 +index a24cbb4837b8f..34aa78d5d814d 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -851,6 +851,7 @@ CONFIG_SND_SOC_ADAU1701=m @@ -398678,10 +398678,10 @@ index a24cbb4837b8..34aa78d5d814 100644 2.18.4 -From 488921fd9973e8f8a6ca861da25be88ff1478ca8 Mon Sep 17 00:00:00 2001 +From 16402e4c77bb07a832e2e22c323e8459d91933a0 Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Wed, 8 Apr 2020 10:04:49 +0200 -Subject: [PATCH 0713/1216] ASoC: ma120x0p: Add 96KHz rate support +Subject: [PATCH 0713/1224] ASoC: ma120x0p: Add 96KHz rate support Add 96KHz rate support to MA120X0P codec and make enable and mute gpio pins optional. @@ -398692,7 +398692,7 @@ Signed-off-by: AMuszkat 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/ma120x0p.c b/sound/soc/codecs/ma120x0p.c -index 39c74b17e007..e1591b6aff43 100644 +index 39c74b17e0077..e1591b6aff431 100644 --- a/sound/soc/codecs/ma120x0p.c +++ b/sound/soc/codecs/ma120x0p.c @@ -1002,7 +1002,7 @@ static struct snd_soc_dai_driver ma120x0p_dai = { @@ -398726,10 +398726,10 @@ index 39c74b17e007..e1591b6aff43 100644 2.18.4 -From ad13b2cf20e00cd6443b729f0848cfa3dab36852 Mon Sep 17 00:00:00 2001 +From 92f0ba7168a9c8ad7c66dfbbb4292586b5470060 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 Nov 2019 10:56:11 +0100 -Subject: [PATCH 0714/1216] arm64: mm: reserve CMA and crashkernel in +Subject: [PATCH 0714/1224] arm64: mm: reserve CMA and crashkernel in ZONE_DMA32 commit bff3b04460a80f425442fe8e5c6ee8c3ebef611f upstream. @@ -398752,10 +398752,10 @@ Signed-off-by: Catalin Marinas 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index ddd6a6ce158e..9ee7894d6414 100644 +index d5733f2d35159..c16d223c0eb4c 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -91,7 +91,7 @@ static void __init reserve_crashkernel(void) +@@ -85,7 +85,7 @@ static void __init reserve_crashkernel(void) if (crash_base == 0) { /* Current arm64 boot protocol requires 2MB alignment */ @@ -398764,7 +398764,7 @@ index ddd6a6ce158e..9ee7894d6414 100644 crash_size, SZ_2M); if (crash_base == 0) { pr_warn("cannot allocate crashkernel (size:0x%llx)\n", -@@ -459,7 +459,7 @@ void __init arm64_memblock_init(void) +@@ -449,7 +449,7 @@ void __init arm64_memblock_init(void) high_memory = __va(memblock_end_of_DRAM() - 1) + 1; @@ -398777,10 +398777,10 @@ index ddd6a6ce158e..9ee7894d6414 100644 2.18.4 -From e05359b5f644056f82bf433a8db5765b0119347b Mon Sep 17 00:00:00 2001 +From 1213a766689ef699153feb530353f52a3a8368b9 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 3 Dec 2019 12:10:13 +0000 -Subject: [PATCH 0715/1216] arm64: mm: Fix initialisation of DMA zones on +Subject: [PATCH 0715/1224] arm64: mm: Fix initialisation of DMA zones on non-NUMA systems commit 93b90414c33f59b7960bc8d607da0ce83377e021 upstream. @@ -398828,10 +398828,10 @@ Signed-off-by: Catalin Marinas 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 9ee7894d6414..9af647dafa51 100644 +index c16d223c0eb4c..53037b6b6708c 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -214,15 +214,14 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) +@@ -208,15 +208,14 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) { struct memblock_region *reg; unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; @@ -398850,7 +398850,7 @@ index 9ee7894d6414..9af647dafa51 100644 #endif #ifdef CONFIG_ZONE_DMA32 max_dma32 = PFN_DOWN(arm64_dma32_phys_limit); -@@ -236,25 +235,23 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) +@@ -230,25 +229,23 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) unsigned long start = memblock_region_memory_base_pfn(reg); unsigned long end = memblock_region_memory_end_pfn(reg); @@ -398888,10 +398888,10 @@ index 9ee7894d6414..9af647dafa51 100644 2.18.4 -From 50c6d035eafb747598967bf7ebdcc87d1c96105d Mon Sep 17 00:00:00 2001 +From d69494288ab880c1d10ca9c05d33d3630dbf1e2e Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 10 Jan 2020 18:29:35 +0100 -Subject: [PATCH 0716/1216] ARM: dts: bcm283x: Unify CMA configuration +Subject: [PATCH 0716/1224] ARM: dts: bcm283x: Unify CMA configuration commit c5a1e5375d19bd4001c59dc5d482ac5b1ba51cbf upstream. @@ -398914,7 +398914,7 @@ Signed-off-by: Florian Fainelli 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 3ecff12736ad..72cbd23c9796 100644 +index 3ecff12736adc..72cbd23c9796d 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -12,25 +12,6 @@ @@ -398964,7 +398964,7 @@ index 3ecff12736ad..72cbd23c9796 100644 compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c"; interrupts = ; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 202a61f574c7..adb59ca3df6c 100644 +index 202a61f574c73..adb59ca3df6c6 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -30,6 +30,19 @@ @@ -398991,10 +398991,10 @@ index 202a61f574c7..adb59ca3df6c 100644 2.18.4 -From fc22c3bc65c50a588ae2d6910f56aff1bb16a681 Mon Sep 17 00:00:00 2001 +From 07bdf19d0fc0098c40e11f21fc017fe64ed99c85 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 10 Jan 2020 18:19:33 +0100 -Subject: [PATCH 0717/1216] dma-contiguous: CMA: give precedence to cmdline +Subject: [PATCH 0717/1224] dma-contiguous: CMA: give precedence to cmdline commit 8c8c5a4994a306c217fd061cbfc5903399fd4c1c upstream. @@ -399013,7 +399013,7 @@ Signed-off-by: Christoph Hellwig 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c -index 69cfb4345388..8477bf549dc9 100644 +index 69cfb4345388c..8477bf549dc91 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -301,9 +301,16 @@ static int __init rmem_cma_setup(struct reserved_mem *rmem) @@ -399046,10 +399046,10 @@ index 69cfb4345388..8477bf549dc9 100644 2.18.4 -From e23e79aebf10c2da7dbf4fc4c48f765e6f0c0125 Mon Sep 17 00:00:00 2001 +From 536f3c3a9b01378845a375c0dca0dbe4a67975ed Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 2 Apr 2020 19:22:46 +0200 -Subject: [PATCH 0718/1216] ARM: dts: Use upstream CMA configuration +Subject: [PATCH 0718/1224] 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 @@ -399061,7 +399061,7 @@ Signed-off-by: Nicolas Saenz Julienne 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 83a8431d9e5f..996112381eef 100644 +index 83a8431d9e5fd..996112381eefb 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -195,7 +195,7 @@ @@ -399088,10 +399088,10 @@ index 83a8431d9e5f..996112381eef 100644 2.18.4 -From fc3cb99cfb607eb409a88b9ca1569153dec49561 Mon Sep 17 00:00:00 2001 +From f06bdc3e1a309ff230ea74534872d07bfa6e59ec Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 2 Apr 2020 19:54:33 +0200 -Subject: [PATCH 0719/1216] ARM: dts: overlays: Unify overlay CMA handling +Subject: [PATCH 0719/1224] 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. @@ -399115,7 +399115,7 @@ Signed-off-by: Nicolas Saenz Julienne create mode 100644 arch/arm/boot/dts/overlays/cma-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 3f60596cdbeb..96f96c98561e 100644 +index 3f60596cdbeb2..96f96c98561e5 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -28,6 +28,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -399127,7 +399127,7 @@ index 3f60596cdbeb..96f96c98561e 100644 dionaudio-loco.dtbo \ dionaudio-loco-v2.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 38459f67ddcf..1df13b1fbc51 100644 +index 38459f67ddcf7..1df13b1fbc513 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -554,6 +554,19 @@ Info: This overlay is now deprecated - see i2c-sensor @@ -399179,7 +399179,7 @@ index 38459f67ddcf..1df13b1fbc51 100644 audio1 Enable or disable audio over HDMI1 (default diff --git a/arch/arm/boot/dts/overlays/cma-overlay.dts b/arch/arm/boot/dts/overlays/cma-overlay.dts new file mode 100644 -index 000000000000..4fbdf161672e +index 0000000000000..4fbdf161672e3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/cma-overlay.dts @@ -0,0 +1,32 @@ @@ -399216,7 +399216,7 @@ index 000000000000..4fbdf161672e + }; +}; diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts -index 96837d962188..4d46790d81c9 100644 +index 96837d962188c..4d46790d81c9c 100644 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts @@ -1,4 +1,4 @@ @@ -399356,7 +399356,7 @@ index 96837d962188..4d46790d81c9 100644 #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts -index 2db343ef2237..428aa5dcc38f 100644 +index 2db343ef2237f..428aa5dcc38f0 100644 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts @@ -8,144 +8,120 @@ @@ -399526,7 +399526,7 @@ index 2db343ef2237..428aa5dcc38f 100644 #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts -index d9af97c8414f..ca344492bed8 100644 +index d9af97c8414f0..ca344492bed86 100644 --- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts @@ -5,77 +5,36 @@ @@ -399613,7 +399613,7 @@ index d9af97c8414f..ca344492bed8 100644 - }; }; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts -index c5f687e8bcb9..b40aa1d8f432 100644 +index c5f687e8bcb9a..b40aa1d8f432b 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts @@ -7,108 +7,75 @@ @@ -399774,7 +399774,7 @@ index c5f687e8bcb9..b40aa1d8f432 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts -index 7d59a30a3662..134ad9ecbd4a 100644 +index 7d59a30a3662a..134ad9ecbd4ab 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts @@ -7,164 +7,131 @@ @@ -399980,10 +399980,10 @@ index 7d59a30a3662..134ad9ecbd4a 100644 2.18.4 -From 5c323ebb0da3d7cde79e253405a88d564e7fb9c2 Mon Sep 17 00:00:00 2001 +From 146a2806048883bb6064de1ba602d40d308494f1 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 19 Mar 2020 20:00:13 +0100 -Subject: [PATCH 0720/1216] ARM: dts: bcm283x: Fix vc4's firmware bus DMA +Subject: [PATCH 0720/1224] ARM: dts: bcm283x: Fix vc4's firmware bus DMA limitations The bus is virtual and devices have to inherit their DMA constraints @@ -399999,7 +399999,7 @@ Signed-off-by: Florian Fainelli 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index 394c8a71b13b..fd2c766e0f71 100644 +index 394c8a71b13be..fd2c766e0f710 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -15,6 +15,7 @@ @@ -400014,10 +400014,10 @@ index 394c8a71b13b..fd2c766e0f71 100644 2.18.4 -From 7aab47daef28b050ca4c7617765c98fc80743fc2 Mon Sep 17 00:00:00 2001 +From f1c715ff75d976778d894f5fec86c72b7f35170e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Apr 2020 15:25:02 +0100 -Subject: [PATCH 0721/1216] ARM: dts: bcm2711: Restrict CMA to first 768MB +Subject: [PATCH 0721/1224] 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 @@ -400034,7 +400034,7 @@ Signed-off-by: Phil Elwell 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index b113ca5bfbf6..f27cb47448b1 100644 +index b113ca5bfbf6b..f27cb47448b11 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -45,6 +45,11 @@ @@ -400053,10 +400053,10 @@ index b113ca5bfbf6..f27cb47448b1 100644 2.18.4 -From 9f6eec14fd338ca41196116aacc57d4339ac1924 Mon Sep 17 00:00:00 2001 +From fcaf4bf0a855c646743fc45479ae0a31280c3982 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Feb 2020 12:00:42 +0000 -Subject: [PATCH 0722/1216] configs: Restore CONFIG_GPIO_SYSFS +Subject: [PATCH 0722/1224] configs: Restore CONFIG_GPIO_SYSFS Signed-off-by: Phil Elwell --- @@ -400067,7 +400067,7 @@ Signed-off-by: Phil Elwell 4 files changed, 4 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 030e57d27fbe..1542ea5af327 100644 +index 030e57d27fbe6..1542ea5af327e 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -670,6 +670,7 @@ CONFIG_PPS=m @@ -400079,7 +400079,7 @@ index 030e57d27fbe..1542ea5af327 100644 CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index ca5ca0917390..393bf162e73b 100644 +index ca5ca09173906..393bf162e73bb 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -643,6 +643,7 @@ CONFIG_PPS=m @@ -400091,7 +400091,7 @@ index ca5ca0917390..393bf162e73b 100644 CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index d610d48707a3..8eddf1eec9b7 100644 +index d610d48707a34..8eddf1eec9b7a 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -663,6 +663,7 @@ CONFIG_PPS=m @@ -400103,7 +400103,7 @@ index d610d48707a3..8eddf1eec9b7 100644 CONFIG_GPIO_PCF857X=m CONFIG_GPIO_ARIZONA=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 818e84acbf53..dac95c734828 100644 +index 818e84acbf539..dac95c7348288 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -675,6 +675,7 @@ CONFIG_SPI_GPIO=m @@ -400118,10 +400118,10 @@ index 818e84acbf53..dac95c734828 100644 2.18.4 -From 9eefd7c669d312e20855c3249a0b69b44bc56511 Mon Sep 17 00:00:00 2001 +From 8b726015f443e198f866931e7bb3021f4546a511 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Feb 2020 12:51:56 +0000 -Subject: [PATCH 0723/1216] ARM: dts: Extend SCB bus address range +Subject: [PATCH 0723/1224] ARM: dts: Extend SCB bus address range Signed-off-by: Phil Elwell --- @@ -400129,7 +400129,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index f27cb47448b1..4bc44b2ad211 100644 +index f27cb47448b11..4bc44b2ad211f 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -69,7 +69,9 @@ @@ -400147,10 +400147,10 @@ index f27cb47448b1..4bc44b2ad211 100644 2.18.4 -From d0b3f86bec2eb7a35cf3acfd34326234d5127aeb Mon Sep 17 00:00:00 2001 +From 62319a51a5aab61414ca751e838edccc70567a4b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Dec 2019 18:02:08 +0000 -Subject: [PATCH 0724/1216] dts: bcm2711: Move emmc2 to its own "bus" +Subject: [PATCH 0724/1224] 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 @@ -400162,7 +400162,7 @@ Signed-off-by: Phil Elwell 1 file changed, 22 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 996112381eef..34251ec1b531 100644 +index 996112381eefb..34251ec1b531d 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -193,6 +193,8 @@ @@ -400205,10 +400205,10 @@ index 996112381eef..34251ec1b531 100644 2.18.4 -From 69cd2b6f45e1d51036abfdd124c298901f1803be Mon Sep 17 00:00:00 2001 +From 5b32195df56e13aa4ac0148b7b21533922940ab7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 10 Apr 2020 19:24:40 -0600 -Subject: [PATCH 0725/1216] drm/vc4: hdmi: Silence pixel clock error on +Subject: [PATCH 0725/1224] drm/vc4: hdmi: Silence pixel clock error on -EPROBE_DEFER If the vc4 hdmi driver loads before the pixel clock is available we @@ -400220,7 +400220,7 @@ 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 6621eb3e01c6..2ebaea7e2a7b 100644 +index 6621eb3e01c6e..2ebaea7e2a7bf 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1494,8 +1494,10 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) @@ -400240,11 +400240,11 @@ index 6621eb3e01c6..2ebaea7e2a7b 100644 2.18.4 -From 43fa7853868d6cc6d940a4c0a0fcd1b970e62d70 Mon Sep 17 00:00:00 2001 +From 1008fb6b9498960c6e17e37f78f4e0b8740b6953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?= Date: Wed, 15 Apr 2020 11:48:29 +0200 -Subject: [PATCH 0726/1216] Fixes a problem with clock settings of HiFiBerry +Subject: [PATCH 0726/1224] Fixes a problem with clock settings of HiFiBerry DAC+ADC PRO (#3545) This patch fixes a problem of the re-calculation of @@ -400256,7 +400256,7 @@ Signed-off-by: Joerg Schambacher 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c -index 2883c3ce9488..ffa76014e7df 100644 +index 2883c3ce9488b..ffa76014e7df6 100644 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c @@ -390,9 +390,11 @@ static int snd_rpi_hifiberry_dacplusadcpro_hw_params( @@ -400288,10 +400288,10 @@ index 2883c3ce9488..ffa76014e7df 100644 2.18.4 -From 24ca6dcaba11d2dbaadacb93e707a5f245e7c877 Mon Sep 17 00:00:00 2001 +From 0681e4c1075b5998b98d9f5d78d518f71200eb09 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 7 Apr 2020 17:21:55 +0200 -Subject: [PATCH 0727/1216] Documentation: media: Update sub-device API intro +Subject: [PATCH 0727/1224] 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 @@ -400305,7 +400305,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/media/kapi/v4l2-subdev.rst b/Documentation/media/kapi/v4l2-subdev.rst -index 29e07e23f888..41ccb3e5c707 100644 +index 29e07e23f8885..41ccb3e5c7075 100644 --- a/Documentation/media/kapi/v4l2-subdev.rst +++ b/Documentation/media/kapi/v4l2-subdev.rst @@ -275,8 +275,13 @@ system the .unbind() method is called. All three callbacks are optional. @@ -400328,10 +400328,10 @@ index 29e07e23f888..41ccb3e5c707 100644 2.18.4 -From 6e9177eca32ad6b77cb53935374dcc09d39dfe1e Mon Sep 17 00:00:00 2001 +From 2946d82ce95d351f2754c76411729b7e43336aa3 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 7 Apr 2020 17:21:56 +0200 -Subject: [PATCH 0728/1216] Documentation: media: Document read-only subdevice +Subject: [PATCH 0728/1224] 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. @@ -400350,7 +400350,7 @@ Signed-off-by: Jacopo Mondi 8 files changed, 94 insertions(+) diff --git a/Documentation/media/kapi/v4l2-subdev.rst b/Documentation/media/kapi/v4l2-subdev.rst -index 41ccb3e5c707..6ced2381952a 100644 +index 41ccb3e5c7075..6ced2381952ab 100644 --- a/Documentation/media/kapi/v4l2-subdev.rst +++ b/Documentation/media/kapi/v4l2-subdev.rst @@ -332,6 +332,50 @@ Private ioctls @@ -400405,7 +400405,7 @@ index 41ccb3e5c707..6ced2381952a 100644 I2C sub-device drivers ---------------------- diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst b/Documentation/media/uapi/v4l/dev-subdev.rst -index 029bb2d9928a..d665366056a9 100644 +index 029bb2d9928aa..d665366056a90 100644 --- a/Documentation/media/uapi/v4l/dev-subdev.rst +++ b/Documentation/media/uapi/v4l/dev-subdev.rst @@ -39,6 +39,11 @@ will feature a character device node on which ioctls can be called to @@ -400421,7 +400421,7 @@ index 029bb2d9928a..d665366056a9 100644 Controls ======== diff --git a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst -index 5712bd48e687..435d955aaf85 100644 +index 5712bd48e6870..435d955aaf859 100644 --- a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst +++ b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst @@ -57,6 +57,10 @@ pointer to the struct :c:type:`v4l2_dv_timings` @@ -400445,7 +400445,7 @@ index 5712bd48e687..435d955aaf85 100644 .. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}| diff --git a/Documentation/media/uapi/v4l/vidioc-g-std.rst b/Documentation/media/uapi/v4l/vidioc-g-std.rst -index e633e42e3910..e220b38b859f 100644 +index e633e42e39104..e220b38b859f9 100644 --- a/Documentation/media/uapi/v4l/vidioc-g-std.rst +++ b/Documentation/media/uapi/v4l/vidioc-g-std.rst @@ -66,6 +66,9 @@ video timings (e.g. if :ref:`VIDIOC_ENUMINPUT` @@ -400466,7 +400466,7 @@ index e633e42e3910..e220b38b859f 100644 +EPERM + ``VIDIOC_SUBDEV_S_STD`` has been called on a read-only subdevice. diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst -index 632ee053accc..307b80c4b543 100644 +index 632ee053accc4..307b80c4b5435 100644 --- a/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst +++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst @@ -73,6 +73,11 @@ crop rectangles and stored in the sub-device file handle. Two @@ -400490,7 +400490,7 @@ index 632ee053accc..307b80c4b543 100644 + The ``VIDIOC_SUBDEV_S_CROP`` ioctl has been called on a read-only subdevice + and the ``which`` field is set to ``V4L2_SUBDEV_FORMAT_ACTIVE``. diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst -index 472577bd1745..b811c68d2d3d 100644 +index 472577bd17454..b811c68d2d3da 100644 --- a/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst +++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst @@ -78,6 +78,11 @@ current links configuration or sub-device controls value. For instance, @@ -400516,7 +400516,7 @@ index 472577bd1745..b811c68d2d3d 100644 ============ diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst -index 4b1b4bc78bfe..34aa39096e3d 100644 +index 4b1b4bc78bfea..34aa39096e3d3 100644 --- a/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst +++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst @@ -65,6 +65,10 @@ struct @@ -400539,7 +400539,7 @@ index 4b1b4bc78bfe..34aa39096e3d 100644 + The ``VIDIOC_SUBDEV_S_FRAME_INTERVAL`` ioctl has been called on a read-only + subdevice. diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst -index fc73d27e6d74..feba9f807135 100644 +index fc73d27e6d747..feba9f807135e 100644 --- a/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst +++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst @@ -53,6 +53,10 @@ function of the crop API, and more, are supported by the selections API. @@ -400565,10 +400565,10 @@ index fc73d27e6d74..feba9f807135 100644 2.18.4 -From a7c0b2e914b95405d15b3005af57668d51530b40 Mon Sep 17 00:00:00 2001 +From 5fa61b81d3374f2c7d4a20dfd2f08bd0de8c7854 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 7 Apr 2020 17:21:57 +0200 -Subject: [PATCH 0729/1216] media: v4l2-dev: Add +Subject: [PATCH 0729/1224] media: v4l2-dev: Add v4l2_device_register_ro_subdev_node() Add to the V4L2 core a function to register device nodes for video @@ -400588,7 +400588,7 @@ Signed-off-by: Jacopo Mondi 4 files changed, 77 insertions(+), 6 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c -index 41da73ce2e98..76d2d46dcc5c 100644 +index 41da73ce2e98f..76d2d46dcc5c8 100644 --- a/drivers/media/v4l2-core/v4l2-device.c +++ b/drivers/media/v4l2-core/v4l2-device.c @@ -189,7 +189,8 @@ static void v4l2_device_release_subdev_node(struct video_device *vdev) @@ -400620,7 +400620,7 @@ index 41da73ce2e98..76d2d46dcc5c 100644 void v4l2_device_unregister_subdev(struct v4l2_subdev *sd) { diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c -index f725cd9b66b9..83a3667e6d30 100644 +index f725cd9b66b96..83a3667e6d309 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -331,6 +331,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) @@ -400692,7 +400692,7 @@ index f725cd9b66b9..83a3667e6d30 100644 } diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h -index 48531e57cc5a..8f2befe9c905 100644 +index 48531e57cc5a8..8f2befe9c905e 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -82,11 +82,18 @@ struct v4l2_ctrl_handler; @@ -400715,7 +400715,7 @@ index 48531e57cc5a..8f2befe9c905 100644 /* Priority helper functions */ diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h -index a0e93f0ef62a..841d23e3bbcf 100644 +index a0e93f0ef62a1..841d23e3bbcf0 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h @@ -174,14 +174,56 @@ int __must_check v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, @@ -400783,10 +400783,10 @@ index a0e93f0ef62a..841d23e3bbcf 100644 2.18.4 -From 7169f46d90146c745ed4546989be48913da755b6 Mon Sep 17 00:00:00 2001 +From 4921478c94cd84b9e24a90177f359553c543f9ee Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:39:49 +0100 -Subject: [PATCH 0730/1216] media: bcm2835-unicam: Driver for CCP2/CSI2 camera +Subject: [PATCH 0730/1224] media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface Add driver for the Unicam camera receiver block on @@ -400812,7 +400812,7 @@ Signed-off-by: Naushir Patuck create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h diff --git a/MAINTAINERS b/MAINTAINERS -index b1b23c692186..ac0d4c2eeedf 100644 +index b1b23c6921865..ac0d4c2eeedfe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3206,7 +3206,7 @@ F: Documentation/devicetree/bindings/media/rpivid_hevc.jaml @@ -400825,7 +400825,7 @@ index b1b23c692186..ac0d4c2eeedf 100644 S: Maintained F: drivers/media/platform/bcm2835/ diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig -index f1f61419fd29..c06699ab787d 100644 +index f1f61419fd292..c06699ab787d9 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -146,6 +146,7 @@ source "drivers/media/platform/am437x/Kconfig" @@ -400837,7 +400837,7 @@ index f1f61419fd29..c06699ab787d 100644 config VIDEO_TI_CAL diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile -index 6ee7eb0d36f4..2718dc538312 100644 +index 6ee7eb0d36f43..2718dc5383126 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -100,4 +100,6 @@ obj-y += meson/ @@ -400849,7 +400849,7 @@ index 6ee7eb0d36f4..2718dc538312 100644 obj-y += sunxi/ diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig new file mode 100644 -index 000000000000..20e15147ee02 +index 0000000000000..20e15147ee02f --- /dev/null +++ b/drivers/media/platform/bcm2835/Kconfig @@ -0,0 +1,14 @@ @@ -400869,7 +400869,7 @@ index 000000000000..20e15147ee02 + will be called bcm2835-unicam. diff --git a/drivers/media/platform/bcm2835/Makefile b/drivers/media/platform/bcm2835/Makefile new file mode 100644 -index 000000000000..a98aba03598a +index 0000000000000..a98aba03598ab --- /dev/null +++ b/drivers/media/platform/bcm2835/Makefile @@ -0,0 +1,3 @@ @@ -400878,7 +400878,7 @@ index 000000000000..a98aba03598a +obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.o diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c new file mode 100644 -index 000000000000..8c1b220e6d8c +index 0000000000000..8c1b220e6d8c9 --- /dev/null +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -0,0 +1,2369 @@ @@ -403253,7 +403253,7 @@ index 000000000000..8c1b220e6d8c +MODULE_VERSION(UNICAM_VERSION); diff --git a/drivers/media/platform/bcm2835/vc4-regs-unicam.h b/drivers/media/platform/bcm2835/vc4-regs-unicam.h new file mode 100644 -index 000000000000..ae059a171d0f +index 0000000000000..ae059a171d0fe --- /dev/null +++ b/drivers/media/platform/bcm2835/vc4-regs-unicam.h @@ -0,0 +1,253 @@ @@ -403514,10 +403514,10 @@ index 000000000000..ae059a171d0f 2.18.4 -From 438be6e43c3acd42c51544f2e683c889cebdb382 Mon Sep 17 00:00:00 2001 +From f2996e7bcb1b03fba78cded3f676d1e4bc1c3203 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:46:29 +0100 -Subject: [PATCH 0731/1216] defconfig: Add bcm2835-unicam to platform +Subject: [PATCH 0731/1224] defconfig: Add bcm2835-unicam to platform defconfigs. This commit enables the bcm2835-unicam driver in the following @@ -403535,7 +403535,7 @@ Signed-off-by: Naushir Patuck 3 files changed, 3 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 1542ea5af327..e5168c0359b2 100644 +index 1542ea5af327e..e5168c0359b23 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -875,6 +875,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m @@ -403547,7 +403547,7 @@ index 1542ea5af327..e5168c0359b2 100644 CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 393bf162e73b..19a8ec28f8a4 100644 +index 393bf162e73bb..19a8ec28f8a45 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -851,6 +851,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m @@ -403559,7 +403559,7 @@ index 393bf162e73b..19a8ec28f8a4 100644 CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 8eddf1eec9b7..543948a9499d 100644 +index 8eddf1eec9b7a..543948a9499d7 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -867,6 +867,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m @@ -403574,10 +403574,10 @@ index 8eddf1eec9b7..543948a9499d 100644 2.18.4 -From 967bb4bcafcc9a7e29c6acd61cdcb89bedd9acad Mon Sep 17 00:00:00 2001 +From 4b46971ed4349ab72cdc53562cc39831b6303891 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 1 Apr 2020 08:46:29 +0100 -Subject: [PATCH 0732/1216] media: uapi: v4l2-core: Add sensor ancillary data +Subject: [PATCH 0732/1224] media: uapi: v4l2-core: Add sensor ancillary data V4L2 foucc type. Add V4L2_META_FMT_SENSOR_DATA format 4CC. @@ -403595,7 +403595,7 @@ Signed-off-by: Naushir Patuck create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst diff --git a/Documentation/media/uapi/v4l/meta-formats.rst b/Documentation/media/uapi/v4l/meta-formats.rst -index b10ca9ee3968..3d937720f0b9 100644 +index b10ca9ee39686..3d937720f0b9f 100644 --- a/Documentation/media/uapi/v4l/meta-formats.rst +++ b/Documentation/media/uapi/v4l/meta-formats.rst @@ -21,6 +21,7 @@ These formats are used for the :ref:`metadata` interface only. @@ -403608,7 +403608,7 @@ index b10ca9ee3968..3d937720f0b9 100644 pixfmt-meta-vsp1-hgt diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst b/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst new file mode 100644 -index 000000000000..4a67e204d08a +index 0000000000000..4a67e204d08a3 --- /dev/null +++ b/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst @@ -0,0 +1,32 @@ @@ -403645,7 +403645,7 @@ index 000000000000..4a67e204d08a +and cannot be modified with a call to :c:type:`VIDIOC_SUBDEV_S_FMT`. + diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 360200ed4f08..8878b9abd034 100644 +index 360200ed4f083..8878b9abd0346 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1332,6 +1332,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -403657,7 +403657,7 @@ index 360200ed4f08..8878b9abd034 100644 default: /* Compressed formats */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 5d28d8ef6c0c..d8320844d188 100644 +index 5d28d8ef6c0cc..d8320844d188c 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -768,6 +768,7 @@ struct v4l2_pix_format { @@ -403672,10 +403672,10 @@ index 5d28d8ef6c0c..d8320844d188 100644 2.18.4 -From e03d28c9305e8b680d3ab0412ac7afa8516823b6 Mon Sep 17 00:00:00 2001 +From 85e3d31b3b745d843161cd8d8c66cc83d43c0c90 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Jan 2020 14:06:47 +0000 -Subject: [PATCH 0733/1216] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media +Subject: [PATCH 0733/1224] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media bus format This patch adds MEDIA_BUS_FMT_SENSOR_DATA used by the bcm2835-unicam @@ -403688,7 +403688,7 @@ Signed-off-by: Naushir Patuck 2 files changed, 36 insertions(+) diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst -index 15e11f27b4c8..42870bd65de1 100644 +index 15e11f27b4c8f..42870bd65de17 100644 --- a/Documentation/media/uapi/v4l/subdev-formats.rst +++ b/Documentation/media/uapi/v4l/subdev-formats.rst @@ -7794,3 +7794,36 @@ formats. @@ -403729,7 +403729,7 @@ index 15e11f27b4c8..42870bd65de1 100644 + `_ + diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h -index 16c1fa2d89a4..4b5e2a71dfec 100644 +index 16c1fa2d89a42..4b5e2a71dfec3 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -155,4 +155,7 @@ @@ -403744,10 +403744,10 @@ index 16c1fa2d89a4..4b5e2a71dfec 100644 2.18.4 -From ba7590d11625e80d5f8d034adbe3ac693ee16fae Mon Sep 17 00:00:00 2001 +From c6911931cbc7268a10c5714e0324a59ac77a32a7 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 7 Apr 2020 10:42:14 +0100 -Subject: [PATCH 0734/1216] media: bcm2835-unicam: Add support for mulitple +Subject: [PATCH 0734/1224] media: bcm2835-unicam: Add support for mulitple device nodes. Move device node specific state out of the device state structure and @@ -403764,7 +403764,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 283 insertions(+), 201 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 8c1b220e6d8c..c19f96ce9d29 100644 +index 8c1b220e6d8c9..c19f96ce9d29d 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -109,7 +109,8 @@ MODULE_PARM_DESC(debug, "Debug level 0-3"); @@ -404833,10 +404833,10 @@ index 8c1b220e6d8c..c19f96ce9d29 100644 2.18.4 -From 4e9b0c978c8db8e37a8d9b6f6e07798d730b88f5 Mon Sep 17 00:00:00 2001 +From dd9fcc1e09641c1673887fead8f94a74991af995 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 16 Apr 2020 11:35:41 +0100 -Subject: [PATCH 0735/1216] media: bcm2835-unicam: Add embedded data node. +Subject: [PATCH 0735/1224] 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 @@ -404848,7 +404848,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 474 insertions(+), 193 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index c19f96ce9d29..27752969c275 100644 +index c19f96ce9d29d..27752969c2755 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -109,8 +109,15 @@ MODULE_PARM_DESC(debug, "Debug level 0-3"); @@ -406007,10 +406007,10 @@ index c19f96ce9d29..27752969c275 100644 2.18.4 -From d61a866bb7f03b5cf32df1210dcafaa734683560 Mon Sep 17 00:00:00 2001 +From abfd7c7ffa28a55d49fefcf8227c837619182ddd Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 2 Apr 2020 16:08:51 +0100 -Subject: [PATCH 0736/1216] media: bcm2835-unicam: Use dummy buffer if none +Subject: [PATCH 0736/1224] media: bcm2835-unicam: Use dummy buffer if none have been queued If no buffer has been queued by a userland application, we use an @@ -406024,7 +406024,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 110 insertions(+), 50 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 27752969c275..62248db04bfa 100644 +index 27752969c2755..62248db04bfaf 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -47,6 +47,7 @@ @@ -406321,10 +406321,10 @@ index 27752969c275..62248db04bfa 100644 2.18.4 -From 796ecd45307645f17031a772166b1942535d24c6 Mon Sep 17 00:00:00 2001 +From 7dbb7ebc7260f7b12b60b5fb7667331d7fefbfee Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Apr 2020 10:46:19 +0100 -Subject: [PATCH 0737/1216] spi: Force CS_HIGH if GPIO descriptors are used +Subject: [PATCH 0737/1224] 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 @@ -406345,7 +406345,7 @@ Signed-off-by: Phil Elwell 1 file changed, 9 insertions(+) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index e1205d72be52..5f6a95c4da6c 100644 +index e1205d72be523..5f6a95c4da6cb 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3115,6 +3115,7 @@ static int __spi_validate_bits_per_word(struct spi_controller *ctlr, @@ -406375,10 +406375,10 @@ index e1205d72be52..5f6a95c4da6c 100644 2.18.4 -From df88826c9b185dcd5e216dbcb0e47b319ab6a644 Mon Sep 17 00:00:00 2001 +From fa64839c0a0f7733cf37319e78016cccc4eb3def Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 10 Mar 2020 14:17:07 +0100 -Subject: [PATCH 0738/1216] media: i2c: imx219: Fix power sequence +Subject: [PATCH 0738/1224] media: i2c: imx219: Fix power sequence Commit ca45448a56659c6df6e0436188e97f6cc65dea8a upstream. @@ -406405,7 +406405,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 17 insertions(+) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index f1effb5a5f66..16010ca1781a 100644 +index f1effb5a5f66a..16010ca1781aa 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -1224,6 +1224,23 @@ static int imx219_probe(struct i2c_client *client) @@ -406436,10 +406436,10 @@ index f1effb5a5f66..16010ca1781a 100644 2.18.4 -From 0c6ea869aef080049669ad0b615ee10846d915c2 Mon Sep 17 00:00:00 2001 +From 485a91d641617943e446d097176e10b8337bb1bb Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 10 Mar 2020 14:17:08 +0100 -Subject: [PATCH 0739/1216] media: i2c: imx219: Add support for RAW8 bit bayer +Subject: [PATCH 0739/1224] media: i2c: imx219: Add support for RAW8 bit bayer format Commit 22da1d56e982151e0bdfafe9de6fe94098a51356 upstream. @@ -406456,7 +406456,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 116 insertions(+), 32 deletions(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index 16010ca1781a..3207487b4c10 100644 +index 16010ca1781aa..3207487b4c103 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -168,15 +168,12 @@ static const struct imx219_reg mode_3280x2464_regs[] = { @@ -406761,10 +406761,10 @@ index 16010ca1781a..3207487b4c10 100644 2.18.4 -From 9adb7bf20ba582dc13dc2b471c8173ac99689370 Mon Sep 17 00:00:00 2001 +From e7a1bdbcd34db7c7f16c449efa57e5a72f24086c Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 10 Mar 2020 14:17:09 +0100 -Subject: [PATCH 0740/1216] media: i2c: imx219: Add support for cropped 640x480 +Subject: [PATCH 0740/1224] media: i2c: imx219: Add support for cropped 640x480 resolution Commit 25130b8ad409d5532f3763bcf891af74f550a70d upstream. @@ -406780,7 +406780,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index 3207487b4c10..cb03bdec1f9c 100644 +index 3207487b4c103..cb03bdec1f9c8 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -54,6 +54,7 @@ @@ -406885,10 +406885,10 @@ index 3207487b4c10..cb03bdec1f9c 100644 2.18.4 -From 3fb6722bb146a39a084e849fe809dfc98b578ed4 Mon Sep 17 00:00:00 2001 +From e09298c4ef991519cbfe9c1091ef6c775c1044cb Mon Sep 17 00:00:00 2001 From: Dafna Hirschfeld Date: Tue, 31 Mar 2020 20:06:30 +0200 -Subject: [PATCH 0741/1216] media: i2c: imx219: Fix a bug in +Subject: [PATCH 0741/1224] media: i2c: imx219: Fix a bug in imx219_enum_frame_size https://patchwork.linuxtv.org/patch/62740/ @@ -406909,7 +406909,7 @@ Reviewed-by: Lad Prabhakar 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index cb03bdec1f9c..86e0564bfb4f 100644 +index cb03bdec1f9c8..86e0564bfb4fd 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -781,7 +781,7 @@ static int imx219_enum_frame_size(struct v4l2_subdev *sd, @@ -406925,10 +406925,10 @@ index cb03bdec1f9c..86e0564bfb4f 100644 2.18.4 -From d78301ff534d330b746ecf686cdae90839ef64a3 Mon Sep 17 00:00:00 2001 +From f9ccb24c3b699f637dd7bb35c717add815c5062d Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 24 Mar 2020 23:13:02 +0200 -Subject: [PATCH 0742/1216] media: bcm2835-unicam: Disable event-related ioctls +Subject: [PATCH 0742/1224] media: bcm2835-unicam: Disable event-related ioctls on metadata node The unicam driver supports both the SOURCE_CHANGE and CTRL events. Both @@ -406943,7 +406943,7 @@ Reviewed-by: Naushir Patuck 1 file changed, 5 insertions(+) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 62248db04bfa..4840aa6c96c4 100644 +index 62248db04bfaf..4840aa6c96c4c 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -2374,6 +2374,11 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node, @@ -406962,10 +406962,10 @@ index 62248db04bfa..4840aa6c96c4 100644 2.18.4 -From d60b024899f1af7cf9bd4dc7d15bbf6243387b19 Mon Sep 17 00:00:00 2001 +From de311d12352530282d384b0da7fc61ceedbff08f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 24 Mar 2020 23:13:02 +0200 -Subject: [PATCH 0743/1216] media: bcm2835-unicam: Add support for the +Subject: [PATCH 0743/1224] media: bcm2835-unicam: Add support for the FRAME_SYNC event The FRAME_SYNC event is useful for userspace image processing algorithms @@ -406981,7 +406981,7 @@ Reviewed-by: Naushir Patuck 1 file changed, 14 insertions(+) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 4840aa6c96c4..2ddac7382fb9 100644 +index 4840aa6c96c4c..2ddac7382fb9e 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -772,6 +772,16 @@ static int unicam_all_nodes_disabled(struct unicam_device *dev) @@ -407023,10 +407023,10 @@ index 4840aa6c96c4..2ddac7382fb9 100644 2.18.4 -From 024cb350d57e28d22fb3a1b370c91df7a938a176 Mon Sep 17 00:00:00 2001 +From abc5585c1db1f9f3e485f1f0d6d3a9faa9c93add Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 17 Apr 2020 16:24:21 +0100 -Subject: [PATCH 0744/1216] configs: Enable CONFIG_ARM_BCM2835_CPUFREQ +Subject: [PATCH 0744/1224] 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. @@ -407038,7 +407038,7 @@ Signed-off-by: popcornmix 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index dac95c734828..14398af7f558 100644 +index dac95c7348288..14398af7f5589 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -55,7 +55,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y @@ -407053,10 +407053,10 @@ index dac95c734828..14398af7f558 100644 2.18.4 -From a6bfd13262e2b0792aca63754b5ecc5936a2e36f Mon Sep 17 00:00:00 2001 +From 4f09e12a235c0ca1330dcd2897324c542e83a1e8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Apr 2020 16:20:55 +0100 -Subject: [PATCH 0745/1216] Revert "firmware: raspberrypi: register clk device" +Subject: [PATCH 0745/1224] Revert "firmware: raspberrypi: register clk device" This reverts commit 91f2cf4a6b2131016b1ae9c9500245f0572112c7. @@ -407072,7 +407072,7 @@ Signed-off-by: Phil Elwell 1 file changed, 10 deletions(-) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index 4f3ab14d275a..dc11a1968e99 100644 +index 4f3ab14d275a2..dc11a1968e99c 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -21,7 +21,6 @@ @@ -407117,10 +407117,10 @@ index 4f3ab14d275a..dc11a1968e99 100644 2.18.4 -From 5ffcce006113802d54e986b8a79474be2e31dc6b Mon Sep 17 00:00:00 2001 +From bfaaf20bdedc49fd6328ff883d16f3235e09dbac Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 12 Mar 2020 14:09:38 +0000 -Subject: [PATCH 0746/1216] media: imx219: Advertise embedded data node on +Subject: [PATCH 0746/1224] media: imx219: Advertise embedded data node on media pad 1 This commit updates the imx219 driver to adverise support for embedded @@ -407138,7 +407138,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 155 insertions(+), 71 deletions(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index 86e0564bfb4f..017ae503cc09 100644 +index 86e0564bfb4fd..017ae503cc09e 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -112,6 +112,16 @@ @@ -407458,10 +407458,10 @@ index 86e0564bfb4f..017ae503cc09 100644 2.18.4 -From 20e416420e2fe41c6ac0fbc585c010ff0ca8d1dd Mon Sep 17 00:00:00 2001 +From ed9a4c077de594f337757241057fe2f0b35738ea Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 11:25:18 +0100 -Subject: [PATCH 0747/1216] dts: bcm2711: EMMC2 can address the whole first GB +Subject: [PATCH 0747/1224] 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 @@ -407479,7 +407479,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 34251ec1b531..b3a00baba962 100644 +index 34251ec1b531d..b3a00baba9628 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -223,7 +223,7 @@ @@ -407495,10 +407495,10 @@ index 34251ec1b531..b3a00baba962 100644 2.18.4 -From b9edb603d0fe6384f95b084bf3febc5eb0c148e9 Mon Sep 17 00:00:00 2001 +From 2853ee6b792d2ce94a94608983c8af0c0d24fbcd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 22:18:52 +0100 -Subject: [PATCH 0748/1216] driver: char: rpivid: Remove legacy name support +Subject: [PATCH 0748/1224] driver: char: rpivid: Remove legacy name support Signed-off-by: Phil Elwell --- @@ -407506,7 +407506,7 @@ Signed-off-by: Phil Elwell 1 file changed, 22 deletions(-) diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c -index fbf3d4f3fe0c..5f4c91924ec1 100644 +index fbf3d4f3fe0cb..5f4c91924ec16 100644 --- a/drivers/char/broadcom/rpivid-mem.c +++ b/drivers/char/broadcom/rpivid-mem.c @@ -193,32 +193,11 @@ static int rpivid_mem_probe(struct platform_device *pdev) @@ -407554,10 +407554,10 @@ index fbf3d4f3fe0c..5f4c91924ec1 100644 2.18.4 -From a3496d7bf1fdcd22ed74ba2398070147b7a954cc Mon Sep 17 00:00:00 2001 +From 8ac6eb3e73feaf1ebb90af7ef00b13c83dd80622 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Apr 2020 11:30:23 +0100 -Subject: [PATCH 0749/1216] driver: char: rpivid: Don't map more than wanted +Subject: [PATCH 0749/1224] 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. @@ -407568,7 +407568,7 @@ Signed-off-by: Phil Elwell 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c -index 5f4c91924ec1..9f38083f4cb6 100644 +index 5f4c91924ec16..9f38083f4cb65 100644 --- a/drivers/char/broadcom/rpivid-mem.c +++ b/drivers/char/broadcom/rpivid-mem.c @@ -100,6 +100,7 @@ static int rpivid_mem_mmap(struct file *file, struct vm_area_struct *vma) @@ -407611,10 +407611,10 @@ index 5f4c91924ec1..9f38083f4cb6 100644 2.18.4 -From 527545896aa2b5166c2ce46a763b2f3c5faed139 Mon Sep 17 00:00:00 2001 +From 355ff3607dea7dd07c3ba1f3b353e55640b3a993 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 12:43:22 +0100 -Subject: [PATCH 0750/1216] defconfig: Enable I2C_MUX_PINCTRL in all Pi configs +Subject: [PATCH 0750/1224] 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. @@ -407631,7 +407631,7 @@ Signed-off-by: Dave Stevenson 5 files changed, 8 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index e5168c0359b2..35ee59842466 100644 +index e5168c0359b23..35ee59842466c 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -655,6 +655,7 @@ CONFIG_I2C_CHARDEV=m @@ -407643,7 +407643,7 @@ index e5168c0359b2..35ee59842466 100644 CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 19a8ec28f8a4..27b906723ba6 100644 +index 19a8ec28f8a45..27b906723ba66 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -628,6 +628,7 @@ CONFIG_I2C_CHARDEV=m @@ -407655,7 +407655,7 @@ index 19a8ec28f8a4..27b906723ba6 100644 CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 543948a9499d..892840ab9370 100644 +index 543948a9499d7..892840ab9370e 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -648,6 +648,7 @@ CONFIG_I2C_CHARDEV=m @@ -407667,7 +407667,7 @@ index 543948a9499d..892840ab9370 100644 CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 14398af7f558..1389bdc58808 100644 +index 14398af7f5589..1389bdc588084 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -662,6 +662,7 @@ CONFIG_I2C_CHARDEV=m @@ -407679,7 +407679,7 @@ index 14398af7f558..1389bdc58808 100644 CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 34aa78d5d814..3a39acd6d0ab 100644 +index 34aa78d5d814d..3a39acd6d0abe 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -592,6 +592,10 @@ CONFIG_TCG_TPM=m @@ -407697,10 +407697,10 @@ index 34aa78d5d814..3a39acd6d0ab 100644 2.18.4 -From df60f55454a7573257f0ec06acaf31eda859a9c3 Mon Sep 17 00:00:00 2001 +From fab45fee083feaae5c7bbb6650d2d12d60d65739 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 12:46:13 +0100 -Subject: [PATCH 0751/1216] dt: Implement an I2C pinctrl mux for BSC0. +Subject: [PATCH 0751/1224] 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 @@ -407732,7 +407732,7 @@ Signed-off-by: Dave Stevenson create mode 100644 arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts -index b800699a03fb..0e137d85897b 100644 +index b800699a03fbd..0e137d85897b6 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts @@ -4,6 +4,7 @@ @@ -407762,7 +407762,7 @@ index b800699a03fb..0e137d85897b 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts -index ef47775692ce..47c093364683 100644 +index ef47775692cea..47c093364683b 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts @@ -4,6 +4,7 @@ @@ -407792,7 +407792,7 @@ index ef47775692ce..47c093364683 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts -index 64809aee5c0c..5dcdf8888ec1 100644 +index 64809aee5c0ca..5dcdf8888ec12 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts @@ -3,6 +3,7 @@ @@ -407822,7 +407822,7 @@ index 64809aee5c0c..5dcdf8888ec1 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts -index 92f780a3e557..af883bf02ec5 100644 +index 92f780a3e5577..af883bf02ec5a 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -3,6 +3,7 @@ @@ -407852,7 +407852,7 @@ index 92f780a3e557..af883bf02ec5 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts -index 2909ddeafc83..0e61e8269efc 100644 +index 2909ddeafc833..0e61e8269efc8 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -3,6 +3,7 @@ @@ -407882,7 +407882,7 @@ index 2909ddeafc83..0e61e8269efc 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts -index 4d2262f8d376..77678a3d7ef9 100644 +index 4d2262f8d376b..77678a3d7ef91 100644 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts @@ -4,6 +4,7 @@ @@ -407912,7 +407912,7 @@ index 4d2262f8d376..77678a3d7ef9 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi -index be11a4436279..2af64cd43729 100644 +index be11a44362799..2af64cd43729b 100644 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi @@ -21,6 +21,7 @@ @@ -407945,7 +407945,7 @@ index be11a4436279..2af64cd43729 100644 }; diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts -index 65a6f4d06866..dd7e1897ea45 100644 +index 65a6f4d06866f..dd7e1897ea456 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts @@ -4,6 +4,7 @@ @@ -407975,7 +407975,7 @@ index 65a6f4d06866..dd7e1897ea45 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -index 0c36c64aaeef..f49738688187 100644 +index 0c36c64aaeeff..f497386881870 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -4,6 +4,7 @@ @@ -408005,7 +408005,7 @@ index 0c36c64aaeef..f49738688187 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts -index 261827cdb957..112eb73f2cc1 100644 +index 261827cdb957c..112eb73f2cc1f 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -4,6 +4,7 @@ @@ -408035,7 +408035,7 @@ index 261827cdb957..112eb73f2cc1 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts -index addebe448e32..88f7fe53b97f 100644 +index addebe448e32c..88f7fe53b97f2 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -4,7 +4,7 @@ @@ -408066,7 +408066,7 @@ index addebe448e32..88f7fe53b97f 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index b3a00baba962..7467817bfe7d 100644 +index b3a00baba9628..7467817bfe7d1 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -192,6 +192,7 @@ @@ -408089,7 +408089,7 @@ index b3a00baba962..7467817bfe7d 100644 }; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 72cbd23c9796..b34a65ff6316 100644 +index 72cbd23c9796d..b34a65ff63163 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -986,7 +986,7 @@ @@ -408103,7 +408103,7 @@ index 72cbd23c9796..b34a65ff6316 100644 }; diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi new file mode 100644 -index 000000000000..38f0074bce3f +index 0000000000000..38f0074bce3ff --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi @@ -0,0 +1,4 @@ @@ -408113,7 +408113,7 @@ index 000000000000..38f0074bce3f +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi new file mode 100644 -index 000000000000..119946d878db +index 0000000000000..119946d878dbf --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi @@ -0,0 +1,4 @@ @@ -408122,7 +408122,7 @@ index 000000000000..119946d878db + pinctrl-1 = <&i2c0_gpio44>; +}; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index adb59ca3df6c..4426f9e6ba92 100644 +index adb59ca3df6c6..4426f9e6ba92c 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -340,7 +340,7 @@ @@ -408169,10 +408169,10 @@ index adb59ca3df6c..4426f9e6ba92 100644 2.18.4 -From 87c79e980b614f496d40492d4f76f67194cd852d Mon Sep 17 00:00:00 2001 +From 70442d8efad103a49fe2271785f2656e507b6c04 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 15:04:14 +0100 -Subject: [PATCH 0752/1216] dtoverlays: Update CSI overlays to use i2c_csi_dsi +Subject: [PATCH 0752/1224] 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. @@ -408189,7 +408189,7 @@ Signed-off-by: Dave Stevenson 6 files changed, 47 insertions(+), 163 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 1df13b1fbc51..eaf26f19392e 100644 +index 1df13b1fbc513..eaf26f19392e5 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -331,22 +331,14 @@ Info: Analog Devices ADV7282M analogue video to CSI2 bridge. @@ -408276,7 +408276,7 @@ index 1df13b1fbc51..eaf26f19392e 100644 Name: tc358743-audio Info: Used in combination with the tc358743-fast overlay to route the audio diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts -index 197c8f41a265..238acd2bee72 100644 +index 197c8f41a2658..238acd2bee723 100644 --- a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts @@ -7,7 +7,7 @@ @@ -408332,7 +408332,7 @@ index 197c8f41a265..238acd2bee72 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts -index b9e3d9e5730d..5fd39060ee87 100644 +index b9e3d9e5730d4..5fd39060ee87c 100644 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts @@ -9,7 +9,7 @@ @@ -408407,7 +408407,7 @@ index b9e3d9e5730d..5fd39060ee87 100644 - }; }; diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts -index b9006715a539..3fc7a9e23019 100644 +index b9006715a5397..3fc7a9e23019a 100644 --- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts @@ -7,7 +7,7 @@ @@ -408470,7 +408470,7 @@ index b9006715a539..3fc7a9e23019 100644 - }; }; diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts -index 5266d4b8758d..34aa9f386178 100644 +index 5266d4b8758d3..34aa9f3861782 100644 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts @@ -7,7 +7,7 @@ @@ -408534,7 +408534,7 @@ index 5266d4b8758d..34aa9f386178 100644 - }; }; diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts -index 2a1a3a80de49..f8c059827234 100644 +index 2a1a3a80de493..f8c059827234d 100644 --- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts @@ -7,7 +7,7 @@ @@ -408610,10 +408610,10 @@ index 2a1a3a80de49..f8c059827234 100644 2.18.4 -From 0eb5339a1e9304a1849f079b6f5e457994e5543f Mon Sep 17 00:00:00 2001 +From dff2aa5ac5f3328cd15c9311c6457fb72f6c4fee Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 9 Apr 2020 17:26:13 +0100 -Subject: [PATCH 0753/1216] dt: Update all mainline bcm283x dt files for i2c0 +Subject: [PATCH 0753/1224] 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 @@ -408640,7 +408640,7 @@ Signed-off-by: Dave Stevenson 14 files changed, 78 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts -index 6c8ce39833bf..e82e75ec342a 100644 +index 6c8ce39833bf6..e82e75ec342a3 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -126,3 +126,8 @@ @@ -408653,7 +408653,7 @@ index 6c8ce39833bf..e82e75ec342a 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts -index 17fdd48346ff..d400f88127db 100644 +index 17fdd48346ffb..d400f88127db0 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -121,3 +121,10 @@ @@ -408668,7 +408668,7 @@ index 17fdd48346ff..d400f88127db 100644 + pinctrl-1 = <&i2c0_gpio0>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts -index b0355c229cdc..57ab4d443493 100644 +index b0355c229cdc2..57ab4d4434939 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -128,3 +128,8 @@ @@ -408681,7 +408681,7 @@ index b0355c229cdc..57ab4d443493 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts -index 33b3b5c02521..cb08d5ac0412 100644 +index 33b3b5c025219..cb08d5ac0412c 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -121,3 +121,10 @@ @@ -408696,7 +408696,7 @@ index 33b3b5c02521..cb08d5ac0412 100644 + pinctrl-1 = <&i2c0_gpio0>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts -index 2b69957e0113..d5b4d9d20424 100644 +index 2b69957e0113e..d5b4d9d204248 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -116,3 +116,10 @@ @@ -408711,7 +408711,7 @@ index 2b69957e0113..d5b4d9d20424 100644 + pinctrl-1 = <&i2c0_gpio0>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts -index a75c882e6575..95564c93a645 100644 +index a75c882e65751..95564c93a6452 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts @@ -95,3 +95,8 @@ @@ -408724,7 +408724,7 @@ index a75c882e6575..95564c93a645 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts -index f65448c01e31..7de8af65c142 100644 +index f65448c01e317..7de8af65c142b 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -149,3 +149,8 @@ @@ -408737,7 +408737,7 @@ index f65448c01e31..7de8af65c142 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts -index 6dd93c6f4966..cad16a2df245 100644 +index 6dd93c6f49666..cad16a2df2455 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -117,3 +117,8 @@ @@ -408750,7 +408750,7 @@ index 6dd93c6f4966..cad16a2df245 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index fd2c766e0f71..c011b7914688 100644 +index fd2c766e0f710..c011b7914688b 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -46,13 +46,17 @@ @@ -408775,7 +408775,7 @@ index fd2c766e0f71..c011b7914688 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_gpio2>; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts -index 0455a680394a..f62eff03dae1 100644 +index 0455a680394a2..f62eff03dae10 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -128,3 +128,8 @@ @@ -408788,7 +408788,7 @@ index 0455a680394a..f62eff03dae1 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts -index 66ab35eccba7..66ba24e9ff37 100644 +index 66ab35eccba7b..66ba24e9ff375 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts @@ -176,3 +176,8 @@ @@ -408801,7 +408801,7 @@ index 66ab35eccba7..66ba24e9ff37 100644 + pinctrl-1 = <&i2c0_gpio44>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts -index 74ed6d047807..63f4592ba7dd 100644 +index 74ed6d0478070..63f4592ba7dd6 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -179,3 +179,8 @@ @@ -408814,7 +408814,7 @@ index 74ed6d047807..63f4592ba7dd 100644 + pinctrl-1 = <&i2c0_gpio44>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index 054ecaa355c9..5474f8ab894f 100644 +index 054ecaa355c9a..5474f8ab894fa 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -174,3 +174,8 @@ @@ -408827,7 +408827,7 @@ index 054ecaa355c9..5474f8ab894f 100644 + pinctrl-1 = <&i2c0_gpio44>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts -index 588d9411ceb6..dde209ade51b 100644 +index 588d9411ceb61..dde209ade51b9 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts @@ -94,3 +94,8 @@ @@ -408843,10 +408843,10 @@ index 588d9411ceb6..dde209ade51b 100644 2.18.4 -From 1e8d33c6c9bfe69a2b72611498aa1586f8c8d945 Mon Sep 17 00:00:00 2001 +From 87997329027f536fb23a3a3c39e06e92e15557f9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Apr 2020 17:34:27 +0100 -Subject: [PATCH 0754/1216] ARM: dts: Create bcm2708-rpi-b-rev1.dts +Subject: [PATCH 0754/1224] 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. @@ -408873,7 +408873,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 54f3c1d1e9f5..990457a51843 100644 +index 54f3c1d1e9f58..990457a51843b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -2,6 +2,7 @@ @@ -408886,7 +408886,7 @@ index 54f3c1d1e9f5..990457a51843 100644 bcm2708-rpi-zero.dtb \ diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts new file mode 100644 -index 000000000000..7b554b465b27 +index 0000000000000..7b554b465b277 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts @@ -0,0 +1,127 @@ @@ -409018,7 +409018,7 @@ index 000000000000..7b554b465b27 + }; +}; diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi -index 2af64cd43729..e3d90b4262f1 100644 +index 2af64cd43729b..e3d90b4262f1f 100644 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi @@ -110,6 +110,10 @@ @@ -409036,10 +409036,10 @@ index 2af64cd43729..e3d90b4262f1 100644 2.18.4 -From c11f773125c518c4f3b688399ff5bc07bae30835 Mon Sep 17 00:00:00 2001 +From e260d801dafc72b17fc6a0d7d0218ff68ae12b6b Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Wed, 22 Apr 2020 13:40:47 +0300 -Subject: [PATCH 0755/1216] dts: bcm2711: set #size-cells = <2> +Subject: [PATCH 0755/1224] dts: bcm2711: set #size-cells = <2> There already is one 4 GiB range, and one more will appear when high peripheral mode is enabled. @@ -409051,7 +409051,7 @@ Signed-off-by: Hristo Venev 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 4bc44b2ad211..84bf0cfc1c56 100644 +index 4bc44b2ad211f..84bf0cfc1c566 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -65,17 +65,16 @@ @@ -409126,7 +409126,7 @@ index 4bc44b2ad211..84bf0cfc1c56 100644 }; }; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index b34a65ff6316..41698e7f5e24 100644 +index b34a65ff63163..41698e7f5e243 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -445,14 +445,14 @@ @@ -409161,10 +409161,10 @@ index b34a65ff6316..41698e7f5e24 100644 2.18.4 -From f15772ab9895241e39d06ba92cd9249d77b0a7bd Mon Sep 17 00:00:00 2001 +From 3eaeaae52d65686506c81f746ce4f80574376317 Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Wed, 22 Apr 2020 16:34:59 +0300 -Subject: [PATCH 0756/1216] dts: bcm2711: add "High Peripheral" mode overlay +Subject: [PATCH 0756/1224] dts: bcm2711: add "High Peripheral" mode overlay The following addresses change: @@ -409186,7 +409186,7 @@ Signed-off-by: Hristo Venev create mode 100644 arch/arm/boot/dts/overlays/highperi-overlay.dts diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 84bf0cfc1c56..2c55c78bd7cb 100644 +index 84bf0cfc1c566..2c55c78bd7cb3 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -16,7 +16,7 @@ @@ -409199,7 +409199,7 @@ index 84bf0cfc1c56..2c55c78bd7cb 100644 #address-cells = <1>; #size-cells = <2>; diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 96f96c98561e..c41abba3c3fb 100644 +index 96f96c98561e5..c41abba3c3fb2 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -64,6 +64,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -409211,7 +409211,7 @@ index 96f96c98561e..c41abba3c3fb 100644 hy28b.dtbo \ hy28b-2017.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index eaf26f19392e..ece3d3143643 100644 +index eaf26f19392e5..ece3d3143643b 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1019,6 +1019,12 @@ Load: dtoverlay=hifiberry-digi-pro @@ -409229,7 +409229,7 @@ index eaf26f19392e..ece3d3143643 100644 Default values match Texy's display shield diff --git a/arch/arm/boot/dts/overlays/highperi-overlay.dts b/arch/arm/boot/dts/overlays/highperi-overlay.dts new file mode 100644 -index 000000000000..4dbd5b108d57 +index 0000000000000..4dbd5b108d57d --- /dev/null +++ b/arch/arm/boot/dts/overlays/highperi-overlay.dts @@ -0,0 +1,64 @@ @@ -409298,7 +409298,7 @@ index 000000000000..4dbd5b108d57 + }; +}; diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts -index a20c0e079cc8..1287964c15bf 100644 +index a20c0e079cc86..1287964c15bf1 100644 --- a/arch/arm/boot/dts/overlays/overlay_map.dts +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -5,6 +5,10 @@ @@ -409316,10 +409316,10 @@ index a20c0e079cc8..1287964c15bf 100644 2.18.4 -From eb01f92307d3099e546bba6fa093b28127411a46 Mon Sep 17 00:00:00 2001 +From 502089322de346fab30d2750b00b755b9b99d3a8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 13:41:10 +0100 -Subject: [PATCH 0757/1216] Revert "spi: spidev: Fix CS polarity if GPIO +Subject: [PATCH 0757/1224] Revert "spi: spidev: Fix CS polarity if GPIO descriptors are used" This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28. @@ -409328,7 +409328,7 @@ This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28. 1 file changed, 5 deletions(-) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index 736af270d7a1..d41630b23968 100644 +index 736af270d7a10..d41630b23968e 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -399,7 +399,6 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) @@ -409354,10 +409354,10 @@ index 736af270d7a1..d41630b23968 100644 2.18.4 -From fb80f488c4246d2ee7345593810bd3ce1b638c2d Mon Sep 17 00:00:00 2001 +From 54b30ee355e7990c7b6ccaf92aad3f24a9a9b442 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Apr 2020 13:30:49 +0100 -Subject: [PATCH 0758/1216] spi: use_gpio_descriptor fixup moved to spi_setup +Subject: [PATCH 0758/1224] 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 @@ -409392,7 +409392,7 @@ Signed-off-by: Phil Elwell 1 file changed, 9 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 5f6a95c4da6c..b067ba232e39 100644 +index 5f6a95c4da6cb..b067ba232e39c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1793,15 +1793,6 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, @@ -409415,10 +409415,10 @@ index 5f6a95c4da6c..b067ba232e39 100644 2.18.4 -From 6ae3c97d0e4be6ac70df7cfb2a54c3d89eebeaff Mon Sep 17 00:00:00 2001 +From 17548a42632bf68ac011d712b7e6a04c59146fae Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 24 Apr 2020 15:17:06 +0100 -Subject: [PATCH 0759/1216] overlays: rpivid-v4l2 also needs size-cells = 2 +Subject: [PATCH 0759/1224] overlays: rpivid-v4l2 also needs size-cells = 2 Fixes: "dts: bcm2711: set #size-cells = <2>" @@ -409428,7 +409428,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts -index e6ece0570e90..cd8d96bb5715 100644 +index e6ece0570e90d..cd8d96bb57153 100644 --- a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts @@ -13,11 +13,12 @@ @@ -409451,10 +409451,10 @@ index e6ece0570e90..cd8d96bb5715 100644 2.18.4 -From 3f4519a1ae3974ae478d5b4272524ccd07404ccc Mon Sep 17 00:00:00 2001 +From bc6e487aafd74396d6989eb23db3e3ca1aa2d77f Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Apr 2020 16:26:03 +0100 -Subject: [PATCH 0760/1216] media: bcm2835-unicam: Re-fetch mbus code from +Subject: [PATCH 0760/1224] 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 @@ -409467,7 +409467,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 2ddac7382fb9..2e022c5e1cfd 100644 +index 2ddac7382fb9e..2e022c5e1cfd1 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -967,11 +967,30 @@ static int unicam_enum_fmt_vid_cap(struct file *file, void *priv, @@ -409506,10 +409506,10 @@ index 2ddac7382fb9..2e022c5e1cfd 100644 2.18.4 -From 5f61c9edc3c7e24b5d6f99659994e61786aee5f4 Mon Sep 17 00:00:00 2001 +From f683e0ecc2204772bb171f7c03659280d50d4a1c Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:18:15 +0100 -Subject: [PATCH 0761/1216] uapi: bcm2835-isp: Add bcm2835-isp uapi header file +Subject: [PATCH 0761/1224] 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. @@ -409522,7 +409522,7 @@ Signed-off-by: Naushir Patuck diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h new file mode 100644 -index 000000000000..e7afc367fd76 +index 0000000000000..e7afc367fd76c --- /dev/null +++ b/include/uapi/linux/bcm2835-isp.h @@ -0,0 +1,320 @@ @@ -409850,10 +409850,10 @@ index 000000000000..e7afc367fd76 2.18.4 -From c278e436f44fa958855a571cdd5ac4b94875cafc Mon Sep 17 00:00:00 2001 +From 8e0491d7739df7b3fa048ebda03fd0a974e9dab1 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:20:26 +0100 -Subject: [PATCH 0762/1216] media: uapi: v4l2-core: Add ISP statistics output +Subject: [PATCH 0762/1224] media: uapi: v4l2-core: Add ISP statistics output V4L2 fourcc type Add V4L2_META_FMT_BCM2835_ISP_STATS V4L2 format type. @@ -409871,7 +409871,7 @@ Signed-off-by: Naushir Patuck create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-bcm2835-isp-stats.rst diff --git a/Documentation/media/uapi/v4l/meta-formats.rst b/Documentation/media/uapi/v4l/meta-formats.rst -index 3d937720f0b9..66245b369c36 100644 +index 3d937720f0b9f..66245b369c36a 100644 --- a/Documentation/media/uapi/v4l/meta-formats.rst +++ b/Documentation/media/uapi/v4l/meta-formats.rst @@ -19,6 +19,7 @@ These formats are used for the :ref:`metadata` interface only. @@ -409884,7 +409884,7 @@ index 3d937720f0b9..66245b369c36 100644 pixfmt-meta-sensor-data diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-bcm2835-isp-stats.rst b/Documentation/media/uapi/v4l/pixfmt-meta-bcm2835-isp-stats.rst new file mode 100644 -index 000000000000..f974774c8252 +index 0000000000000..f974774c82527 --- /dev/null +++ b/Documentation/media/uapi/v4l/pixfmt-meta-bcm2835-isp-stats.rst @@ -0,0 +1,41 @@ @@ -409930,7 +409930,7 @@ index 000000000000..f974774c8252 + bcm2835_isp_stats_focus bcm2835_isp_stats + diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 8878b9abd034..31d3f50a5040 100644 +index 8878b9abd0346..31d3f50a50408 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1333,6 +1333,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -409942,7 +409942,7 @@ index 8878b9abd034..31d3f50a5040 100644 default: /* Compressed formats */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index d8320844d188..10e146cd092a 100644 +index d8320844d188c..10e146cd092aa 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -769,6 +769,7 @@ struct v4l2_pix_format { @@ -409957,10 +409957,10 @@ index d8320844d188..10e146cd092a 100644 2.18.4 -From 4e3a49c8685ac1b0798dc19c1486ad0c41a74bc9 Mon Sep 17 00:00:00 2001 +From a65ef79a6c155755f62d71936cb2e7812a4766f5 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 21 Apr 2020 15:06:19 +0100 -Subject: [PATCH 0763/1216] media: uapi: v4l-ctrls: Add CID base for the +Subject: [PATCH 0763/1224] media: uapi: v4l-ctrls: Add CID base for the bcm2835-isp driver We are reserving controls for the new bcm2835-isp driver. @@ -409975,7 +409975,7 @@ Signed-off-by: Naushir Patuck diff --git a/Documentation/media/v4l-drivers/bcm2835-isp.rst b/Documentation/media/v4l-drivers/bcm2835-isp.rst new file mode 100644 -index 000000000000..e1c19f78435e +index 0000000000000..e1c19f78435e6 --- /dev/null +++ b/Documentation/media/v4l-drivers/bcm2835-isp.rst @@ -0,0 +1,127 @@ @@ -410107,7 +410107,7 @@ index 000000000000..e1c19f78435e + bcm2835_isp_denoise bcm2835_isp_sharpen + bcm2835_isp_dpc_mode bcm2835_isp_dpc diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst -index c4c78a28654c..bb05f4cf8623 100644 +index c4c78a28654c0..bb05f4cf86238 100644 --- a/Documentation/media/v4l-drivers/index.rst +++ b/Documentation/media/v4l-drivers/index.rst @@ -35,6 +35,7 @@ For more details see the file COPYING in the source distribution of Linux. @@ -410119,7 +410119,7 @@ index c4c78a28654c..bb05f4cf8623 100644 cafe_ccic cpia2 diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h -index d21ac7545626..660574b1b4e7 100644 +index d21ac75456263..660574b1b4e7a 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -192,6 +192,10 @@ enum v4l2_colorfx { @@ -410137,10 +410137,10 @@ index d21ac7545626..660574b1b4e7 100644 2.18.4 -From 7b70d001871f8c1a65e5d658ace556db1408b7d8 Mon Sep 17 00:00:00 2001 +From 3375d5fb25ab3555be31b5a954bbbe77b755cf40 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:12:24 +0100 -Subject: [PATCH 0764/1216] staging: mmal-vchiq: Fix formatting errors in +Subject: [PATCH 0764/1224] staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h No functional changes in this commit. @@ -410155,7 +410155,7 @@ Signed-off-by: Naushir Patuck 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -index 4317bf595477..e69ec072c2c7 100644 +index 4317bf5954774..e69ec072c2c77 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -1523,7 +1523,7 @@ static int get_num_cameras(struct vchiq_mmal_instance *instance, @@ -410168,7 +410168,7 @@ index 4317bf595477..e69ec072c2c7 100644 int i; diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h -index d3d7828d1e56..27bafc5f01d2 100644 +index d3d7828d1e56c..27bafc5f01d2b 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h @@ -23,21 +23,21 @@ @@ -410261,10 +410261,10 @@ index d3d7828d1e56..27bafc5f01d2 100644 2.18.4 -From caf71e67c7728a5d87cb9f6459dd1eccc86f4237 Mon Sep 17 00:00:00 2001 +From 3aa180d6e9f609c0ec9324c6dfd3ee2ef75560fd Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 23 Apr 2020 10:17:37 +0100 -Subject: [PATCH 0765/1216] staging: vc04_services: ISP: Add a more complex ISP +Subject: [PATCH 0765/1224] staging: vc04_services: ISP: Add a more complex ISP processing component Driver for the BCM2835 ISP hardware block. This driver uses the MMAL @@ -410294,7 +410294,7 @@ Signed-off-by: Naushir Patuck create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h diff --git a/MAINTAINERS b/MAINTAINERS -index ac0d4c2eeedf..4745f2252127 100644 +index ac0d4c2eeedfe..4745f22521277 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3212,6 +3212,15 @@ S: Maintained @@ -410314,7 +410314,7 @@ index ac0d4c2eeedf..4745f2252127 100644 M: Hauke Mehrtens M: Rafał Miłecki diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig -index 0db67350a1f1..33146fabc59e 100644 +index 0db67350a1f17..33146fabc59ec 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -25,6 +25,7 @@ source "drivers/staging/vc04_services/bcm2835-camera/Kconfig" @@ -410326,7 +410326,7 @@ index 0db67350a1f1..33146fabc59e 100644 endif diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile -index 709185d002e1..a1d111ba3901 100644 +index 709185d002e11..a1d111ba3901d 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-camera/ @@ -410339,7 +410339,7 @@ index 709185d002e1..a1d111ba3901 100644 diff --git a/drivers/staging/vc04_services/bcm2835-isp/Kconfig b/drivers/staging/vc04_services/bcm2835-isp/Kconfig new file mode 100644 -index 000000000000..71b14acc297e +index 0000000000000..71b14acc297e0 --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/Kconfig @@ -0,0 +1,14 @@ @@ -410359,7 +410359,7 @@ index 000000000000..71b14acc297e + will be called bcm2835-isp. diff --git a/drivers/staging/vc04_services/bcm2835-isp/Makefile b/drivers/staging/vc04_services/bcm2835-isp/Makefile new file mode 100644 -index 000000000000..42d3081d342f +index 0000000000000..42d3081d342f4 --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/Makefile @@ -0,0 +1,8 @@ @@ -410373,7 +410373,7 @@ index 000000000000..42d3081d342f + -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c new file mode 100644 -index 000000000000..6056218af679 +index 0000000000000..6056218af679f --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -0,0 +1,1627 @@ @@ -412006,7 +412006,7 @@ index 000000000000..6056218af679 +MODULE_ALIAS("platform:bcm2835-isp"); diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h new file mode 100644 -index 000000000000..cfbb1063aad1 +index 0000000000000..cfbb1063aad1c --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h @@ -0,0 +1,67 @@ @@ -412079,7 +412079,7 @@ index 000000000000..cfbb1063aad1 +#endif diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h new file mode 100644 -index 000000000000..ded2be584f95 +index 0000000000000..ded2be584f95f --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h @@ -0,0 +1,272 @@ @@ -412356,7 +412356,7 @@ index 000000000000..ded2be584f95 + +#endif diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h -index 44ba91aa6d47..8d904fcce388 100644 +index 44ba91aa6d479..8d904fcce3889 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h @@ -100,6 +100,10 @@ @@ -412371,7 +412371,7 @@ index 44ba91aa6d47..8d904fcce388 100644 /** \name Pre-defined audio encodings */ diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h -index 27bafc5f01d2..9c752db45565 100644 +index 27bafc5f01d2b..9c752db455658 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h @@ -221,6 +221,62 @@ enum mmal_parameter_camera_type { @@ -412545,10 +412545,10 @@ index 27bafc5f01d2..9c752db45565 100644 2.18.4 -From bf1ac68b740ecfdf6731de3fdf6725ef181a833a Mon Sep 17 00:00:00 2001 +From 769a9bfc30ca8b62208f8e9b98c73b2b7603404a Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 22 Apr 2020 08:32:32 +0100 -Subject: [PATCH 0766/1216] staging: vchiq: Load bcm2835_isp driver from vchiq +Subject: [PATCH 0766/1224] 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. @@ -412559,7 +412559,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 3 insertions(+) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index a3fcb1830995..d01c2d424310 100644 +index a3fcb1830995c..d01c2d4243104 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -142,6 +142,7 @@ static struct platform_device *bcm2835_camera; @@ -412590,10 +412590,10 @@ index a3fcb1830995..d01c2d424310 100644 2.18.4 -From d378742f20c085f1a7dc3ac5544f13147d2af717 Mon Sep 17 00:00:00 2001 +From afbe3e60ee7a9f4f49f9f85f29849558a5ce503d Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 20 Jan 2020 12:58:06 +0000 -Subject: [PATCH 0767/1216] configs: Add VIDEO_ISP_BCM2835 to all Pi defconfigs +Subject: [PATCH 0767/1224] configs: Add VIDEO_ISP_BCM2835 to all Pi defconfigs This commit enables the bcm2835-isp driver in the following defconfigs: @@ -412613,7 +412613,7 @@ Signed-off-by: Naushir Patuck 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 35ee59842466..135c2c2ae292 100644 +index 35ee59842466c..135c2c2ae292f 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1281,6 +1281,7 @@ CONFIG_BCM2835_VCHIQ=y @@ -412625,7 +412625,7 @@ index 35ee59842466..135c2c2ae292 100644 CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 27b906723ba6..5e75a34d9257 100644 +index 27b906723ba66..5e75a34d9257d 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1280,6 +1280,7 @@ CONFIG_BCM2835_VCHIQ=y @@ -412637,7 +412637,7 @@ index 27b906723ba6..5e75a34d9257 100644 CONFIG_MAILBOX=y CONFIG_BCM2835_MBOX=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 892840ab9370..560f2e5a9a97 100644 +index 892840ab9370e..560f2e5a9a974 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1291,6 +1291,7 @@ CONFIG_BCM2835_VCHIQ=y @@ -412649,7 +412649,7 @@ index 892840ab9370..560f2e5a9a97 100644 CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 1389bdc58808..fcb3c1e19ac4 100644 +index 1389bdc588084..fcb3c1e19ac4d 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1307,6 +1307,7 @@ CONFIG_BCM2835_VCHIQ=y @@ -412661,7 +412661,7 @@ index 1389bdc58808..fcb3c1e19ac4 100644 CONFIG_MAILBOX=y CONFIG_BCM2835_MBOX=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 3a39acd6d0ab..bb3b687406ab 100644 +index 3a39acd6d0abe..bb3b687406ab0 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1121,6 +1121,7 @@ CONFIG_FB_TFT_WATTEROTT=m @@ -412676,10 +412676,10 @@ index 3a39acd6d0ab..bb3b687406ab 100644 2.18.4 -From f58625537b379035b7c49acdaf7fd2a496bb2aa5 Mon Sep 17 00:00:00 2001 +From 56249145406ca0dcf71de3409e1f5a8b4c841137 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Apr 2020 17:35:07 +0100 -Subject: [PATCH 0768/1216] vc4_hvs: Mark core clock as optional +Subject: [PATCH 0768/1224] vc4_hvs: Mark core clock as optional This isn't required on Pi3, so don't treat as an error @@ -412689,7 +412689,7 @@ Signed-off-by: popcornmix 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c -index 59198019aa1d..d76521be2c0d 100644 +index 59198019aa1d9..d76521be2c0d0 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -240,7 +240,7 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data) @@ -412705,10 +412705,10 @@ index 59198019aa1d..d76521be2c0d 100644 2.18.4 -From 45b447d549fc7acff9c13bd5a924072f8bc8d3e8 Mon Sep 17 00:00:00 2001 +From 4eb3679fa90e0ff1739b9b33e90d03fa07af1d09 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Apr 2020 19:07:50 +0100 -Subject: [PATCH 0769/1216] vc4_hdmi: BCM2835 requires a fixed hsm clock for +Subject: [PATCH 0769/1224] vc4_hdmi: BCM2835 requires a fixed hsm clock for CEC to work Signed-off-by: popcornmix @@ -412718,7 +412718,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 2ebaea7e2a7b..2919549b227f 100644 +index 2ebaea7e2a7bf..2919549b227f6 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) @@ -412789,7 +412789,7 @@ index 2ebaea7e2a7b..2919549b227f 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 9b80f9401d58..95bed29531b9 100644 +index 9b80f9401d583..95bed29531b9d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -92,6 +92,9 @@ struct vc4_hdmi_variant { @@ -412806,10 +412806,10 @@ index 9b80f9401d58..95bed29531b9 100644 2.18.4 -From 1c16accaa9952332bdac2903b02d40027feb7419 Mon Sep 17 00:00:00 2001 +From 2d7644ad478abc5112c8c6e11bb3eddd196e8834 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 29 Apr 2020 13:41:20 +0100 -Subject: [PATCH 0770/1216] configs: Enable CONFIG_DRM_VC4_HDMI_CEC +Subject: [PATCH 0770/1224] configs: Enable CONFIG_DRM_VC4_HDMI_CEC Signed-off-by: popcornmix --- @@ -412818,7 +412818,7 @@ Signed-off-by: popcornmix 2 files changed, 2 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 135c2c2ae292..e56f5bb9a54e 100644 +index 135c2c2ae292f..e56f5bb9a54eb 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -912,6 +912,7 @@ CONFIG_DRM_UDL=m @@ -412830,7 +412830,7 @@ index 135c2c2ae292..e56f5bb9a54e 100644 CONFIG_TINYDRM_ILI9341=m CONFIG_TINYDRM_MI0283QT=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index bb3b687406ab..f6c12a7a04be 100644 +index bb3b687406ab0..f6c12a7a04bee 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -794,6 +794,7 @@ CONFIG_DRM_UDL=m @@ -412845,10 +412845,10 @@ index bb3b687406ab..f6c12a7a04be 100644 2.18.4 -From 8e8873517d1a761325d8a624d9b7f4c72107d1b5 Mon Sep 17 00:00:00 2001 +From 5940f2585d207b6a1f96ce7270ec2d4f6b1616b2 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Wed, 29 Apr 2020 11:50:38 +0200 -Subject: [PATCH 0771/1216] media: i2c: imx219: Implement get_selection +Subject: [PATCH 0771/1224] 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 @@ -412861,7 +412861,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 94 insertions(+) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index 017ae503cc09..988ebf6dd895 100644 +index 017ae503cc09e..988ebf6dd8950 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -122,6 +122,14 @@ enum pad_types { @@ -413032,10 +413032,10 @@ index 017ae503cc09..988ebf6dd895 100644 2.18.4 -From 90f6621ee097bdb1efb9ad7f728af0a2e7f5c0b9 Mon Sep 17 00:00:00 2001 +From 2f8ed2089f3ad4f8be5af3f27dcd8ca4842d1102 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 11:46:07 +0100 -Subject: [PATCH 0772/1216] media: i2c: ov5647: Add support for g_selection to +Subject: [PATCH 0772/1224] 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 @@ -413048,7 +413048,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 96 insertions(+), 23 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 66b3ee5cc190..e7c7e3ab4b38 100644 +index 66b3ee5cc1909..e7c7e3ab4b383 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -70,25 +70,14 @@ @@ -413244,10 +413244,10 @@ index 66b3ee5cc190..e7c7e3ab4b38 100644 2.18.4 -From 2ec32d7cca7982b15afc7afeed1322a248f4f763 Mon Sep 17 00:00:00 2001 +From bbb826a7ffd68a587ae93d9dbe0426c340e1790b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 11:50:52 +0100 -Subject: [PATCH 0773/1216] media: i2c: ov5467: Fixup error path to release +Subject: [PATCH 0773/1224] media: i2c: ov5467: Fixup error path to release mutex "87f3ab9 media: ov5647: Add basic support for multiple sensor modes." @@ -413261,7 +413261,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index e7c7e3ab4b38..09d68b0b4a13 100644 +index e7c7e3ab4b383..09d68b0b4a13e 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -1146,8 +1146,10 @@ static int ov5647_set_fmt(struct v4l2_subdev *sd, @@ -413280,10 +413280,10 @@ index e7c7e3ab4b38..09d68b0b4a13 100644 2.18.4 -From 9fb7f9987ebfda6b3975e3b0a7cff025bad50bcb Mon Sep 17 00:00:00 2001 +From d4e175b439cc3b090b98b34c1c08c8496fc4cdc1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 12:25:13 +0100 -Subject: [PATCH 0774/1216] media: i2c: ov5647: Support V4L2_CID_PIXEL_RATE +Subject: [PATCH 0774/1224] media: i2c: ov5647: Support V4L2_CID_PIXEL_RATE Clients need to know the pixel rate in order to compute exposure and frame rate values. @@ -413295,7 +413295,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 09d68b0b4a13..02d72feb837e 100644 +index 09d68b0b4a13e..02d72feb837ef 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -89,6 +89,8 @@ struct ov5647_mode { @@ -413417,10 +413417,10 @@ index 09d68b0b4a13..02d72feb837e 100644 2.18.4 -From f0bd7efa4bad9c2420fd492111324c106fb79108 Mon Sep 17 00:00:00 2001 +From 1b46554643e26dbac21eb669ccf737ee70ba1e41 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 17:25:56 +0100 -Subject: [PATCH 0775/1216] media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS +Subject: [PATCH 0775/1224] media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS flag The ov5647 subdev can generate control events, therefore set @@ -413432,7 +413432,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 02d72feb837e..c012e0b3d68b 100644 +index 02d72feb837ef..c012e0b3d68bd 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -90,6 +90,8 @@ struct ov5647_mode { @@ -413566,10 +413566,10 @@ index 02d72feb837e..c012e0b3d68b 100644 2.18.4 -From 5745b198073929b3747687034dafddfdb5614419 Mon Sep 17 00:00:00 2001 +From b4787e77e987c39cacdd9b97001e8e848e4e671a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 21:39:58 +0100 -Subject: [PATCH 0776/1216] media: i2c: ov5647: Add support for V4L2_CID_VBLANK +Subject: [PATCH 0776/1224] media: i2c: ov5647: Add support for V4L2_CID_VBLANK Adds vblank control to allow for frame rate control. @@ -413579,7 +413579,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index c012e0b3d68b..445a0ce186ec 100644 +index c012e0b3d68bd..445a0ce186ece 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -61,6 +61,8 @@ @@ -413777,10 +413777,10 @@ index c012e0b3d68b..445a0ce186ec 100644 2.18.4 -From 2463e33b79d4c4e59150f69a790610a80c6fe5d5 Mon Sep 17 00:00:00 2001 +From f6ec21142370b8cdb36a5de67791bbf32f0ec826 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 21:47:25 +0100 -Subject: [PATCH 0777/1216] media: i2c: ov5647: Neither analogue gain nor +Subject: [PATCH 0777/1224] media: i2c: ov5647: Neither analogue gain nor exposure need EXECUTE_ON_WRITE The controls for analogue gain and exposure were defined with @@ -413793,7 +413793,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 445a0ce186ec..49247711221c 100644 +index 445a0ce186ece..49247711221c9 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -1472,7 +1472,6 @@ static int ov5647_probe(struct i2c_client *client) @@ -413841,10 +413841,10 @@ index 445a0ce186ec..49247711221c 100644 2.18.4 -From 233286adb087a106aede31340962930a433afc66 Mon Sep 17 00:00:00 2001 +From 6095c66c241339144daee232dd178ed20d94a4e0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 22:11:01 +0100 -Subject: [PATCH 0778/1216] media: i2c: ov5647: Use member names in mode tables +Subject: [PATCH 0778/1224] 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. @@ -413855,7 +413855,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 49247711221c..da4ef30d8f32 100644 +index 49247711221c9..da4ef30d8f328 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -592,7 +592,7 @@ static struct ov5647_mode supported_modes_8bit[] = { @@ -413958,10 +413958,10 @@ index 49247711221c..da4ef30d8f32 100644 2.18.4 -From 0efe6ff4e5de0508be9e58ee810de9551100efff Mon Sep 17 00:00:00 2001 +From e6067c4a24016bd89489251acaf9e886a2aeafba Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 Apr 2020 11:03:00 +0100 -Subject: [PATCH 0779/1216] media: i2c: ov5647: Advertise the correct exposure +Subject: [PATCH 0779/1224] media: i2c: ov5647: Advertise the correct exposure range Exposure is clipped by the VTS of the mode, so needs to be updated as @@ -413973,7 +413973,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index da4ef30d8f32..6d84d2785f74 100644 +index da4ef30d8f328..6d84d2785f740 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -84,6 +84,11 @@ @@ -414083,10 +414083,10 @@ index da4ef30d8f32..6d84d2785f74 100644 2.18.4 -From a078459a94374b99bb3dd1be30a80f5802630e5c Mon Sep 17 00:00:00 2001 +From 01cacb1dcc76a349e6c7328c1b661dae3fc76ff5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Apr 2020 11:01:21 +0100 -Subject: [PATCH 0780/1216] media: i2c: imx219: Declare that the driver can +Subject: [PATCH 0780/1224] media: i2c: imx219: Declare that the driver can create events The flag V4L2_SUBDEV_FL_HAS_EVENTS is required if the subdev can @@ -414099,7 +414099,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index 988ebf6dd895..b84fc19e9ff7 100644 +index 988ebf6dd8950..b84fc19e9ff75 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -1573,7 +1573,8 @@ static int imx219_probe(struct i2c_client *client) @@ -414116,10 +414116,10 @@ index 988ebf6dd895..b84fc19e9ff7 100644 2.18.4 -From e3b34efec2da321066a960d0c8e68b9479665414 Mon Sep 17 00:00:00 2001 +From 434a40078ee656dd9eb21ff1b4c0cf596f68f1cb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 16:45:02 +0100 -Subject: [PATCH 0781/1216] media: bcm2835-unicam: Add support for +Subject: [PATCH 0781/1224] media: bcm2835-unicam: Add support for VIDIOC_[S|G]_SELECTION Sensors are now reflecting cropping and scaling parameters through @@ -414132,7 +414132,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 44 insertions(+) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 2e022c5e1cfd..f94a790ca315 100644 +index 2e022c5e1cfd1..f94a790ca3153 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -1898,6 +1898,39 @@ static int unicam_g_edid(struct file *file, void *priv, struct v4l2_edid *edid) @@ -414204,10 +414204,10 @@ index 2e022c5e1cfd..f94a790ca315 100644 2.18.4 -From 1e362491d9f062b39d7576b9432e52c0e1a0f7a8 Mon Sep 17 00:00:00 2001 +From d1d395ccd6a400a4d0e898fab12a0b9427c07ac0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 Apr 2020 22:05:09 +0100 -Subject: [PATCH 0782/1216] media: bcm2835-unicam: Do not stop streaming in +Subject: [PATCH 0782/1224] media: bcm2835-unicam: Do not stop streaming in unicam_release unicam_release calls _vb2_fop_release, which will call stop_streaming @@ -414221,7 +414221,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index f94a790ca315..e7c0e91cb841 100644 +index f94a790ca3153..e7c0e91cb841c 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -2204,9 +2204,6 @@ static int unicam_release(struct file *file) @@ -414238,10 +414238,10 @@ index f94a790ca315..e7c0e91cb841 100644 2.18.4 -From 40f39c4b51281ac37da329635b312057f78358a4 Mon Sep 17 00:00:00 2001 +From 9319e632d285f1313822704dcd530ba41bdaff86 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 Apr 2020 09:52:50 +0100 -Subject: [PATCH 0783/1216] media: bcm2835-unicam: Fix reference counting in +Subject: [PATCH 0783/1224] media: bcm2835-unicam: Fix reference counting in unicam_open The reference counting of node->open was only incremented after @@ -414255,7 +414255,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index e7c0e91cb841..5b5585f6770c 100644 +index e7c0e91cb841c..5b5585f6770c9 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -2170,16 +2170,18 @@ static int unicam_open(struct file *file) @@ -414282,10 +414282,10 @@ index e7c0e91cb841..5b5585f6770c 100644 2.18.4 -From 18cb6f5fbde7062a6ed967d749f9095458a12712 Mon Sep 17 00:00:00 2001 +From 9bbdb80a27a87193ff3caf50ebeaa01ab4e5177f Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 1 May 2020 14:15:24 +0100 -Subject: [PATCH 0784/1216] staging: vc04_services: ISP: Add enum_framesizes +Subject: [PATCH 0784/1224] staging: vc04_services: ISP: Add enum_framesizes ioctl This is used to enumerate available frame sizes on all nodes @@ -414298,7 +414298,7 @@ Signed-off-by: Naushir Patuck 2 files changed, 72 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c -index 6056218af679..6c4405ab4dc5 100644 +index 6056218af679f..6c4405ab4dc58 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -227,8 +227,9 @@ static const struct bcm2835_isp_fmt *get_fmt(u32 mmal_fmt) @@ -414384,7 +414384,7 @@ index 6056218af679..6c4405ab4dc5 100644 .vidioc_reqbufs = vb2_ioctl_reqbufs, .vidioc_querybuf = vb2_ioctl_querybuf, diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h -index ded2be584f95..9d8ccb403480 100644 +index ded2be584f95f..9d8ccb403480e 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h @@ -22,6 +22,7 @@ struct bcm2835_isp_fmt { @@ -414623,10 +414623,10 @@ index ded2be584f95..9d8ccb403480 100644 2.18.4 -From 5c02974d52a2114d0fb714578cce44b79b69de96 Mon Sep 17 00:00:00 2001 +From 91d04b8b1a815bb4d046eddb89802f09c59f1fef Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 1 May 2020 14:58:23 +0100 -Subject: [PATCH 0785/1216] SQUASH: spi: Demote SPI_CS_HIGH warning to +Subject: [PATCH 0785/1224] SQUASH: spi: Demote SPI_CS_HIGH warning to KERN_DEBUG This warning is unavoidable from a client's perspective and @@ -414640,7 +414640,7 @@ 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 b067ba232e39..464d28ebc957 100644 +index b067ba232e39c..464d28ebc9572 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3127,8 +3127,8 @@ int spi_setup(struct spi_device *spi) @@ -414658,10 +414658,10 @@ index b067ba232e39..464d28ebc957 100644 2.18.4 -From 46c9225d25acde9d2e2957dfcb945052209adf83 Mon Sep 17 00:00:00 2001 +From 9fef2b606db236268094770a8e020c860004f8cf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Apr 2019 13:33:47 +0100 -Subject: [PATCH 0786/1216] bcm2835-dma: Add proper 40-bit DMA support +Subject: [PATCH 0786/1224] 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. @@ -414672,7 +414672,7 @@ Signed-off-by: Phil Elwell 1 file changed, 412 insertions(+), 73 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 1e5d6f1bed4e..53346d7eb66c 100644 +index 1e5d6f1bed4ec..53346d7eb66c4 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -38,6 +38,11 @@ @@ -415464,10 +415464,10 @@ index 1e5d6f1bed4e..53346d7eb66c 100644 2.18.4 -From d8fc88f5c70e0ad50bf17ed256d45d118d6e92b6 Mon Sep 17 00:00:00 2001 +From 7f3726652f796d47c3c841dcc60a3e53fae840c0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Apr 2020 12:43:05 +0100 -Subject: [PATCH 0787/1216] ARM: dts: bcm2711: Allow 40-bit DMA for SPI +Subject: [PATCH 0787/1224] 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, @@ -415482,7 +415482,7 @@ Signed-off-by: Phil Elwell 2 files changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 7467817bfe7d..86dd3093e709 100644 +index 7467817bfe7d1..86dd3093e7098 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -554,5 +554,7 @@ @@ -415494,7 +415494,7 @@ index 7467817bfe7d..86dd3093e709 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index ece3d3143643..505f37235473 100644 +index ece3d3143643b..505f37235473c 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -159,6 +159,10 @@ Params: @@ -415512,10 +415512,10 @@ index ece3d3143643..505f37235473 100644 2.18.4 -From c47f03d82de4e1fc532c27b512eb36df93d7079f Mon Sep 17 00:00:00 2001 +From e92e1a1aa179cfc5210672a4819ea88ff3f10ecb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 1 May 2020 17:56:13 +0100 -Subject: [PATCH 0788/1216] overlays: Make the i2c-gpio overlay safe again +Subject: [PATCH 0788/1224] 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 @@ -415533,7 +415533,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 deletions(-) diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts -index e94053b55610..39e7bc5fa9d8 100644 +index e94053b55610a..39e7bc5fa9d88 100644 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts @@ -9,9 +9,6 @@ @@ -415550,10 +415550,10 @@ index e94053b55610..39e7bc5fa9d8 100644 2.18.4 -From eb95507e9078e8750438b7d68600610da22d6439 Mon Sep 17 00:00:00 2001 +From 1d1a67a4e5b36198bc60e1c81674d301d82b0811 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 1 May 2020 17:49:08 +0100 -Subject: [PATCH 0789/1216] staging: vc04_services: isp: Remove duplicated +Subject: [PATCH 0789/1224] staging: vc04_services: isp: Remove duplicated initialisation With the codec code from which this was derived, the driver had to @@ -415569,7 +415569,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 35 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c -index 6c4405ab4dc5..edb1a27328de 100644 +index 6c4405ab4dc58..edb1a27328de3 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -1160,41 +1160,6 @@ static int bcm2835_isp_get_supported_fmts(struct bcm2835_isp_node *node) @@ -415618,10 +415618,10 @@ index 6c4405ab4dc5..edb1a27328de 100644 2.18.4 -From cd8ab68493b23202c3bf95e6c2afe71294e90b85 Mon Sep 17 00:00:00 2001 +From 513ae625a6f604377a0b81de0d884ecfd156018a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 1 May 2020 16:54:20 +0100 -Subject: [PATCH 0790/1216] staging: vc04_services: isp: Make all references to +Subject: [PATCH 0790/1224] staging: vc04_services: isp: Make all references to bcm2835_isp_fmt const The array of potential formats and their configuration should be const. @@ -415638,7 +415638,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c -index edb1a27328de..bd1bb760419c 100644 +index edb1a27328de3..bd1bb760419cc 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -67,7 +67,7 @@ struct bcm2835_isp_q_data { @@ -415758,7 +415758,7 @@ index edb1a27328de..bd1bb760419c 100644 } } diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h -index 9d8ccb403480..af3bde152bb2 100644 +index 9d8ccb403480e..af3bde152bb24 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h @@ -26,7 +26,7 @@ struct bcm2835_isp_fmt { @@ -415774,10 +415774,10 @@ index 9d8ccb403480..af3bde152bb2 100644 2.18.4 -From 28b77019326923b5fcf3104f717a63771ff6ac46 Mon Sep 17 00:00:00 2001 +From ce75f620718c6f3d94250662a020d17bddc03306 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 2 May 2020 13:43:06 +0100 -Subject: [PATCH 0791/1216] overlays: gpio-keys: Avoid open-drain warnings +Subject: [PATCH 0791/1224] 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. @@ -415793,7 +415793,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts -index 39e7bc5fa9d8..def139db8bcb 100644 +index 39e7bc5fa9d88..def139db8bcb5 100644 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts @@ -16,6 +16,8 @@ @@ -415809,10 +415809,10 @@ index 39e7bc5fa9d8..def139db8bcb 100644 2.18.4 -From 4150c27009ca3be1a627fc3baa1d2dc5cc11b515 Mon Sep 17 00:00:00 2001 +From 7a67018767736da9a1f867e077eb0bb86a36488e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 4 May 2020 11:06:04 +0100 -Subject: [PATCH 0792/1216] configs: Add missing PPS configs +Subject: [PATCH 0792/1224] configs: Add missing PPS configs The arm64 bcm2711_defconfig was inexplicably missing three PPS config options. Add them, along with another missing option from @@ -415827,7 +415827,7 @@ Signed-off-by: Phil Elwell 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index fcb3c1e19ac4..d626405a9199 100644 +index fcb3c1e19ac4d..d626405a9199b 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -674,6 +674,9 @@ CONFIG_SPI_BCM2835AUX=m @@ -415841,7 +415841,7 @@ index fcb3c1e19ac4..d626405a9199 100644 CONFIG_GPIO_SYSFS=y CONFIG_GPIO_BCM_VIRT=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index f6c12a7a04be..751f6efda9f1 100644 +index f6c12a7a04bee..751f6efda9f19 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -611,6 +611,7 @@ CONFIG_GPIO_BCM_VIRT=y @@ -415856,10 +415856,10 @@ index f6c12a7a04be..751f6efda9f1 100644 2.18.4 -From 5911deebee744245a3c049540f5acf737fe57000 Mon Sep 17 00:00:00 2001 +From 1f7d1efa7d20dc56fd9ff28a88e982289c2f2dae Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 4 May 2020 13:38:39 +0100 -Subject: [PATCH 0793/1216] configs: Add missing TOUCHSCREEN_RASPBERRYPI_FW=m +Subject: [PATCH 0793/1224] configs: Add missing TOUCHSCREEN_RASPBERRYPI_FW=m The 32- and 64-bit bcm2711 defconfigs are missing support for the official Raspberry Pi touchscreen. @@ -415875,7 +415875,7 @@ Signed-off-by: Phil Elwell 2 files changed, 2 insertions(+) diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 5e75a34d9257..134c235b0fc2 100644 +index 5e75a34d9257d..134c235b0fc2d 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -579,6 +579,7 @@ CONFIG_TOUCHSCREEN_EXC3000=m @@ -415887,7 +415887,7 @@ index 5e75a34d9257..134c235b0fc2 100644 CONFIG_TOUCHSCREEN_STMPE=m CONFIG_INPUT_MISC=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index d626405a9199..7c362f4355c5 100644 +index d626405a9199b..7c362f4355c55 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -614,6 +614,7 @@ CONFIG_TOUCHSCREEN_EXC3000=m @@ -415902,10 +415902,10 @@ index d626405a9199..7c362f4355c5 100644 2.18.4 -From a27c1d58ee189f92578ae8d79966c3a4d09b970c Mon Sep 17 00:00:00 2001 +From 90f255f05abc573305c72d2e82ba0ea385ce5867 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 6 Apr 2020 17:07:31 +0100 -Subject: [PATCH 0794/1216] vc4_hdmi_phy: Fix typo in phy_get_cp_current +Subject: [PATCH 0794/1224] vc4_hdmi_phy: Fix typo in phy_get_cp_current This is stored in a 6-bit register field which causes a WARN @@ -415915,7 +415915,7 @@ Signed-off-by: popcornmix 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -index 732d8a0e5a1c..0e242f87db9e 100644 +index 732d8a0e5a1cd..0e242f87db9e5 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c @@ -182,7 +182,7 @@ static u8 phy_get_cp_current(unsigned long vco_freq) @@ -415931,10 +415931,10 @@ index 732d8a0e5a1c..0e242f87db9e 100644 2.18.4 -From a5edbba6a0c736d681f0fbd9f329011f73ea6792 Mon Sep 17 00:00:00 2001 +From b7e5a3310bfd36ae6936fb221934e6591760515c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 4 May 2020 15:13:24 +0100 -Subject: [PATCH 0795/1216] overlays: Make use of intra-overlay fragments +Subject: [PATCH 0795/1224] 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 @@ -415948,7 +415948,7 @@ Signed-off-by: Phil Elwell 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/overlays/ads1015-overlay.dts b/arch/arm/boot/dts/overlays/ads1015-overlay.dts -index 26d68fccc6a8..deeee1228395 100644 +index 26d68fccc6a85..deeee12283956 100644 --- a/arch/arm/boot/dts/overlays/ads1015-overlay.dts +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts @@ -24,7 +24,7 @@ @@ -415988,7 +415988,7 @@ index 26d68fccc6a8..deeee1228395 100644 #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/overlays/ads1115-overlay.dts b/arch/arm/boot/dts/overlays/ads1115-overlay.dts -index b380d925f0a5..4fc571c2db33 100644 +index b380d925f0a51..4fc571c2db334 100644 --- a/arch/arm/boot/dts/overlays/ads1115-overlay.dts +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts @@ -26,7 +26,7 @@ @@ -416031,10 +416031,10 @@ index b380d925f0a5..4fc571c2db33 100644 2.18.4 -From fa1d50efb7147c1460cc975397fa71e2c0a037e9 Mon Sep 17 00:00:00 2001 +From 229149e1c31842d3e887bdbd68d801bb3b33608b Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:28:14 +0200 -Subject: [PATCH 0796/1216] media: i2c: tc358743: Fix fallthrough warning +Subject: [PATCH 0796/1224] media: i2c: tc358743: Fix fallthrough warning Signed-off-by: Jacko Dirks --- @@ -416042,7 +416042,7 @@ Signed-off-by: Jacko Dirks 1 file changed, 1 insertion(+) diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c -index 01e255aede50..73caf8609a7e 100644 +index 01e255aede504..73caf8609a7e1 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -2004,6 +2004,7 @@ static int tc358743_probe_of(struct tc358743_state *state) @@ -416057,10 +416057,10 @@ index 01e255aede50..73caf8609a7e 100644 2.18.4 -From 03027c53b693d0ef21940235386fcb26ab56c111 Mon Sep 17 00:00:00 2001 +From 8dbeb99db9b7eddd9df656d28e2e65ebe1083018 Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:33:31 +0200 -Subject: [PATCH 0797/1216] media: bcm2835: unicam: Fix uninitialized warning +Subject: [PATCH 0797/1224] media: bcm2835: unicam: Fix uninitialized warning Signed-off-by: Jacko Dirks --- @@ -416068,7 +416068,7 @@ Signed-off-by: Jacko Dirks 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 5b5585f6770c..6fd1b0939a07 100644 +index 5b5585f6770c9..6fd1b0939a07a 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -1001,7 +1001,7 @@ const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev) @@ -416084,10 +416084,10 @@ index 5b5585f6770c..6fd1b0939a07 100644 2.18.4 -From 1eb6b17c8d433a183570e46a31d2fb325343571a Mon Sep 17 00:00:00 2001 +From 30e532fa314334e194888815675ea6a42891871f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 19:45:41 +0100 -Subject: [PATCH 0798/1216] video: bcm2708_fb: Disable FB if no displays found +Subject: [PATCH 0798/1224] 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 @@ -416104,7 +416104,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c -index 8234207b1914..d035fa59c269 100644 +index 8234207b1914b..d035fa59c269d 100644 --- a/drivers/video/fbdev/bcm2708_fb.c +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -1104,10 +1104,9 @@ static int bcm2708_fb_probe(struct platform_device *dev) @@ -416124,10 +416124,10 @@ index 8234207b1914..d035fa59c269 100644 2.18.4 -From 6d9a061cecf5aad4ced04f37f110491574aaf45b Mon Sep 17 00:00:00 2001 +From 35cb16f8853f949d043f59f6fcefa6fb5f9b5b4e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 May 2020 14:25:20 +0100 -Subject: [PATCH 0799/1216] overlays: sc16is752-spi1: Add xtal parameter +Subject: [PATCH 0799/1224] 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 @@ -416142,7 +416142,7 @@ Signed-off-by: Phil Elwell 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 505f37235473..116863ba85b6 100644 +index 505f37235473c..116863ba85b6c 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2114,6 +2114,7 @@ Info: Overlay for the NXP SC16IS752 Dual UART with SPI Interface @@ -416154,7 +416154,7 @@ index 505f37235473..116863ba85b6 100644 Name: sdhost diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts -index 4e33b14afc78..131d3ab43d3a 100644 +index 4e33b14afc784..131d3ab43d3a5 100644 --- a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts @@ -56,6 +56,7 @@ @@ -416170,10 +416170,10 @@ index 4e33b14afc78..131d3ab43d3a 100644 2.18.4 -From cd929615cd847ee3206db3fdcc8a4ccca1662171 Mon Sep 17 00:00:00 2001 +From 34f87dccd324f006a18312e2dd6c05f3bae4d875 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 0800/1216] vc4_hdmi: Fix register offset when sending longer +Subject: [PATCH 0800/1224] vc4_hdmi: Fix register offset when sending longer CEC messages Signed-off-by: Dom Cobley @@ -416182,7 +416182,7 @@ 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 2919549b227f..7b5421d24871 100644 +index 2919549b227f6..7b5421d248710 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1265,8 +1265,13 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) @@ -416218,10 +416218,10 @@ index 2919549b227f..7b5421d24871 100644 2.18.4 -From e18f815b46e3bbf9f5a2e6d52f45e1ad5eceded9 Mon Sep 17 00:00:00 2001 +From 28b1a6d837652419feaa607addc8599c9a9a7cdc Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 0801/1216] vc4_hdmi: Fix up CEC registers +Subject: [PATCH 0801/1224] vc4_hdmi: Fix up CEC registers Fix an incorrect register address, add a missing one and reorder into address order @@ -416232,7 +416232,7 @@ Signed-off-by: Dom Cobley 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h -index ea948ffaa69b..a0fa082a017c 100644 +index ea948ffaa69bc..a0fa082a017c8 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h @@ -33,11 +33,12 @@ enum vc4_hdmi_field { @@ -416267,10 +416267,10 @@ index ea948ffaa69b..a0fa082a017c 100644 2.18.4 -From b8efc2293476e90e36d94f92460dcafc37771b50 Mon Sep 17 00:00:00 2001 +From 9a4167ea134ff5a92fd221bb85a073225a5f8d11 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:07 +0100 -Subject: [PATCH 0802/1216] vc4_hdmi_regs: Add Intr2 register block +Subject: [PATCH 0802/1224] vc4_hdmi_regs: Add Intr2 register block Signed-off-by: Dom Cobley --- @@ -416281,7 +416281,7 @@ Signed-off-by: Dom Cobley 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 41698e7f5e24..96ef133391d1 100644 +index 41698e7f5e243..96ef133391d1c 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -316,7 +316,8 @@ @@ -416339,7 +416339,7 @@ index 41698e7f5e24..96ef133391d1 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 7b5421d24871..8d8ba07b3c9b 100644 +index 7b5421d248710..8d8ba07b3c9b8 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1582,6 +1582,14 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) @@ -416358,7 +416358,7 @@ index 7b5421d24871..8d8ba07b3c9b 100644 if (!res) return -ENODEV; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 95bed29531b9..72024547e7fa 100644 +index 95bed29531b9d..72024547e7fa2 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -140,6 +140,8 @@ struct vc4_hdmi { @@ -416371,7 +416371,7 @@ index 95bed29531b9..72024547e7fa 100644 int hpd_gpio; bool hpd_active_low; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h -index a0fa082a017c..7311a8c0f1e5 100644 +index a0fa082a017c8..7311a8c0f1e50 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h @@ -24,6 +24,7 @@ enum vc4_hdmi_regs { @@ -416430,10 +416430,10 @@ index a0fa082a017c..7311a8c0f1e5 100644 2.18.4 -From 8f3b15541b2c0bb0c5a8b4b201fa0833888251f9 Mon Sep 17 00:00:00 2001 +From de8385ba0b1482475c575c37ed66f4d520d89b73 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 0803/1216] vc4_hdmi_regs: Make interrupt mask variant specific +Subject: [PATCH 0803/1224] vc4_hdmi_regs: Make interrupt mask variant specific Signed-off-by: Dom Cobley --- @@ -416443,7 +416443,7 @@ 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 8d8ba07b3c9b..9f6b260a7238 100644 +index 8d8ba07b3c9b8..9f6b260a72386 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1286,7 +1286,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) @@ -416504,7 +416504,7 @@ index 8d8ba07b3c9b..9f6b260a7238 100644 static const struct of_device_id vc4_hdmi_dt_match[] = { diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 72024547e7fa..7765b9cf885b 100644 +index 72024547e7fa2..7765b9cf885b3 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -97,6 +97,9 @@ struct vc4_hdmi_variant { @@ -416518,7 +416518,7 @@ index 72024547e7fa..7765b9cf885b 100644 /* HDMI audio information */ diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h -index 78809866097c..4d017572a5c2 100644 +index 78809866097c8..4d017572a5c28 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -668,6 +668,15 @@ @@ -416541,10 +416541,10 @@ index 78809866097c..4d017572a5c2 100644 2.18.4 -From 68a2661d1c0bc6c5c98431d6f200ca4a4b114807 Mon Sep 17 00:00:00 2001 +From 6caedb3be6dd33641d686f26b4bff76d58ff1d29 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 0804/1216] vc4_hdmi: Make irq shared +Subject: [PATCH 0804/1224] vc4_hdmi: Make irq shared Signed-off-by: Dom Cobley --- @@ -416552,7 +416552,7 @@ 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 9f6b260a7238..7b9d98fe2e3e 100644 +index 9f6b260a72386..7b9d98fe2e3eb 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1429,7 +1429,8 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) @@ -416569,10 +416569,10 @@ index 9f6b260a7238..7b9d98fe2e3e 100644 2.18.4 -From 2ff9ecdc95fdb8a2c94c596a98777c0cbc99f583 Mon Sep 17 00:00:00 2001 +From cc27458e89bf8aff0aec3ff0f95d1a5b3b3d04cf Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:08 +0100 -Subject: [PATCH 0805/1216] vc4_hdmi: Adjust CEC ref clock based on its input +Subject: [PATCH 0805/1224] vc4_hdmi: Adjust CEC ref clock based on its input clock 2711 uses a fixed 27MHz input, earlier models use the HSM clock @@ -416584,7 +416584,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 7b9d98fe2e3e..35d1da61f05d 100644 +index 7b9d98fe2e3eb..35d1da61f05dd 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -79,6 +79,7 @@ @@ -416649,7 +416649,7 @@ index 7b9d98fe2e3e..35d1da61f05d 100644 .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi1_fields), .phy_lane_mapping = { diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 7765b9cf885b..dbf96a3b01ee 100644 +index 7765b9cf885b3..dbf96a3b01ee5 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -48,6 +48,9 @@ struct vc4_hdmi_variant { @@ -416666,10 +416666,10 @@ index 7765b9cf885b..dbf96a3b01ee 100644 2.18.4 -From 153f67e65985c564027935a3f4c2ee5de09fa1f3 Mon Sep 17 00:00:00 2001 +From b5c3db446423a8b994607e380dc28d94f5df419f Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:09 +0100 -Subject: [PATCH 0806/1216] vc4_hdmi: Remove cec_available flag as always +Subject: [PATCH 0806/1224] vc4_hdmi: Remove cec_available flag as always supported Signed-off-by: Dom Cobley @@ -416679,7 +416679,7 @@ 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 35d1da61f05d..093f424ad5b4 100644 +index 35d1da61f05dd..093f424ad5b46 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1403,9 +1403,6 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) @@ -416701,7 +416701,7 @@ index 35d1da61f05d..093f424ad5b4 100644 .num_registers = ARRAY_SIZE(vc4_hdmi_fields), diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index dbf96a3b01ee..60f7bf99e06e 100644 +index dbf96a3b01ee5..60f7bf99e06ef 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -42,9 +42,6 @@ struct vc4_hdmi_variant { @@ -416718,10 +416718,10 @@ index dbf96a3b01ee..60f7bf99e06e 100644 2.18.4 -From e3866131df3c3ef16ad9141fa3872a0884103729 Mon Sep 17 00:00:00 2001 +From 471b8499c493062aba942f6d4f5663da99985572 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 7 May 2020 18:16:09 +0100 -Subject: [PATCH 0807/1216] config: Enable CONFIG_DRM_VC4_HDMI_CEC +Subject: [PATCH 0807/1224] config: Enable CONFIG_DRM_VC4_HDMI_CEC Signed-off-by: Dom Cobley --- @@ -416730,7 +416730,7 @@ Signed-off-by: Dom Cobley 2 files changed, 2 insertions(+) diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 134c235b0fc2..311c8bfbaedf 100644 +index 134c235b0fc2d..311c8bfbaedf5 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -890,6 +890,7 @@ CONFIG_DRM_PANEL_SIMPLE=m @@ -416742,7 +416742,7 @@ index 134c235b0fc2..311c8bfbaedf 100644 CONFIG_TINYDRM_ILI9341=m CONFIG_TINYDRM_MI0283QT=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 7c362f4355c5..35afa6b6ffd6 100644 +index 7c362f4355c55..35afa6b6ffd61 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -921,6 +921,7 @@ CONFIG_DRM_PANEL_SIMPLE=m @@ -416757,10 +416757,10 @@ index 7c362f4355c5..35afa6b6ffd6 100644 2.18.4 -From 61a5b223c237e6a8e9fee88cee2bac5110dd7b04 Mon Sep 17 00:00:00 2001 +From 7b18d014993412d07b0e1b8e7c26245c40c6b3c0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 May 2020 11:55:45 +0100 -Subject: [PATCH 0808/1216] overlays: tc358743: Use intra-overlay fragments +Subject: [PATCH 0808/1224] 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 @@ -416778,7 +416778,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts -index f8c059827234..b317e088b37e 100644 +index f8c059827234d..b317e088b37e2 100644 --- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts @@ -54,28 +54,16 @@ @@ -416818,10 +416818,10 @@ index f8c059827234..b317e088b37e 100644 2.18.4 -From cc404b7b5a0d680ebde3df968864bfccb7c8eda1 Mon Sep 17 00:00:00 2001 +From 13149f0f574b3a64911224abb119b6a182e69c1a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 May 2020 15:12:21 +0100 -Subject: [PATCH 0809/1216] overlays: Move "fixed-clock" nodes to the root +Subject: [PATCH 0809/1224] 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" @@ -416852,7 +416852,7 @@ Signed-off-by: Phil Elwell 12 files changed, 80 insertions(+), 55 deletions(-) diff --git a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts -index 4b96a3a8a14a..81af26374d92 100644 +index 4b96a3a8a14a2..81af26374d920 100644 --- a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts +++ b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts @@ -24,6 +24,13 @@ @@ -416884,7 +416884,7 @@ index 4b96a3a8a14a..81af26374d92 100644 #sound-dai-cells = <0>; compatible = "ti,tlv320aic32x4"; diff --git a/arch/arm/boot/dts/overlays/draws-overlay.dts b/arch/arm/boot/dts/overlays/draws-overlay.dts -index 32b665c3934b..08bfce0edb23 100644 +index 32b665c3934b7..08bfce0edb239 100644 --- a/arch/arm/boot/dts/overlays/draws-overlay.dts +++ b/arch/arm/boot/dts/overlays/draws-overlay.dts @@ -30,6 +30,12 @@ @@ -416914,7 +416914,7 @@ index 32b665c3934b..08bfce0edb23 100644 tla2024: tla2024@48 { diff --git a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts -index 1c3ec3e21a18..743f14ae5768 100644 +index 1c3ec3e21a184..743f14ae5768d 100644 --- a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts +++ b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts @@ -6,7 +6,7 @@ @@ -416927,7 +416927,7 @@ index 1c3ec3e21a18..743f14ae5768 100644 sgtl5000_mclk: sgtl5000_mclk { compatible = "fixed-clock"; diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts -index 5fd39060ee87..7cdafdc3db1b 100644 +index 5fd39060ee87c..7cdafdc3db1bd 100644 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts @@ -27,12 +27,6 @@ @@ -416957,7 +416957,7 @@ index 5fd39060ee87..7cdafdc3db1b 100644 }; diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts -index 3fc7a9e23019..7e9431f64dc3 100644 +index 3fc7a9e23019a..7e9431f64dc32 100644 --- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts @@ -21,12 +21,6 @@ @@ -416990,7 +416990,7 @@ index 3fc7a9e23019..7e9431f64dc3 100644 + }; }; diff --git a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts -index 0dae8053a9a9..46f143d809cc 100755 +index 0dae8053a9a91..46f143d809cc8 100755 --- a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts +++ b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts @@ -35,7 +35,7 @@ @@ -417003,7 +417003,7 @@ index 0dae8053a9a9..46f143d809cc 100755 /* external oscillator of mcp2515 on SPI0.0 */ can0_osc: can0_osc { diff --git a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts -index c70dc3d05ebf..0a8dd576818e 100644 +index c70dc3d05ebfe..0a8dd576818e9 100644 --- a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts +++ b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts @@ -35,7 +35,7 @@ @@ -417016,7 +417016,7 @@ index c70dc3d05ebf..0a8dd576818e 100644 /* external oscillator of mcp2515 on spi0.1 */ can1_osc: can1_osc { diff --git a/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts -index 565af7cf79d7..f7e44d29e101 100644 +index 565af7cf79d76..f7e44d29e1010 100644 --- a/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts +++ b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts @@ -15,7 +15,7 @@ @@ -417029,7 +417029,7 @@ index 565af7cf79d7..f7e44d29e101 100644 midi_clk: midi_clk { compatible = "fixed-clock"; diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts -index 34aa9f386178..3dc817fa48a8 100644 +index 34aa9f3861782..3dc817fa48a8f 100644 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts @@ -21,12 +21,6 @@ @@ -417062,7 +417062,7 @@ index 34aa9f386178..3dc817fa48a8 100644 + }; }; diff --git a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts -index cd8d96bb5715..0a611b31b9d4 100644 +index cd8d96bb57153..0a611b31b9d43 100644 --- a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts @@ -26,12 +26,6 @@ @@ -417095,7 +417095,7 @@ index cd8d96bb5715..0a611b31b9d4 100644 + }; }; diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts -index 131d3ab43d3a..ffdea106434a 100644 +index 131d3ab43d3a5..ffdea106434a2 100644 --- a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts @@ -38,12 +38,6 @@ @@ -417134,7 +417134,7 @@ index 131d3ab43d3a..ffdea106434a 100644 + }; }; diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts -index b317e088b37e..2ea99cd9e1a1 100644 +index b317e088b37e2..2ea99cd9e1a1e 100644 --- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts @@ -21,12 +21,6 @@ @@ -417172,10 +417172,10 @@ index b317e088b37e..2ea99cd9e1a1 100644 2.18.4 -From d38fbb636194824284cbe28196d06557d74dcac4 Mon Sep 17 00:00:00 2001 +From dcb79f4b3b1b94bda5ce8993e38c5a6da0feb378 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 May 2020 08:32:42 +0100 -Subject: [PATCH 0810/1216] raspberrypi: dts: Switch to discrete ALSA devices +Subject: [PATCH 0810/1224] raspberrypi: dts: Switch to discrete ALSA devices Add the command line options required to enable audio over discrete ALSA devices. @@ -417191,7 +417191,7 @@ Signed-off-by: Phil Elwell 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts -index af883bf02ec5..6ec6b88e03ce 100644 +index af883bf02ec5a..6ec6b88e03ced 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -10,7 +10,7 @@ @@ -417204,7 +417204,7 @@ index af883bf02ec5..6ec6b88e03ce 100644 aliases { diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts -index 0e61e8269efc..c2f58e84eb32 100644 +index 0e61e8269efc8..c2f58e84eb323 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -10,7 +10,7 @@ @@ -417217,7 +417217,7 @@ index 0e61e8269efc..c2f58e84eb32 100644 }; diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi -index 04669f512b4c..bf90fd585364 100644 +index 04669f512b4c9..bf90fd585364c 100644 --- a/arch/arm/boot/dts/bcm270x.dtsi +++ b/arch/arm/boot/dts/bcm270x.dtsi @@ -3,7 +3,7 @@ @@ -417230,7 +417230,7 @@ index 04669f512b4c..bf90fd585364 100644 }; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -index f49738688187..3ca70650287c 100644 +index f497386881870..3ca70650287cb 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -11,7 +11,7 @@ @@ -417243,7 +417243,7 @@ index f49738688187..3ca70650287c 100644 aliases { diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts -index 112eb73f2cc1..abdf7e1c0247 100644 +index 112eb73f2cc1f..abdf7e1c02476 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -11,7 +11,7 @@ @@ -417256,7 +417256,7 @@ index 112eb73f2cc1..abdf7e1c0247 100644 aliases { diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 86dd3093e709..05220fa0202b 100644 +index 86dd3093e7098..05220fa0202b3 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -198,7 +198,7 @@ @@ -417272,10 +417272,10 @@ index 86dd3093e709..05220fa0202b 100644 2.18.4 -From 35e7ee8055b400e78b330934b393e8bbd60ef7d6 Mon Sep 17 00:00:00 2001 +From 6afa97383d884d88eacd829014258beae1ad43e3 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:50:54 +0100 -Subject: [PATCH 0811/1216] dt-bindings: media: i2c: Add IMX477 CMOS sensor +Subject: [PATCH 0811/1224] dt-bindings: media: i2c: Add IMX477 CMOS sensor binding Add YAML device tree binding for IMX477 CMOS image sensor. @@ -417288,7 +417288,7 @@ Signed-off-by: Naushir Patuck diff --git a/Documentation/devicetree/bindings/media/i2c/imx477.yaml b/Documentation/devicetree/bindings/media/i2c/imx477.yaml new file mode 100644 -index 000000000000..0994e13e67f6 +index 0000000000000..0994e13e67f68 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx477.yaml @@ -0,0 +1,113 @@ @@ -417409,10 +417409,10 @@ index 000000000000..0994e13e67f6 2.18.4 -From d3c146d80f628526396ccb91e2e166204779803b Mon Sep 17 00:00:00 2001 +From 8002eca5f1798cae5bc6b8b971121bf803bbb453 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:50:04 +0100 -Subject: [PATCH 0812/1216] dtoverlays: Add IMX477 sensor overlay +Subject: [PATCH 0812/1224] dtoverlays: Add IMX477 sensor overlay Add an overlay for the Sony IMX477 CMOS sensor device. Also update overlay README and Makefile. @@ -417426,7 +417426,7 @@ Signed-off-by: Naushir Patuck create mode 100644 arch/arm/boot/dts/overlays/imx477-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index c41abba3c3fb..f9e7416a41ee 100644 +index c41abba3c3fb2..f9e7416a41ee1 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -85,6 +85,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -417438,7 +417438,7 @@ index c41abba3c3fb..f9e7416a41ee 100644 iqaudio-dac.dtbo \ iqaudio-dacplus.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 116863ba85b6..0a9c9ec6cc8d 100644 +index 116863ba85b6c..0a9c9ec6cc8d0 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1390,6 +1390,14 @@ Load: dtoverlay=imx219 @@ -417458,7 +417458,7 @@ index 116863ba85b6..0a9c9ec6cc8d 100644 Load: dtoverlay=iqaudio-codec diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts new file mode 100644 -index 000000000000..1dd6f92b4dfe +index 0000000000000..1dd6f92b4dfe7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts @@ -0,0 +1,110 @@ @@ -417576,10 +417576,10 @@ index 000000000000..1dd6f92b4dfe 2.18.4 -From cc9c9f1f593b7c0a286287512df07605d5813f8e Mon Sep 17 00:00:00 2001 +From 975d847b4c46a4060aa47a8b845641288e44528f Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 8 May 2020 10:00:12 +0100 -Subject: [PATCH 0813/1216] media: i2c: Add driver for Sony IMX477 sensor +Subject: [PATCH 0813/1224] 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 @@ -417602,7 +417602,7 @@ Signed-off-by: Naushir Patuck create mode 100644 drivers/media/i2c/imx477.c diff --git a/MAINTAINERS b/MAINTAINERS -index 4745f2252127..158c0a7f73c2 100644 +index 4745f22521277..158c0a7f73c26 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15196,6 +15196,14 @@ T: git git://linuxtv.org/media_tree.git @@ -417621,7 +417621,7 @@ index 4745f2252127..158c0a7f73c2 100644 M: Maxim Levitsky M: Alex Dubov diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 7ae2a94bb2ef..40ff7cf92cef 100644 +index 7ae2a94bb2ef5..40ff7cf92cefe 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -609,6 +609,17 @@ config VIDEO_IMX274 @@ -417643,7 +417643,7 @@ index 7ae2a94bb2ef..40ff7cf92cef 100644 tristate "Sony IMX319 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 52e4c4026307..93015547a1f6 100644 +index 52e4c40263075..93015547a1f6c 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -114,6 +114,7 @@ obj-$(CONFIG_VIDEO_IMX214) += imx214.o @@ -417656,7 +417656,7 @@ index 52e4c4026307..93015547a1f6 100644 obj-$(CONFIG_VIDEO_ST_MIPID02) += st-mipid02.o diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c new file mode 100644 -index 000000000000..ec56b0cfd57b +index 0000000000000..ec56b0cfd57b3 --- /dev/null +++ b/drivers/media/i2c/imx477.c @@ -0,0 +1,2191 @@ @@ -419855,10 +419855,10 @@ index 000000000000..ec56b0cfd57b 2.18.4 -From 860b4aeeadc6cb2e2a5d3e3c4059da50cff8b896 Mon Sep 17 00:00:00 2001 +From b4906c0ed9e1381c3dc42c8ffe2569a4ad0a3886 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Fri, 8 May 2020 09:41:17 +0100 -Subject: [PATCH 0814/1216] media: i2c: imx477: Add support for adaptive frame +Subject: [PATCH 0814/1224] media: i2c: imx477: Add support for adaptive frame control Use V4L2_CID_EXPOSURE_AUTO_PRIORITY to control if the driver should @@ -419871,7 +419871,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 91 insertions(+), 22 deletions(-) diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c -index ec56b0cfd57b..bd0e2c291a32 100644 +index ec56b0cfd57b3..bd0e2c291a321 100644 --- a/drivers/media/i2c/imx477.c +++ b/drivers/media/i2c/imx477.c @@ -1082,6 +1082,8 @@ struct imx477 { @@ -420043,10 +420043,10 @@ index ec56b0cfd57b..bd0e2c291a32 100644 2.18.4 -From a73796abb0e0fd9199644e4c1aa8f77e76a530f6 Mon Sep 17 00:00:00 2001 +From ebc2fcf2452738851a340cd447fe442f98eeaaf8 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 7 May 2020 15:36:25 +0100 -Subject: [PATCH 0815/1216] configs: Add imx477 sensor driver to all Raspberry +Subject: [PATCH 0815/1224] configs: Add imx477 sensor driver to all Raspberry Pi defconfigs This commit enables the imx477 sensor driver in the following @@ -420067,7 +420067,7 @@ Signed-off-by: Naushir Patuck 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index e56f5bb9a54e..19c12103e367 100644 +index e56f5bb9a54eb..19c12103e3677 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -902,6 +902,7 @@ CONFIG_VIDEO_TW2804=m @@ -420079,7 +420079,7 @@ index e56f5bb9a54e..19c12103e367 100644 CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_IRS1125=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 311c8bfbaedf..02a76e3d071d 100644 +index 311c8bfbaedf5..02a76e3d071d5 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -879,6 +879,7 @@ CONFIG_VIDEO_TW2804=m @@ -420091,7 +420091,7 @@ index 311c8bfbaedf..02a76e3d071d 100644 CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_IRS1125=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 560f2e5a9a97..e3ff4e45fc54 100644 +index 560f2e5a9a974..e3ff4e45fc547 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -894,6 +894,7 @@ CONFIG_VIDEO_TW2804=m @@ -420103,7 +420103,7 @@ index 560f2e5a9a97..e3ff4e45fc54 100644 CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_IRS1125=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 35afa6b6ffd6..5eb62c0ceffe 100644 +index 35afa6b6ffd61..5eb62c0ceffed 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -910,6 +910,7 @@ CONFIG_VIDEO_TW2804=m @@ -420115,7 +420115,7 @@ index 35afa6b6ffd6..5eb62c0ceffe 100644 CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_IRS1125=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 751f6efda9f1..efb1b60cbbb6 100644 +index 751f6efda9f19..efb1b60cbbb62 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -785,6 +785,7 @@ CONFIG_VIDEO_TW2804=m @@ -420130,10 +420130,10 @@ index 751f6efda9f1..efb1b60cbbb6 100644 2.18.4 -From 53d8a32cf76af79d74b62cfe5632aa21d84679b3 Mon Sep 17 00:00:00 2001 +From 13186dca5acc19a330f5cd49c1c0dc66d917328d Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Tue, 26 Nov 2019 15:25:16 +0100 -Subject: [PATCH 0816/1216] udmabuf: Remove deleted map/unmap handlers. +Subject: [PATCH 0816/1224] udmabuf: Remove deleted map/unmap handlers. Commit 19d32ace8b6acebc45da1ea748000ac79ccc7721 upstream. @@ -420154,7 +420154,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191126142516.630200-1-maar 1 file changed, 16 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index 9635897458a0..9de539c1def4 100644 +index 9635897458a09..9de539c1def47 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -93,26 +93,10 @@ static void release_udmabuf(struct dma_buf *buf) @@ -420188,10 +420188,10 @@ index 9635897458a0..9de539c1def4 100644 2.18.4 -From 99c8d2f8d649cfa38008d5fe01f1c4fb6862ca30 Mon Sep 17 00:00:00 2001 +From d3d8cae29bb4ada6654ce6c193e17ec2c8848fb3 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:24 -0800 -Subject: [PATCH 0817/1216] udmabuf: use cache_sgt_mapping option +Subject: [PATCH 0817/1224] udmabuf: use cache_sgt_mapping option Commit bc7a71da43b48333f84c6534ab43d240e34cf9eb uptream. @@ -420206,7 +420206,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index 9de539c1def4..be15eb6b0586 100644 +index 9de539c1def47..be15eb6b05865 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -94,10 +94,11 @@ static void release_udmabuf(struct dma_buf *buf) @@ -420229,10 +420229,10 @@ index 9de539c1def4..be15eb6b0586 100644 2.18.4 -From f295ccb134aeeed84f58ba15b357d698e2669468 Mon Sep 17 00:00:00 2001 +From eef4930a84c5b84aad048b87ba6a4b6496d559ef Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:25 -0800 -Subject: [PATCH 0818/1216] udmabuf: add a pointer to the miscdevice in dma-buf +Subject: [PATCH 0818/1224] udmabuf: add a pointer to the miscdevice in dma-buf private data Commit c1bbed668997268c9edccdc9db1bd1487d9e20b0 upstream. @@ -420249,7 +420249,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index be15eb6b0586..f0bf3ba7441e 100644 +index be15eb6b05865..f0bf3ba7441e7 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -18,6 +18,7 @@ static const size_t size_limit_mb = 64; /* total dmabuf size, in megabytes */ @@ -420302,10 +420302,10 @@ index be15eb6b0586..f0bf3ba7441e 100644 2.18.4 -From c7da4822211530a683f6ddca9f0e6157fab6fbc5 Mon Sep 17 00:00:00 2001 +From 69d033d725987837a672b4a0cfeb7d035d8f304e Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:26 -0800 -Subject: [PATCH 0819/1216] udmabuf: separate out creating/destroying +Subject: [PATCH 0819/1224] udmabuf: separate out creating/destroying scatter-table Commit 17a7ce203490459cff14fb1c8f9a15d65fd1c544 upstream. @@ -420320,7 +420320,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index f0bf3ba7441e..0a610e09ae23 100644 +index f0bf3ba7441e7..0a610e09ae237 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -47,10 +47,10 @@ static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma) @@ -420379,10 +420379,10 @@ index f0bf3ba7441e..0a610e09ae23 100644 2.18.4 -From cd09c09ef0c4df567af32071ffb0fdf7d5a36fec Mon Sep 17 00:00:00 2001 +From e0c4bf1f7b3b2a46a70d52b885a2b649e09e1cc3 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 2 Dec 2019 17:36:27 -0800 -Subject: [PATCH 0820/1216] udmabuf: implement begin_cpu_access/end_cpu_access +Subject: [PATCH 0820/1224] udmabuf: implement begin_cpu_access/end_cpu_access hooks Commit 284562e1f34874e267d4f499362c3816f8f6bc3f upstream. @@ -420401,7 +420401,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 39 insertions(+) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index 0a610e09ae23..61b0a2cff874 100644 +index 0a610e09ae237..61b0a2cff874a 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -18,6 +18,7 @@ static const size_t size_limit_mb = 64; /* total dmabuf size, in megabytes */ @@ -420475,10 +420475,10 @@ index 0a610e09ae23..61b0a2cff874 100644 2.18.4 -From b2afddea2c25f3c3a1d04ac5d303db37029b09d1 Mon Sep 17 00:00:00 2001 +From 6fbe83aea167485b3c90a49958d7a4a0ff13d346 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Tue, 17 Dec 2019 15:02:28 -0800 -Subject: [PATCH 0821/1216] udmabuf: fix dma-buf cpu access +Subject: [PATCH 0821/1224] udmabuf: fix dma-buf cpu access Commit 1ffe09590121fbb3786d6c860acdd200f7ab095c upstream. @@ -420513,7 +420513,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index 61b0a2cff874..acb26c627d27 100644 +index 61b0a2cff874a..acb26c627d27b 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -122,9 +122,8 @@ static int begin_cpu_udmabuf(struct dma_buf *buf, @@ -420541,10 +420541,10 @@ index 61b0a2cff874..acb26c627d27 100644 2.18.4 -From 954af2d0b059fb289149db573da0fe816a30105f Mon Sep 17 00:00:00 2001 +From 3462ae5e927eaea785d4081681409f5587826cbf Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Tue, 3 Dec 2019 17:26:37 +0000 -Subject: [PATCH 0822/1216] dma-buf: Add dma-buf heaps framework +Subject: [PATCH 0822/1224] dma-buf: Add dma-buf heaps framework Commit c02a81fba74fe3488ad6b08bfb5a1329005418f8 upstream. This framework allows a unified userspace interface for dma-buf @@ -420596,7 +420596,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-2-john. create mode 100644 include/uapi/linux/dma-heap.h diff --git a/MAINTAINERS b/MAINTAINERS -index 158c0a7f73c2..4ba0cad48512 100644 +index 158c0a7f73c26..4ba0cad485129 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4963,6 +4963,24 @@ F: include/linux/*fence.h @@ -420625,7 +420625,7 @@ index 158c0a7f73c2..4ba0cad48512 100644 M: Vinod Koul L: dmaengine@vger.kernel.org diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig -index a23b6752d11a..bffa58fc3e6e 100644 +index a23b6752d11ac..bffa58fc3e6e0 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -44,4 +44,13 @@ config DMABUF_SELFTESTS @@ -420643,7 +420643,7 @@ index a23b6752d11a..bffa58fc3e6e 100644 + endmenu diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile -index 03479da06422..caee5eb3d351 100644 +index 03479da064222..caee5eb3d3517 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -1,6 +1,7 @@ @@ -420656,7 +420656,7 @@ index 03479da06422..caee5eb3d351 100644 obj-$(CONFIG_UDMABUF) += udmabuf.o diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c new file mode 100644 -index 000000000000..4f04d104ae61 +index 0000000000000..4f04d104ae614 --- /dev/null +++ b/drivers/dma-buf/dma-heap.c @@ -0,0 +1,297 @@ @@ -420959,7 +420959,7 @@ index 000000000000..4f04d104ae61 +subsys_initcall(dma_heap_init); diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h new file mode 100644 -index 000000000000..454e354d1ffb +index 0000000000000..454e354d1ffb7 --- /dev/null +++ b/include/linux/dma-heap.h @@ -0,0 +1,59 @@ @@ -421024,7 +421024,7 @@ index 000000000000..454e354d1ffb +#endif /* _DMA_HEAPS_H */ diff --git a/include/uapi/linux/dma-heap.h b/include/uapi/linux/dma-heap.h new file mode 100644 -index 000000000000..73e7f66c1cae +index 0000000000000..73e7f66c1cae1 --- /dev/null +++ b/include/uapi/linux/dma-heap.h @@ -0,0 +1,53 @@ @@ -421085,10 +421085,10 @@ index 000000000000..73e7f66c1cae 2.18.4 -From c862b0761828b7bd31836c968b5f763ca45932e2 Mon Sep 17 00:00:00 2001 +From 51174cfa58fa0cb5ea6a9c23a9447831c54abe90 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:38 +0000 -Subject: [PATCH 0823/1216] dma-buf: heaps: Add heap helpers +Subject: [PATCH 0823/1224] dma-buf: heaps: Add heap helpers Commit 5248eb12fea890a03b4cdc3ef546d6319d4d9b73 upstream. @@ -421135,7 +421135,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-3-john. create mode 100644 drivers/dma-buf/heaps/heap-helpers.h diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile -index caee5eb3d351..9c190026bfab 100644 +index caee5eb3d3517..9c190026bfab1 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -2,6 +2,7 @@ @@ -421148,7 +421148,7 @@ index caee5eb3d351..9c190026bfab 100644 obj-$(CONFIG_UDMABUF) += udmabuf.o diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile new file mode 100644 -index 000000000000..de49898112db +index 0000000000000..de49898112db8 --- /dev/null +++ b/drivers/dma-buf/heaps/Makefile @@ -0,0 +1,2 @@ @@ -421156,7 +421156,7 @@ index 000000000000..de49898112db +obj-y += heap-helpers.o diff --git a/drivers/dma-buf/heaps/heap-helpers.c b/drivers/dma-buf/heaps/heap-helpers.c new file mode 100644 -index 000000000000..9f964ca3f59c +index 0000000000000..9f964ca3f59ce --- /dev/null +++ b/drivers/dma-buf/heaps/heap-helpers.c @@ -0,0 +1,271 @@ @@ -421433,7 +421433,7 @@ index 000000000000..9f964ca3f59c +}; diff --git a/drivers/dma-buf/heaps/heap-helpers.h b/drivers/dma-buf/heaps/heap-helpers.h new file mode 100644 -index 000000000000..805d2df88024 +index 0000000000000..805d2df88024f --- /dev/null +++ b/drivers/dma-buf/heaps/heap-helpers.h @@ -0,0 +1,53 @@ @@ -421494,10 +421494,10 @@ index 000000000000..805d2df88024 2.18.4 -From 35af18231cffb8ebe8a7a3228b2711fc14882c82 Mon Sep 17 00:00:00 2001 +From 9c17428afc9bcffd34a397b34edc35ed4c9bf690 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:39 +0000 -Subject: [PATCH 0824/1216] dma-buf: heaps: Add system heap to dmabuf heaps +Subject: [PATCH 0824/1224] dma-buf: heaps: Add system heap to dmabuf heaps Commit efa04fefebbd724ffda7f49e42d057a7217c45b0 upstream. @@ -421545,7 +421545,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-4-john. create mode 100644 drivers/dma-buf/heaps/system_heap.c diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig -index bffa58fc3e6e..0613bb7770f5 100644 +index bffa58fc3e6e0..0613bb7770f52 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -53,4 +53,6 @@ menuconfig DMABUF_HEAPS @@ -421557,7 +421557,7 @@ index bffa58fc3e6e..0613bb7770f5 100644 endmenu diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig new file mode 100644 -index 000000000000..205052744169 +index 0000000000000..205052744169e --- /dev/null +++ b/drivers/dma-buf/heaps/Kconfig @@ -0,0 +1,6 @@ @@ -421568,7 +421568,7 @@ index 000000000000..205052744169 + Choose this option to enable the system dmabuf heap. The system heap + is backed by pages from the buddy allocator. If in doubt, say Y. diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile -index de49898112db..d1808eca2581 100644 +index de49898112db8..d1808eca25810 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,2 +1,3 @@ @@ -421577,7 +421577,7 @@ index de49898112db..d1808eca2581 100644 +obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c new file mode 100644 -index 000000000000..1aa01e98c595 +index 0000000000000..1aa01e98c5958 --- /dev/null +++ b/drivers/dma-buf/heaps/system_heap.c @@ -0,0 +1,123 @@ @@ -421708,10 +421708,10 @@ index 000000000000..1aa01e98c595 2.18.4 -From 62bcba28f37bafa4441c0f8a158bfc04a4e1357a Mon Sep 17 00:00:00 2001 +From 22a88e31cfef1d7a5aff4f8058157cae37e78698 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:40 +0000 -Subject: [PATCH 0825/1216] dma-buf: heaps: Add CMA heap to dmabuf heaps +Subject: [PATCH 0825/1224] dma-buf: heaps: Add CMA heap to dmabuf heaps Commit b61614ec318aae0c77ecd2816878d851dd61d9a6 upstream. @@ -421759,7 +421759,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-5-john. create mode 100644 drivers/dma-buf/heaps/cma_heap.c diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig -index 205052744169..a5eef06c4226 100644 +index 205052744169e..a5eef06c42264 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM @@ -421775,7 +421775,7 @@ index 205052744169..a5eef06c4226 100644 + by the Contiguous Memory Allocator (CMA). If your system has these + regions, you should say Y here. diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile -index d1808eca2581..6e54cdec3da0 100644 +index d1808eca25810..6e54cdec3da02 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,3 +1,4 @@ @@ -421785,7 +421785,7 @@ index d1808eca2581..6e54cdec3da0 100644 +obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c new file mode 100644 -index 000000000000..626cf7fd033a +index 0000000000000..626cf7fd033af --- /dev/null +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -0,0 +1,177 @@ @@ -421970,10 +421970,10 @@ index 000000000000..626cf7fd033a 2.18.4 -From c3e97159fc709cf4052bdb9ea2e4fcb75eb80045 Mon Sep 17 00:00:00 2001 +From 2b8ba88b6ac0a6599359c1e681ed8a79cb592e2e Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 3 Dec 2019 17:26:41 +0000 -Subject: [PATCH 0826/1216] kselftests: Add dma-heap test +Subject: [PATCH 0826/1224] kselftests: Add dma-heap test Commit a8779927fd86c91f5400bfcbccfa018a667d8350 upstream. @@ -422017,7 +422017,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-6-john. diff --git a/tools/testing/selftests/dmabuf-heaps/Makefile b/tools/testing/selftests/dmabuf-heaps/Makefile new file mode 100644 -index 000000000000..607c2acd2082 +index 0000000000000..607c2acd20829 --- /dev/null +++ b/tools/testing/selftests/dmabuf-heaps/Makefile @@ -0,0 +1,6 @@ @@ -422029,7 +422029,7 @@ index 000000000000..607c2acd2082 +include ../lib.mk diff --git a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c new file mode 100644 -index 000000000000..3e53ad331bdc +index 0000000000000..3e53ad331bdce --- /dev/null +++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c @@ -0,0 +1,396 @@ @@ -422433,10 +422433,10 @@ index 000000000000..3e53ad331bdc 2.18.4 -From 9aebaec09479abd2867e9ff14c475fe947fd7dfa Mon Sep 17 00:00:00 2001 +From 80d0bcc199422f3617f1ad70f6081e055b6ab54d Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Mon, 16 Dec 2019 08:34:04 -0500 -Subject: [PATCH 0827/1216] dma-buf: heaps: Use _IOCTL_ for userspace IOCTL +Subject: [PATCH 0827/1224] dma-buf: heaps: Use _IOCTL_ for userspace IOCTL identifier Commit b3b4346544b571c96d46be615b9db69a601ce4c8 upstream. @@ -422455,7 +422455,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191216133405.1001-2-afd@ti 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c -index 4f04d104ae61..a24721496114 100644 +index 4f04d104ae614..a247214961149 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -107,7 +107,7 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data) @@ -422477,7 +422477,7 @@ index 4f04d104ae61..a24721496114 100644 break; default: diff --git a/include/uapi/linux/dma-heap.h b/include/uapi/linux/dma-heap.h -index 73e7f66c1cae..6f84fa08e074 100644 +index 73e7f66c1cae1..6f84fa08e074a 100644 --- a/include/uapi/linux/dma-heap.h +++ b/include/uapi/linux/dma-heap.h @@ -42,12 +42,12 @@ struct dma_heap_allocation_data { @@ -422496,7 +422496,7 @@ index 73e7f66c1cae..6f84fa08e074 100644 #endif /* _UAPI_LINUX_DMABUF_POOL_H */ diff --git a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c -index 3e53ad331bdc..cd5e1f602ac9 100644 +index 3e53ad331bdce..cd5e1f602ac9d 100644 --- a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c +++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c @@ -116,7 +116,7 @@ static int dmabuf_heap_alloc_fdflags(int fd, size_t len, unsigned int fd_flags, @@ -422512,10 +422512,10 @@ index 3e53ad331bdc..cd5e1f602ac9 100644 2.18.4 -From 948a244e82aea66a905c7964beeb82de68d683c6 Mon Sep 17 00:00:00 2001 +From a864d147f5722c19660372a128b04a35461637ec Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Mon, 16 Dec 2019 08:34:05 -0500 -Subject: [PATCH 0828/1216] dma-buf: heaps: Remove redundant heap identifier +Subject: [PATCH 0828/1224] 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 @@ -422530,7 +422530,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191216133405.1001-3-afd@ti 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c -index 1aa01e98c595..0bf688e3c023 100644 +index 1aa01e98c5958..0bf688e3c023a 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -109,7 +109,7 @@ static int system_heap_create(void) @@ -422546,10 +422546,10 @@ index 1aa01e98c595..0bf688e3c023 100644 2.18.4 -From 7134addb204b496fb0d41e577293d1f2357e5df6 Mon Sep 17 00:00:00 2001 +From 582ba3042b950e08ae6d2cdef9c93dcde9b43070 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Mon, 16 Dec 2019 16:10:59 +0000 -Subject: [PATCH 0829/1216] dma-buf: fix resource leak on -ENOTTY error return +Subject: [PATCH 0829/1224] dma-buf: fix resource leak on -ENOTTY error return path Commit f9d3b2c600075d1f79efcd5cdb1718c2f554c0f9 upstream. @@ -422569,7 +422569,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191216161059.269492-1-coli 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c -index a24721496114..1886aee46131 100644 +index a247214961149..1886aee461315 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -157,7 +157,8 @@ static long dma_heap_ioctl(struct file *file, unsigned int ucmd, @@ -422586,10 +422586,10 @@ index a24721496114..1886aee46131 100644 2.18.4 -From 87f71d2e9886157b6e92ae32011b7832b4a043ed Mon Sep 17 00:00:00 2001 +From a42620597a2551504da9840ac0addd323521feb7 Mon Sep 17 00:00:00 2001 From: zhong jiang Date: Wed, 18 Dec 2019 00:38:22 +0530 -Subject: [PATCH 0830/1216] dma-heap: Make the symbol 'dma_heap_ioctl_cmds' +Subject: [PATCH 0830/1224] dma-heap: Make the symbol 'dma_heap_ioctl_cmds' static Commit 7d411afe8444060454a53b1f9b70ee78b3e75ef1 upstream. @@ -422610,7 +422610,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191217190822.1969-1-sumit. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c -index 1886aee46131..afd22c9dbdcf 100644 +index 1886aee461315..afd22c9dbdcfa 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -106,7 +106,7 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data) @@ -422626,10 +422626,10 @@ index 1886aee46131..afd22c9dbdcf 100644 2.18.4 -From b340cf785b3d5ce596facba87971a83eac773861 Mon Sep 17 00:00:00 2001 +From 16132514ef8876d705722b0b9ea652b23eaf7733 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 May 2020 20:44:12 +0100 -Subject: [PATCH 0831/1216] defconfig: Add CMA and system dma-heaps to the +Subject: [PATCH 0831/1224] defconfig: Add CMA and system dma-heaps to the config The CMA dma-heap allocator can be used in place of vcsm-cma @@ -422645,7 +422645,7 @@ Signed-off-by: Dave Stevenson 5 files changed, 15 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 19c12103e367..da822a5c6ef7 100644 +index 19c12103e3677..da822a5c6ef72 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1237,6 +1237,9 @@ CONFIG_RTC_DRV_RV3029C2=m @@ -422659,7 +422659,7 @@ index 19c12103e367..da822a5c6ef7 100644 CONFIG_HD44780=m CONFIG_UIO=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 02a76e3d071d..3f977b02ce89 100644 +index 02a76e3d071d5..3f977b02ce89a 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1236,6 +1236,9 @@ CONFIG_RTC_DRV_RV3029C2=m @@ -422673,7 +422673,7 @@ index 02a76e3d071d..3f977b02ce89 100644 CONFIG_HD44780=m CONFIG_UIO=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index e3ff4e45fc54..34ac60ce6384 100644 +index e3ff4e45fc547..34ac60ce63843 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1246,6 +1246,9 @@ CONFIG_RTC_DRV_RV3029C2=m @@ -422687,7 +422687,7 @@ index e3ff4e45fc54..34ac60ce6384 100644 CONFIG_HD44780=m CONFIG_UIO=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 5eb62c0ceffe..6dcbe14ac4d8 100644 +index 5eb62c0ceffed..6dcbe14ac4d8a 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1267,6 +1267,9 @@ CONFIG_RTC_DRV_RV3029C2=m @@ -422701,7 +422701,7 @@ index 5eb62c0ceffe..6dcbe14ac4d8 100644 CONFIG_HD44780=m CONFIG_UIO=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index efb1b60cbbb6..1f037a5bd4ef 100644 +index efb1b60cbbb62..1f037a5bd4ef1 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1082,6 +1082,9 @@ CONFIG_RTC_DRV_RV3029C2=m @@ -422718,10 +422718,10 @@ index efb1b60cbbb6..1f037a5bd4ef 100644 2.18.4 -From 77566dc1cdec84bd6676a80790033ba1aa7466df Mon Sep 17 00:00:00 2001 +From 37ccdf84e2a420149dab931396a99923cd19122a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 May 2020 17:02:26 +0100 -Subject: [PATCH 0832/1216] ARM: dts: Enable firmware-clocks on all Pis +Subject: [PATCH 0832/1224] ARM: dts: Enable firmware-clocks on all Pis Signed-off-by: Phil Elwell --- @@ -422729,7 +422729,7 @@ Signed-off-by: Phil Elwell 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi -index bf90fd585364..d2f5ea1f31f8 100644 +index bf90fd585364c..d2f5ea1f31f8e 100644 --- a/arch/arm/boot/dts/bcm270x.dtsi +++ b/arch/arm/boot/dts/bcm270x.dtsi @@ -7,6 +7,12 @@ @@ -422749,10 +422749,10 @@ index bf90fd585364..d2f5ea1f31f8 100644 2.18.4 -From 7fbe6344c7cd2706e6900d64e96fd49690bd078f Mon Sep 17 00:00:00 2001 +From 949be101118e480b43c75d6ae85e66eff44119e2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 May 2020 17:17:45 +0100 -Subject: [PATCH 0833/1216] configs: Include the firmware-clocks driver +Subject: [PATCH 0833/1224] configs: Include the firmware-clocks driver Signed-off-by: Phil Elwell --- @@ -422762,7 +422762,7 @@ Signed-off-by: Phil Elwell 3 files changed, 3 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index da822a5c6ef7..38bd15616539 100644 +index da822a5c6ef72..38bd156165391 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1287,6 +1287,7 @@ CONFIG_SND_BCM2835=m @@ -422774,7 +422774,7 @@ index da822a5c6ef7..38bd15616539 100644 CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 34ac60ce6384..392f5cc9312f 100644 +index 34ac60ce63843..392f5cc9312f1 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1296,6 +1296,7 @@ CONFIG_SND_BCM2835=m @@ -422786,7 +422786,7 @@ index 34ac60ce6384..392f5cc9312f 100644 CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 1f037a5bd4ef..f546bc80c8b1 100644 +index 1f037a5bd4ef1..f546bc80c8b17 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1128,6 +1128,7 @@ CONFIG_SND_BCM2835=m @@ -422801,10 +422801,10 @@ index 1f037a5bd4ef..f546bc80c8b1 100644 2.18.4 -From 3def915311f680d6c381a36e4c8354e80d6004e3 Mon Sep 17 00:00:00 2001 +From 4f3b813262ff3701829a464db8d3e640c8b05253 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 12 May 2020 17:18:28 +0100 -Subject: [PATCH 0834/1216] configs: Use the upstream cpufreq driver +Subject: [PATCH 0834/1224] configs: Use the upstream cpufreq driver Switch to the upstream cpufreq driver on non-BCM2835 Pis. @@ -422816,7 +422816,7 @@ Signed-off-by: Phil Elwell 3 files changed, 7 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 38bd15616539..20fced93a36a 100644 +index 38bd156165391..20fced93a36a3 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -48,6 +48,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y @@ -422830,7 +422830,7 @@ index 38bd15616539..20fced93a36a 100644 CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 6dcbe14ac4d8..1fff60a1a876 100644 +index 6dcbe14ac4d8a..1fff60a1a876f 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -55,6 +55,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y @@ -422842,7 +422842,7 @@ index 6dcbe14ac4d8..1fff60a1a876 100644 CONFIG_VIRTUALIZATION=y CONFIG_KVM=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index f546bc80c8b1..05a9f0ef9508 100644 +index f546bc80c8b17..05a9f0ef9508d 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -53,6 +53,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y @@ -422859,10 +422859,10 @@ index f546bc80c8b1..05a9f0ef9508 100644 2.18.4 -From 9937de207e11cd91cb618e28977528497fcfe90d Mon Sep 17 00:00:00 2001 +From 539ba114022ff44c81baae6a1fce0e5668559343 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 May 2020 18:28:27 +0100 -Subject: [PATCH 0835/1216] media: bcm2835-unicam: Always service interrupts +Subject: [PATCH 0835/1224] 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 @@ -422880,7 +422880,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 15 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 6fd1b0939a07..aadc2ab6ec91 100644 +index 6fd1b0939a07a..aadc2ab6ec911 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -766,12 +766,6 @@ static int unicam_all_nodes_streaming(struct unicam_device *dev) @@ -422916,10 +422916,10 @@ index 6fd1b0939a07..aadc2ab6ec91 100644 2.18.4 -From 5557f6f16877e8200c487b4b6048c9714d216a3a Mon Sep 17 00:00:00 2001 +From 67adffd3270c6c7f72c1d2b5ce386bd430365c60 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 May 2020 20:10:15 +0100 -Subject: [PATCH 0836/1216] sc16is7xx: Fix for hardware flow control +Subject: [PATCH 0836/1224] sc16is7xx: Fix for hardware flow control The SC16IS7XX hardware flow control is mishandled by the driver in a number of ways: @@ -422943,7 +422943,7 @@ Signed-off-by: Phil Elwell 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c -index fe486498530d..7eda5b1eb1d9 100644 +index fe486498530da..7eda5b1eb1d9b 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -523,8 +523,9 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud) @@ -422992,10 +422992,10 @@ index fe486498530d..7eda5b1eb1d9 100644 2.18.4 -From bc2d68dcd3b42ea564868564650680a7700311fe Mon Sep 17 00:00:00 2001 +From b0f5f08ad0449f5385d5d523bbb283077499189d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 14 May 2020 14:44:15 +0100 -Subject: [PATCH 0837/1216] drm/vc4: Fix VIC usage with Broadcast RGB +Subject: [PATCH 0837/1224] 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 @@ -423010,7 +423010,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 6701cd3a0249..25a1f066e62c 100644 +index 6701cd3a0249a..25a1f066e62c5 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -936,19 +936,14 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -423056,10 +423056,10 @@ index 6701cd3a0249..25a1f066e62c 100644 2.18.4 -From a7eeb98bbce59509f3eaa9021cdbefa9e058e95d Mon Sep 17 00:00:00 2001 +From 5ead3e79f9950e691c1470823f19e8c90e64c043 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:42:10 +0100 -Subject: [PATCH 0838/1216] staging: vc04_services: mmal-vchiq: Update +Subject: [PATCH 0838/1224] staging: vc04_services: mmal-vchiq: Update parameters list Adds in a couple of new MMAL parameter defines. @@ -423070,7 +423070,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 6 insertions(+) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h -index 9c752db45565..5b596b5c057f 100644 +index 9c752db455658..5b596b5c057f8 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h @@ -668,6 +668,12 @@ enum mmal_parameter_video_type { @@ -423090,10 +423090,10 @@ index 9c752db45565..5b596b5c057f 100644 2.18.4 -From f483d2348bc9182928881f2850c0f68c9d258589 Mon Sep 17 00:00:00 2001 +From a87ac23016a0f91a53a027398e6b8d9e72004b1d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:43:08 +0100 -Subject: [PATCH 0839/1216] staging:vc04_services: bcm2835-codec: Request +Subject: [PATCH 0839/1224] staging:vc04_services: bcm2835-codec: Request headers with I-frame V4L2 wishes to have the codec header bytes in the same buffer as the @@ -423106,7 +423106,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 5 insertions(+) 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 50395795c3db..3c819e251513 100644 +index 50395795c3dba..3c819e2515137 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1967,6 +1967,11 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx) @@ -423125,10 +423125,10 @@ index 50395795c3db..3c819e251513 100644 2.18.4 -From 2c73f3a8ce65ae452edbc68a3561515fc755e09c Mon Sep 17 00:00:00 2001 +From 080168b9c1fa35a6620f4f1960adffbbbaaded5c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:47:13 +0100 -Subject: [PATCH 0840/1216] staging:vc04_services: bcm2835-codec: Avoid +Subject: [PATCH 0840/1224] staging:vc04_services: bcm2835-codec: Avoid fragmenting buffers The firmware by default is quite happy to fragment encoded @@ -423141,7 +423141,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 8 insertions(+) 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 3c819e251513..1c7fbba6c9c8 100644 +index 3c819e2515137..1c7fbba6c9c85 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1972,6 +1972,14 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx) @@ -423163,10 +423163,10 @@ index 3c819e251513..1c7fbba6c9c8 100644 2.18.4 -From fc3c705c19c75346495df25488f4586c057ab4dc Mon Sep 17 00:00:00 2001 +From 78721ea5b0b9f8c40283f02fe0a0b7ee14a5c27f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 May 2020 13:48:59 +0100 -Subject: [PATCH 0841/1216] staging:vc04_services: bcm2835-camera: Request +Subject: [PATCH 0841/1224] staging:vc04_services: bcm2835-camera: Request headers with I-frame V4L2 wishes to have the codec header bytes in the same buffer as the @@ -423179,7 +423179,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 6 insertions(+) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -index e69ec072c2c7..b7214741fa61 100644 +index e69ec072c2c77..b7214741fa613 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -1762,6 +1762,12 @@ static int mmal_init(struct bm2835_mmal_dev *dev) @@ -423199,10 +423199,10 @@ index e69ec072c2c7..b7214741fa61 100644 2.18.4 -From ece39f2ea6373e0d4776b9c36ed82e3b46a66664 Mon Sep 17 00:00:00 2001 +From 5834e5787f52fb50292c0c77900ccc7191df00ad Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 15 May 2020 17:18:20 +0100 -Subject: [PATCH 0842/1216] configs: Restore missing NF_TABLES settings +Subject: [PATCH 0842/1224] configs: Restore missing NF_TABLES settings The arm bcm2711_defconfig and the arm64 bcmrpi3_defconfig have been missing their NF_TABLES settings. Restore them. @@ -423216,7 +423216,7 @@ Signed-off-by: Phil Elwell 2 files changed, 80 insertions(+) diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 3f977b02ce89..5b490f1a7916 100644 +index 3f977b02ce89a..5b490f1a79169 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -137,6 +137,36 @@ CONFIG_NF_CONNTRACK_SANE=m @@ -423288,7 +423288,7 @@ index 3f977b02ce89..5b490f1a7916 100644 CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 05a9f0ef9508..da5a47b18b19 100644 +index 05a9f0ef9508d..da5a47b18b19e 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -128,6 +128,36 @@ CONFIG_NF_CONNTRACK_SANE=m @@ -423363,10 +423363,10 @@ index 05a9f0ef9508..da5a47b18b19 100644 2.18.4 -From a8d062f1c5e11f065acc39a71eed91c07e491a32 Mon Sep 17 00:00:00 2001 +From 427115404351a9543bb871c49721b2ebf74d8ae1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 18 May 2020 09:46:48 +0100 -Subject: [PATCH 0843/1216] overlays: Fix audio parameter of vc4-kms-v3d +Subject: [PATCH 0843/1224] overlays: Fix audio parameter of vc4-kms-v3d The CMA handling change broke the audio parameter - the fragment numbering has changed - so fix it. @@ -423379,7 +423379,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts -index b40aa1d8f432..caa64bfb95a7 100644 +index b40aa1d8f432b..caa64bfb95a72 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts @@ -109,6 +109,6 @@ @@ -423394,10 +423394,10 @@ index b40aa1d8f432..caa64bfb95a7 100644 2.18.4 -From ff0411c59a97e238fe7f506445c3db0dc1302ffa Mon Sep 17 00:00:00 2001 +From afce85ddd86d11f3f86d74b9f4c4a5d970199521 Mon Sep 17 00:00:00 2001 From: j-schambacher Date: Tue, 19 May 2020 13:56:17 +0200 -Subject: [PATCH 0844/1216] Switch to snd_soc_dai_set_bclk_ratio Replaces +Subject: [PATCH 0844/1224] Switch to snd_soc_dai_set_bclk_ratio Replaces obsolete function snd_soc_dai_set_tdm_slot Signed-off-by: Joerg Schambacher @@ -423406,7 +423406,7 @@ Signed-off-by: Joerg Schambacher 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c -index ffa76014e7df..a7fab4d951b6 100644 +index ffa76014e7df6..a7fab4d951b6e 100644 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c @@ -406,21 +406,14 @@ static int snd_rpi_hifiberry_dacplusadcpro_hw_params( @@ -423438,10 +423438,10 @@ index ffa76014e7df..a7fab4d951b6 100644 2.18.4 -From 600074841ffc505391ef176aa0463d0a47184e0e Mon Sep 17 00:00:00 2001 +From e3b3fa1e79f97e847c80d9bdfa412238fdb7bdcc Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 11:46:47 +0100 -Subject: [PATCH 0845/1216] media: bcm2835-unicam: Retain packing information +Subject: [PATCH 0845/1224] media: bcm2835-unicam: Retain packing information on G_FMT The change to retrieve the pixel format always on g_fmt didn't @@ -423459,7 +423459,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index aadc2ab6ec91..c4e7d2177193 100644 +index aadc2ab6ec911..c4e7d21771937 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -974,8 +974,23 @@ static int unicam_g_fmt_vid_cap(struct file *file, void *priv, @@ -423492,10 +423492,10 @@ index aadc2ab6ec91..c4e7d2177193 100644 2.18.4 -From 6e0d21984d97c0f022116a1acfe54ccb5322f038 Mon Sep 17 00:00:00 2001 +From 5772e97680e33292185522d30ac0e96de46b5a2f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 May 2020 15:47:02 +0100 -Subject: [PATCH 0846/1216] zswap: Uncross module parameter setting functions +Subject: [PATCH 0846/1224] 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 @@ -423512,7 +423512,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c -index 46a322316e52..b0fc8d9ffe1f 100644 +index 46a322316e52c..b0fc8d9ffe1fb 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -761,13 +761,13 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, @@ -423535,10 +423535,10 @@ index 46a322316e52..b0fc8d9ffe1f 100644 2.18.4 -From d006ff2279cac1a64f91bd750a357f093293b980 Mon Sep 17 00:00:00 2001 +From fa3128e045672665bd2f029c637bff82045a4dff Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 15:23:32 +0100 -Subject: [PATCH 0847/1216] zswap: Defer zswap initialisation +Subject: [PATCH 0847/1224] 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 @@ -423556,7 +423556,7 @@ Signed-off-by: Phil Elwell 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c -index b0fc8d9ffe1f..a347f8df45c1 100644 +index b0fc8d9ffe1fb..a347f8df45c18 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -564,8 +564,9 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) @@ -423656,10 +423656,10 @@ index b0fc8d9ffe1f..a347f8df45c1 100644 2.18.4 -From 141f36c8f0f9e8bb3b29e3f3492d0560cfd8fe7b Mon Sep 17 00:00:00 2001 +From b72dff2d84821db60b99f6dfc46fc188d189536a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 May 2020 15:25:06 +0100 -Subject: [PATCH 0848/1216] configs: Add ZSWAP=y, ZBUD=m, Z3FOLD=m +Subject: [PATCH 0848/1224] configs: Add ZSWAP=y, ZBUD=m, Z3FOLD=m Signed-off-by: Phil Elwell --- @@ -423671,7 +423671,7 @@ Signed-off-by: Phil Elwell 5 files changed, 15 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 20fced93a36a..7581b253e359 100644 +index 20fced93a36a3..7581b253e359a 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -74,6 +74,9 @@ CONFIG_BINFMT_MISC=m @@ -423685,7 +423685,7 @@ index 20fced93a36a..7581b253e359 100644 CONFIG_PGTABLE_MAPPING=y CONFIG_NET=y diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 5b490f1a7916..d68934954ad7 100644 +index 5b490f1a79169..d68934954ad70 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -77,6 +77,9 @@ CONFIG_BINFMT_MISC=m @@ -423699,7 +423699,7 @@ index 5b490f1a7916..d68934954ad7 100644 CONFIG_PGTABLE_MAPPING=y CONFIG_NET=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 392f5cc9312f..7ed163999a2e 100644 +index 392f5cc9312f1..7ed163999a2ee 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -64,6 +64,9 @@ CONFIG_BINFMT_MISC=m @@ -423713,7 +423713,7 @@ index 392f5cc9312f..7ed163999a2e 100644 CONFIG_PGTABLE_MAPPING=y CONFIG_NET=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 1fff60a1a876..05d721c25d2d 100644 +index 1fff60a1a876f..05d721c25d2d6 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -76,6 +76,9 @@ CONFIG_BINFMT_MISC=m @@ -423727,7 +423727,7 @@ index 1fff60a1a876..05d721c25d2d 100644 CONFIG_PGTABLE_MAPPING=y CONFIG_NET=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index da5a47b18b19..4b232432e240 100644 +index da5a47b18b19e..4b232432e240e 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -71,6 +71,9 @@ CONFIG_BINFMT_MISC=y @@ -423744,10 +423744,10 @@ index da5a47b18b19..4b232432e240 100644 2.18.4 -From 117ae2be2496e16e46a15bf357c3ae4d9204159f Mon Sep 17 00:00:00 2001 +From ae2baef13672ba40b9942647b5c1964f1c0dd20b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 14:54:28 +0100 -Subject: [PATCH 0849/1216] drm/vc4: Adopt the dma configuration from the HVS +Subject: [PATCH 0849/1224] 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 @@ -423765,7 +423765,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 18 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c -index 68f9db6c4c87..82fd80547bb1 100644 +index 68f9db6c4c878..82fd80547bb11 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -249,6 +249,14 @@ static void vc4_match_add_drivers(struct device *dev, @@ -423804,10 +423804,10 @@ index 68f9db6c4c87..82fd80547bb1 100644 2.18.4 -From 1da25f120a008b6a353ff12f105f02ed27125522 Mon Sep 17 00:00:00 2001 +From 73aa9266bff29434c3a5926e3296e9dcc6594819 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 16:20:30 +0100 -Subject: [PATCH 0850/1216] drm/vc4: Add FKMS as an acceptable node for dma +Subject: [PATCH 0850/1224] drm/vc4: Add FKMS as an acceptable node for dma ranges. Under FKMS, the firmware (via FKMS) also requires the VideoCore cache @@ -423822,7 +423822,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c -index 82fd80547bb1..2e1b2e51aff0 100644 +index 82fd80547bb11..2e1b2e51aff04 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -251,6 +251,7 @@ static void vc4_match_add_drivers(struct device *dev, @@ -423837,10 +423837,10 @@ index 82fd80547bb1..2e1b2e51aff0 100644 2.18.4 -From 4aa8d26e76711a46270bc5b1f3192ea173231464 Mon Sep 17 00:00:00 2001 +From d96782fc8cbf29ef9578baf7a92dd5877a3cece2 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 16:56:33 +0100 -Subject: [PATCH 0851/1216] media: i2c: imx477: Return correct result on sensor +Subject: [PATCH 0851/1224] media: i2c: imx477: Return correct result on sensor id verification The test should return -EIO if the register read id does not match @@ -423852,7 +423852,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c -index bd0e2c291a32..e42a8633087d 100644 +index bd0e2c291a321..e42a8633087d4 100644 --- a/drivers/media/i2c/imx477.c +++ b/drivers/media/i2c/imx477.c @@ -1919,7 +1919,7 @@ static int imx477_identify_module(struct imx477 *imx477) @@ -423868,10 +423868,10 @@ index bd0e2c291a32..e42a8633087d 100644 2.18.4 -From 132c2ca729c18ad66bd2065a72afff6986c37d55 Mon Sep 17 00:00:00 2001 +From f59b7da1a0124e3ba477fa4beb1c0880980d4e57 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 May 2020 16:36:33 +0100 -Subject: [PATCH 0852/1216] staging: vchiq_arm: Clean up 40-bit DMA support +Subject: [PATCH 0852/1224] 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- @@ -423886,7 +423886,7 @@ Signed-off-by: Phil Elwell 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c -index 2dfdee1f814f..d6a6ca9e06ec 100644 +index 2dfdee1f814f1..d6a6ca9e06ec6 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -16,8 +16,6 @@ @@ -424000,7 +424000,7 @@ index 2dfdee1f814f..d6a6ca9e06ec 100644 /* Note: addrs is the address + page_count - 1 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index d01c2d424310..d55f038637fc 100644 +index d01c2d4243104..d55f038637fc4 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -3205,22 +3205,8 @@ vchiq_register_child(struct platform_device *pdev, const char *name) @@ -424030,10 +424030,10 @@ index d01c2d424310..d55f038637fc 100644 2.18.4 -From f371ff77ebe09a3bb86382c528d4484032383f22 Mon Sep 17 00:00:00 2001 +From 8626b17ba455f25ee7c529525bc2d76c8490d022 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 May 2020 16:36:57 +0100 -Subject: [PATCH 0853/1216] ARM: dts: Update for new VCHIQ BCM2711 DMA support +Subject: [PATCH 0853/1224] 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, @@ -424045,7 +424045,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 2c55c78bd7cb..46bcfd586f17 100644 +index 2c55c78bd7cb3..46bcfd586f173 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -4,7 +4,6 @@ @@ -424103,10 +424103,10 @@ index 2c55c78bd7cb..46bcfd586f17 100644 2.18.4 -From 5f1dec4856585160404b9ede60a9684b896fc78e Mon Sep 17 00:00:00 2001 +From c7728e5bf35f426f7c332275bd4645760a40e7c4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 25 May 2020 21:52:40 +0100 -Subject: [PATCH 0854/1216] Revert "zswap: Uncross module parameter setting +Subject: [PATCH 0854/1224] Revert "zswap: Uncross module parameter setting functions" This reverts commit e5e8a2214dff0c43580afc5dc22d496f667c3bbf. @@ -424115,7 +424115,7 @@ This reverts commit e5e8a2214dff0c43580afc5dc22d496f667c3bbf. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c -index a347f8df45c1..232f4565e795 100644 +index a347f8df45c18..232f4565e7957 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -774,13 +774,13 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, @@ -424138,10 +424138,10 @@ index a347f8df45c1..232f4565e795 100644 2.18.4 -From 23c9b3067177117ad3b58ad5f3e7fd2a611de3a6 Mon Sep 17 00:00:00 2001 +From beb9a2a1ff7fd7a844d8e1bc658613f4acc6e7a4 Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 28 May 2020 11:09:48 +0100 -Subject: [PATCH 0855/1216] media: bcm2835-unicam: change minimum number of +Subject: [PATCH 0855/1224] 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 @@ -424156,7 +424156,7 @@ Signed-off-by: David Plowman 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index c4e7d2177193..47b2d3a03fbf 100644 +index c4e7d21771937..47b2d3a03fbfa 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -2404,7 +2404,7 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node, @@ -424172,10 +424172,10 @@ index c4e7d2177193..47b2d3a03fbf 100644 2.18.4 -From 845e36f0fcad81a22a35181ab71ff88e88873638 Mon Sep 17 00:00:00 2001 +From b4a411b30d443d66c9ada20c05a731ccbad30c52 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:15 +0100 -Subject: [PATCH 0856/1216] dt-bindings: Add Broadcom AVS RO thermal +Subject: [PATCH 0856/1224] dt-bindings: Add Broadcom AVS RO thermal Commit ee31ff373da6602e7a4e60fe11322b41ac38eb22 upstream. @@ -424196,7 +424196,7 @@ Signed-off-by: Chen-Yu Tsai diff --git a/Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml b/Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml new file mode 100644 -index 000000000000..98e7b57bfa13 +index 0000000000000..98e7b57bfa13a --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml @@ -0,0 +1,45 @@ @@ -424249,10 +424249,10 @@ index 000000000000..98e7b57bfa13 2.18.4 -From e8de50d46e80df0e50f5bfa5722eac74bd01de4a Mon Sep 17 00:00:00 2001 +From a7c5f40e5e2e1c85e17bdbe85db00de2bd80e607 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:16 +0100 -Subject: [PATCH 0857/1216] thermal: Add BCM2711 thermal driver +Subject: [PATCH 0857/1224] thermal: Add BCM2711 thermal driver Commit 59b781352dc4cb9ae27a8ddae0cda979d29d8af7 upstream. @@ -424275,7 +424275,7 @@ Signed-off-by: Chen-Yu Tsai create mode 100644 drivers/thermal/broadcom/bcm2711_thermal.c diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig -index 54a9748feac5..42c6b22b35ce 100644 +index 54a9748feac5d..42c6b22b35ce7 100644 --- a/drivers/thermal/broadcom/Kconfig +++ b/drivers/thermal/broadcom/Kconfig @@ -1,4 +1,11 @@ @@ -424291,7 +424291,7 @@ index 54a9748feac5..42c6b22b35ce 100644 tristate "Thermal sensors on bcm2835 SoC" depends on ARCH_BCM2835 || COMPILE_TEST diff --git a/drivers/thermal/broadcom/Makefile b/drivers/thermal/broadcom/Makefile -index 490ab1f7a86d..c917b243d5f0 100644 +index 490ab1f7a86df..c917b243d5f00 100644 --- a/drivers/thermal/broadcom/Makefile +++ b/drivers/thermal/broadcom/Makefile @@ -1,4 +1,5 @@ @@ -424302,7 +424302,7 @@ index 490ab1f7a86d..c917b243d5f0 100644 obj-$(CONFIG_BCM_NS_THERMAL) += ns-thermal.o diff --git a/drivers/thermal/broadcom/bcm2711_thermal.c b/drivers/thermal/broadcom/bcm2711_thermal.c new file mode 100644 -index 000000000000..67c2a737bc9d +index 0000000000000..67c2a737bc9d9 --- /dev/null +++ b/drivers/thermal/broadcom/bcm2711_thermal.c @@ -0,0 +1,123 @@ @@ -424433,10 +424433,10 @@ index 000000000000..67c2a737bc9d 2.18.4 -From daba8b51bc4ab045c0a5460121628a3837fc2ac3 Mon Sep 17 00:00:00 2001 +From c1786d9d446a6c587b8724cc8fe2bbad38a39813 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:17 +0100 -Subject: [PATCH 0858/1216] ARM: dts: bcm2711: Enable thermal +Subject: [PATCH 0858/1224] ARM: dts: bcm2711: Enable thermal Commit a1d6989bf12b01cd9198e2c31a96678ac9c47415 upstream. @@ -424455,7 +424455,7 @@ Signed-off-by: Chen-Yu Tsai 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 96ef133391d1..20114a723cf9 100644 +index 96ef133391d1c..20114a723cf94 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -64,6 +64,17 @@ @@ -424488,10 +424488,10 @@ index 96ef133391d1..20114a723cf9 100644 2.18.4 -From ba0daaa11f7cd632408f90fb3bdf71a470394321 Mon Sep 17 00:00:00 2001 +From 6d86df23fe354e26b1dbde817e3c9a27f31e51eb Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 13 Jan 2020 19:56:18 +0100 -Subject: [PATCH 0859/1216] ARM: configs: Build BCM2711 thermal as module +Subject: [PATCH 0859/1224] ARM: configs: Build BCM2711 thermal as module Commit 1a90e73248c4d0add6583bd88bb5e082c3e090bc upstream. @@ -424510,7 +424510,7 @@ Signed-off-by: Chen-Yu Tsai 2 files changed, 2 insertions(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig -index e4c8def9a0a5..458d8a07d7e2 100644 +index e4c8def9a0a57..458d8a07d7e2a 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -487,6 +487,7 @@ CONFIG_IMX_THERMAL=y @@ -424522,7 +424522,7 @@ index e4c8def9a0a5..458d8a07d7e2 100644 CONFIG_BRCMSTB_THERMAL=m CONFIG_ST_THERMAL_MEMMAP=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index c9a867ac32d4..4486777c7f86 100644 +index c9a867ac32d48..4486777c7f86e 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -444,6 +444,7 @@ CONFIG_ROCKCHIP_THERMAL=m @@ -424537,10 +424537,10 @@ index c9a867ac32d4..4486777c7f86 100644 2.18.4 -From e4dbd5d08370ebc5c370eeee4027bfe2b14dc6aa Mon Sep 17 00:00:00 2001 +From 9e29803263638717e6e82fde0099664ba36240db Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2020 17:24:24 +0800 -Subject: [PATCH 0860/1216] Revert "thermal: brcmstb_thermal: Correct SoC name" +Subject: [PATCH 0860/1224] Revert "thermal: brcmstb_thermal: Correct SoC name" This reverts commit 6642a4f0769be5732fd372a5637fc1b01d62f93a. @@ -424550,7 +424550,7 @@ Signed-off-by: Chen-Yu Tsai 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c -index 08f71fec5152..7a7c6ad7b8a0 100644 +index 08f71fec51520..7a7c6ad7b8a04 100644 --- a/drivers/thermal/broadcom/brcmstb_thermal.c +++ b/drivers/thermal/broadcom/brcmstb_thermal.c @@ -290,7 +290,7 @@ static const struct thermal_zone_of_device_ops bcm7445_thermal_of_ops = { @@ -424588,10 +424588,10 @@ index 08f71fec5152..7a7c6ad7b8a0 100644 2.18.4 -From b83e7df685810e8af87352dd7ea6834563ee96fa Mon Sep 17 00:00:00 2001 +From 247993420d0ea6159817ac5e0ca73d78c57e631d Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2020 17:24:28 +0800 -Subject: [PATCH 0861/1216] Revert "thermal: brcmstb_thermal: Add BCM2838 +Subject: [PATCH 0861/1224] Revert "thermal: brcmstb_thermal: Add BCM2838 support" This reverts commit 9d62448adc918a94fba091d475d0e6f1648c36f4. @@ -424603,7 +424603,7 @@ Signed-off-by: Chen-Yu Tsai 2 files changed, 9 insertions(+), 54 deletions(-) diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig -index 42c6b22b35ce..061f1db6edc9 100644 +index 42c6b22b35ce7..061f1db6edc9e 100644 --- a/drivers/thermal/broadcom/Kconfig +++ b/drivers/thermal/broadcom/Kconfig @@ -16,7 +16,7 @@ config BCM2835_THERMAL @@ -424616,7 +424616,7 @@ index 42c6b22b35ce..061f1db6edc9 100644 Enable this driver if you have a Broadcom STB SoC and would like thermal framework support. diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c -index 7a7c6ad7b8a0..680f1a070606 100644 +index 7a7c6ad7b8a04..680f1a0706065 100644 --- a/drivers/thermal/broadcom/brcmstb_thermal.c +++ b/drivers/thermal/broadcom/brcmstb_thermal.c @@ -10,7 +10,6 @@ @@ -424748,10 +424748,10 @@ index 7a7c6ad7b8a0..680f1a070606 100644 2.18.4 -From 27618d7da4fcc087ca93a403e9c2d81f9bbfae75 Mon Sep 17 00:00:00 2001 +From cfb27b9abfa0b265567e537e1ffaebc22f123518 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2020 17:39:30 +0800 -Subject: [PATCH 0862/1216] ARM: dts: bcm2711-rpi: Remove downstream thermal +Subject: [PATCH 0862/1224] ARM: dts: bcm2711-rpi: Remove downstream thermal sensor node Signed-off-by: Chen-Yu Tsai @@ -424760,7 +424760,7 @@ Signed-off-by: Chen-Yu Tsai 1 file changed, 14 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 46bcfd586f17..05e51a05bf56 100644 +index 46bcfd586f173..05e51a05bf56c 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -50,16 +50,6 @@ @@ -424795,10 +424795,10 @@ index 46bcfd586f17..05e51a05bf56 100644 2.18.4 -From b018a4be7a8667075d5c0256a14ae74eb233690b Mon Sep 17 00:00:00 2001 +From 841feeec2dd87ad0943b4b3892b35df341fb0354 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Fri, 15 May 2020 15:38:12 +0800 -Subject: [PATCH 0863/1216] configs: Switch to upstream thermal sensor for RPi +Subject: [PATCH 0863/1224] configs: Switch to upstream thermal sensor for RPi 4 - BCM2711_THERMAL Signed-off-by: Chen-Yu Tsai @@ -424808,7 +424808,7 @@ Signed-off-by: Chen-Yu Tsai 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index d68934954ad7..c2b7263db6e4 100644 +index d68934954ad70..c2b7263db6e47 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -731,13 +731,14 @@ CONFIG_SENSORS_SHTC1=m @@ -424828,7 +424828,7 @@ index d68934954ad7..c2b7263db6e4 100644 CONFIG_MFD_ARIZONA_SPI=m CONFIG_MFD_WM5102=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 05d721c25d2d..09d3180c9fd9 100644 +index 05d721c25d2d6..09d3180c9fd97 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -725,13 +725,14 @@ CONFIG_SENSORS_SHTC1=m @@ -424851,10 +424851,10 @@ index 05d721c25d2d..09d3180c9fd9 100644 2.18.4 -From e7c039d72ff54b2558d42500481d79c3858fcbf5 Mon Sep 17 00:00:00 2001 +From 4b8b556bb5554234b2a53bc0e11182aab138f7fd Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Fri, 15 May 2020 15:56:14 +0800 -Subject: [PATCH 0864/1216] configs: Build HWMON core into kernel +Subject: [PATCH 0864/1224] 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. @@ -424869,7 +424869,7 @@ Signed-off-by: Chen-Yu Tsai 5 files changed, 5 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 7581b253e359..6b8c0f506b5f 100644 +index 7581b253e359a..6b8c0f506b5fd 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -707,7 +707,6 @@ CONFIG_POWER_RESET_GPIO=y @@ -424881,7 +424881,7 @@ index 7581b253e359..6b8c0f506b5f 100644 CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_JC42=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index c2b7263db6e4..6dd5e643a32c 100644 +index c2b7263db6e47..6dd5e643a32c4 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -718,7 +718,6 @@ CONFIG_POWER_RESET_GPIO=y @@ -424893,7 +424893,7 @@ index c2b7263db6e4..6dd5e643a32c 100644 CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_JC42=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 7ed163999a2e..2e899053607a 100644 +index 7ed163999a2ee..2e899053607a0 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -696,7 +696,6 @@ CONFIG_POWER_RESET_GPIO=y @@ -424905,7 +424905,7 @@ index 7ed163999a2e..2e899053607a 100644 CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_JC42=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 09d3180c9fd9..8a5702bbb37a 100644 +index 09d3180c9fd97..8a5702bbb37a7 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -712,7 +712,6 @@ CONFIG_POWER_RESET_GPIO=y @@ -424917,7 +424917,7 @@ index 09d3180c9fd9..8a5702bbb37a 100644 CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_JC42=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 4b232432e240..585a975caf2a 100644 +index 4b232432e240e..585a975caf2a9 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -678,7 +678,6 @@ CONFIG_W1_SLAVE_DS28E17=m @@ -424932,10 +424932,10 @@ index 4b232432e240..585a975caf2a 100644 2.18.4 -From 09a2dbfed3e99c2d83f46650be9d7edc7f0dc9df Mon Sep 17 00:00:00 2001 +From ab789c1f657d46b57bda137f7fcaeb0daaefc606 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 May 2020 09:46:12 +0100 -Subject: [PATCH 0865/1216] brcmfmac: BCM43436 needs dedicated firmware +Subject: [PATCH 0865/1224] brcmfmac: BCM43436 needs dedicated firmware Signed-off-by: Phil Elwell --- @@ -424943,7 +424943,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index 0c9f5b5791e9..bc858aaaddf9 100644 +index 0c9f5b5791e93..bc858aaaddf99 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -611,6 +611,7 @@ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio"); @@ -424968,10 +424968,10 @@ index 0c9f5b5791e9..bc858aaaddf9 100644 2.18.4 -From 189bcd308e573d23297b2e56b833be0d39120d8d Mon Sep 17 00:00:00 2001 +From 5620f1c3c973b276592cf122b0dcd64cacf72f36 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 May 2020 14:41:13 +0100 -Subject: [PATCH 0866/1216] overlays: i2c-rtc: Fix trickle-resistor-ohms param +Subject: [PATCH 0866/1224] 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. @@ -424984,7 +424984,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts -index 5df390b52a7b..24c86974b0db 100644 +index 5df390b52a7bb..24c86974b0dbd 100644 --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts @@ -229,7 +229,7 @@ @@ -425000,10 +425000,10 @@ index 5df390b52a7b..24c86974b0db 100644 2.18.4 -From f0244f4bac3172dbee81b8e7f1ea45d78ce08e2c Mon Sep 17 00:00:00 2001 +From 7c6b14123ea169bc8b53af3a0d9f204c2e64f5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 30 Apr 2020 19:40:07 +0200 -Subject: [PATCH 0867/1216] overlays: gpio-shutdown: Add information for SysV +Subject: [PATCH 0867/1224] overlays: gpio-shutdown: Add information for SysV init / inittab KeyboardSignal and kb::kbrequest can be used to call /sbin/shutdown @@ -425012,7 +425012,7 @@ KeyboardSignal and kb::kbrequest can be used to call /sbin/shutdown 1 file changed, 24 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 0a9c9ec6cc8d..2afd499b2808 100644 +index 0a9c9ec6cc8d0..2afd499b2808c 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -847,6 +847,7 @@ Params: gpiopin GPIO for signalling (default 26) @@ -425057,10 +425057,10 @@ index 0a9c9ec6cc8d..2afd499b2808 100644 2.18.4 -From 08aa63c50ae1f1fd75d1e3ff3f357c366cd639fd Mon Sep 17 00:00:00 2001 +From 31eeca1fc158b0ec79aff5c5bc8639aa56aa212b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 30 Apr 2020 19:41:10 +0200 -Subject: [PATCH 0868/1216] overlays: gpio-shutdown: Add information for +Subject: [PATCH 0868/1224] 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. @@ -425070,7 +425070,7 @@ Raspberry Pi 1 Model B rev 1 uses GPIO1 for power-up instead of GPIO3. 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 2afd499b2808..4dfd7923492c 100644 +index 2afd499b2808c..4dfd7923492c8 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -883,9 +883,14 @@ Info: Initiates a shutdown when GPIO pin changes. The given GPIO pin @@ -425100,7 +425100,7 @@ index 2afd499b2808..4dfd7923492c 100644 debounce Specify the debounce interval in milliseconds (default 100) diff --git a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts -index db07ba67781d..0a27595143ec 100644 +index db07ba67781d7..0a27595143ec1 100644 --- a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts +++ b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts @@ -4,7 +4,9 @@ @@ -425127,10 +425127,10 @@ index db07ba67781d..0a27595143ec 100644 2.18.4 -From d04b072f877e95261fd0ceeb040714469fda3bb1 Mon Sep 17 00:00:00 2001 +From 400749ed0469034037ade1217270d565397f762c Mon Sep 17 00:00:00 2001 From: bjorn Date: Thu, 7 May 2020 05:11:43 +0200 -Subject: [PATCH 0869/1216] overlays: Add spi0 overlay to support sc16is752 +Subject: [PATCH 0869/1224] overlays: Add spi0 overlay to support sc16is752 Signed-off-by: Bjorn --- @@ -425141,7 +425141,7 @@ Signed-off-by: Bjorn create mode 100644 arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index f9e7416a41ee..52fd4e684087 100644 +index f9e7416a41ee1..52fd4e6840870 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -143,6 +143,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -425153,7 +425153,7 @@ index f9e7416a41ee..52fd4e684087 100644 sdhost.dtbo \ sdio.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 4dfd7923492c..71651c85a6f2 100644 +index 4dfd7923492c8..71651c85a6f27 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2144,6 +2144,14 @@ Params: int_pin GPIO used for IRQ (default 24) @@ -425173,7 +425173,7 @@ index 4dfd7923492c..71651c85a6f2 100644 Enables the chip on SPI1. diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts new file mode 100644 -index 000000000000..ccce7ad599bc +index 0000000000000..ccce7ad599bc1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts @@ -0,0 +1,44 @@ @@ -425225,10 +425225,10 @@ index 000000000000..ccce7ad599bc 2.18.4 -From ce1dfc06c0a1132d2111589a0df2d40f464b4cfc Mon Sep 17 00:00:00 2001 +From ef7d364d3d8457c560b0fff3ddcabcdd1e15bed1 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 24 Nov 2019 16:40:48 -0600 -Subject: [PATCH 0870/1216] net: rtl8192cu: fix gcc misleading whitespace +Subject: [PATCH 0870/1224] net: rtl8192cu: fix gcc misleading whitespace warning This fixes a gcc warning about misleading whitespace. @@ -425239,7 +425239,7 @@ Signed-off-by: David Lechner 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c -index 8fa8ed51b721..bdd9c73cba3f 100755 +index 8fa8ed51b721c..bdd9c73cba3fc 100755 --- a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c @@ -1502,10 +1502,10 @@ _func_enter_; @@ -425274,10 +425274,10 @@ index 8fa8ed51b721..bdd9c73cba3f 100755 2.18.4 -From 736267d0ced21c7115ec37a057ef22aa6d690f2e Mon Sep 17 00:00:00 2001 +From fee958551f67620712d804e61c28eee3fad0062e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 May 2020 16:55:12 +0100 -Subject: [PATCH 0871/1216] overlays: i2c-rtc-gpio: Fix trickle-resistor-ohms +Subject: [PATCH 0871/1224] overlays: i2c-rtc-gpio: Fix trickle-resistor-ohms param The abx80x implementation of the trickle-resistor-ohms parameter is @@ -425291,7 +425291,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts -index 44df77459520..125bd77fff0a 100644 +index 44df77459520b..125bd77fff0a5 100644 --- a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts @@ -230,7 +230,7 @@ @@ -425307,10 +425307,10 @@ index 44df77459520..125bd77fff0a 100644 2.18.4 -From 290f540623104b74b8d9dca1d9abab4c614cf177 Mon Sep 17 00:00:00 2001 +From 4a981599071e96fbfddaedd0c7754a61f9574cfc Mon Sep 17 00:00:00 2001 From: David Plowman Date: Fri, 29 May 2020 14:36:56 +0100 -Subject: [PATCH 0872/1216] media: bcm2835-isp: fix bytes per line calculations +Subject: [PATCH 0872/1224] media: bcm2835-isp: fix bytes per line calculations for some image formats The bytes per line numbers calculated by get_bytesperline was not @@ -425326,7 +425326,7 @@ Signed-off-by: David Plowman 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c -index bd1bb760419c..bc86354ac4c6 100644 +index bd1bb760419cc..bc86354ac4c6c 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -676,7 +676,11 @@ struct bcm2835_isp_fmt *get_default_format(struct bcm2835_isp_node *node) @@ -425343,7 +425343,7 @@ index bd1bb760419c..bc86354ac4c6 100644 static inline unsigned int get_sizeimage(int bpl, int width, int height, diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h -index af3bde152bb2..40ca0f6e9c97 100644 +index af3bde152bb24..40ca0f6e9c979 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h @@ -71,7 +71,7 @@ static const struct bcm2835_isp_fmt supported_formats[] = { @@ -425395,10 +425395,10 @@ index af3bde152bb2..40ca0f6e9c97 100644 2.18.4 -From 3f187fd313a8caaa434880cbbb384f4ac5d34952 Mon Sep 17 00:00:00 2001 +From cecb739470867f64f822a48ce479abee80d9958f Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 1 Jun 2020 07:02:00 -0400 -Subject: [PATCH 0873/1216] Add Micro Crystal RV-1805 to i2c-rtc overlays +Subject: [PATCH 0873/1224] 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 @@ -425412,7 +425412,7 @@ Signed-off-by: Kevin P. Fleming 3 files changed, 56 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 71651c85a6f2..9060fe7b0d7e 100644 +index 71651c85a6f27..9060fe7b0d7ea 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1196,6 +1196,8 @@ Params: abx80x Select one of the ABx80x family: @@ -425460,7 +425460,7 @@ index 71651c85a6f2..9060fe7b0d7e 100644 wakeup-source Specify that the RTC can be used as a wakeup source diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts -index 125bd77fff0a..23813369093a 100644 +index 125bd77fff0a5..23813369093a7 100644 --- a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts @@ -204,6 +204,23 @@ @@ -425515,7 +425515,7 @@ index 125bd77fff0a..23813369093a 100644 wakeup-source = <&ds1339>,"wakeup-source?", <&ds3231>,"wakeup-source?", diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts -index 24c86974b0db..df59d93cd759 100644 +index 24c86974b0dbd..df59d93cd759b 100644 --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts @@ -203,6 +203,23 @@ @@ -425572,10 +425572,10 @@ index 24c86974b0db..df59d93cd759 100644 2.18.4 -From 00c9e8c6d756f695c4747120223b8ae0daffa9dc Mon Sep 17 00:00:00 2001 +From 6b3248ff3e0c6bd12f01309e32ce54fe24600f0f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 2 Jun 2020 10:06:05 +0100 -Subject: [PATCH 0874/1216] configs: Add SND_SOC_MAX98357A=m +Subject: [PATCH 0874/1224] configs: Add SND_SOC_MAX98357A=m Enable the MAX98357A driver. @@ -425591,7 +425591,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 6b8c0f506b5f..41a34ca374a8 100644 +index 6b8c0f506b5fd..41a34ca374a8b 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1000,6 +1000,7 @@ CONFIG_SND_SOC_AK4554=m @@ -425603,7 +425603,7 @@ index 6b8c0f506b5f..41a34ca374a8 100644 CONFIG_SND_SOC_WM8804_I2C=m CONFIG_SND_SIMPLE_CARD=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 6dd5e643a32c..c7b9f34ceb77 100644 +index 6dd5e643a32c4..c7b9f34ceb775 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -737,7 +737,6 @@ CONFIG_GPIO_WATCHDOG=m @@ -425623,7 +425623,7 @@ index 6dd5e643a32c..c7b9f34ceb77 100644 CONFIG_SND_SOC_WM8804_I2C=m CONFIG_SND_SIMPLE_CARD=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 2e899053607a..93fb7f03d31c 100644 +index 2e899053607a0..93fb7f03d31ce 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -988,6 +988,7 @@ CONFIG_SND_SOC_AK4554=m @@ -425635,7 +425635,7 @@ index 2e899053607a..93fb7f03d31c 100644 CONFIG_SND_SOC_WM8804_I2C=m CONFIG_SND_SIMPLE_CARD=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 8a5702bbb37a..448cc2ec5c4f 100644 +index 8a5702bbb37a7..448cc2ec5c4f9 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1008,6 +1008,7 @@ CONFIG_SND_SOC_AK4554=m @@ -425647,7 +425647,7 @@ index 8a5702bbb37a..448cc2ec5c4f 100644 CONFIG_SND_SOC_WM8804_I2C=m CONFIG_SND_SIMPLE_CARD=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 585a975caf2a..c82e163a095c 100644 +index 585a975caf2a9..c82e163a095c3 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -904,6 +904,7 @@ CONFIG_SND_SOC_AK4554=m @@ -425662,10 +425662,10 @@ index 585a975caf2a..c82e163a095c 100644 2.18.4 -From b70788764b8557ead51969cd281a05872230c513 Mon Sep 17 00:00:00 2001 +From 463702091e8da394e2589b70e09131b54ce68b90 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 2 Jun 2020 19:31:49 +0100 -Subject: [PATCH 0875/1216] vc4: Set driver_name for card +Subject: [PATCH 0875/1224] vc4: Set driver_name for card Allows use of the same alsa conf file for hdmi1 @@ -425675,7 +425675,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 093f424ad5b4..4ba7add2737f 100644 +index 093f424ad5b46..4ba7add2737f7 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) @@ -425690,10 +425690,10 @@ index 093f424ad5b4..4ba7add2737f 100644 2.18.4 -From bb4ffaa76b94512afcfe1c0ecbb38eb6f2af1565 Mon Sep 17 00:00:00 2001 +From 32ecf707acb7e4d5a7fc84a624bba0cc1b5e1fcf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Jun 2020 17:23:36 +0100 -Subject: [PATCH 0876/1216] staging: vchiq_arm: Use g_dma_dev for dma_unmap_sg +Subject: [PATCH 0876/1224] 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 @@ -425707,7 +425707,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c -index d6a6ca9e06ec..b396fed96f3f 100644 +index d6a6ca9e06ec6..b396fed96f3fb 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -641,7 +641,7 @@ free_pagelist(struct vchiq_pagelist_info *pagelistinfo, @@ -425723,10 +425723,10 @@ index d6a6ca9e06ec..b396fed96f3f 100644 2.18.4 -From d847a8bed9204c5d60e05416988ae8b5d368eadd Mon Sep 17 00:00:00 2001 +From f4366a9c24cc03887541df4661c2b84d09b4bba7 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 3 Jun 2020 12:20:19 +0100 -Subject: [PATCH 0877/1216] vc4: cec: Restore cec physical address on reconnect +Subject: [PATCH 0877/1224] 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 @@ -425740,7 +425740,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 4ba7add2737f..5aa5236e576d 100644 +index 4ba7add2737f7..5aa5236e576da 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 @@ -425785,10 +425785,10 @@ index 4ba7add2737f..5aa5236e576d 100644 2.18.4 -From 4af0c79b102876c7b5912e507490189b77838dce Mon Sep 17 00:00:00 2001 +From 490e2bd65f6a8b91f43367a76692c45c86d386ae Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Fri, 5 Jun 2020 09:22:49 +0000 -Subject: [PATCH 0878/1216] snd_bcm2835: disable HDMI audio when vc4 is used +Subject: [PATCH 0878/1224] snd_bcm2835: disable HDMI audio when vc4 is used (#3640) Things don't work too well when both the vc4 driver and the firmware @@ -425809,7 +425809,7 @@ Signed-off-by: Hristo Venev 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 9060fe7b0d7e..3c38fbe71886 100644 +index 9060fe7b0d7ea..3c38fbe718863 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2745,6 +2745,7 @@ Params: cma-256 CMA is 256MB (needs 1GB) @@ -425829,7 +425829,7 @@ index 9060fe7b0d7e..3c38fbe71886 100644 Name: vga666 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts -index caa64bfb95a7..6d34a2bff49b 100644 +index caa64bfb95a72..6d34a2bff49b6 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts @@ -108,7 +108,15 @@ @@ -425850,7 +425850,7 @@ index caa64bfb95a7..6d34a2bff49b 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts -index 134ad9ecbd4a..935e9469e318 100644 +index 134ad9ecbd4ab..935e9469e318a 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts @@ -138,8 +138,16 @@ @@ -425871,7 +425871,7 @@ index 134ad9ecbd4a..935e9469e318 100644 }; }; diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index 2f465dba54bf..a53c39d1bbaa 100644 +index 2f465dba54bfc..a53c39d1bbaa6 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -381,7 +381,9 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev) @@ -425889,10 +425889,10 @@ index 2f465dba54bf..a53c39d1bbaa 100644 2.18.4 -From c26cf70b8a0731df2101afd9740c5e12ae79fe03 Mon Sep 17 00:00:00 2001 +From ad8e7d6058fafbd387b54a703d839bed4f5d5c6b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jun 2020 16:06:59 +0100 -Subject: [PATCH 0879/1216] Revert "overlays: gpio-keys: Avoid open-drain +Subject: [PATCH 0879/1224] Revert "overlays: gpio-keys: Avoid open-drain warnings" This reverts commit 907e08e6e70dd557a1f5cd03ef28492ffebffb08. @@ -425901,7 +425901,7 @@ This reverts commit 907e08e6e70dd557a1f5cd03ef28492ffebffb08. 1 file changed, 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts -index def139db8bcb..39e7bc5fa9d8 100644 +index def139db8bcb5..39e7bc5fa9d88 100644 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts @@ -16,8 +16,6 @@ @@ -425917,10 +425917,10 @@ index def139db8bcb..39e7bc5fa9d8 100644 2.18.4 -From 1909a3884e02b335acc90f3ea40a2ac315712f9d Mon Sep 17 00:00:00 2001 +From 42915a3f695a39a2f566a2ce33fce7af27ccdf14 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jun 2020 16:07:07 +0100 -Subject: [PATCH 0880/1216] overlays: i2c-gpio: Avoid open-drain warnings +Subject: [PATCH 0880/1224] 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. @@ -425946,7 +425946,7 @@ Signed-off-by: Phil Elwell 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts -index 249c8202b2ed..e7ead7cdf5f5 100644 +index 249c8202b2ed4..e7ead7cdf5f5e 100644 --- a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts +++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts @@ -1,6 +1,8 @@ @@ -425969,7 +425969,7 @@ index 249c8202b2ed..e7ead7cdf5f5 100644 i2c-gpio,scl-open-drain; i2c-gpio,sda-open-drain; diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts -index 39e7bc5fa9d8..63231b5d7c0c 100644 +index 39e7bc5fa9d88..63231b5d7c0c1 100644 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts @@ -2,6 +2,8 @@ @@ -425993,7 +425993,7 @@ index 39e7bc5fa9d8..63231b5d7c0c 100644 i2c-gpio,delay-us = <2>; /* ~100 kHz */ #address-cells = <1>; diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts -index 23813369093a..227e3c0fa1cd 100644 +index 23813369093a7..227e3c0fa1cd2 100644 --- a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts @@ -3,6 +3,8 @@ @@ -426020,10 +426020,10 @@ index 23813369093a..227e3c0fa1cd 100644 2.18.4 -From 9cf753f8fbb2732cb2cacb1493c06202d75cc5b0 Mon Sep 17 00:00:00 2001 +From d65c2ad03176f2d8d08945ad0f8648276f123b0a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jun 2020 16:18:52 +0100 -Subject: [PATCH 0881/1216] overlays: Update upstream overlays after +Subject: [PATCH 0881/1224] overlays: Update upstream overlays after vc4-kms-v3d change Signed-off-by: Phil Elwell @@ -426033,7 +426033,7 @@ Signed-off-by: Phil Elwell 2 files changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts -index 4d46790d81c9..2e9dcd4f5f0a 100644 +index 4d46790d81c9c..2e9dcd4f5f0a3 100644 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts @@ -92,6 +92,12 @@ @@ -426050,7 +426050,7 @@ index 4d46790d81c9..2e9dcd4f5f0a 100644 #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts -index 428aa5dcc38f..30130f09fbc6 100644 +index 428aa5dcc38f0..30130f09fbc66 100644 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts @@ -122,6 +122,12 @@ @@ -426070,10 +426070,10 @@ index 428aa5dcc38f..30130f09fbc6 100644 2.18.4 -From 5246ddfe5b7d942e6ecffa280d0be9596762ca31 Mon Sep 17 00:00:00 2001 +From ff4d3f1d02f214184feb7964227f5db0e7716386 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:35:35 +0200 -Subject: [PATCH 0882/1216] w1_therm: adding code comments and code reordering +Subject: [PATCH 0882/1224] w1_therm: adding code comments and code reordering commit 92b8d2724464bc1d2e735a84c0da5741dce33485 upstream. @@ -426094,7 +426094,7 @@ Signed-off-by: Greg Kroah-Hartman 1 file changed, 259 insertions(+), 168 deletions(-) diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index e028e0092799..1234916daaa8 100644 +index e028e00927991..1234916daaa8f 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -25,7 +25,8 @@ @@ -426656,10 +426656,10 @@ index e028e0092799..1234916daaa8 100644 2.18.4 -From c63d5cc3e22758dc6156804f8b6d22aea83dfaff Mon Sep 17 00:00:00 2001 +From 79ca31e822b6740d44b3c0ae1b017e17a92d0134 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:36:10 +0200 -Subject: [PATCH 0883/1216] w1_therm: fix reset_select_slave during discovery +Subject: [PATCH 0883/1224] w1_therm: fix reset_select_slave during discovery commit c8ad65f6fbfdcb9b620674ef456020eef2bfeb36 upstream. @@ -426686,7 +426686,7 @@ Signed-off-by: Greg Kroah-Hartman 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index 1234916daaa8..aa5678369c0b 100644 +index 1234916daaa8f..aa5678369c0b6 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -16,6 +16,7 @@ @@ -426811,10 +426811,10 @@ index 1234916daaa8..aa5678369c0b 100644 2.18.4 -From 8a3e2d37e19ddd73f5ef2987ead0fcae45c861f0 Mon Sep 17 00:00:00 2001 +From 625c2bef572e96cd6a5f902ba328efa67aa0cd47 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:36:50 +0200 -Subject: [PATCH 0884/1216] w1_therm: adding ext_power sysfs entry +Subject: [PATCH 0884/1224] w1_therm: adding ext_power sysfs entry commit b7bb6ca17a90f47c2fe2848531b5bbaf27a65ba7 upstream. @@ -426854,7 +426854,7 @@ Signed-off-by: Greg Kroah-Hartman diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm new file mode 100644 -index 000000000000..99d73eeee3db +index 0000000000000..99d73eeee3db6 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm @@ -0,0 +1,29 @@ @@ -426889,7 +426889,7 @@ index 000000000000..99d73eeee3db + w1_term device \ No newline at end of file diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index aa5678369c0b..932a0738b52a 100644 +index aa5678369c0b6..932a0738b52ad 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -43,8 +43,21 @@ @@ -427113,10 +427113,10 @@ index aa5678369c0b..932a0738b52a 100644 2.18.4 -From 5be64048464af2c22983a5d8aa9f425903fc9cd4 Mon Sep 17 00:00:00 2001 +From 067ff548bd8c8aacebee8a79364def2e0682ea7f Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:37:08 +0200 -Subject: [PATCH 0885/1216] w1_therm: adding resolution sysfs entry +Subject: [PATCH 0885/1224] w1_therm: adding resolution sysfs entry commit 308bdb94de0c1abe7eac5193f58638b8aeaddf4b upstream. @@ -427166,7 +427166,7 @@ Signed-off-by: Greg Kroah-Hartman 2 files changed, 361 insertions(+), 98 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm -index 99d73eeee3db..7ed95e9e0b64 100644 +index 99d73eeee3db6..7ed95e9e0b648 100644 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm @@ -10,6 +10,23 @@ Users: any user space application which wants to communicate with @@ -427194,7 +427194,7 @@ index 99d73eeee3db..7ed95e9e0b64 100644 Date: May 2020 Contact: Akira Shimahara diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index 932a0738b52a..7ab8a141ce6e 100644 +index 932a0738b52ad..7ab8a141ce6e4 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -51,6 +51,13 @@ module_param_named(strong_pullup, w1_strong_pullup, int, 0); @@ -427834,10 +427834,10 @@ index 932a0738b52a..7ab8a141ce6e 100644 2.18.4 -From c46333fc29584a24294166f91011bc1961e116d2 Mon Sep 17 00:00:00 2001 +From ee6e87ba0d44a1e29c970cf3d86bc71b36a8c00c Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:37:25 +0200 -Subject: [PATCH 0886/1216] w1_therm: adding eeprom sysfs entry +Subject: [PATCH 0886/1224] w1_therm: adding eeprom sysfs entry commit 45d457a4cf24455eefd076a01a3d86414fc2ff1e upstream. @@ -427861,7 +427861,7 @@ Signed-off-by: Greg Kroah-Hartman 2 files changed, 132 insertions(+), 57 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm -index 7ed95e9e0b64..8b7ee89ac6ce 100644 +index 7ed95e9e0b648..8b7ee89ac6ce2 100644 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm @@ -1,3 +1,17 @@ @@ -427883,7 +427883,7 @@ index 7ed95e9e0b64..8b7ee89ac6ce 100644 Date: May 2020 Contact: Akira Shimahara diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index 7ab8a141ce6e..1ba07b0833fa 100644 +index 7ab8a141ce6e4..1ba07b0833fac 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -43,12 +43,21 @@ @@ -428214,10 +428214,10 @@ index 7ab8a141ce6e..1ba07b0833fa 100644 2.18.4 -From 3e48c1d48dcd9c77b01802b7d723c50732432676 Mon Sep 17 00:00:00 2001 +From 0bdb7e352b85011fd3ee1cdeacb7c96eda559c72 Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:37:42 +0200 -Subject: [PATCH 0887/1216] w1_therm: optimizing temperature read timings +Subject: [PATCH 0887/1224] w1_therm: optimizing temperature read timings commit 67b392f7b8edfa6f427fecd98722acab34c1c99f upstream. @@ -428250,7 +428250,7 @@ Signed-off-by: Greg Kroah-Hartman 2 files changed, 197 insertions(+), 101 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm -index 8b7ee89ac6ce..6ffd3e3286a7 100644 +index 8b7ee89ac6ce2..6ffd3e3286a75 100644 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm @@ -41,6 +41,18 @@ Users: any user space application which wants to communicate with @@ -428273,7 +428273,7 @@ index 8b7ee89ac6ce..6ffd3e3286a7 100644 Date: May 2020 Contact: Akira Shimahara diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index 1ba07b0833fa..5a81ce2a4e74 100644 +index 1ba07b0833fac..5a81ce2a4e742 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -93,6 +93,7 @@ module_param_named(strong_pullup, w1_strong_pullup, int, 0); @@ -428750,10 +428750,10 @@ index 1ba07b0833fa..5a81ce2a4e74 100644 2.18.4 -From 7a12c255a117b68f3803093d2be2bce59f71cdfa Mon Sep 17 00:00:00 2001 +From ad7fe2fc822fcb095ee267a593f748b4735ea2cd Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:38:01 +0200 -Subject: [PATCH 0888/1216] w1_therm: adding alarm sysfs entry +Subject: [PATCH 0888/1224] w1_therm: adding alarm sysfs entry commit e2c94d6f572079511945e64537eb1218643f2e68 upstream. @@ -428780,7 +428780,7 @@ Signed-off-by: Greg Kroah-Hartman 2 files changed, 177 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm -index 6ffd3e3286a7..f2895205a515 100644 +index 6ffd3e3286a75..f2895205a515c 100644 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm @@ -1,3 +1,19 @@ @@ -428804,7 +428804,7 @@ index 6ffd3e3286a7..f2895205a515 100644 Date: May 2020 Contact: Akira Shimahara diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index 5a81ce2a4e74..825536196e61 100644 +index 5a81ce2a4e742..825536196e610 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -58,6 +58,9 @@ module_param_named(strong_pullup, w1_strong_pullup, int, 0); @@ -429077,10 +429077,10 @@ index 5a81ce2a4e74..825536196e61 100644 2.18.4 -From ffa9ac6db3296b6df7db080390666d46f9b6f0cb Mon Sep 17 00:00:00 2001 +From 869ed1774dfba5457d322a4e483eaf2b4292542c Mon Sep 17 00:00:00 2001 From: Akira Shimahara Date: Mon, 11 May 2020 22:38:20 +0200 -Subject: [PATCH 0889/1216] w1_therm: adding bulk read support to trigger +Subject: [PATCH 0889/1224] w1_therm: adding bulk read support to trigger multiple conversion on bus commit 57c76221d5af648c8355a55c09b050c5d8d38189 upstream. @@ -429130,7 +429130,7 @@ Signed-off-by: Greg Kroah-Hartman 3 files changed, 322 insertions(+), 15 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm -index f2895205a515..076659d506f2 100644 +index f2895205a515c..076659d506f26 100644 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm @@ -62,9 +62,16 @@ Date: May 2020 @@ -429182,7 +429182,7 @@ index f2895205a515..076659d506f2 100644 +Users: any user space application which wants to communicate with + w1_term device diff --git a/Documentation/w1/slaves/w1_therm.rst b/Documentation/w1/slaves/w1_therm.rst -index 90531c340a07..cc4edae17751 100644 +index 90531c340a07a..cc4edae177513 100644 --- a/Documentation/w1/slaves/w1_therm.rst +++ b/Documentation/w1/slaves/w1_therm.rst @@ -26,20 +26,31 @@ W1_THERM_DS1825 0x3B @@ -429255,7 +429255,7 @@ index 90531c340a07..cc4edae17751 100644 strong pullup, 1 to enable autodetection or 2 to force strong pullup. In case of autodetection, the driver will use the "READ POWER SUPPLY" diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index 825536196e61..cc4b88056b33 100644 +index 825536196e610..cc4b88056b338 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -43,6 +43,9 @@ @@ -429674,10 +429674,10 @@ index 825536196e61..cc4b88056b33 100644 2.18.4 -From 6458666a996f07b7ee766ae704fc8bc433538d83 Mon Sep 17 00:00:00 2001 +From 025cdcd8b0775ec1867d1c64e3387cb1aa0fe9a1 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 20 May 2020 15:00:19 +0300 -Subject: [PATCH 0890/1216] w1_therm: Free the correct variable +Subject: [PATCH 0890/1224] w1_therm: Free the correct variable commit e420637b81f78d0fbacf539bdb1b341eba602aea upstream. @@ -429694,7 +429694,7 @@ Signed-off-by: Greg Kroah-Hartman 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index cc4b88056b33..a6c85e486671 100644 +index cc4b88056b338..a6c85e4866719 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -1526,8 +1526,9 @@ static ssize_t alarms_store(struct device *device, @@ -429721,10 +429721,10 @@ index cc4b88056b33..a6c85e486671 100644 2.18.4 -From d175904ea284bc716c4831605f309ce8bfc11f65 Mon Sep 17 00:00:00 2001 +From c9ab44d95b8cc611f2c989541a0b23e39035fa9c Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Tue, 19 May 2020 16:45:53 +0100 -Subject: [PATCH 0891/1216] w1_therm: remove redundant assignments to variable +Subject: [PATCH 0891/1224] w1_therm: remove redundant assignments to variable ret commit f37d13d52c0560bd2bac40b22466af538e61a5ce upstream. @@ -429742,7 +429742,7 @@ Signed-off-by: Greg Kroah-Hartman 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c -index a6c85e486671..c1b4eda16719 100644 +index a6c85e4866719..c1b4eda167193 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -505,7 +505,7 @@ static inline int w1_DS18S20_write_data(struct w1_slave *sl, @@ -429785,10 +429785,10 @@ index a6c85e486671..c1b4eda16719 100644 2.18.4 -From 561a3c86c524f3aa3b20068aa48666fb3aa41000 Mon Sep 17 00:00:00 2001 +From a914beb4d189a51f42d629ef0718f7ceb3282940 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Thu, 7 May 2020 19:20:20 +0200 -Subject: [PATCH 0892/1216] PCI: brcmstb: Assert fundamental reset on +Subject: [PATCH 0892/1224] PCI: brcmstb: Assert fundamental reset on initialization commit 22e21e51ce755399fd42055a3f668ee4af370881 upstream. @@ -429809,7 +429809,7 @@ Acked-by: Florian Fainelli 1 file changed, 1 insertion(+) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 3a10e678c7f4..9e452c366b26 100644 +index 3a10e678c7f47..9e452c366b263 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -697,6 +697,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) @@ -429824,10 +429824,10 @@ index 3a10e678c7f4..9e452c366b26 100644 2.18.4 -From 5ded9d4bffc2e3159fb2b7ab2dfc2083da30b814 Mon Sep 17 00:00:00 2001 +From 64772c15b1d6a52ae7b807a37bb865c4210e17dc Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 10 Jun 2020 16:28:56 +0200 -Subject: [PATCH 0893/1216] clk: rpi: Adjust DT binding to match upstream +Subject: [PATCH 0893/1224] clk: rpi: Adjust DT binding to match upstream Signed-off-by: Maxime Ripard --- @@ -429845,7 +429845,7 @@ Signed-off-by: Maxime Ripard 11 files changed, 51 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi -index d2f5ea1f31f8..bf90fd585364 100644 +index d2f5ea1f31f8e..bf90fd585364c 100644 --- a/arch/arm/boot/dts/bcm270x.dtsi +++ b/arch/arm/boot/dts/bcm270x.dtsi @@ -7,12 +7,6 @@ @@ -429862,7 +429862,7 @@ index d2f5ea1f31f8..bf90fd585364 100644 watchdog: watchdog@7e100000 { diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -index 3ca70650287c..497a3f253291 100644 +index 3ca70650287cb..497a3f253291c 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -85,6 +85,11 @@ @@ -429878,7 +429878,7 @@ index 3ca70650287c..497a3f253291 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts -index abdf7e1c0247..92ad8ba8987d 100644 +index abdf7e1c02476..92ad8ba8987db 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -96,6 +96,11 @@ @@ -429894,7 +429894,7 @@ index abdf7e1c0247..92ad8ba8987d 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts -index 88f7fe53b97f..a8e2e6486d59 100644 +index 88f7fe53b97f2..a8e2e6486d59b 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -58,6 +58,11 @@ @@ -429910,7 +429910,7 @@ index 88f7fe53b97f..a8e2e6486d59 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 05220fa0202b..efff867951bb 100644 +index 05220fa0202b3..efff867951bb9 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -54,6 +54,11 @@ @@ -429926,7 +429926,7 @@ index 05220fa0202b..efff867951bb 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 20114a723cf9..4b98dba51e59 100644 +index 20114a723cf94..4b98dba51e59b 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -24,12 +24,6 @@ @@ -429943,7 +429943,7 @@ index 20114a723cf9..4b98dba51e59 100644 /* * Defined ranges: diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts -index 66ba24e9ff37..4a28b144eaf2 100644 +index 66ba24e9ff375..4a28b144eaf21 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts @@ -31,6 +31,11 @@ @@ -429959,7 +429959,7 @@ index 66ba24e9ff37..4a28b144eaf2 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts -index 63f4592ba7dd..f38b2c5aa449 100644 +index 63f4592ba7dd6..f38b2c5aa449b 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -37,6 +37,11 @@ @@ -429975,7 +429975,7 @@ index 63f4592ba7dd..f38b2c5aa449 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index 5474f8ab894f..11b2d823e6ae 100644 +index 5474f8ab894fa..11b2d823e6ae6 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -32,6 +32,11 @@ @@ -429991,7 +429991,7 @@ index 5474f8ab894f..11b2d823e6ae 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi -index 925cb37c22f0..73e1290616e4 100644 +index 925cb37c22f06..73e1290616e4f 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi @@ -35,6 +35,11 @@ @@ -430007,7 +430007,7 @@ index 925cb37c22f0..73e1290616e4 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index eb1844148af9..c4929416b6d5 100644 +index eb1844148af96..c4929416b6d5c 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -383,13 +383,23 @@ static int raspberrypi_clk_probe(struct platform_device *pdev) @@ -430039,10 +430039,10 @@ index eb1844148af9..c4929416b6d5 100644 2.18.4 -From e35753e71dd04c1bb4f742e36f85791544af3505 Mon Sep 17 00:00:00 2001 +From 59fd6765177bb06131e546c3319bd0a534d00e5d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 26 May 2020 14:23:04 +0200 -Subject: [PATCH 0894/1216] clk: bcm: rpi: Add an enum for the firmware clocks +Subject: [PATCH 0894/1224] 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. @@ -430056,7 +430056,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index c4929416b6d5..c21d8c7de439 100644 +index c4929416b6d5c..c21d8c7de439e 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -18,7 +18,23 @@ @@ -430125,10 +430125,10 @@ index c4929416b6d5..c21d8c7de439 100644 2.18.4 -From 3a76e2a5aee30a9f845cde01d7027d9c009c920d Mon Sep 17 00:00:00 2001 +From 1859246d57ccb72ebc9f14c55baac1114f5142f4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 27 May 2020 11:13:52 +0200 -Subject: [PATCH 0895/1216] clk: bcm: rpi: Use CCF boundaries instead of +Subject: [PATCH 0895/1224] clk: bcm: rpi: Use CCF boundaries instead of rolling our own The raspberrypi firmware clock driver has a min_rate / max_rate clamping by @@ -430144,7 +430144,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index c21d8c7de439..70574c937b68 100644 +index c21d8c7de439e..70574c937b68f 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -57,9 +57,6 @@ struct raspberrypi_clk_data { @@ -430265,10 +430265,10 @@ index c21d8c7de439..70574c937b68 100644 2.18.4 -From 6cc4b741bd3e64d0ad08a0eaea66a539b8f92cd0 Mon Sep 17 00:00:00 2001 +From 28cb66bf39cc11f730f596d9e1dc4beae63efc32 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 26 May 2020 14:30:31 +0200 -Subject: [PATCH 0896/1216] clk: bcm: rpi: Give firmware clocks a name +Subject: [PATCH 0896/1224] 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 @@ -430281,7 +430281,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 70574c937b68..4f7fe01c1b3b 100644 +index 70574c937b68f..4f7fe01c1b3b0 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -36,6 +36,23 @@ enum rpi_firmware_clk_id { @@ -430323,10 +430323,10 @@ index 70574c937b68..4f7fe01c1b3b 100644 2.18.4 -From dc78bd213e5dc8dd5b75c8953a4c89e1585f410a Mon Sep 17 00:00:00 2001 +From eaa0478f69ff601eb9f86ee3f38b2698dd9dc394 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 26 May 2020 15:27:35 +0200 -Subject: [PATCH 0897/1216] clk: bcm: rpi: Remove the quirks for the CPU clock +Subject: [PATCH 0897/1224] 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, @@ -430338,7 +430338,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 9 insertions(+), 154 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 4f7fe01c1b3b..c87e3ee58e4b 100644 +index 4f7fe01c1b3b0..c87e3ee58e4ba 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -151,13 +151,6 @@ static unsigned long raspberrypi_fw_get_rate(struct clk_hw *hw, @@ -430536,10 +430536,10 @@ index 4f7fe01c1b3b..c87e3ee58e4b 100644 2.18.4 -From 8eca43bdd58fed425652a02ff9110b156a730f22 Mon Sep 17 00:00:00 2001 +From 9b36cb02b26676f3fe9363703a8dd90fb4cccfef Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 10 Jun 2020 16:18:17 +0200 -Subject: [PATCH 0898/1216] clk: rpi: Only register a few firmware clocks +Subject: [PATCH 0898/1224] clk: rpi: Only register a few firmware clocks Signed-off-by: Maxime Ripard --- @@ -430547,7 +430547,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index c87e3ee58e4b..642622fb77ea 100644 +index c87e3ee58e4ba..642622fb77ea4 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -268,13 +268,24 @@ static int raspberrypi_discover_clocks(struct raspberrypi_clk *rpi, @@ -430586,10 +430586,10 @@ index c87e3ee58e4b..642622fb77ea 100644 2.18.4 -From 8da103643343fed17209fe84b4ddc0e2594e36c5 Mon Sep 17 00:00:00 2001 +From 3f982241896d1bc6defd8928d7417e8d062f61ea Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 10 Jun 2020 16:29:08 +0200 -Subject: [PATCH 0899/1216] clk: rpi: Fix compatible indentation +Subject: [PATCH 0899/1224] clk: rpi: Fix compatible indentation Signed-off-by: Maxime Ripard --- @@ -430597,7 +430597,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 642622fb77ea..cb87980b468e 100644 +index 642622fb77ea4..cb87980b468e5 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -359,8 +359,8 @@ static int raspberrypi_clk_remove(struct platform_device *pdev) @@ -430615,10 +430615,10 @@ index 642622fb77ea..cb87980b468e 100644 2.18.4 -From 60a3a00a234a5e4db66249ba098ca0de39219fbb Mon Sep 17 00:00:00 2001 +From b0f7255fa8ffce44e9f0f89ec8cee4c8d29e7178 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 16:34:00 +0100 -Subject: [PATCH 0900/1216] SQUASH: dts: Fix firmware clocks support +Subject: [PATCH 0900/1224] 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 @@ -430641,7 +430641,7 @@ Signed-off-by: Phil Elwell 11 files changed, 21 insertions(+), 40 deletions(-) diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi -index babfa41cd9f7..624e2bdc8733 100644 +index babfa41cd9f78..624e2bdc8733f 100644 --- a/arch/arm/boot/dts/bcm2709-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi @@ -3,3 +3,10 @@ @@ -430656,7 +430656,7 @@ index babfa41cd9f7..624e2bdc8733 100644 + }; +}; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -index 497a3f253291..3ca70650287c 100644 +index 497a3f253291c..3ca70650287cb 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -85,11 +85,6 @@ @@ -430672,7 +430672,7 @@ index 497a3f253291..3ca70650287c 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts -index 92ad8ba8987d..abdf7e1c0247 100644 +index 92ad8ba8987db..abdf7e1c02476 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -96,11 +96,6 @@ @@ -430688,7 +430688,7 @@ index 92ad8ba8987d..abdf7e1c0247 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts -index a8e2e6486d59..88f7fe53b97f 100644 +index a8e2e6486d59b..88f7fe53b97f2 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -58,11 +58,6 @@ @@ -430704,7 +430704,7 @@ index a8e2e6486d59..88f7fe53b97f 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index efff867951bb..05220fa0202b 100644 +index efff867951bb9..05220fa0202b3 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -54,11 +54,6 @@ @@ -430720,7 +430720,7 @@ index efff867951bb..05220fa0202b 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 05e51a05bf56..7fd09353740a 100644 +index 05e51a05bf56c..7fd09353740af 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -170,3 +170,10 @@ @@ -430735,7 +430735,7 @@ index 05e51a05bf56..7fd09353740a 100644 + }; +}; diff --git a/arch/arm/boot/dts/bcm2836-rpi.dtsi b/arch/arm/boot/dts/bcm2836-rpi.dtsi -index c4c858b984c6..52b47038ca82 100644 +index c4c858b984c6b..52b47038ca822 100644 --- a/arch/arm/boot/dts/bcm2836-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi @@ -4,3 +4,10 @@ @@ -430750,7 +430750,7 @@ index c4c858b984c6..52b47038ca82 100644 + }; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts -index 4a28b144eaf2..66ba24e9ff37 100644 +index 4a28b144eaf21..66ba24e9ff375 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts @@ -31,11 +31,6 @@ @@ -430766,7 +430766,7 @@ index 4a28b144eaf2..66ba24e9ff37 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts -index f38b2c5aa449..63f4592ba7dd 100644 +index f38b2c5aa449b..63f4592ba7dd6 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -37,11 +37,6 @@ @@ -430782,7 +430782,7 @@ index f38b2c5aa449..63f4592ba7dd 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index 11b2d823e6ae..5474f8ab894f 100644 +index 11b2d823e6ae6..5474f8ab894fa 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -32,11 +32,6 @@ @@ -430798,7 +430798,7 @@ index 11b2d823e6ae..5474f8ab894f 100644 compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi -index 73e1290616e4..925cb37c22f0 100644 +index 73e1290616e4f..925cb37c22f06 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi @@ -35,11 +35,6 @@ @@ -430817,10 +430817,10 @@ index 73e1290616e4..925cb37c22f0 100644 2.18.4 -From d9881b5ae7a0926610f66ad738b1966a4fc7d829 Mon Sep 17 00:00:00 2001 +From 4c255fee385ddd23c09221d0ce16bbe81699f356 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 2 Jun 2020 17:19:51 +0100 -Subject: [PATCH 0901/1216] ARM: dts: Add bcm2711-rpi-cm4.dts +Subject: [PATCH 0901/1224] ARM: dts: Add bcm2711-rpi-cm4.dts Add initial DTS file for Compute Module 4. @@ -430833,7 +430833,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 990457a51843..477108fe0404 100644 +index 990457a51843b..477108fe04043 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -12,7 +12,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -430848,7 +430848,7 @@ index 990457a51843..477108fe0404 100644 alpine-db.dtb diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts new file mode 100644 -index 000000000000..f616d3f23f14 +index 0000000000000..f616d3f23f14b --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -0,0 +1,586 @@ @@ -431439,7 +431439,7 @@ index 000000000000..f616d3f23f14 + }; +}; diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 3c38fbe71886..073d7dadcc95 100644 +index 3c38fbe718863..073d7dadcc95a 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -92,6 +92,12 @@ Name: @@ -431459,10 +431459,10 @@ index 3c38fbe71886..073d7dadcc95 100644 2.18.4 -From fa5b07c81f3194518669fe0fd2ce6ff10546c538 Mon Sep 17 00:00:00 2001 +From 281972743de0c56d8dafa7e48b377cf3d0aa8f4e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 09:57:03 +0100 -Subject: [PATCH 0902/1216] PCI: brcmstb: Add DT property to control L1SS +Subject: [PATCH 0902/1224] 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. @@ -431478,7 +431478,7 @@ Signed-off-by: Phil Elwell 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 9e452c366b26..1e0a94778856 100644 +index 9e452c366b263..1e0a94778856a 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -102,8 +102,9 @@ @@ -431544,10 +431544,10 @@ index 9e452c366b26..1e0a94778856 100644 2.18.4 -From 190c582b7cd2cc78885f20a3944566dcc5108fab Mon Sep 17 00:00:00 2001 +From a8448ebe43421e79a9c190903cd4cfb81c919bd7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 11:22:38 +0100 -Subject: [PATCH 0903/1216] ARM: dts: Set brcm,enable-l1ss for CM4 +Subject: [PATCH 0903/1224] 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 @@ -431559,7 +431559,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index f616d3f23f14..2ea54b92fbca 100644 +index f616d3f23f14b..2ea54b92fbcab 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -252,6 +252,10 @@ @@ -431577,10 +431577,10 @@ index f616d3f23f14..2ea54b92fbca 100644 2.18.4 -From 448cb859c74272dc9431f6676e0ae18eef44249c Mon Sep 17 00:00:00 2001 +From 705466e7bcbb19e0363a47a786a5e4fff7ae6009 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 16 Jun 2020 10:23:42 +0100 -Subject: [PATCH 0904/1216] Revert "spi: spi-bcm2835: Re-enable HW CS" +Subject: [PATCH 0904/1224] Revert "spi: spi-bcm2835: Re-enable HW CS" This reverts commit 49b9bd89784e3fa29f143ebf1ac8f125be47b708. @@ -431590,7 +431590,7 @@ See: https://github.com/raspberrypi/linux/pull/3687 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c -index 7ac3563f458b..7b5216461bc4 100644 +index 7ac3563f458b1..7b5216461bc4b 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -1173,57 +1173,9 @@ static void bcm2835_spi_handle_err(struct spi_controller *ctlr, @@ -431665,10 +431665,10 @@ index 7ac3563f458b..7b5216461bc4 100644 2.18.4 -From a96b4aa2450cd2f6968ca5736a06988fc770e216 Mon Sep 17 00:00:00 2001 +From 4beed2cc388f943252ad068da242edf90bc0746d Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:24:31 +0200 -Subject: [PATCH 0905/1216] media: irs1125: Using i2c_transfer for ic2 reads +Subject: [PATCH 0905/1224] 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. @@ -431679,7 +431679,7 @@ Signed-off-by: Markus Proeller 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c -index 25e1dd5a08ef..6680afea5894 100644 +index 25e1dd5a08efa..6680afea58947 100644 --- a/drivers/media/i2c/irs1125.c +++ b/drivers/media/i2c/irs1125.c @@ -248,27 +248,34 @@ static int irs1125_write(struct v4l2_subdev *sd, u16 reg, u16 val) @@ -431736,10 +431736,10 @@ index 25e1dd5a08ef..6680afea5894 100644 2.18.4 -From 892b52b55dfc409e3d9f28a456696a1ad84d5c4a Mon Sep 17 00:00:00 2001 +From 0cf7ecbe691666e0b89606f035ececbe5f4f47c2 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:27:42 +0200 -Subject: [PATCH 0906/1216] media: irs1125: Refactoring and debug messages +Subject: [PATCH 0906/1224] media: irs1125: Refactoring and debug messages Changed some variable names to comply with checkpatch --strict mode. Debug messages added. @@ -431750,7 +431750,7 @@ Signed-off-by: Markus Proeller 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c -index 6680afea5894..289f0c25b141 100644 +index 6680afea58947..289f0c25b1414 100644 --- a/drivers/media/i2c/irs1125.c +++ b/drivers/media/i2c/irs1125.c @@ -15,6 +15,7 @@ @@ -431865,10 +431865,10 @@ index 6680afea5894..289f0c25b141 100644 2.18.4 -From bbf8feb1ca75b6437670e9ff46a2445b9db1464e Mon Sep 17 00:00:00 2001 +From dbf4138cb119589ca3098dd40a92b576f6f18663 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:31:36 +0200 -Subject: [PATCH 0907/1216] media: irs1125: Atomic access to imager +Subject: [PATCH 0907/1224] media: irs1125: Atomic access to imager reconfiguration Instead of changing the exposure and framerate settings for all sequences, @@ -431886,7 +431886,7 @@ Signed-off-by: Markus Proeller 2 files changed, 204 insertions(+), 88 deletions(-) diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c -index 289f0c25b141..d59e05004a03 100644 +index 289f0c25b1414..d59e05004a037 100644 --- a/drivers/media/i2c/irs1125.c +++ b/drivers/media/i2c/irs1125.c @@ -89,6 +89,52 @@ static inline struct irs1125 *to_state(struct v4l2_subdev *sd) @@ -432165,7 +432165,7 @@ index 289f0c25b141..d59e05004a03 100644 return 0; diff --git a/drivers/media/i2c/irs1125.h b/drivers/media/i2c/irs1125.h -index dccaca23aa76..96d676123d5e 100644 +index dccaca23aa76a..96d676123d5ed 100644 --- a/drivers/media/i2c/irs1125.h +++ b/drivers/media/i2c/irs1125.h @@ -21,18 +21,57 @@ @@ -432254,10 +432254,10 @@ index dccaca23aa76..96d676123d5e 100644 2.18.4 -From 081cc4c60e870a1c0e121624d6fdea2e5ef4d1ef Mon Sep 17 00:00:00 2001 +From add4f87cf329796075dfd41b1cd3c586e10d16c1 Mon Sep 17 00:00:00 2001 From: Markus Proeller Date: Tue, 16 Jun 2020 13:33:56 +0200 -Subject: [PATCH 0908/1216] media: irs1125: Keep HW in sync after imager reset +Subject: [PATCH 0908/1224] 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 @@ -432274,7 +432274,7 @@ Signed-off-by: Markus Proeller 1 file changed, 58 insertions(+), 63 deletions(-) diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c -index d59e05004a03..30c3d2640386 100644 +index d59e05004a037..30c3d26403865 100644 --- a/drivers/media/i2c/irs1125.c +++ b/drivers/media/i2c/irs1125.c @@ -82,6 +82,7 @@ struct irs1125 { @@ -432441,10 +432441,10 @@ index d59e05004a03..30c3d2640386 100644 2.18.4 -From 284d9533e9f21660512101551d23b2db8c0b6823 Mon Sep 17 00:00:00 2001 +From 06e436c0d5c991df8c1f01e1690de143a51ef702 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sat, 20 Jun 2020 15:40:00 +0300 -Subject: [PATCH 0909/1216] staging: bcm2835-audio: Add missing MODULE_ALIAS +Subject: [PATCH 0909/1224] staging: bcm2835-audio: Add missing MODULE_ALIAS Commit 8353fe6f1e0f ("Revert "staging: bcm2835-audio: Drop DT dependency"") reverts the upstream change and makes bcm2835-audio use @@ -432465,7 +432465,7 @@ Signed-off-by: Maxim Mikityanskiy 1 file changed, 1 insertion(+) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index a53c39d1bbaa..b9716f3e264c 100644 +index a53c39d1bbaa6..b9716f3e264c6 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -438,3 +438,4 @@ module_platform_driver(bcm2835_alsa_driver); @@ -432477,10 +432477,10 @@ index a53c39d1bbaa..b9716f3e264c 100644 2.18.4 -From be2ac59e813d44406695b50aa6e604d719db62f8 Mon Sep 17 00:00:00 2001 +From 4099b10ff0d4897ee3fbb575dc6840bbb963864b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 26 Jun 2020 11:51:05 +0100 -Subject: [PATCH 0910/1216] brcmfmac: Prefer a ccode from OTP over nvram file +Subject: [PATCH 0910/1224] 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. @@ -432492,7 +432492,7 @@ Signed-off-by: Phil Elwell 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 16bfcbe191c2..7336112d359c 100644 +index 16bfcbe191c2d..7336112d359ca 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -9,6 +9,7 @@ @@ -432562,7 +432562,7 @@ index 16bfcbe191c2..7336112d359c 100644 return; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -index 3aed4c4b887a..a926c466706f 100644 +index 3aed4c4b887aa..a926c466706f0 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -10,6 +10,7 @@ @@ -432614,10 +432614,10 @@ index 3aed4c4b887a..a926c466706f 100644 2.18.4 -From 29e9c947884759c067bf1d3f79489ca83ed06e0e Mon Sep 17 00:00:00 2001 +From f262abc6cc656bf35d315a350695416fc7a1be73 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:36 +0200 -Subject: [PATCH 0911/1216] media: v4l2-subdev: Introduce [get|set]_mbus_config +Subject: [PATCH 0911/1224] media: v4l2-subdev: Introduce [get|set]_mbus_config pad ops Upstream https://patchwork.linuxtv.org/patch/64669/ @@ -432635,7 +432635,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 27 insertions(+) diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h -index 71f1f2f0da53..ab736577b882 100644 +index 71f1f2f0da536..ab736577b882f 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -670,6 +670,29 @@ struct v4l2_subdev_pad_config { @@ -432683,10 +432683,10 @@ index 71f1f2f0da53..ab736577b882 100644 2.18.4 -From c11be7404533e5c5d8157297b80e397799b5c5d7 Mon Sep 17 00:00:00 2001 +From f24b127e60234b30b2f3e9133c428aedfab39b58 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:37 +0200 -Subject: [PATCH 0912/1216] media: i2c: Use the new get_mbus_config pad op +Subject: [PATCH 0912/1224] media: i2c: Use the new get_mbus_config pad op Upstream https://patchwork.linuxtv.org/patch/64669/ @@ -432711,7 +432711,7 @@ Signed-off-by: Jacopo Mondi 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c -index 8e3cf751a5a1..575c4b60beae 100644 +index 8e3cf751a5a1d..575c4b60beae6 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -749,8 +749,9 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd, @@ -432743,7 +432743,7 @@ index 8e3cf751a5a1..575c4b60beae 100644 static const struct v4l2_subdev_sensor_ops adv7180_sensor_ops = { diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c -index c444bd6a0658..ff212335326a 100644 +index c444bd6a06580..ff212335326a7 100644 --- a/drivers/media/i2c/ml86v7667.c +++ b/drivers/media/i2c/ml86v7667.c @@ -219,8 +219,9 @@ static int ml86v7667_fill_fmt(struct v4l2_subdev *sd, @@ -432774,7 +432774,7 @@ index c444bd6a0658..ff212335326a 100644 static const struct v4l2_subdev_core_ops ml86v7667_subdev_core_ops = { diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c -index 5613072908ac..052d168e2700 100644 +index 5613072908acb..052d168e2700b 100644 --- a/drivers/media/i2c/mt9m001.c +++ b/drivers/media/i2c/mt9m001.c @@ -689,8 +689,9 @@ static int mt9m001_enum_mbus_code(struct v4l2_subdev *sd, @@ -432806,7 +432806,7 @@ index 5613072908ac..052d168e2700 100644 static const struct v4l2_subdev_ops mt9m001_subdev_ops = { diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c -index 17e8253f5748..69697386ffcd 100644 +index 17e8253f5748e..69697386ffcd6 100644 --- a/drivers/media/i2c/mt9m111.c +++ b/drivers/media/i2c/mt9m111.c @@ -1137,8 +1137,9 @@ static int mt9m111_init_cfg(struct v4l2_subdev *sd, @@ -432838,7 +432838,7 @@ index 17e8253f5748..69697386ffcd 100644 static const struct v4l2_subdev_ops mt9m111_subdev_ops = { diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c -index 482609665305..0ef5af026d09 100644 +index 4826096653056..0ef5af026d097 100644 --- a/drivers/media/i2c/ov9640.c +++ b/drivers/media/i2c/ov9640.c @@ -648,8 +648,9 @@ static const struct v4l2_subdev_core_ops ov9640_core_ops = { @@ -432869,7 +432869,7 @@ index 482609665305..0ef5af026d09 100644 static const struct v4l2_subdev_ops ov9640_subdev_ops = { diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c -index 73caf8609a7e..b3b8d6e15ea2 100644 +index 73caf8609a7e1..b3b8d6e15ea2b 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -1621,8 +1621,9 @@ static int tc358743_dv_timings_cap(struct v4l2_subdev *sd, @@ -432901,7 +432901,7 @@ index 73caf8609a7e..b3b8d6e15ea2 100644 static const struct v4l2_subdev_ops tc358743_ops = { diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c -index edad49cebcdf..8ffff67ce2b7 100644 +index edad49cebcdf6..8ffff67ce2b7c 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -1104,8 +1104,9 @@ static int tvp5150_get_selection(struct v4l2_subdev *sd, @@ -432936,10 +432936,10 @@ index edad49cebcdf..8ffff67ce2b7 100644 2.18.4 -From 0c6341191bb8d08c07a2b52b8e6074b65e9267c6 Mon Sep 17 00:00:00 2001 +From 4fcd300f2139ee32293bcbec550f36c2a350377f Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:38 +0200 -Subject: [PATCH 0913/1216] media: i2c: ov6650: Use new [get|set]_mbus_config +Subject: [PATCH 0913/1224] media: i2c: ov6650: Use new [get|set]_mbus_config ops Upstream https://patchwork.linuxtv.org/patch/64674/ @@ -432967,7 +432967,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/drivers/media/i2c/ov6650.c b/drivers/media/i2c/ov6650.c -index af482620f94a..704064728f55 100644 +index af482620f94a6..704064728f55b 100644 --- a/drivers/media/i2c/ov6650.c +++ b/drivers/media/i2c/ov6650.c @@ -909,46 +909,68 @@ static const struct v4l2_subdev_core_ops ov6650_core_ops = { @@ -433076,10 +433076,10 @@ index af482620f94a..704064728f55 100644 2.18.4 -From 9fe0fad902a8615afdf0ba478bbbcd4cdabe7ebb Mon Sep 17 00:00:00 2001 +From 70d1c8084836b962d2c08721a6a830c8003dfd7c Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:39 +0200 -Subject: [PATCH 0914/1216] media: pxa_camera: Use the new set_mbus_config op +Subject: [PATCH 0914/1224] media: pxa_camera: Use the new set_mbus_config op Upstream https://patchwork.linuxtv.org/patch/64671/ @@ -433120,7 +433120,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 51 insertions(+), 138 deletions(-) diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c -index 8d47ea0c33f8..1200d9991b18 100644 +index 8d47ea0c33f84..1200d9991b181 100644 --- a/drivers/media/platform/pxa_camera.c +++ b/drivers/media/platform/pxa_camera.c @@ -605,42 +605,6 @@ static const struct pxa_mbus_pixelfmt *pxa_mbus_get_fmtdesc( @@ -433365,10 +433365,10 @@ index 8d47ea0c33f8..1200d9991b18 100644 2.18.4 -From 34315e547a853925b4eca8401849a24c885b5159 Mon Sep 17 00:00:00 2001 +From 055f5661b04609be1f6468181e8c2871f1a8d0ed Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:40 +0200 -Subject: [PATCH 0915/1216] media: v4l2-subdev: Remove [s|g]_mbus_config video +Subject: [PATCH 0915/1224] media: v4l2-subdev: Remove [s|g]_mbus_config video ops Upstream https://patchwork.linuxtv.org/patch/64670/ @@ -433383,7 +433383,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 10 deletions(-) diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h -index ab736577b882..d5225239f316 100644 +index ab736577b882f..d5225239f3165 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -402,12 +402,6 @@ struct v4l2_mbus_frame_desc { @@ -433414,10 +433414,10 @@ index ab736577b882..d5225239f316 100644 2.18.4 -From 8b3b0be9a5a6779f324531885b5577648af4d67d Mon Sep 17 00:00:00 2001 +From 727b7b3fa1faefaf26d285369505d5a071770655 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:41 +0200 -Subject: [PATCH 0916/1216] staging: media: imx: Update TODO entry +Subject: [PATCH 0916/1224] staging: media: imx: Update TODO entry Upstream https://patchwork.linuxtv.org/patch/64672/ @@ -433430,7 +433430,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 4 insertions(+) diff --git a/drivers/staging/media/imx/TODO b/drivers/staging/media/imx/TODO -index 6f29b5ca5324..64c6ba5945ca 100644 +index 6f29b5ca5324c..64c6ba5945ca3 100644 --- a/drivers/staging/media/imx/TODO +++ b/drivers/staging/media/imx/TODO @@ -10,6 +10,10 @@ @@ -433448,10 +433448,10 @@ index 6f29b5ca5324..64c6ba5945ca 100644 2.18.4 -From a30cd2b799c8825243e84afd3f02d2370e2e3a06 Mon Sep 17 00:00:00 2001 +From 76fac623615ca880e5869ce15617caa121de0978 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:42 +0200 -Subject: [PATCH 0917/1216] media: i2c: adv748x: Adjust TXA data lanes number +Subject: [PATCH 0917/1224] media: i2c: adv748x: Adjust TXA data lanes number MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -433480,7 +433480,7 @@ Signed-off-by: Jacopo Mondi 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c -index 23e02ff27b17..1fe7f97c6d52 100644 +index 23e02ff27b17b..1fe7f97c6d52c 100644 --- a/drivers/media/i2c/adv748x/adv748x-core.c +++ b/drivers/media/i2c/adv748x/adv748x-core.c @@ -241,10 +241,10 @@ static int adv748x_power_up_tx(struct adv748x_csi2 *tx) @@ -433564,7 +433564,7 @@ index 23e02ff27b17..1fe7f97c6d52 100644 } diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h -index fccb388ce179..1061f425ece5 100644 +index fccb388ce179f..1061f425ece59 100644 --- a/drivers/media/i2c/adv748x/adv748x.h +++ b/drivers/media/i2c/adv748x/adv748x.h @@ -79,6 +79,7 @@ struct adv748x_csi2 { @@ -433579,10 +433579,10 @@ index fccb388ce179..1061f425ece5 100644 2.18.4 -From 58e3bd86bd743dc24e81bb2851fc5e0c5e82aa2d Mon Sep 17 00:00:00 2001 +From f86a248c0f4ec0a6cee096fba96beeac2df1f36b Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:43 +0200 -Subject: [PATCH 0918/1216] media: i2c: adv748x: Implement get_mbus_config +Subject: [PATCH 0918/1224] media: i2c: adv748x: Implement get_mbus_config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -433600,7 +433600,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 31 insertions(+) diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c -index 2091cda50935..99bb63d05eef 100644 +index 2091cda509356..99bb63d05eef1 100644 --- a/drivers/media/i2c/adv748x/adv748x-csi2.c +++ b/drivers/media/i2c/adv748x/adv748x-csi2.c @@ -214,9 +214,40 @@ static int adv748x_csi2_set_format(struct v4l2_subdev *sd, @@ -433648,10 +433648,10 @@ index 2091cda50935..99bb63d05eef 100644 2.18.4 -From 74ec6ef259d21dd3931d4d4393e2754f9bf21ef3 Mon Sep 17 00:00:00 2001 +From 051677cb0201348f3e201cb9198c87adc434f97e Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 16 Jun 2020 16:12:44 +0200 -Subject: [PATCH 0919/1216] media: rcar-csi2: Negotiate data lanes number +Subject: [PATCH 0919/1224] media: rcar-csi2: Negotiate data lanes number Upstream https://patchwork.linuxtv.org/patch/64675/ @@ -433668,7 +433668,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c -index d27eccfa57ca..7a1f397d4fc3 100644 +index d27eccfa57cae..7a1f397d4fc37 100644 --- a/drivers/media/platform/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c @@ -362,6 +362,7 @@ struct rcar_csi2 { @@ -433813,10 +433813,10 @@ index d27eccfa57ca..7a1f397d4fc3 100644 2.18.4 -From 9be69bc063bfea1f1f4ae508808c5432f730f8e0 Mon Sep 17 00:00:00 2001 +From c268f7384fcdd08f8a5ca0d41e3665750eb8dcee Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 10:05:57 +0100 -Subject: [PATCH 0920/1216] drivers: media: Remove the downstream version of +Subject: [PATCH 0920/1224] drivers: media: Remove the downstream version of bcm2835-unicam About to be replaced by the upstream version. @@ -433835,7 +433835,7 @@ Signed-off-by: Dave Stevenson diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig deleted file mode 100644 -index 20e15147ee02..000000000000 +index 20e15147ee02f..0000000000000 --- a/drivers/media/platform/bcm2835/Kconfig +++ /dev/null @@ -1,14 +0,0 @@ @@ -433855,7 +433855,7 @@ index 20e15147ee02..000000000000 - will be called bcm2835-unicam. diff --git a/drivers/media/platform/bcm2835/Makefile b/drivers/media/platform/bcm2835/Makefile deleted file mode 100644 -index a98aba03598a..000000000000 +index a98aba03598ab..0000000000000 --- a/drivers/media/platform/bcm2835/Makefile +++ /dev/null @@ -1,3 +0,0 @@ @@ -433864,7 +433864,7 @@ index a98aba03598a..000000000000 -obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.o diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c deleted file mode 100644 -index 47b2d3a03fbf..000000000000 +index 47b2d3a03fbfa..0000000000000 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ /dev/null @@ -1,2873 +0,0 @@ @@ -436743,7 +436743,7 @@ index 47b2d3a03fbf..000000000000 -MODULE_VERSION(UNICAM_VERSION); diff --git a/drivers/media/platform/bcm2835/vc4-regs-unicam.h b/drivers/media/platform/bcm2835/vc4-regs-unicam.h deleted file mode 100644 -index ae059a171d0f..000000000000 +index ae059a171d0fe..0000000000000 --- a/drivers/media/platform/bcm2835/vc4-regs-unicam.h +++ /dev/null @@ -1,253 +0,0 @@ @@ -437004,10 +437004,10 @@ index ae059a171d0f..000000000000 2.18.4 -From 6da3fd402a7c75f7ffc5a023e866a1a78bf582fd Mon Sep 17 00:00:00 2001 +From ffe0f68b5b41513b970f1edd6e9174e439492f7d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 10:35:24 +0100 -Subject: [PATCH 0921/1216] include: media: Add vfl_devnode_type of +Subject: [PATCH 0921/1224] include: media: Add vfl_devnode_type of VFL_TYPE_VIDEO Upsstream are renaming VFL_TYPE_GRABBER to VFL_TYPE_VIDEO. @@ -437020,7 +437020,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+) diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h -index 8f2befe9c905..4cc362a79c7c 100644 +index 8f2befe9c905e..4cc362a79c7c7 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -34,6 +34,7 @@ @@ -437035,10 +437035,10 @@ index 8f2befe9c905..4cc362a79c7c 100644 2.18.4 -From 846c5c68fc76cd5c86ad503e281ef42aa3fd843e Mon Sep 17 00:00:00 2001 +From e2b513be8c68155b93c23f98cf4caf35286b58fd Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 4 May 2020 12:25:41 +0300 -Subject: [PATCH 0922/1216] media: bcm2835-unicam: Driver for CCP2/CSI2 camera +Subject: [PATCH 0922/1224] media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface Add a driver for the Unicam camera receiver block on BCM283x processors. @@ -437067,7 +437067,7 @@ Reported-by: kbuild test robot create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h diff --git a/MAINTAINERS b/MAINTAINERS -index 4ba0cad48512..d744087f13a7 100644 +index 4ba0cad485129..d744087f13a70 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3210,7 +3210,7 @@ M: Raspberry Pi Kernel Maintenance @@ -437081,7 +437081,7 @@ index 4ba0cad48512..d744087f13a7 100644 M: Raspberry Pi Kernel Maintenance diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig new file mode 100644 -index 000000000000..ec46e3ef053c +index 0000000000000..ec46e3ef053cf --- /dev/null +++ b/drivers/media/platform/bcm2835/Kconfig @@ -0,0 +1,15 @@ @@ -437102,7 +437102,7 @@ index 000000000000..ec46e3ef053c + called bcm2835-unicam. diff --git a/drivers/media/platform/bcm2835/Makefile b/drivers/media/platform/bcm2835/Makefile new file mode 100644 -index 000000000000..a98aba03598a +index 0000000000000..a98aba03598ab --- /dev/null +++ b/drivers/media/platform/bcm2835/Makefile @@ -0,0 +1,3 @@ @@ -437111,7 +437111,7 @@ index 000000000000..a98aba03598a +obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.o diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c new file mode 100644 -index 000000000000..2e9387cbc1e0 +index 0000000000000..2e9387cbc1e05 --- /dev/null +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -0,0 +1,2825 @@ @@ -439942,7 +439942,7 @@ index 000000000000..2e9387cbc1e0 +MODULE_VERSION(UNICAM_VERSION); diff --git a/drivers/media/platform/bcm2835/vc4-regs-unicam.h b/drivers/media/platform/bcm2835/vc4-regs-unicam.h new file mode 100644 -index 000000000000..ae059a171d0f +index 0000000000000..ae059a171d0fe --- /dev/null +++ b/drivers/media/platform/bcm2835/vc4-regs-unicam.h @@ -0,0 +1,253 @@ @@ -440203,10 +440203,10 @@ index 000000000000..ae059a171d0f 2.18.4 -From e5d12b0e9eacf85879bdc9ff12299c994b00e8aa Mon Sep 17 00:00:00 2001 +From c54ea4bcf0b56809cbbb7efd48741dd161cb4f56 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 14:32:51 +0100 -Subject: [PATCH 0923/1216] media: bcm2835-unicam: Add support for +Subject: [PATCH 0923/1224] 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 @@ -440218,7 +440218,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 2e9387cbc1e0..9adfb2d217af 100644 +index 2e9387cbc1e05..9adfb2d217af1 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -1639,12 +1639,35 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count) @@ -440265,10 +440265,10 @@ index 2e9387cbc1e0..9adfb2d217af 100644 2.18.4 -From 3a7dfb0b13d97c879c1e64e0a77dbb6032c2c74d Mon Sep 17 00:00:00 2001 +From b7b1be8b463b7c4b5a6a0b77771e9b4be43dc6d4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 May 2020 18:28:27 +0100 -Subject: [PATCH 0924/1216] media: bcm2835-unicam: Always service interrupts +Subject: [PATCH 0924/1224] 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 @@ -440286,7 +440286,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 15 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 9adfb2d217af..9c0b9375572d 100644 +index 9adfb2d217af1..9c0b9375572d1 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -772,12 +772,6 @@ static bool unicam_all_nodes_streaming(struct unicam_device *dev) @@ -440322,10 +440322,10 @@ index 9adfb2d217af..9c0b9375572d 100644 2.18.4 -From a969954948ba5cc6c1b033c87c015fbe4e93f4bf Mon Sep 17 00:00:00 2001 +From c4c0696cdee347a712e0b1273630d4905f4d216a Mon Sep 17 00:00:00 2001 From: Jacko Dirks Date: Tue, 5 May 2020 14:33:31 +0200 -Subject: [PATCH 0925/1216] media: bcm2835: unicam: Fix uninitialized warning +Subject: [PATCH 0925/1224] media: bcm2835: unicam: Fix uninitialized warning Signed-off-by: Jacko Dirks --- @@ -440333,7 +440333,7 @@ Signed-off-by: Jacko Dirks 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 9c0b9375572d..7906c2813a70 100644 +index 9c0b9375572d1..7906c2813a700 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -994,7 +994,7 @@ const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev) @@ -440349,10 +440349,10 @@ index 9c0b9375572d..7906c2813a70 100644 2.18.4 -From 51d66c8cefaba515b9afa8405a5a9385483675d1 Mon Sep 17 00:00:00 2001 +From 0b31e31e7331acea15026153894c812ff0f47ac9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 15:14:05 +0100 -Subject: [PATCH 0926/1216] media: bcm2835-unicam: Fixup review comments from +Subject: [PATCH 0926/1224] media: bcm2835-unicam: Fixup review comments from Hans. Updates the driver based on the upstream review comments from @@ -440365,7 +440365,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig -index ec46e3ef053c..c45ae3c6f1fd 100644 +index ec46e3ef053cf..c45ae3c6f1fde 100644 --- a/drivers/media/platform/bcm2835/Kconfig +++ b/drivers/media/platform/bcm2835/Kconfig @@ -1,15 +1,19 @@ @@ -440393,7 +440393,7 @@ index ec46e3ef053c..c45ae3c6f1fd 100644 To compile this driver as a module, choose M here. The module will be called bcm2835-unicam. diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 7906c2813a70..94e08ae92c1f 100644 +index 7906c2813a700..94e08ae92c1f6 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -1,6 +1,6 @@ @@ -440599,10 +440599,10 @@ index 7906c2813a70..94e08ae92c1f 100644 2.18.4 -From da35ec6081d37dcad7a11f58cb954433b3154ce9 Mon Sep 17 00:00:00 2001 +From ba7872adcb7e898f781a03e5dd6624f8d795119e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 11:46:47 +0100 -Subject: [PATCH 0927/1216] media: bcm2835-unicam: Retain packing information +Subject: [PATCH 0927/1224] media: bcm2835-unicam: Retain packing information on G_FMT The change to retrieve the pixel format always on g_fmt didn't @@ -440620,7 +440620,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 94e08ae92c1f..96c0b9fea942 100644 +index 94e08ae92c1f6..96c0b9fea9423 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -970,8 +970,23 @@ static int unicam_g_fmt_vid_cap(struct file *file, void *priv, @@ -440653,10 +440653,10 @@ index 94e08ae92c1f..96c0b9fea942 100644 2.18.4 -From 7ffb35326bbfa747530f90b5882803439bbff577 Mon Sep 17 00:00:00 2001 +From d090f244ae12e31816095aca850669854361c6ab Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 28 May 2020 11:09:48 +0100 -Subject: [PATCH 0928/1216] media: bcm2835-unicam: change minimum number of +Subject: [PATCH 0928/1224] 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 @@ -440671,7 +440671,7 @@ Signed-off-by: David Plowman 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 96c0b9fea942..f2cd2083bbd4 100644 +index 96c0b9fea9423..f2cd2083bbd42 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -2387,7 +2387,7 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node, @@ -440687,10 +440687,10 @@ index 96c0b9fea942..f2cd2083bbd4 100644 2.18.4 -From 32a77224d6fc07f2a03a416e133a2a2813abbcd0 Mon Sep 17 00:00:00 2001 +From 872ef7c4fa913769035655c47353a9ca239ec403 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jun 2020 15:41:42 +0100 -Subject: [PATCH 0929/1216] dt/dtoverlays: Fix up base DT and overlays for +Subject: [PATCH 0929/1224] dt/dtoverlays: Fix up base DT and overlays for updated Unicam driver The upstreamed Unicam driver uses a dt property to denote how many @@ -440717,7 +440717,7 @@ Signed-off-by: Dave Stevenson 9 files changed, 25 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index 2ea54b92fbca..c42fa2aa5ef2 100644 +index 2ea54b92fbcab..c42fa2aa5ef23 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -203,7 +203,8 @@ @@ -440731,7 +440731,7 @@ index 2ea54b92fbca..c42fa2aa5ef2 100644 /delete-node/ &emmc2; diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi -index 952a28eaf616..6e4ce8622b47 100644 +index 952a28eaf6163..6e4ce8622b477 100644 --- a/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi +++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi @@ -1,8 +1,4 @@ @@ -440745,7 +440745,7 @@ index 952a28eaf616..6e4ce8622b47 100644 + brcm,num-data-lanes = <2>; }; diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi -index 451fb4bb4ab8..6938f4daacdc 100644 +index 451fb4bb4ab81..6938f4daacdc2 100644 --- a/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi @@ -1,8 +1,4 @@ @@ -440759,7 +440759,7 @@ index 451fb4bb4ab8..6938f4daacdc 100644 + brcm,num-data-lanes = <2>; }; diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi -index 9279d4b0bfae..b37037437bee 100644 +index 9279d4b0bfae2..b37037437beed 100644 --- a/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi @@ -1,8 +1,4 @@ @@ -440773,7 +440773,7 @@ index 9279d4b0bfae..b37037437bee 100644 + brcm,num-data-lanes = <4>; }; diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts -index 238acd2bee72..5d85dfd0595c 100644 +index 238acd2bee723..5d85dfd0595c9 100644 --- a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts @@ -40,6 +40,7 @@ @@ -440785,7 +440785,7 @@ index 238acd2bee72..5d85dfd0595c 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts -index 1dd6f92b4dfe..bd187713939e 100644 +index 1dd6f92b4dfe7..bd187713939e1 100644 --- a/arch/arm/boot/dts/overlays/imx477-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts @@ -49,6 +49,7 @@ @@ -440797,7 +440797,7 @@ index 1dd6f92b4dfe..bd187713939e 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts -index 7e9431f64dc3..e926e18e71fc 100644 +index 7e9431f64dc32..e926e18e71fce 100644 --- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts @@ -43,6 +43,8 @@ @@ -440810,7 +440810,7 @@ index 7e9431f64dc3..e926e18e71fc 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts -index 3dc817fa48a8..5eba3cb9fb91 100644 +index 3dc817fa48a8f..5eba3cb9fb91d 100644 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts @@ -43,6 +43,7 @@ @@ -440822,7 +440822,7 @@ index 3dc817fa48a8..5eba3cb9fb91 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts -index 2ea99cd9e1a1..a1f8af36d2e7 100644 +index 2ea99cd9e1a1e..a1f8af36d2e74 100644 --- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts @@ -86,8 +86,22 @@ @@ -440853,10 +440853,10 @@ index 2ea99cd9e1a1..a1f8af36d2e7 100644 2.18.4 -From 95a7bb98910ff3448e6e8a40219e8040bc53938d Mon Sep 17 00:00:00 2001 +From a697eb62f2662cf6b8c043b7e751545ad5b31594 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Jun 2020 15:53:44 +0100 -Subject: [PATCH 0930/1216] media: bcm2835-unicam: Avoid gcc warning over {0} +Subject: [PATCH 0930/1224] media: bcm2835-unicam: Avoid gcc warning over {0} on endpoint Older gcc versions object to = { 0 } initialisation if the first @@ -440870,7 +440870,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index f2cd2083bbd4..f70167d271fe 100644 +index f2cd2083bbd42..f70167d271fe6 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -2578,7 +2578,7 @@ static const struct v4l2_async_notifier_operations unicam_async_ops = { @@ -440886,10 +440886,10 @@ index f2cd2083bbd4..f70167d271fe 100644 2.18.4 -From 60c20f605a08c8827bc71dc1d24b1681cc8b4325 Mon Sep 17 00:00:00 2001 +From 997f35860618d4454b847702f096074ca513a597 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 4 Oct 2019 13:05:24 -0300 -Subject: [PATCH 0931/1216] media: dt-bindings: media: i2c: Add IMX290 CMOS +Subject: [PATCH 0931/1224] media: dt-bindings: media: i2c: Add IMX290 CMOS sensor binding Commit 8a97a4676f8b1badcd9cfbed2b081342847bb1b1 upstream. @@ -440909,7 +440909,7 @@ Signed-off-by: Mauro Carvalho Chehab diff --git a/Documentation/devicetree/bindings/media/i2c/imx290.txt b/Documentation/devicetree/bindings/media/i2c/imx290.txt new file mode 100644 -index 000000000000..a3cc21410f7c +index 0000000000000..a3cc21410f7c6 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx290.txt @@ -0,0 +1,57 @@ @@ -440971,7 +440971,7 @@ index 000000000000..a3cc21410f7c + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS -index d744087f13a7..1543a5147d22 100644 +index d744087f13a70..1543a5147d221 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15200,6 +15200,14 @@ S: Maintained @@ -440993,10 +440993,10 @@ index d744087f13a7..1543a5147d22 100644 2.18.4 -From e5a8a2f758020bdd4bf15bdee880370ebd714515 Mon Sep 17 00:00:00 2001 +From e8d3f6ca451f5a568eba9fc1a524a8a051a16d8f Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 4 Oct 2019 13:05:25 -0300 -Subject: [PATCH 0932/1216] media: i2c: Add IMX290 CMOS image sensor driver +Subject: [PATCH 0932/1224] media: i2c: Add IMX290 CMOS image sensor driver Commit 828dbc299278065b634e913d2700d254a3224853 upstream. @@ -441016,7 +441016,7 @@ Signed-off-by: Mauro Carvalho Chehab create mode 100644 drivers/media/i2c/imx290.c diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 40ff7cf92cef..8e5e037f30df 100644 +index 40ff7cf92cefe..8e5e037f30df9 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -609,6 +609,17 @@ config VIDEO_IMX274 @@ -441038,7 +441038,7 @@ index 40ff7cf92cef..8e5e037f30df 100644 tristate "Sony IMX477 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 93015547a1f6..2d55801afdc6 100644 +index 93015547a1f6c..2d55801afdc6c 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -114,6 +114,7 @@ obj-$(CONFIG_VIDEO_IMX214) += imx214.o @@ -441051,7 +441051,7 @@ index 93015547a1f6..2d55801afdc6 100644 obj-$(CONFIG_VIDEO_IMX355) += imx355.o diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c new file mode 100644 -index 000000000000..f7678e5a5d87 +index 0000000000000..f7678e5a5d879 --- /dev/null +++ b/drivers/media/i2c/imx290.c @@ -0,0 +1,884 @@ @@ -441943,10 +441943,10 @@ index 000000000000..f7678e5a5d87 2.18.4 -From c3a33af815023bda6dcfc2bf49db8fe876623058 Mon Sep 17 00:00:00 2001 +From 6751583c84147bac6edb44e5b7c2bc011da298f8 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:46 +0200 -Subject: [PATCH 0933/1216] media: i2c: imx290: set the format before +Subject: [PATCH 0933/1224] media: i2c: imx290: set the format before VIDIOC_SUBDEV_G_FMT is called Commit d46cfdc86c30d5ec768924f0b1e2683c8d20b671 upstream. @@ -441972,7 +441972,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index f7678e5a5d87..2d8c38ffe2f0 100644 +index f7678e5a5d879..2d8c38ffe2f07 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -722,9 +722,6 @@ static int imx290_probe(struct i2c_client *client) @@ -441999,10 +441999,10 @@ index f7678e5a5d87..2d8c38ffe2f0 100644 2.18.4 -From d8584e5a97c9a5f1a989d4e6ff1dc3866b9dca4b Mon Sep 17 00:00:00 2001 +From c25cfba04e7bc7040d83c696fd71c4dd9dc3c191 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:47 +0200 -Subject: [PATCH 0934/1216] media: i2c: imx290: fix the order of the args in +Subject: [PATCH 0934/1224] media: i2c: imx290: fix the order of the args in SET_RUNTIME_PM_OPS() Commit 8d2d1bedb1b9af3e0c039a4444858da7b6da71f8 upstream. @@ -442019,7 +442019,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 2d8c38ffe2f0..d0322f9a8856 100644 +index 2d8c38ffe2f07..d0322f9a88562 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -648,7 +648,7 @@ static int imx290_power_off(struct device *dev) @@ -442035,10 +442035,10 @@ index 2d8c38ffe2f0..d0322f9a8856 100644 2.18.4 -From 6ccf24454a8c24e1be7e3527fa7a84906710792c Mon Sep 17 00:00:00 2001 +From 38daad2e6fd3e37ac9b067bf72d8deb897da28de Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:48 +0200 -Subject: [PATCH 0935/1216] media: i2c: imx290: fix reset GPIO pin handling +Subject: [PATCH 0935/1224] media: i2c: imx290: fix reset GPIO pin handling Commit 3909a92d7df622b41b9ceeeea694e641cad7667b upstream. @@ -442067,7 +442067,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index d0322f9a8856..7b1de1f0c8b7 100644 +index d0322f9a88562..7b1de1f0c8b74 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -628,7 +628,7 @@ static int imx290_power_on(struct device *dev) @@ -442102,10 +442102,10 @@ index d0322f9a8856..7b1de1f0c8b7 100644 2.18.4 -From 587ff56cc55e6df5cdc7faeb93160f3f3c4d5be5 Mon Sep 17 00:00:00 2001 +From bf93abaaff79d636dc2a3b01792676c8a03c61d3 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:49 +0200 -Subject: [PATCH 0936/1216] media: i2c: imx290: Add support for 2 data lanes +Subject: [PATCH 0936/1224] media: i2c: imx290: Add support for 2 data lanes Commit 97589ad61c730e0f486635c6c19fa25ab8e8f29d upstream. @@ -442123,7 +442123,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 133 insertions(+), 14 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 7b1de1f0c8b7..ffb393962ffc 100644 +index 7b1de1f0c8b74..ffb393962ffc5 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -25,7 +25,12 @@ @@ -442422,10 +442422,10 @@ index 7b1de1f0c8b7..ffb393962ffc 100644 2.18.4 -From 9e8c8fa4d5cc1d5173d6545768039cb51ff04dd5 Mon Sep 17 00:00:00 2001 +From 400f813f574e974102af121300f0ae554de71acc Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:50 +0200 -Subject: [PATCH 0937/1216] media: i2c: imx290: Add configurable link frequency +Subject: [PATCH 0937/1224] media: i2c: imx290: Add configurable link frequency and pixel rate Commit 98e0500eadb772e1be32d8e369fcc3b7bcac93ed upstream. @@ -442444,7 +442444,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 109 insertions(+), 39 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index ffb393962ffc..152b65cb7cbc 100644 +index ffb393962ffc5..152b65cb7cbc1 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -32,8 +32,6 @@ @@ -442734,10 +442734,10 @@ index ffb393962ffc..152b65cb7cbc 100644 2.18.4 -From e9803a2b85b899ba973fa5e83dd12ed9417aee54 Mon Sep 17 00:00:00 2001 +From a557fd935d5bf65ededc9ff93ab363c29c7dc0bc Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:51 +0200 -Subject: [PATCH 0938/1216] media: i2c: imx290: Add support for test pattern +Subject: [PATCH 0938/1224] media: i2c: imx290: Add support for test pattern generation Commit a58df1f9e4885eaf3d0663574a217e513821a9f0 upstream. @@ -442761,7 +442761,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 152b65cb7cbc..67725a5aabd3 100644 +index 152b65cb7cbc1..67725a5aabd36 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -26,12 +26,19 @@ @@ -442850,10 +442850,10 @@ index 152b65cb7cbc..67725a5aabd3 100644 2.18.4 -From e157c5c2b71eb646d7bcbe9fa6b8dd8b7ac54836 Mon Sep 17 00:00:00 2001 +From 8da32382e0d22937065ac7627358dfc89f0ad4c5 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:52 +0200 -Subject: [PATCH 0939/1216] media: i2c: imx290: Add RAW12 mode support +Subject: [PATCH 0939/1224] media: i2c: imx290: Add RAW12 mode support Commit c566ac01ceaa02450acc155201772c0623530e76 upstream. @@ -442870,7 +442870,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 67725a5aabd3..c654a9a8fb08 100644 +index 67725a5aabd36..c654a9a8fb081 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -67,6 +67,7 @@ struct imx290 { @@ -442965,10 +442965,10 @@ index 67725a5aabd3..c654a9a8fb08 100644 2.18.4 -From efd55a7b9bdbb49f1c1ee4b83863ab6c6645eaba Mon Sep 17 00:00:00 2001 +From a48f3ceefd86f921a51acd649300e135b5a101ce Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:53 +0200 -Subject: [PATCH 0940/1216] media: i2c: imx290: Add support to enumerate all +Subject: [PATCH 0940/1224] media: i2c: imx290: Add support to enumerate all frame sizes Commit 3b867fb641d884b714fba390ae866714ba475f29 upstream. @@ -442985,7 +442985,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 23 insertions(+) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index c654a9a8fb08..fd147fac5ef2 100644 +index c654a9a8fb081..fd147fac5ef2e 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -528,6 +528,28 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd, @@ -443029,10 +443029,10 @@ index c654a9a8fb08..fd147fac5ef2 100644 2.18.4 -From 595f6bd7d47dd14342a194e8772bbe511d30b6b4 Mon Sep 17 00:00:00 2001 +From 48ec2295a590d233c43f3fae2d9840ebc4a0eea2 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Fri, 12 Jun 2020 15:53:54 +0200 -Subject: [PATCH 0941/1216] media: i2c: imx290: Move the settle time delay out +Subject: [PATCH 0941/1224] media: i2c: imx290: Move the settle time delay out of loop Commit 6544af9b04b4484867c234ba0be1b5008e4a14ee upstream. @@ -443050,7 +443050,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index fd147fac5ef2..02001c1b0dfc 100644 +index fd147fac5ef2e..02001c1b0dfcf 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -404,11 +404,11 @@ static int imx290_set_register_array(struct imx290 *imx290, @@ -443072,10 +443072,10 @@ index fd147fac5ef2..02001c1b0dfc 100644 2.18.4 -From 6f99748c3c7efd5a952598969bd9a082571cf1bf Mon Sep 17 00:00:00 2001 +From fe81cba249b9ffc09f47e4a3a9bbaf9819c59ad5 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 12 Jun 2020 15:53:55 +0200 -Subject: [PATCH 0942/1216] media: i2c: imx290: set bus_type before calling +Subject: [PATCH 0942/1224] media: i2c: imx290: set bus_type before calling v4l2_fwnode_endpoint_alloc_parse() Commit a270675875829b6d46eb9e38960fd6019555ebb8 upstream. @@ -443096,7 +443096,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 02001c1b0dfc..9c97830164e9 100644 +index 02001c1b0dfcf..9c97830164e97 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -70,7 +70,6 @@ struct imx290 { @@ -443215,10 +443215,10 @@ index 02001c1b0dfc..9c97830164e9 100644 2.18.4 -From 5f8c2e1b876777ca129ea717781d467ff2e67f5e Mon Sep 17 00:00:00 2001 +From df6e1404d86ca004140f11b6b35b4128903056a4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 08:28:51 +0100 -Subject: [PATCH 0943/1216] media: i2c: imx290: Add support for 74.25MHz clock +Subject: [PATCH 0943/1224] 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. @@ -443232,7 +443232,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 97 insertions(+), 22 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 9c97830164e9..656716fea44b 100644 +index 9c97830164e97..656716fea44b3 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -1,6 +1,10 @@ @@ -443485,10 +443485,10 @@ index 9c97830164e9..656716fea44b 100644 2.18.4 -From d17d65a8be93b5df59a3d982a91b3a3476487457 Mon Sep 17 00:00:00 2001 +From 850555c62c025d5d81a887674aea5c65bc207595 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 13:41:43 +0100 -Subject: [PATCH 0944/1216] media: i2c: imx290: Correct range for V4L2_CID_GAIN +Subject: [PATCH 0944/1224] 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 @@ -443501,7 +443501,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 656716fea44b..e7eecbea9bb0 100644 +index 656716fea44b3..e7eecbea9bb07 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -1124,7 +1124,7 @@ static int imx290_probe(struct i2c_client *client) @@ -443517,10 +443517,10 @@ index 656716fea44b..e7eecbea9bb0 100644 2.18.4 -From 91ef81bc8e481f46e3c1baac54fb9763755f3de9 Mon Sep 17 00:00:00 2001 +From d2c062cf0340339316e6f8c4e407e4eb390e3512 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 14:36:40 +0100 -Subject: [PATCH 0945/1216] media: i2c: imx290: Convert HMAX setting into +Subject: [PATCH 0945/1224] media: i2c: imx290: Convert HMAX setting into V4L2_CID_HBLANK Userspace needs to know HBLANK if it is to work out exposure times @@ -443532,7 +443532,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index e7eecbea9bb0..876ad590102b 100644 +index e7eecbea9bb07..876ad590102be 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -40,6 +40,9 @@ enum imx290_clk_index { @@ -443682,10 +443682,10 @@ index e7eecbea9bb0..876ad590102b 100644 2.18.4 -From 33db34e10b8dfa9efe458c200b86903f513da893 Mon Sep 17 00:00:00 2001 +From 590ea5594e35fd21f0095d3c6dc56103bb822cc3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:09:12 +0100 -Subject: [PATCH 0946/1216] media: i2c: imx290: Add support for V4L2_CID_VBLANK +Subject: [PATCH 0946/1224] 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, @@ -443700,7 +443700,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 876ad590102b..ea0559e8dcc9 100644 +index 876ad590102be..ea0559e8dcc95 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -38,6 +38,8 @@ enum imx290_clk_index { @@ -443829,10 +443829,10 @@ index 876ad590102b..ea0559e8dcc9 100644 2.18.4 -From 41e52c8b2644b16d891ca5ff45b6a480561df363 Mon Sep 17 00:00:00 2001 +From 2f8770e52aebf17bf72c9c046bfc7686229b9e3c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:19:13 +0100 -Subject: [PATCH 0947/1216] media: i2c: imx290: Add exposure control to the +Subject: [PATCH 0947/1224] media: i2c: imx290: Add exposure control to the driver. Adds support for V4L2_CID_EXPOSURE so that userspace can control @@ -443844,7 +443844,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 35 insertions(+) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index ea0559e8dcc9..df1ad9ac509f 100644 +index ea0559e8dcc95..df1ad9ac509fa 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -45,6 +45,10 @@ enum imx290_clk_index { @@ -443928,10 +443928,10 @@ index ea0559e8dcc9..df1ad9ac509f 100644 2.18.4 -From 3f77fa01b3548b9aa64c5b4826d8ea63c0716a20 Mon Sep 17 00:00:00 2001 +From 7301de67a9cbd546f1993129c23a4335cff35432 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jun 2020 18:34:16 +0100 -Subject: [PATCH 0948/1216] media: i2c: imx290: Add H and V flip controls +Subject: [PATCH 0948/1224] 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. @@ -443946,7 +443946,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 22 insertions(+) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index df1ad9ac509f..246c4b149598 100644 +index df1ad9ac509fa..246c4b1495983 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -34,6 +34,7 @@ enum imx290_clk_index { @@ -444017,10 +444017,10 @@ index df1ad9ac509f..246c4b149598 100644 2.18.4 -From 95ba7be95a9b76c95d72cda7fa9c8dce33c7e032 Mon Sep 17 00:00:00 2001 +From b895805acd30047e83cb57e6be8855f06bd96eb5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 16:52:14 +0100 -Subject: [PATCH 0949/1216] media: dt-bindings: media: i2c: Add mono version to +Subject: [PATCH 0949/1224] media: dt-bindings: media: i2c: Add mono version to IMX290 bindings The IMX290 module is available as either monochrome or colour and @@ -444034,7 +444034,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/media/i2c/imx290.txt b/Documentation/devicetree/bindings/media/i2c/imx290.txt -index a3cc21410f7c..294e63650d9e 100644 +index a3cc21410f7c6..294e63650d9e3 100644 --- a/Documentation/devicetree/bindings/media/i2c/imx290.txt +++ b/Documentation/devicetree/bindings/media/i2c/imx290.txt @@ -1,13 +1,14 @@ @@ -444059,10 +444059,10 @@ index a3cc21410f7c..294e63650d9e 100644 2.18.4 -From a1fc0ee18e81d01fa02df594e0c5138f89e7abf5 Mon Sep 17 00:00:00 2001 +From f05644aefce2c73d08212b12deb3b5c37705ed41 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:03:11 +0100 -Subject: [PATCH 0950/1216] media : i2c: imx290: Add support for the mono +Subject: [PATCH 0950/1224] media : i2c: imx290: Add support for the mono sensor variant. The IMX290 module is available as either mono or colour (Bayer). @@ -444076,7 +444076,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 246c4b149598..a6c5d9ce709f 100644 +index 246c4b1495983..a6c5d9ce709f6 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -1,10 +1,12 @@ @@ -444250,10 +444250,10 @@ index 246c4b149598..a6c5d9ce709f 100644 2.18.4 -From 324d7f6eb9c9b55e96c59ffee69974807fd9617f Mon Sep 17 00:00:00 2001 +From ee19457a54c6cf5be46dfa9b18f390629c31fce1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Jun 2020 18:11:49 +0100 -Subject: [PATCH 0951/1216] media: i2c: imx290: Switch set_hmax to use +Subject: [PATCH 0951/1224] media: i2c: imx290: Switch set_hmax to use imx290_write_buffered_reg imx290_set_hmax was using two independent writes to set up hmax, @@ -444268,7 +444268,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index a6c5d9ce709f..9431c2b917ed 100644 +index a6c5d9ce709f6..9431c2b917ed5 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -568,19 +568,12 @@ static int imx290_set_hmax(struct imx290 *imx290, u32 val) @@ -444299,10 +444299,10 @@ index a6c5d9ce709f..9431c2b917ed 100644 2.18.4 -From 1c9d8f9d33410b87470a3c58b96c502bcf964762 Mon Sep 17 00:00:00 2001 +From 9fc26b4c11f4c2da6384ead4c4dd9d6974631af5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 May 2020 13:35:17 +0100 -Subject: [PATCH 0952/1216] dtoverlays: Add an overlay for the Sony IMX290 +Subject: [PATCH 0952/1224] dtoverlays: Add an overlay for the Sony IMX290 image sensor Adds an overlay to configure the IMX290 image sensor. @@ -444318,7 +444318,7 @@ Signed-off-by: Dave Stevenson create mode 100644 arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 52fd4e684087..25f3ee2e1acc 100644 +index 52fd4e6840870..25f3ee2e1accc 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -85,6 +85,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -444330,7 +444330,7 @@ index 52fd4e684087..25f3ee2e1acc 100644 iqaudio-codec.dtbo \ iqaudio-dac.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 073d7dadcc95..88d69764b8ea 100644 +index 073d7dadcc95a..88d69764b8ea8 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1430,6 +1430,22 @@ Load: dtoverlay=imx219 @@ -444358,7 +444358,7 @@ index 073d7dadcc95..88d69764b8ea 100644 Uses Unicam 1, which is the standard camera connector on most Pi diff --git a/arch/arm/boot/dts/overlays/imx290-overlay.dts b/arch/arm/boot/dts/overlays/imx290-overlay.dts new file mode 100644 -index 000000000000..e536aa7f9e33 +index 0000000000000..e536aa7f9e338 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx290-overlay.dts @@ -0,0 +1,32 @@ @@ -444396,7 +444396,7 @@ index 000000000000..e536aa7f9e33 +}; diff --git a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi new file mode 100644 -index 000000000000..8f1dadb13f6a +index 0000000000000..8f1dadb13f6a9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi @@ -0,0 +1,145 @@ @@ -444549,10 +444549,10 @@ index 000000000000..8f1dadb13f6a 2.18.4 -From 7a79a2494ff6c13d68035d58af8b6f89a5eddb27 Mon Sep 17 00:00:00 2001 +From cedd0ef23119893edb6fe899ed5aa971382028be Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 18:12:17 +0100 -Subject: [PATCH 0953/1216] defconfig: Add Sony IMX290 image sensor driver to +Subject: [PATCH 0953/1224] defconfig: Add Sony IMX290 image sensor driver to all Pi defconfigs Adds the mainline IMX290 sensor driver (with extra features) to @@ -444568,7 +444568,7 @@ Signed-off-by: Dave Stevenson 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 41a34ca374a8..80ff3a2d1085 100644 +index 41a34ca374a8b..80ff3a2d1085b 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -907,6 +907,7 @@ CONFIG_VIDEO_TW2804=m @@ -444580,7 +444580,7 @@ index 41a34ca374a8..80ff3a2d1085 100644 CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV7640=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index c7b9f34ceb77..60ec82bf1a11 100644 +index c7b9f34ceb775..60ec82bf1a115 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -921,6 +921,7 @@ CONFIG_VIDEO_TW2804=m @@ -444592,7 +444592,7 @@ index c7b9f34ceb77..60ec82bf1a11 100644 CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV7640=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 93fb7f03d31c..fd6e2a4422fb 100644 +index 93fb7f03d31ce..fd6e2a4422fb0 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -896,6 +896,7 @@ CONFIG_VIDEO_TW2804=m @@ -444604,7 +444604,7 @@ index 93fb7f03d31c..fd6e2a4422fb 100644 CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV7640=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 448cc2ec5c4f..641f5fe2801b 100644 +index 448cc2ec5c4f9..641f5fe2801b7 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -914,6 +914,7 @@ CONFIG_VIDEO_TW2804=m @@ -444616,7 +444616,7 @@ index 448cc2ec5c4f..641f5fe2801b 100644 CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV7640=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index c82e163a095c..55bf3bbbcb74 100644 +index c82e163a095c3..55bf3bbbcb746 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -830,6 +830,7 @@ CONFIG_VIDEO_TW2804=m @@ -444631,10 +444631,10 @@ index c82e163a095c..55bf3bbbcb74 100644 2.18.4 -From be0460ada1ad5e2eef320ca659a0851a0b50e380 Mon Sep 17 00:00:00 2001 +From 32c1dc8e71dd788f05d3911212f663efc08cee52 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 23 Jun 2020 18:37:01 +0100 -Subject: [PATCH 0954/1216] vc4_hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET +Subject: [PATCH 0954/1224] vc4_hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET Symptom is random switching of speakers when using multichannel. @@ -444659,7 +444659,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 5aa5236e576d..994bcb027172 100644 +index 5aa5236e576da..994bcb027172d 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, @@ -444675,10 +444675,10 @@ index 5aa5236e576d..994bcb027172 100644 2.18.4 -From c9a64d3f1476978c34875269405655d48b687334 Mon Sep 17 00:00:00 2001 +From c6c8ba2d0a54094d33d5fa5dd9a355293106ac06 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 15:56:47 +0100 -Subject: [PATCH 0955/1216] staging: vc04_services: isp: Fixup g/s_selection +Subject: [PATCH 0955/1224] staging: vc04_services: isp: Fixup g/s_selection implementation Add V4L2_SEL_TGT_CROP_DEFAULT and V4L2_SEL_TGT_CROP_BOUND targets. @@ -444691,7 +444691,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 55 insertions(+), 29 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c -index bc86354ac4c6..83471996a84d 100644 +index bc86354ac4c6c..83471996a84d6 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -1006,15 +1006,32 @@ static int bcm2835_isp_node_s_selection(struct file *file, void *fh, @@ -444810,10 +444810,10 @@ index bc86354ac4c6..83471996a84d 100644 2.18.4 -From bda32171eb625cc5111566c71cbdd9dae5d98ed7 Mon Sep 17 00:00:00 2001 +From 340418529355b5850d372f47d1f308337fffd2ae Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 15:57:08 +0100 -Subject: [PATCH 0956/1216] staging: vc04_services: isp: Reorder operations +Subject: [PATCH 0956/1224] staging: vc04_services: isp: Reorder operations during device probe Register the video node at the end of the probe, swapping order with @@ -444825,7 +444825,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c -index 83471996a84d..815cf50cd07a 100644 +index 83471996a84d6..815cf50cd07a5 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -1295,21 +1295,6 @@ static int register_node(struct bcm2835_isp_dev *dev, @@ -444908,10 +444908,10 @@ index 83471996a84d..815cf50cd07a 100644 2.18.4 -From 10dd5d47ec5ddb73bccfa3a18d3ba1e7e54145ea Mon Sep 17 00:00:00 2001 +From 5282b480eb88df3a13d274a8d414533cae9e89a1 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 19 May 2020 15:57:23 +0100 -Subject: [PATCH 0957/1216] uapi: bcm2835-isp: Fixups for bcm2835-isp uapi +Subject: [PATCH 0957/1224] uapi: bcm2835-isp: Fixups for bcm2835-isp uapi structures Rename pad_[] to padding[]. @@ -444923,7 +444923,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h -index e7afc367fd76..bb16dcbcb40f 100644 +index e7afc367fd76c..bb16dcbcb40f5 100644 --- a/include/uapi/linux/bcm2835-isp.h +++ b/include/uapi/linux/bcm2835-isp.h @@ -46,7 +46,7 @@ @@ -444948,10 +444948,10 @@ index e7afc367fd76..bb16dcbcb40f 100644 2.18.4 -From 46672c0a105e2785ce9b2ac0004821011eb174bb Mon Sep 17 00:00:00 2001 +From 8eb77189726b89721c60ff3e07c7d1d05532f5d2 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sun, 21 Jun 2020 18:06:31 +0300 -Subject: [PATCH 0958/1216] config: Set CONFIG_SERIAL_DEV_CTRL_TTYPORT=y in +Subject: [PATCH 0958/1224] config: Set CONFIG_SERIAL_DEV_CTRL_TTYPORT=y in Raspberry Pi defconfigs The next patch adds a device tree overlay for Bluetooth. The Bluetooth @@ -444983,7 +444983,7 @@ Signed-off-by: Maxim Mikityanskiy 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 80ff3a2d1085..78cfd48bdbaa 100644 +index 80ff3a2d1085b..78cfd48bdbaa5 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -650,7 +650,8 @@ CONFIG_SERIAL_AMBA_PL011=y @@ -444997,7 +444997,7 @@ index 80ff3a2d1085..78cfd48bdbaa 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 60ec82bf1a11..6d4215757ab8 100644 +index 60ec82bf1a115..6d4215757ab87 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -661,7 +661,8 @@ CONFIG_SERIAL_AMBA_PL011=y @@ -445011,7 +445011,7 @@ index 60ec82bf1a11..6d4215757ab8 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index fd6e2a4422fb..b5d722f1164b 100644 +index fd6e2a4422fb0..b5d722f1164b4 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -640,7 +640,8 @@ CONFIG_SERIAL_AMBA_PL011=y @@ -445025,7 +445025,7 @@ index fd6e2a4422fb..b5d722f1164b 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 641f5fe2801b..ef61141de634 100644 +index 641f5fe2801b7..ef61141de634b 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -656,7 +656,8 @@ CONFIG_SERIAL_AMBA_PL011=y @@ -445039,7 +445039,7 @@ index 641f5fe2801b..ef61141de634 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 55bf3bbbcb74..bf65e6561589 100644 +index 55bf3bbbcb746..bf65e65615895 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -630,7 +630,8 @@ CONFIG_SERIAL_AMBA_PL011=y @@ -445056,10 +445056,10 @@ index 55bf3bbbcb74..bf65e6561589 100644 2.18.4 -From 1e13e9ed63d108e4bf3befa1e618c922907e3bba Mon Sep 17 00:00:00 2001 +From 66938ca8c0fdabe58fad961e06c1eabd0a47593a Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sat, 27 Jun 2020 13:08:26 +0300 -Subject: [PATCH 0959/1216] ARM: dts: Add Bluetooth nodes for Raspberry Pi +Subject: [PATCH 0959/1224] 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 @@ -445094,7 +445094,7 @@ Signed-off-by: Maxim Mikityanskiy diff --git a/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi new file mode 100644 -index 000000000000..a18f80af97d3 +index 0000000000000..a18f80af97d32 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi @@ -0,0 +1,26 @@ @@ -445125,7 +445125,7 @@ index 000000000000..a18f80af97d3 + }; +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts -index 6ec6b88e03ce..111f61915947 100644 +index 6ec6b88e03ced..111f61915947a 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -4,6 +4,7 @@ @@ -445137,7 +445137,7 @@ index 6ec6b88e03ce..111f61915947 100644 / { compatible = "raspberrypi,model-zero-w", "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -index 3ca70650287c..0d6a47118b83 100644 +index 3ca70650287cb..0d6a47118b83e 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -5,6 +5,7 @@ @@ -445149,7 +445149,7 @@ index 3ca70650287c..0d6a47118b83 100644 / { compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837"; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts -index abdf7e1c0247..e833915a7854 100644 +index abdf7e1c02476..e833915a7854d 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -5,6 +5,7 @@ @@ -445161,7 +445161,7 @@ index abdf7e1c0247..e833915a7854 100644 / { compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 05220fa0202b..46475840a6da 100644 +index 05220fa0202b3..46475840a6da2 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -182,6 +182,7 @@ @@ -445183,7 +445183,7 @@ index 05220fa0202b..46475840a6da 100644 &uart1 { diff --git a/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi new file mode 100644 -index 000000000000..6b9b79f74cf3 +index 0000000000000..6b9b79f74cf36 --- /dev/null +++ b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi @@ -0,0 +1,26 @@ @@ -445214,7 +445214,7 @@ index 000000000000..6b9b79f74cf3 + }; +}; diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 88d69764b8ea..500437d65c96 100644 +index 88d69764b8ea8..500437d65c96d 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -162,6 +162,13 @@ Params: @@ -445244,7 +445244,7 @@ index 88d69764b8ea..500437d65c96 100644 Name: mmc diff --git a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts -index 2f1b655a133c..d5a66e5d76a9 100644 +index 2f1b655a133c3..d5a66e5d76a94 100644 --- a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts +++ b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts @@ -8,6 +8,8 @@ @@ -445289,7 +445289,7 @@ index 2f1b655a133c..d5a66e5d76a9 100644 __overlay__ { serial0 = "/soc/serial@7e201000"; diff --git a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts -index 30d3d8549da0..44d8e10ef735 100644 +index 30d3d8549da0a..44d8e10ef735c 100644 --- a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts +++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts @@ -15,6 +15,8 @@ @@ -445363,10 +445363,10 @@ index 30d3d8549da0..44d8e10ef735 100644 2.18.4 -From 5bfbaf7033e390bfbb66f737d060370a5c4902da Mon Sep 17 00:00:00 2001 +From 0ca82024c94556e726fc12083140e00e165ce566 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 30 Jun 2020 18:04:13 +0100 -Subject: [PATCH 0960/1216] drm/vc4: Allow interlaced HDMI modes from FKMS. +Subject: [PATCH 0960/1224] 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 @@ -445380,7 +445380,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 25a1f066e62c..ab794eec6afe 100644 +index 25a1f066e62c5..ab794eec6afef 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -936,6 +936,9 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -445406,10 +445406,10 @@ index 25a1f066e62c..ab794eec6afe 100644 2.18.4 -From e529c6c9b63a25a96a577a5a3eb70eca59a0b4ce Mon Sep 17 00:00:00 2001 +From e55183a885d4c12b85bf900f1c3ace4cd894236b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 2 Jul 2020 13:53:20 +0100 -Subject: [PATCH 0961/1216] serial: 8250: bcm2835aux - defer if clock is zero +Subject: [PATCH 0961/1224] serial: 8250: bcm2835aux - defer if clock is zero See: https://github.com/raspberrypi/linux/issues/3700 @@ -445419,7 +445419,7 @@ Signed-off-by: Phil Elwell 1 file changed, 7 insertions(+) diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c -index 33da68341c3a..8102ad9d04ea 100644 +index 33da68341c3a7..8102ad9d04ead 100644 --- a/drivers/tty/serial/8250/8250_bcm2835aux.c +++ b/drivers/tty/serial/8250/8250_bcm2835aux.c @@ -92,6 +92,13 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev) @@ -445440,10 +445440,10 @@ index 33da68341c3a..8102ad9d04ea 100644 2.18.4 -From 00dce17547b2949b247dcb7ae957dbab5e180177 Mon Sep 17 00:00:00 2001 +From b6ca658e949ef135877b49e01919ec774f10f5e5 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 24 Feb 2020 18:52:20 +0100 -Subject: [PATCH 0962/1216] media: v4l: Add 14-bit raw bayer pixel formats +Subject: [PATCH 0962/1224] media: v4l: Add 14-bit raw bayer pixel formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -445472,7 +445472,7 @@ Signed-off-by: Mauro Carvalho Chehab create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb14.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-bayer.rst b/Documentation/media/uapi/v4l/pixfmt-bayer.rst -index cfa2f4e3e114..807ab34ba93b 100644 +index cfa2f4e3e1142..807ab34ba93bb 100644 --- a/Documentation/media/uapi/v4l/pixfmt-bayer.rst +++ b/Documentation/media/uapi/v4l/pixfmt-bayer.rst @@ -34,5 +34,6 @@ orders. See also `the Wikipedia article on Bayer filter @@ -445484,7 +445484,7 @@ index cfa2f4e3e114..807ab34ba93b 100644 pixfmt-srggb16 diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb14.rst b/Documentation/media/uapi/v4l/pixfmt-srggb14.rst new file mode 100644 -index 000000000000..3420d4d1825e +index 0000000000000..3420d4d1825e4 --- /dev/null +++ b/Documentation/media/uapi/v4l/pixfmt-srggb14.rst @@ -0,0 +1,82 @@ @@ -445571,7 +445571,7 @@ index 000000000000..3420d4d1825e + - R\ :sub:`33low` + - R\ :sub:`33high` diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 31d3f50a5040..fddc53668cf3 100644 +index 31d3f50a50408..fddc53668cf39 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1298,6 +1298,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -445586,7 +445586,7 @@ index 31d3f50a5040..fddc53668cf3 100644 case V4L2_PIX_FMT_SGBRG14P: descr = "14-bit Bayer GBGB/RGRG Packed"; break; case V4L2_PIX_FMT_SGRBG14P: descr = "14-bit Bayer GRGR/BGBG Packed"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 10e146cd092a..20bbc3e60118 100644 +index 10e146cd092aa..20bbc3e601189 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -666,6 +666,10 @@ struct v4l2_pix_format { @@ -445604,10 +445604,10 @@ index 10e146cd092a..20bbc3e60118 100644 2.18.4 -From e78e544e121d2bcd1b50bdc6b7d14532846a7e37 Mon Sep 17 00:00:00 2001 +From 32eab2a50572783c97fa51c0b88f5fc37618432a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= Date: Mon, 24 Feb 2020 18:52:21 +0100 -Subject: [PATCH 0963/1216] media: v4l: Add 14-bit raw greyscale pixel format +Subject: [PATCH 0963/1224] media: v4l: Add 14-bit raw greyscale pixel format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -445632,7 +445632,7 @@ Signed-off-by: Mauro Carvalho Chehab diff --git a/Documentation/media/uapi/v4l/pixfmt-y14.rst b/Documentation/media/uapi/v4l/pixfmt-y14.rst new file mode 100644 -index 000000000000..5c260f8da088 +index 0000000000000..5c260f8da0882 --- /dev/null +++ b/Documentation/media/uapi/v4l/pixfmt-y14.rst @@ -0,0 +1,72 @@ @@ -445709,7 +445709,7 @@ index 000000000000..5c260f8da088 + - Y'\ :sub:`33low` + - Y'\ :sub:`33high` diff --git a/Documentation/media/uapi/v4l/yuv-formats.rst b/Documentation/media/uapi/v4l/yuv-formats.rst -index 962f5c367ebc..d3017026ec7b 100644 +index 962f5c367ebcd..d3017026ec7b2 100644 --- a/Documentation/media/uapi/v4l/yuv-formats.rst +++ b/Documentation/media/uapi/v4l/yuv-formats.rst @@ -35,6 +35,7 @@ to brightness information. @@ -445721,7 +445721,7 @@ index 962f5c367ebc..d3017026ec7b 100644 pixfmt-y10p pixfmt-y16 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index fddc53668cf3..6296f6cc87c4 100644 +index fddc53668cf39..6296f6cc87c48 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1212,6 +1212,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -445733,7 +445733,7 @@ index fddc53668cf3..6296f6cc87c4 100644 case V4L2_PIX_FMT_Y16_BE: descr = "16-bit Greyscale BE"; break; case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 20bbc3e60118..a4fd05446c62 100644 +index 20bbc3e601189..a4fd05446c627 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -569,6 +569,7 @@ struct v4l2_pix_format { @@ -445748,10 +445748,10 @@ index 20bbc3e60118..a4fd05446c62 100644 2.18.4 -From a694e8ed063a5aed8ac78b5a13fbab8a79d175d6 Mon Sep 17 00:00:00 2001 +From 1c73bdecd2f32ea9b6465aa73939185960c2537a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= Date: Mon, 24 Feb 2020 18:52:22 +0100 -Subject: [PATCH 0964/1216] media: v4l: Add 1X14 14-bit greyscale media bus +Subject: [PATCH 0964/1224] media: v4l: Add 1X14 14-bit greyscale media bus code definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -445772,7 +445772,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst -index 42870bd65de1..e79caa61b9ce 100644 +index 42870bd65de17..e79caa61b9ced 100644 --- a/Documentation/media/uapi/v4l/subdev-formats.rst +++ b/Documentation/media/uapi/v4l/subdev-formats.rst @@ -5792,6 +5792,43 @@ the following codes. @@ -445820,7 +445820,7 @@ index 42870bd65de1..e79caa61b9ce 100644 - MEDIA_BUS_FMT_UYVY8_1X16 diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h -index 4b5e2a71dfec..3c2848e91c1b 100644 +index 4b5e2a71dfec3..3c2848e91c1b2 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -64,7 +64,7 @@ @@ -445844,10 +445844,10 @@ index 4b5e2a71dfec..3c2848e91c1b 100644 2.18.4 -From c5a5f4a90d774d14ef053bd6e616836457f13183 Mon Sep 17 00:00:00 2001 +From 82f4e10c5bce37cd8213674ad3b9ac23f2de0c1f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 7 May 2020 16:59:03 +0100 -Subject: [PATCH 0965/1216] media: Add a pixel format for MIPI packed 12bit +Subject: [PATCH 0965/1224] media: Add a pixel format for MIPI packed 12bit luma only. This is the format used by monochrome 12bit image sensors. @@ -445863,7 +445863,7 @@ Signed-off-by: Dave Stevenson diff --git a/Documentation/media/uapi/v4l/pixfmt-y12p.rst b/Documentation/media/uapi/v4l/pixfmt-y12p.rst new file mode 100644 -index 000000000000..3704f9180fd7 +index 0000000000000..3704f9180fd77 --- /dev/null +++ b/Documentation/media/uapi/v4l/pixfmt-y12p.rst @@ -0,0 +1,45 @@ @@ -445913,7 +445913,7 @@ index 000000000000..3704f9180fd7 + Y'\ :sub:`00low`\ (bits 3--0) + diff --git a/Documentation/media/uapi/v4l/yuv-formats.rst b/Documentation/media/uapi/v4l/yuv-formats.rst -index d3017026ec7b..37f0dabf7174 100644 +index d3017026ec7b2..37f0dabf71747 100644 --- a/Documentation/media/uapi/v4l/yuv-formats.rst +++ b/Documentation/media/uapi/v4l/yuv-formats.rst @@ -35,6 +35,7 @@ to brightness information. @@ -445925,7 +445925,7 @@ index d3017026ec7b..37f0dabf7174 100644 pixfmt-y10b pixfmt-y10p diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 6296f6cc87c4..c76d836b6e0d 100644 +index 6296f6cc87c48..c76d836b6e0d2 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1217,6 +1217,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -445937,7 +445937,7 @@ index 6296f6cc87c4..c76d836b6e0d 100644 case V4L2_PIX_FMT_Y12I: descr = "Interleaved 12-bit Greyscale"; break; case V4L2_PIX_FMT_Z16: descr = "16-bit Depth"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index a4fd05446c62..cd055346095b 100644 +index a4fd05446c627..cd055346095bc 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -576,6 +576,7 @@ struct v4l2_pix_format { @@ -445952,10 +445952,10 @@ index a4fd05446c62..cd055346095b 100644 2.18.4 -From 99b2c828e415320ba453cb6211bb12030f5bbcba Mon Sep 17 00:00:00 2001 +From decab8359f8c776f6bed769ad3cc172483dc4fee Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:51:03 +0100 -Subject: [PATCH 0966/1216] media: Add a pixel format for MIPI packed 14bit +Subject: [PATCH 0966/1224] media: Add a pixel format for MIPI packed 14bit luma only. This is the format used by monochrome 14bit image sensors. @@ -445971,7 +445971,7 @@ Signed-off-by: Dave Stevenson diff --git a/Documentation/media/uapi/v4l/pixfmt-y14p.rst b/Documentation/media/uapi/v4l/pixfmt-y14p.rst new file mode 100644 -index 000000000000..27fe14c9a9eb +index 0000000000000..27fe14c9a9ebd --- /dev/null +++ b/Documentation/media/uapi/v4l/pixfmt-y14p.rst @@ -0,0 +1,54 @@ @@ -446030,7 +446030,7 @@ index 000000000000..27fe14c9a9eb + + Y'\ :sub:`02low bits 5--4`\ (bits 1--0) diff --git a/Documentation/media/uapi/v4l/yuv-formats.rst b/Documentation/media/uapi/v4l/yuv-formats.rst -index 37f0dabf7174..04315eb60c64 100644 +index 37f0dabf71747..04315eb60c64a 100644 --- a/Documentation/media/uapi/v4l/yuv-formats.rst +++ b/Documentation/media/uapi/v4l/yuv-formats.rst @@ -37,6 +37,7 @@ to brightness information. @@ -446042,7 +446042,7 @@ index 37f0dabf7174..04315eb60c64 100644 pixfmt-y10p pixfmt-y16 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index c76d836b6e0d..1deb1919cdcd 100644 +index c76d836b6e0d2..1deb1919cdcdf 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1218,6 +1218,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -446054,7 +446054,7 @@ index c76d836b6e0d..1deb1919cdcd 100644 case V4L2_PIX_FMT_Y12I: descr = "Interleaved 12-bit Greyscale"; break; case V4L2_PIX_FMT_Z16: descr = "16-bit Depth"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index cd055346095b..8020c483ea3c 100644 +index cd055346095bc..8020c483ea3cb 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -577,6 +577,7 @@ struct v4l2_pix_format { @@ -446069,10 +446069,10 @@ index cd055346095b..8020c483ea3c 100644 2.18.4 -From e31402257e15268563b939deb8f1627a8de8dae3 Mon Sep 17 00:00:00 2001 +From 4a94b06661caacf32f9fa56304f205a1403031b5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:09:04 +0100 -Subject: [PATCH 0967/1216] staging: vc04_services: isp: Add support for 14bit +Subject: [PATCH 0967/1224] staging: vc04_services: isp: Add support for 14bit Bayer The only thing missing was a set of defines, therefore add them in. @@ -446084,7 +446084,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 43 insertions(+) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h -index 40ca0f6e9c97..f590c20315dd 100644 +index 40ca0f6e9c979..f590c20315dd5 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h @@ -253,6 +253,43 @@ static const struct bcm2835_isp_fmt supported_formats[] = { @@ -446132,7 +446132,7 @@ index 40ca0f6e9c97..f590c20315dd 100644 /* 16 bit */ .fourcc = V4L2_PIX_FMT_SRGGB16, diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h -index 8d904fcce388..4288d50a7e6b 100644 +index 8d904fcce3889..4288d50a7e6b6 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h @@ -90,6 +90,12 @@ @@ -446152,10 +446152,10 @@ index 8d904fcce388..4288d50a7e6b 100644 2.18.4 -From b2751212746a2b030d93ffa962d1209a2b0c42d3 Mon Sep 17 00:00:00 2001 +From 3f5061478fb5f3b4e15f5b32fb5287c3868b9b50 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:11:14 +0100 -Subject: [PATCH 0968/1216] staging: vc04_services: isp: Add monochrome image +Subject: [PATCH 0968/1224] staging: vc04_services: isp: Add monochrome image formats Adds support for monochrome image formats in the various @@ -446168,7 +446168,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h -index f590c20315dd..fc0f95a3677d 100644 +index f590c20315dd5..fc0f95a3677de 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h @@ -328,7 +328,57 @@ static const struct bcm2835_isp_fmt supported_formats[] = { @@ -446231,7 +446231,7 @@ index f590c20315dd..fc0f95a3677d 100644 .mmal_fmt = MMAL_ENCODING_BRCM_STATS, /* The rest are not valid fields for stats. */ diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h -index 4288d50a7e6b..8eb6334ee055 100644 +index 4288d50a7e6b6..8eb6334ee0557 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h @@ -102,6 +102,13 @@ @@ -446252,10 +446252,10 @@ index 4288d50a7e6b..8eb6334ee055 100644 2.18.4 -From e52eb59f2837302db528817aaeaba325b13bf149 Mon Sep 17 00:00:00 2001 +From d85feabe5ab7c03633bc4199bb0c57148dc5c722 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 6 May 2020 18:24:34 +0100 -Subject: [PATCH 0969/1216] staging: vc04_services: isp: Increase the number of +Subject: [PATCH 0969/1224] staging: vc04_services: isp: Increase the number of supported formats expected The ISP now supports 47 different input formats, therefore increase the @@ -446267,7 +446267,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c -index 815cf50cd07a..424e7e6da1d6 100644 +index 815cf50cd07a5..424e7e6da1d6f 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -1134,10 +1134,10 @@ static const struct v4l2_ioctl_ops bcm2835_isp_node_ioctl_ops = { @@ -446287,10 +446287,10 @@ index 815cf50cd07a..424e7e6da1d6 100644 2.18.4 -From d12c9b6299b74179bd66b317bdc6037d6d7a91f9 Mon Sep 17 00:00:00 2001 +From c04e3b04a940bdc4df5fefb0ac73f22193b5efc9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:40:56 +0100 -Subject: [PATCH 0970/1216] staging: vc04_services: codec: Increase the number +Subject: [PATCH 0970/1224] staging: vc04_services: codec: Increase the number of supported formats expected The ISP now supports 47 different input formats, therefore increase the @@ -446302,7 +446302,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 2 deletions(-) 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 1c7fbba6c9c8..2391d589f170 100644 +index 1c7fbba6c9c85..2391d589f1702 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -2569,10 +2569,10 @@ static const struct v4l2_m2m_ops m2m_ops = { @@ -446322,10 +446322,10 @@ index 1c7fbba6c9c8..2391d589f170 100644 2.18.4 -From d77647bdf4401f3713d8d3d387052f545ee9763d Mon Sep 17 00:00:00 2001 +From f230e96d814c03f9213ce6b082130259bf9313b9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:38:12 +0100 -Subject: [PATCH 0971/1216] staging: vc04_services: codec: Add support for mono +Subject: [PATCH 0971/1224] staging: vc04_services: codec: Add support for mono formats The firmware ISP component now allows for processing of mono @@ -446337,7 +446337,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 41 insertions(+) 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 2391d589f170..b9415f3cdb76 100644 +index 2391d589f1702..b9415f3cdb76f 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -343,6 +343,47 @@ static const struct bcm2835_codec_fmt supported_formats[] = { @@ -446392,10 +446392,10 @@ index 2391d589f170..b9415f3cdb76 100644 2.18.4 -From f4e6b7fe4b6dc986a3f5e5bf6e5b41fa8b957734 Mon Sep 17 00:00:00 2001 +From c5646b4e1c2ab8f8f55561f6106d549d3a3ac737 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:50:12 +0100 -Subject: [PATCH 0972/1216] staging: vc04_services: codec: Add support for +Subject: [PATCH 0972/1224] staging: vc04_services: codec: Add support for 14bit Bayer formats Now that the 14bit Bayer formats have been defined within @@ -446407,7 +446407,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 34 insertions(+) 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 b9415f3cdb76..3fe81979aaa1 100644 +index b9415f3cdb76f..3fe81979aaa16 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -310,6 +310,40 @@ static const struct bcm2835_codec_fmt supported_formats[] = { @@ -446455,10 +446455,10 @@ index b9415f3cdb76..3fe81979aaa1 100644 2.18.4 -From 92107faf62d80a3f0798a94bd1c7d1108e3acce8 Mon Sep 17 00:00:00 2001 +From 1bd0ec4658cca576ef04e904df819e759059acfe Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 17:53:32 +0100 -Subject: [PATCH 0973/1216] media: bcm2835-unicam: Add support for 12bit mono +Subject: [PATCH 0973/1224] media: bcm2835-unicam: Add support for 12bit mono packed format Now that V4L2_PIX_FMT_Y12P is defined, allow passing raw 12bit @@ -446470,7 +446470,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index f70167d271fe..104f4d0f9f05 100644 +index f70167d271fe6..104f4d0f9f057 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -336,7 +336,7 @@ static const struct unicam_fmt formats[] = { @@ -446486,10 +446486,10 @@ index f70167d271fe..104f4d0f9f05 100644 2.18.4 -From a2fb6c44e9787d15d5f5b13abf2f465dc79165bd Mon Sep 17 00:00:00 2001 +From fb2fc0a14c8cd90221e99cb1600de8c208cea5a7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jun 2020 18:03:47 +0100 -Subject: [PATCH 0974/1216] media: bcm2835-unicam: Add support for 14bit mono +Subject: [PATCH 0974/1224] media: bcm2835-unicam: Add support for 14bit mono sources Now that V4L2_PIX_FMT_Y14 and V4L2_PIX_FMT_Y14P are defined, @@ -446501,7 +446501,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 6 insertions(+) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 104f4d0f9f05..799bea3d4f41 100644 +index 104f4d0f9f057..799bea3d4f41b 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -341,6 +341,12 @@ static const struct unicam_fmt formats[] = { @@ -446521,10 +446521,10 @@ index 104f4d0f9f05..799bea3d4f41 100644 2.18.4 -From 80817253331c4fd3e288302c4e4e661aef3da1ec Mon Sep 17 00:00:00 2001 +From 9821d359dcb585d43d1a6facebd210fb235172f5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 10:57:57 +0100 -Subject: [PATCH 0975/1216] media: bcm2835-unicam: Add support for unpacked +Subject: [PATCH 0975/1224] media: bcm2835-unicam: Add support for unpacked 14bit Bayer formats Now that the 14bit non-packed Bayer formats are defined, add them @@ -446536,7 +446536,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 799bea3d4f41..3b082587dd14 100644 +index 799bea3d4f41b..3b082587dd14d 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -299,21 +299,25 @@ static const struct unicam_fmt formats[] = { @@ -446569,10 +446569,10 @@ index 799bea3d4f41..3b082587dd14 100644 2.18.4 -From 0ad5ef1ea9c009eadc9ca4b3a2ef11f2bff50330 Mon Sep 17 00:00:00 2001 +From de3bb526217f61ac513393bd6b1d79be320e758f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 2 Jul 2020 15:21:05 +0100 -Subject: [PATCH 0976/1216] overlays: Fix miniuart-bt "krnbt" parameter +Subject: [PATCH 0976/1224] 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 @@ -446585,7 +446585,7 @@ Signed-off-by: Phil Elwell 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts -index 44d8e10ef735..da49f14a0940 100644 +index 44d8e10ef735c..da49f14a09401 100644 --- a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts +++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts @@ -81,7 +81,13 @@ @@ -446607,10 +446607,10 @@ index 44d8e10ef735..da49f14a0940 100644 2.18.4 -From a75461fa621fb4a955ae6624bd3067a55355c954 Mon Sep 17 00:00:00 2001 +From 7e5760d720484e02e4bb3f255d136c9e6b2431d8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 14:11:55 +0100 -Subject: [PATCH 0977/1216] drm/vc4: Make FKMS max refresh rate a module +Subject: [PATCH 0977/1224] drm/vc4: Make FKMS max refresh rate a module parameter Some people want to use the high refresh rate modes for 1080p100 @@ -446628,7 +446628,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index ab794eec6afe..a173ca430db4 100644 +index ab794eec6afef..a173ca430db4d 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -14,6 +14,8 @@ @@ -446668,10 +446668,10 @@ index ab794eec6afe..a173ca430db4 100644 2.18.4 -From 7e650c85e5446e12624c60fe88292be2c9c9e28f Mon Sep 17 00:00:00 2001 +From fb0a7cb9f9315c2ac505fb0dff957dca01136baf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 16:06:55 +0100 -Subject: [PATCH 0978/1216] drm/vc4: FKMS Block modes with odd horizontal +Subject: [PATCH 0978/1224] drm/vc4: FKMS Block modes with odd horizontal timing values on Pi4 Pi4 HDMI pipeline is 2 pixels/clock and can not produce timings @@ -446685,7 +446685,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 21 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index a173ca430db4..ff726486c785 100644 +index a173ca430db4d..ff726486c7855 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -44,6 +44,7 @@ struct get_display_cfg { @@ -446748,10 +446748,10 @@ index a173ca430db4..ff726486c785 100644 2.18.4 -From 053d5008c7c7038436c6102eed7776126c72143f Mon Sep 17 00:00:00 2001 +From 61fb91b7c638652f36c4de751e417d5003f1f0ed Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 16:05:37 +0100 -Subject: [PATCH 0979/1216] dt: Use rpi-firmware-kms-2711 on 2711 platforms +Subject: [PATCH 0979/1224] dt: Use rpi-firmware-kms-2711 on 2711 platforms Signed-off-by: Dave Stevenson --- @@ -446760,7 +446760,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 46475840a6da..9b8a3ce831bb 100644 +index 46475840a6da2..9b8a3ce831bb1 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -443,6 +443,10 @@ @@ -446775,7 +446775,7 @@ index 46475840a6da..9b8a3ce831bb 100644 // Board specific stuff here diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index c42fa2aa5ef2..ce3edc2cda7d 100644 +index c42fa2aa5ef23..ce3edc2cda7d4 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -461,6 +461,10 @@ @@ -446793,10 +446793,10 @@ index c42fa2aa5ef2..ce3edc2cda7d 100644 2.18.4 -From d4d8155c1e2532c10f0256dd778273afe388818c Mon Sep 17 00:00:00 2001 +From 5d41ec57af75df9daaef8efbd35b6a31ed603c7d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 Jul 2020 16:13:33 +0100 -Subject: [PATCH 0980/1216] drm/vc4: FKMS: Put includes in alphabetical order, +Subject: [PATCH 0980/1224] drm/vc4: FKMS: Put includes in alphabetical order, and use <> instead of "" Reorder the includes, and use the system include paths rather than @@ -446808,7 +446808,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index ff726486c785..ec5c223033c8 100644 +index ff726486c7855..ec5c223033c8d 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -14,25 +14,26 @@ @@ -446856,10 +446856,10 @@ index ff726486c785..ec5c223033c8 100644 2.18.4 -From a293b2df7e97cba983a1bcaf29f8555f9a53f2a8 Mon Sep 17 00:00:00 2001 +From a091e2890218dc36639b8deca88d91da8ac00631 Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Tue, 4 Feb 2020 15:50:41 +0100 -Subject: [PATCH 0981/1216] irqchip/bcm2835: Quiesce IRQs left enabled by +Subject: [PATCH 0981/1224] irqchip/bcm2835: Quiesce IRQs left enabled by bootloader [ Upstream commit bd59b343a9c902c522f006e6d71080f4893bbf42 ] @@ -446904,7 +446904,7 @@ Link: https://lore.kernel.org/r/f97868ba4e9b86ddad71f44ec9d8b3b7d8daa1ea.1582618 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 40c1b38d5db5..be181d4aecca 100644 +index 40c1b38d5db5c..be181d4aeccae 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -67,8 +67,7 @@ @@ -446967,10 +446967,10 @@ index 40c1b38d5db5..be181d4aecca 100644 2.18.4 -From 685ff29231455865e1b326936a0ed170bc661f94 Mon Sep 17 00:00:00 2001 +From 6f2fa3bb0eb37787b2bef9b19b75e3d0cc017f44 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Jul 2020 18:28:10 +0100 -Subject: [PATCH 0982/1216] dtoverlays: Fixup imx219 and imx477 overlays due to +Subject: [PATCH 0982/1224] dtoverlays: Fixup imx219 and imx477 overlays due to parsing failures imx219 overlay failed to detect as CSI2 as it was missing any @@ -446986,7 +446986,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts -index 7cdafdc3db1b..3c2d3fac93d2 100644 +index 7cdafdc3db1bd..3c2d3fac93d21 100644 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts @@ -49,6 +49,9 @@ @@ -447000,7 +447000,7 @@ index 7cdafdc3db1b..3c2d3fac93d2 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts -index bd187713939e..73d4f79d54e6 100644 +index bd187713939e1..73d4f79d54e6f 100644 --- a/arch/arm/boot/dts/overlays/imx477-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts @@ -49,7 +49,9 @@ @@ -447017,10 +447017,10 @@ index bd187713939e..73d4f79d54e6 100644 2.18.4 -From 825a552070ade6a2c0e76ca8cd3cff66504289db Mon Sep 17 00:00:00 2001 +From 2f263a4441de1d8c00417c1b1a2aeb46fb1c141a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 4 Jul 2020 22:19:26 +0100 -Subject: [PATCH 0983/1216] overlays: rpi-ft5406: Fix boolean parameters +Subject: [PATCH 0983/1224] overlays: rpi-ft5406: Fix boolean parameters An improvement in the automated testing of overlays revealed these invalid boolean parameter declarations. @@ -447031,7 +447031,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts -index 4dcb490f04b6..8483c4f4b2eb 100644 +index 4dcb490f04b6f..8483c4f4b2eb2 100644 --- a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts @@ -18,8 +18,8 @@ @@ -447050,10 +447050,10 @@ index 4dcb490f04b6..8483c4f4b2eb 100644 2.18.4 -From 2c95928deb7a4adbf4b6298e5af7528bb881d404 Mon Sep 17 00:00:00 2001 +From 03827d137bf71820d8035b6b0286fc681086d2d4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jul 2020 20:04:53 +0100 -Subject: [PATCH 0984/1216] configs: Regenerate Pi defconfigs +Subject: [PATCH 0984/1224] configs: Regenerate Pi defconfigs Signed-off-by: Phil Elwell --- @@ -447065,7 +447065,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 78cfd48bdbaa..21051cbfbe8e 100644 +index 78cfd48bdbaa5..21051cbfbe8ee 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -651,7 +651,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y @@ -447077,7 +447077,7 @@ index 78cfd48bdbaa..21051cbfbe8e 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 6d4215757ab8..cae30e908ee7 100644 +index 6d4215757ab87..cae30e908ee7f 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -662,7 +662,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y @@ -447089,7 +447089,7 @@ index 6d4215757ab8..cae30e908ee7 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index b5d722f1164b..3c258e951074 100644 +index b5d722f1164b4..3c258e9510748 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -641,7 +641,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y @@ -447101,7 +447101,7 @@ index b5d722f1164b..3c258e951074 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index ef61141de634..9656ca9f5316 100644 +index ef61141de634b..9656ca9f53167 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -657,7 +657,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y @@ -447113,7 +447113,7 @@ index ef61141de634..9656ca9f5316 100644 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index bf65e6561589..99ed08604d56 100644 +index bf65e65615895..99ed08604d569 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -631,7 +631,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y @@ -447128,10 +447128,10 @@ index bf65e6561589..99ed08604d56 100644 2.18.4 -From 8f7eb25cc1b0a5980efe5f870f0b772df5d2edec Mon Sep 17 00:00:00 2001 +From bff4129156a40e7c07d1bdcbf6f1f285c86dca91 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Jul 2020 17:53:47 +0100 -Subject: [PATCH 0985/1216] ARM: dts: Copy kernel BT changes to CM4 +Subject: [PATCH 0985/1224] ARM: dts: Copy kernel BT changes to CM4 Signed-off-by: Phil Elwell --- @@ -447139,7 +447139,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index ce3edc2cda7d..d5d62245f73c 100644 +index ce3edc2cda7d4..d5d62245f73c3 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -194,6 +194,7 @@ @@ -447163,10 +447163,10 @@ index ce3edc2cda7d..d5d62245f73c 100644 2.18.4 -From 1b32da4bf5059f4769d7a32575c23a3e595e37da Mon Sep 17 00:00:00 2001 +From b9229de38febf4f4a5dbcb08b775ca7d2c1b10cc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 Jul 2020 09:01:54 +0100 -Subject: [PATCH 0986/1216] ARM: dts: Make bcm2711 dts more like 5.7 +Subject: [PATCH 0986/1224] 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 @@ -447181,7 +447181,7 @@ Signed-off-by: Phil Elwell 4 files changed, 245 insertions(+), 273 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 9b8a3ce831bb..21b20e334b1a 100644 +index 9b8a3ce831bb1..21b20e334b1a7 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -19,7 +19,9 @@ @@ -447378,7 +447378,7 @@ index 9b8a3ce831bb..21b20e334b1a 100644 <&spi0>, "dmas:8=", <&dma40>; }; diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index d5d62245f73c..d4ea928e30ce 100644 +index d5d62245f73c3..d4ea928e30ce6 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -19,7 +19,9 @@ @@ -447495,7 +447495,7 @@ index d5d62245f73c..d4ea928e30ce 100644 <&spi0>, "dmas:8=", <&dma40>; }; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 7fd09353740a..e8c6a0dfc9f7 100644 +index 7fd09353740af..e8c6a0dfc9f70 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -4,6 +4,129 @@ @@ -447680,7 +447680,7 @@ index 7fd09353740a..e8c6a0dfc9f7 100644 firmware_clocks: clocks { compatible = "raspberrypi,firmware-clocks"; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 4b98dba51e59..4f87bb4fd3d1 100644 +index 4b98dba51e59b..4f87bb4fd3d1e 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -12,18 +12,6 @@ @@ -447871,10 +447871,10 @@ index 4b98dba51e59..4f87bb4fd3d1 100644 2.18.4 -From 8958d1bd546b87dd607cf4134fc8ee3c386e42cf Mon Sep 17 00:00:00 2001 +From b48ae2e37223ffda9b53a15bc6bcde4150e76dcb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Jul 2020 20:28:27 +0100 -Subject: [PATCH 0987/1216] bcm2835-dma: Add NO_WAIT_RESP flag +Subject: [PATCH 0987/1224] 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. @@ -447885,7 +447885,7 @@ Signed-off-by: Phil Elwell 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 53346d7eb66c..9fec52489421 100644 +index 53346d7eb66c4..9fec52489421a 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -167,6 +167,11 @@ struct bcm2835_desc { @@ -447931,10 +447931,10 @@ index 53346d7eb66c..9fec52489421 100644 2.18.4 -From fc7fb8df56451b1e2c0a108743a1568d31728635 Mon Sep 17 00:00:00 2001 +From 292208dc9fa99d63ffbd7cd0ef0c5c5cc2fdf555 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 Jul 2020 14:08:55 +0100 -Subject: [PATCH 0988/1216] ARM: dts: Restore the old 2711 scb ranges property +Subject: [PATCH 0988/1224] ARM: dts: Restore the old 2711 scb ranges property The back-ported value breaks PCIe. @@ -447944,7 +447944,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index e8c6a0dfc9f7..4a3659d21997 100644 +index e8c6a0dfc9f70..4a3659d21997b 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -191,7 +191,8 @@ @@ -447961,10 +447961,10 @@ index e8c6a0dfc9f7..4a3659d21997 100644 2.18.4 -From bedd7915abd7706e7b2f71d1028b0e98a1e547b5 Mon Sep 17 00:00:00 2001 +From b3669bda6524d53c585d01b9fe12fd383dd25ecd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 Jul 2020 14:22:25 +0100 -Subject: [PATCH 0989/1216] configs: Enable CONFIG_BLK_DEV_NVME=m +Subject: [PATCH 0989/1224] configs: Enable CONFIG_BLK_DEV_NVME=m Enable support for NVME SSDs. @@ -447975,7 +447975,7 @@ Signed-off-by: Phil Elwell 2 files changed, 2 insertions(+) diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index cae30e908ee7..18fc77ae0aee 100644 +index cae30e908ee7f..18fc77ae0aeef 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -462,6 +462,7 @@ CONFIG_BLK_DEV_NBD=m @@ -447987,7 +447987,7 @@ index cae30e908ee7..18fc77ae0aee 100644 CONFIG_TI_ST=m CONFIG_SCSI=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 9656ca9f5316..656068a1bbb8 100644 +index 9656ca9f53167..656068a1bbb8c 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -458,6 +458,7 @@ CONFIG_BLK_DEV_NBD=m @@ -448002,10 +448002,10 @@ index 9656ca9f5316..656068a1bbb8 100644 2.18.4 -From d885b5d4f8424c50d43233ecdc887c757fae5cb6 Mon Sep 17 00:00:00 2001 +From d30006902db25fadedcf76a022cbe38ab7ac2a3a Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Fri, 17 May 2019 18:23:03 +0800 -Subject: [PATCH 0990/1216] media: i2c: add ov9281 driver. +Subject: [PATCH 0990/1224] media: i2c: add ov9281 driver. Change-Id: I7b77250bbc56d2f861450cf77271ad15f9b88ab1 Signed-off-by: Zefa Chen @@ -448017,7 +448017,7 @@ Signed-off-by: Zefa Chen create mode 100644 drivers/media/i2c/ov9281.c diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 8e5e037f30df..499fd08b2a40 100644 +index 8e5e037f30df9..499fd08b2a404 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -855,6 +855,17 @@ config VIDEO_OV9640 @@ -448039,7 +448039,7 @@ index 8e5e037f30df..499fd08b2a40 100644 tristate "OmniVision OV9650/OV9652 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 2d55801afdc6..9aaf6f2bd87e 100644 +index 2d55801afdc6c..9aaf6f2bd87e1 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -79,6 +79,7 @@ obj-$(CONFIG_VIDEO_OV7670) += ov7670.o @@ -448052,7 +448052,7 @@ index 2d55801afdc6..9aaf6f2bd87e 100644 obj-$(CONFIG_VIDEO_OV13858) += ov13858.o diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c new file mode 100644 -index 000000000000..4a6324a3e5da +index 0000000000000..4a6324a3e5da2 --- /dev/null +++ b/drivers/media/i2c/ov9281.c @@ -0,0 +1,1171 @@ @@ -449231,10 +449231,10 @@ index 000000000000..4a6324a3e5da 2.18.4 -From bba7f2085300dec8e8966d40efb2ee2d8c1bb37b Mon Sep 17 00:00:00 2001 +From 52b5a1ba5fb07b16762b6ef3a7615d7888d2a415 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 15:47:09 +0100 -Subject: [PATCH 0991/1216] media: i2c: ov9281: fix mclk issue when probe +Subject: [PATCH 0991/1224] media: i2c: ov9281: fix mclk issue when probe multiple camera. Takes the ov9281 part only from the Rockchip's patch. @@ -449246,7 +449246,7 @@ Signed-off-by: Zefa Chen 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c -index 4a6324a3e5da..0d6759942f79 100644 +index 4a6324a3e5da2..0d6759942f793 100644 --- a/drivers/media/i2c/ov9281.c +++ b/drivers/media/i2c/ov9281.c @@ -3,6 +3,7 @@ @@ -449297,10 +449297,10 @@ index 4a6324a3e5da..0d6759942f79 100644 2.18.4 -From 7588790131c33781d1b77eeb668b654fa76850f4 Mon Sep 17 00:00:00 2001 +From ac2dde3e7e17b8804189ace1cedcf22a819871f2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 15:51:50 +0100 -Subject: [PATCH 0992/1216] media: i2c: ov9281: add enum_frame_interval +Subject: [PATCH 0992/1224] 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 @@ -449313,7 +449313,7 @@ Signed-off-by: Zefa Chen 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c -index 0d6759942f79..273aa904683c 100644 +index 0d6759942f793..273aa904683cd 100644 --- a/drivers/media/i2c/ov9281.c +++ b/drivers/media/i2c/ov9281.c @@ -4,6 +4,7 @@ @@ -449400,10 +449400,10 @@ index 0d6759942f79..273aa904683c 100644 2.18.4 -From 4d9866289ef6fff0eebe7426149e0977dfb311ce Mon Sep 17 00:00:00 2001 +From 0c6bec78c25603e434e80fed4d152e9c4f6bd657 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 14 Apr 2020 16:12:33 +0100 -Subject: [PATCH 0993/1216] media: i2c: ov9281: Fixup for recent kernel +Subject: [PATCH 0993/1224] 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 @@ -449419,7 +449419,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 123 insertions(+), 240 deletions(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 499fd08b2a40..0a0973b5f55d 100644 +index 499fd08b2a404..0a0973b5f55d1 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -857,7 +857,7 @@ config VIDEO_OV9640 @@ -449432,7 +449432,7 @@ index 499fd08b2a40..0a0973b5f55d 100644 help This is a Video4Linux2 sensor-level driver for the OmniVision diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c -index 273aa904683c..7b9bea476cfb 100644 +index 273aa904683cd..7b9bea476cfb4 100644 --- a/drivers/media/i2c/ov9281.c +++ b/drivers/media/i2c/ov9281.c @@ -1,6 +1,11 @@ @@ -450097,10 +450097,10 @@ index 273aa904683c..7b9bea476cfb 100644 2.18.4 -From e04eecf7e4dabe3dc9109001b74641899d86c4af Mon Sep 17 00:00:00 2001 +From fc2312f615fbf30d362a78df283ad30fce8f013a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 17:51:32 +0100 -Subject: [PATCH 0994/1216] media: i2c: ov9281: Read chip ID via 2 reads +Subject: [PATCH 0994/1224] 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 @@ -450115,7 +450115,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c -index 7b9bea476cfb..bb8efc3d3cba 100644 +index 7b9bea476cfb4..bb8efc3d3cba8 100644 --- a/drivers/media/i2c/ov9281.c +++ b/drivers/media/i2c/ov9281.c @@ -904,13 +904,17 @@ static int ov9281_check_sensor_id(struct ov9281 *ov9281, @@ -450145,10 +450145,10 @@ index 7b9bea476cfb..bb8efc3d3cba 100644 2.18.4 -From 7bd744f552448251431b865e29c4986fccb9919b Mon Sep 17 00:00:00 2001 +From 65a251233e713c1c523a26e1e0ae4ce2d0b2762c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 17:32:21 +0100 -Subject: [PATCH 0995/1216] dtoverlay: Add overlay for Omnivision OV9281 image +Subject: [PATCH 0995/1224] dtoverlay: Add overlay for Omnivision OV9281 image sensor Adds an overlay for the OV9281 mono imaging sensor using 2 CSI-2 @@ -450163,7 +450163,7 @@ Signed-off-by: Dave Stevenson create mode 100644 arch/arm/boot/dts/overlays/ov9281-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 25f3ee2e1acc..e7db9daa8969 100644 +index 25f3ee2e1accc..e7db9daa89694 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -115,6 +115,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -450175,7 +450175,7 @@ index 25f3ee2e1acc..e7db9daa8969 100644 pibell.dtbo \ piglow.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 500437d65c96..4a3f201d185a 100644 +index 500437d65c96d..4a3f201d185a5 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1813,6 +1813,14 @@ Load: dtoverlay=ov5647 @@ -450195,7 +450195,7 @@ index 500437d65c96..4a3f201d185a 100644 Load: dtoverlay=papirus,= diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts new file mode 100644 -index 000000000000..4411c9d96564 +index 0000000000000..4411c9d965646 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts @@ -0,0 +1,110 @@ @@ -450313,10 +450313,10 @@ index 000000000000..4411c9d96564 2.18.4 -From 280d4630533c88dc06a0b481ecb18f9339cebb7f Mon Sep 17 00:00:00 2001 +From b199bc0ef97d21f36c3f3183a139235a3847324e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 6 Jul 2020 18:45:01 +0100 -Subject: [PATCH 0996/1216] defconfigs: Add OV9281 to all the Pi defconfigs +Subject: [PATCH 0996/1224] defconfigs: Add OV9281 to all the Pi defconfigs Adds the driver for use by the dtoverlay. @@ -450330,7 +450330,7 @@ Signed-off-by: Dave Stevenson 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 21051cbfbe8e..8269ac84d6fd 100644 +index 21051cbfbe8ee..8269ac84d6fd3 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -911,6 +911,7 @@ CONFIG_VIDEO_IMX290=m @@ -450342,7 +450342,7 @@ index 21051cbfbe8e..8269ac84d6fd 100644 CONFIG_VIDEO_MT9V011=m CONFIG_DRM=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 18fc77ae0aee..d332041fffe6 100644 +index 18fc77ae0aeef..d332041fffe60 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -926,6 +926,7 @@ CONFIG_VIDEO_IMX290=m @@ -450354,7 +450354,7 @@ index 18fc77ae0aee..d332041fffe6 100644 CONFIG_VIDEO_MT9V011=m CONFIG_DRM=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 3c258e951074..1148f84893ed 100644 +index 3c258e9510748..1148f84893ed8 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -900,6 +900,7 @@ CONFIG_VIDEO_IMX290=m @@ -450366,7 +450366,7 @@ index 3c258e951074..1148f84893ed 100644 CONFIG_VIDEO_MT9V011=m CONFIG_DRM=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 656068a1bbb8..59bf96c985fa 100644 +index 656068a1bbb8c..59bf96c985fa6 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -919,6 +919,7 @@ CONFIG_VIDEO_IMX290=m @@ -450378,7 +450378,7 @@ index 656068a1bbb8..59bf96c985fa 100644 CONFIG_VIDEO_MT9V011=m CONFIG_DRM=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 99ed08604d56..e238f963d172 100644 +index 99ed08604d569..e238f963d1724 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -834,6 +834,7 @@ CONFIG_VIDEO_IMX290=m @@ -450393,10 +450393,10 @@ index 99ed08604d56..e238f963d172 100644 2.18.4 -From 50e9fef85a615c1825dd3df93168228c17adca93 Mon Sep 17 00:00:00 2001 +From 0d8bd88965cc261f526175a3dbb4b7ee155d5f5b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 6 Oct 2019 17:28:19 +0200 -Subject: [PATCH 0997/1216] Bluetooth: hci_bcm: Fix RTS handling during startup +Subject: [PATCH 0997/1224] Bluetooth: hci_bcm: Fix RTS handling during startup commit 3347a80965b38f096b1d6f995c00c9c9e53d4b8b upstream. @@ -450413,7 +450413,7 @@ Signed-off-by: Marcel Holtmann 1 file changed, 2 insertions(+) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c -index 94ed734c1d7e..f204ae626c69 100644 +index 94ed734c1d7eb..f204ae626c693 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -448,9 +448,11 @@ static int bcm_open(struct hci_uart *hu) @@ -450432,10 +450432,10 @@ index 94ed734c1d7e..f204ae626c69 100644 2.18.4 -From a6ee7d36c4fd596f91c05d0a8e835e2a1c1d327a Mon Sep 17 00:00:00 2001 +From 20f26d19a56a7b8f632214c981b4808fd1714e42 Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Fri, 25 Oct 2019 14:54:26 -0700 -Subject: [PATCH 0998/1216] Bluetooth: hci_bcm: Add compatible string for +Subject: [PATCH 0998/1224] Bluetooth: hci_bcm: Add compatible string for BCM43540 commit d462af20dbfa1b9b1a831412f32d9d6757b82459 upstream. @@ -450451,7 +450451,7 @@ Signed-off-by: Marcel Holtmann 1 file changed, 1 insertion(+) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c -index f204ae626c69..31943895b22e 100644 +index f204ae626c693..31943895b22e6 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -1427,6 +1427,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = { @@ -450466,10 +450466,10 @@ index f204ae626c69..31943895b22e 100644 2.18.4 -From 743fe3fc8e2e29d8ecb1e5e2fee15d59ed458688 Mon Sep 17 00:00:00 2001 +From bde5c5f58b4f57aa4ab387173b9500e8a7e09eeb Mon Sep 17 00:00:00 2001 From: Mohammad Rasim Date: Wed, 20 Nov 2019 14:02:35 +0300 -Subject: [PATCH 0999/1216] Bluetooth: btbcm: Add entry for BCM4335A0 UART +Subject: [PATCH 0999/1224] Bluetooth: btbcm: Add entry for BCM4335A0 UART bluetooth commit 1199ab4c9e1d4cdfbabd70b4aadbc8e72c691f65 upstream. @@ -450505,7 +450505,7 @@ Signed-off-by: Marcel Holtmann 2 files changed, 2 insertions(+) diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c -index dd29d687cd38..15b7cafde0f7 100644 +index dd29d687cd380..15b7cafde0f7b 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -340,6 +340,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = { @@ -450517,7 +450517,7 @@ index dd29d687cd38..15b7cafde0f7 100644 }; diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c -index 31943895b22e..d5b6467b0e9f 100644 +index 31943895b22e6..d5b6467b0e9f3 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -1428,6 +1428,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = { @@ -450532,10 +450532,10 @@ index 31943895b22e..d5b6467b0e9f 100644 2.18.4 -From b983e0836fad88afc726819009c59b16b1e87818 Mon Sep 17 00:00:00 2001 +From 6076d2b1cbd9540a61712b4de1edb78267181e70 Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Tue, 26 Nov 2019 08:17:29 +0100 -Subject: [PATCH 1000/1216] Bluetooth: hci_bcm: Disallow set_baudrate for +Subject: [PATCH 1000/1224] Bluetooth: hci_bcm: Disallow set_baudrate for BCM4354 commit 5d6f391073d5c1c903ac12be72c66b96b2ae93f4 upstream. @@ -450554,7 +450554,7 @@ Signed-off-by: Johan Hedberg 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c -index d5b6467b0e9f..84a32c58712e 100644 +index d5b6467b0e9f3..84a32c58712ef 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -47,6 +47,14 @@ @@ -450653,10 +450653,10 @@ index d5b6467b0e9f..84a32c58712e 100644 2.18.4 -From fce3fc81416f0345b4d79722116e9c66d9577807 Mon Sep 17 00:00:00 2001 +From 2f85bdb28c95f98133850e595c4da49b48a7bbd6 Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Tue, 26 Nov 2019 08:17:30 +0100 -Subject: [PATCH 1001/1216] Bluetooth: btbcm: Support pcm configuration +Subject: [PATCH 1001/1224] Bluetooth: btbcm: Support pcm configuration commit 528379902337102b0264fe5343eafb3d6c59fa45 upstream. @@ -450691,7 +450691,7 @@ Signed-off-by: Johan Hedberg 2 files changed, 62 insertions(+) diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c -index 15b7cafde0f7..5b0f8a0b87f2 100644 +index 15b7cafde0f7b..5b0f8a0b87f2c 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -105,6 +105,52 @@ int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) @@ -450748,7 +450748,7 @@ index 15b7cafde0f7..5b0f8a0b87f2 100644 { const struct hci_command_hdr *cmd; diff --git a/drivers/bluetooth/btbcm.h b/drivers/bluetooth/btbcm.h -index d204be8a84bf..3c7dd0765837 100644 +index d204be8a84bfe..3c7dd07658374 100644 --- a/drivers/bluetooth/btbcm.h +++ b/drivers/bluetooth/btbcm.h @@ -54,6 +54,10 @@ struct bcm_set_pcm_format_params { @@ -450785,10 +450785,10 @@ index d204be8a84bf..3c7dd0765837 100644 2.18.4 -From b522e3d324570e4f652c77f1ed88af884daa9155 Mon Sep 17 00:00:00 2001 +From 57d85877f97bd29b85a1539eed51b2e30a8d9dcc Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Tue, 26 Nov 2019 08:17:32 +0100 -Subject: [PATCH 1002/1216] Bluetooth: hci_bcm: Support pcm params in dts +Subject: [PATCH 1002/1224] Bluetooth: hci_bcm: Support pcm params in dts commit eb762b94111b646b4f116ebfdbfcadbad14e12b3 upstream. @@ -450804,7 +450804,7 @@ Signed-off-by: Johan Hedberg 1 file changed, 19 insertions(+) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c -index 84a32c58712e..4f21b60a8a20 100644 +index 84a32c58712ef..4f21b60a8a20f 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -123,6 +123,7 @@ struct bcm_device { @@ -450865,10 +450865,10 @@ index 84a32c58712e..4f21b60a8a20 100644 2.18.4 -From 25a52ffccea5549d0182ccfe3a96bcab7edd9013 Mon Sep 17 00:00:00 2001 +From e96c37dc032b09583d612735894d64653950b254 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 1 Jan 2020 15:01:34 +0100 -Subject: [PATCH 1003/1216] Bluetooth: hci_bcm: Drive RTS only for BCM43438 +Subject: [PATCH 1003/1224] Bluetooth: hci_bcm: Drive RTS only for BCM43438 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -450888,7 +450888,7 @@ Signed-off-by: Marcel Holtmann 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c -index 4f21b60a8a20..de05b1428289 100644 +index 4f21b60a8a20f..de05b14282890 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -53,6 +53,7 @@ @@ -450963,10 +450963,10 @@ index 4f21b60a8a20..de05b1428289 100644 2.18.4 -From 9f2eb043bc9905a5e200e5f85b9e16fdc9863eb5 Mon Sep 17 00:00:00 2001 +From 1df8914f3a87aee1b5ef0d05e74688384fce839a Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Tue, 7 Jul 2020 15:09:06 +0200 -Subject: [PATCH 1004/1216] Enhances the DAC+ driver to control the optional +Subject: [PATCH 1004/1224] Enhances the DAC+ driver to control the optional headphone amplifier Probes on the I2C bus for TPA6130A2, if successful, it sets DT-parameter @@ -450980,7 +450980,7 @@ Signed-off-by: Joerg Schambacher joerg@i2audio.com 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index fdaccbfd79ce..5ec58ef9cbe6 100644 +index fdaccbfd79ce5..5ec58ef9cbe66 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -38,6 +38,7 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS @@ -450992,7 +450992,7 @@ index fdaccbfd79ce..5ec58ef9cbe6 100644 help Say Y or M if you want to add support for HifiBerry DAC+. diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c -index 4cde60a5b6f6..286a62c3ff48 100644 +index 4cde60a5b6f6a..286a62c3ff487 100644 --- a/sound/soc/bcm/hifiberry_dacplus.c +++ b/sound/soc/bcm/hifiberry_dacplus.c @@ -4,6 +4,7 @@ @@ -451105,10 +451105,10 @@ index 4cde60a5b6f6..286a62c3ff48 100644 2.18.4 -From d170d4c341bbb87c0ae4aa07b858a84f0f08ca0c Mon Sep 17 00:00:00 2001 +From 58a8f22daf1bfd4434b5a392b803927d614c9856 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 Jul 2020 17:33:06 +0100 -Subject: [PATCH 1005/1216] ARM: dts: hifiberry-dacplus headphone amp support +Subject: [PATCH 1005/1224] ARM: dts: hifiberry-dacplus headphone amp support Signed-off-by: Phil Elwell --- @@ -451116,7 +451116,7 @@ Signed-off-by: Phil Elwell 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts -index 2ca3d886ebb7..ff19015ba656 100644 +index 2ca3d886ebb7a..ff19015ba6561 100644 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts @@ -39,6 +39,11 @@ @@ -451135,10 +451135,10 @@ index 2ca3d886ebb7..ff19015ba656 100644 2.18.4 -From b72bcc66bf2588e2157f2df01f41551086ae75b0 Mon Sep 17 00:00:00 2001 +From 89bd97a470e99b96aeaa8f358c1f3dc36f7b9adb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 10:31:53 +0100 -Subject: [PATCH 1006/1216] media: i2c: imx290: Explicitly set v&h blank on +Subject: [PATCH 1006/1224] media: i2c: imx290: Explicitly set v&h blank on mode change __v4l2_ctrl_modify_range only updates the current value should @@ -451154,7 +451154,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 9431c2b917ed..0aa3940c577e 100644 +index 9431c2b917ed5..0aa3940c577ea 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -796,17 +796,23 @@ static int imx290_set_fmt(struct v4l2_subdev *sd, @@ -451187,10 +451187,10 @@ index 9431c2b917ed..0aa3940c577e 100644 2.18.4 -From 5d07366deab0026cf600f572edd97d78c625667b Mon Sep 17 00:00:00 2001 +From 170107c0f8360ee2e200fd5390b32eee27e2bb51 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 11:23:48 +0100 -Subject: [PATCH 1007/1216] media: i2c: imx290: Add support for g_selection to +Subject: [PATCH 1007/1224] media: i2c: imx290: Add support for g_selection to report cropping Userspace needs to know the cropping arrangements for each mode, @@ -451202,7 +451202,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 84 insertions(+) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 0aa3940c577e..5b7083b7050e 100644 +index 0aa3940c577ea..5b7083b7050e9 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -61,6 +61,13 @@ enum imx290_clk_index { @@ -451349,10 +451349,10 @@ index 0aa3940c577e..5b7083b7050e 100644 2.18.4 -From fb6ef1a925f05816bc14131f8f9c0255a28531a0 Mon Sep 17 00:00:00 2001 +From 07cb26557346ae392081657cce3c85f78d36eb9b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 11:51:26 +0100 -Subject: [PATCH 1008/1216] media: i2c: imx290: Set the colorspace fields in +Subject: [PATCH 1008/1224] media: i2c: imx290: Set the colorspace fields in the format The colorspace fields were left untouched in imx290_set_fmt @@ -451364,7 +451364,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 8 insertions(+) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index 5b7083b7050e..0057e0b98912 100644 +index 5b7083b7050e9..0057e0b989123 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -813,6 +813,14 @@ static int imx290_set_fmt(struct v4l2_subdev *sd, @@ -451386,10 +451386,10 @@ index 5b7083b7050e..0057e0b98912 100644 2.18.4 -From 86338916920ef8906000ab03c3dd152f9042e40a Mon Sep 17 00:00:00 2001 +From 5f29b4c08f06eb04326ae5745e8c340e6010e4ad Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 14:23:40 +0100 -Subject: [PATCH 1009/1216] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE +Subject: [PATCH 1009/1224] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE in the caps v4l2-compliance throws a failure if the device doesn't advertise @@ -451402,7 +451402,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 3b082587dd14..6b7780ec8ec6 100644 +index 3b082587dd14d..6b7780ec8ec6c 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -2416,8 +2416,8 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node, @@ -451420,10 +451420,10 @@ index 3b082587dd14..6b7780ec8ec6 100644 2.18.4 -From 472a4ddf2c38cdc37e54247547cabd85901e6376 Mon Sep 17 00:00:00 2001 +From eac95d0b493f1b3c24d0c9b0c2385de3be4251a4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 14:52:43 +0100 -Subject: [PATCH 1010/1216] media: bcm2835-unicam: Ensure type is VIDEO_CAPTURE +Subject: [PATCH 1010/1224] 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 @@ -451435,7 +451435,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 6 insertions(+) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 6b7780ec8ec6..c2b9d89f0ae5 100644 +index 6b7780ec8ec6c..c2b9d89f0ae52 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -1880,6 +1880,9 @@ static int unicam_s_selection(struct file *file, void *priv, @@ -451462,10 +451462,10 @@ index 6b7780ec8ec6..c2b9d89f0ae5 100644 2.18.4 -From bae0c794e82036a53a57b6243bf8daff129020db Mon Sep 17 00:00:00 2001 +From 47d91a28fbcf0f952e2aabd74743da75c2f2d1b1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Jul 2020 14:34:34 +0100 -Subject: [PATCH 1011/1216] configs: Add CAN_EMS_USB=m +Subject: [PATCH 1011/1224] configs: Add CAN_EMS_USB=m See: https://github.com/raspberrypi/linux/issues/3716 @@ -451479,7 +451479,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 8269ac84d6fd..42faa1b8f201 100644 +index 8269ac84d6fd3..42faa1b8f201e 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -409,6 +409,7 @@ CONFIG_CAN=m @@ -451491,7 +451491,7 @@ index 8269ac84d6fd..42faa1b8f201 100644 CONFIG_BT=m CONFIG_BT_RFCOMM=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index d332041fffe6..ebe4b220dbd5 100644 +index d332041fffe60..ebe4b220dbd51 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -412,6 +412,7 @@ CONFIG_CAN=m @@ -451503,7 +451503,7 @@ index d332041fffe6..ebe4b220dbd5 100644 CONFIG_BT=m CONFIG_BT_RFCOMM=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 1148f84893ed..a257f554a831 100644 +index 1148f84893ed8..a257f554a8316 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -399,6 +399,7 @@ CONFIG_CAN=m @@ -451515,7 +451515,7 @@ index 1148f84893ed..a257f554a831 100644 CONFIG_BT=m CONFIG_BT_RFCOMM=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 59bf96c985fa..667bf89d9553 100644 +index 59bf96c985fa6..667bf89d9553b 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -411,6 +411,7 @@ CONFIG_CAN=m @@ -451527,7 +451527,7 @@ index 59bf96c985fa..667bf89d9553 100644 CONFIG_BT=m CONFIG_BT_RFCOMM=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index e238f963d172..c028ffce473a 100644 +index e238f963d1724..c028ffce473a6 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -399,6 +399,7 @@ CONFIG_YAM=m @@ -451542,10 +451542,10 @@ index e238f963d172..c028ffce473a 100644 2.18.4 -From 8bff41049f2a79840b508f9b868d1b199cb4d563 Mon Sep 17 00:00:00 2001 +From cb23e9f033e3920cebc2cc01024c719c4928dded Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 16:12:05 +0100 -Subject: [PATCH 1012/1216] dtoverlays: Create an overlay for the Omnivision +Subject: [PATCH 1012/1224] dtoverlays: Create an overlay for the Omnivision OV7251 sensor Adds an overlay for the OV7251 VGA global shutter sensor. @@ -451559,7 +451559,7 @@ Signed-off-by: Dave Stevenson create mode 100644 arch/arm/boot/dts/overlays/ov7251-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index e7db9daa8969..fa6db6eed3e2 100644 +index e7db9daa89694..fa6db6eed3e2a 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -115,6 +115,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -451571,7 +451571,7 @@ index e7db9daa8969..fa6db6eed3e2 100644 papirus.dtbo \ pibell.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 4a3f201d185a..eb561ef272e0 100644 +index 4a3f201d185a5..eb561ef272e0f 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1813,6 +1813,14 @@ Load: dtoverlay=ov5647 @@ -451591,7 +451591,7 @@ index 4a3f201d185a..eb561ef272e0 100644 Uses Unicam 1, which is the standard camera connector on most Pi diff --git a/arch/arm/boot/dts/overlays/ov7251-overlay.dts b/arch/arm/boot/dts/overlays/ov7251-overlay.dts new file mode 100644 -index 000000000000..f04eafd4adf9 +index 0000000000000..f04eafd4adf99 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts @@ -0,0 +1,111 @@ @@ -451710,10 +451710,10 @@ index 000000000000..f04eafd4adf9 2.18.4 -From b03135962695fe183c380dbb4720799c39199c2c Mon Sep 17 00:00:00 2001 +From 90ed09df956512a270931cdecd86500f20034cb4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 16:14:36 +0100 -Subject: [PATCH 1013/1216] defconfigs: Add the Omnivision OV7251 sensor driver +Subject: [PATCH 1013/1224] defconfigs: Add the Omnivision OV7251 sensor driver to the defconfigs Signed-off-by: Dave Stevenson @@ -451726,7 +451726,7 @@ Signed-off-by: Dave Stevenson 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 42faa1b8f201..cde54a9a89bf 100644 +index 42faa1b8f201e..cde54a9a89bf1 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -911,6 +911,7 @@ CONFIG_VIDEO_IMX219=m @@ -451738,7 +451738,7 @@ index 42faa1b8f201..cde54a9a89bf 100644 CONFIG_VIDEO_OV9281=m CONFIG_VIDEO_IRS1125=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index ebe4b220dbd5..7d6eaa682233 100644 +index ebe4b220dbd51..7d6eaa6822339 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -926,6 +926,7 @@ CONFIG_VIDEO_IMX219=m @@ -451750,7 +451750,7 @@ index ebe4b220dbd5..7d6eaa682233 100644 CONFIG_VIDEO_OV9281=m CONFIG_VIDEO_IRS1125=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index a257f554a831..3957962a2134 100644 +index a257f554a8316..3957962a2134f 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -900,6 +900,7 @@ CONFIG_VIDEO_IMX219=m @@ -451762,7 +451762,7 @@ index a257f554a831..3957962a2134 100644 CONFIG_VIDEO_OV9281=m CONFIG_VIDEO_IRS1125=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 667bf89d9553..d5ce9e70fb81 100644 +index 667bf89d9553b..d5ce9e70fb813 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -919,6 +919,7 @@ CONFIG_VIDEO_IMX219=m @@ -451774,7 +451774,7 @@ index 667bf89d9553..d5ce9e70fb81 100644 CONFIG_VIDEO_OV9281=m CONFIG_VIDEO_IRS1125=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index c028ffce473a..1d42667e3c11 100644 +index c028ffce473a6..1d42667e3c11f 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -834,6 +834,7 @@ CONFIG_VIDEO_IMX219=m @@ -451789,10 +451789,10 @@ index c028ffce473a..1d42667e3c11 100644 2.18.4 -From d09ff0495b2eb2ac36ff5eb843062ebb259829c3 Mon Sep 17 00:00:00 2001 +From 17b5cb462a1000a98facf14e3cc92b741055c7f5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 10 Mar 2020 22:21:15 +0000 -Subject: [PATCH 1014/1216] vc4_hdmi: Set HDMI_MAI_FMT +Subject: [PATCH 1014/1224] vc4_hdmi: Set HDMI_MAI_FMT The hardware uses this for generating the right audio data island packets when using formats other than PCM @@ -451804,7 +451804,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 994bcb027172..f3e692b2ffa1 100644 +index 994bcb027172d..f3e692b2ffa19 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, @@ -451876,7 +451876,7 @@ index 994bcb027172..f3e692b2ffa1 100644 audio_packet_config = VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_SAMPLE_FLAT | diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h -index 4d017572a5c2..a388a9265afc 100644 +index 4d017572a5c28..a388a9265afc4 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -516,6 +516,37 @@ @@ -451921,10 +451921,10 @@ index 4d017572a5c2..a388a9265afc 100644 2.18.4 -From 5e6983a96019a8d045c104d9593ea9b38900359f Mon Sep 17 00:00:00 2001 +From 5761945575a34d3e95d01181f6b277ca49ed705f Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 17 Mar 2020 12:12:22 +0100 -Subject: [PATCH 1015/1216] drm/vc4: add iec958 controls to vc4_hdmi +Subject: [PATCH 1015/1224] 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 @@ -451940,7 +451940,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 f3e692b2ffa1..913dbcc7a7dd 100644 +index f3e692b2ffa19..913dbcc7a7dd9 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -43,6 +43,7 @@ @@ -452032,7 +452032,7 @@ index f3e692b2ffa1..913dbcc7a7dd 100644 if (ret) { dev_err(dev, "Could not register PCM component: %d\n", ret); diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 60f7bf99e06e..5914de41705c 100644 +index 60f7bf99e06ef..5914de41705c4 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -115,6 +115,8 @@ struct vc4_hdmi_audio { @@ -452048,10 +452048,10 @@ index 60f7bf99e06e..5914de41705c 100644 2.18.4 -From 89d408c94d6005d0144b41a43a1d6930fdbb98af Mon Sep 17 00:00:00 2001 +From 0e33959b0ec62abcfe9cbb11271187610b99ca3f Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 19 Mar 2020 20:00:35 +0100 -Subject: [PATCH 1016/1216] drm/vc4: move setup from hw_params to prepare +Subject: [PATCH 1016/1224] 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 @@ -452063,7 +452063,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 913dbcc7a7dd..d6961466e2eb 100644 +index 913dbcc7a7dd9..d6961466e2eb4 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) @@ -452110,10 +452110,10 @@ index 913dbcc7a7dd..d6961466e2eb 100644 2.18.4 -From ad5c2dcb669e071630e46fcdeaecec2c92b0aa6f Mon Sep 17 00:00:00 2001 +From ea0a25d78ac1fd2e042231571194779263c0819b Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Fri, 10 Jul 2020 11:51:16 +0100 -Subject: [PATCH 1017/1216] drm/vc4: enable HBR MAI format on HBR streams +Subject: [PATCH 1017/1224] drm/vc4: enable HBR MAI format on HBR streams Signed-off-by: Matthias Reichl --- @@ -452121,7 +452121,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 d6961466e2eb..3108e0a1eacd 100644 +index d6961466e2eb4..3108e0a1eacdc 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, @@ -452141,10 +452141,10 @@ index d6961466e2eb..3108e0a1eacd 100644 2.18.4 -From a287615a1353fd8d0a5f15523726adf6079e4faa Mon Sep 17 00:00:00 2001 +From 1fbaff2ee0d22f0846385470ef02419396d1a943 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 25 Jun 2020 18:48:40 +0100 -Subject: [PATCH 1018/1216] vc4_hdmi: Remove firmware logic for MAI threshold +Subject: [PATCH 1018/1224] vc4_hdmi: Remove firmware logic for MAI threshold setting This was a workaround for bugs in hardware on earlier Pi models @@ -452158,7 +452158,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 3108e0a1eacd..19a243c9d805 100644 +index 3108e0a1eacdc..19a243c9d805d 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, @@ -452194,10 +452194,10 @@ index 3108e0a1eacd..19a243c9d805 100644 2.18.4 -From bf7cb739c822bd875dbb5692376dc7272efc1b4c Mon Sep 17 00:00:00 2001 +From 290215cbb504704ecfde36dddfbc42f2eb7d3ad6 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 30 Jun 2020 11:23:49 +0100 -Subject: [PATCH 1019/1216] vc_hdmi: Set VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE +Subject: [PATCH 1019/1224] 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 @@ -452209,7 +452209,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 19a243c9d805..5e74a6ca0c99 100644 +index 19a243c9d805d..5e74a6ca0c992 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, @@ -452224,10 +452224,10 @@ index 19a243c9d805..5e74a6ca0c99 100644 2.18.4 -From 3f53082a3ff341571c00d1de205425f17487bcc9 Mon Sep 17 00:00:00 2001 +From 4354bc8b39ae856903fadbcae35f0bbae8d5c2df Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 2 Jul 2020 19:36:08 +0100 -Subject: [PATCH 1020/1216] dts: Enable NO_WAIT_RESP for hdmi audio dma +Subject: [PATCH 1020/1224] 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 @@ -452239,7 +452239,7 @@ Signed-off-by: Dom Cobley 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 4a3659d21997..9c62edc2330b 100644 +index 4a3659d21997b..9c62edc2330b7 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -74,7 +74,7 @@ @@ -452261,7 +452261,7 @@ index 4a3659d21997..9c62edc2330b 100644 interrupts = ; status = "disabled"; diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi -index e269e75f0f57..e39577e90cc1 100644 +index e269e75f0f57d..e39577e90cc15 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -117,7 +117,7 @@ @@ -452277,10 +452277,10 @@ index e269e75f0f57..e39577e90cc1 100644 2.18.4 -From 416d82d60f49abbf25137be3b8faa3d46a7e0213 Mon Sep 17 00:00:00 2001 +From 703cab8c6d437252f58c13b34519a8087a2708d8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 10 Jul 2020 16:57:43 +0100 -Subject: [PATCH 1021/1216] SQUASH: dts: Further simplify firmware clocks +Subject: [PATCH 1021/1224] 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. @@ -452294,7 +452294,7 @@ Signed-off-by: Phil Elwell 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi -index 624e2bdc8733..babfa41cd9f7 100644 +index 624e2bdc8733f..babfa41cd9f78 100644 --- a/arch/arm/boot/dts/bcm2709-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi @@ -3,10 +3,3 @@ @@ -452309,7 +452309,7 @@ index 624e2bdc8733..babfa41cd9f7 100644 - }; -}; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 9c62edc2330b..444a3d74e8f2 100644 +index 9c62edc2330b7..444a3d74e8f2d 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -309,10 +309,3 @@ @@ -452324,7 +452324,7 @@ index 9c62edc2330b..444a3d74e8f2 100644 - }; -}; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index c011b7914688..e01ad15ea3e6 100644 +index c011b7914688b..e01ad15ea3e67 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -16,6 +16,11 @@ @@ -452340,7 +452340,7 @@ index c011b7914688..e01ad15ea3e6 100644 power: power { diff --git a/arch/arm/boot/dts/bcm2836-rpi.dtsi b/arch/arm/boot/dts/bcm2836-rpi.dtsi -index 52b47038ca82..c4c858b984c6 100644 +index 52b47038ca822..c4c858b984c6b 100644 --- a/arch/arm/boot/dts/bcm2836-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi @@ -4,10 +4,3 @@ @@ -452358,10 +452358,10 @@ index 52b47038ca82..c4c858b984c6 100644 2.18.4 -From 29fd4b31a3b99086f5b02df69e8990929b8935aa Mon Sep 17 00:00:00 2001 +From c84916d5386a6731591f914fcfed3a6b49be6562 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 11 May 2020 13:02:22 +0100 -Subject: [PATCH 1022/1216] media: bcm2835: unicam: Set VPU min clock freq to +Subject: [PATCH 1022/1224] media: bcm2835: unicam: Set VPU min clock freq to 250Mhz. When streaming with Unicam, the VPU must have a clock frequency of at @@ -452375,7 +452375,7 @@ Signed-off-by: Naushir Patuck 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi -index bf90fd585364..b74a9df1390e 100644 +index bf90fd585364c..b74a9df1390e1 100644 --- a/arch/arm/boot/dts/bcm270x.dtsi +++ b/arch/arm/boot/dts/bcm270x.dtsi @@ -88,8 +88,9 @@ @@ -452403,7 +452403,7 @@ index bf90fd585364..b74a9df1390e 100644 #address-cells = <1>; #size-cells = <0>; diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index c2b9d89f0ae5..57c3c5f5db56 100644 +index c2b9d89f0ae52..57c3c5f5db56f 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -88,6 +88,11 @@ MODULE_PARM_DESC(debug, "Debug level 0-3"); @@ -452520,10 +452520,10 @@ index c2b9d89f0ae5..57c3c5f5db56 100644 2.18.4 -From 5b958da5a0dcf8fe58eba2983e7a0c8d301f2a62 Mon Sep 17 00:00:00 2001 +From 8e1a57a6fb71f8a9890c9ece3e159bf178d0fd51 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 11 May 2020 13:06:27 +0100 -Subject: [PATCH 1023/1216] dt-bindings: bcm2835-unicam: Update documentation +Subject: [PATCH 1023/1224] dt-bindings: bcm2835-unicam: Update documentation with new clock params Update the documentation to reflect the new "VPU" clock needed @@ -452535,7 +452535,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt -index 7714fb374b34..164d0377dcd2 100644 +index 7714fb374b34d..164d0377dcd24 100644 --- a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt +++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt @@ -20,7 +20,7 @@ Required properties: @@ -452564,10 +452564,10 @@ index 7714fb374b34..164d0377dcd2 100644 2.18.4 -From abbcf3be4eee296ec048ab8fa2571c56bb4ea0de Mon Sep 17 00:00:00 2001 +From d303602ea88bf074f51c04ea02b127123eca6ccc Mon Sep 17 00:00:00 2001 From: AMuszkat Date: Tue, 14 Jul 2020 17:51:03 +0200 -Subject: [PATCH 1024/1216] correct SND_SOC_DAILINK_DEFS +Subject: [PATCH 1024/1224] correct SND_SOC_DAILINK_DEFS Signed-off-by: AMuszkat --- @@ -452575,7 +452575,7 @@ Signed-off-by: AMuszkat 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c -index 41965c71c912..db43239d29c9 100644 +index 41965c71c9120..db43239d29c95 100644 --- a/sound/soc/bcm/rpi-simple-soundcard.c +++ b/sound/soc/bcm/rpi-simple-soundcard.c @@ -235,7 +235,7 @@ static struct snd_rpi_simple_drvdata drvdata_rpi_dac = { @@ -452591,10 +452591,10 @@ index 41965c71c912..db43239d29c9 100644 2.18.4 -From 2f6927212111a5fa192058db0cf07529b7ee6911 Mon Sep 17 00:00:00 2001 +From e390a0c56359f83556bff3cdee766c230a8a19ab Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:44 +0200 -Subject: [PATCH 1025/1216] media: dt-bindings: video-interfaces: Document +Subject: [PATCH 1025/1224] media: dt-bindings: video-interfaces: Document 'orientation' property Add the 'orientation' device property, used to specify the device mounting @@ -452615,7 +452615,7 @@ Signed-off-by: Laurent Pinchart 1 file changed, 11 insertions(+) diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt b/Documentation/devicetree/bindings/media/video-interfaces.txt -index f884ada0bffc..b1ff492c7da7 100644 +index f884ada0bffc8..b1ff492c7da7a 100644 --- a/Documentation/devicetree/bindings/media/video-interfaces.txt +++ b/Documentation/devicetree/bindings/media/video-interfaces.txt @@ -89,6 +89,17 @@ Optional properties @@ -452640,10 +452640,10 @@ index f884ada0bffc..b1ff492c7da7 100644 2.18.4 -From 50036219f117e580b0584e17246ff8e98f06eaad Mon Sep 17 00:00:00 2001 +From 22cdcaa3bd4d63ce86a90aa9bdc0fa2fa28f9b2d Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:45 +0200 -Subject: [PATCH 1026/1216] media: dt-bindings: video-interface: Replace +Subject: [PATCH 1026/1224] media: dt-bindings: video-interface: Replace 'rotation' description Replace the 'rotation' property description by providing a definition @@ -452663,7 +452663,7 @@ Signed-off-by: Laurent Pinchart 1 file changed, 356 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt b/Documentation/devicetree/bindings/media/video-interfaces.txt -index b1ff492c7da7..3920f25a9123 100644 +index b1ff492c7da7a..3920f25a91235 100644 --- a/Documentation/devicetree/bindings/media/video-interfaces.txt +++ b/Documentation/devicetree/bindings/media/video-interfaces.txt @@ -85,9 +85,362 @@ Optional properties @@ -453036,10 +453036,10 @@ index b1ff492c7da7..3920f25a9123 100644 2.18.4 -From f0100a949ab2226b60d33801444c60d793e943d8 Mon Sep 17 00:00:00 2001 +From 0e6df3971a82eeae6db161baa283da2589636b53 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:46 +0200 -Subject: [PATCH 1027/1216] media: v4l2-ctrl: Document +Subject: [PATCH 1027/1224] media: v4l2-ctrl: Document V4L2_CID_CAMERA_ORIENTATION Add documentation for the V4L2_CID_CAMERA_ORIENTATION camera @@ -453059,7 +453059,7 @@ Signed-off-by: Laurent Pinchart 1 file changed, 30 insertions(+) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst b/Documentation/media/uapi/v4l/ext-ctrls-camera.rst -index 51c1d5c9eb00..c65a2b66232e 100644 +index 51c1d5c9eb002..c65a2b66232e1 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-camera.rst @@ -510,6 +510,36 @@ enum v4l2_scene_mode - @@ -453103,10 +453103,10 @@ index 51c1d5c9eb00..c65a2b66232e 100644 2.18.4 -From bfd95d6d6efd3d2793adb64fa6109c452a28dc95 Mon Sep 17 00:00:00 2001 +From e5a18976d83fb07f8e39be54bffb78f850dd6a81 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:47 +0200 -Subject: [PATCH 1028/1216] media: v4l2-ctrl: Document +Subject: [PATCH 1028/1224] media: v4l2-ctrl: Document V4L2_CID_CAMERA_SENSOR_ROTATION Add documentation for the V4L2_CID_CAMERA_SENSOR_ROTATION camera @@ -453125,7 +453125,7 @@ Signed-off-by: Laurent Pinchart 1 file changed, 121 insertions(+) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst b/Documentation/media/uapi/v4l/ext-ctrls-camera.rst -index c65a2b66232e..e64c1b2c01e8 100644 +index c65a2b66232e1..e64c1b2c01e84 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-camera.rst @@ -540,6 +540,127 @@ enum v4l2_scene_mode - @@ -453260,10 +453260,10 @@ index c65a2b66232e..e64c1b2c01e8 100644 2.18.4 -From 5f103134b6b20d268bc2e48f896fd290c04cdc1f Mon Sep 17 00:00:00 2001 +From 2ae8b73ed27c83742e56b823a8c974d78d3fffcc Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:48 +0200 -Subject: [PATCH 1029/1216] media: v4l2-ctrls: Add camera orientation and +Subject: [PATCH 1029/1224] media: v4l2-ctrls: Add camera orientation and rotation Add support for the newly defined V4L2_CID_CAMERA_ORIENTATION @@ -453284,7 +453284,7 @@ Signed-off-by: Laurent Pinchart 2 files changed, 20 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 4f1533563655..6a8eb39eec81 100644 +index 4f15335636550..6a8eb39eec813 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -577,6 +577,12 @@ const char * const *v4l2_ctrl_get_menu(u32 id) @@ -453336,7 +453336,7 @@ index 4f1533563655..6a8eb39eec81 100644 break; case V4L2_CID_RF_TUNER_PLL_LOCK: diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h -index 660574b1b4e7..b6173d8c38f1 100644 +index 660574b1b4e7a..b6173d8c38f18 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -917,6 +917,13 @@ enum v4l2_auto_focus_range { @@ -453357,10 +453357,10 @@ index 660574b1b4e7..b6173d8c38f1 100644 2.18.4 -From 2cf5c611a25cf5e294730954160a0a3b20c92298 Mon Sep 17 00:00:00 2001 +From 7bbfcb949a5403e5a9bef03bf04068652cf555ee Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:49 +0200 -Subject: [PATCH 1030/1216] media: v4l2-fwnode: Add helper to parse device +Subject: [PATCH 1030/1224] media: v4l2-fwnode: Add helper to parse device properties Add an helper function to parse common device properties in the same @@ -453382,7 +453382,7 @@ Signed-off-by: Laurent Pinchart 2 files changed, 89 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c -index 48c3b9f72722..26f644d3ef60 100644 +index 48c3b9f72722a..26f644d3ef60d 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -599,6 +599,48 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link) @@ -453435,7 +453435,7 @@ index 48c3b9f72722..26f644d3ef60 100644 v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev, struct v4l2_async_notifier *notifier, diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h -index f6a7bcd13197..7bb8da2092f6 100644 +index f6a7bcd131977..7bb8da2092f69 100644 --- a/include/media/v4l2-fwnode.h +++ b/include/media/v4l2-fwnode.h @@ -109,6 +109,36 @@ struct v4l2_fwnode_endpoint { @@ -453503,10 +453503,10 @@ index f6a7bcd13197..7bb8da2092f6 100644 2.18.4 -From b5f4c1742fa13395dc3655fa127e250a8ee4d26d Mon Sep 17 00:00:00 2001 +From 54ccaad4a31604930334b0f5272107aaeefaf166 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:52 +0200 -Subject: [PATCH 1031/1216] media: v4l2-ctrls: Add helper to register +Subject: [PATCH 1031/1224] media: v4l2-ctrls: Add helper to register properties Add an helper function to v4l2-ctrls to register controls associated @@ -453525,7 +453525,7 @@ Signed-off-by: Laurent Pinchart 2 files changed, 66 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 6a8eb39eec81..e0cac7f3d960 100644 +index 6a8eb39eec813..e0cac7f3d9608 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -17,6 +17,7 @@ @@ -453580,7 +453580,7 @@ index 6a8eb39eec81..e0cac7f3d960 100644 +} +EXPORT_SYMBOL(v4l2_ctrl_new_fwnode_properties); diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h -index 65575e9b5a2b..162859aa2138 100644 +index 65575e9b5a2b1..162859aa21389 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -29,6 +29,7 @@ struct v4l2_ctrl_handler; @@ -453625,10 +453625,10 @@ index 65575e9b5a2b..162859aa2138 100644 2.18.4 -From f0332559aaa1b3b3f34bf4f08e2f5ac344ccdc95 Mon Sep 17 00:00:00 2001 +From 19fd04970a2700c566e88705ca79d89a883c5e2e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 01:45:08 +0300 -Subject: [PATCH 1032/1216] media: i2c: ov5647: Parse and register properties +Subject: [PATCH 1032/1224] media: i2c: ov5647: Parse and register properties Parse device properties and register controls for them using the V4L2 fwnode properties helpers. @@ -453639,7 +453639,7 @@ Signed-off-by: Laurent Pinchart 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 6d84d2785f74..86a821a172b3 100644 +index 6d84d2785f740..86a821a172b3d 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -1501,6 +1501,7 @@ static int ov5647_probe(struct i2c_client *client) @@ -453680,10 +453680,10 @@ index 6d84d2785f74..86a821a172b3 100644 2.18.4 -From 962187660632c8871d78f36401891c3c20820799 Mon Sep 17 00:00:00 2001 +From 63acac7bc9d2986da111d8ed59752536a1460f75 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sat, 9 May 2020 11:04:55 +0200 -Subject: [PATCH 1033/1216] media: i2c: imx219: Parse and register properties +Subject: [PATCH 1033/1224] media: i2c: imx219: Parse and register properties Parse device properties and register controls for them using the newly introduced helpers. @@ -453700,7 +453700,7 @@ Signed-off-by: Laurent Pinchart 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index b84fc19e9ff7..812323107f36 100644 +index b84fc19e9ff75..812323107f36c 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -1348,11 +1348,12 @@ static int imx219_init_controls(struct imx219 *imx219) @@ -453737,10 +453737,10 @@ index b84fc19e9ff7..812323107f36 100644 2.18.4 -From 3161d530390644c1a592eb0f8d7af41dc25e558f Mon Sep 17 00:00:00 2001 +From cff1e1c419b6e501cb80907a540f850de9cc909f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 01:45:08 +0300 -Subject: [PATCH 1034/1216] media: i2c: imx477: Parse and register properties +Subject: [PATCH 1034/1224] media: i2c: imx477: Parse and register properties Parse device properties and register controls for them using the V4L2 fwnode properties helpers. @@ -453751,7 +453751,7 @@ Signed-off-by: Laurent Pinchart 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c -index e42a8633087d..3fbb173fa079 100644 +index e42a8633087d4..3fbb173fa0796 100644 --- a/drivers/media/i2c/imx477.c +++ b/drivers/media/i2c/imx477.c @@ -1957,11 +1957,12 @@ static int imx477_init_controls(struct imx477 *imx477) @@ -453788,10 +453788,10 @@ index e42a8633087d..3fbb173fa079 100644 2.18.4 -From e5fbdfd5e52ab9817a8a423aa0f4a12f28906adc Mon Sep 17 00:00:00 2001 +From 5c7e909149335aa4f839b5ed813f098dc7305059 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 03:04:38 +0300 -Subject: [PATCH 1035/1216] dt/dtoverlays: ov5647: Add parameter to set camera +Subject: [PATCH 1035/1224] dt/dtoverlays: ov5647: Add parameter to set camera module rotation Add a rotation DT overlay parameter to allow specifying the camera @@ -453804,7 +453804,7 @@ Signed-off-by: Laurent Pinchart 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index eb561ef272e0..651acea3194b 100644 +index eb561ef272e0f..651acea3194b3 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1809,8 +1809,9 @@ Name: ov5647 @@ -453820,7 +453820,7 @@ index eb561ef272e0..651acea3194b 100644 Name: ov7251 diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts -index 5eba3cb9fb91..fd1e7a457f69 100644 +index 5eba3cb9fb91d..fd1e7a457f697 100644 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts @@ -21,6 +21,8 @@ @@ -453845,10 +453845,10 @@ index 5eba3cb9fb91..fd1e7a457f69 100644 2.18.4 -From a710524b945bb8c5639bbd716241ba63e50eb938 Mon Sep 17 00:00:00 2001 +From 9d402622203dcbb926712199af2d74ff3ee143a8 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 03:04:38 +0300 -Subject: [PATCH 1036/1216] dt/dtoverlays: imx219: Add parameter to set camera +Subject: [PATCH 1036/1224] dt/dtoverlays: imx219: Add parameter to set camera module rotation Add a rotation DT overlay parameter to allow specifying the camera @@ -453862,7 +453862,7 @@ Signed-off-by: Laurent Pinchart 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 651acea3194b..61fe86817292 100644 +index 651acea3194b3..61fe868172927 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1433,8 +1433,9 @@ Name: imx219 @@ -453878,7 +453878,7 @@ index 651acea3194b..61fe86817292 100644 Name: imx290 diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts -index 3c2d3fac93d2..dce07b335c4e 100644 +index 3c2d3fac93d21..dce07b335c4e8 100644 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts @@ -27,6 +27,8 @@ @@ -453903,10 +453903,10 @@ index 3c2d3fac93d2..dce07b335c4e 100644 2.18.4 -From 0930e1e176064ee239f0c5a26104ddf71ef8fa23 Mon Sep 17 00:00:00 2001 +From 079128c4909bbf13714d82d162fbe54872ca463e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jul 2020 03:04:38 +0300 -Subject: [PATCH 1037/1216] dt/dtoverlays: imx477: Add parameter to set camera +Subject: [PATCH 1037/1224] dt/dtoverlays: imx477: Add parameter to set camera module rotation Add a rotation DT overlay parameter to allow specifying the camera @@ -453920,7 +453920,7 @@ Signed-off-by: Laurent Pinchart 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 61fe86817292..69892d01faae 100644 +index 61fe868172927..69892d01faae1 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1458,8 +1458,9 @@ Name: imx477 @@ -453936,7 +453936,7 @@ index 61fe86817292..69892d01faae 100644 Name: iqaudio-codec diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts -index 73d4f79d54e6..1a97eaaf4c82 100644 +index 73d4f79d54e6f..1a97eaaf4c826 100644 --- a/arch/arm/boot/dts/overlays/imx477-overlay.dts +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts @@ -27,6 +27,8 @@ @@ -453961,10 +453961,10 @@ index 73d4f79d54e6..1a97eaaf4c82 100644 2.18.4 -From 74e25f00fee800fce3a9def638c79619f9a0a462 Mon Sep 17 00:00:00 2001 +From 85dfb2a6c95fd286edaa44070fe4513a948fbfc1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 16 Jul 2020 12:02:47 +0100 -Subject: [PATCH 1038/1216] drm/vc4: Add DRM_MODE_FLAG_DBLCLK support to +Subject: [PATCH 1038/1224] drm/vc4: Add DRM_MODE_FLAG_DBLCLK support to vc4-fkms 480i and several other modes use DRM_MODE_FLAG_DBLCLK and pixel @@ -453978,7 +453978,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index ec5c223033c8..31982bda0062 100644 +index ec5c223033c8d..31982bda0062d 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -158,6 +158,8 @@ struct set_timings { @@ -454021,10 +454021,10 @@ index ec5c223033c8..31982bda0062 100644 2.18.4 -From 9486243a8531e656d4e158f3f20c3023f92517c6 Mon Sep 17 00:00:00 2001 +From 048a090bfbb05479b75aad042454a7204cb01e98 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Jul 2020 10:33:19 +0100 -Subject: [PATCH 1039/1216] leds: Add the actpwr trigger +Subject: [PATCH 1039/1224] 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 @@ -454039,7 +454039,7 @@ Signed-off-by: Phil Elwell create mode 100644 drivers/leds/trigger/ledtrig-actpwr.c diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig -index 03e3f1c267dd..d45aba3e1d13 100644 +index 03e3f1c267dd7..d45aba3e1d13b 100644 --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig @@ -151,4 +151,15 @@ config LEDS_TRIGGER_AUDIO @@ -454059,7 +454059,7 @@ index 03e3f1c267dd..d45aba3e1d13 100644 + endif # LEDS_TRIGGERS diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile -index f2d085c67233..1083b35cbe8b 100644 +index f2d085c672333..1083b35cbe8b6 100644 --- a/drivers/leds/trigger/Makefile +++ b/drivers/leds/trigger/Makefile @@ -16,3 +16,4 @@ obj-$(CONFIG_LEDS_TRIGGER_PANIC) += ledtrig-panic.o @@ -454069,7 +454069,7 @@ index f2d085c67233..1083b35cbe8b 100644 +obj-$(CONFIG_LEDS_TRIGGER_ACTPWR) += ledtrig-actpwr.o diff --git a/drivers/leds/trigger/ledtrig-actpwr.c b/drivers/leds/trigger/ledtrig-actpwr.c new file mode 100644 -index 000000000000..4e89fb314e2c +index 0000000000000..4e89fb314e2c9 --- /dev/null +++ b/drivers/leds/trigger/ledtrig-actpwr.c @@ -0,0 +1,191 @@ @@ -454268,10 +454268,10 @@ index 000000000000..4e89fb314e2c 2.18.4 -From 31b21396afeac16b01cdc0385d2a7b2749921a51 Mon Sep 17 00:00:00 2001 +From c2774ee2356d50f5d777b64006b6a859efa56e05 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2020 13:18:11 +0100 -Subject: [PATCH 1040/1216] configs: Enable LEDS_TRIGGER_ACTPWR +Subject: [PATCH 1040/1224] configs: Enable LEDS_TRIGGER_ACTPWR Make the combined mmc0 activity & power trigger available to use. @@ -454285,7 +454285,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index cde54a9a89bf..77feb47ce9fb 100644 +index cde54a9a89bf1..77feb47ce9fbc 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1208,6 +1208,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m @@ -454297,7 +454297,7 @@ index cde54a9a89bf..77feb47ce9fb 100644 # CONFIG_RTC_HCTOSYS is not set CONFIG_RTC_DRV_ABX80X=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 7d6eaa682233..95934186bfb8 100644 +index 7d6eaa6822339..95934186bfb8e 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1245,6 +1245,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m @@ -454309,7 +454309,7 @@ index 7d6eaa682233..95934186bfb8 100644 # CONFIG_RTC_HCTOSYS is not set CONFIG_RTC_DRV_ABX80X=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 3957962a2134..bf6e9ba085d7 100644 +index 3957962a2134f..bf6e9ba085d71 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1214,6 +1214,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m @@ -454321,7 +454321,7 @@ index 3957962a2134..bf6e9ba085d7 100644 # CONFIG_RTC_HCTOSYS is not set CONFIG_RTC_DRV_ABX80X=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index d5ce9e70fb81..b9b2ef66f297 100644 +index d5ce9e70fb813..b9b2ef66f297e 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1238,6 +1238,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m @@ -454333,7 +454333,7 @@ index d5ce9e70fb81..b9b2ef66f297 100644 # CONFIG_RTC_HCTOSYS is not set CONFIG_RTC_DRV_ABX80X=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 1d42667e3c11..c7e5eeacb27c 100644 +index 1d42667e3c11f..c7e5eeacb27c4 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1093,6 +1093,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m @@ -454348,10 +454348,10 @@ index 1d42667e3c11..c7e5eeacb27c 100644 2.18.4 -From a3b7a1505e555beace5cf59bca33ad6ec53af09b Mon Sep 17 00:00:00 2001 +From af57be351af4ccfaa04dbb11f0a92ae6fc50ed7d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 16 Jul 2020 18:19:58 +0100 -Subject: [PATCH 1041/1216] ARM: dts: Select the actpwr LED trigger on Zeroes +Subject: [PATCH 1041/1224] 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 @@ -454364,7 +454364,7 @@ Signed-off-by: Phil Elwell 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts -index 111f61915947..0060c9bfe2e6 100644 +index 111f61915947a..0060c9bfe2e68 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -144,8 +144,8 @@ @@ -454379,7 +454379,7 @@ index 111f61915947..0060c9bfe2e6 100644 }; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts -index c2f58e84eb32..5655eb4769ea 100644 +index c2f58e84eb323..5655eb4769ea9 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -98,8 +98,8 @@ @@ -454397,10 +454397,10 @@ index c2f58e84eb32..5655eb4769ea 100644 2.18.4 -From 0ed3f4861626fbf26dbe2983f46779f36a7e0452 Mon Sep 17 00:00:00 2001 +From 4da73623464ae3be2ced71b6c20d77d269f948a8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 May 2020 22:05:29 +0100 -Subject: [PATCH 1042/1216] staging: vc04_services: isp: Rework lens shading to +Subject: [PATCH 1042/1224] staging: vc04_services: isp: Rework lens shading to take a dmabuf This removes the need for the client to use vcsm at all. @@ -454412,7 +454412,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c -index 424e7e6da1d6..db38649124b7 100644 +index 424e7e6da1d6f..db38649124b77 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -21,6 +21,8 @@ @@ -454467,7 +454467,7 @@ index 424e7e6da1d6..db38649124b7 100644 ret = set_isp_param(node, MMAL_PARAMETER_BLACK_LEVEL, ctrl->p_new.p_u8, diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h -index bb16dcbcb40f..cf8c0437f159 100644 +index bb16dcbcb40f5..cf8c0437f1597 100644 --- a/include/uapi/linux/bcm2835-isp.h +++ b/include/uapi/linux/bcm2835-isp.h @@ -108,7 +108,7 @@ enum bcm2835_isp_gain_format { @@ -454492,10 +454492,10 @@ index bb16dcbcb40f..cf8c0437f159 100644 2.18.4 -From 1c4b1b8db3ca5122e6aeee502f095acd7fb728ff Mon Sep 17 00:00:00 2001 +From d243c920200f48c56d7097c48f54aa9fe45bad45 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Fri, 17 Jul 2020 09:17:36 +1000 -Subject: [PATCH 1043/1216] Mute bug fix for the Audioinjector.net isolated +Subject: [PATCH 1043/1224] Mute bug fix for the Audioinjector.net isolated soundcard. --- @@ -454503,7 +454503,7 @@ Subject: [PATCH 1043/1216] Mute bug fix for the Audioinjector.net isolated 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/sound/soc/bcm/audioinjector-isolated-soundcard.c b/sound/soc/bcm/audioinjector-isolated-soundcard.c -index 652464658fef..27e1316e387d 100644 +index 652464658fef9..27e1316e387df 100644 --- a/sound/soc/bcm/audioinjector-isolated-soundcard.c +++ b/sound/soc/bcm/audioinjector-isolated-soundcard.c @@ -42,41 +42,20 @@ static int audioinjector_isolated_dai_init(struct snd_soc_pcm_runtime *rtd) @@ -454562,10 +454562,10 @@ index 652464658fef..27e1316e387d 100644 2.18.4 -From 9984edd5d5ae5bf45419aeda641c39f139065af7 Mon Sep 17 00:00:00 2001 +From 96063582467a792bf48d3eef688a45a549f6e992 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Jul 2020 17:56:17 +0100 -Subject: [PATCH 1044/1216] configs: Add MAXIM_THERMOCOUPLE=m +Subject: [PATCH 1044/1224] configs: Add MAXIM_THERMOCOUPLE=m See: https://github.com/raspberrypi/linux/issues/3732 @@ -454579,7 +454579,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 77feb47ce9fb..e087265da246 100644 +index 77feb47ce9fbc..e087265da2462 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1319,6 +1319,7 @@ CONFIG_APDS9960=m @@ -454591,7 +454591,7 @@ index 77feb47ce9fb..e087265da246 100644 CONFIG_PWM_PCA9685=m CONFIG_RPI_AXIPERF=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 95934186bfb8..9aeb3aa1a618 100644 +index 95934186bfb8e..9aeb3aa1a618c 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1357,6 +1357,7 @@ CONFIG_APDS9960=m @@ -454603,7 +454603,7 @@ index 95934186bfb8..9aeb3aa1a618 100644 CONFIG_PWM_PCA9685=m CONFIG_GENERIC_PHY=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index bf6e9ba085d7..18e7506a2531 100644 +index bf6e9ba085d71..18e7506a25314 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1325,6 +1325,7 @@ CONFIG_APDS9960=m @@ -454615,7 +454615,7 @@ index bf6e9ba085d7..18e7506a2531 100644 CONFIG_PWM_PCA9685=m CONFIG_RPI_AXIPERF=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index b9b2ef66f297..e8eee3446fc0 100644 +index b9b2ef66f297e..e8eee3446fc08 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1349,6 +1349,7 @@ CONFIG_APDS9960=m @@ -454627,7 +454627,7 @@ index b9b2ef66f297..e8eee3446fc0 100644 CONFIG_PWM_PCA9685=m CONFIG_GENERIC_PHY=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index c7e5eeacb27c..04128417383a 100644 +index c7e5eeacb27c4..04128417383a9 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1194,6 +1194,7 @@ CONFIG_BME680=m @@ -454642,10 +454642,10 @@ index c7e5eeacb27c..04128417383a 100644 2.18.4 -From a2e50dc9d07c5128bb6e3c6c8f856f05a4e91c02 Mon Sep 17 00:00:00 2001 +From 3a7d910f1183e32ebca6e30bc83b764ae6174a0b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 20 Apr 2020 18:00:38 +0100 -Subject: [PATCH 1045/1216] vc4: Report channel mapping back to userspace +Subject: [PATCH 1045/1224] 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 @@ -454662,7 +454662,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 5e74a6ca0c99..2f6730983183 100644 +index 5e74a6ca0c992..2f6730983183a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -48,6 +48,7 @@ @@ -455137,7 +455137,7 @@ index 5e74a6ca0c99..2f6730983183 100644 static const struct snd_soc_dapm_widget vc4_hdmi_audio_widgets[] = { diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 5914de41705c..e866979a6df5 100644 +index 5914de41705c4..e866979a6df59 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -117,6 +117,9 @@ struct vc4_hdmi_audio { @@ -455154,10 +455154,10 @@ index 5914de41705c..e866979a6df5 100644 2.18.4 -From dc877526a36dac4c74fa7bd817906503d5338d39 Mon Sep 17 00:00:00 2001 +From 536d1490774998a3ed4070ec898da7dcbc11fd7e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 20 Jul 2020 09:35:46 +0100 -Subject: [PATCH 1046/1216] SQUASH: leds: actpwr - delete unused variable +Subject: [PATCH 1046/1224] SQUASH: leds: actpwr - delete unused variable Signed-off-by: Phil Elwell --- @@ -455165,7 +455165,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 deletion(-) diff --git a/drivers/leds/trigger/ledtrig-actpwr.c b/drivers/leds/trigger/ledtrig-actpwr.c -index 4e89fb314e2c..1a52107ceb03 100644 +index 4e89fb314e2c9..1a52107ceb03b 100644 --- a/drivers/leds/trigger/ledtrig-actpwr.c +++ b/drivers/leds/trigger/ledtrig-actpwr.c @@ -94,7 +94,6 @@ static void actpwr_trig_cycle(struct timer_list *t) @@ -455180,10 +455180,10 @@ index 4e89fb314e2c..1a52107ceb03 100644 2.18.4 -From 0c2b8d82e6e6e2afcde063abe3e63c8fe9e041f5 Mon Sep 17 00:00:00 2001 +From dc631263ef3697fdd9a1e54606c023203db59f64 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 Jul 2020 17:34:09 +0100 -Subject: [PATCH 1047/1216] staging: vchiq_arm: children inherit DMA config +Subject: [PATCH 1047/1224] 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 @@ -455196,7 +455196,7 @@ Signed-off-by: Phil Elwell 1 file changed, 10 insertions(+) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index d55f038637fc..4edfca26410e 100644 +index d55f038637fc4..4edfca26410ed 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -3205,8 +3205,18 @@ vchiq_register_child(struct platform_device *pdev, const char *name) @@ -455222,10 +455222,10 @@ index d55f038637fc..4edfca26410e 100644 2.18.4 -From 03f587b9f71af6686836897c77c48e1ad4e5e168 Mon Sep 17 00:00:00 2001 +From 3e3e037f092705a366c371ff8cb435002f82ea05 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 Jul 2020 17:45:24 +0100 -Subject: [PATCH 1048/1216] ARM: dts: 2711 DMA can address 36 bits +Subject: [PATCH 1048/1224] 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. @@ -455236,7 +455236,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 444a3d74e8f2..c2c63bbef338 100644 +index 444a3d74e8f2d..c2c63bbef338d 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -193,8 +193,7 @@ @@ -455253,10 +455253,10 @@ index 444a3d74e8f2..c2c63bbef338 100644 2.18.4 -From 6c7250aa0b4e9b79f63c20877fedaa7cb72e3828 Mon Sep 17 00:00:00 2001 +From 49b316d286614c7540172f90c9d5a9c2e5f03ddf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 Jul 2020 17:59:31 +0100 -Subject: [PATCH 1049/1216] bcm2835-dma: Advertise the full DMA range +Subject: [PATCH 1049/1224] bcm2835-dma: Advertise the full DMA range Unless the DMA mask is set wider than 32 bits, DMA mapping will use a bounce buffer. @@ -455267,7 +455267,7 @@ Signed-off-by: Phil Elwell 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 9fec52489421..5a9b18edc2b7 100644 +index 9fec52489421a..5a9b18edc2b73 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -41,6 +41,7 @@ @@ -455336,10 +455336,10 @@ index 9fec52489421..5a9b18edc2b7 100644 2.18.4 -From f67582cc9d09b8dc51b45557de84e8472acccc95 Mon Sep 17 00:00:00 2001 +From 9ba761c5c5f67bd7b1f07ff6ccd7ef7779e7d008 Mon Sep 17 00:00:00 2001 From: iamdavidcz Date: Thu, 23 Jul 2020 23:10:22 +0200 -Subject: [PATCH 1050/1216] add CONFIG_CRYPTO_USER_API_HASH=m +Subject: [PATCH 1050/1224] add CONFIG_CRYPTO_USER_API_HASH=m --- arch/arm/configs/bcm2709_defconfig | 1 + @@ -455350,7 +455350,7 @@ Subject: [PATCH 1050/1216] add CONFIG_CRYPTO_USER_API_HASH=m 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index e087265da246..5eaa8be6b458 100644 +index e087265da2462..5eaa8be6b458c 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1443,6 +1443,7 @@ CONFIG_CRYPTO_WP512=m @@ -455362,7 +455362,7 @@ index e087265da246..5eaa8be6b458 100644 # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 9aeb3aa1a618..8f261cec85c3 100644 +index 9aeb3aa1a618c..8f261cec85c30 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1482,6 +1482,7 @@ CONFIG_CRYPTO_WP512=m @@ -455374,7 +455374,7 @@ index 9aeb3aa1a618..8f261cec85c3 100644 # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 18e7506a2531..e593c41ba646 100644 +index 18e7506a25314..e593c41ba6464 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1452,6 +1452,7 @@ CONFIG_CRYPTO_WP512=m @@ -455386,7 +455386,7 @@ index 18e7506a2531..e593c41ba646 100644 # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index e8eee3446fc0..e9eb3a88cbbe 100644 +index e8eee3446fc08..e9eb3a88cbbe4 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1474,6 +1474,7 @@ CONFIG_CRYPTO_WP512=m @@ -455398,7 +455398,7 @@ index e8eee3446fc0..e9eb3a88cbbe 100644 # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 04128417383a..05459f731972 100644 +index 04128417383a9..05459f731972a 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1317,6 +1317,7 @@ CONFIG_CRYPTO_WP512=m @@ -455413,10 +455413,10 @@ index 04128417383a..05459f731972 100644 2.18.4 -From 80bb736600d87c3a6faa05bf9ec73d908b691431 Mon Sep 17 00:00:00 2001 +From 9ff443f8b9d456b21f1ff0390e04841f78bfa549 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Jul 2020 14:56:16 +0100 -Subject: [PATCH 1051/1216] configs: Adding remaining crypto API modules +Subject: [PATCH 1051/1224] 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 @@ -455434,7 +455434,7 @@ Signed-off-by: Phil Elwell 5 files changed, 10 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 5eaa8be6b458..079ce5cf796b 100644 +index 5eaa8be6b458c..079ce5cf796be 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1445,6 +1445,8 @@ CONFIG_CRYPTO_DES=y @@ -455447,7 +455447,7 @@ index 5eaa8be6b458..079ce5cf796b 100644 CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 8f261cec85c3..53bbdd37e3b1 100644 +index 8f261cec85c30..53bbdd37e3b13 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1484,6 +1484,8 @@ CONFIG_CRYPTO_DES=y @@ -455460,7 +455460,7 @@ index 8f261cec85c3..53bbdd37e3b1 100644 CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index e593c41ba646..269df029e398 100644 +index e593c41ba6464..269df029e3988 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1454,6 +1454,8 @@ CONFIG_CRYPTO_DES=y @@ -455473,7 +455473,7 @@ index e593c41ba646..269df029e398 100644 CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index e9eb3a88cbbe..c30be2d0ddd8 100644 +index e9eb3a88cbbe4..c30be2d0ddd8a 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1476,6 +1476,8 @@ CONFIG_CRYPTO_DES=y @@ -455486,7 +455486,7 @@ index e9eb3a88cbbe..c30be2d0ddd8 100644 CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 05459f731972..11f3ff5d60f8 100644 +index 05459f731972a..11f3ff5d60f8e 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1319,6 +1319,8 @@ CONFIG_CRYPTO_DES=y @@ -455502,10 +455502,10 @@ index 05459f731972..11f3ff5d60f8 100644 2.18.4 -From bba664e54769d2e65e1c7535b0c60f8f5b565f12 Mon Sep 17 00:00:00 2001 +From 8afa6114bda34615ec7b85058ebeea381176c375 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Jul 2020 15:34:19 +0100 -Subject: [PATCH 1052/1216] configs: Restore missing cgroups to BCM2835-7 +Subject: [PATCH 1052/1224] configs: Restore missing cgroups to BCM2835-7 See: https://github.com/raspberrypi/linux/issues/3644 @@ -455517,7 +455517,7 @@ Signed-off-by: Phil Elwell 3 files changed, 6 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 079ce5cf796b..3658272f1cf7 100644 +index 079ce5cf796be..3658272f1cf74 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -14,6 +14,8 @@ CONFIG_TASK_XACCT=y @@ -455530,7 +455530,7 @@ index 079ce5cf796b..3658272f1cf7 100644 CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 269df029e398..95ad3fce074a 100644 +index 269df029e3988..95ad3fce074ac 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y @@ -455543,7 +455543,7 @@ index 269df029e398..95ad3fce074a 100644 CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 11f3ff5d60f8..feca764ecd74 100644 +index 11f3ff5d60f8e..feca764ecd749 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y @@ -455559,10 +455559,10 @@ index 11f3ff5d60f8..feca764ecd74 100644 2.18.4 -From 516c628ece33d850fbb1a580c2a2a876c41b1aea Mon Sep 17 00:00:00 2001 +From 37d13cf40aa6ecb28f55845798c1f3f047989508 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 17 Jul 2020 11:20:07 +0100 -Subject: [PATCH 1053/1216] ARM: dts: Add UART skip-init properties for U-boot +Subject: [PATCH 1053/1224] 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 @@ -455578,7 +455578,7 @@ Signed-off-by: Phil Elwell 1 file changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi -index e3d90b4262f1..68a7e1c09db1 100644 +index e3d90b4262f1f..68a7e1c09db1d 100644 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi @@ -102,6 +102,14 @@ @@ -455600,10 +455600,10 @@ index e3d90b4262f1..68a7e1c09db1 100644 2.18.4 -From 70e1865ad23710f341c065763b4641d245155ca4 Mon Sep 17 00:00:00 2001 +From 42ada7f96ec4d5e794987a83dcc118b2732e4bc7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 28 Jul 2020 13:01:42 +0100 -Subject: [PATCH 1054/1216] drm/vc4: Remove UIF from the list of modifiers +Subject: [PATCH 1054/1224] 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 @@ -455620,7 +455620,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 31982bda0062..7802020cc3c0 100644 +index 31982bda0062d..7802020cc3c0e 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -718,7 +718,6 @@ static bool vc4_fkms_format_mod_supported(struct drm_plane *plane, @@ -455635,10 +455635,10 @@ index 31982bda0062..7802020cc3c0 100644 2.18.4 -From eb9f559a21e131b5662248deee65f237bd19785c Mon Sep 17 00:00:00 2001 +From 529e756261b162ef3012c2082dd2eef848f9b85f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Jul 2020 13:47:55 +0100 -Subject: [PATCH 1055/1216] ARM: proc-v7: Force misalignment of early stmia +Subject: [PATCH 1055/1224] 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 @@ -455667,7 +455667,7 @@ Signed-off-by: Phil Elwell 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S -index c4e8006a1a8c..d5d63b9fbe22 100644 +index c4e8006a1a8cd..d5d63b9fbe225 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -287,6 +287,8 @@ __v7_ca17mp_setup: @@ -455701,10 +455701,10 @@ index c4e8006a1a8c..d5d63b9fbe22 100644 2.18.4 -From a7ecc0eab1acbbeec4d179a381d175ea1784d7f8 Mon Sep 17 00:00:00 2001 +From bae35f59427700c13243ad56b68deccad0018f68 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jul 2020 15:13:09 +0100 -Subject: [PATCH 1056/1216] overlays: Fix sc16is75x overlays w.r.t. serdev +Subject: [PATCH 1056/1224] 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, @@ -455725,7 +455725,7 @@ Signed-off-by: Phil Elwell 4 files changed, 45 insertions(+), 32 deletions(-) diff --git a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts -index 16fe0d08cef1..04d74d62897b 100644 +index 16fe0d08cef1b..04d74d62897b9 100644 --- a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts +++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts @@ -13,26 +13,31 @@ @@ -455770,7 +455770,7 @@ index 16fe0d08cef1..04d74d62897b 100644 - }; diff --git a/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts -index 57ae35c38442..da05e981314c 100644 +index 57ae35c384425..da05e981314c4 100644 --- a/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts +++ b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts @@ -5,29 +5,32 @@ @@ -455819,7 +455819,7 @@ index 57ae35c38442..da05e981314c 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts -index ccce7ad599bc..a49a04722b99 100644 +index ccce7ad599bc1..a49a04722b996 100644 --- a/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts +++ b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts @@ -17,15 +17,9 @@ @@ -455861,7 +455861,7 @@ index ccce7ad599bc..a49a04722b99 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts -index ffdea106434a..730c6e8cd614 100644 +index ffdea106434a2..730c6e8cd6142 100644 --- a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts @@ -21,7 +21,7 @@ @@ -455895,10 +455895,10 @@ index ffdea106434a..730c6e8cd614 100644 2.18.4 -From 7b52614fbf1845a4c45d409f3e3ab44ad74d2716 Mon Sep 17 00:00:00 2001 +From 265defbac45be49830fcf899520f260cdd329ccc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 Jul 2020 18:06:24 +0100 -Subject: [PATCH 1057/1216] overlays: Delete spi0-hw-cs +Subject: [PATCH 1057/1224] 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 @@ -455916,7 +455916,7 @@ Signed-off-by: Phil Elwell delete mode 100644 arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index fa6db6eed3e2..afe0125760c0 100644 +index fa6db6eed3e2a..afe0125760c09 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -159,7 +159,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -455928,7 +455928,7 @@ index fa6db6eed3e2..afe0125760c0 100644 spi1-2cs.dtbo \ spi1-3cs.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 69892d01faae..81b1a1ffa7fa 100644 +index 69892d01faae1..81b1a1ffa7fa7 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2346,9 +2346,9 @@ Params: cs0_pin GPIO pin for CS0 (default 8) @@ -455945,7 +455945,7 @@ index 69892d01faae..81b1a1ffa7fa 100644 Name: spi1-1cs diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts -index 1287964c15bf..b15ecc68c149 100644 +index 1287964c15bf1..b15ecc68c149f 100644 --- a/arch/arm/boot/dts/overlays/overlay_map.dts +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -61,6 +61,10 @@ @@ -455961,7 +455961,7 @@ index 1287964c15bf..b15ecc68c149 100644 }; diff --git a/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts deleted file mode 100644 -index 168a0dc80ad1..000000000000 +index 168a0dc80ad1a..0000000000000 --- a/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts +++ /dev/null @@ -1,26 +0,0 @@ @@ -455995,10 +455995,10 @@ index 168a0dc80ad1..000000000000 2.18.4 -From a0c8afd8e8a6c871d6369df24bbd3056aa9aa5e4 Mon Sep 17 00:00:00 2001 +From d03b98d8afd3a216e170390b2d21eaa53efa8f35 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Tue, 22 Oct 2019 10:36:24 +0200 -Subject: [PATCH 1058/1216] backlight: gpio: Explicitly set the direction of +Subject: [PATCH 1058/1224] backlight: gpio: Explicitly set the direction of the GPIO commit 706dc68102bc7421a9e6573d149ab6d769d71cc7 upstream. @@ -456023,7 +456023,7 @@ Signed-off-by: Lee Jones 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c -index 18e053e4716c..40e94eb7a7b3 100644 +index 18e053e4716c4..40e94eb7a7b39 100644 --- a/drivers/video/backlight/gpio_backlight.c +++ b/drivers/video/backlight/gpio_backlight.c @@ -26,9 +26,8 @@ struct gpio_backlight { @@ -456089,10 +456089,10 @@ index 18e053e4716c..40e94eb7a7b3 100644 2.18.4 -From f82a68c2aa6e517164b884c5642eee0a748d8cc8 Mon Sep 17 00:00:00 2001 +From 90aa6f4694068cdb9f4c5476bd0345723df0633f Mon Sep 17 00:00:00 2001 From: Dougie Lawson Date: Mon, 27 Jul 2020 23:52:40 +0100 -Subject: [PATCH 1059/1216] overlays: Add maxtherm overlay for MAX6675/31855 +Subject: [PATCH 1059/1224] overlays: Add maxtherm overlay for MAX6675/31855 Add an overlay - maxtherm - to support the MAX6675 and MAX31855 family of thermocouples. @@ -456110,7 +456110,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm/boot/dts/overlays/maxtherm-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index afe0125760c0..f2e6ea5ffb5e 100644 +index afe0125760c09..f2e6ea5ffb5ea 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -98,6 +98,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -456122,7 +456122,7 @@ index afe0125760c0..f2e6ea5ffb5e 100644 mcp23017.dtbo \ mcp23s17.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 81b1a1ffa7fa..0feef8806543 100644 +index 81b1a1ffa7fa7..0feef88065431 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1622,6 +1622,36 @@ Params: no-sdmode Driver does not manage the state of the DAC's @@ -456164,7 +456164,7 @@ index 81b1a1ffa7fa..0feef8806543 100644 Load: dtoverlay=mbed-dac diff --git a/arch/arm/boot/dts/overlays/maxtherm-overlay.dts b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts new file mode 100644 -index 000000000000..34d5727069ec +index 0000000000000..34d5727069ece --- /dev/null +++ b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts @@ -0,0 +1,166 @@ @@ -456338,10 +456338,10 @@ index 000000000000..34d5727069ec 2.18.4 -From b5876dc2c67674ff81d4ee962e7b67daa073fc0e Mon Sep 17 00:00:00 2001 +From 6338f41976b204a8adeeea2e1f4f9fa4447a33da Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Sun, 2 Aug 2020 18:19:43 +0000 -Subject: [PATCH 1060/1216] configs: add CONFIG_SENSORS_IIO_HWMON=m +Subject: [PATCH 1060/1224] 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 @@ -456358,7 +456358,7 @@ Signed-off-by: Annaliese McDermond 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 3658272f1cf7..7860c8e1ffa7 100644 +index 3658272f1cf74..7860c8e1ffa77 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -712,6 +712,7 @@ CONFIG_BATTERY_MAX17040=m @@ -456370,7 +456370,7 @@ index 3658272f1cf7..7860c8e1ffa7 100644 CONFIG_SENSORS_LM75=m CONFIG_SENSORS_RASPBERRYPI_HWMON=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 53bbdd37e3b1..e98d0009a227 100644 +index 53bbdd37e3b13..e98d0009a2272 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -722,6 +722,7 @@ CONFIG_BATTERY_MAX17040=m @@ -456382,7 +456382,7 @@ index 53bbdd37e3b1..e98d0009a227 100644 CONFIG_SENSORS_LM75=m CONFIG_SENSORS_RASPBERRYPI_HWMON=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 95ad3fce074a..e8b8a09a0eed 100644 +index 95ad3fce074ac..e8b8a09a0eedc 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -701,6 +701,7 @@ CONFIG_BATTERY_MAX17040=m @@ -456394,7 +456394,7 @@ index 95ad3fce074a..e8b8a09a0eed 100644 CONFIG_SENSORS_LM75=m CONFIG_SENSORS_RASPBERRYPI_HWMON=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index c30be2d0ddd8..085507434521 100644 +index c30be2d0ddd8a..0855074345211 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -716,6 +716,7 @@ CONFIG_BATTERY_MAX17040=m @@ -456406,7 +456406,7 @@ index c30be2d0ddd8..085507434521 100644 CONFIG_SENSORS_LM75=m CONFIG_SENSORS_RASPBERRYPI_HWMON=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index feca764ecd74..497a14e0a6aa 100644 +index feca764ecd749..497a14e0a6aa4 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -681,6 +681,7 @@ CONFIG_W1_SLAVE_DS28E17=m @@ -456421,10 +456421,10 @@ index feca764ecd74..497a14e0a6aa 100644 2.18.4 -From 3f2e34852df19d8aa66c9e501a5d4d23b6fd0ef6 Mon Sep 17 00:00:00 2001 +From 399cc34149f477fe10fdc04d12015252ef4d5412 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Sun, 2 Aug 2020 18:25:07 +0000 -Subject: [PATCH 1061/1216] dtoverlays: Add the iio_hwmon driver to correct ADC +Subject: [PATCH 1061/1224] dtoverlays: Add the iio_hwmon driver to correct ADC issues The Linux kernel maintainers removed the hwmon driver for the @@ -456438,7 +456438,7 @@ Signed-off-by: Annaliese McDermond 1 file changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/overlays/draws-overlay.dts b/arch/arm/boot/dts/overlays/draws-overlay.dts -index 08bfce0edb23..d18187d7f343 100644 +index 08bfce0edb239..d18187d7f3437 100644 --- a/arch/arm/boot/dts/overlays/draws-overlay.dts +++ b/arch/arm/boot/dts/overlays/draws-overlay.dts @@ -45,6 +45,13 @@ @@ -456467,10 +456467,10 @@ index 08bfce0edb23..d18187d7f343 100644 2.18.4 -From c5769ff0bddf7639f4fa5a40c2e38809ac6d3753 Mon Sep 17 00:00:00 2001 +From a86a33982f57d65f0e97a8b6463979777c677dab Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2020 14:03:44 +0200 -Subject: [PATCH 1062/1216] Revert "ath9k: Fix general protection fault in +Subject: [PATCH 1062/1224] Revert "ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb" This reverts commit b5c8896bc14f54e5c4dd5a6e42879f125b8abd2d which is @@ -456489,7 +456489,7 @@ Signed-off-by: Greg Kroah-Hartman 2 files changed, 11 insertions(+), 42 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c -index 2ed98aaed6fb..edaafa2d4715 100644 +index 2ed98aaed6fb5..edaafa2d4715a 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -652,9 +652,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, @@ -456639,7 +456639,7 @@ index 2ed98aaed6fb..edaafa2d4715 100644 return ret; } diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h -index 5985aa15ca93..a94e7e1c86e9 100644 +index 5985aa15ca931..a94e7e1c86e98 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.h +++ b/drivers/net/wireless/ath/ath9k/hif_usb.h @@ -86,11 +86,6 @@ struct tx_buf { @@ -456658,10 +456658,10 @@ index 5985aa15ca93..a94e7e1c86e9 100644 2.18.4 -From 7725542891d29ee16d996dc05fe7baa68c2b15b4 Mon Sep 17 00:00:00 2001 +From 2d438448973ccbdd22ace7ee73b795285979cdb9 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 7 Aug 2020 13:55:18 +0100 -Subject: [PATCH 1063/1216] dts: bcm2711: Disable DVP by default +Subject: [PATCH 1063/1224] 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 @@ -456677,7 +456677,7 @@ Add a fragment to re-enable this in vc4-kms-v3d-pi4-overlay 2 files changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index c2c63bbef338..0d804cc824e0 100644 +index c2c63bbef338d..0d804cc824e0c 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -46,6 +46,7 @@ @@ -456689,7 +456689,7 @@ index c2c63bbef338..0d804cc824e0 100644 hdmi0: hdmi@7ef00700 { diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts -index 935e9469e318..3c662cea4e1f 100644 +index 935e9469e318a..3c662cea4e1f0 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts @@ -145,6 +145,13 @@ @@ -456710,10 +456710,10 @@ index 935e9469e318..3c662cea4e1f 100644 2.18.4 -From c07c10094cc4716a7657ac7375fe4f458683a81d Mon Sep 17 00:00:00 2001 +From e7912710ab178b8b978d77f01ce6b27703376d6b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Aug 2020 17:34:27 +0100 -Subject: [PATCH 1064/1216] config: Add USB gadget support to bcm2711 config +Subject: [PATCH 1064/1224] config: Add USB gadget support to bcm2711 config Signed-off-by: Phil Elwell --- @@ -456722,7 +456722,7 @@ Signed-off-by: Phil Elwell 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index e98d0009a227..bdad251281a0 100644 +index e98d0009a2272..bdad251281a04 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1187,7 +1187,8 @@ CONFIG_USB_SPEEDTOUCH=m @@ -456744,7 +456744,7 @@ index e98d0009a227..bdad251281a0 100644 CONFIG_IIO=m CONFIG_IIO_BUFFER_CB=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 085507434521..7ea2b663bdc0 100644 +index 0855074345211..7ea2b663bdc06 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1180,7 +1180,8 @@ CONFIG_USB_SPEEDTOUCH=m @@ -456769,10 +456769,10 @@ index 085507434521..7ea2b663bdc0 100644 2.18.4 -From 4452c35c7255e5297c1759e97a746a8044ad3616 Mon Sep 17 00:00:00 2001 +From afb93c53d20301bfa6cafa0f0c86607dad4355cf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Aug 2020 17:35:48 +0100 -Subject: [PATCH 1065/1216] ARM: dts: Add required USB power domain for XCHI +Subject: [PATCH 1065/1224] 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 @@ -456784,7 +456784,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index 0d804cc824e0..b624ab54ad05 100644 +index 0d804cc824e0c..b624ab54ad059 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -217,6 +217,7 @@ @@ -456799,10 +456799,10 @@ index 0d804cc824e0..b624ab54ad05 100644 2.18.4 -From 644becc673442b06397385ef8c49e83d3b9887e7 Mon Sep 17 00:00:00 2001 +From d4fd96d2ed4f4593d0bac422123efe10132b10bb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Aug 2020 10:15:52 +0100 -Subject: [PATCH 1066/1216] overlays: Regenerate upstream-pi4 +Subject: [PATCH 1066/1224] 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. @@ -456813,7 +456813,7 @@ Signed-off-by: Phil Elwell 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts -index 30130f09fbc6..d88bbcfc36d1 100644 +index 30130f09fbc66..d88bbcfc36d10 100644 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts @@ -128,6 +128,12 @@ @@ -456833,10 +456833,10 @@ index 30130f09fbc6..d88bbcfc36d1 100644 2.18.4 -From dd5a29e24977b50da5e14f3d4dd3b1040cbda32d Mon Sep 17 00:00:00 2001 +From 777cd2500a67e13e9c2af959d12dba8b441ac0e8 Mon Sep 17 00:00:00 2001 From: Qiujun Huang Date: Sat, 4 Apr 2020 12:18:38 +0800 -Subject: [PATCH 1067/1216] ath9k: Fix general protection fault in +Subject: [PATCH 1067/1224] ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -456889,7 +456889,7 @@ Signed-off-by: Greg Kroah-Hartman 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c -index edaafa2d4715..2ed98aaed6fb 100644 +index edaafa2d4715a..2ed98aaed6fb5 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -652,9 +652,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, @@ -457039,7 +457039,7 @@ index edaafa2d4715..2ed98aaed6fb 100644 return ret; } diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h -index a94e7e1c86e9..5985aa15ca93 100644 +index a94e7e1c86e98..5985aa15ca931 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.h +++ b/drivers/net/wireless/ath/ath9k/hif_usb.h @@ -86,6 +86,11 @@ struct tx_buf { @@ -457058,10 +457058,10 @@ index a94e7e1c86e9..5985aa15ca93 100644 2.18.4 -From 329ddcff497684c2dc762d3e3b6f23df14f7b13f Mon Sep 17 00:00:00 2001 +From 4de40f362a71c07f5eab0be5ce0494975fb266a6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 20 Jul 2020 16:42:57 +0100 -Subject: [PATCH 1068/1216] drm/vc4: Increase the number of planes per crtc in +Subject: [PATCH 1068/1224] drm/vc4: Increase the number of planes per crtc in FKMS. The number assigned was arbitrary as one primary, one overlay, @@ -457078,7 +457078,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index 7802020cc3c0..bafdd1265289 100644 +index 7802020cc3c0e..bafdd12652899 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -48,7 +48,7 @@ struct vc4_fkms { @@ -457169,10 +457169,10 @@ index 7802020cc3c0..bafdd1265289 100644 2.18.4 -From 1bf1995644d27a7869f14bade2c4b07b0aa47632 Mon Sep 17 00:00:00 2001 +From fa48b5b3b16a6daa0ac036d9a6821d960561fa91 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 18:29:56 +0100 -Subject: [PATCH 1069/1216] drm/vc4: Set the possible crtcs mask correctly for +Subject: [PATCH 1069/1224] drm/vc4: Set the possible crtcs mask correctly for planes with FKMS The driver was assigning all planes to crtcs when actually they're @@ -457188,7 +457188,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index bafdd1265289..0063d78a1b4a 100644 +index bafdd12652899..0063d78a1b4a4 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -816,7 +816,7 @@ static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev, @@ -457215,10 +457215,10 @@ index bafdd1265289..0063d78a1b4a 100644 2.18.4 -From 44ae84a07bcc21b852025972f8bbf2f63b3d25e5 Mon Sep 17 00:00:00 2001 +From 2cd54abf2b8e924264573e9fe995f431b3769106 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 16:58:18 +0100 -Subject: [PATCH 1070/1216] staging: vc04_services: codec: Fix incorrect buffer +Subject: [PATCH 1070/1224] staging: vc04_services: codec: Fix incorrect buffer cleanup The allocated input and output buffers are initialised in @@ -457235,7 +457235,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 16 deletions(-) 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 3fe81979aaa1..b6c5a66b4b4a 100644 +index 3fe81979aaa16..b6c5a66b4b4aa 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -2320,10 +2320,7 @@ static void bcm2835_codec_stop_streaming(struct vb2_queue *q) @@ -457273,10 +457273,10 @@ index 3fe81979aaa1..b6c5a66b4b4a 100644 2.18.4 -From 012346b4f1e9a2cb75ddc9c9ca59b229abeff371 Mon Sep 17 00:00:00 2001 +From 03df6b3d64d4aa029ed6b63a91581ad853a67ba3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 17:01:27 +0100 -Subject: [PATCH 1071/1216] staging: vc04_service: codec: Allow start_streaming +Subject: [PATCH 1071/1224] staging: vc04_service: codec: Allow start_streaming to update the buffernum start_streaming passes a count of how many buffers have been queued @@ -457291,7 +457291,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 19 insertions(+), 4 deletions(-) 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 b6c5a66b4b4a..427048c0ea31 100644 +index b6c5a66b4b4aa..427048c0ea31d 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -2268,6 +2268,7 @@ static int bcm2835_codec_start_streaming(struct vb2_queue *q, @@ -457349,10 +457349,10 @@ index b6c5a66b4b4a..427048c0ea31 100644 2.18.4 -From c0f6c47fa70786e91c3ef734c43806af706f8898 Mon Sep 17 00:00:00 2001 +From ef077f4af05471149cffb8e399bcbc0cb757e036 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Aug 2020 17:04:53 +0100 -Subject: [PATCH 1072/1216] staging: vc04_services: codec: Fix component +Subject: [PATCH 1072/1224] staging: vc04_services: codec: Fix component enable/disable start_streaming enabled the VPU component if ctx->component_enabled @@ -457369,7 +457369,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 3 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 427048c0ea31..14c47e2ea995 100644 +index 427048c0ea31d..14c47e2ea9955 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -2377,13 +2377,15 @@ static void bcm2835_codec_stop_streaming(struct vb2_queue *q) @@ -457393,10 +457393,10 @@ index 427048c0ea31..14c47e2ea995 100644 2.18.4 -From 411b0beff07ff9ac5a04efeec844234aa8490fb3 Mon Sep 17 00:00:00 2001 +From f4f998f07b2ba4efc40d5ac132102a46afa944be Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 14 Aug 2020 17:29:29 +0100 -Subject: [PATCH 1073/1216] configs: Add USB_GADGET=m to bcmrpi3_defconfig +Subject: [PATCH 1073/1224] configs: Add USB_GADGET=m to bcmrpi3_defconfig See: https://github.com/raspberrypi/linux/issues/3796 @@ -457406,7 +457406,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 497a14e0a6aa..65432c855202 100644 +index 497a14e0a6aa4..65432c8552026 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1069,6 +1069,7 @@ CONFIG_USB_SPEEDTOUCH=m @@ -457421,17 +457421,17 @@ index 497a14e0a6aa..65432c855202 100644 2.18.4 -From c1ae4fa6c68776185e3215fce788b25961c64861 Mon Sep 17 00:00:00 2001 +From de421511aa448d9c2e854c4edfc5caf19d4c5a23 Mon Sep 17 00:00:00 2001 From: Andreas Watterott <1488433+awatterott@users.noreply.github.com> Date: Mon, 17 Aug 2020 21:17:09 +0200 -Subject: [PATCH 1074/1216] update rpi-display-overlay.dts pins for 5.4 +Subject: [PATCH 1074/1224] update rpi-display-overlay.dts pins for 5.4 --- arch/arm/boot/dts/overlays/rpi-display-overlay.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts -index a5eed07d6a4b..de87432ff2be 100644 +index a5eed07d6a4b4..de87432ff2bea 100644 --- a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts @@ -59,9 +59,9 @@ @@ -457459,10 +457459,10 @@ index a5eed07d6a4b..de87432ff2be 100644 2.18.4 -From 3c1deaaa5386c01544d451b723fbf0f67cc91b15 Mon Sep 17 00:00:00 2001 +From 463ba7c808fbc2cbad99a510737bf82dc42a1595 Mon Sep 17 00:00:00 2001 From: "Ziqian SUN (Zamir)" Date: Sat, 11 Apr 2020 09:34:27 +0800 -Subject: [PATCH 1075/1216] Bluetooth: btrtl: Add support for RTL8761B +Subject: [PATCH 1075/1224] Bluetooth: btrtl: Add support for RTL8761B commit 04896832c94aae4842100cafb8d3a73e1bed3a45 upstream. @@ -457506,7 +457506,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 0dfaf90a31b0..6cfdef7fc4b1 100644 +index 0dfaf90a31b06..6cfdef7fc4b18 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -130,12 +130,19 @@ static const struct id_table ic_id_table[] = { @@ -457542,10 +457542,10 @@ index 0dfaf90a31b0..6cfdef7fc4b1 100644 2.18.4 -From ce4499837ccfae9c814c5941bd7562a93667b9e4 Mon Sep 17 00:00:00 2001 +From 63d956136d5d748cb1bfa18203473999039621bb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 17 Aug 2020 18:11:47 +0100 -Subject: [PATCH 1076/1216] dtoverlays: Add overlay for the PCA953x family of +Subject: [PATCH 1076/1224] dtoverlays: Add overlay for the PCA953x family of GPIO expanders Adds an overlay for configuring all the GPIO expanders supported @@ -457560,7 +457560,7 @@ Signed-off-by: Dave Stevenson create mode 100644 arch/arm/boot/dts/overlays/pca953x-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index f2e6ea5ffb5e..91ba5cab2ad3 100644 +index f2e6ea5ffb5ea..91ba5cab2ad36 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -119,6 +119,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -457572,7 +457572,7 @@ index f2e6ea5ffb5e..91ba5cab2ad3 100644 piglow.dtbo \ piscreen.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 0feef8806543..c17128789dbc 100644 +index 0feef88065431..c17128789dbc6 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1873,6 +1873,42 @@ Params: panel Display panel (required): @@ -457620,7 +457620,7 @@ index 0feef8806543..c17128789dbc 100644 diff --git a/arch/arm/boot/dts/overlays/pca953x-overlay.dts b/arch/arm/boot/dts/overlays/pca953x-overlay.dts new file mode 100644 -index 000000000000..8b6ee44665ce +index 0000000000000..8b6ee44665cee --- /dev/null +++ b/arch/arm/boot/dts/overlays/pca953x-overlay.dts @@ -0,0 +1,240 @@ @@ -457868,10 +457868,10 @@ index 000000000000..8b6ee44665ce 2.18.4 -From 2b0863f42615983f0b6db8499d6f46a9401efc8f Mon Sep 17 00:00:00 2001 +From 2ad5b60dca014981a2fffa6272837c25e460333b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 15 May 2020 16:28:32 +0100 -Subject: [PATCH 1077/1216] rtc: rv3028: Write BSM and TCE/TCR to EEPROM +Subject: [PATCH 1077/1224] 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 @@ -457888,7 +457888,7 @@ Signed-off-by: Phil Elwell 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/drivers/rtc/rtc-rv3028.c b/drivers/rtc/rtc-rv3028.c -index 8b2446909a1b..e02ae4b1cbc2 100644 +index 8b2446909a1bb..e02ae4b1cbc2a 100644 --- a/drivers/rtc/rtc-rv3028.c +++ b/drivers/rtc/rtc-rv3028.c @@ -18,6 +18,7 @@ @@ -457994,10 +457994,10 @@ index 8b2446909a1b..e02ae4b1cbc2 100644 2.18.4 -From 4dcc7f717d1e17a318d1e6627b9189c389a0f38f Mon Sep 17 00:00:00 2001 +From 4d3e89d218259638bb4516383a031a21a5a688b9 Mon Sep 17 00:00:00 2001 From: Einar Vading Date: Fri, 14 Aug 2020 22:14:41 +0200 -Subject: [PATCH 1078/1216] rtc: rv3028: Refresh RAM on EEPROM write +Subject: [PATCH 1078/1224] 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. @@ -458008,7 +458008,7 @@ Signed-off-by: Einar Vading 1 file changed, 56 insertions(+) diff --git a/drivers/rtc/rtc-rv3028.c b/drivers/rtc/rtc-rv3028.c -index e02ae4b1cbc2..99d10d7ead2f 100644 +index e02ae4b1cbc2a..99d10d7ead2f4 100644 --- a/drivers/rtc/rtc-rv3028.c +++ b/drivers/rtc/rtc-rv3028.c @@ -66,6 +66,7 @@ @@ -458092,10 +458092,10 @@ index e02ae4b1cbc2..99d10d7ead2f 100644 2.18.4 -From 56b654dba5692940476a5ed0f0516c854f5c5c92 Mon Sep 17 00:00:00 2001 +From 32c8b9dca22bab20e3e6ee4094309c3f7041c258 Mon Sep 17 00:00:00 2001 From: Thomas Preston Date: Thu, 13 Aug 2020 01:38:35 +0100 -Subject: [PATCH 1079/1216] dt/overlays: Add PiFace Digital Device Tree Overlay +Subject: [PATCH 1079/1224] dt/overlays: Add PiFace Digital Device Tree Overlay The PiFace Digital is a convenient breakout board for the Microchip mcp23s17 SPI GPIO port expander. @@ -458118,7 +458118,7 @@ Signed-off-by: Thomas Preston create mode 100644 arch/arm/boot/dts/overlays/pifacedigital-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 91ba5cab2ad3..875532b2fd3c 100644 +index 91ba5cab2ad36..875532b2fd3c3 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -121,6 +121,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -458130,7 +458130,7 @@ index 91ba5cab2ad3..875532b2fd3c 100644 piscreen.dtbo \ piscreen2r.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index c17128789dbc..253a52b6113d 100644 +index c17128789dbc6..253a52b6113d1 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1949,6 +1949,14 @@ Params: alsaname Set the name as it appears in ALSA (default @@ -458150,7 +458150,7 @@ index c17128789dbc..253a52b6113d 100644 Load: dtoverlay=piglow diff --git a/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts new file mode 100644 -index 000000000000..532a858683d6 +index 0000000000000..532a858683d6f --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts @@ -0,0 +1,144 @@ @@ -458302,10 +458302,10 @@ index 000000000000..532a858683d6 2.18.4 -From 9549a541130d7874f0a8e2c5c992f35bd8a28a1a Mon Sep 17 00:00:00 2001 +From cd0165b128f6ad5ef3183a474db478d9c9612bae Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 18 Aug 2020 13:16:39 +0100 -Subject: [PATCH 1080/1216] configs: Add CONFIG_UEVENT_HELPER=y +Subject: [PATCH 1080/1224] configs: Add CONFIG_UEVENT_HELPER=y See: https://github.com/raspberrypi/linux/issues/3785 @@ -458319,7 +458319,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 7860c8e1ffa7..b8aa20368b80 100644 +index 7860c8e1ffa77..b8aa20368b803 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -441,6 +441,7 @@ CONFIG_RFKILL=m @@ -458331,7 +458331,7 @@ index 7860c8e1ffa7..b8aa20368b80 100644 CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index bdad251281a0..c169476f4b5b 100644 +index bdad251281a04..c169476f4b5b3 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -447,6 +447,7 @@ CONFIG_PCIEPORTBUS=y @@ -458343,7 +458343,7 @@ index bdad251281a0..c169476f4b5b 100644 CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index e8b8a09a0eed..8e157f06a9f4 100644 +index e8b8a09a0eedc..8e157f06a9f49 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -431,6 +431,7 @@ CONFIG_RFKILL=m @@ -458355,7 +458355,7 @@ index e8b8a09a0eed..8e157f06a9f4 100644 CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 7ea2b663bdc0..1ea1af34c55b 100644 +index 7ea2b663bdc06..1ea1af34c55b6 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -443,6 +443,7 @@ CONFIG_NET_9P=m @@ -458367,7 +458367,7 @@ index 7ea2b663bdc0..1ea1af34c55b 100644 CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 65432c855202..9c6ada12bebf 100644 +index 65432c8552026..9c6ada12bebf3 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -430,6 +430,7 @@ CONFIG_RFKILL=m @@ -458382,10 +458382,10 @@ index 65432c855202..9c6ada12bebf 100644 2.18.4 -From d7ab9105078d464fd85a7c7f705391bb1b581ea7 Mon Sep 17 00:00:00 2001 +From 18a8b502a66b8cdf17f702540256931dfba0ddb2 Mon Sep 17 00:00:00 2001 From: RICCIARDI-Adrien Date: Thu, 20 Aug 2020 10:18:35 +0200 -Subject: [PATCH 1081/1216] overlays: Updated MCP3008 compatible strings. +Subject: [PATCH 1081/1224] overlays: Updated MCP3008 compatible strings. Used recommended ones from Documentation/devicetree/bindings/iio/adc/mcp320x.txt. --- @@ -458393,7 +458393,7 @@ Used recommended ones from Documentation/devicetree/bindings/iio/adc/mcp320x.txt 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts -index 0b7d9f75546e..957fdb9310af 100755 +index 0b7d9f75546ef..957fdb9310af4 100755 --- a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts @@ -72,7 +72,7 @@ @@ -458472,10 +458472,10 @@ index 0b7d9f75546e..957fdb9310af 100755 2.18.4 -From 607d9742b195866388c7e4afba89f5acbe590e37 Mon Sep 17 00:00:00 2001 +From adbdb18433968a7b87529a4c793e41a1c9a68b7d Mon Sep 17 00:00:00 2001 From: Ramin Moussavi Date: Sat, 25 Jul 2020 22:31:49 +0200 -Subject: [PATCH 1082/1216] RESET_CONTROLLER needs to be activated to compile +Subject: [PATCH 1082/1224] RESET_CONTROLLER needs to be activated to compile Broadcom BCM2835 clock support --- @@ -458483,7 +458483,7 @@ Subject: [PATCH 1082/1216] RESET_CONTROLLER needs to be activated to compile 1 file changed, 1 insertion(+) diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig -index 03bbd8040451..2d32eeca0153 100644 +index 03bbd80404514..2d32eeca01538 100644 --- a/drivers/clk/bcm/Kconfig +++ b/drivers/clk/bcm/Kconfig @@ -5,6 +5,7 @@ config CLK_BCM2835 @@ -458498,10 +458498,10 @@ index 03bbd8040451..2d32eeca0153 100644 2.18.4 -From 99366e8496203b9b56ec6a3a2e00e7239d5a0ef2 Mon Sep 17 00:00:00 2001 +From bfe9da3cc864b64ce99ce97940e508ad5a50c5f8 Mon Sep 17 00:00:00 2001 From: Andrei Koshkosh Date: Sun, 29 Sep 2019 05:04:05 -0300 -Subject: [PATCH 1083/1216] media: dvbsky: use a single mutex and state buffers +Subject: [PATCH 1083/1224] media: dvbsky: use a single mutex and state buffers for all R/W ops commit cecf0bbbcb6f035a5ca2197f3e11ec2b7fb3da83 upstream. @@ -458519,7 +458519,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c -index dc380c0c9536..199ba6a8201f 100644 +index dc380c0c95369..199ba6a8201f8 100644 --- a/drivers/media/usb/dvb-usb-v2/dvbsky.c +++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c @@ -22,7 +22,6 @@ MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver."); @@ -458568,10 +458568,10 @@ index dc380c0c9536..199ba6a8201f 100644 2.18.4 -From f7518053f51c34611bbea86ce462f3eba85896d5 Mon Sep 17 00:00:00 2001 +From c4029430b0b914c3e62be8cc8948356a3745dc2a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 24 Aug 2020 17:11:34 +0100 -Subject: [PATCH 1084/1216] ARM: dts: bcm2711: Enable support for DDR52 eMMC +Subject: [PATCH 1084/1224] ARM: dts: bcm2711: Enable support for DDR52 eMMC See: https://github.com/raspberrypi/linux/issues/3802 @@ -458581,7 +458581,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi -index b624ab54ad05..0556c73e332a 100644 +index b624ab54ad059..0556c73e332aa 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -310,3 +310,7 @@ @@ -458596,10 +458596,10 @@ index b624ab54ad05..0556c73e332a 100644 2.18.4 -From 07cf208b37b2a5e0abe849c57f2f33ba0583b852 Mon Sep 17 00:00:00 2001 +From 2081fb92b9e3f7d4833ea4caf68e0f314bc95881 Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Mon, 24 Aug 2020 17:14:29 +0900 -Subject: [PATCH 1085/1216] staging: vc04_services: ISP: Fix dmabuf error check +Subject: [PATCH 1085/1224] 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, @@ -458611,7 +458611,7 @@ Signed-off-by: Paul Elder 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c -index db38649124b7..f3703f2a0143 100644 +index db38649124b77..f3703f2a01438 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -733,7 +733,7 @@ static int bcm2835_isp_s_ctrl(struct v4l2_ctrl *ctrl) @@ -458627,10 +458627,10 @@ index db38649124b7..f3703f2a0143 100644 2.18.4 -From 658c467c904c7b608ba3dc0871d8aca16da98b6c Mon Sep 17 00:00:00 2001 +From 33dde5f77aa3be48d56e31642f3cc9b673545233 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 24 Aug 2020 18:28:52 +0100 -Subject: [PATCH 1086/1216] ARM: dts: bcm2708.dtsi: Don't delete the cpus node +Subject: [PATCH 1086/1224] 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 @@ -458643,7 +458643,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi -index a32ff21613ed..36ec4989403f 100644 +index a32ff21613eda..36ec4989403f5 100644 --- a/arch/arm/boot/dts/bcm2708.dtsi +++ b/arch/arm/boot/dts/bcm2708.dtsi @@ -2,8 +2,6 @@ @@ -458659,10 +458659,10 @@ index a32ff21613ed..36ec4989403f 100644 2.18.4 -From f2b4b3946b1670ba98fe033ad4806a5184ca10e0 Mon Sep 17 00:00:00 2001 +From b1999dc0dd152cc50dd22932ad7973e7e850a90a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 11:06:20 +0100 -Subject: [PATCH 1087/1216] ARM: dts: bcm2711: Add mmc_ddr_1_8v where possible +Subject: [PATCH 1087/1224] ARM: dts: bcm2711: Add mmc_ddr_1_8v where possible Advertise mmc_ddr_1_8v on platforms that support 1.8V SD/MMC DDR52. @@ -458673,7 +458673,7 @@ Signed-off-by: Phil Elwell 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 21b20e334b1a..5469f5ad4bb3 100644 +index 21b20e334b1a7..5469f5ad4bb37 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -173,6 +173,7 @@ @@ -458685,7 +458685,7 @@ index 21b20e334b1a..5469f5ad4bb3 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index d4ea928e30ce..823aeeca393d 100644 +index d4ea928e30ce6..823aeeca393de 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -109,9 +109,10 @@ @@ -458704,10 +458704,10 @@ index d4ea928e30ce..823aeeca393d 100644 2.18.4 -From 0d58e69972999ec830f38d37d64868095e6b75ee Mon Sep 17 00:00:00 2001 +From c8ce0f20bf42669d9991e3126b651343e0c4e6c4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 14:06:34 +0100 -Subject: [PATCH 1088/1216] configs: Add I2C_HID=m +Subject: [PATCH 1088/1224] configs: Add I2C_HID=m Enable support for I2C HID devices. @@ -458723,7 +458723,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index b8aa20368b80..170d0870a3b0 100644 +index b8aa20368b803..170d0870a3b0f 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1073,6 +1073,7 @@ CONFIG_HID_ZEROPLUS=m @@ -458735,7 +458735,7 @@ index b8aa20368b80..170d0870a3b0 100644 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_MON=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index c169476f4b5b..dbeeff9c2a5d 100644 +index c169476f4b5b3..dbeeff9c2a5da 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1087,6 +1087,7 @@ CONFIG_HID_ZEROPLUS=m @@ -458747,7 +458747,7 @@ index c169476f4b5b..dbeeff9c2a5d 100644 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_MON=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 8e157f06a9f4..41265fbe8ab2 100644 +index 8e157f06a9f49..41265fbe8ab21 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1061,6 +1061,7 @@ CONFIG_HID_ZEROPLUS=m @@ -458759,7 +458759,7 @@ index 8e157f06a9f4..41265fbe8ab2 100644 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_MON=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 1ea1af34c55b..e8889a89b3c5 100644 +index 1ea1af34c55b6..e8889a89b3c5f 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1080,6 +1080,7 @@ CONFIG_HID_ZEROPLUS=m @@ -458771,7 +458771,7 @@ index 1ea1af34c55b..e8889a89b3c5 100644 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_MON=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 9c6ada12bebf..f278668e178d 100644 +index 9c6ada12bebf3..f278668e178d7 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -972,6 +972,7 @@ CONFIG_HID_ZEROPLUS=m @@ -458786,10 +458786,10 @@ index 9c6ada12bebf..f278668e178d 100644 2.18.4 -From 14d2f9d4da8526ee3581be66850ccab75f36ad55 Mon Sep 17 00:00:00 2001 +From af77531f0839f3a6b56f5375e09319166b24e077 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 14:19:51 +0100 -Subject: [PATCH 1089/1216] Revert "ARM: dts: bcm2711: Add mmc_ddr_1_8v where +Subject: [PATCH 1089/1224] Revert "ARM: dts: bcm2711: Add mmc_ddr_1_8v where possible" The commit being reverted has been seen to prevent booting with an eMMC @@ -458802,7 +458802,7 @@ Signed-off-by: Phil Elwell 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 5469f5ad4bb3..21b20e334b1a 100644 +index 5469f5ad4bb37..21b20e334b1a7 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -173,7 +173,6 @@ @@ -458814,7 +458814,7 @@ index 5469f5ad4bb3..21b20e334b1a 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index 823aeeca393d..d4ea928e30ce 100644 +index 823aeeca393de..d4ea928e30ce6 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -109,10 +109,9 @@ @@ -458833,10 +458833,10 @@ index 823aeeca393d..d4ea928e30ce 100644 2.18.4 -From 0d052fcc36706ecec826b14bc74a841706d8e114 Mon Sep 17 00:00:00 2001 +From 7ed47dfb0666d613f196358ca8a086fcf83c4319 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 25 Aug 2020 17:08:17 +0100 -Subject: [PATCH 1090/1216] configs: Add CONFIG_SPS30=m +Subject: [PATCH 1090/1224] 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 @@ -458854,7 +458854,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 170d0870a3b0..c6d146029bad 100644 +index 170d0870a3b0f..c6d146029bad5 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1316,6 +1316,7 @@ CONFIG_MCP320X=m @@ -458866,7 +458866,7 @@ index 170d0870a3b0..c6d146029bad 100644 CONFIG_HDC100X=m CONFIG_HTU21=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index dbeeff9c2a5d..c4620ef40ebd 100644 +index dbeeff9c2a5da..c4620ef40ebd2 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1352,6 +1352,7 @@ CONFIG_MCP320X=m @@ -458878,7 +458878,7 @@ index dbeeff9c2a5d..c4620ef40ebd 100644 CONFIG_HDC100X=m CONFIG_HTU21=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 41265fbe8ab2..9789478cc4d1 100644 +index 41265fbe8ab21..9789478cc4d17 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1322,6 +1322,7 @@ CONFIG_MCP320X=m @@ -458890,7 +458890,7 @@ index 41265fbe8ab2..9789478cc4d1 100644 CONFIG_HDC100X=m CONFIG_HTU21=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index e8889a89b3c5..e75e32b63bda 100644 +index e8889a89b3c5f..e75e32b63bdae 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1344,6 +1344,7 @@ CONFIG_MCP320X=m @@ -458902,7 +458902,7 @@ index e8889a89b3c5..e75e32b63bda 100644 CONFIG_HDC100X=m CONFIG_HTU21=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index f278668e178d..a69ed1899039 100644 +index f278668e178d7..a69ed1899039c 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1197,6 +1197,7 @@ CONFIG_IIO_BUFFER_CB=m @@ -458917,10 +458917,10 @@ index f278668e178d..a69ed1899039 100644 2.18.4 -From c95e7bf4173a8c2284132cebe0a77b8f82397e60 Mon Sep 17 00:00:00 2001 +From 882eef7ce4b11d7d197f155ad2030d97188848e9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 24 Aug 2020 17:30:06 +0100 -Subject: [PATCH 1091/1216] Revert "raspberrypi-cpufreq: Only report integer +Subject: [PATCH 1091/1224] Revert "raspberrypi-cpufreq: Only report integer pll divisor frequencies" This reverts commit f44019c198fdfea0c880f5e64641b8a43c13e829. @@ -458929,7 +458929,7 @@ This reverts commit f44019c198fdfea0c880f5e64641b8a43c13e829. 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/cpufreq/raspberrypi-cpufreq.c b/drivers/cpufreq/raspberrypi-cpufreq.c -index 8bcfab2749a8..2bc7d9734272 100644 +index 8bcfab2749a8d..2bc7d9734272a 100644 --- a/drivers/cpufreq/raspberrypi-cpufreq.c +++ b/drivers/cpufreq/raspberrypi-cpufreq.c @@ -8,7 +8,6 @@ @@ -458964,10 +458964,10 @@ index 8bcfab2749a8..2bc7d9734272 100644 2.18.4 -From 4e1c3f351acffb20db99cc0ae0be18d9597f9ec0 Mon Sep 17 00:00:00 2001 +From 8a60efcfe7bd0651c9fcac91c834c9d9ff8e36c8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 25 Aug 2020 11:26:04 +0100 -Subject: [PATCH 1092/1216] configs: Enable upstream cpufreq driver for pi0/pi1 +Subject: [PATCH 1092/1224] configs: Enable upstream cpufreq driver for pi0/pi1 Signed-off-by: popcornmix --- @@ -458975,7 +458975,7 @@ Signed-off-by: popcornmix 1 file changed, 3 insertions(+) diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 9789478cc4d1..d681885c1d2b 100644 +index 9789478cc4d17..d681885c1d2b8 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -46,6 +46,9 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y @@ -458992,10 +458992,10 @@ index 9789478cc4d1..d681885c1d2b 100644 2.18.4 -From 8036fd7d17d8cce05433a10a298ab7bea828eda3 Mon Sep 17 00:00:00 2001 +From 6a6a938eb1693f6ed21da3ddd04cdb985f2681fe Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 27 Aug 2020 17:57:18 +0100 -Subject: [PATCH 1093/1216] ARM: dts: bcm2835: Use the L2 non-allocating alias +Subject: [PATCH 1093/1224] 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 @@ -459012,7 +459012,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi -index 53bf4579cc22..b94d5ec3f332 100644 +index 53bf4579cc224..b94d5ec3f332c 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -18,7 +18,7 @@ @@ -459028,10 +459028,10 @@ index 53bf4579cc22..b94d5ec3f332 100644 2.18.4 -From 1ee3f3d62551c27cc82e5194e8ceeff68bd286a9 Mon Sep 17 00:00:00 2001 +From b4a74fb973c7ef2e35005bd8c82486e20b8e696e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 27 Aug 2020 16:30:26 +0100 -Subject: [PATCH 1094/1216] media: bcm2835-unicam: Drop WARN on uing direct +Subject: [PATCH 1094/1224] media: bcm2835-unicam: Drop WARN on uing direct cache alias Pi 0&1 pass all ARM accesses through the VPU L2 cache, therefore @@ -459047,7 +459047,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 57c3c5f5db56..6501fb205e20 100644 +index 57c3c5f5db56f..6501fb205e205 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -708,13 +708,6 @@ static void unicam_wr_dma_addr(struct unicam_device *dev, dma_addr_t dmaaddr, @@ -459068,10 +459068,10 @@ index 57c3c5f5db56..6501fb205e20 100644 2.18.4 -From fc84abc6b7586abd9573394b14221c0112ea0468 Mon Sep 17 00:00:00 2001 +From bd338f5ade1965e0394a0a2b3728ddc72b90e3ca Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 Jul 2020 12:40:50 +0100 -Subject: [PATCH 1095/1216] media: i2c: tc358743: Only allow supported pixel +Subject: [PATCH 1095/1224] media: i2c: tc358743: Only allow supported pixel fmts in set_fmt Fix commit "media: tc358743: Return an appropriate colorspace from @@ -459084,7 +459084,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c -index b3b8d6e15ea2..eef6ab823c6c 100644 +index b3b8d6e15ea2b..eef6ab823c6cb 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -1731,8 +1731,10 @@ static int tc358743_set_fmt(struct v4l2_subdev *sd, @@ -459104,10 +459104,10 @@ index b3b8d6e15ea2..eef6ab823c6c 100644 2.18.4 -From fd4bd730f820b24fbd75015468a74b7ea96af32a Mon Sep 17 00:00:00 2001 +From 3453fe9da402465d284e89538a6d487629173ecb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 Jul 2020 18:29:10 +0100 -Subject: [PATCH 1096/1216] media: i2c: ov9281: Add support for 8 bit readout +Subject: [PATCH 1096/1224] 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. @@ -459118,7 +459118,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c -index bb8efc3d3cba..9610c24ceff1 100644 +index bb8efc3d3cba8..9610c24ceff18 100644 --- a/drivers/media/i2c/ov9281.c +++ b/drivers/media/i2c/ov9281.c @@ -29,11 +29,12 @@ @@ -459298,10 +459298,10 @@ index bb8efc3d3cba..9610c24ceff1 100644 2.18.4 -From d57035d8791e82948aaee618825a986f56ae68fe Mon Sep 17 00:00:00 2001 +From 920581d4df0ac2b4cb48c4391c82ff43b9b21483 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Aug 2020 12:55:41 +0100 -Subject: [PATCH 1097/1216] overlays: Add spi0-1cs and spi0-2cs +Subject: [PATCH 1097/1224] 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 @@ -459323,7 +459323,7 @@ Signed-off-by: Phil Elwell rename arch/arm/boot/dts/overlays/{spi0-cs-overlay.dts => spi0-2cs-overlay.dts} (79%) diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 875532b2fd3c..fa92793b2e7f 100644 +index 875532b2fd3c3..fa92793b2e7f1 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -161,7 +161,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -459337,7 +459337,7 @@ index 875532b2fd3c..fa92793b2e7f 100644 spi1-2cs.dtbo \ spi1-3cs.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 253a52b6113d..a0adf476eafa 100644 +index 253a52b6113d1..a0adf476eafae 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2412,11 +2412,27 @@ Load: dtoverlay=spi-rtc,= @@ -459372,7 +459372,7 @@ index 253a52b6113d..a0adf476eafa 100644 Name: spi0-hw-cs diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts -index b15ecc68c149..22b0ad1738ec 100644 +index b15ecc68c149f..22b0ad1738ec6 100644 --- a/arch/arm/boot/dts/overlays/overlay_map.dts +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -61,6 +61,10 @@ @@ -459388,7 +459388,7 @@ index b15ecc68c149..22b0ad1738ec 100644 }; diff --git a/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts new file mode 100644 -index 000000000000..e6eb66e2076a +index 0000000000000..e6eb66e2076aa --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts @@ -0,0 +1,42 @@ @@ -459438,7 +459438,7 @@ diff --git a/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts b/arch/arm/boot/dts/ similarity index 79% rename from arch/arm/boot/dts/overlays/spi0-cs-overlay.dts rename to arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts -index ff41439a483a..df6519537c3a 100644 +index ff41439a483af..df6519537c3a8 100644 --- a/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts +++ b/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts @@ -20,10 +20,18 @@ @@ -459464,10 +459464,10 @@ index ff41439a483a..df6519537c3a 100644 2.18.4 -From 646d165222f6ee706c58da9fc97f9f605ba07d59 Mon Sep 17 00:00:00 2001 +From 53bf5060e42daa446e11f4a243cc2720b4abee5e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Aug 2020 22:04:05 +0100 -Subject: [PATCH 1098/1216] overlays: Fix error in README +Subject: [PATCH 1098/1224] overlays: Fix error in README spi0-cs has been renamed spi0-2cs, not spi0-1cs. @@ -459477,7 +459477,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index a0adf476eafa..e2d90595c3c0 100644 +index a0adf476eafae..e2d90595c3c04 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2430,7 +2430,7 @@ Params: cs0_pin GPIO pin for CS0 (default 8) @@ -459493,10 +459493,10 @@ index a0adf476eafa..e2d90595c3c0 100644 2.18.4 -From c5f92f9f4c85047f1f6c6755d6d6f9175410f5c9 Mon Sep 17 00:00:00 2001 +From be9b1713192d9fe84e7c18a569109df9def2c170 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 15:46:28 +0100 -Subject: [PATCH 1099/1216] configs: Make the evdev module a built-in +Subject: [PATCH 1099/1224] 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 @@ -459515,7 +459515,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index c6d146029bad..27baef62e942 100644 +index c6d146029bad5..27baef62e942b 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -595,7 +595,7 @@ CONFIG_IEEE802154_MRF24J40=m @@ -459528,7 +459528,7 @@ index c6d146029bad..27baef62e942 100644 CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_MATRIX=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index c4620ef40ebd..165afd913a4a 100644 +index c4620ef40ebd2..165afd913a4ac 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -604,7 +604,7 @@ CONFIG_IEEE802154_MRF24J40=m @@ -459541,7 +459541,7 @@ index c4620ef40ebd..165afd913a4a 100644 CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_MATRIX=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index d681885c1d2b..65283969c6f2 100644 +index d681885c1d2b8..65283969c6f28 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -588,7 +588,7 @@ CONFIG_IEEE802154_MRF24J40=m @@ -459554,7 +459554,7 @@ index d681885c1d2b..65283969c6f2 100644 CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_MATRIX=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index e75e32b63bda..977b5ac32fa1 100644 +index e75e32b63bdae..977b5ac32fa14 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -600,7 +600,7 @@ CONFIG_IEEE802154_MRF24J40=m @@ -459567,7 +459567,7 @@ index e75e32b63bda..977b5ac32fa1 100644 CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_MATRIX=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index a69ed1899039..93c935bc9fb6 100644 +index a69ed1899039c..93c935bc9fb64 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -579,7 +579,7 @@ CONFIG_IEEE802154_AT86RF230=m @@ -459583,10 +459583,10 @@ index a69ed1899039..93c935bc9fb6 100644 2.18.4 -From a9354d770bfe6fd5578bee16e498cbe3012d5052 Mon Sep 17 00:00:00 2001 +From 4cd6592247d73e7d3f1c8aec1897c40531dede8c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 17:31:31 +0100 -Subject: [PATCH 1100/1216] configs: Include AppArmor support +Subject: [PATCH 1100/1224] 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 @@ -459610,7 +459610,7 @@ Signed-off-by: Phil Elwell 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 27baef62e942..6f8de700a3b9 100644 +index 27baef62e942b..6f8de700a3b9c 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -16,11 +16,13 @@ CONFIG_IKCONFIG=m @@ -459647,7 +459647,7 @@ index 27baef62e942..6f8de700a3b9 100644 CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 165afd913a4a..f0a7ef5d2e67 100644 +index 165afd913a4ac..f0a7ef5d2e673 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -16,11 +16,13 @@ CONFIG_IKCONFIG=m @@ -459683,7 +459683,7 @@ index 165afd913a4a..f0a7ef5d2e67 100644 CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 65283969c6f2..b5585e7c5e6b 100644 +index 65283969c6f28..b5585e7c5e6b8 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -15,9 +15,12 @@ CONFIG_IKCONFIG=m @@ -459719,7 +459719,7 @@ index 65283969c6f2..b5585e7c5e6b 100644 CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CBC=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 977b5ac32fa1..1dac44488fe0 100644 +index 977b5ac32fa14..1dac44488fe02 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -16,11 +16,13 @@ CONFIG_IKCONFIG=m @@ -459755,7 +459755,7 @@ index 977b5ac32fa1..1dac44488fe0 100644 CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 93c935bc9fb6..e5696e1c86c2 100644 +index 93c935bc9fb64..e5696e1c86c20 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -15,10 +15,13 @@ CONFIG_IKCONFIG=m @@ -459795,10 +459795,10 @@ index 93c935bc9fb6..e5696e1c86c2 100644 2.18.4 -From 745cc366bb0c5fd483a9be4ec4409f05d8915ec0 Mon Sep 17 00:00:00 2001 +From cc5d1877c1e428e375dbb50172a935fb491d50a0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 2 Sep 2020 08:39:57 +0100 -Subject: [PATCH 1101/1216] overlays: Minor README correction +Subject: [PATCH 1101/1224] overlays: Minor README correction Signed-off-by: Phil Elwell --- @@ -459806,7 +459806,7 @@ Signed-off-by: Phil Elwell 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index e2d90595c3c0..9662d297ac6f 100644 +index e2d90595c3c04..9662d297ac6fd 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -134,7 +134,7 @@ Params: @@ -459822,10 +459822,10 @@ index e2d90595c3c0..9662d297ac6f 100644 2.18.4 -From 57a20b6c261a1a9dd506cf300e35aea3b7384544 Mon Sep 17 00:00:00 2001 +From a5f759fd1be9c3de6e059defe97fd1e2542d4660 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 1 Sep 2020 18:15:27 +0100 -Subject: [PATCH 1102/1216] staging/fbtft: Add support for display variants +Subject: [PATCH 1102/1224] 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 @@ -459843,7 +459843,7 @@ Signed-off-by: Phil Elwell 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/drivers/staging/fbtft/fb_st7735r.c b/drivers/staging/fbtft/fb_st7735r.c -index 9670a8989b91..1a3219657cbb 100644 +index 9670a8989b917..1a3219657cbb2 100644 --- a/drivers/staging/fbtft/fb_st7735r.c +++ b/drivers/staging/fbtft/fb_st7735r.c @@ -16,6 +16,10 @@ @@ -459911,7 +459911,7 @@ index 9670a8989b91..1a3219657cbb 100644 MODULE_DESCRIPTION("FB driver for the ST7735R LCD Controller"); MODULE_AUTHOR("Noralf Tronnes"); diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c -index 61f0286fb157..132692211717 100644 +index 61f0286fb157e..132692211717c 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -24,6 +24,7 @@ @@ -459963,7 +459963,7 @@ index 61f0286fb157..132692211717 100644 info = fbtft_framebuffer_alloc(display, dev, pdata); diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h -index 9b6bdb62093d..c5703cd5ec7d 100644 +index 9b6bdb62093d7..c5703cd5ec7d8 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -251,7 +251,8 @@ void fbtft_register_backlight(struct fbtft_par *par); @@ -460036,10 +460036,10 @@ index 9b6bdb62093d..c5703cd5ec7d 100644 2.18.4 -From d8254b081f32cd0c887edfa706d84fa9a0f385a7 Mon Sep 17 00:00:00 2001 +From d4066ca8530f8d1e001d94e78a762114b892a2c4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 3 Sep 2020 17:36:00 +0100 -Subject: [PATCH 1103/1216] overlays: Add adafruit18 and sainsmart18 overlays +Subject: [PATCH 1103/1224] overlays: Add adafruit18 and sainsmart18 overlays Add support for three ST7735R-based displays - adafruit18, adafruit18_green and sainsmart18. @@ -460055,7 +460055,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm/boot/dts/overlays/sainsmart18-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index fa92793b2e7f..104b0a908f3c 100644 +index fa92793b2e7f1..104b0a908f3c2 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += overlay_map.dtb @@ -460075,7 +460075,7 @@ index fa92793b2e7f..104b0a908f3c 100644 sc16is752-i2c.dtbo \ sc16is752-spi0.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 9662d297ac6f..9b28b88fe60f 100644 +index 9662d297ac6fd..9b28b88fe60f0 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -261,6 +261,14 @@ Params: activelow Set to "on" to invert the sense of the LED @@ -460109,7 +460109,7 @@ index 9662d297ac6f..9b28b88fe60f 100644 Enables the chip on I2C1 at 0x48 (or the "addr" parameter value). To diff --git a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts new file mode 100644 -index 000000000000..bd2b1315d444 +index 0000000000000..bd2b1315d4441 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts @@ -0,0 +1,49 @@ @@ -460164,7 +460164,7 @@ index 000000000000..bd2b1315d444 +}; diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts new file mode 100644 -index 000000000000..38bbe2cfc207 +index 0000000000000..38bbe2cfc207a --- /dev/null +++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts @@ -0,0 +1,47 @@ @@ -460219,10 +460219,10 @@ index 000000000000..38bbe2cfc207 2.18.4 -From ac1960335708a40a142074da84d2b69327d0784c Mon Sep 17 00:00:00 2001 +From 3cf9324e23127933047784a814910ddfdf9ce8c5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 4 Sep 2020 09:04:29 +0100 -Subject: [PATCH 1104/1216] ARM: dts: Limit BT modem baud rate on 3B +Subject: [PATCH 1104/1224] 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 @@ -460235,7 +460235,7 @@ Signed-off-by: Phil Elwell 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts -index e833915a7854..7dc3ef47e78f 100644 +index e833915a7854d..7dc3ef47e78fd 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -117,6 +117,10 @@ @@ -460253,10 +460253,10 @@ index e833915a7854..7dc3ef47e78f 100644 2.18.4 -From 0fcca4f17fb809ca198ccde1b3fb4907f931bcfa Mon Sep 17 00:00:00 2001 +From bb43b681e5cd28cf448b93abc7c8365e9d034c93 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Sep 2020 13:47:20 +0100 -Subject: [PATCH 1105/1216] configs: Enable CHACHA20POLY1305=m +Subject: [PATCH 1105/1224] configs: Enable CHACHA20POLY1305=m Enable the CHACHA20 cipher, a high-performance AES alternative, and the POLY1305 authentication algorithm. Together they make up RFC-7539. @@ -460275,7 +460275,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 6f8de700a3b9..53557cce7584 100644 +index 6f8de700a3b9c..53557cce75845 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1448,6 +1448,7 @@ CONFIG_SECURITY=y @@ -460287,7 +460287,7 @@ index 6f8de700a3b9..53557cce7584 100644 CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index f0a7ef5d2e67..2014e5451ad3 100644 +index f0a7ef5d2e673..2014e5451ad36 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1486,6 +1486,7 @@ CONFIG_SECURITY=y @@ -460299,7 +460299,7 @@ index f0a7ef5d2e67..2014e5451ad3 100644 CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index b5585e7c5e6b..d112db106414 100644 +index b5585e7c5e6b8..d112db106414f 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1458,6 +1458,7 @@ CONFIG_SECURITY_APPARMOR=y @@ -460311,7 +460311,7 @@ index b5585e7c5e6b..d112db106414 100644 CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_XTS=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 1dac44488fe0..ba3afaa902b7 100644 +index 1dac44488fe02..ba3afaa902b7a 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1478,6 +1478,7 @@ CONFIG_SECURITY=y @@ -460323,7 +460323,7 @@ index 1dac44488fe0..ba3afaa902b7 100644 CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index e5696e1c86c2..a32bad78a0a3 100644 +index e5696e1c86c20..a32bad78a0a34 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1324,6 +1324,7 @@ CONFIG_SECURITY=y @@ -460338,10 +460338,10 @@ index e5696e1c86c2..a32bad78a0a3 100644 2.18.4 -From dd26ac28b0ff4bd5a13449ea1a7477b6d149e7e2 Mon Sep 17 00:00:00 2001 +From 1fa230c6fee1a1ae00434a80bae8ddc084e9d095 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 3 Sep 2020 14:59:40 +0100 -Subject: [PATCH 1106/1216] overlays: Update i2c0 overlay to disable the +Subject: [PATCH 1106/1224] overlays: Update i2c0 overlay to disable the i2c0mux. The i2c0 overlay was assigning pinctrl settings to node i2c0, @@ -460362,7 +460362,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 9b28b88fe60f..50d62cef1487 100644 +index 9b28b88fe60f0..50d62cef14879 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1354,6 +1354,13 @@ Name: i2c0 @@ -460380,7 +460380,7 @@ index 9b28b88fe60f..50d62cef1487 100644 Params: pins_0_1 Use pins 0 and 1 (default) pins_28_29 Use pins 28 and 29 diff --git a/arch/arm/boot/dts/overlays/i2c0-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-overlay.dts -index 6b1f9ec6c878..7c6771f84d8e 100644 +index 6b1f9ec6c8782..7c6771f84d8ed 100644 --- a/arch/arm/boot/dts/overlays/i2c0-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c0-overlay.dts @@ -5,7 +5,7 @@ @@ -460416,10 +460416,10 @@ index 6b1f9ec6c878..7c6771f84d8e 100644 2.18.4 -From c39549ccdd47b0593e8765ac2d0a06fee547768f Mon Sep 17 00:00:00 2001 +From d72f0336ae89e562710ba26e3a99415f1ebc5e08 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 3 Sep 2020 15:12:50 +0100 -Subject: [PATCH 1107/1216] dt: Remove duplicate assignment for i2c0 pinctrl +Subject: [PATCH 1107/1224] dt: Remove duplicate assignment for i2c0 pinctrl config The include file bcm283x-rpi-i2c0mux_0_XX.dtsi was setting @@ -460442,7 +460442,7 @@ Signed-off-by: Dave Stevenson 10 files changed, 40 deletions(-) diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts -index 0e137d85897b..98581eec4bdc 100644 +index 0e137d85897b6..98581eec4bdc2 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts @@ -73,10 +73,6 @@ @@ -460457,7 +460457,7 @@ index 0e137d85897b..98581eec4bdc 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts -index 47c093364683..305f1dbde60f 100644 +index 47c093364683b..305f1dbde60fd 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts @@ -73,10 +73,6 @@ @@ -460472,7 +460472,7 @@ index 47c093364683..305f1dbde60f 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts -index 5dcdf8888ec1..93062c4ffad2 100644 +index 5dcdf8888ec12..93062c4ffad20 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts @@ -72,10 +72,6 @@ @@ -460487,7 +460487,7 @@ index 5dcdf8888ec1..93062c4ffad2 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts -index 0060c9bfe2e6..f1bbed9fbf73 100644 +index 0060c9bfe2e68..f1bbed9fbf73c 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -122,10 +122,6 @@ @@ -460502,7 +460502,7 @@ index 0060c9bfe2e6..f1bbed9fbf73 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts -index 5655eb4769ea..e7578788b839 100644 +index 5655eb4769ea9..e7578788b8393 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -76,10 +76,6 @@ @@ -460517,7 +460517,7 @@ index 5655eb4769ea..e7578788b839 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts -index 77678a3d7ef9..6b2e3c291d72 100644 +index 77678a3d7ef91..6b2e3c291d721 100644 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts @@ -73,10 +73,6 @@ @@ -460532,7 +460532,7 @@ index 77678a3d7ef9..6b2e3c291d72 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts -index dd7e1897ea45..49cfda63606e 100644 +index dd7e1897ea456..49cfda63606e1 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts @@ -73,10 +73,6 @@ @@ -460547,7 +460547,7 @@ index dd7e1897ea45..49cfda63606e 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -index 0d6a47118b83..4e4e47100831 100644 +index 0d6a47118b83e..4e4e471008315 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -132,10 +132,6 @@ @@ -460562,7 +460562,7 @@ index 0d6a47118b83..4e4e47100831 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts -index 7dc3ef47e78f..8989c00b03e5 100644 +index 7dc3ef47e78fd..8989c00b03e54 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -147,10 +147,6 @@ @@ -460577,7 +460577,7 @@ index 7dc3ef47e78f..8989c00b03e5 100644 pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts -index 88f7fe53b97f..f972979281f5 100644 +index 88f7fe53b97f2..f972979281f52 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -92,10 +92,6 @@ @@ -460595,10 +460595,10 @@ index 88f7fe53b97f..f972979281f5 100644 2.18.4 -From 5af62c861a4392878131718896db5d0b7ce300dc Mon Sep 17 00:00:00 2001 +From ecc1319abbb744cd7f679e917189f6706c7c07c0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 27 Aug 2020 18:57:26 +0100 -Subject: [PATCH 1108/1216] overlays: Add option for composite to +Subject: [PATCH 1108/1224] overlays: Add option for composite to vc4-kms-v3d-pi4. Composite is an alternative to HDMI/DPI/DSI on Pi4 as it @@ -460615,7 +460615,7 @@ Signed-off-by: Dave Stevenson 2 files changed, 28 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 50d62cef1487..3e583922ac0d 100644 +index 50d62cef14879..3e583922ac0dd 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2924,6 +2924,8 @@ Params: cma-256 CMA is 256MB @@ -460628,7 +460628,7 @@ index 50d62cef1487..3e583922ac0d 100644 Name: vga666 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts -index 3c662cea4e1f..f721f12d729d 100644 +index 3c662cea4e1f0..f721f12d729d0 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts @@ -152,9 +152,35 @@ @@ -460671,17 +460671,17 @@ index 3c662cea4e1f..f721f12d729d 100644 2.18.4 -From 4d0931d012604222fef3ce826531a5607f6e750d Mon Sep 17 00:00:00 2001 +From dc57f0afc49972f4080592566fcf2aac14c21063 Mon Sep 17 00:00:00 2001 From: lsellens Date: Mon, 14 Sep 2020 22:35:39 -0500 -Subject: [PATCH 1109/1216] minor typo in directions +Subject: [PATCH 1109/1224] 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 +index 0b14981b4824e..77a7bbb41e3bd 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 @@ @@ -460697,10 +460697,10 @@ index 0b14981b4824..77a7bbb41e3b 100644 2.18.4 -From cb032b9104faebbdd9d9f3e8be5fc3a227ff7c15 Mon Sep 17 00:00:00 2001 +From b3c26a22ef2fc6a3b286622699b80119c82f97d1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 14 Sep 2020 15:49:38 +0100 -Subject: [PATCH 1110/1216] overlays: Regenerate upstream-pi4 overlay +Subject: [PATCH 1110/1224] overlays: Regenerate upstream-pi4 overlay Signed-off-by: Phil Elwell --- @@ -460708,7 +460708,7 @@ Signed-off-by: Phil Elwell 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 +index d88bbcfc36d10..5673f61b79518 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 @@ @@ -460734,10 +460734,10 @@ index d88bbcfc36d1..5673f61b7951 100644 2.18.4 -From 6e323e05f701cf9543a7df8989c0ae288aea7123 Mon Sep 17 00:00:00 2001 +From dbb6533dfb89b57b64a25f0d6b94f4033bd3626f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 14 Sep 2020 15:48:16 +0100 -Subject: [PATCH 1111/1216] overlays: Add parameters to adafruit18, sainsmart18 +Subject: [PATCH 1111/1224] overlays: Add parameters to adafruit18, sainsmart18 Also fix polarity of the reset GPIO. @@ -460749,7 +460749,7 @@ Signed-off-by: Phil Elwell 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 +index 3e583922ac0dd..9d21a3eb21dce 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 @@ -460780,7 +460780,7 @@ index 3e583922ac0d..9d21a3eb21dc 100644 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 +index bd2b1315d4441..aae485ab7d6ce 100644 --- a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts +++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts @@ -33,7 +33,7 @@ @@ -460808,7 +460808,7 @@ index bd2b1315d444..aae485ab7d6c 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts -index 38bbe2cfc207..ce2f942ba316 100644 +index 38bbe2cfc207a..ce2f942ba3162 100644 --- a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts +++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts @@ -33,7 +33,7 @@ @@ -460838,10 +460838,10 @@ index 38bbe2cfc207..ce2f942ba316 100644 2.18.4 -From 74f445ff763d02ce34951a694c3909aa29a2acbe Mon Sep 17 00:00:00 2001 +From b0481bb4c194dad6bc23055dfe8e50265d12513a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 21 Sep 2020 14:02:44 +0100 -Subject: [PATCH 1112/1216] rpivid_h265: Fix width/height typo +Subject: [PATCH 1112/1224] rpivid_h265: Fix width/height typo Signed-off-by: popcornmix --- @@ -460849,7 +460849,7 @@ Signed-off-by: popcornmix 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 +index 47d4de42c5844..b677910e237c6 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) @@ -460865,10 +460865,10 @@ index 47d4de42c584..b677910e237c 100644 2.18.4 -From 410a3eae11aa7e8bb675223c3ecb7e00d69783c7 Mon Sep 17 00:00:00 2001 +From 269121b3dd610c46120a54a61d9dde31a26e093c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 21 Sep 2020 22:00:10 +0100 -Subject: [PATCH 1113/1216] overlays: Add extra CMA sizes (up to 512M) +Subject: [PATCH 1113/1224] overlays: Add extra CMA sizes (up to 512M) Signed-off-by: Phil Elwell --- @@ -460877,7 +460877,7 @@ Signed-off-by: Phil Elwell 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 +index 9d21a3eb21dce..afd40f84a342d 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -582,7 +582,11 @@ Name: cma @@ -460933,7 +460933,7 @@ index 9d21a3eb21dc..afd40f84a342 100644 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 +index 4fbdf161672e3..1d87c599f909d 100644 --- a/arch/arm/boot/dts/overlays/cma-overlay.dts +++ b/arch/arm/boot/dts/overlays/cma-overlay.dts @@ -21,6 +21,10 @@ @@ -460951,10 +460951,10 @@ index 4fbdf161672e..1d87c599f909 100644 2.18.4 -From 30816c442842eecb1d4103df418364b765a41b79 Mon Sep 17 00:00:00 2001 +From e799405797b1648d1ce399ba283a200d7cffebcd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 21 Sep 2020 22:09:40 +0100 -Subject: [PATCH 1114/1216] overlays: Add note to BCM2711 overlays +Subject: [PATCH 1114/1224] overlays: Add note to BCM2711 overlays Signed-off-by: Phil Elwell --- @@ -460962,7 +460962,7 @@ Signed-off-by: Phil Elwell 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 +index afd40f84a342d..5118f477cc13e 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1403,7 +1403,7 @@ Load: @@ -461107,10 +461107,10 @@ index afd40f84a342..5118f477cc13 100644 2.18.4 -From 46d38d5717aa0c89c4c0d7a0db1ce53b98653ec9 Mon Sep 17 00:00:00 2001 +From 009287cf09056091744765f6de19a4df149d6f3a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 21 Sep 2020 20:45:46 +0100 -Subject: [PATCH 1115/1216] overlays: adafruit18,sainsmart18: default bgr to +Subject: [PATCH 1115/1224] overlays: adafruit18,sainsmart18: default bgr to off Signed-off-by: Phil Elwell @@ -461121,7 +461121,7 @@ Signed-off-by: Phil Elwell 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 +index 5118f477cc13e..8df8283a7677f 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. @@ -461143,7 +461143,7 @@ index 5118f477cc13..8df8283a7677 100644 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 +index aae485ab7d6ce..e1ce94a8cd3e2 100644 --- a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts +++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts @@ -36,7 +36,6 @@ @@ -461155,7 +461155,7 @@ index aae485ab7d6c..e1ce94a8cd3e 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts -index ce2f942ba316..c51f1c030a55 100644 +index ce2f942ba3162..c51f1c030a557 100644 --- a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts +++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts @@ -35,7 +35,6 @@ @@ -461170,10 +461170,10 @@ index ce2f942ba316..c51f1c030a55 100644 2.18.4 -From a2f039b6fbc0de62fa5773b23f7de24a28772fb7 Mon Sep 17 00:00:00 2001 +From 180eea7050de840961126f9b2b2cff157b4793fc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 25 Sep 2020 17:50:14 +0100 -Subject: [PATCH 1116/1216] configs: Remove I2C_BRCMSTB from the kernel +Subject: [PATCH 1116/1224] configs: Remove I2C_BRCMSTB from the kernel Make it a module on 2711-based platforms, otherwise delete it altogether, @@ -461188,7 +461188,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 53557cce7584..d2e674b2637e 100644 +index 53557cce75845..d2e674b2637e8 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -671,6 +671,7 @@ CONFIG_I2C_MUX_PCA954x=m @@ -461200,7 +461200,7 @@ index 53557cce7584..d2e674b2637e 100644 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 +index 2014e5451ad36..be6b167f6b4f3 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -681,6 +681,7 @@ CONFIG_I2C_MUX_PCA954x=m @@ -461212,7 +461212,7 @@ index 2014e5451ad3..be6b167f6b4f 100644 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 +index d112db106414f..23a0cb2d3ee32 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -665,6 +665,7 @@ CONFIG_I2C_MUX_PCA954x=m @@ -461224,7 +461224,7 @@ index d112db106414..23a0cb2d3ee3 100644 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 +index ba3afaa902b7a..31655187154fb 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -676,6 +676,7 @@ CONFIG_I2C_MUX_PCA954x=m @@ -461236,7 +461236,7 @@ index ba3afaa902b7..31655187154f 100644 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 +index a32bad78a0a34..7f159969011eb 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -652,6 +652,7 @@ CONFIG_I2C_MUX_PCA954x=m @@ -461251,10 +461251,10 @@ index a32bad78a0a3..7f159969011e 100644 2.18.4 -From 2f943ea2003b5fd1242fc814f816aa2429f0037c Mon Sep 17 00:00:00 2001 +From 8f4c2e9582d7eb25cc5ddd68c46ebefdc03df38c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 25 Sep 2020 15:07:23 +0100 -Subject: [PATCH 1117/1216] net: bcmgenet: Reset RBUF on first open +Subject: [PATCH 1117/1224] 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 @@ -461276,7 +461276,7 @@ Signed-off-by: Phil Elwell 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index aba145a144b4..d17f2a229ab9 100644 +index aba145a144b46..d17f2a229ab9f 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, @@ -461327,10 +461327,10 @@ index aba145a144b4..d17f2a229ab9 100644 2.18.4 -From e88a1cf754695761b789613aed4098d75b62bf4c Mon Sep 17 00:00:00 2001 +From 0bb303603d4a69d218ebb56bea1d04bcb1d99fca Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 29 Sep 2020 15:03:34 +0100 -Subject: [PATCH 1118/1216] ASoC: cs42xx8: Only define cs42xx8_of_match once +Subject: [PATCH 1118/1224] 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 @@ -461347,7 +461347,7 @@ Signed-off-by: Phil Elwell 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 +index a4586ea4acf6e..b8b15b886c224 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[] = { @@ -461376,10 +461376,10 @@ index a4586ea4acf6..b8b15b886c22 100644 2.18.4 -From 37d5478181fc12e650d959eaee55ea6b98247771 Mon Sep 17 00:00:00 2001 +From 281e54d5734b67d2f384d0ca36ce4ea4d6f5a921 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:28:37 +0100 -Subject: [PATCH 1119/1216] configs: Regenerate the defconfigs +Subject: [PATCH 1119/1224] configs: Regenerate the defconfigs Signed-off-by: Phil Elwell --- @@ -461389,7 +461389,7 @@ Signed-off-by: Phil Elwell 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 +index d2e674b2637e8..0862670c700c3 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -671,7 +671,7 @@ CONFIG_I2C_MUX_PCA954x=m @@ -461402,7 +461402,7 @@ index d2e674b2637e..0862670c700c 100644 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 +index 23a0cb2d3ee32..1dbac6d45cfea 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -665,7 +665,7 @@ CONFIG_I2C_MUX_PCA954x=m @@ -461415,7 +461415,7 @@ index 23a0cb2d3ee3..1dbac6d45cfe 100644 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 +index 7f159969011eb..c838461038e6d 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -652,7 +652,7 @@ CONFIG_I2C_MUX_PCA954x=m @@ -461431,10 +461431,10 @@ index 7f159969011e..c838461038e6 100644 2.18.4 -From baec2552feecf1d2267fe86e52f7309418325760 Mon Sep 17 00:00:00 2001 +From 3f8c07eb65d4bd38653c41c0da0ea91c3fbc8c73 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 30 Sep 2020 12:12:32 +0100 -Subject: [PATCH 1120/1216] staging: bcm2835-codec: Use a define the completion +Subject: [PATCH 1120/1224] staging: bcm2835-codec: Use a define the completion timeout Hiding a use of "HZ" as a timeout is a little nasty. @@ -461445,7 +461445,7 @@ Signed-off-by: Dave Stevenson 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 +index 14c47e2ea9955..f3dfc7fda8849 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[] = { @@ -461472,10 +461472,10 @@ index 14c47e2ea995..f3dfc7fda884 100644 2.18.4 -From 9f2b18e07b42cc9d0844cfeed692000d5a9ec3f3 Mon Sep 17 00:00:00 2001 +From bc1bea8bce1fa8c4c7bcd7baf917f61ae0845982 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 30 Sep 2020 12:13:44 +0100 -Subject: [PATCH 1121/1216] staging: bcm2835-codec: Correct buffer number +Subject: [PATCH 1121/1224] staging: bcm2835-codec: Correct buffer number change on start streaming "cac8c90 staging: vc04_service: codec: Allow start_streaming to update @@ -461492,7 +461492,7 @@ Signed-off-by: Dave Stevenson 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 +index f3dfc7fda8849..b1e00e65ce186 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, @@ -461508,10 +461508,10 @@ index f3dfc7fda884..b1e00e65ce18 100644 2.18.4 -From ecbb27eda26c7907790452044a83d5e51cc1d114 Mon Sep 17 00:00:00 2001 +From 8d17ab86cb8a183e64173941e8f82d949a300c22 Mon Sep 17 00:00:00 2001 From: Adrian Carpenter Date: Wed, 14 Aug 2019 15:33:36 +0100 -Subject: [PATCH 1122/1216] usb/dwc2: Set correct state on gadget disconnect +Subject: [PATCH 1122/1224] 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. --- @@ -461519,7 +461519,7 @@ When operating as a USB device, when the device is disconnected the suspend inte 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 +index 6272b4ae4740f..11c8893fbc1ab 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) @@ -461545,10 +461545,10 @@ index 6272b4ae4740..11c8893fbc1a 100644 2.18.4 -From 88aba664ac464604b1acd24537dc0f5901ed41ab Mon Sep 17 00:00:00 2001 +From 4665e0d5164be90feed2a64cc6ae2c81f64925a5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 19:23:43 +0100 -Subject: [PATCH 1123/1216] USB: gadget: f_hid: avoid crashes and log spam +Subject: [PATCH 1123/1224] 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. @@ -461561,7 +461561,7 @@ Signed-off-by: Phil Elwell 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 +index f3816a5c861ee..00fae22e941a9 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, @@ -461607,10 +461607,10 @@ index f3816a5c861e..00fae22e941a 100644 2.18.4 -From 37f8cb166689f17277be1a739e5af1d59b2e0f7b Mon Sep 17 00:00:00 2001 +From 61a3166ed274c0441dc34bd75d8c86f14b92013d Mon Sep 17 00:00:00 2001 From: newbloke82 <39644602+newbloke82@users.noreply.github.com> Date: Thu, 1 Oct 2020 19:16:35 +0200 -Subject: [PATCH 1124/1216] Update hy28b-overlay.dts +Subject: [PATCH 1124/1224] 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 --- @@ -461618,7 +461618,7 @@ My hy28b TFT stopped working on upgrade to 5.4 kernel. I had a whitescreen but 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 +index 2e5e20f327a3c..9edd0848d5550 100644 --- a/arch/arm/boot/dts/overlays/hy28b-overlay.dts +++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts @@ -61,7 +61,7 @@ @@ -461634,10 +461634,10 @@ index 2e5e20f327a3..9edd0848d555 100644 2.18.4 -From 9e26e853c92ed1663d8ccdc861c948931b1f4c9a Mon Sep 17 00:00:00 2001 +From 2ef9685f9e2391eabba6905c2c10f3aac1d6ffa9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 2 Oct 2020 10:06:49 +0100 -Subject: [PATCH 1125/1216] overlays: Update display GPIO declarations +Subject: [PATCH 1125/1224] 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 @@ -461663,7 +461663,7 @@ Signed-off-by: Phil Elwell 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 +index 8571527de49a6..a11d65f81c5ed 100644 --- a/arch/arm/boot/dts/overlays/goodix-overlay.dts +++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts @@ -31,7 +31,7 @@ @@ -461676,7 +461676,7 @@ index 8571527de49a..a11d65f81c5e 100644 }; }; diff --git a/arch/arm/boot/dts/overlays/hy28a-overlay.dts b/arch/arm/boot/dts/overlays/hy28a-overlay.dts -index aa6463e6e749..5843a5e9c86a 100644 +index aa6463e6e7497..5843a5e9c86a4 100644 --- a/arch/arm/boot/dts/overlays/hy28a-overlay.dts +++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts @@ -61,7 +61,7 @@ @@ -461689,7 +461689,7 @@ index aa6463e6e749..5843a5e9c86a 100644 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 +index 42b68b684bd0a..95bfb1eadc208 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 @@ @@ -461702,7 +461702,7 @@ index 42b68b684bd0..95bfb1eadc20 100644 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 +index 0fcdcfa18eb3b..1b56963f4f16b 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 @@ @@ -461727,7 +461727,7 @@ index 0fcdcfa18eb3..1b56963f4f16 100644 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 +index 32686968c0d65..6e00e8b2ddf2a 100644 --- a/arch/arm/boot/dts/overlays/mz61581-overlay.dts +++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts @@ -65,7 +65,7 @@ @@ -461740,7 +461740,7 @@ index 32686968c0d6..6e00e8b2ddf2 100644 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 +index ae1af76d3923f..1ac75a248fab5 100644 --- a/arch/arm/boot/dts/overlays/piscreen-overlay.dts +++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts @@ -59,9 +59,9 @@ @@ -461756,7 +461756,7 @@ index ae1af76d3923..1ac75a248fab 100644 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 +index 93b85be3f7c15..9d2b51101969e 100644 --- a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts +++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts @@ -59,9 +59,9 @@ @@ -461772,7 +461772,7 @@ index 93b85be3f7c1..9d2b51101969 100644 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 +index 70d7bb6faee94..57a0cc9b17410 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 @@ @@ -461785,7 +461785,7 @@ index 70d7bb6faee9..57a0cc9b1741 100644 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 +index 74635705273eb..ffc90c7cecf66 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 @@ @@ -461798,7 +461798,7 @@ index 74635705273e..ffc90c7cecf6 100644 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 +index 0eb1451b36c07..ffc872c60648f 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 @@ @@ -461811,7 +461811,7 @@ index 0eb1451b36c0..ffc872c60648 100644 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 +index 254ac2e0a2144..a102b09e3ab56 100644 --- a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts +++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts @@ -85,9 +85,9 @@ @@ -461830,10 +461830,10 @@ index 254ac2e0a214..a102b09e3ab5 100644 2.18.4 -From a636074bb6adb44866375fbb74918ca09e831201 Mon Sep 17 00:00:00 2001 +From 4d903975742d572f0a4dd974899b711b2d5a2029 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Oct 2020 15:41:15 +0100 -Subject: [PATCH 1126/1216] SQUASH: USB: gadget: f_hid: remove more spam +Subject: [PATCH 1126/1224] 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. @@ -461846,7 +461846,7 @@ Signed-off-by: Phil Elwell 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 +index 00fae22e941a9..4670ad21402db 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, @@ -461862,10 +461862,10 @@ index 00fae22e941a..4670ad21402d 100644 2.18.4 -From 8ad59ecaad50e8158524a5f84734a46ca818db7d Mon Sep 17 00:00:00 2001 +From 47139e49b2dc3679ea51d62fe544e7f5efe8d342 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Oct 2020 16:08:18 +0100 -Subject: [PATCH 1127/1216] configs: Add CONFIG_RTC_DRV_SD3078=m +Subject: [PATCH 1127/1224] configs: Add CONFIG_RTC_DRV_SD3078=m Enable the driver module for the SD3078 RTC. @@ -461881,7 +461881,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 0862670c700c..2c44682484bf 100644 +index 0862670c700c3..2c44682484bf5 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1241,6 +1241,7 @@ CONFIG_RTC_DRV_RX8581=m @@ -461893,7 +461893,7 @@ index 0862670c700c..2c44682484bf 100644 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 +index be6b167f6b4f3..9e1b4b9a19a5f 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1277,6 +1277,7 @@ CONFIG_RTC_DRV_RX8581=m @@ -461905,7 +461905,7 @@ index be6b167f6b4f..9e1b4b9a19a5 100644 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 +index 1dbac6d45cfea..e3b5ef7aa8765 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1251,6 +1251,7 @@ CONFIG_RTC_DRV_RX8581=m @@ -461917,7 +461917,7 @@ index 1dbac6d45cfe..e3b5ef7aa876 100644 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 +index 31655187154fb..006cc2f760b3e 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1270,6 +1270,7 @@ CONFIG_RTC_DRV_RX8581=m @@ -461929,7 +461929,7 @@ index 31655187154f..006cc2f760b3 100644 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 +index c838461038e6d..ee15660f83061 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1128,6 +1128,7 @@ CONFIG_RTC_DRV_RX8581=m @@ -461944,10 +461944,10 @@ index c838461038e6..ee15660f8306 100644 2.18.4 -From bb4b672581b09048f7257ede7265ba8f7131cbdf Mon Sep 17 00:00:00 2001 +From a9cf4e96d4be8879fbe55f5927179540c7198bda Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Oct 2020 16:10:26 +0100 -Subject: [PATCH 1128/1216] overlays: Add sd3078 to the i2c-rtc overlay +Subject: [PATCH 1128/1224] overlays: Add sd3078 to the i2c-rtc overlay Add support for the SD3078 RTC to the i2c-rtc overlay. @@ -461960,7 +461960,7 @@ Signed-off-by: Phil Elwell 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 +index 8df8283a7677f..0c33d39f6f3aa 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: @@ -461973,7 +461973,7 @@ index 8df8283a7677..0c33d39f6f3a 100644 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 +index df59d93cd759b..735ca303e4fa7 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 @@ @@ -462010,10 +462010,10 @@ index df59d93cd759..735ca303e4fa 100644 2.18.4 -From 6f61476900f9c7b0a501e5db5760931adeb38c5f Mon Sep 17 00:00:00 2001 +From 2ffaf5cc575017d53ba89bc915c06db7ff1d506a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Oct 2020 17:16:39 +0100 -Subject: [PATCH 1129/1216] configs: Restore SND_PCM_OSS=m +Subject: [PATCH 1129/1224] 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 @@ -462031,7 +462031,7 @@ Signed-off-by: Phil Elwell 5 files changed, 10 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 2c44682484bf..021985dcc1fd 100644 +index 2c44682484bf5..021985dcc1fd6 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -953,6 +953,8 @@ CONFIG_LOGO=y @@ -462044,7 +462044,7 @@ index 2c44682484bf..021985dcc1fd 100644 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 +index 9e1b4b9a19a5f..52129a7606798 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -967,6 +967,8 @@ CONFIG_LOGO=y @@ -462057,7 +462057,7 @@ index 9e1b4b9a19a5..52129a760679 100644 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 +index e3b5ef7aa8765..985fa8a129264 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -945,6 +945,8 @@ CONFIG_LOGO=y @@ -462070,7 +462070,7 @@ index e3b5ef7aa876..985fa8a12926 100644 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 +index 006cc2f760b3e..9557b03fac1b4 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -960,6 +960,8 @@ CONFIG_LOGO=y @@ -462083,7 +462083,7 @@ index 006cc2f760b3..9557b03fac1b 100644 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 +index ee15660f83061..32fbcba060987 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -869,6 +869,8 @@ CONFIG_LOGO=y @@ -462099,10 +462099,10 @@ index ee15660f8306..32fbcba06098 100644 2.18.4 -From a810e2096d04c9082b94722247eaeac1b8e847a6 Mon Sep 17 00:00:00 2001 +From 4c301a66b43de4342992553588d2145e0fad6f0a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 6 Oct 2020 11:44:16 +0100 -Subject: [PATCH 1130/1216] Revert "usb/dwc2: Set correct state on gadget +Subject: [PATCH 1130/1224] Revert "usb/dwc2: Set correct state on gadget disconnect" This reverts commit c3974850cc10de2596893eaec2f5c456e9ded6a0. @@ -462115,7 +462115,7 @@ Signed-off-by: Phil Elwell 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 +index 11c8893fbc1ab..6272b4ae4740f 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) @@ -462141,10 +462141,10 @@ index 11c8893fbc1a..6272b4ae4740 100644 2.18.4 -From 07385f89367e585eb3a128f7c009257863204e16 Mon Sep 17 00:00:00 2001 +From d7029dd54aacb352f6c51ab403bdb3040366bb40 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 7 Oct 2020 13:14:19 +0100 -Subject: [PATCH 1131/1216] configs: Add MEMCG_SWAP support initially disabled +Subject: [PATCH 1131/1224] 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. @@ -462161,7 +462161,7 @@ Signed-off-by: Phil Elwell 5 files changed, 10 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 021985dcc1fd..7368dff25c5c 100644 +index 021985dcc1fd6..7368dff25c5c6 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -15,6 +15,8 @@ CONFIG_TASK_IO_ACCOUNTING=y @@ -462174,7 +462174,7 @@ index 021985dcc1fd..7368dff25c5c 100644 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 +index 52129a7606798..efacba968d3fe 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -15,6 +15,8 @@ CONFIG_TASK_IO_ACCOUNTING=y @@ -462187,7 +462187,7 @@ index 52129a760679..efacba968d3f 100644 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 +index 985fa8a129264..e2e2168cd3f22 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -14,6 +14,8 @@ CONFIG_TASK_IO_ACCOUNTING=y @@ -462200,7 +462200,7 @@ index 985fa8a12926..e2e2168cd3f2 100644 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 +index 9557b03fac1b4..3dcc4ead364e5 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -15,6 +15,8 @@ CONFIG_TASK_IO_ACCOUNTING=y @@ -462213,7 +462213,7 @@ index 9557b03fac1b..3dcc4ead364e 100644 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 +index 32fbcba060987..6d9c9978ccb7e 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -14,6 +14,8 @@ CONFIG_TASK_IO_ACCOUNTING=y @@ -462229,10 +462229,10 @@ index 32fbcba06098..6d9c9978ccb7 100644 2.18.4 -From 7503126ac7bdde4b4172a9a4351b58b5280b5ac2 Mon Sep 17 00:00:00 2001 +From eba2de41d9d337df7cf079679c515c792efd5698 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 7 Oct 2020 15:09:29 +0100 -Subject: [PATCH 1132/1216] dwc_otg: initialise sched_frame for periodic QHs +Subject: [PATCH 1132/1224] 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 @@ -462249,7 +462249,7 @@ Signed-off-by: Jonathan Bell 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 +index 2823dc9af63f1..4503af692aefe 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) @@ -462268,10 +462268,10 @@ index 2823dc9af63f..4503af692aef 100644 2.18.4 -From d27388b79d779540395e7d272a8e0ac6d19758a5 Mon Sep 17 00:00:00 2001 +From 1a5af720c3ac4e654449ccec36a5faefc9f1d5be Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 8 Oct 2020 12:06:58 +0100 -Subject: [PATCH 1133/1216] arm64: configs: Enable Unicam support +Subject: [PATCH 1133/1224] arm64: configs: Enable Unicam support Enable the unicam module on 64 bit kernel builds. @@ -462282,7 +462282,7 @@ Signed-off-by: Kieran Bingham 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 3dcc4ead364e..7d7a62f80587 100644 +index 3dcc4ead364e5..7d7a62f805873 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -899,6 +899,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m @@ -462294,7 +462294,7 @@ index 3dcc4ead364e..7d7a62f80587 100644 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 +index 6d9c9978ccb7e..fceaba1e6630e 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -817,6 +817,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m @@ -462309,10 +462309,10 @@ index 6d9c9978ccb7..fceaba1e6630 100644 2.18.4 -From bebf392164c06824c7b6d61e181cc61f44df1b0b Mon Sep 17 00:00:00 2001 +From 039d6c0f32cb9ae6f464f9f811e3db0127a1118c Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 8 Oct 2020 12:07:16 +0100 -Subject: [PATCH 1134/1216] arm64: configs: Enable V4L2 test module support +Subject: [PATCH 1134/1224] arm64: configs: Enable V4L2 test module support Enable the v4l2 test modules on 64 bit kernel builds. @@ -462323,7 +462323,7 @@ Signed-off-by: Kieran Bingham 2 files changed, 10 insertions(+) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 7d7a62f80587..78233d8d2e35 100644 +index 7d7a62f805873..78233d8d2e350 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -900,6 +900,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m @@ -462339,7 +462339,7 @@ index 7d7a62f80587..78233d8d2e35 100644 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 +index fceaba1e6630e..a4db167942854 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -818,6 +818,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m @@ -462358,10 +462358,10 @@ index fceaba1e6630..a4db16794285 100644 2.18.4 -From 54a83ca6133325da0412c0c8af4ad742f97e2205 Mon Sep 17 00:00:00 2001 +From 24c4081c9718c047bc040a5a4f8e157725375e39 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Oct 2020 15:35:14 +0100 -Subject: [PATCH 1135/1216] staging: bcm2835-camera: Replace deprecated +Subject: [PATCH 1135/1224] staging: bcm2835-camera: Replace deprecated V4L2_PIX_FMT_BGR32 V4L2_PIX_FMT_BGR32 is deprecated as it is ambiguous over where @@ -462378,7 +462378,7 @@ Signed-off-by: Dave Stevenson 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 +index b7214741fa613..da14f1fb86640 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[] = { @@ -462394,10 +462394,10 @@ index b7214741fa61..da14f1fb8664 100644 2.18.4 -From 8405ab5c6328a8f8df0a69215ee006b39cb830ed Mon Sep 17 00:00:00 2001 +From ed9c141cd6c4ac0bd2e597ead34c8f7cc235e977 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 8 Oct 2020 16:06:59 +0100 -Subject: [PATCH 1136/1216] staging: bcm2835-codec: Replace deprecated +Subject: [PATCH 1136/1224] staging: bcm2835-codec: Replace deprecated V4L2_PIX_FMT_BGR32 V4L2_PIX_FMT_BGR32 is deprecated as it is ambiguous over where @@ -462411,7 +462411,7 @@ Signed-off-by: Dave Stevenson 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 +index b1e00e65ce186..eefe8e101f96a 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[] = { @@ -462427,10 +462427,10 @@ index b1e00e65ce18..eefe8e101f96 100644 2.18.4 -From ba6ca3c9404a66246041c7c0e0cb01f4456a68a0 Mon Sep 17 00:00:00 2001 +From 76106ad1d91cac654140fa6d1093e25beb1f3003 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 12 Oct 2020 14:36:35 +0100 -Subject: [PATCH 1137/1216] ARM: bcm2711-rpi.dts: Unlock DMA channels 9 & 10 +Subject: [PATCH 1137/1224] 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 @@ -462444,7 +462444,7 @@ Signed-off-by: Phil Elwell 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 +index 0556c73e332aa..0c586d9ea6f8d 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -246,13 +246,8 @@ @@ -462466,10 +462466,10 @@ index 0556c73e332a..0c586d9ea6f8 100644 2.18.4 -From c94784b96a4f4443a06bf8cb21a2434b3fef2b7c Mon Sep 17 00:00:00 2001 +From a389efca7a13d8faac3340cf531df51e19cdae11 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:00:54 +0100 -Subject: [PATCH 1138/1216] gpio: Add gpio-fsm driver +Subject: [PATCH 1138/1224] 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 @@ -462491,7 +462491,7 @@ Signed-off-by: Phil Elwell create mode 100644 include/dt-bindings/gpio/gpio-fsm.h diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index a4fe9a954b88..7f9c5df745e9 100644 +index a4fe9a954b882..7f9c5df745e95 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1071,6 +1071,15 @@ config HTC_EGPIO @@ -462511,7 +462511,7 @@ index a4fe9a954b88..7f9c5df745e9 100644 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 +index 86edbc79e5956..49a763681c05f 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -55,6 +55,7 @@ obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o @@ -462524,7 +462524,7 @@ index 86edbc79e595..49a763681c05 100644 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 +index 0000000000000..eb8b4d58d2d0a --- /dev/null +++ b/drivers/gpio/gpio-fsm.c @@ -0,0 +1,1103 @@ @@ -463633,7 +463633,7 @@ index 000000000000..eb8b4d58d2d0 +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 +index 0000000000000..eb40cfdc71dfe --- /dev/null +++ b/include/dt-bindings/gpio/gpio-fsm.h @@ -0,0 +1,21 @@ @@ -463662,10 +463662,10 @@ index 000000000000..eb40cfdc71df 2.18.4 -From 0a0748612567bc99bc45c037e2cf9382c89c26a6 Mon Sep 17 00:00:00 2001 +From eee0365dc812f3299aa53423a07f30113a0e7816 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:18:45 +0100 -Subject: [PATCH 1139/1216] configs: Add CONFIG_GPIO_FSM=m +Subject: [PATCH 1139/1224] configs: Add CONFIG_GPIO_FSM=m Enable the gpio-fsm module. @@ -463679,7 +463679,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 7368dff25c5c..350461728d8f 100644 +index 7368dff25c5c6..350461728d8f6 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -692,6 +692,7 @@ CONFIG_GPIO_BCM_VIRT=y @@ -463691,7 +463691,7 @@ index 7368dff25c5c..350461728d8f 100644 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 +index efacba968d3fe..d9dc636eb222a 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -702,6 +702,7 @@ CONFIG_GPIO_BCM_VIRT=y @@ -463703,7 +463703,7 @@ index efacba968d3f..d9dc636eb222 100644 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 +index e2e2168cd3f22..67d7bb17b5961 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -685,6 +685,7 @@ CONFIG_GPIO_SYSFS=y @@ -463715,7 +463715,7 @@ index e2e2168cd3f2..67d7bb17b596 100644 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 +index 78233d8d2e350..60e1cb88fe8cf 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -697,6 +697,7 @@ CONFIG_GPIO_BCM_VIRT=y @@ -463727,7 +463727,7 @@ index 78233d8d2e35..60e1cb88fe8c 100644 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 +index a4db167942854..54579a7451765 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -667,6 +667,7 @@ CONFIG_GPIO_SYSFS=y @@ -463742,10 +463742,10 @@ index a4db16794285..54579a745176 100644 2.18.4 -From c4825aeba5c8b0844a86ffc4fa3082fba56cb1a5 Mon Sep 17 00:00:00 2001 +From 99e0db4a3b67acf671f81e2851852e3db54b0513 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:08:08 +0100 -Subject: [PATCH 1140/1216] overlays: Add fsm-demo overlay +Subject: [PATCH 1140/1224] 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 @@ -463760,7 +463760,7 @@ Signed-off-by: Phil Elwell 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 +index 104b0a908f3c2..90c9baefc41df 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -44,6 +44,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -463772,7 +463772,7 @@ index 104b0a908f3c..90c9baefc41d 100644 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 +index 0c33d39f6f3aa..6b61b0255fd76 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -767,6 +767,14 @@ Load: dtoverlay=fe-pi-audio @@ -463792,7 +463792,7 @@ index 0c33d39f6f3a..6b61b0255fd7 100644 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 +index 0000000000000..9e06e388e4d32 --- /dev/null +++ b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts @@ -0,0 +1,104 @@ @@ -463904,10 +463904,10 @@ index 000000000000..9e06e388e4d3 2.18.4 -From 45ca5d94e3e66fb0d5030c0f4043cc26c262e8c3 Mon Sep 17 00:00:00 2001 +From 9b05c1971ab7262d8830e5d8b95497ce8c862ec6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Sep 2020 12:17:48 +0100 -Subject: [PATCH 1141/1216] overlays: Add ghost-amp overlay +Subject: [PATCH 1141/1224] overlays: Add ghost-amp overlay Add an overlay for the Ghost amplifier. @@ -463920,7 +463920,7 @@ Signed-off-by: Phil Elwell 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 +index 90c9baefc41df..ab9fa47c8876c 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -45,6 +45,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -463932,7 +463932,7 @@ index 90c9baefc41d..ab9fa47c8876 100644 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 +index 6b61b0255fd76..eff90baed4068 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -775,6 +775,13 @@ Load: dtoverlay=fsm-demo,= @@ -463951,7 +463951,7 @@ index 6b61b0255fd7..eff90baed406 100644 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 +index 0000000000000..afc9f034b5fcb --- /dev/null +++ b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts @@ -0,0 +1,119 @@ @@ -464078,10 +464078,10 @@ index 000000000000..afc9f034b5fc 2.18.4 -From 318329fd14a9ad83e7d1a0c8544ad41c8bb9a911 Mon Sep 17 00:00:00 2001 +From 63cf5f88f029e182e02b984c2842dc36c413fc03 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Thu, 6 Aug 2020 11:17:13 -0700 -Subject: [PATCH 1142/1216] Bluetooth: Disable High Speed by default +Subject: [PATCH 1142/1224] Bluetooth: Disable High Speed by default commit b176dd0ef6afcb3bca24f41d78b0d0b731ec2d08 upstream. @@ -464095,7 +464095,7 @@ Signed-off-by: Marcel Holtmann 1 file changed, 1 deletion(-) diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig -index 3803135c88ff..340f169f6d54 100644 +index 3803135c88ff4..340f169f6d547 100644 --- a/net/bluetooth/Kconfig +++ b/net/bluetooth/Kconfig @@ -64,7 +64,6 @@ source "net/bluetooth/hidp/Kconfig" @@ -464110,10 +464110,10 @@ index 3803135c88ff..340f169f6d54 100644 2.18.4 -From 87760c323024ee740bb1ead5032dd84513fa388a Mon Sep 17 00:00:00 2001 +From 8f4c239915af15e69c0aed2cf230473c71ea425b Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Fri, 16 Oct 2020 15:17:07 +0200 -Subject: [PATCH 1143/1216] Fixes a problem when module probes before i2c +Subject: [PATCH 1143/1224] Fixes a problem when module probes before i2c module is available The driver crashed while a NULL pointer returned by i2c_get_adapter() @@ -464127,7 +464127,7 @@ Signed-off-by: Joerg Schambacher 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 +index 286a62c3ff487..2f1b1ef4191a5 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) @@ -464162,10 +464162,10 @@ index 286a62c3ff48..2f1b1ef4191a 100644 2.18.4 -From 17d2eea70adfb4f20d3d00f0fb66bcf34727f518 Mon Sep 17 00:00:00 2001 +From 2c24e2ffd112395c323ce14153d26599a10c79ae Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 15 Oct 2020 11:59:02 +0100 -Subject: [PATCH 1144/1216] uapi: Update V4L2_CID_USER_BCM2835_ISP_BASE due to +Subject: [PATCH 1144/1224] uapi: Update V4L2_CID_USER_BCM2835_ISP_BASE due to upstream change Commit "4e52889 media: atmel: atmel-isc-base: expose white @@ -464185,7 +464185,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h -index b6173d8c38f1..9afecc81b883 100644 +index b6173d8c38f18..9afecc81b883b 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -192,9 +192,15 @@ enum v4l2_colorfx { @@ -464209,10 +464209,10 @@ index b6173d8c38f1..9afecc81b883 100644 2.18.4 -From 00ac0afe15a6e2e6517cf287d03419382d2b889f Mon Sep 17 00:00:00 2001 +From 5521c7aecbd7a25940f26e69d56ddec3fe7719ec Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Oct 2020 18:33:02 +0100 -Subject: [PATCH 1145/1216] dtoverlays: Correct CSI2 settings for ov9281 +Subject: [PATCH 1145/1224] dtoverlays: Correct CSI2 settings for ov9281 OV9281 appears to drop the clock to LP mode between frames, but the overlay didn't define this at both ends of the CSI2 link. @@ -464227,7 +464227,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts -index 4411c9d96564..40b298d3dd86 100644 +index 4411c9d965646..40b298d3dd86d 100644 --- a/arch/arm/boot/dts/overlays/ov9281-overlay.dts +++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts @@ -34,7 +34,7 @@ @@ -464251,10 +464251,10 @@ index 4411c9d96564..40b298d3dd86 100644 2.18.4 -From 76c27f70209361495a2ea4f1638613682c4859bb Mon Sep 17 00:00:00 2001 +From 70251b0e1d80b012753b81a721d4b113a3c12e2a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 23 Oct 2020 15:45:11 +0100 -Subject: [PATCH 1146/1216] dts: Add CM4 to arm64 dt files +Subject: [PATCH 1146/1224] dts: Add CM4 to arm64 dt files Signed-off-by: Dave Stevenson --- @@ -464264,7 +464264,7 @@ Signed-off-by: Dave Stevenson create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index c3eaf8d63ee4..1e861e2bf2e0 100644 +index c3eaf8d63ee4a..1e861e2bf2e0e 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -7,7 +7,8 @@ dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-2-b.dtb @@ -464279,7 +464279,7 @@ index c3eaf8d63ee4..1e861e2bf2e0 100644 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts new file mode 100644 -index 000000000000..8064a58155f1 +index 0000000000000..8064a58155f1b --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts @@ -0,0 +1 @@ @@ -464288,10 +464288,10 @@ index 000000000000..8064a58155f1 2.18.4 -From bd50cc3ae5cc85b20caa6fad2cfd083189249dcb Mon Sep 17 00:00:00 2001 +From b36708055a41cbbae3182a3ad89ccbfd03952aa6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 15:01:21 +0000 -Subject: [PATCH 1147/1216] dts: Tidy the Raspberry Pi Makefile entries +Subject: [PATCH 1147/1224] dts: Tidy the Raspberry Pi Makefile entries Signed-off-by: Phil Elwell --- @@ -464300,7 +464300,7 @@ Signed-off-by: Phil Elwell 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 477108fe0404..325f1ceccad9 100644 +index 477108fe04043..325f1ceccad97 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -10,8 +10,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -464314,7 +464314,7 @@ index 477108fe0404..325f1ceccad9 100644 bcm2711-rpi-cm4.dtb diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index 1e861e2bf2e0..996e670a6018 100644 +index 1e861e2bf2e0e..996e670a60183 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -3,15 +3,12 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-a-plus.dtb \ @@ -464339,10 +464339,10 @@ index 1e861e2bf2e0..996e670a6018 100644 2.18.4 -From 2eea99622a6427fe58fbfdcda26d132076ef063e Mon Sep 17 00:00:00 2001 +From f8f421c6c5e3fdfa9952c50b8efdbdc3b691d033 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:23:22 +0000 -Subject: [PATCH 1148/1216] staging: bcm2835-audio: Add disable-headphones flag +Subject: [PATCH 1148/1224] staging: bcm2835-audio: Add disable-headphones flag Add a property to allow the headphone output to be disabled. Use an integer property rather than a boolean so that an overlay can clear it. @@ -464353,7 +464353,7 @@ Signed-off-by: Phil Elwell 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index b9716f3e264c..092ccbfd5243 100644 +index b9716f3e264c6..092ccbfd52430 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -381,11 +381,16 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev) @@ -464379,10 +464379,10 @@ index b9716f3e264c..092ccbfd5243 100644 2.18.4 -From 8330e116746b7996a4ff4de5e0c3169dea65d292 Mon Sep 17 00:00:00 2001 +From 55a5c34323d56d33f9991e3215796ee28161be84 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:18:50 +0000 -Subject: [PATCH 1149/1216] ARM: dts: Disable headphone audio on Zeroes, CM4 +Subject: [PATCH 1149/1224] ARM: dts: Disable headphone audio on Zeroes, CM4 Signed-off-by: Phil Elwell --- @@ -464392,7 +464392,7 @@ Signed-off-by: Phil Elwell 3 files changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts -index f1bbed9fbf73..80263a42aebf 100644 +index f1bbed9fbf73c..80263a42aebf3 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -152,6 +152,7 @@ @@ -464404,7 +464404,7 @@ index f1bbed9fbf73..80263a42aebf 100644 / { diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts -index e7578788b839..5b1332ace9b8 100644 +index e7578788b8393..5b1332ace9b8a 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -106,6 +106,7 @@ @@ -464416,7 +464416,7 @@ index e7578788b839..5b1332ace9b8 100644 / { diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index d4ea928e30ce..3ff0be02cb34 100644 +index d4ea928e30ce6..3ff0be02cb34c 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -460,6 +460,7 @@ @@ -464431,10 +464431,10 @@ index d4ea928e30ce..3ff0be02cb34 100644 2.18.4 -From 65a697b9141ab956daad094f9954df32575947e0 Mon Sep 17 00:00:00 2001 +From a380aee5261a2922eb551d6d3abc6a2dfaeb1e0e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Oct 2020 10:21:23 +0000 -Subject: [PATCH 1150/1216] overlays: Enable headphone audio in audremap +Subject: [PATCH 1150/1224] overlays: Enable headphone audio in audremap Signed-off-by: Phil Elwell --- @@ -464442,7 +464442,7 @@ Signed-off-by: Phil Elwell 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/overlays/audremap-overlay.dts b/arch/arm/boot/dts/overlays/audremap-overlay.dts -index d624bb3a3fea..7324890ead86 100644 +index d624bb3a3feaf..7324890ead869 100644 --- a/arch/arm/boot/dts/overlays/audremap-overlay.dts +++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts @@ -26,6 +26,13 @@ @@ -464463,10 +464463,10 @@ index d624bb3a3fea..7324890ead86 100644 2.18.4 -From b86db4919a6ebb1187af15e0a173f785630c3212 Mon Sep 17 00:00:00 2001 +From cedcc8103a6d449f95d86971abaf4b2b494ea6e2 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 26 Oct 2020 16:38:21 +0000 -Subject: [PATCH 1151/1216] rpisense-fb: Set pseudo_pallete to prevent crash on +Subject: [PATCH 1151/1224] rpisense-fb: Set pseudo_pallete to prevent crash on fbcon takeover Signed-off-by: Serge Schneider @@ -464475,7 +464475,7 @@ Signed-off-by: Serge Schneider 1 file changed, 3 insertions(+) diff --git a/drivers/video/fbdev/rpisense-fb.c b/drivers/video/fbdev/rpisense-fb.c -index 26432a5a0b4b..325977def531 100644 +index 26432a5a0b4b4..325977def5311 100644 --- a/drivers/video/fbdev/rpisense-fb.c +++ b/drivers/video/fbdev/rpisense-fb.c @@ -52,6 +52,8 @@ static u8 gamma_low[32] = {0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, @@ -464499,10 +464499,10 @@ index 26432a5a0b4b..325977def531 100644 2.18.4 -From 3d85263fa1b2de431aea07eefe64f20cd78599e3 Mon Sep 17 00:00:00 2001 +From 47e8ebd4ced26f5c575f387d40df4ee061f45ae7 Mon Sep 17 00:00:00 2001 From: David Knell Date: Wed, 28 Oct 2020 14:18:42 +0000 -Subject: [PATCH 1152/1216] PiFi-40 defconfigs +Subject: [PATCH 1152/1224] PiFi-40 defconfigs Signed-off-by: David Knell --- @@ -464514,7 +464514,7 @@ Signed-off-by: David Knell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 350461728d8f..6b3d27193be4 100644 +index 350461728d8f6..6b3d27193be43 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -984,6 +984,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m @@ -464526,7 +464526,7 @@ index 350461728d8f..6b3d27193be4 100644 CONFIG_SND_BCM2708_SOC_RPI_DAC=m CONFIG_SND_BCM2708_SOC_RPI_PROTO=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index d9dc636eb222..5b826bc26c30 100644 +index d9dc636eb222a..5b826bc26c309 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -998,6 +998,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m @@ -464538,7 +464538,7 @@ index d9dc636eb222..5b826bc26c30 100644 CONFIG_SND_BCM2708_SOC_RPI_DAC=m CONFIG_SND_BCM2708_SOC_RPI_PROTO=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 67d7bb17b596..1beb2c61e519 100644 +index 67d7bb17b5961..1beb2c61e519e 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -976,6 +976,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m @@ -464550,7 +464550,7 @@ index 67d7bb17b596..1beb2c61e519 100644 CONFIG_SND_BCM2708_SOC_RPI_DAC=m CONFIG_SND_BCM2708_SOC_RPI_PROTO=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 60e1cb88fe8c..22ba4d32f786 100644 +index 60e1cb88fe8cf..22ba4d32f7862 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -997,6 +997,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m @@ -464562,7 +464562,7 @@ index 60e1cb88fe8c..22ba4d32f786 100644 CONFIG_SND_BCM2708_SOC_RPI_DAC=m CONFIG_SND_BCM2708_SOC_RPI_PROTO=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 54579a745176..a91f46b4a45c 100644 +index 54579a7451765..a91f46b4a45c7 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -904,6 +904,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m @@ -464577,10 +464577,10 @@ index 54579a745176..a91f46b4a45c 100644 2.18.4 -From e72aeb575378c44f57c2e1e87d77585433a4efd2 Mon Sep 17 00:00:00 2001 +From f3e9cb928ad02d41345a8c88d5d9e578b83a4de9 Mon Sep 17 00:00:00 2001 From: David Knell Date: Wed, 28 Oct 2020 14:20:56 +0000 -Subject: [PATCH 1153/1216] PiFi-40 Devicetree files +Subject: [PATCH 1153/1224] PiFi-40 Devicetree files Signed-off-by: David Knell --- @@ -464591,7 +464591,7 @@ Signed-off-by: David Knell create mode 100644 arch/arm/boot/dts/overlays/pifi-40-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index ab9fa47c8876..fbb7ed1ba55b 100644 +index ab9fa47c8876c..fbb7ed1ba55b1 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -125,6 +125,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -464603,7 +464603,7 @@ index ab9fa47c8876..fbb7ed1ba55b 100644 piscreen.dtbo \ piscreen2r.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index eff90baed406..c709c4b89c15 100644 +index eff90baed4068..c709c4b89c155 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2000,6 +2000,12 @@ Params: spi-present-mask 8-bit integer, bitmap indicating MCP23S17 SPI0 @@ -464621,7 +464621,7 @@ index eff90baed406..c709c4b89c15 100644 Load: dtoverlay=piglow diff --git a/arch/arm/boot/dts/overlays/pifi-40-overlay.dts b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts new file mode 100644 -index 000000000000..51a20e54977f +index 0000000000000..51a20e54977fe --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts @@ -0,0 +1,50 @@ @@ -464679,10 +464679,10 @@ index 000000000000..51a20e54977f 2.18.4 -From 037256c4b903e321a148aa6a47ccf88b1bfb10a0 Mon Sep 17 00:00:00 2001 +From 786104a49839b5b43009fd0945fd24cc0b532405 Mon Sep 17 00:00:00 2001 From: David Knell Date: Wed, 28 Oct 2020 14:21:37 +0000 -Subject: [PATCH 1154/1216] PiFi-40 driver, Makefile and Kconfig +Subject: [PATCH 1154/1224] PiFi-40 driver, Makefile and Kconfig Signed-off-by: David Knell --- @@ -464693,7 +464693,7 @@ Signed-off-by: David Knell create mode 100644 sound/soc/bcm/pifi-40.c diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index 5ec58ef9cbe6..7433e6f15cd7 100644 +index 5ec58ef9cbe66..7433e6f15cd7c 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -91,6 +91,14 @@ config SND_BCM2708_SOC_HIFIBERRY_AMP @@ -464712,7 +464712,7 @@ index 5ec58ef9cbe6..7433e6f15cd7 100644 tristate "Support for Cirrus Logic Audio Card" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index cab392690974..00a983355b91 100644 +index cab3926909740..00a983355b911 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -40,6 +40,7 @@ snd-soc-pisound-objs := pisound.o @@ -464731,7 +464731,7 @@ index cab392690974..00a983355b91 100644 + diff --git a/sound/soc/bcm/pifi-40.c b/sound/soc/bcm/pifi-40.c new file mode 100644 -index 000000000000..dbb9dd0dbe94 +index 0000000000000..dbb9dd0dbe949 --- /dev/null +++ b/sound/soc/bcm/pifi-40.c @@ -0,0 +1,282 @@ @@ -465021,10 +465021,10 @@ index 000000000000..dbb9dd0dbe94 2.18.4 -From 5f9515ee70fc432a0ae3156e65d8f1bff51e81fa Mon Sep 17 00:00:00 2001 +From 097d25a5ab11b552bdefffe4a8a40a2fb7447f77 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 09:59:49 +0000 -Subject: [PATCH 1155/1216] dwc_otg: Minimise header and fix build warnings +Subject: [PATCH 1155/1224] dwc_otg: Minimise header and fix build warnings Delete a large amount of unused declaration from "usb.h", some of which were causing build warnings, and get the module building cleanly. @@ -465037,7 +465037,7 @@ Signed-off-by: Phil Elwell 3 files changed, 3 insertions(+), 667 deletions(-) diff --git a/drivers/usb/host/dwc_common_port/usb.h b/drivers/usb/host/dwc_common_port/usb.h -index 27bda82dac2e..f78593575736 100644 +index 27bda82dac2eb..f785935757368 100644 --- a/drivers/usb/host/dwc_common_port/usb.h +++ b/drivers/usb/host/dwc_common_port/usb.h @@ -55,12 +55,6 @@ typedef u_int8_t uByte; @@ -465747,7 +465747,7 @@ index 27bda82dac2e..f78593575736 100644 #include #endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c -index eda7a33908b3..50c8705185ad 100644 +index eda7a33908b33..50c8705185ad8 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c @@ -482,8 +482,8 @@ static void hcd_init_fiq(void *cookie) @@ -465762,7 +465762,7 @@ index eda7a33908b3..50c8705185ad 100644 dwc_otg_hcd->fiq_state->mphi_regs.ctrl = otg_dev->os_dep.mphi_base + 0x4c; diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c -index e55ea9c74be4..76e94b4ebb43 100644 +index e55ea9c74be46..76e94b4ebb43a 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c @@ -3377,7 +3377,7 @@ void predict_nextep_seq( dwc_otg_core_if_t * core_if) @@ -465778,10 +465778,10 @@ index e55ea9c74be4..76e94b4ebb43 100644 2.18.4 -From 83e642e9fadc62013412c9d70837bee5ee3d6863 Mon Sep 17 00:00:00 2001 +From c2d1108a1ca3bf7526ee40ab69df7f4f99a6fc59 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:10:04 +0000 -Subject: [PATCH 1156/1216] gpio-fsm: Fix a build warning +Subject: [PATCH 1156/1224] gpio-fsm: Fix a build warning Signed-off-by: Phil Elwell --- @@ -465789,7 +465789,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-fsm.c b/drivers/gpio/gpio-fsm.c -index eb8b4d58d2d0..2cab50e51315 100644 +index eb8b4d58d2d0a..2cab50e513152 100644 --- a/drivers/gpio/gpio-fsm.c +++ b/drivers/gpio/gpio-fsm.c @@ -956,7 +956,8 @@ static int gpio_fsm_probe(struct platform_device *pdev) @@ -465806,10 +465806,10 @@ index eb8b4d58d2d0..2cab50e51315 100644 2.18.4 -From 4e44c05b18767a7dd4c7e200f61792a946db51ee Mon Sep 17 00:00:00 2001 +From 42389c16b70b01d0e280c1063143b56aabddc224 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:10:40 +0000 -Subject: [PATCH 1157/1216] rpivid_h625: Fix build warnings +Subject: [PATCH 1157/1224] rpivid_h625: Fix build warnings Signed-off-by: Phil Elwell --- @@ -465817,7 +465817,7 @@ Signed-off-by: Phil Elwell 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c -index b677910e237c..fc3caed58187 100644 +index b677910e237c6..fc3caed581873 100644 --- a/drivers/staging/media/rpivid/rpivid_h265.c +++ b/drivers/staging/media/rpivid/rpivid_h265.c @@ -1341,10 +1341,10 @@ static int frame_end(struct rpivid_dev *const dev, @@ -465880,10 +465880,10 @@ index b677910e237c..fc3caed58187 100644 2.18.4 -From e628a1a5a19d7cf56ed5a4bc4e48429be7867314 Mon Sep 17 00:00:00 2001 +From b47fe81455e235b811208ab241397edd4fcc5151 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:11:56 +0000 -Subject: [PATCH 1158/1216] dwc_otg: Fix more build warnings +Subject: [PATCH 1158/1224] dwc_otg: Fix more build warnings Signed-off-by: Phil Elwell --- @@ -465894,7 +465894,7 @@ Signed-off-by: Phil Elwell 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c -index 490a7801e737..f644acbce748 100644 +index 490a7801e737e..f644acbce748f 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c @@ -240,7 +240,8 @@ static int notrace fiq_increment_dma_buf(struct fiq_state *st, int num_channels, @@ -465936,7 +465936,7 @@ index 490a7801e737..f644acbce748 100644 //hcdma.d32 += st->channel[n].dma_info.slot_len[i]; fiq_print(FIQDBG_INT, st, "LAST: %01d ", last); diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c -index 0f6645e2383c..e42d8ca89c01 100644 +index 0f6645e2383c0..e42d8ca89c013 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c @@ -1270,7 +1270,8 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh) @@ -466005,7 +466005,7 @@ index 0f6645e2383c..e42d8ca89c01 100644 /* fixup xfersize to the actual packet size */ st->hctsiz_copy.b.pid = 0; diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c -index bd8a20403713..2fd96e56e412 100644 +index bd8a204037134..2fd96e56e4129 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c @@ -620,7 +620,8 @@ static void init_non_isoc_dma_desc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh) @@ -466019,7 +466019,7 @@ index bd8a20403713..2fd96e56e412 100644 } diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c -index d3097ef3728c..9d49b2b33227 100644 +index d3097ef3728ca..9d49b2b332276 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c @@ -1857,10 +1857,10 @@ static int32_t handle_hc_ahberr_intr(dwc_otg_hcd_t * hcd, @@ -466041,10 +466041,10 @@ index d3097ef3728c..9d49b2b33227 100644 2.18.4 -From b26c06f0c57f0f1ab3194e8e8dc90dd8fb8abc8d Mon Sep 17 00:00:00 2001 +From 5f9e85c7e98b3337a6fe34a0b810640b36b34f79 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Oct 2020 12:12:22 +0000 -Subject: [PATCH 1159/1216] bcm2708_fb: Fix a build warning +Subject: [PATCH 1159/1224] bcm2708_fb: Fix a build warning Signed-off-by: Phil Elwell --- @@ -466052,7 +466052,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c -index d035fa59c269..9a3d3d23c17e 100644 +index d035fa59c269d..9a3d3d23c17ed 100644 --- a/drivers/video/fbdev/bcm2708_fb.c +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -705,7 +705,8 @@ static long vc_mem_copy(struct bcm2708_fb *fb, struct fb_dmacopy *ioparam) @@ -466069,10 +466069,10 @@ index d035fa59c269..9a3d3d23c17e 100644 2.18.4 -From c8fd3621feaeebc9dc769241d97f01b6991b81b7 Mon Sep 17 00:00:00 2001 +From 84d46b97e23d1cfee3248e87cb27bf7353abbfef Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 27 Oct 2020 12:24:14 +0000 -Subject: [PATCH 1160/1216] bcm2835-pcm: Fix up multichannel pcm audio +Subject: [PATCH 1160/1224] bcm2835-pcm: Fix up multichannel pcm audio Fixes: a9c1660ff5f02d048c5f31abf1fd1108ccf9ef87 Signed-off-by: Dom Cobley @@ -466081,7 +466081,7 @@ Signed-off-by: Dom Cobley 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c -index e4603ba742e4..b409e84901ec 100644 +index e4603ba742e45..b409e84901ece 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c @@ -14,14 +14,14 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_hw = { @@ -466130,10 +466130,10 @@ index e4603ba742e4..b409e84901ec 100644 2.18.4 -From bf149f1561597b2ee644b0a3dfa45e7283d67867 Mon Sep 17 00:00:00 2001 +From 4894ca4d5a9f2f5908950741848f98b778559e6d Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 22 Oct 2020 15:30:55 +0100 -Subject: [PATCH 1161/1216] watchdog: bcm2835: Ignore params after the +Subject: [PATCH 1161/1224] watchdog: bcm2835: Ignore params after the partition number Use sscanf to extract the partition number and ignore extra parameters @@ -466143,7 +466143,7 @@ which are only relevant to other reboot notifiers. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c -index 62937e6f83ca..de25e3682f03 100644 +index 62937e6f83ca1..de25e3682f037 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -126,10 +126,12 @@ static int bcm2835_restart(struct watchdog_device *wdog, @@ -466165,10 +466165,10 @@ index 62937e6f83ca..de25e3682f03 100644 2.18.4 -From 95adecd54e818214dc5a4b0a97ebb6165786308e Mon Sep 17 00:00:00 2001 +From 381943c1c23a493f8fd3c378fbb6a64c298413c8 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 20 Oct 2020 11:55:37 +0100 -Subject: [PATCH 1162/1216] firmware: raspberrypi: Add support for tryonce +Subject: [PATCH 1162/1224] firmware: raspberrypi: Add support for tryonce reboot flag Define a new mailbox (SET_REBOOT_FLAGS) which may be used to @@ -466186,7 +466186,7 @@ mechanism to be implemented for OS upgrades. 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index dc11a1968e99..9b5cb65a8712 100644 +index dc11a1968e99c..9b5cb65a87129 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -190,6 +190,7 @@ static int rpi_firmware_notify_reboot(struct notifier_block *nb, @@ -466229,7 +466229,7 @@ index dc11a1968e99..9b5cb65a8712 100644 return 0; } diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index 3335c2a2993c..7e0d1f186f29 100644 +index 3335c2a2993c2..7e0d1f186f29a 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -96,6 +96,8 @@ enum rpi_firmware_property_tag { @@ -466245,10 +466245,10 @@ index 3335c2a2993c..7e0d1f186f29 100644 2.18.4 -From c84825c04c11f9bfb4265deb53e871c7579d3149 Mon Sep 17 00:00:00 2001 +From c43425ac973c5e817e0e9958bd3f453d896c09f1 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:00:41 +0100 -Subject: [PATCH 1163/1216] phy: broadcom: split out the BCM54213PE from the +Subject: [PATCH 1163/1224] phy: broadcom: split out the BCM54213PE from the BCM54210E IDs The last nibble is a revision ID, and the 54213pe is a later rev @@ -466262,7 +466262,7 @@ Signed-off-by: Jonathan Bell 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 56f029579b24..49de844e03a3 100644 +index 56f029579b24d..49de844e03a3d 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -213,7 +213,8 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) @@ -466308,7 +466308,7 @@ index 56f029579b24..49de844e03a3 100644 { PHY_ID_BCM54612E, 0xfffffff0 }, { PHY_ID_BCM54616S, 0xfffffff0 }, diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h -index 6db2d9a6e503..bfb37218f435 100644 +index 6db2d9a6e5031..bfb37218f435c 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -20,6 +20,7 @@ @@ -466323,10 +466323,10 @@ index 6db2d9a6e503..bfb37218f435 100644 2.18.4 -From 4e1c66f361bba280c3354c224eec3da15fc2ac38 Mon Sep 17 00:00:00 2001 +From 8be7db908115feb8a3a8c5e8ad4f55af23bc055d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 29 Oct 2020 14:10:56 +0000 -Subject: [PATCH 1164/1216] phy: broadcom: Add bcm54213pe configuration +Subject: [PATCH 1164/1224] phy: broadcom: Add bcm54213pe configuration Signed-off-by: Phil Elwell --- @@ -466334,7 +466334,7 @@ Signed-off-by: Phil Elwell 1 file changed, 9 insertions(+) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 49de844e03a3..5a1ba06163cc 100644 +index 49de844e03a3d..5a1ba06163cce 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -43,6 +43,11 @@ static int bcm54210e_config_init(struct phy_device *phydev) @@ -466364,10 +466364,10 @@ index 49de844e03a3..5a1ba06163cc 100644 2.18.4 -From b1dcfcb4b61d427955a7021f52b1c6a477e2e647 Mon Sep 17 00:00:00 2001 +From d7b7d3a98ea241dd257f0c321f2cca80ffd38468 Mon Sep 17 00:00:00 2001 From: Sudeep Date: Fri, 23 Oct 2020 15:47:17 +0530 -Subject: [PATCH 1165/1216] Allo boss2 driver +Subject: [PATCH 1165/1224] Allo boss2 driver Signed-off-by: Sudeep --- @@ -466378,7 +466378,7 @@ Signed-off-by: Sudeep create mode 100644 sound/soc/bcm/allo-boss2-dac.c diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index 7433e6f15cd7..31ec3e047c55 100644 +index 7433e6f15cd7c..31ec3e047c55b 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -258,6 +258,15 @@ config SND_BCM2708_SOC_ALLO_BOSS_DAC @@ -466398,7 +466398,7 @@ index 7433e6f15cd7..31ec3e047c55 100644 tristate "Support for Allo DigiOne" depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index 00a983355b91..8ebbd3f29380 100644 +index 00a983355b911..8ebbd3f29380c 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -33,6 +33,7 @@ snd-soc-digidac1-soundcard-objs := digidac1-soundcard.o @@ -466419,7 +466419,7 @@ index 00a983355b91..8ebbd3f29380 100644 obj-$(CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC) += snd-soc-allo-katana-codec.o diff --git a/sound/soc/bcm/allo-boss2-dac.c b/sound/soc/bcm/allo-boss2-dac.c new file mode 100644 -index 000000000000..5ad7f16964aa +index 0000000000000..5ad7f16964aa8 --- /dev/null +++ b/sound/soc/bcm/allo-boss2-dac.c @@ -0,0 +1,1133 @@ @@ -467560,10 +467560,10 @@ index 000000000000..5ad7f16964aa 2.18.4 -From ecf7dc950a29f91e6be016072d948abeb8014fe3 Mon Sep 17 00:00:00 2001 +From 72c9fa3e15dc2efa21a4ad05a805e850e4ef3c17 Mon Sep 17 00:00:00 2001 From: Sudeep Date: Fri, 23 Oct 2020 15:51:15 +0530 -Subject: [PATCH 1166/1216] Add allo boss2 overlay +Subject: [PATCH 1166/1224] Add allo boss2 overlay Signed-off-by: Sudeep --- @@ -467574,7 +467574,7 @@ Signed-off-by: Sudeep create mode 100644 arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index fbb7ed1ba55b..13342d83d02d 100644 +index fbb7ed1ba55b1..13342d83d02d1 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -14,6 +14,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -467586,7 +467586,7 @@ index fbb7ed1ba55b..13342d83d02d 100644 allo-katana-dac-audio.dtbo \ allo-piano-dac-pcm512x-audio.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index c709c4b89c15..2192cdfb27aa 100644 +index c709c4b89c155..2192cdfb27aad 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -420,6 +420,12 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec @@ -467604,7 +467604,7 @@ index c709c4b89c15..2192cdfb27aa 100644 Load: dtoverlay=allo-digione diff --git a/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts new file mode 100644 -index 000000000000..a6adfb495eb9 +index 0000000000000..a6adfb495eb90 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts @@ -0,0 +1,57 @@ @@ -467669,10 +467669,10 @@ index 000000000000..a6adfb495eb9 2.18.4 -From 0a95881a0373c382e844f0c4231df75e85263be0 Mon Sep 17 00:00:00 2001 +From 3882306064a455b17ec21f46e91c0713a11ba29e Mon Sep 17 00:00:00 2001 From: Sudeep Date: Fri, 23 Oct 2020 15:52:38 +0530 -Subject: [PATCH 1167/1216] Add allo boss2 config +Subject: [PATCH 1167/1224] Add allo boss2 config Signed-off-by: Sudeep --- @@ -467684,7 +467684,7 @@ Signed-off-by: Sudeep 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 6b3d27193be4..b062fead409b 100644 +index 6b3d27193be43..b062fead409b0 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1006,6 +1006,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m @@ -467696,7 +467696,7 @@ index 6b3d27193be4..b062fead409b 100644 CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 5b826bc26c30..598e9e198951 100644 +index 5b826bc26c309..598e9e1989510 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1020,6 +1020,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m @@ -467708,7 +467708,7 @@ index 5b826bc26c30..598e9e198951 100644 CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 1beb2c61e519..520d0bf8c700 100644 +index 1beb2c61e519e..520d0bf8c7001 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -998,6 +998,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m @@ -467720,7 +467720,7 @@ index 1beb2c61e519..520d0bf8c700 100644 CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 22ba4d32f786..39f2fc51de4d 100644 +index 22ba4d32f7862..39f2fc51de4d6 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1019,6 +1019,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m @@ -467732,7 +467732,7 @@ index 22ba4d32f786..39f2fc51de4d 100644 CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index a91f46b4a45c..3d43b416bce4 100644 +index a91f46b4a45c7..3d43b416bce45 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -921,6 +921,7 @@ CONFIG_SND_AUDIOSENSE_PI=m @@ -467747,10 +467747,10 @@ index a91f46b4a45c..3d43b416bce4 100644 2.18.4 -From 9d0d719bb5b2b1a444eb3c1152f8b40624c81edd Mon Sep 17 00:00:00 2001 +From a5fdbd08f037c0b29b021560354925d0768f083a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Nov 2020 10:13:48 +0000 -Subject: [PATCH 1168/1216] Revert "mailbox: avoid timer start from callback" +Subject: [PATCH 1168/1224] Revert "mailbox: avoid timer start from callback" This reverts commit 6dc15642c8b830d384fd3e6c9ea63144202b8932. @@ -467777,7 +467777,7 @@ Signed-off-by: Phil Elwell 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c -index 3e7d4b20ab34..0b821a5b2db8 100644 +index 3e7d4b20ab34f..0b821a5b2db84 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -82,12 +82,9 @@ static void msg_submit(struct mbox_chan *chan) @@ -467813,10 +467813,10 @@ index 3e7d4b20ab34..0b821a5b2db8 100644 2.18.4 -From 2ccd5e9bbb4c44114ca8817a329fe37af4c36263 Mon Sep 17 00:00:00 2001 +From 2fe1ab3354583796e9a91aa394d29b05f04d5f60 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2020 14:21:33 +0100 -Subject: [PATCH 1169/1216] ARM: dts: Add bcm2711-rpi-400.dts +Subject: [PATCH 1169/1224] ARM: dts: Add bcm2711-rpi-400.dts Signed-off-by: Phil Elwell --- @@ -467829,7 +467829,7 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 325f1ceccad9..0e1c0aeefa69 100644 +index 325f1ceccad97..0e1c0aeefa690 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -12,6 +12,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -467842,7 +467842,7 @@ index 325f1ceccad9..0e1c0aeefa69 100644 diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts new file mode 100644 -index 000000000000..afd1ca215518 +index 0000000000000..afd1ca215518c --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts @@ -0,0 +1,585 @@ @@ -468432,7 +468432,7 @@ index 000000000000..afd1ca215518 + }; +}; diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index 996e670a6018..2bca736a7197 100644 +index 996e670a60183..2bca736a71976 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-2-b.dtb @@ -468445,7 +468445,7 @@ index 996e670a6018..2bca736a7197 100644 diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts new file mode 100644 -index 000000000000..90c2b5a195d4 +index 0000000000000..90c2b5a195d48 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts @@ -0,0 +1 @@ @@ -468454,10 +468454,10 @@ index 000000000000..90c2b5a195d4 2.18.4 -From 9ff86dbbc4582ebabbb4610ff5273fca6e18d4de Mon Sep 17 00:00:00 2001 +From 30ee2ab16032bd1cac8c5ae6307465744e13eb53 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 4 Nov 2020 11:25:02 +0000 -Subject: [PATCH 1170/1216] overlays: Deprecate and delete the sdtweak overlay +Subject: [PATCH 1170/1224] overlays: Deprecate and delete the sdtweak overlay The sdtweak overlay has been superseded by the board-specific sd_* parameters such as sd_poll_once, sd_overclock etc. @@ -468478,7 +468478,7 @@ Signed-off-by: Phil Elwell delete mode 100644 arch/arm/boot/dts/overlays/sdtweak-overlay.dts diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts -index 22b0ad1738ec..b2e6b41216b2 100644 +index 22b0ad1738ec6..b2e6b41216b20 100644 --- a/arch/arm/boot/dts/overlays/overlay_map.dts +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -61,6 +61,10 @@ @@ -468494,7 +468494,7 @@ index 22b0ad1738ec..b2e6b41216b2 100644 }; diff --git a/arch/arm/boot/dts/overlays/sdtweak-overlay.dts b/arch/arm/boot/dts/overlays/sdtweak-overlay.dts deleted file mode 100644 -index 38157d2f9bf3..000000000000 +index 38157d2f9bf3b..0000000000000 --- a/arch/arm/boot/dts/overlays/sdtweak-overlay.dts +++ /dev/null @@ -1,25 +0,0 @@ @@ -468527,10 +468527,10 @@ index 38157d2f9bf3..000000000000 2.18.4 -From 731b7f421757c6c314b942c95b1f2253d4a768ef Mon Sep 17 00:00:00 2001 +From 8c2c57c6ad324d3c33281c96c09280d86195b763 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Nov 2020 09:54:33 +0000 -Subject: [PATCH 1171/1216] overlays: Complete the sdtweak excision +Subject: [PATCH 1171/1224] overlays: Complete the sdtweak excision Signed-off-by: Phil Elwell --- @@ -468539,7 +468539,7 @@ Signed-off-by: Phil Elwell 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 13342d83d02d..467cc0ae9194 100644 +index 13342d83d02d1..467cc0ae9194b 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -159,7 +159,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -468551,7 +468551,7 @@ index 13342d83d02d..467cc0ae9194 100644 smi.dtbo \ smi-dev.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 2192cdfb27aa..dd33a27178b5 100644 +index 2192cdfb27aad..dd33a27178b5a 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2407,29 +2407,10 @@ Load: @@ -468592,10 +468592,10 @@ index 2192cdfb27aa..dd33a27178b5 100644 2.18.4 -From b4f04106886a491d42eaf94f6401e6c23e1c40af Mon Sep 17 00:00:00 2001 +From c46f6baaef17ed4f9abde1e0954dce67bc0b2c8a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Nov 2020 11:39:35 +0000 -Subject: [PATCH 1172/1216] ARM: dts: bcm27xx: Remove enable_headphones setting +Subject: [PATCH 1172/1224] ARM: dts: bcm27xx: Remove enable_headphones setting The enable_headphones parameter of the snd_bcm2835 module is forced to 1 if enable_compat_alsa is 0, so setting them both on the kernel @@ -468615,7 +468615,7 @@ Signed-off-by: Phil Elwell 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts -index 80263a42aebf..188f56b3a7f5 100644 +index 80263a42aebf3..188f56b3a7f53 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -11,7 +11,7 @@ @@ -468628,7 +468628,7 @@ index 80263a42aebf..188f56b3a7f5 100644 aliases { diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts -index 5b1332ace9b8..8d20064dddc4 100644 +index 5b1332ace9b8a..8d20064dddc4e 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -10,7 +10,7 @@ @@ -468641,7 +468641,7 @@ index 5b1332ace9b8..8d20064dddc4 100644 }; diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi -index b74a9df1390e..c3a55a7a2deb 100644 +index b74a9df1390e1..c3a55a7a2deb8 100644 --- a/arch/arm/boot/dts/bcm270x.dtsi +++ b/arch/arm/boot/dts/bcm270x.dtsi @@ -3,7 +3,7 @@ @@ -468654,7 +468654,7 @@ index b74a9df1390e..c3a55a7a2deb 100644 }; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts -index 4e4e47100831..e7b7281d3c60 100644 +index 4e4e471008315..e7b7281d3c608 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -12,7 +12,7 @@ @@ -468667,7 +468667,7 @@ index 4e4e47100831..e7b7281d3c60 100644 aliases { diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts -index 8989c00b03e5..d69d6a187e0c 100644 +index 8989c00b03e54..d69d6a187e0ca 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -12,7 +12,7 @@ @@ -468680,7 +468680,7 @@ index 8989c00b03e5..d69d6a187e0c 100644 aliases { diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 21b20e334b1a..b5daeee077ec 100644 +index 21b20e334b1a7..b5daeee077ecc 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -234,7 +234,7 @@ @@ -468693,7 +468693,7 @@ index 21b20e334b1a..b5daeee077ec 100644 aliases { diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts -index afd1ca215518..9454ce193ec5 100644 +index afd1ca215518c..9454ce193ec53 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts @@ -234,7 +234,7 @@ @@ -468706,7 +468706,7 @@ index afd1ca215518..9454ce193ec5 100644 aliases { diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index 3ff0be02cb34..a969000c0b89 100644 +index 3ff0be02cb34c..a969000c0b899 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -174,7 +174,7 @@ @@ -468722,10 +468722,10 @@ index 3ff0be02cb34..a969000c0b89 100644 2.18.4 -From f391cdefa34af644d9e2c36843bcb20cc7383a95 Mon Sep 17 00:00:00 2001 +From e4d7ffd6670f3a98f34f6ab3cdb2a06ea9d3e882 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 4 Nov 2020 18:54:20 +0000 -Subject: [PATCH 1173/1216] staging: vcsm-cma: Fix memory leak from not +Subject: [PATCH 1173/1224] staging: vcsm-cma: Fix memory leak from not detaching dmabuf When importing there was a missing call to detach the buffer, @@ -468741,7 +468741,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c -index 8cbe2b3522c6..03685cb5c80f 100644 +index 8cbe2b3522c65..03685cb5c80f6 100644 --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c @@ -237,6 +237,7 @@ static void vc_sm_add_resource(struct vc_sm_privdata_t *privdata, @@ -468805,10 +468805,10 @@ index 8cbe2b3522c6..03685cb5c80f 100644 2.18.4 -From 5882981c2eb172871385a6a6e542ac726e728c01 Mon Sep 17 00:00:00 2001 +From 6cd8e0d5ba760a914c1319eea21c6c5620847552 Mon Sep 17 00:00:00 2001 From: paul-1 <6473457+paul-1@users.noreply.github.com> Date: Wed, 4 Nov 2020 19:11:37 -0500 -Subject: [PATCH 1174/1216] Update Allo Piano Dac Driver for 5.4.y kernels +Subject: [PATCH 1174/1224] Update Allo Piano Dac Driver for 5.4.y kernels Add unique names to the individual dac coded drivers Remove some of the codec controls that are not used. @@ -468819,7 +468819,7 @@ Signed-off-by: Paul Hermann 1 file changed, 97 insertions(+), 32 deletions(-) diff --git a/sound/soc/bcm/allo-piano-dac-plus.c b/sound/soc/bcm/allo-piano-dac-plus.c -index e910d4a4546d..d323f24e7d9a 100644 +index e910d4a4546dc..d323f24e7d9a3 100644 --- a/sound/soc/bcm/allo-piano-dac-plus.c +++ b/sound/soc/bcm/allo-piano-dac-plus.c @@ -2,7 +2,8 @@ @@ -469057,10 +469057,10 @@ index e910d4a4546d..d323f24e7d9a 100644 2.18.4 -From 84b497d6674412f6b444d2ecfcb0d11ce98386fd Mon Sep 17 00:00:00 2001 +From 847322f35e4caba0746897581564c5599146de12 Mon Sep 17 00:00:00 2001 From: paul-1 <6473457+paul-1@users.noreply.github.com> Date: Wed, 4 Nov 2020 19:17:48 -0500 -Subject: [PATCH 1175/1216] Overlay: Update Allo Piano Plus dac driver for +Subject: [PATCH 1175/1224] Overlay: Update Allo Piano Plus dac driver for 5.4.y kernels. Create unique names for the two instances of the codec driver. @@ -469071,7 +469071,7 @@ Signed-off-by: Paul Hermann 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts -index 374c553db062..d47a35def4f7 100644 +index 374c553db062e..d47a35def4f76 100644 --- a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts @@ -23,12 +23,14 @@ @@ -469093,10 +469093,10 @@ index 374c553db062..d47a35def4f7 100644 2.18.4 -From c8131df013a042d954024074c7b08273f1eafb30 Mon Sep 17 00:00:00 2001 +From fb3a7f3c9e5b0ffb1eb349df7824514687215de9 Mon Sep 17 00:00:00 2001 From: paul-1 <6473457+paul-1@users.noreply.github.com> Date: Sat, 7 Nov 2020 12:01:44 -0500 -Subject: [PATCH 1176/1216] Update volume controls in Allo Piano Dac Plus +Subject: [PATCH 1176/1224] Update volume controls in Allo Piano Dac Plus Put control scaling back to 255. Clean up what master/sub volume controls set in codec. @@ -469108,7 +469108,7 @@ Signed-off-by: Paul Hermann 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/sound/soc/bcm/allo-piano-dac-plus.c b/sound/soc/bcm/allo-piano-dac-plus.c -index d323f24e7d9a..245c3fc47736 100644 +index d323f24e7d9a3..245c3fc477364 100644 --- a/sound/soc/bcm/allo-piano-dac-plus.c +++ b/sound/soc/bcm/allo-piano-dac-plus.c @@ -420,6 +420,7 @@ static int pcm512x_get_reg_sub(struct snd_kcontrol *kcontrol, @@ -469240,10 +469240,10 @@ index d323f24e7d9a..245c3fc47736 100644 2.18.4 -From 8d94e77b029e4edd903adbab0f1159586112f326 Mon Sep 17 00:00:00 2001 +From fd03f652dcc5d8363eca07e1612bad80b8c505fd Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 16 Sep 2020 00:35:22 +0200 -Subject: [PATCH 1177/1216] can: rx-offload: can_rx_offload_add_manual(): add +Subject: [PATCH 1177/1224] can: rx-offload: can_rx_offload_add_manual(): add new initialization function This patch adds a new initialization function: @@ -469263,7 +469263,7 @@ Signed-off-by: Marc Kleine-Budde 2 files changed, 14 insertions(+) diff --git a/drivers/net/can/rx-offload.c b/drivers/net/can/rx-offload.c -index 7e75a87a8a6a..fa65e0a4b7a0 100644 +index 7e75a87a8a6a9..fa65e0a4b7a0c 100644 --- a/drivers/net/can/rx-offload.c +++ b/drivers/net/can/rx-offload.c @@ -375,6 +375,17 @@ int can_rx_offload_add_fifo(struct net_device *dev, struct can_rx_offload *offlo @@ -469285,7 +469285,7 @@ index 7e75a87a8a6a..fa65e0a4b7a0 100644 { can_rx_offload_reset(offload); diff --git a/include/linux/can/rx-offload.h b/include/linux/can/rx-offload.h -index 01219f2902bf..eac8f11413f0 100644 +index 01219f2902bf7..eac8f11413f09 100644 --- a/include/linux/can/rx-offload.h +++ b/include/linux/can/rx-offload.h @@ -35,6 +35,9 @@ int can_rx_offload_add_timestamp(struct net_device *dev, @@ -469302,10 +469302,10 @@ index 01219f2902bf..eac8f11413f0 100644 2.18.4 -From 4b5bf50e33d28ba47b2e8fbbb72e5d91c450b672 Mon Sep 17 00:00:00 2001 +From fb94233fc6a2662f59ba95c5bc07073f388fd47f Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Fri, 18 Sep 2020 19:25:31 +0200 -Subject: [PATCH 1178/1216] dt-binding: can: mcp25xxfd: document device tree +Subject: [PATCH 1178/1224] dt-binding: can: mcp25xxfd: document device tree bindings This patch adds the device-tree binding documentation for the Microchip @@ -469323,7 +469323,7 @@ Signed-off-by: Marc Kleine-Budde diff --git a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml b/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml new file mode 100644 -index 000000000000..aa2cad14d6d7 +index 0000000000000..aa2cad14d6d77 --- /dev/null +++ b/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml @@ -0,0 +1,79 @@ @@ -469410,10 +469410,10 @@ index 000000000000..aa2cad14d6d7 2.18.4 -From db9d5af54e6e7bc84c3ea61be0254f2e8548e9e5 Mon Sep 17 00:00:00 2001 +From 1c8fb045c3fdb9142e2ee23db8168325792faec4 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 18 Sep 2020 19:25:32 +0200 -Subject: [PATCH 1179/1216] can: mcp25xxfd: add regmap infrastructure +Subject: [PATCH 1179/1224] can: mcp25xxfd: add regmap infrastructure This patch adds the regmap infrastructure for the Microchip MCP25xxFD SPI CAN controller family. The actual driver is added in the next commit. @@ -469440,7 +469440,7 @@ Signed-off-by: Marc Kleine-Budde create mode 100644 drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h diff --git a/drivers/net/can/spi/Kconfig b/drivers/net/can/spi/Kconfig -index 1c50788055cb..d4b68eb5d386 100644 +index 1c50788055cb6..d4b68eb5d386a 100644 --- a/drivers/net/can/spi/Kconfig +++ b/drivers/net/can/spi/Kconfig @@ -15,4 +15,6 @@ config CAN_MCP251X @@ -469451,7 +469451,7 @@ index 1c50788055cb..d4b68eb5d386 100644 + endmenu diff --git a/drivers/net/can/spi/Makefile b/drivers/net/can/spi/Makefile -index f115b2c46623..20c18ac96b1c 100644 +index f115b2c466231..20c18ac96b1c9 100644 --- a/drivers/net/can/spi/Makefile +++ b/drivers/net/can/spi/Makefile @@ -6,3 +6,4 @@ @@ -469461,7 +469461,7 @@ index f115b2c46623..20c18ac96b1c 100644 +obj-y += mcp25xxfd/ diff --git a/drivers/net/can/spi/mcp25xxfd/Kconfig b/drivers/net/can/spi/mcp25xxfd/Kconfig new file mode 100644 -index 000000000000..9eb596019a58 +index 0000000000000..9eb596019a58d --- /dev/null +++ b/drivers/net/can/spi/mcp25xxfd/Kconfig @@ -0,0 +1,17 @@ @@ -469484,7 +469484,7 @@ index 000000000000..9eb596019a58 + Disable if unsure. diff --git a/drivers/net/can/spi/mcp25xxfd/Makefile b/drivers/net/can/spi/mcp25xxfd/Makefile new file mode 100644 -index 000000000000..9dadf0070b42 +index 0000000000000..9dadf0070b424 --- /dev/null +++ b/drivers/net/can/spi/mcp25xxfd/Makefile @@ -0,0 +1,7 @@ @@ -469497,7 +469497,7 @@ index 000000000000..9dadf0070b42 +mcp25xxfd-objs += mcp25xxfd-regmap.o diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c new file mode 100644 -index 000000000000..79d09aaebf33 +index 0000000000000..79d09aaebf332 --- /dev/null +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c @@ -0,0 +1,89 @@ @@ -469592,7 +469592,7 @@ index 000000000000..79d09aaebf33 +} diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c new file mode 100644 -index 000000000000..376649c7e443 +index 0000000000000..376649c7e443b --- /dev/null +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c @@ -0,0 +1,556 @@ @@ -470154,7 +470154,7 @@ index 000000000000..376649c7e443 +} diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h new file mode 100644 -index 000000000000..3bc799204cb0 +index 0000000000000..3bc799204cb01 --- /dev/null +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h @@ -0,0 +1,835 @@ @@ -470997,10 +470997,10 @@ index 000000000000..3bc799204cb0 2.18.4 -From ec847227c7a8c92096d1f8013f016c345b4263d2 Mon Sep 17 00:00:00 2001 +From c5277ccc5fe940ae0494dc9f195fc52ce50c5b3a Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 18 Sep 2020 19:25:33 +0200 -Subject: [PATCH 1180/1216] can: mcp25xxfd: add driver for Microchip MCP25xxFD +Subject: [PATCH 1180/1224] can: mcp25xxfd: add driver for Microchip MCP25xxFD SPI CAN This patch adds support for the Microchip MCP25xxFD SPI CAN controller family. @@ -471021,7 +471021,7 @@ Signed-off-by: Marc Kleine-Budde create mode 100644 drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c diff --git a/drivers/net/can/spi/mcp25xxfd/Makefile b/drivers/net/can/spi/mcp25xxfd/Makefile -index 9dadf0070b42..4e17f592e22e 100644 +index 9dadf0070b424..4e17f592e22ee 100644 --- a/drivers/net/can/spi/mcp25xxfd/Makefile +++ b/drivers/net/can/spi/mcp25xxfd/Makefile @@ -3,5 +3,6 @@ @@ -471033,7 +471033,7 @@ index 9dadf0070b42..4e17f592e22e 100644 mcp25xxfd-objs += mcp25xxfd-regmap.o diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c new file mode 100644 -index 000000000000..eed20e132ddb +index 0000000000000..eed20e132ddba --- /dev/null +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c @@ -0,0 +1,2907 @@ @@ -473948,10 +473948,10 @@ index 000000000000..eed20e132ddb 2.18.4 -From 00aa6ac0d4c280b99f695e8615d0232809114f8d Mon Sep 17 00:00:00 2001 +From 70df74adf4e620ff1bb7bc29f66631da6023124d Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Fri, 18 Sep 2020 19:25:34 +0200 -Subject: [PATCH 1181/1216] can: mcp25xxfd: add listen-only mode +Subject: [PATCH 1181/1224] can: mcp25xxfd: add listen-only mode This commit enables listen-only mode, which works internally like CANFD mode. @@ -473965,7 +473965,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c -index eed20e132ddb..fd736fc13396 100644 +index eed20e132ddba..fd736fc133968 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c @@ -392,7 +392,8 @@ static int mcp25xxfd_ring_alloc(struct mcp25xxfd_priv *priv) @@ -474023,10 +474023,10 @@ index eed20e132ddb..fd736fc13396 100644 2.18.4 -From a9126cc09ec5e375220b45e2a8fc432fb40ae428 Mon Sep 17 00:00:00 2001 +From 1a8d3a88b77d77b00f03a02ec9a64fa99efb8c55 Mon Sep 17 00:00:00 2001 From: Thomas Kopp Date: Fri, 25 Sep 2020 08:56:06 +0200 -Subject: [PATCH 1182/1216] can: mcp25xxfd: mcp25xxfd_handle_eccif(): add ECC +Subject: [PATCH 1182/1224] can: mcp25xxfd: mcp25xxfd_handle_eccif(): add ECC related errata and update log messages This patch adds a reference to the recent released MCP2517FD and MCP2518FD @@ -474048,7 +474048,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c -index fd736fc13396..cad6f139bcf6 100644 +index fd736fc133968..cad6f139bcf61 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c @@ -1973,8 +1973,20 @@ mcp25xxfd_handle_eccif(struct mcp25xxfd_priv *priv, bool set_normal_mode) @@ -474091,10 +474091,10 @@ index fd736fc13396..cad6f139bcf6 100644 2.18.4 -From bd35f2c93f9fa37056e4585815fbee6c5d3a7e19 Mon Sep 17 00:00:00 2001 +From c928e6108aa18eea0dff5490f8a21b17acae2603 Mon Sep 17 00:00:00 2001 From: Thomas Kopp Date: Fri, 25 Sep 2020 08:56:06 +0200 -Subject: [PATCH 1183/1216] can: mcp25xxfd: mcp25xxfd_probe(): add SPI clk +Subject: [PATCH 1183/1224] can: mcp25xxfd: mcp25xxfd_probe(): add SPI clk limit related errata information This patch adds a reference to the recent released MCP2517FD and MCP2518FD @@ -474113,7 +474113,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c -index cad6f139bcf6..310bc93c69f8 100644 +index cad6f139bcf61..310bc93c69f80 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c @@ -2819,11 +2819,21 @@ static int mcp25xxfd_probe(struct spi_device *spi) @@ -474154,10 +474154,10 @@ index cad6f139bcf6..310bc93c69f8 100644 2.18.4 -From e2707db4a46c814c4c58a95807fe33b1b7f11329 Mon Sep 17 00:00:00 2001 +From eaf54a369e570e998f5d2e1ec0d81cd284169342 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 23 Sep 2020 14:27:52 +0300 -Subject: [PATCH 1184/1216] can: mcp25xxfd: mcp25xxfd_ring_free(): fix memory +Subject: [PATCH 1184/1224] can: mcp25xxfd: mcp25xxfd_ring_free(): fix memory leak during cleanup This loop doesn't free the first element of the array. The "i > 0" has @@ -474174,7 +474174,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c -index 310bc93c69f8..edcf9e287284 100644 +index 310bc93c69f80..edcf9e2872844 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c @@ -377,7 +377,7 @@ static void mcp25xxfd_ring_free(struct mcp25xxfd_priv *priv) @@ -474190,10 +474190,10 @@ index 310bc93c69f8..edcf9e287284 100644 2.18.4 -From bf3435a424dad0404cd76e65f433e4901a50f6c6 Mon Sep 17 00:00:00 2001 +From fc7097b771b370dc21e04764ba18fa9efeff7d53 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 23 Sep 2020 13:44:36 +0200 -Subject: [PATCH 1185/1216] can: mcp25xxfd: mcp25xxfd_irq(): add missing +Subject: [PATCH 1185/1224] can: mcp25xxfd: mcp25xxfd_irq(): add missing initialization of variable set_normal mode This patch fixes the following warning: @@ -474215,7 +474215,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c -index edcf9e287284..7fb654edfc9f 100644 +index edcf9e2872844..7fb654edfc9ff 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c @@ -2080,7 +2080,7 @@ static irqreturn_t mcp25xxfd_irq(int irq, void *dev_id) @@ -474231,10 +474231,10 @@ index edcf9e287284..7fb654edfc9f 100644 2.18.4 -From b5930d311881c183b20d2d78ea67b37247c75c25 Mon Sep 17 00:00:00 2001 +From 6f63a5b352bd834eaef9e3da7f465b8011bb022a Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Wed, 23 Sep 2020 14:53:01 +0200 -Subject: [PATCH 1186/1216] dt-binding: can: mcp25xxfd: documentation fixes +Subject: [PATCH 1186/1224] dt-binding: can: mcp25xxfd: documentation fixes Apply following fixes: - Use 'interrupts'. (interrupts-extended will automagically be supported @@ -474255,7 +474255,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml b/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml -index aa2cad14d6d7..5beb00a614bf 100644 +index aa2cad14d6d77..5beb00a614bfb 100644 --- a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml +++ b/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml @@ -24,7 +24,7 @@ properties: @@ -474296,10 +474296,10 @@ index aa2cad14d6d7..5beb00a614bf 100644 2.18.4 -From 6121cbe4c512464e559f1a2fc83b71ca1c41f264 Mon Sep 17 00:00:00 2001 +From 30ba74d9115c3e6464dddd583e70fd19b15a1361 Mon Sep 17 00:00:00 2001 From: Thomas Kopp Date: Wed, 30 Sep 2020 11:14:23 +0200 -Subject: [PATCH 1187/1216] dt-binding: can: mcp251xfd: narrow down wildcards +Subject: [PATCH 1187/1224] dt-binding: can: mcp251xfd: narrow down wildcards in device tree bindings to "microchip,mcp251xfd" The wildcard should be narrowed down to prevent existing and future devices @@ -474326,7 +474326,7 @@ diff --git a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml similarity index 91% rename from Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml rename to Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml -index 5beb00a614bf..2a884c1fe0e0 100644 +index 5beb00a614bfb..2a884c1fe0e01 100644 --- a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml +++ b/Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml @@ -1,7 +1,7 @@ @@ -474369,10 +474369,10 @@ index 5beb00a614bf..2a884c1fe0e0 100644 2.18.4 -From 5969b817b64c9b196cbc81014b7704cd1045b02d Mon Sep 17 00:00:00 2001 +From 84d7779c1c1842ca8ae76b76b6277bfe2f8ebee1 Mon Sep 17 00:00:00 2001 From: Thomas Kopp Date: Wed, 30 Sep 2020 11:14:22 +0200 -Subject: [PATCH 1188/1216] can: mcp25xxfd: narrow down wildcards in device +Subject: [PATCH 1188/1224] can: mcp25xxfd: narrow down wildcards in device tree bindings to "microchip,mcp251xfd" The wildcard should be narrowed down to prevent existing and future devices @@ -474393,7 +474393,7 @@ Signed-off-by: Marc Kleine-Budde 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c -index 7fb654edfc9f..409367e894b2 100644 +index 7fb654edfc9ff..409367e894b28 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c @@ -41,10 +41,10 @@ static const struct mcp25xxfd_devtype_data mcp25xxfd_devtype_data_mcp2518fd = { @@ -474452,7 +474452,7 @@ index 7fb654edfc9f..409367e894b2 100644 /* sentinel */ }, diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h -index 3bc799204cb0..b1b5d7fd33ea 100644 +index 3bc799204cb01..b1b5d7fd33ea7 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h @@ -553,7 +553,7 @@ struct mcp25xxfd_regs_status { @@ -474477,10 +474477,10 @@ index 3bc799204cb0..b1b5d7fd33ea 100644 2.18.4 -From 98a292e15255ea3c2093774822f9cb153c25172e Mon Sep 17 00:00:00 2001 +From 689d07f9497e73e74e096309442a3c2d5e198bb2 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 30 Sep 2020 10:49:00 +0200 -Subject: [PATCH 1189/1216] can: mcp251xfd: rename driver files and subdir to +Subject: [PATCH 1189/1224] can: mcp251xfd: rename driver files and subdir to mcp251xfd In [1] Geert noted that the autodetect compatible for the mcp25xxfd driver, @@ -474517,7 +474517,7 @@ Signed-off-by: Marc Kleine-Budde delete mode 100644 drivers/net/can/spi/mcp25xxfd/Makefile diff --git a/drivers/net/can/spi/Kconfig b/drivers/net/can/spi/Kconfig -index d4b68eb5d386..8f145a2daf57 100644 +index d4b68eb5d386a..8f145a2daf57f 100644 --- a/drivers/net/can/spi/Kconfig +++ b/drivers/net/can/spi/Kconfig @@ -15,6 +15,6 @@ config CAN_MCP251X @@ -474529,7 +474529,7 @@ index d4b68eb5d386..8f145a2daf57 100644 endmenu diff --git a/drivers/net/can/spi/Makefile b/drivers/net/can/spi/Makefile -index 20c18ac96b1c..33e3f60bbc10 100644 +index 20c18ac96b1c9..33e3f60bbc104 100644 --- a/drivers/net/can/spi/Makefile +++ b/drivers/net/can/spi/Makefile @@ -6,4 +6,4 @@ @@ -474544,7 +474544,7 @@ rename from drivers/net/can/spi/mcp25xxfd/Kconfig rename to drivers/net/can/spi/mcp251xfd/Kconfig diff --git a/drivers/net/can/spi/mcp251xfd/Makefile b/drivers/net/can/spi/mcp251xfd/Makefile new file mode 100644 -index 000000000000..e943e6a2db0c +index 0000000000000..e943e6a2db0cb --- /dev/null +++ b/drivers/net/can/spi/mcp251xfd/Makefile @@ -0,0 +1,8 @@ @@ -474560,7 +474560,7 @@ diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/sp similarity index 99% rename from drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c rename to drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c -index 409367e894b2..a1561d6e2326 100644 +index 409367e894b28..a1561d6e2326e 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -23,7 +23,7 @@ @@ -474576,7 +474576,7 @@ diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c b/drivers/net/can/s similarity index 99% rename from drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c rename to drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c -index 79d09aaebf33..bc90afb34df2 100644 +index 79d09aaebf332..bc90afb34df29 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c @@ -12,7 +12,7 @@ @@ -474592,7 +474592,7 @@ diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c b/drivers/net/can/ similarity index 99% rename from drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c rename to drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c -index 376649c7e443..3511317bb49b 100644 +index 376649c7e443b..3511317bb49bb 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c @@ -6,7 +6,7 @@ @@ -474610,7 +474610,7 @@ rename from drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h rename to drivers/net/can/spi/mcp251xfd/mcp251xfd.h diff --git a/drivers/net/can/spi/mcp25xxfd/Makefile b/drivers/net/can/spi/mcp25xxfd/Makefile deleted file mode 100644 -index 4e17f592e22e..000000000000 +index 4e17f592e22ee..0000000000000 --- a/drivers/net/can/spi/mcp25xxfd/Makefile +++ /dev/null @@ -1,8 +0,0 @@ @@ -474626,10 +474626,10 @@ index 4e17f592e22e..000000000000 2.18.4 -From 5bb05bdde91ade5b71a0f609890883c4640b0b32 Mon Sep 17 00:00:00 2001 +From bde35d91f6a13ad74d9ea8f04887b6f993503555 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 30 Sep 2020 10:49:00 +0200 -Subject: [PATCH 1190/1216] can: mcp251xfd: rename all user facing strings to +Subject: [PATCH 1190/1224] can: mcp251xfd: rename all user facing strings to mcp251xfd In [1] Geert noted that the autodetect compatible for the mcp25xxfd driver, @@ -474656,7 +474656,7 @@ Signed-off-by: Marc Kleine-Budde 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/can/spi/mcp251xfd/Kconfig b/drivers/net/can/spi/mcp251xfd/Kconfig -index 9eb596019a58..f5a147a92cb2 100644 +index 9eb596019a58d..f5a147a92cb25 100644 --- a/drivers/net/can/spi/mcp251xfd/Kconfig +++ b/drivers/net/can/spi/mcp251xfd/Kconfig @@ -1,14 +1,14 @@ @@ -474680,7 +474680,7 @@ index 9eb596019a58..f5a147a92cb2 100644 help This option enables additional sanity checks in the driver, diff --git a/drivers/net/can/spi/mcp251xfd/Makefile b/drivers/net/can/spi/mcp251xfd/Makefile -index e943e6a2db0c..cb71244cbe89 100644 +index e943e6a2db0cb..cb71244cbe891 100644 --- a/drivers/net/can/spi/mcp251xfd/Makefile +++ b/drivers/net/can/spi/mcp251xfd/Makefile @@ -1,8 +1,8 @@ @@ -474698,7 +474698,7 @@ index e943e6a2db0c..cb71244cbe89 100644 +mcp251xfd-objs += mcp251xfd-crc16.o +mcp251xfd-objs += mcp251xfd-regmap.o diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c -index a1561d6e2326..147af29e6759 100644 +index a1561d6e2326e..147af29e67593 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -25,7 +25,7 @@ @@ -474721,10 +474721,10 @@ index a1561d6e2326..147af29e6759 100644 2.18.4 -From a21a24fb4f945648810b1a7b37be42a087d8acf3 Mon Sep 17 00:00:00 2001 +From 6f4548ec53de479d560f04d21deadfed255eed54 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 30 Sep 2020 10:49:00 +0200 -Subject: [PATCH 1191/1216] can: mcp251xfd: rename all remaining occurrence to +Subject: [PATCH 1191/1224] can: mcp251xfd: rename all remaining occurrence to mcp251xfd In [1] Geert noted that the autodetect compatible for the mcp25xxfd driver, @@ -474749,7 +474749,7 @@ Signed-off-by: Marc Kleine-Budde 4 files changed, 1277 insertions(+), 1277 deletions(-) diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c -index 147af29e6759..dffa5d81a7c7 100644 +index 147af29e67593..dffa5d81a7c76 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -1,6 +1,6 @@ @@ -477895,7 +477895,7 @@ index 147af29e6759..dffa5d81a7c7 100644 MODULE_AUTHOR("Marc Kleine-Budde "); MODULE_DESCRIPTION("Microchip MCP251xFD Family CAN controller driver"); diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c -index bc90afb34df2..a02ca76ac239 100644 +index bc90afb34df29..a02ca76ac2398 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c @@ -1,6 +1,6 @@ @@ -477961,7 +477961,7 @@ index bc90afb34df2..a02ca76ac239 100644 return crc; } diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c -index 3511317bb49b..ba25902dd78c 100644 +index 3511317bb49bb..ba25902dd78c7 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c @@ -1,6 +1,6 @@ @@ -478529,7 +478529,7 @@ index 3511317bb49b..ba25902dd78c 100644 return 0; diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h -index b1b5d7fd33ea..fa1246e39980 100644 +index b1b5d7fd33ea7..fa1246e399806 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h @@ -1,14 +1,14 @@ @@ -479848,10 +479848,10 @@ index b1b5d7fd33ea..fa1246e39980 100644 2.18.4 -From fe3e722daa6b1a7baef04f0f77f76502af2b099f Mon Sep 17 00:00:00 2001 +From 4585c059947b9e6a08f06395078df9cfa79679e6 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 15 Oct 2020 21:16:37 +0200 -Subject: [PATCH 1192/1216] can: mcp251xfd: mcp251xfd_regmap_crc_read(): +Subject: [PATCH 1192/1224] can: mcp251xfd: mcp251xfd_regmap_crc_read(): increase severity of CRC read error messages During debugging it turned out that some people have setups where the SPI @@ -479872,7 +479872,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c -index ba25902dd78c..c9ffc5ea2b25 100644 +index ba25902dd78c7..c9ffc5ea2b25c 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c @@ -330,17 +330,17 @@ mcp251xfd_regmap_crc_read(void *context, @@ -479905,10 +479905,10 @@ index ba25902dd78c..c9ffc5ea2b25 100644 2.18.4 -From c0abc698f320c19944e4399c986d51a021513cb4 Mon Sep 17 00:00:00 2001 +From b76b0f5f87a2449f1679728aadc42769be1ba5d9 Mon Sep 17 00:00:00 2001 From: kernel test robot Date: Mon, 19 Oct 2020 20:08:05 +0800 -Subject: [PATCH 1193/1216] can: mcp251xfd: mcp251xfd_regmap_nocrc_read(): fix +Subject: [PATCH 1193/1224] can: mcp251xfd: mcp251xfd_regmap_nocrc_read(): fix semicolon.cocci warnings drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c:176:2-3: Unneeded semicolon @@ -479928,7 +479928,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c -index c9ffc5ea2b25..314f868b3465 100644 +index c9ffc5ea2b25c..314f868b34658 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c @@ -173,7 +173,7 @@ mcp251xfd_regmap_nocrc_read(void *context, @@ -479944,10 +479944,10 @@ index c9ffc5ea2b25..314f868b3465 100644 2.18.4 -From 2f6b1dd101c27149ac89f261ac3bdc1848dca9e1 Mon Sep 17 00:00:00 2001 +From 6f137230edfe4ce18086e2a510f430bec1e18f7e Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Mon, 19 Oct 2020 10:24:12 -0700 -Subject: [PATCH 1194/1216] can: mcp251xfd: remove unneeded break +Subject: [PATCH 1194/1224] can: mcp251xfd: remove unneeded break A break is not needed if it is preceded by a return. @@ -479961,7 +479961,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c -index dffa5d81a7c7..ac3025ccd9d5 100644 +index dffa5d81a7c76..ac3025ccd9d5f 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -75,11 +75,11 @@ static const char *__mcp251xfd_get_model_str(enum mcp251xfd_model model) @@ -480013,10 +480013,10 @@ index dffa5d81a7c7..ac3025ccd9d5 100644 2.18.4 -From 9d869d962e2f6ffb100894134532d78c49ad3c50 Mon Sep 17 00:00:00 2001 +From ff46e19441ed88789d2290f2b3ebdc11587fce6b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 15 Nov 2019 00:54:07 +0100 -Subject: [PATCH 1195/1216] mcp251xfd: add overlay +Subject: [PATCH 1195/1224] mcp251xfd: add overlay Signed-off-by: Marc Kleine-Budde --- @@ -480027,7 +480027,7 @@ Signed-off-by: Marc Kleine-Budde create mode 100644 arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 467cc0ae9194..04219c05c385 100644 +index 467cc0ae9194b..04219c05c3850 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -108,6 +108,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -480039,7 +480039,7 @@ index 467cc0ae9194..04219c05c385 100644 mcp3202.dtbo \ mcp342x.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index dd33a27178b5..ea76358a7ff4 100644 +index dd33a27178b5a..ea76358a7ff46 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1763,6 +1763,28 @@ Params: oscillator Clock frequency for the CAN controller (Hz) @@ -480073,7 +480073,7 @@ index dd33a27178b5..ea76358a7ff4 100644 For devices on spi1 or spi2, the interfaces should be enabled diff --git a/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts new file mode 100644 -index 000000000000..65c861bbd340 +index 0000000000000..65c861bbd3401 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts @@ -0,0 +1,226 @@ @@ -480307,10 +480307,10 @@ index 000000000000..65c861bbd340 2.18.4 -From 8d96d3e56ab447d74d4550b38b86fe522a0a3417 Mon Sep 17 00:00:00 2001 +From a7bc2f7b823deb55ff9f730a1bd5310df595f71e Mon Sep 17 00:00:00 2001 From: Patrick Menschel Date: Wed, 28 Oct 2020 20:35:35 +0100 -Subject: [PATCH 1196/1216] Add mcp251xfd driver as module to RPI build +Subject: [PATCH 1196/1224] Add mcp251xfd driver as module to RPI build configuration This Patch adds MCP251XFD=m Kconfig flag to the 32 bit RPI defconfig files: @@ -480334,7 +480334,7 @@ Signed-off-by: Marc Kleine-Budde 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index b062fead409b..096894330856 100644 +index b062fead409b0..0968943308560 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -416,6 +416,7 @@ CONFIG_CAN=m @@ -480346,7 +480346,7 @@ index b062fead409b..096894330856 100644 CONFIG_CAN_GS_USB=m CONFIG_BT=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 598e9e198951..1a6853beda54 100644 +index 598e9e1989510..1a6853beda549 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -417,6 +417,7 @@ CONFIG_CAN=m @@ -480358,7 +480358,7 @@ index 598e9e198951..1a6853beda54 100644 CONFIG_CAN_GS_USB=m CONFIG_BT=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 520d0bf8c700..bd00983d72a9 100644 +index 520d0bf8c7001..bd00983d72a93 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -410,6 +410,7 @@ CONFIG_CAN=m @@ -480370,7 +480370,7 @@ index 520d0bf8c700..bd00983d72a9 100644 CONFIG_CAN_GS_USB=m CONFIG_BT=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 39f2fc51de4d..3de6d6dd9ed3 100644 +index 39f2fc51de4d6..3de6d6dd9ed34 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -416,6 +416,7 @@ CONFIG_CAN=m @@ -480382,7 +480382,7 @@ index 39f2fc51de4d..3de6d6dd9ed3 100644 CONFIG_CAN_GS_USB=m CONFIG_BT=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 3d43b416bce4..3c2980cc8f35 100644 +index 3d43b416bce45..3c2980cc8f35d 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -407,6 +407,7 @@ CONFIG_YAM=m @@ -480397,10 +480397,10 @@ index 3d43b416bce4..3c2980cc8f35 100644 2.18.4 -From 74d868033b15ce117dbe9563414e6cc1856d6503 Mon Sep 17 00:00:00 2001 +From 2654e16c4316c621fbc232978859b46826656ad4 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 5 Aug 2020 12:57:21 +0200 -Subject: [PATCH 1197/1216] media: i2c: imx219: Selection compliance fixes +Subject: [PATCH 1197/1224] media: i2c: imx219: Selection compliance fixes To comply with the intended usage of the V4L2 selection target when used to retrieve a sensor image properties, adjust the rectangles @@ -480424,7 +480424,7 @@ Signed-off-by: Jacopo Mondi 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index 812323107f36..fbbee1b08a8c 100644 +index 812323107f36c..fbbee1b08a8ce 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -485,8 +485,8 @@ static const struct imx219_mode supported_modes[] = { @@ -480483,10 +480483,10 @@ index 812323107f36..fbbee1b08a8c 100644 2.18.4 -From b2db08eefa872cdde7472d0bab098026b3646cd6 Mon Sep 17 00:00:00 2001 +From 9a84bedcfff02bb750f84431154a30dd44d70034 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 2 Dec 2020 15:22:23 +0000 -Subject: [PATCH 1198/1216] media: bcm2835-unicam: Correctly handle error +Subject: [PATCH 1198/1224] media: bcm2835-unicam: Correctly handle error propagation for stream on On a failure in start_streaming(), the error code would not propagate to @@ -480499,7 +480499,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 6501fb205e20..c13a0a20fd12 100644 +index 6501fb205e205..c13a0a20fd126 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -1730,8 +1730,7 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count) @@ -480516,10 +480516,10 @@ index 6501fb205e20..c13a0a20fd12 100644 2.18.4 -From c1c37108d5b2d81a245c78574a3740a392767bbd Mon Sep 17 00:00:00 2001 +From 3e8948b327720866060e22ed83ee482ef3459b72 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 2 Dec 2020 15:26:09 +0000 -Subject: [PATCH 1199/1216] media: bcm2835-unicam: Return early from +Subject: [PATCH 1199/1224] media: bcm2835-unicam: Return early from stop_streaming() if stopped clk_disable_unprepare() is called unconditionally in stop_streaming(). @@ -480534,7 +480534,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index c13a0a20fd12..60309de02369 100644 +index c13a0a20fd126..60309de02369d 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -426,6 +426,8 @@ struct unicam_device { @@ -480586,10 +480586,10 @@ index c13a0a20fd12..60309de02369 100644 2.18.4 -From bd5744f64e5ce908787ac52a322b669f142d1551 Mon Sep 17 00:00:00 2001 +From 388f571a648ef8f3a683493c2802ded20955eaf9 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 2 Dec 2020 16:48:41 +0000 -Subject: [PATCH 1200/1216] media: bcm2835-unicam: Clear clock state when +Subject: [PATCH 1200/1224] media: bcm2835-unicam: Clear clock state when stopping streaming Commit 65e08c465020d4c5b51afb452efc2246d80fd66f failed to clear the @@ -480602,7 +480602,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 1 insertion(+) diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 60309de02369..a8b3f5433f04 100644 +index 60309de02369d..a8b3f5433f041 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -1769,6 +1769,7 @@ static void unicam_stop_streaming(struct vb2_queue *vq) @@ -480617,10 +480617,10 @@ index 60309de02369..a8b3f5433f04 100644 2.18.4 -From 58405bfdac5e9a20e1ca879d7806ff58b7da6403 Mon Sep 17 00:00:00 2001 +From 7875626f66b5d4d743d142a4c3bf223ad4e90387 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 09:35:57 +0000 -Subject: [PATCH 1201/1216] ARM: dts: CM4 audio pins are not connected +Subject: [PATCH 1201/1224] ARM: dts: CM4 audio pins are not connected Signed-off-by: Phil Elwell --- @@ -480628,7 +480628,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -index a969000c0b89..fc3f062fd820 100644 +index a969000c0b899..fc3f062fd820d 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -434,8 +434,6 @@ @@ -480644,10 +480644,10 @@ index a969000c0b89..fc3f062fd820 100644 2.18.4 -From 6f727e817354db8f1348c41b0517142bfd491107 Mon Sep 17 00:00:00 2001 +From b17bdf61203c5f11cdd216b10100c0b7672736f5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 08:33:19 +0000 -Subject: [PATCH 1202/1216] configs: Add RTC_DRV_PCF85063=m +Subject: [PATCH 1202/1224] configs: Add RTC_DRV_PCF85063=m Include the driver module for the PCF85063 and PCF85063A RTC devices. @@ -480661,7 +480661,7 @@ Signed-off-by: Phil Elwell 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 096894330856..9df5d9941791 100644 +index 0968943308560..9df5d99417911 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1238,6 +1238,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -480673,7 +480673,7 @@ index 096894330856..9df5d9941791 100644 CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 1a6853beda54..e3b19eba75a6 100644 +index 1a6853beda549..e3b19eba75a6a 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1274,6 +1274,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -480685,7 +480685,7 @@ index 1a6853beda54..e3b19eba75a6 100644 CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index bd00983d72a9..1f2c5558453f 100644 +index bd00983d72a93..1f2c5558453f0 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1248,6 +1248,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -480697,7 +480697,7 @@ index bd00983d72a9..1f2c5558453f 100644 CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 3de6d6dd9ed3..c37aa87597df 100644 +index 3de6d6dd9ed34..c37aa87597df5 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1273,6 +1273,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -480709,7 +480709,7 @@ index 3de6d6dd9ed3..c37aa87597df 100644 CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index 3c2980cc8f35..599472e99d39 100644 +index 3c2980cc8f35d..599472e99d39a 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1131,6 +1131,7 @@ CONFIG_RTC_DRV_ISL1208=m @@ -480724,10 +480724,10 @@ index 3c2980cc8f35..599472e99d39 100644 2.18.4 -From ea473d771744bb23776a4dc6537056b8f8643b6a Mon Sep 17 00:00:00 2001 +From ebced79079a68116a081b81089414ca4e558c17e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 08:49:53 +0000 -Subject: [PATCH 1203/1216] overlays: Add PCF85063 and PCF85063A to i2c-rtc +Subject: [PATCH 1203/1224] overlays: Add PCF85063 and PCF85063A to i2c-rtc Add support for the PCF85063 and PCF85063A RTC devices to the i2c-rtc overlay. @@ -480742,7 +480742,7 @@ Signed-off-by: Phil Elwell 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index ea76358a7ff4..cc380d8049c1 100644 +index ea76358a7ff46..cc380d8049c1c 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1243,6 +1243,10 @@ Params: abx80x Select one of the ABx80x family: @@ -480768,7 +480768,7 @@ index ea76358a7ff4..cc380d8049c1 100644 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 735ca303e4fa..759f532d5be1 100644 +index 735ca303e4fa7..759f532d5be15 100644 --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts @@ -6,235 +6,238 @@ @@ -481071,10 +481071,10 @@ index 735ca303e4fa..759f532d5be1 100644 2.18.4 -From ae82d84315bb36c7986c7bb3f66a9883fb904cda Mon Sep 17 00:00:00 2001 +From b75d7b166a7bf7067f4cbb3b317141c7a74b53b8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 7 Dec 2020 17:18:39 +0000 -Subject: [PATCH 1204/1216] overlays: Fix cut-and-paste error in README +Subject: [PATCH 1204/1224] overlays: Fix cut-and-paste error in README Signed-off-by: Phil Elwell --- @@ -481082,7 +481082,7 @@ Signed-off-by: Phil Elwell 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index cc380d8049c1..b393c9651d08 100644 +index cc380d8049c1c..b393c9651d08c 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1243,9 +1243,9 @@ Params: abx80x Select one of the ABx80x family: @@ -481101,10 +481101,10 @@ index cc380d8049c1..b393c9651d08 100644 2.18.4 -From 6558cb8ef440b8156873b8942b5702d26498c0ed Mon Sep 17 00:00:00 2001 +From f1d7adb475c07e0edce69f1f0710941e33832ee9 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 9 Dec 2020 11:30:12 +0000 -Subject: [PATCH 1205/1216] media: i2c: imx477: Selection compliance fixes +Subject: [PATCH 1205/1224] media: i2c: imx477: Selection compliance fixes To comply with the intended usage of the V4L2 selection target when used to retrieve a sensor image properties, adjust the rectangles @@ -481128,7 +481128,7 @@ Signed-off-by: Naushir Patuck 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c -index 3fbb173fa079..f68e7718b09c 100644 +index 3fbb173fa0796..f68e7718b09c5 100644 --- a/drivers/media/i2c/imx477.c +++ b/drivers/media/i2c/imx477.c @@ -900,8 +900,8 @@ static const struct imx477_mode supported_modes_12bit[] = { @@ -481187,10 +481187,10 @@ index 3fbb173fa079..f68e7718b09c 100644 2.18.4 -From 9dd43656d53d3bd30568232ffcc2db4b59c8dfaa Mon Sep 17 00:00:00 2001 +From efbba6764f516e7a267e0a56d55cff92a90f99ae Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Dec 2020 16:38:37 +0000 -Subject: [PATCH 1206/1216] net: lan78xx: Ack pending PHY ints when resetting +Subject: [PATCH 1206/1224] net: lan78xx: Ack pending PHY ints when resetting lan78xx_link_reset explicitly clears the MAC's view of the PHY's IRQ status. In doing so it potentially leaves the PHY with a pending @@ -481208,7 +481208,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index f72ab25e7d06..fc14099fc4b2 100644 +index f72ab25e7d06c..fc14099fc4b2a 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1181,6 +1181,9 @@ static int lan78xx_link_reset(struct lan78xx_net *dev) @@ -481225,10 +481225,10 @@ index f72ab25e7d06..fc14099fc4b2 100644 2.18.4 -From 6fad1eef823033df504b86674571ae38d2546369 Mon Sep 17 00:00:00 2001 +From 5a9dcbca19bac373bb49ef64a1bcb9ee30f341c3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Dec 2020 17:02:17 +0000 -Subject: [PATCH 1207/1216] overlays: mpu6050: Add 'addr' parameter +Subject: [PATCH 1207/1224] overlays: mpu6050: Add 'addr' parameter The mpu6050 starts up at address 0x68 by default, but can be set to 0x69 if the ADO pin is pulled high. Give the overlay an addr parameter @@ -481243,7 +481243,7 @@ Signed-off-by: Phil Elwell 2 files changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index b393c9651d08..c95f06407c5f 100644 +index b393c9651d08c..c95f06407c5f7 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1898,6 +1898,7 @@ Name: mpu6050 @@ -481255,7 +481255,7 @@ index b393c9651d08..c95f06407c5f 100644 Name: mz61581 diff --git a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts -index 3109d90562ae..1b4c06535687 100644 +index 3109d90562aee..1b4c065356874 100644 --- a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts +++ b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts @@ -24,5 +24,6 @@ @@ -481269,10 +481269,10 @@ index 3109d90562ae..1b4c06535687 100644 2.18.4 -From 526fca8dc329f3f5410fa931cbe82de16ec75bf1 Mon Sep 17 00:00:00 2001 +From 2317964338fca1201434ad03d3039b1841d9ead1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 16 Dec 2020 09:28:17 +0000 -Subject: [PATCH 1208/1216] overlays: Add missing addresses to ads1015/ads1115 +Subject: [PATCH 1208/1224] overlays: Add missing addresses to ads1015/ads1115 The overlays for the ads1015 and ads1115 I2C ADCs omitted the addresses in the main device node names. As well as breaking the conventions for @@ -481289,7 +481289,7 @@ Signed-off-by: Phil Elwell 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/ads1015-overlay.dts b/arch/arm/boot/dts/overlays/ads1015-overlay.dts -index deeee1228395..dc1764613a8b 100644 +index deeee12283956..dc1764613a8b0 100644 --- a/arch/arm/boot/dts/overlays/ads1015-overlay.dts +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts @@ -13,7 +13,7 @@ @@ -481302,7 +481302,7 @@ index deeee1228395..dc1764613a8b 100644 status = "okay"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/overlays/ads1115-overlay.dts b/arch/arm/boot/dts/overlays/ads1115-overlay.dts -index 4fc571c2db33..e44ced704ee2 100644 +index 4fc571c2db334..e44ced704ee2d 100644 --- a/arch/arm/boot/dts/overlays/ads1115-overlay.dts +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts @@ -15,7 +15,7 @@ @@ -481318,10 +481318,10 @@ index 4fc571c2db33..e44ced704ee2 100644 2.18.4 -From 4f16c7a9eb35b27fa84c3d7b730d507e5336cbef Mon Sep 17 00:00:00 2001 +From 6758de44ec177858f1d908446316174bd509f199 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Mon, 26 Oct 2020 14:03:35 +0000 -Subject: [PATCH 1209/1216] xhci: quirks: add link TRB quirk for VL805 +Subject: [PATCH 1209/1224] xhci: quirks: add link TRB quirk for VL805 The VL805 controller can't cope with the TR Dequeue Pointer for an endpoint being set to a Link TRB. The hardware-maintained endpoint context ends up @@ -481341,7 +481341,7 @@ Signed-off-by: Jonathan Bell 3 files changed, 12 insertions(+) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index 73600f6b2c1b..64c66dcaca43 100644 +index 73600f6b2c1b8..64c66dcaca430 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -258,6 +258,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) @@ -481353,7 +481353,7 @@ index 73600f6b2c1b..64c66dcaca43 100644 if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index d99e636f3844..8149abff857c 100644 +index 32939242ec170..d7f719ae76587 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -624,6 +624,16 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, @@ -481374,7 +481374,7 @@ index d99e636f3844..8149abff857c 100644 state->new_deq_ptr = new_deq; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 1bd165cbd74f..77594e7c8bb2 100644 +index 1bd165cbd74f0..77594e7c8bb2e 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1874,6 +1874,7 @@ struct xhci_hcd { @@ -481389,10 +481389,10 @@ index 1bd165cbd74f..77594e7c8bb2 100644 2.18.4 -From d77715a693c0f9d0f89112b9ed3acce5c0a9dd2b Mon Sep 17 00:00:00 2001 +From 9f808e206681589f2fa8278a000f1844aa399e50 Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Tue, 22 Dec 2020 14:27:46 +0900 -Subject: [PATCH 1210/1216] media: i2c: ov5647: Selection compliance fixes +Subject: [PATCH 1210/1224] media: i2c: ov5647: Selection compliance fixes To comply with the intended usage of the V4L2 selection target when used to retrieve a sensor image properties, adjust the rectangles @@ -481413,7 +481413,7 @@ Signed-off-by: Paul Elder 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index 86a821a172b3..40d0d45a2481 100644 +index 86a821a172b3d..40d0d45a2481f 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -606,8 +606,8 @@ static struct ov5647_mode supported_modes_8bit[] = { @@ -481483,10 +481483,10 @@ index 86a821a172b3..40d0d45a2481 100644 2.18.4 -From f39dc61df53f752579efa1a2396b98416e340382 Mon Sep 17 00:00:00 2001 +From e214df6bc1b422869cb26f8bd71639124a83e72c Mon Sep 17 00:00:00 2001 From: menschel Date: Wed, 30 Dec 2020 21:55:34 +0100 -Subject: [PATCH 1211/1216] Add overlay for Seeed Studio CAN BUS FD HAT (#4034) +Subject: [PATCH 1211/1224] Add overlay for Seeed Studio CAN BUS FD HAT (#4034) This patch adds the overlay for the Seeed Studio CAN BUS FD HAT with two CAN FD Channels and an RTC. @@ -481509,7 +481509,7 @@ Signed-off-by: Patrick Menschel create mode 100644 arch/arm/boot/dts/overlays/seeed-can-fd-hat-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 04219c05c385..ff269e097688 100644 +index 04219c05c3850..ff269e097688b 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -160,6 +160,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -481521,7 +481521,7 @@ index 04219c05c385..ff269e097688 100644 smi.dtbo \ smi-dev.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index c95f06407c5f..60a490625c23 100644 +index c95f06407c5f7..60a490625c23a 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -81,6 +81,44 @@ Parameters usually have default values, although certain parameters are @@ -481586,7 +481586,7 @@ index c95f06407c5f..60a490625c23 100644 Load: dtoverlay=sh1106-spi,= diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-overlay.dts new file mode 100644 -index 000000000000..e843d0b19745 +index 0000000000000..e843d0b197450 --- /dev/null +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-overlay.dts @@ -0,0 +1,117 @@ @@ -481711,10 +481711,10 @@ index 000000000000..e843d0b19745 2.18.4 -From d7352d4fa12950832dc436635945d4aa458f3754 Mon Sep 17 00:00:00 2001 +From 018a42bfceae0f37d9884b7f3d3f324c16d909fa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 30 Dec 2020 20:00:38 +0000 -Subject: [PATCH 1212/1216] overlays: Rebuild "upstream" with latest ovmerge +Subject: [PATCH 1212/1224] overlays: Rebuild "upstream" with latest ovmerge The latest ovmerge drops disabled fragments, causing the "upstream" overlay to change. @@ -481726,7 +481726,7 @@ Signed-off-by: Phil Elwell 2 files changed, 15 insertions(+), 51 deletions(-) diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts -index 2e9dcd4f5f0a..7c4071a7cb27 100644 +index 2e9dcd4f5f0a3..7c4071a7cb270 100644 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts @@ -8,96 +8,84 @@ @@ -481840,7 +481840,7 @@ index 2e9dcd4f5f0a..7c4071a7cb27 100644 #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts -index 5673f61b7951..1681c3060b62 100644 +index 5673f61b79518..1681c3060b629 100644 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts @@ -110,42 +110,18 @@ @@ -481892,10 +481892,10 @@ index 5673f61b7951..1681c3060b62 100644 2.18.4 -From b34e44ac2afb1b43d83010a52f95b172a0d39251 Mon Sep 17 00:00:00 2001 +From dd57fcadfe40e15b66c214e6aa43efedc4f59809 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 2 Jan 2021 21:08:59 +0100 -Subject: [PATCH 1213/1216] overlays: give Seeed Studio CAN BUS FD HAT a -v2 +Subject: [PATCH 1213/1224] overlays: give Seeed Studio CAN BUS FD HAT a -v2 postfix There are several versions of the Seeed Studio CAN BUS FD HAT. This is the @@ -481910,7 +481910,7 @@ Signed-off-by: Marc Kleine-Budde rename arch/arm/boot/dts/overlays/{seeed-can-fd-hat-overlay.dts => seeed-can-fd-hat-v2-overlay.dts} (100%) diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index ff269e097688..64e36e8c28da 100644 +index ff269e097688b..64e36e8c28dac 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -160,7 +160,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -481923,7 +481923,7 @@ index ff269e097688..64e36e8c28da 100644 smi.dtbo \ smi-dev.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 60a490625c23..003cd5de6141 100644 +index 60a490625c23a..003cd5de6141c 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2482,11 +2482,11 @@ Info: This overlay is now deprecated. Use the sd_* dtparams in the @@ -481950,10 +481950,10 @@ rename to arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts 2.18.4 -From 39631241ff71286251877079cad1dbd615aa25d7 Mon Sep 17 00:00:00 2001 +From 2e1ffcb5147cb1de7126554b29565e3a6372e99b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 2 Jan 2021 21:38:58 +0100 -Subject: [PATCH 1214/1216] overlays: Add overlay for Seeed Studio CAN BUS FD +Subject: [PATCH 1214/1224] overlays: Add overlay for Seeed Studio CAN BUS FD HAT v1 (based on mcp2517fd) This patch adds the overlay for the Seeed Studio CAN BUS FD HAT v1 with two CAN @@ -481975,7 +481975,7 @@ Signed-off-by: Marc Kleine-Budde create mode 100644 arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 64e36e8c28da..25028bd73756 100644 +index 64e36e8c28dac..25028bd73756c 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -160,6 +160,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -481987,7 +481987,7 @@ index 64e36e8c28da..25028bd73756 100644 sh1106-spi.dtbo \ smi.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 003cd5de6141..a4fc41ca93d1 100644 +index 003cd5de6141c..a4fc41ca93d13 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2482,6 +2482,14 @@ Info: This overlay is now deprecated. Use the sd_* dtparams in the @@ -482007,7 +482007,7 @@ index 003cd5de6141..a4fc41ca93d1 100644 (based on the mcp2518fd) and an RTC. diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts new file mode 100644 -index 000000000000..210d027a073e +index 0000000000000..210d027a073ee --- /dev/null +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts @@ -0,0 +1,138 @@ @@ -482153,10 +482153,10 @@ index 000000000000..210d027a073e 2.18.4 -From 3800c83567147e00263ff6e225ca3040933823e1 Mon Sep 17 00:00:00 2001 +From 09bd92b8ab86234f57ae95aea49937e0d474a0fb Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Sat, 2 Jan 2021 02:34:03 +0000 -Subject: [PATCH 1215/1216] overlays: add wm8960-soundcard overlay +Subject: [PATCH 1215/1224] overlays: add wm8960-soundcard overlay add overlay for waveshare wm8960 simple-audio-card @@ -482170,7 +482170,7 @@ Signed-off-by: Aaron Shaw create mode 100644 arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 25028bd73756..d8a3677b583e 100644 +index 25028bd73756c..d8a3677b583e2 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -211,7 +211,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ @@ -482184,7 +482184,7 @@ index 25028bd73756..d8a3677b583e 100644 targets += dtbs dtbs_install targets += $(dtbo-y) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index a4fc41ca93d1..6f2a6ecc869f 100644 +index a4fc41ca93d13..6f2a6ecc869f1 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -3095,6 +3095,13 @@ Params: led_gpio GPIO for LED (default "17") @@ -482203,7 +482203,7 @@ index a4fc41ca93d1..6f2a6ecc869f 100644 diff --git a/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts new file mode 100644 -index 000000000000..289fa4dacdf1 +index 0000000000000..289fa4dacdf1f --- /dev/null +++ b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts @@ -0,0 +1,82 @@ @@ -482293,10 +482293,10 @@ index 000000000000..289fa4dacdf1 2.18.4 -From a17b4abf0feb23f97ad45f84c3969a17470d0e39 Mon Sep 17 00:00:00 2001 +From 8f453a2a733ca80ee789a7eeed799fe713221e98 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Sat, 26 Dec 2020 03:13:14 +0000 -Subject: [PATCH 1216/1216] overlays: add spi override to merus-amp overlay +Subject: [PATCH 1216/1224] overlays: add spi override to merus-amp overlay adds an override to the merus-amp overlay to turn the spi bus off @@ -482308,7 +482308,7 @@ Signed-off-by: Aaron Shaw 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 6f2a6ecc869f..53ef924a4401 100644 +index 6f2a6ecc869f1..53ef924a44011 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1892,8 +1892,8 @@ Params: speed Display SPI bus speed @@ -482323,7 +482323,7 @@ index 6f2a6ecc869f..53ef924a4401 100644 Name: midi-uart0 diff --git a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts -index 4501fbdc253d..bbffd7d26324 100644 +index 4501fbdc253da..bbffd7d263249 100644 --- a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts +++ b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts @@ -57,4 +57,14 @@ @@ -482344,3 +482344,749 @@ index 4501fbdc253d..bbffd7d26324 100644 -- 2.18.4 + +From 33ac1c9d8fd342049014e3546729ee1fdd41b110 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde +Date: Sat, 9 Jan 2021 17:03:32 +0100 +Subject: [PATCH 1217/1224] overlays: seeed-can-fd-hat: clarify how to identify + HAT version + +It turns out the used CAN SPI chip is not a good way to identify the version of +the CAN HAT. + +There are two different board layouts of the Seeed Studio CAN BUS FD HAT. The +v1 board doesn't have a battery holder, while the v2 board has. Update the +overlay README accordinly. + +Link: https://github.com/Seeed-Studio/seeed-linux-dtoverlays/issues/13 +Cc: Patrick Menschel +Signed-off-by: Marc Kleine-Budde +--- + arch/arm/boot/dts/overlays/README | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 53ef924a44011..5252b1e67326a 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -2483,16 +2483,18 @@ Load: + + + Name: seeed-can-fd-hat-v1 +-Info: Overlay for Seeed Studio CAN BUS FD HAT with two CAN FD channels +- (based on the mcp2517fd). ++Info: Overlay for Seeed Studio CAN BUS FD HAT with two CAN FD ++ channels without RTC. Use this overlay if your HAT has no ++ battery holder. + https://www.seeedstudio.com/2-Channel-CAN-BUS-FD-Shield-for-Raspberry-Pi-p-4072.html + Load: dtoverlay=seeed-can-fd-hat-v1 + Params: + + + Name: seeed-can-fd-hat-v2 +-Info: Overlay for Seeed Studio CAN BUS FD HAT with two CAN FD channels +- (based on the mcp2518fd) and an RTC. ++Info: Overlay for Seeed Studio CAN BUS FD HAT with two CAN FD ++ channels and an RTC. Use this overlay if your HAT has a ++ battery holder. + https://www.seeedstudio.com/CAN-BUS-FD-HAT-for-Raspberry-Pi-p-4742.html + Load: dtoverlay=seeed-can-fd-hat-v2 + Params: +-- +2.18.4 + + +From 629304142c371269c48c8a9ad8cb2e0b2fdb960c Mon Sep 17 00:00:00 2001 +From: Naushir Patuck +Date: Thu, 14 Jan 2021 09:18:42 +0000 +Subject: [PATCH 1218/1224] uapi: bcm2835-isp: Add colour denoise configuration + +Add a configuration structure for colour denoise to the bcm2835_isp +driver. + +Signed-off-by: Naushir Patuck +--- + include/uapi/linux/bcm2835-isp.h | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h +index cf8c0437f1597..c50e3ca815657 100644 +--- a/include/uapi/linux/bcm2835-isp.h ++++ b/include/uapi/linux/bcm2835-isp.h +@@ -31,6 +31,8 @@ + (V4L2_CID_USER_BCM2835_ISP_BASE + 0x0007) + #define V4L2_CID_USER_BCM2835_ISP_DPC \ + (V4L2_CID_USER_BCM2835_ISP_BASE + 0x0008) ++#define V4L2_CID_USER_BCM2835_ISP_CDN \ ++ (V4L2_CID_USER_BCM2835_ISP_BASE + 0x0009) + + /* + * All structs below are directly mapped onto the equivalent structs in +@@ -175,6 +177,31 @@ struct bcm2835_isp_gamma { + __u16 y[BCM2835_NUM_GAMMA_PTS]; + }; + ++/** ++ * enum bcm2835_isp_cdn_mode - Mode of operation for colour denoise. ++ * ++ * @CDN_MODE_FAST: Fast (but lower quality) colour denoise ++ * algorithm, typically used for video recording. ++ * @CDN_HIGH_QUALITY: High quality (but slower) colour denoise ++ * algorithm, typically used for stills capture. ++ */ ++enum bcm2835_isp_cdn_mode { ++ CDN_MODE_FAST = 0, ++ CDN_MODE_HIGH_QUALITY = 1, ++}; ++ ++/** ++ * struct bcm2835_isp_cdn - Colour denoise parameters set with the ++ * V4L2_CID_USER_BCM2835_ISP_CDN ctrl. ++ * ++ * @enabled: Enable colour denoise. ++ * @mode: Colour denoise operating mode (see enum &bcm2835_isp_cdn_mode) ++ */ ++struct bcm2835_isp_cdn { ++ __u32 enabled; ++ __u32 mode; ++}; ++ + /** + * struct bcm2835_isp_denoise - Denoise parameters set with the + * V4L2_CID_USER_BCM2835_ISP_DENOISE ctrl. +-- +2.18.4 + + +From 1e0303f6083414270081a556a9849b39c1852d07 Mon Sep 17 00:00:00 2001 +From: Naushir Patuck +Date: Thu, 14 Jan 2021 09:20:52 +0000 +Subject: [PATCH 1219/1224] staging: vc04_services: ISP: Add colour denoise + control + +Add colour denoise control to the bcm2835 driver through a new v4l2 +control: V4L2_CID_USER_BCM2835_ISP_CDN. + +Add the accompanying MMAL configuration structure definitions as well. + +Signed-off-by: Naushir Patuck +--- + .../vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 5 +++++ + .../vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h | 5 +++++ + .../vc04_services/vchiq-mmal/mmal-parameters.h | 13 +++++++++++++ + 3 files changed, 23 insertions(+) + +diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +index f3703f2a01438..b9cf092cc3165 100644 +--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c ++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +@@ -776,6 +776,11 @@ static int bcm2835_isp_s_ctrl(struct v4l2_ctrl *ctrl) + ctrl->p_new.p_u8, + sizeof(struct bcm2835_isp_denoise)); + break; ++ case V4L2_CID_USER_BCM2835_ISP_CDN: ++ ret = set_isp_param(node, MMAL_PARAMETER_CDN, ++ ctrl->p_new.p_u8, ++ sizeof(struct bcm2835_isp_cdn)); ++ break; + case V4L2_CID_USER_BCM2835_ISP_SHARPEN: + ret = set_isp_param(node, MMAL_PARAMETER_SHARPEN, + ctrl->p_new.p_u8, +diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h +index cfbb1063aad1c..172605718cdfb 100644 +--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h ++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h +@@ -56,6 +56,11 @@ static const struct bcm2835_isp_custom_ctrl custom_ctrls[] = { + .id = V4L2_CID_USER_BCM2835_ISP_DENOISE, + .size = sizeof(struct bcm2835_isp_denoise), + .flags = 0 ++ }, { ++ .name = "Colour Denoise", ++ .id = V4L2_CID_USER_BCM2835_ISP_CDN, ++ .size = sizeof(struct bcm2835_isp_cdn), ++ .flags = 0 + }, { + .name = "Defective Pixel Correction", + .id = V4L2_CID_USER_BCM2835_ISP_DPC, +diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +index 5b596b5c057f8..bcc55483561d8 100644 +--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h ++++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +@@ -277,6 +277,8 @@ enum mmal_parameter_camera_type { + MMAL_PARAMETER_DPC, + /**< Tales a @ref MMAP_PARAMETER_GAMMA_T */ + MMAL_PARAMETER_GAMMA, ++ /**< Takes a @ref MMAL_PARAMETER_CDN_T */ ++ MMAL_PARAMETER_CDN, + }; + + struct mmal_parameter_rational { +@@ -910,6 +912,17 @@ struct mmal_parameter_gamma { + u16 y[MMAL_NUM_GAMMA_PTS]; + }; + ++enum mmal_parameter_cdn_mode { ++ MMAL_PARAM_CDN_FAST = 0, ++ MMAL_PARAM_CDN_HIGH_QUALITY = 1, ++ MMAL_PARAM_CDN_DUMMY = 0x7FFFFFFF ++}; ++ ++struct mmal_parameter_colour_denoise { ++ u32 enabled; ++ enum mmal_parameter_cdn_mode mode; ++}; ++ + struct mmal_parameter_denoise { + u32 enabled; + u32 constant; +-- +2.18.4 + + +From 322c7d1ce0dfb094dea4521a0ce0bee63fae682d Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Fri, 29 Jan 2021 10:34:11 +0000 +Subject: [PATCH 1220/1224] kbuild: Silence unavoidable dtc overlay warnings + +Much effort has been put into finding ways to avoid warnings from dtc +about overlays, usually to do with the presence of #address-cells and +size-cells, but not exclusively so. Since the issues being warned about +are harmless, suppress the warnings to declutter the build output and +to avoid alarming users. + +Signed-off-by: Phil Elwell +--- + scripts/Makefile.lib | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index bdec9e50358db..1968ce27299ec 100644 +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -306,6 +306,12 @@ cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \ + $(DTC) -@ -H epapr -O dtb -o $@ -b 0 \ + -i $(dir $<) $(DTC_FLAGS) \ + -Wno-interrupts_property \ ++ -Wno-label_is_string \ ++ -Wno-reg_format \ ++ -Wno-pci_device_bus_num \ ++ -Wno-i2c_bus_reg \ ++ -Wno-spi_bus_reg \ ++ -Wno-avoid_default_addr_size \ + -d $(depfile).dtc.tmp $(dtc-tmp) ; \ + cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) + +-- +2.18.4 + + +From 7a58cc81402a0c36af0150ae23cc13dc44918ef5 Mon Sep 17 00:00:00 2001 +From: Maxime Ripard +Date: Fri, 29 Jan 2021 15:29:04 +0100 +Subject: [PATCH 1221/1224] drm/vc4: hvs: Fix buffer overflow with the dlist + handling + +Commit 0a038c1c29a7 ("drm/vc4: Move LBM creation out of +vc4_plane_mode_set()") changed the LBM allocation logic from first +allocating the LBM memory for the plane to running mode_set, +adding a gap in the LBM, and then running the dlist allocation filling +that gap. + +The gap was introduced by incrementing the dlist array index, but was +never checking whether or not we were over the array length, leading +eventually to memory corruptions if we ever crossed this limit. + +vc4_dlist_write had that logic though, and was reallocating a larger +dlist array when reaching the end of the buffer. Let's share the logic +between both functions. + +Cc: Boris Brezillon +Cc: Eric Anholt +Fixes: 0a038c1c29a7 ("drm/vc4: Move LBM creation out of vc4_plane_mode_set()") +Signed-off-by: Maxime Ripard +--- + drivers/gpu/drm/vc4/vc4_plane.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c +index d0957d6181679..3732b24a2a8a5 100644 +--- a/drivers/gpu/drm/vc4/vc4_plane.c ++++ b/drivers/gpu/drm/vc4/vc4_plane.c +@@ -228,7 +228,7 @@ static void vc4_plane_reset(struct drm_plane *plane) + __drm_atomic_helper_plane_reset(plane, &vc4_state->base); + } + +-static void vc4_dlist_write(struct vc4_plane_state *vc4_state, u32 val) ++static void vc4_dlist_counter_increment(struct vc4_plane_state *vc4_state) + { + if (vc4_state->dlist_count == vc4_state->dlist_size) { + u32 new_size = max(4u, vc4_state->dlist_count * 2); +@@ -243,7 +243,15 @@ static void vc4_dlist_write(struct vc4_plane_state *vc4_state, u32 val) + vc4_state->dlist_size = new_size; + } + +- vc4_state->dlist[vc4_state->dlist_count++] = val; ++ vc4_state->dlist_count++; ++} ++ ++static void vc4_dlist_write(struct vc4_plane_state *vc4_state, u32 val) ++{ ++ unsigned int idx = vc4_state->dlist_count; ++ ++ vc4_dlist_counter_increment(vc4_state); ++ vc4_state->dlist[idx] = val; + } + + /* Returns the scl0/scl1 field based on whether the dimensions need to +@@ -1050,8 +1058,10 @@ static int vc4_plane_mode_set(struct drm_plane *plane, + * be set when calling vc4_plane_allocate_lbm(). + */ + if (vc4_state->y_scaling[0] != VC4_SCALING_NONE || +- vc4_state->y_scaling[1] != VC4_SCALING_NONE) +- vc4_state->lbm_offset = vc4_state->dlist_count++; ++ vc4_state->y_scaling[1] != VC4_SCALING_NONE) { ++ vc4_state->lbm_offset = vc4_state->dlist_count; ++ vc4_dlist_counter_increment(vc4_state); ++ } + + if (num_planes > 1) { + /* Emit Cb/Cr as channel 0 and Y as channel +-- +2.18.4 + + +From 01c4964e6b6c278bd5b41123fe67940524ac70a7 Mon Sep 17 00:00:00 2001 +From: Joerg Schambacher +Date: Fri, 29 Jan 2021 08:26:44 +0100 +Subject: [PATCH 1222/1224] Adds the DT-overlays to support Hifiberry AMP100 + +Adds new DT-overlay to control AMP100. + +Signed-off-by: Joerg Schambacher +--- + arch/arm/boot/dts/overlays/Makefile | 1 + + arch/arm/boot/dts/overlays/README | 30 ++++++++- + .../dts/overlays/hifiberry-amp100-overlay.dts | 64 +++++++++++++++++++ + 3 files changed, 94 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts + +diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile +index d8a3677b583e2..b6abddcb26158 100644 +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -60,6 +60,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + hd44780-lcd.dtbo \ + hdmi-backlight-hwhack-gpio.dtbo \ + hifiberry-amp.dtbo \ ++ hifiberry-amp100.dtbo \ + hifiberry-dac.dtbo \ + hifiberry-dacplus.dtbo \ + hifiberry-dacplusadc.dtbo \ +diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README +index 5252b1e67326a..f3d6bf57f40b8 100644 +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -1045,8 +1045,36 @@ Load: dtoverlay=hifiberry-amp + Params: + + ++Name: hifiberry-amp100 ++Info: Configures the HifiBerry AMP100 audio card ++Load: dtoverlay=hifiberry-amp100,= ++Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec ++ Digital volume control. Enable with ++ "dtoverlay=hifiberry-amp100,24db_digital_gain" ++ (The default behaviour is that the Digital ++ volume control is limited to a maximum of ++ 0dB. ie. it can attenuate but not provide ++ gain. For most users, this will be desired ++ as it will prevent clipping. By appending ++ the 24dB_digital_gain parameter, the Digital ++ volume control will allow up to 24dB of ++ gain. If this parameter is enabled, it is the ++ responsibility of the user to ensure that ++ the Digital volume control is set to a value ++ that does not result in clipping/distortion!) ++ slave Force DAC+ Pro into slave mode, using Pi as ++ master for bit clock and frame clock. ++ leds_off If set to 'true' the onboard indicator LEDs ++ are switched off at all times. ++ auto_mute If set to 'true' the amplifier is automatically ++ muted when the DAC is not playing. ++ mute_ext_ctl The amplifier's HW mute control is enabled ++ in ALSA mixer and set to . ++ Will be overwritten by ALSA user settings. ++ ++ + Name: hifiberry-dac +-Info: Configures the HifiBerry DAC audio card ++Info: Configures the HifiBerry DAC audio cards + Load: dtoverlay=hifiberry-dac + Params: + +diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts +new file mode 100644 +index 0000000000000..ebdef55d61109 +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts +@@ -0,0 +1,64 @@ ++// Definitions for HiFiBerry AMP100 ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target-path = "/"; ++ __overlay__ { ++ dacpro_osc: dacpro_osc { ++ compatible = "hifiberry,dacpro-clk"; ++ #clock-cells = <0>; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&i2s>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ pcm5122@4d { ++ #sound-dai-cells = <0>; ++ compatible = "ti,pcm5122"; ++ reg = <0x4d>; ++ clocks = <&dacpro_osc>; ++ AVDD-supply = <&vdd_3v3_reg>; ++ DVDD-supply = <&vdd_3v3_reg>; ++ CPVDD-supply = <&vdd_3v3_reg>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@3 { ++ target = <&sound>; ++ hifiberry_dacplus: __overlay__ { ++ compatible = "hifiberry,hifiberry-dacplus"; ++ i2s-controller = <&i2s>; ++ status = "okay"; ++ mute-gpio = <&gpio 4 0>; ++ reset-gpio = <&gpio 17 0x11>; ++ }; ++ }; ++ ++ __overrides__ { ++ 24db_digital_gain = ++ <&hifiberry_dacplus>,"hifiberry,24db_digital_gain?"; ++ slave = <&hifiberry_dacplus>,"hifiberry-dacplus,slave?"; ++ leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?"; ++ mute_ext_ctl = <&hifiberry_dacplus>,"hifiberry-dacplus,mute_ext_ctl:0"; ++ auto_mute = <&hifiberry_dacplus>,"hifiberry-dacplus,auto_mute?"; ++ }; ++}; +-- +2.18.4 + + +From a7fe930a62b605faaef06a8e2a2f44a8bf2b5c2a Mon Sep 17 00:00:00 2001 +From: Joerg Schambacher +Date: Fri, 29 Jan 2021 16:16:39 +0100 +Subject: [PATCH 1223/1224] Enhances the Hifiberry DAC+ driver for Hifiberry + AMP100 support + +Adds the necessary GPIO handling and ALSA mixer extensions. +Also fixes a problem with the PLL/CLK control when switching sample rates. +Thanks to Clive Messer for the support! + +Signed-off-by: Joerg Schambacher +--- + sound/soc/bcm/hifiberry_dacplus.c | 124 ++++++++++++++++++++++++++---- + 1 file changed, 111 insertions(+), 13 deletions(-) + +diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c +index 2f1b1ef4191a5..66a4198a1a304 100644 +--- a/sound/soc/bcm/hifiberry_dacplus.c ++++ b/sound/soc/bcm/hifiberry_dacplus.c +@@ -1,10 +1,10 @@ + /* +- * ASoC Driver for HiFiBerry DAC+ / DAC Pro ++ * ASoC Driver for HiFiBerry DAC+ / DAC Pro / AMP100 + * + * Author: Daniel Matuschek, Stuart MacLean + * Copyright 2014-2015 + * based on code by Florian Meier +- * Headphone added by Joerg Schambacher, joerg@i2audio.com ++ * Headphone/AMP100 Joerg Schambacher + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License +@@ -17,6 +17,8 @@ + */ + + #include ++#include ++#include <../drivers/gpio/gpiolib.h> + #include + #include + #include +@@ -53,6 +55,47 @@ static bool slave; + static bool snd_rpi_hifiberry_is_dacpro; + static bool digital_gain_0db_limit = true; + static bool leds_off; ++static bool auto_mute; ++static int mute_ext_ctl; ++static int mute_ext; ++static struct gpio_desc *snd_mute_gpio; ++static struct gpio_desc *snd_reset_gpio; ++static struct snd_soc_card snd_rpi_hifiberry_dacplus; ++ ++static int snd_rpi_hifiberry_dacplus_mute_set(int mute) ++{ ++ gpiod_set_value_cansleep(snd_mute_gpio, mute); ++ return 1; ++} ++ ++static int snd_rpi_hifiberry_dacplus_mute_get(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ ucontrol->value.integer.value[0] = mute_ext; ++ ++ return 0; ++} ++ ++static int snd_rpi_hifiberry_dacplus_mute_put(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ if (mute_ext == ucontrol->value.integer.value[0]) ++ return 0; ++ ++ mute_ext = ucontrol->value.integer.value[0]; ++ ++ return snd_rpi_hifiberry_dacplus_mute_set(mute_ext); ++} ++ ++static const char * const mute_text[] = {"Play", "Mute"}; ++static const struct soc_enum hb_dacplus_opt_mute_enum = ++ SOC_ENUM_SINGLE_EXT(2, mute_text); ++ ++static const struct snd_kcontrol_new hb_dacplus_opt_mute_controls[] = { ++ SOC_ENUM_EXT("Mute(ext)", hb_dacplus_opt_mute_enum, ++ snd_rpi_hifiberry_dacplus_mute_get, ++ snd_rpi_hifiberry_dacplus_mute_put), ++}; + + static void snd_rpi_hifiberry_dacplus_select_clk(struct snd_soc_component *component, + int clk_id) +@@ -68,6 +111,7 @@ static void snd_rpi_hifiberry_dacplus_select_clk(struct snd_soc_component *compo + snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x04); + break; + } ++ usleep_range(2000, 2100); + } + + static void snd_rpi_hifiberry_dacplus_clk_gpio(struct snd_soc_component *component) +@@ -85,13 +129,6 @@ static bool snd_rpi_hifiberry_dacplus_is_sclk(struct snd_soc_component *componen + return (!(sck & 0x40)); + } + +-static bool snd_rpi_hifiberry_dacplus_is_sclk_sleep( +- struct snd_soc_component *component) +-{ +- msleep(2); +- return snd_rpi_hifiberry_dacplus_is_sclk(component); +-} +- + static bool snd_rpi_hifiberry_dacplus_is_pro_card(struct snd_soc_component *component) + { + bool isClk44EN, isClk48En, isNoClk; +@@ -99,13 +136,13 @@ static bool snd_rpi_hifiberry_dacplus_is_pro_card(struct snd_soc_component *comp + snd_rpi_hifiberry_dacplus_clk_gpio(component); + + snd_rpi_hifiberry_dacplus_select_clk(component, HIFIBERRY_DACPRO_CLK44EN); +- isClk44EN = snd_rpi_hifiberry_dacplus_is_sclk_sleep(component); ++ isClk44EN = snd_rpi_hifiberry_dacplus_is_sclk(component); + + snd_rpi_hifiberry_dacplus_select_clk(component, HIFIBERRY_DACPRO_NOCLOCK); +- isNoClk = snd_rpi_hifiberry_dacplus_is_sclk_sleep(component); ++ isNoClk = snd_rpi_hifiberry_dacplus_is_sclk(component); + + snd_rpi_hifiberry_dacplus_select_clk(component, HIFIBERRY_DACPRO_CLK48EN); +- isClk48En = snd_rpi_hifiberry_dacplus_is_sclk_sleep(component); ++ isClk48En = snd_rpi_hifiberry_dacplus_is_sclk(component); + + return (isClk44EN && isClk48En && !isNoClk); + } +@@ -149,6 +186,7 @@ static int snd_rpi_hifiberry_dacplus_init(struct snd_soc_pcm_runtime *rtd) + { + struct snd_soc_component *component = rtd->codec_dai->component; + struct pcm512x_priv *priv; ++ struct snd_soc_card *card = &snd_rpi_hifiberry_dacplus; + + if (slave) + snd_rpi_hifiberry_is_dacpro = false; +@@ -187,6 +225,20 @@ static int snd_rpi_hifiberry_dacplus_init(struct snd_soc_pcm_runtime *rtd) + if (ret < 0) + dev_warn(card->dev, "Failed to set volume limit: %d\n", ret); + } ++ if (snd_reset_gpio) { ++ gpiod_set_value_cansleep(snd_reset_gpio, 0); ++ msleep(1); ++ gpiod_set_value_cansleep(snd_reset_gpio, 1); ++ msleep(1); ++ gpiod_set_value_cansleep(snd_reset_gpio, 0); ++ } ++ ++ if (mute_ext_ctl) ++ snd_soc_add_card_controls(card, hb_dacplus_opt_mute_controls, ++ ARRAY_SIZE(hb_dacplus_opt_mute_controls)); ++ ++ if (snd_mute_gpio) ++ gpiod_set_value_cansleep(snd_mute_gpio, mute_ext); + + return 0; + } +@@ -254,6 +306,8 @@ static int snd_rpi_hifiberry_dacplus_startup( + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_component *component = rtd->codec_dai->component; + ++ if (auto_mute) ++ gpiod_set_value_cansleep(snd_mute_gpio, 0); + if (leds_off) + return 0; + snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x08); +@@ -267,6 +321,8 @@ static void snd_rpi_hifiberry_dacplus_shutdown( + struct snd_soc_component *component = rtd->codec_dai->component; + + snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x00); ++ if (auto_mute) ++ gpiod_set_value_cansleep(snd_mute_gpio, 1); + } + + /* machine stream operations */ +@@ -342,6 +398,8 @@ static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev) + struct device_node *tpa_node; + struct property *tpa_prop; + struct of_changeset ocs; ++ struct property *pp; ++ int tmp; + + /* probe for head phone amp */ + ret = hb_hp_detect(); +@@ -396,6 +454,39 @@ static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev) + "hifiberry-dacplus,slave"); + leds_off = of_property_read_bool(pdev->dev.of_node, + "hifiberry-dacplus,leds_off"); ++ auto_mute = of_property_read_bool(pdev->dev.of_node, ++ "hifiberry-dacplus,auto_mute"); ++ ++ /* ++ * check for HW MUTE as defined in DT-overlay ++ * active high, therefore default to HIGH to MUTE ++ */ ++ snd_mute_gpio = devm_gpiod_get_optional(&pdev->dev, ++ "mute", GPIOD_OUT_HIGH); ++ if (IS_ERR(snd_mute_gpio)) { ++ dev_err(&pdev->dev, "Can't allocate GPIO (HW-MUTE)"); ++ return PTR_ERR(snd_mute_gpio); ++ } ++ ++ /* add ALSA control if requested in DT-overlay (AMP100) */ ++ pp = of_find_property(pdev->dev.of_node, ++ "hifiberry-dacplus,mute_ext_ctl", &tmp); ++ if (pp) { ++ if (!of_property_read_u32(pdev->dev.of_node, ++ "hifiberry-dacplus,mute_ext_ctl", &mute_ext)) { ++ /* ALSA control will be used */ ++ mute_ext_ctl = 1; ++ } ++ } ++ ++ /* check for HW RESET (AMP100) */ ++ snd_reset_gpio = devm_gpiod_get_optional(&pdev->dev, ++ "reset", GPIOD_OUT_HIGH); ++ if (IS_ERR(snd_reset_gpio)) { ++ dev_err(&pdev->dev, "Can't allocate GPIO (HW-RESET)"); ++ return PTR_ERR(snd_reset_gpio); ++ } ++ + } + + ret = devm_snd_soc_register_card(&pdev->dev, +@@ -403,7 +494,14 @@ static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev) + if (ret && ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "snd_soc_register_card() failed: %d\n", ret); +- ++ if (!ret) { ++ if (snd_mute_gpio) ++ dev_info(&pdev->dev, "GPIO%i for HW-MUTE selected", ++ gpio_chip_hwgpio(snd_mute_gpio)); ++ if (snd_reset_gpio) ++ dev_info(&pdev->dev, "GPIO%i for HW-RESET selected", ++ gpio_chip_hwgpio(snd_reset_gpio)); ++ } + return ret; + } + +-- +2.18.4 + + +From 62127de969392cd4f86e56f384784302033652de Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 3 Feb 2021 16:23:43 +0000 +Subject: [PATCH 1224/1224] ARM: dts: Declare Pi400 and CM4 have no audio pins + +The audio_pins node is left as a placeholder for the audremap overlay, +and it must have (empty) brcm,function and brcm,pins properties +otherwise it will be rejected by the pinctrl driver. + +See: https://www.raspberrypi.org/forums/viewtopic.php?f=98&t=301891 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts +index 9454ce193ec53..1ddeaec6d6089 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts +@@ -495,8 +495,8 @@ + + &gpio { + audio_pins: audio_pins { +- brcm,pins = <40 41>; +- brcm,function = <4>; ++ brcm,pins = <>; ++ brcm,function = <>; + }; + }; + +diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +index fc3f062fd820d..49f6ba6c4792b 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +@@ -434,6 +434,8 @@ + + &gpio { + audio_pins: audio_pins { ++ brcm,pins = <>; ++ brcm,function = <>; + }; + }; + +-- +2.18.4 + diff --git a/SOURCES/wireguard.patch b/SOURCES/wireguard.patch index 9d200b0..f9c5ec8 100644 --- a/SOURCES/wireguard.patch +++ b/SOURCES/wireguard.patch @@ -1,7 +1,7 @@ -From f6ccc0027d3b18f38c5f96f8bae522fad2492c98 Mon Sep 17 00:00:00 2001 +From b197871d28940a799b029951e35297a0e7d8ce39 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:07 +0100 -Subject: [PATCH 001/117] crypto: lib - tidy up lib/crypto Kconfig and Makefile +Subject: [PATCH 001/115] crypto: lib - tidy up lib/crypto Kconfig and Makefile commit 746b2e024c67aa605ac12d135cd7085a49cf9dc4 upstream. @@ -19,7 +19,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 lib/crypto/Kconfig diff --git a/crypto/Kconfig b/crypto/Kconfig -index b2cc0ad3792a..7d19b46a7ef7 100644 +index b2cc0ad3792ad..7d19b46a7ef72 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -878,9 +878,6 @@ config CRYPTO_SHA1_PPC_SPE @@ -72,7 +72,7 @@ index b2cc0ad3792a..7d19b46a7ef7 100644 source "certs/Kconfig" diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig new file mode 100644 -index 000000000000..261430051595 +index 0000000000000..2614300515952 --- /dev/null +++ b/lib/crypto/Kconfig @@ -0,0 +1,15 @@ @@ -92,7 +92,7 @@ index 000000000000..261430051595 +config CRYPTO_LIB_SHA256 + tristate diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile -index cbe0b6a6450d..63de4cb3fcf8 100644 +index cbe0b6a6450d7..63de4cb3fcf82 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -1,13 +1,13 @@ @@ -121,10 +121,10 @@ index cbe0b6a6450d..63de4cb3fcf8 100644 2.18.4 -From 6b2cb077c6b1fb093ec8174a8ddce787446c9e57 Mon Sep 17 00:00:00 2001 +From bce5bec8ca8ba0568969300cb8e50c95ea2769e4 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:08 +0100 -Subject: [PATCH 002/117] crypto: chacha - move existing library code into +Subject: [PATCH 002/115] crypto: chacha - move existing library code into lib/crypto commit 5fb8ef25803ef33e2eb60b626435828b937bed75 upstream. @@ -166,7 +166,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 lib/crypto/libchacha.c diff --git a/arch/arm/crypto/chacha-neon-glue.c b/arch/arm/crypto/chacha-neon-glue.c -index a8e9b534c8da..26576772f18b 100644 +index a8e9b534c8da5..26576772f18bb 100644 --- a/arch/arm/crypto/chacha-neon-glue.c +++ b/arch/arm/crypto/chacha-neon-glue.c @@ -20,7 +20,7 @@ @@ -179,7 +179,7 @@ index a8e9b534c8da..26576772f18b 100644 #include #include diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c -index 1495d2b18518..d4cc61bfe79d 100644 +index 1495d2b18518d..d4cc61bfe79df 100644 --- a/arch/arm64/crypto/chacha-neon-glue.c +++ b/arch/arm64/crypto/chacha-neon-glue.c @@ -20,7 +20,7 @@ @@ -192,7 +192,7 @@ index 1495d2b18518..d4cc61bfe79d 100644 #include #include diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c -index 388f95a4ec24..bc62daa8dafd 100644 +index 388f95a4ec240..bc62daa8dafd3 100644 --- a/arch/x86/crypto/chacha_glue.c +++ b/arch/x86/crypto/chacha_glue.c @@ -7,7 +7,7 @@ @@ -205,7 +205,7 @@ index 388f95a4ec24..bc62daa8dafd 100644 #include #include diff --git a/crypto/Kconfig b/crypto/Kconfig -index 7d19b46a7ef7..f29bf10c0462 100644 +index 7d19b46a7ef72..f29bf10c04627 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1393,6 +1393,7 @@ config CRYPTO_SALSA20 @@ -217,7 +217,7 @@ index 7d19b46a7ef7..f29bf10c0462 100644 help The ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms. diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c -index 085d8d219987..ebae6d9d9b32 100644 +index 085d8d219987a..ebae6d9d9b320 100644 --- a/crypto/chacha_generic.c +++ b/crypto/chacha_generic.c @@ -8,29 +8,10 @@ @@ -315,7 +315,7 @@ index 085d8d219987..ebae6d9d9b32 100644 /* Build the real IV */ diff --git a/include/crypto/chacha.h b/include/crypto/chacha.h -index d1e723c6a37d..5c662f8fecac 100644 +index d1e723c6a37dd..5c662f8fecac0 100644 --- a/include/crypto/chacha.h +++ b/include/crypto/chacha.h @@ -15,9 +15,8 @@ @@ -417,7 +417,7 @@ index d1e723c6a37d..5c662f8fecac 100644 #endif /* _CRYPTO_CHACHA_H */ diff --git a/include/crypto/internal/chacha.h b/include/crypto/internal/chacha.h new file mode 100644 -index 000000000000..c0e40b245431 +index 0000000000000..c0e40b2454311 --- /dev/null +++ b/include/crypto/internal/chacha.h @@ -0,0 +1,53 @@ @@ -475,7 +475,7 @@ index 000000000000..c0e40b245431 + +#endif /* _CRYPTO_CHACHA_H */ diff --git a/lib/Makefile b/lib/Makefile -index c5892807e06f..5af38fd5cc60 100644 +index c5892807e06fa..5af38fd5cc603 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -26,8 +26,7 @@ endif @@ -489,7 +489,7 @@ index c5892807e06f..5af38fd5cc60 100644 is_single_threaded.o plist.o decompress.o kobject_uevent.o \ earlycpio.o seq_buf.o siphash.o dec_and_lock.o \ diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index 261430051595..6a11931ae105 100644 +index 2614300515952..6a11931ae1052 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -8,6 +8,32 @@ config CRYPTO_LIB_AES @@ -526,7 +526,7 @@ index 261430051595..6a11931ae105 100644 tristate diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile -index 63de4cb3fcf8..0ce40604e104 100644 +index 63de4cb3fcf82..0ce40604e104c 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -1,5 +1,9 @@ @@ -543,7 +543,7 @@ diff --git a/lib/chacha.c b/lib/crypto/chacha.c similarity index 88% rename from lib/chacha.c rename to lib/crypto/chacha.c -index c7c9826564d3..65ead6b0c7e0 100644 +index c7c9826564d31..65ead6b0c7e00 100644 --- a/lib/chacha.c +++ b/lib/crypto/chacha.c @@ -5,9 +5,11 @@ @@ -605,7 +605,7 @@ index c7c9826564d3..65ead6b0c7e0 100644 +EXPORT_SYMBOL(hchacha_block_generic); diff --git a/lib/crypto/libchacha.c b/lib/crypto/libchacha.c new file mode 100644 -index 000000000000..dabc3accae05 +index 0000000000000..dabc3accae051 --- /dev/null +++ b/lib/crypto/libchacha.c @@ -0,0 +1,35 @@ @@ -648,10 +648,10 @@ index 000000000000..dabc3accae05 2.18.4 -From b6aac23330329ba2fd5953a2a9e954970b40044a Mon Sep 17 00:00:00 2001 +From 8fb7fcb51aad5548a3bb80f7a3618b518b4c0ff8 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:09 +0100 -Subject: [PATCH 003/117] crypto: x86/chacha - depend on generic chacha library +Subject: [PATCH 003/115] crypto: x86/chacha - depend on generic chacha library instead of crypto driver commit 28e8d89b1ce8d2e7badfb5f69971dd635acb8863 upstream. @@ -676,7 +676,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 36 insertions(+), 56 deletions(-) diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c -index bc62daa8dafd..0aabb382edce 100644 +index bc62daa8dafd3..0aabb382edce0 100644 --- a/arch/x86/crypto/chacha_glue.c +++ b/arch/x86/crypto/chacha_glue.c @@ -123,37 +123,38 @@ static void chacha_dosimd(u32 *state, u8 *dst, const u8 *src, @@ -833,7 +833,7 @@ index bc62daa8dafd..0aabb382edce 100644 .decrypt = xchacha_simd, }, diff --git a/crypto/Kconfig b/crypto/Kconfig -index f29bf10c0462..564a3f7b40b8 100644 +index f29bf10c04627..564a3f7b40b85 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1417,7 +1417,7 @@ config CRYPTO_CHACHA20_X86_64 @@ -849,10 +849,10 @@ index f29bf10c0462..564a3f7b40b8 100644 2.18.4 -From 52c0e077b10f891001bc79c8ce063ccc6d46f5b2 Mon Sep 17 00:00:00 2001 +From 0545790d2026a92f2f3fb0a8e8a73afbd1a5b023 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:10 +0100 -Subject: [PATCH 004/117] crypto: x86/chacha - expose SIMD ChaCha routine as +Subject: [PATCH 004/115] crypto: x86/chacha - expose SIMD ChaCha routine as library function commit 84e03fa39fbe95a5567d43bff458c6d3b3a23ad1 upstream. @@ -877,7 +877,7 @@ Signed-off-by: Jason A. Donenfeld 3 files changed, 73 insertions(+), 25 deletions(-) diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c -index 0aabb382edce..b391e13a9e41 100644 +index 0aabb382edce0..b391e13a9e415 100644 --- a/arch/x86/crypto/chacha_glue.c +++ b/arch/x86/crypto/chacha_glue.c @@ -21,24 +21,24 @@ asmlinkage void chacha_block_xor_ssse3(u32 *state, u8 *dst, const u8 *src, @@ -1033,7 +1033,7 @@ index 0aabb382edce..b391e13a9e41 100644 } diff --git a/crypto/Kconfig b/crypto/Kconfig -index 564a3f7b40b8..649dc564f242 100644 +index 564a3f7b40b85..649dc564f242b 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1418,6 +1418,7 @@ config CRYPTO_CHACHA20_X86_64 @@ -1045,7 +1045,7 @@ index 564a3f7b40b8..649dc564f242 100644 SSSE3, AVX2, and AVX-512VL optimized implementations of the ChaCha20, XChaCha20, and XChaCha12 stream ciphers. diff --git a/include/crypto/chacha.h b/include/crypto/chacha.h -index 5c662f8fecac..2676f4fbd4c1 100644 +index 5c662f8fecac0..2676f4fbd4c16 100644 --- a/include/crypto/chacha.h +++ b/include/crypto/chacha.h @@ -25,6 +25,12 @@ @@ -1065,10 +1065,10 @@ index 5c662f8fecac..2676f4fbd4c1 100644 2.18.4 -From d03f16ef93414148a4f767850e973fdbc862565c Mon Sep 17 00:00:00 2001 +From 451975d1273dce5cebbe79a81a92049e74f3956b Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:11 +0100 -Subject: [PATCH 005/117] crypto: arm64/chacha - depend on generic chacha +Subject: [PATCH 005/115] crypto: arm64/chacha - depend on generic chacha library instead of crypto driver commit c77da4867cbb7841177275dbb250f5c09679fae4 upstream. @@ -1092,7 +1092,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig -index 4922c4451e7c..fdf52d5f18f9 100644 +index 4922c4451e7c3..fdf52d5f18f98 100644 --- a/arch/arm64/crypto/Kconfig +++ b/arch/arm64/crypto/Kconfig @@ -103,7 +103,7 @@ config CRYPTO_CHACHA20_NEON @@ -1105,7 +1105,7 @@ index 4922c4451e7c..fdf52d5f18f9 100644 config CRYPTO_NHPOLY1305_NEON tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)" diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c -index d4cc61bfe79d..cae2cb92eca8 100644 +index d4cc61bfe79df..cae2cb92eca86 100644 --- a/arch/arm64/crypto/chacha-neon-glue.c +++ b/arch/arm64/crypto/chacha-neon-glue.c @@ -68,7 +68,7 @@ static int chacha_neon_stream_xor(struct skcipher_request *req, @@ -1202,10 +1202,10 @@ index d4cc61bfe79d..cae2cb92eca8 100644 2.18.4 -From 9323bf4eee0b433671e3aa6511d9fe4244fc653d Mon Sep 17 00:00:00 2001 +From 85937c6024274450f352e1cb2a070dd9028df852 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:12 +0100 -Subject: [PATCH 006/117] crypto: arm64/chacha - expose arm64 ChaCha routine as +Subject: [PATCH 006/115] crypto: arm64/chacha - expose arm64 ChaCha routine as library function commit b3aad5bad26a01a4bd8c49a5c5f52aec665f3b7c upstream. @@ -1228,7 +1228,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig -index fdf52d5f18f9..17bada4b9dd2 100644 +index fdf52d5f18f98..17bada4b9dd24 100644 --- a/arch/arm64/crypto/Kconfig +++ b/arch/arm64/crypto/Kconfig @@ -104,6 +104,7 @@ config CRYPTO_CHACHA20_NEON @@ -1240,7 +1240,7 @@ index fdf52d5f18f9..17bada4b9dd2 100644 config CRYPTO_NHPOLY1305_NEON tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)" diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c -index cae2cb92eca8..46cd4297761c 100644 +index cae2cb92eca86..46cd4297761c1 100644 --- a/arch/arm64/crypto/chacha-neon-glue.c +++ b/arch/arm64/crypto/chacha-neon-glue.c @@ -23,6 +23,7 @@ @@ -1348,10 +1348,10 @@ index cae2cb92eca8..46cd4297761c 100644 2.18.4 -From b857fdbbb1f25ec31d1c8f8cc5412f4ab489e7df Mon Sep 17 00:00:00 2001 +From eb371adf803efd33c050d4e672775b8ac773c793 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:13 +0100 -Subject: [PATCH 007/117] crypto: arm/chacha - import Eric Biggers's scalar +Subject: [PATCH 007/115] crypto: arm/chacha - import Eric Biggers's scalar accelerated ChaCha code commit 29621d099f9c642b22a69dc8e7e20c108473a392 upstream. @@ -1366,7 +1366,7 @@ Signed-off-by: Jason A. Donenfeld diff --git a/arch/arm/crypto/chacha-scalar-core.S b/arch/arm/crypto/chacha-scalar-core.S new file mode 100644 -index 000000000000..2140319b64a0 +index 0000000000000..2140319b64a05 --- /dev/null +++ b/arch/arm/crypto/chacha-scalar-core.S @@ -0,0 +1,461 @@ @@ -1835,10 +1835,10 @@ index 000000000000..2140319b64a0 2.18.4 -From 4635c03f1686b8ada9ecd42700f82d66412d509d Mon Sep 17 00:00:00 2001 +From 6bb971b9ec7e023f65d1bc0edab7c8e2d1af5fe8 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:14 +0100 -Subject: [PATCH 008/117] crypto: arm/chacha - remove dependency on generic +Subject: [PATCH 008/115] crypto: arm/chacha - remove dependency on generic ChaCha driver commit b36d8c09e710c71f6a9690b6586fea2d1c9e1e27 upstream. @@ -1864,7 +1864,7 @@ Signed-off-by: Jason A. Donenfeld delete mode 100644 arch/arm/crypto/chacha-neon-glue.c diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig -index 043b0b18bf7e..cee414afeabc 100644 +index 043b0b18bf7e0..cee414afeabc9 100644 --- a/arch/arm/crypto/Kconfig +++ b/arch/arm/crypto/Kconfig @@ -127,10 +127,8 @@ config CRYPTO_CRC32_ARM_CE @@ -1880,7 +1880,7 @@ index 043b0b18bf7e..cee414afeabc 100644 config CRYPTO_NHPOLY1305_NEON tristate "NEON accelerated NHPoly1305 hash function (for Adiantum)" diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile -index 4180f3a13512..6b97dffcf90f 100644 +index 4180f3a13512c..6b97dffcf90fa 100644 --- a/arch/arm/crypto/Makefile +++ b/arch/arm/crypto/Makefile @@ -53,7 +53,8 @@ aes-arm-ce-y := aes-ce-core.o aes-ce-glue.o @@ -1895,7 +1895,7 @@ index 4180f3a13512..6b97dffcf90f 100644 ifdef REGENERATE_ARM_CRYPTO diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c new file mode 100644 -index 000000000000..eb40efb3eb34 +index 0000000000000..eb40efb3eb342 --- /dev/null +++ b/arch/arm/crypto/chacha-glue.c @@ -0,0 +1,304 @@ @@ -2205,7 +2205,7 @@ index 000000000000..eb40efb3eb34 +#endif diff --git a/arch/arm/crypto/chacha-neon-glue.c b/arch/arm/crypto/chacha-neon-glue.c deleted file mode 100644 -index 26576772f18b..000000000000 +index 26576772f18bb..0000000000000 --- a/arch/arm/crypto/chacha-neon-glue.c +++ /dev/null @@ -1,202 +0,0 @@ @@ -2412,7 +2412,7 @@ index 26576772f18b..000000000000 -MODULE_ALIAS_CRYPTO("xchacha12"); -MODULE_ALIAS_CRYPTO("xchacha12-neon"); diff --git a/arch/arm/crypto/chacha-scalar-core.S b/arch/arm/crypto/chacha-scalar-core.S -index 2140319b64a0..2985b80a45b5 100644 +index 2140319b64a05..2985b80a45b57 100644 --- a/arch/arm/crypto/chacha-scalar-core.S +++ b/arch/arm/crypto/chacha-scalar-core.S @@ -41,14 +41,6 @@ @@ -2530,7 +2530,7 @@ index 2140319b64a0..2985b80a45b5 100644 + b 0b +ENDPROC(hchacha_block_arm) diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c -index 46cd4297761c..b08029d7bde6 100644 +index 46cd4297761c1..b08029d7bde62 100644 --- a/arch/arm64/crypto/chacha-neon-glue.c +++ b/arch/arm64/crypto/chacha-neon-glue.c @@ -1,5 +1,5 @@ @@ -2544,10 +2544,10 @@ index 46cd4297761c..b08029d7bde6 100644 2.18.4 -From 08b87f4bde29a6bffb50c0aaa3b5acc9b9d1be1e Mon Sep 17 00:00:00 2001 +From 6a86c01ffd4830e820184fa9ed8173e7ddfc7939 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:15 +0100 -Subject: [PATCH 009/117] crypto: arm/chacha - expose ARM ChaCha routine as +Subject: [PATCH 009/115] crypto: arm/chacha - expose ARM ChaCha routine as library function commit a44a3430d71bad4ee56788a59fff099b291ea54c upstream. @@ -2570,7 +2570,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig -index cee414afeabc..b25ffec04417 100644 +index cee414afeabc9..b25ffec044175 100644 --- a/arch/arm/crypto/Kconfig +++ b/arch/arm/crypto/Kconfig @@ -129,6 +129,7 @@ config CRYPTO_CRC32_ARM_CE @@ -2582,7 +2582,7 @@ index cee414afeabc..b25ffec04417 100644 config CRYPTO_NHPOLY1305_NEON tristate "NEON accelerated NHPoly1305 hash function (for Adiantum)" diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c -index eb40efb3eb34..3f0c057aa050 100644 +index eb40efb3eb342..3f0c057aa0502 100644 --- a/arch/arm/crypto/chacha-glue.c +++ b/arch/arm/crypto/chacha-glue.c @@ -11,6 +11,7 @@ @@ -2660,10 +2660,10 @@ index eb40efb3eb34..3f0c057aa050 100644 2.18.4 -From 1d0c6e6f6a9977ebac942667c6f8a3d0d36710a1 Mon Sep 17 00:00:00 2001 +From 1ee79278a7d7a348e72b31c99a8cfe31bb47bbba Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:16 +0100 -Subject: [PATCH 010/117] crypto: mips/chacha - import 32r2 ChaCha code from +Subject: [PATCH 010/115] crypto: mips/chacha - import 32r2 ChaCha code from Zinc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -2687,7 +2687,7 @@ Signed-off-by: Jason A. Donenfeld diff --git a/arch/mips/crypto/chacha-core.S b/arch/mips/crypto/chacha-core.S new file mode 100644 -index 000000000000..a81e02db95e7 +index 0000000000000..a81e02db95e73 --- /dev/null +++ b/arch/mips/crypto/chacha-core.S @@ -0,0 +1,424 @@ @@ -3119,10 +3119,10 @@ index 000000000000..a81e02db95e7 2.18.4 -From 222e72f837e62ce3e85751f973e52243832d3388 Mon Sep 17 00:00:00 2001 +From ec942e9965be966bf4571bcd63570f1dcd707119 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:17 +0100 -Subject: [PATCH 011/117] crypto: mips/chacha - wire up accelerated 32r2 code +Subject: [PATCH 011/115] crypto: mips/chacha - wire up accelerated 32r2 code from Zinc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -3157,7 +3157,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 arch/mips/crypto/chacha-glue.c diff --git a/arch/mips/Makefile b/arch/mips/Makefile -index 5403a91ce098..573409c85c81 100644 +index 5403a91ce098d..573409c85c81b 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -334,7 +334,7 @@ libs-$(CONFIG_MIPS_FP_SUPPORT) += arch/mips/math-emu/ @@ -3170,7 +3170,7 @@ index 5403a91ce098..573409c85c81 100644 # suspend and hibernation support diff --git a/arch/mips/crypto/Makefile b/arch/mips/crypto/Makefile -index e07aca572c2e..b528b9d300f1 100644 +index e07aca572c2e1..b528b9d300f14 100644 --- a/arch/mips/crypto/Makefile +++ b/arch/mips/crypto/Makefile @@ -4,3 +4,7 @@ @@ -3182,7 +3182,7 @@ index e07aca572c2e..b528b9d300f1 100644 +chacha-mips-y := chacha-core.o chacha-glue.o +AFLAGS_chacha-core.o += -O2 # needed to fill branch delay slots diff --git a/arch/mips/crypto/chacha-core.S b/arch/mips/crypto/chacha-core.S -index a81e02db95e7..5755f69cfe00 100644 +index a81e02db95e73..5755f69cfe007 100644 --- a/arch/mips/crypto/chacha-core.S +++ b/arch/mips/crypto/chacha-core.S @@ -125,7 +125,7 @@ @@ -3519,7 +3519,7 @@ index a81e02db95e7..5755f69cfe00 100644 .set at diff --git a/arch/mips/crypto/chacha-glue.c b/arch/mips/crypto/chacha-glue.c new file mode 100644 -index 000000000000..779e399c9bef +index 0000000000000..779e399c9befd --- /dev/null +++ b/arch/mips/crypto/chacha-glue.c @@ -0,0 +1,150 @@ @@ -3674,7 +3674,7 @@ index 000000000000..779e399c9bef +MODULE_ALIAS_CRYPTO("xchacha12"); +MODULE_ALIAS_CRYPTO("xchacha12-mips"); diff --git a/crypto/Kconfig b/crypto/Kconfig -index 649dc564f242..6b5e14cee475 100644 +index 649dc564f242b..6b5e14cee4753 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1423,6 +1423,12 @@ config CRYPTO_CHACHA20_X86_64 @@ -3694,10 +3694,10 @@ index 649dc564f242..6b5e14cee475 100644 2.18.4 -From 88565e6edc8ecc3eb7eda65c14a8e91da2a27b9b Mon Sep 17 00:00:00 2001 +From 2801a189f7b496039db36d72d5f73dbb56a42797 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:18 +0100 -Subject: [PATCH 012/117] crypto: chacha - unexport chacha_generic routines +Subject: [PATCH 012/115] crypto: chacha - unexport chacha_generic routines commit 22cf705360707ced15f9fe5423938f313c7df536 upstream. @@ -3715,7 +3715,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c -index ebae6d9d9b32..c1b147318393 100644 +index ebae6d9d9b320..c1b1473183938 100644 --- a/crypto/chacha_generic.c +++ b/crypto/chacha_generic.c @@ -21,7 +21,7 @@ static int chacha_stream_xor(struct skcipher_request *req, @@ -3788,7 +3788,7 @@ index ebae6d9d9b32..c1b147318393 100644 static struct skcipher_alg algs[] = { { diff --git a/include/crypto/internal/chacha.h b/include/crypto/internal/chacha.h -index c0e40b245431..aa5d4a16aac5 100644 +index c0e40b2454311..aa5d4a16aac5d 100644 --- a/include/crypto/internal/chacha.h +++ b/include/crypto/internal/chacha.h @@ -12,8 +12,6 @@ struct chacha_ctx { @@ -3817,10 +3817,10 @@ index c0e40b245431..aa5d4a16aac5 100644 2.18.4 -From de61b50f3440e3ea5a46678a997fcd4ee88624ca Mon Sep 17 00:00:00 2001 +From a40d0635d0d17f992f25940e9cac320d5208073a Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:19 +0100 -Subject: [PATCH 013/117] crypto: poly1305 - move core routines into a separate +Subject: [PATCH 013/115] crypto: poly1305 - move core routines into a separate library commit 48ea8c6ebc96bc0990e12ee1c43d0832c23576bb upstream. @@ -3853,7 +3853,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 lib/crypto/poly1305.c diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index 4a1c05dce950..6ccf8eb26324 100644 +index 4a1c05dce950f..6ccf8eb263243 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -7,8 +7,8 @@ @@ -3867,7 +3867,7 @@ index 4a1c05dce950..6ccf8eb26324 100644 #include #include diff --git a/crypto/Kconfig b/crypto/Kconfig -index 6b5e14cee475..b70b9d7c6e2f 100644 +index 6b5e14cee4753..b70b9d7c6e2f6 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -446,7 +446,7 @@ config CRYPTO_KEYWRAP @@ -3897,7 +3897,7 @@ index 6b5e14cee475..b70b9d7c6e2f 100644 Poly1305 authenticator algorithm, RFC7539. diff --git a/crypto/adiantum.c b/crypto/adiantum.c -index 395a3ddd3707..aded26092268 100644 +index 395a3ddd37074..aded260922684 100644 --- a/crypto/adiantum.c +++ b/crypto/adiantum.c @@ -33,6 +33,7 @@ @@ -3923,7 +3923,7 @@ index 395a3ddd3707..aded26092268 100644 poly1305_core_emit(&state, &rctx->header_hash); } diff --git a/crypto/nhpoly1305.c b/crypto/nhpoly1305.c -index 9ab4e07cde4d..f6b6a52092b4 100644 +index 9ab4e07cde4dc..f6b6a52092b49 100644 --- a/crypto/nhpoly1305.c +++ b/crypto/nhpoly1305.c @@ -33,6 +33,7 @@ @@ -3944,7 +3944,7 @@ index 9ab4e07cde4d..f6b6a52092b4 100644 /* diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c -index adc40298c749..067f493c2504 100644 +index adc40298c7492..067f493c25043 100644 --- a/crypto/poly1305_generic.c +++ b/crypto/poly1305_generic.c @@ -13,27 +13,12 @@ @@ -4196,7 +4196,7 @@ index adc40298c749..067f493c2504 100644 poly1305_core_emit(&dctx->h, digest); diff --git a/include/crypto/internal/poly1305.h b/include/crypto/internal/poly1305.h new file mode 100644 -index 000000000000..cb58e61f73a7 +index 0000000000000..cb58e61f73a77 --- /dev/null +++ b/include/crypto/internal/poly1305.h @@ -0,0 +1,67 @@ @@ -4268,7 +4268,7 @@ index 000000000000..cb58e61f73a7 + +#endif diff --git a/include/crypto/poly1305.h b/include/crypto/poly1305.h -index 34317ed2071e..f5a4319c2a1f 100644 +index 34317ed2071e6..f5a4319c2a1f3 100644 --- a/include/crypto/poly1305.h +++ b/include/crypto/poly1305.h @@ -38,27 +38,4 @@ struct poly1305_desc_ctx { @@ -4300,7 +4300,7 @@ index 34317ed2071e..f5a4319c2a1f 100644 - #endif diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index 6a11931ae105..c4882d29879e 100644 +index 6a11931ae1052..c4882d29879e8 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -37,5 +37,8 @@ config CRYPTO_LIB_CHACHA @@ -4313,7 +4313,7 @@ index 6a11931ae105..c4882d29879e 100644 config CRYPTO_LIB_SHA256 tristate diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile -index 0ce40604e104..b58ab6843a9d 100644 +index 0ce40604e104c..b58ab6843a9dc 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -13,5 +13,8 @@ libarc4-y := arc4.o @@ -4327,7 +4327,7 @@ index 0ce40604e104..b58ab6843a9d 100644 libsha256-y := sha256.o diff --git a/lib/crypto/poly1305.c b/lib/crypto/poly1305.c new file mode 100644 -index 000000000000..f019a57dbc1b +index 0000000000000..f019a57dbc1b9 --- /dev/null +++ b/lib/crypto/poly1305.c @@ -0,0 +1,158 @@ @@ -4493,10 +4493,10 @@ index 000000000000..f019a57dbc1b 2.18.4 -From bc730a749174bf0429e0b186a75378db13c25cd7 Mon Sep 17 00:00:00 2001 +From 0d420ee8db8b9ee1f978049b59bcb7d03154d2e4 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:20 +0100 -Subject: [PATCH 014/117] crypto: x86/poly1305 - unify Poly1305 state struct +Subject: [PATCH 014/115] crypto: x86/poly1305 - unify Poly1305 state struct with generic code commit ad8f5b88383ea685f2b8df2a12ee3e08089a1287 upstream. @@ -4517,7 +4517,7 @@ Signed-off-by: Jason A. Donenfeld 4 files changed, 43 insertions(+), 73 deletions(-) diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index 6ccf8eb26324..b43b93c95e79 100644 +index 6ccf8eb263243..b43b93c95e798 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -14,40 +14,14 @@ @@ -4671,7 +4671,7 @@ index 6ccf8eb26324..b43b93c95e79 100644 } diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c -index 067f493c2504..f3fcd9578a47 100644 +index 067f493c25043..f3fcd9578a47f 100644 --- a/crypto/poly1305_generic.c +++ b/crypto/poly1305_generic.c @@ -25,7 +25,7 @@ int crypto_poly1305_init(struct shash_desc *desc) @@ -4702,7 +4702,7 @@ index 067f493c2504..f3fcd9578a47 100644 poly1305_core_emit(&dctx->h, digest); diff --git a/include/crypto/internal/poly1305.h b/include/crypto/internal/poly1305.h -index cb58e61f73a7..04fa269e5534 100644 +index cb58e61f73a77..04fa269e5534b 100644 --- a/include/crypto/internal/poly1305.h +++ b/include/crypto/internal/poly1305.h @@ -46,10 +46,10 @@ unsigned int crypto_poly1305_setdesckey(struct poly1305_desc_ctx *dctx, @@ -4719,7 +4719,7 @@ index cb58e61f73a7..04fa269e5534 100644 if (srclen >= POLY1305_BLOCK_SIZE) { dctx->s[0] = get_unaligned_le32(src + 0); diff --git a/include/crypto/poly1305.h b/include/crypto/poly1305.h -index f5a4319c2a1f..36b5886cb50c 100644 +index f5a4319c2a1f3..36b5886cb50ca 100644 --- a/include/crypto/poly1305.h +++ b/include/crypto/poly1305.h @@ -22,20 +22,20 @@ struct poly1305_state { @@ -4756,10 +4756,10 @@ index f5a4319c2a1f..36b5886cb50c 100644 2.18.4 -From e9e675a106b550e653744cbe5e4e4f6845f66aba Mon Sep 17 00:00:00 2001 +From cffafae217a5e94e450cc39c0baf595dbec32d4c Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:21 +0100 -Subject: [PATCH 015/117] crypto: poly1305 - expose init/update/final library +Subject: [PATCH 015/115] crypto: poly1305 - expose init/update/final library interface commit a1d93064094cc5e24d64e35cf093e7191d0c9344 upstream. @@ -4781,7 +4781,7 @@ Signed-off-by: Jason A. Donenfeld 4 files changed, 138 insertions(+), 22 deletions(-) diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c -index f3fcd9578a47..afe9a9e576dd 100644 +index f3fcd9578a47f..afe9a9e576dda 100644 --- a/crypto/poly1305_generic.c +++ b/crypto/poly1305_generic.c @@ -85,31 +85,11 @@ EXPORT_SYMBOL_GPL(crypto_poly1305_update); @@ -4818,7 +4818,7 @@ index f3fcd9578a47..afe9a9e576dd 100644 } EXPORT_SYMBOL_GPL(crypto_poly1305_final); diff --git a/include/crypto/poly1305.h b/include/crypto/poly1305.h -index 36b5886cb50c..74c6e1cd73ee 100644 +index 36b5886cb50ca..74c6e1cd73eee 100644 --- a/include/crypto/poly1305.h +++ b/include/crypto/poly1305.h @@ -35,7 +35,43 @@ struct poly1305_desc_ctx { @@ -4867,7 +4867,7 @@ index 36b5886cb50c..74c6e1cd73ee 100644 + #endif diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index c4882d29879e..a731ea36bd5c 100644 +index c4882d29879e8..a731ea36bd5c7 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -37,8 +37,34 @@ config CRYPTO_LIB_CHACHA @@ -4906,7 +4906,7 @@ index c4882d29879e..a731ea36bd5c 100644 config CRYPTO_LIB_SHA256 tristate diff --git a/lib/crypto/poly1305.c b/lib/crypto/poly1305.c -index f019a57dbc1b..32ec293c65ae 100644 +index f019a57dbc1b9..32ec293c65ae7 100644 --- a/lib/crypto/poly1305.c +++ b/lib/crypto/poly1305.c @@ -154,5 +154,79 @@ void poly1305_core_emit(const struct poly1305_state *state, void *dst) @@ -4993,10 +4993,10 @@ index f019a57dbc1b..32ec293c65ae 100644 2.18.4 -From 93baad7ba81bf360b41969758112e5a487d55662 Mon Sep 17 00:00:00 2001 +From 71176ba2390b8b777e3704c82fd7e894b6e9f4a8 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:22 +0100 -Subject: [PATCH 016/117] crypto: x86/poly1305 - depend on generic library not +Subject: [PATCH 016/115] crypto: x86/poly1305 - depend on generic library not generic shash commit 1b2c6a5120489d41c8ea3b8dacd0b4586289b158 upstream. @@ -5023,7 +5023,7 @@ Signed-off-by: Jason A. Donenfeld 4 files changed, 60 insertions(+), 28 deletions(-) diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index b43b93c95e79..a5b3a054604c 100644 +index b43b93c95e798..a5b3a054604cf 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -34,6 +34,24 @@ static void poly1305_simd_mult(u32 *a, const u32 *b) @@ -5128,7 +5128,7 @@ index b43b93c95e79..a5b3a054604c 100644 } diff --git a/crypto/Kconfig b/crypto/Kconfig -index b70b9d7c6e2f..6178aa627141 100644 +index b70b9d7c6e2f6..6178aa6271412 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -697,7 +697,7 @@ config CRYPTO_POLY1305 @@ -5141,7 +5141,7 @@ index b70b9d7c6e2f..6178aa627141 100644 Poly1305 authenticator algorithm, RFC7539. diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c -index afe9a9e576dd..21edbd8c99fb 100644 +index afe9a9e576dda..21edbd8c99fbc 100644 --- a/crypto/poly1305_generic.c +++ b/crypto/poly1305_generic.c @@ -19,7 +19,7 @@ @@ -5192,7 +5192,7 @@ index afe9a9e576dd..21edbd8c99fb 100644 static struct shash_alg poly1305_alg = { .digestsize = POLY1305_DIGEST_SIZE, diff --git a/include/crypto/internal/poly1305.h b/include/crypto/internal/poly1305.h -index 04fa269e5534..479b0cab2a1a 100644 +index 04fa269e5534b..479b0cab2a1ad 100644 --- a/include/crypto/internal/poly1305.h +++ b/include/crypto/internal/poly1305.h @@ -10,8 +10,6 @@ @@ -5222,10 +5222,10 @@ index 04fa269e5534..479b0cab2a1a 100644 2.18.4 -From 459fb048bbcc9c07f559cbf6a37b4bb2cb14c519 Mon Sep 17 00:00:00 2001 +From 86de1a707edadb5219cbd156162933e3addf9d6e Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:23 +0100 -Subject: [PATCH 017/117] crypto: x86/poly1305 - expose existing driver as +Subject: [PATCH 017/115] crypto: x86/poly1305 - expose existing driver as poly1305 library commit f0e89bcfbb894e5844cd1bbf6b3cf7c63cb0f5ac upstream. @@ -5244,7 +5244,7 @@ Signed-off-by: Jason A. Donenfeld 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index a5b3a054604c..370cd88068ec 100644 +index a5b3a054604cf..370cd88068ec1 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -10,6 +10,7 @@ @@ -5369,7 +5369,7 @@ index a5b3a054604c..370cd88068ec 100644 return crypto_register_shash(&alg); } diff --git a/crypto/Kconfig b/crypto/Kconfig -index 6178aa627141..15cfb02c3e49 100644 +index 6178aa6271412..15cfb02c3e49c 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -698,6 +698,7 @@ config CRYPTO_POLY1305_X86_64 @@ -5381,7 +5381,7 @@ index 6178aa627141..15cfb02c3e49 100644 Poly1305 authenticator algorithm, RFC7539. diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index a731ea36bd5c..181754615f73 100644 +index a731ea36bd5c7..181754615f734 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -39,6 +39,7 @@ config CRYPTO_LIB_DES @@ -5396,10 +5396,10 @@ index a731ea36bd5c..181754615f73 100644 2.18.4 -From e9816596e34dbdfd87ee1b3f9482bcc998ced2fc Mon Sep 17 00:00:00 2001 +From 5f07f88b171ef95ba2befa12b0a11ddbc2c7e5b9 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:24 +0100 -Subject: [PATCH 018/117] crypto: arm64/poly1305 - incorporate +Subject: [PATCH 018/115] crypto: arm64/poly1305 - incorporate OpenSSL/CRYPTOGAMS NEON implementation commit f569ca16475155013525686d0f73bc379c67e635 upstream. @@ -5431,7 +5431,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 arch/arm64/crypto/poly1305-glue.c diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig -index 17bada4b9dd2..30d9b24ee86e 100644 +index 17bada4b9dd24..30d9b24ee86e3 100644 --- a/arch/arm64/crypto/Kconfig +++ b/arch/arm64/crypto/Kconfig @@ -106,6 +106,12 @@ config CRYPTO_CHACHA20_NEON @@ -5448,7 +5448,7 @@ index 17bada4b9dd2..30d9b24ee86e 100644 tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)" depends on KERNEL_MODE_NEON diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile -index 0435f2a0610e..d0901e610df3 100644 +index 0435f2a0610ed..d0901e610df3b 100644 --- a/arch/arm64/crypto/Makefile +++ b/arch/arm64/crypto/Makefile @@ -50,6 +50,10 @@ sha512-arm64-y := sha512-glue.o sha512-core.o @@ -5481,7 +5481,7 @@ index 0435f2a0610e..d0901e610df3 100644 +clean-files += poly1305-core.S sha256-core.S sha512-core.S diff --git a/arch/arm64/crypto/poly1305-armv8.pl b/arch/arm64/crypto/poly1305-armv8.pl new file mode 100644 -index 000000000000..6e5576d19af8 +index 0000000000000..6e5576d19af8f --- /dev/null +++ b/arch/arm64/crypto/poly1305-armv8.pl @@ -0,0 +1,913 @@ @@ -6400,7 +6400,7 @@ index 000000000000..6e5576d19af8 +close STDOUT; diff --git a/arch/arm64/crypto/poly1305-core.S_shipped b/arch/arm64/crypto/poly1305-core.S_shipped new file mode 100644 -index 000000000000..8d1c4e420ccd +index 0000000000000..8d1c4e420ccdc --- /dev/null +++ b/arch/arm64/crypto/poly1305-core.S_shipped @@ -0,0 +1,835 @@ @@ -7241,7 +7241,7 @@ index 000000000000..8d1c4e420ccd +#endif diff --git a/arch/arm64/crypto/poly1305-glue.c b/arch/arm64/crypto/poly1305-glue.c new file mode 100644 -index 000000000000..dd843d0ee83a +index 0000000000000..dd843d0ee83ab --- /dev/null +++ b/arch/arm64/crypto/poly1305-glue.c @@ -0,0 +1,237 @@ @@ -7483,7 +7483,7 @@ index 000000000000..dd843d0ee83a +MODULE_ALIAS_CRYPTO("poly1305"); +MODULE_ALIAS_CRYPTO("poly1305-neon"); diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index 181754615f73..9923445e8225 100644 +index 181754615f734..9923445e82251 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -40,6 +40,7 @@ config CRYPTO_LIB_DES @@ -7498,10 +7498,10 @@ index 181754615f73..9923445e8225 100644 2.18.4 -From b3af3aefd51d8f57070fee8f8074f0c537f23938 Mon Sep 17 00:00:00 2001 +From ddfe74f7a6399d21f7255d5cd125f353762b20e8 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:25 +0100 -Subject: [PATCH 019/117] crypto: arm/poly1305 - incorporate OpenSSL/CRYPTOGAMS +Subject: [PATCH 019/115] crypto: arm/poly1305 - incorporate OpenSSL/CRYPTOGAMS NEON implementation commit a6b803b3ddc793d6db0c16f12fc12d30d20fa9cc upstream. @@ -7533,7 +7533,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 arch/arm/crypto/poly1305-glue.c diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig -index b25ffec04417..2e8a9289bded 100644 +index b25ffec044175..2e8a9289bded3 100644 --- a/arch/arm/crypto/Kconfig +++ b/arch/arm/crypto/Kconfig @@ -131,6 +131,11 @@ config CRYPTO_CHACHA20_NEON @@ -7549,7 +7549,7 @@ index b25ffec04417..2e8a9289bded 100644 tristate "NEON accelerated NHPoly1305 hash function (for Adiantum)" depends on KERNEL_MODE_NEON diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile -index 6b97dffcf90f..4f6a8a81dabc 100644 +index 6b97dffcf90fa..4f6a8a81dabc1 100644 --- a/arch/arm/crypto/Makefile +++ b/arch/arm/crypto/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o @@ -7590,7 +7590,7 @@ index 6b97dffcf90f..4f6a8a81dabc 100644 +AFLAGS_poly1305-core.o += $(poly1305-aflags-y) diff --git a/arch/arm/crypto/poly1305-armv4.pl b/arch/arm/crypto/poly1305-armv4.pl new file mode 100644 -index 000000000000..6d79498d3115 +index 0000000000000..6d79498d3115f --- /dev/null +++ b/arch/arm/crypto/poly1305-armv4.pl @@ -0,0 +1,1236 @@ @@ -8832,7 +8832,7 @@ index 000000000000..6d79498d3115 +close STDOUT; # enforce flush diff --git a/arch/arm/crypto/poly1305-core.S_shipped b/arch/arm/crypto/poly1305-core.S_shipped new file mode 100644 -index 000000000000..37b71d990293 +index 0000000000000..37b71d9902932 --- /dev/null +++ b/arch/arm/crypto/poly1305-core.S_shipped @@ -0,0 +1,1158 @@ @@ -9996,7 +9996,7 @@ index 000000000000..37b71d990293 +.align 2 diff --git a/arch/arm/crypto/poly1305-glue.c b/arch/arm/crypto/poly1305-glue.c new file mode 100644 -index 000000000000..74a725ac89c9 +index 0000000000000..74a725ac89c9f --- /dev/null +++ b/arch/arm/crypto/poly1305-glue.c @@ -0,0 +1,276 @@ @@ -10277,7 +10277,7 @@ index 000000000000..74a725ac89c9 +MODULE_ALIAS_CRYPTO("poly1305-arm"); +MODULE_ALIAS_CRYPTO("poly1305-neon"); diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index 9923445e8225..9bd15b227e78 100644 +index 9923445e82251..9bd15b227e78e 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -40,7 +40,7 @@ config CRYPTO_LIB_DES @@ -10293,10 +10293,10 @@ index 9923445e8225..9bd15b227e78 100644 2.18.4 -From 187998df04dbbdd4298014f8ad95477cc14b2dc8 Mon Sep 17 00:00:00 2001 +From c8af86e6cecbfdfad9086427f0d5c5ef2b5b97f4 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:26 +0100 -Subject: [PATCH 020/117] crypto: mips/poly1305 - incorporate +Subject: [PATCH 020/115] crypto: mips/poly1305 - incorporate OpenSSL/CRYPTOGAMS optimized implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -10331,7 +10331,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 arch/mips/crypto/poly1305-mips.pl diff --git a/arch/mips/crypto/Makefile b/arch/mips/crypto/Makefile -index b528b9d300f1..8e1deaf00e0c 100644 +index b528b9d300f14..8e1deaf00e0c0 100644 --- a/arch/mips/crypto/Makefile +++ b/arch/mips/crypto/Makefile @@ -8,3 +8,17 @@ obj-$(CONFIG_CRYPTO_CRC32_MIPS) += crc32-mips.o @@ -10354,7 +10354,7 @@ index b528b9d300f1..8e1deaf00e0c 100644 +targets += poly1305-core.S diff --git a/arch/mips/crypto/poly1305-glue.c b/arch/mips/crypto/poly1305-glue.c new file mode 100644 -index 000000000000..b759b6ccc361 +index 0000000000000..b759b6ccc361c --- /dev/null +++ b/arch/mips/crypto/poly1305-glue.c @@ -0,0 +1,203 @@ @@ -10563,7 +10563,7 @@ index 000000000000..b759b6ccc361 +MODULE_ALIAS_CRYPTO("poly1305-mips"); diff --git a/arch/mips/crypto/poly1305-mips.pl b/arch/mips/crypto/poly1305-mips.pl new file mode 100644 -index 000000000000..b05bab884ed2 +index 0000000000000..b05bab884ed26 --- /dev/null +++ b/arch/mips/crypto/poly1305-mips.pl @@ -0,0 +1,1273 @@ @@ -11841,7 +11841,7 @@ index 000000000000..b05bab884ed2 +print $code; +close STDOUT; diff --git a/crypto/Kconfig b/crypto/Kconfig -index 15cfb02c3e49..0be5b4092f18 100644 +index 15cfb02c3e49c..0be5b4092f189 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -707,6 +707,11 @@ config CRYPTO_POLY1305_X86_64 @@ -11857,7 +11857,7 @@ index 15cfb02c3e49..0be5b4092f18 100644 tristate "MD4 digest algorithm" select CRYPTO_HASH diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index 9bd15b227e78..d15ec5382986 100644 +index 9bd15b227e78e..d15ec53829861 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -39,6 +39,7 @@ config CRYPTO_LIB_DES @@ -11872,10 +11872,10 @@ index 9bd15b227e78..d15ec5382986 100644 2.18.4 -From 0e008d9ec1da5489db00a542a88f89e29307ad39 Mon Sep 17 00:00:00 2001 +From 2e91e770953810b21ea65021345a36403ce4f168 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:28 +0100 -Subject: [PATCH 021/117] crypto: blake2s - generic C library implementation +Subject: [PATCH 021/115] crypto: blake2s - generic C library implementation and selftest commit 66d7fb94e4ffe5acc589e0b2b4710aecc1f07a28 upstream. @@ -11915,7 +11915,7 @@ Signed-off-by: Jason A. Donenfeld diff --git a/include/crypto/blake2s.h b/include/crypto/blake2s.h new file mode 100644 -index 000000000000..b471deac28ff +index 0000000000000..b471deac28ff8 --- /dev/null +++ b/include/crypto/blake2s.h @@ -0,0 +1,106 @@ @@ -12027,7 +12027,7 @@ index 000000000000..b471deac28ff +#endif /* BLAKE2S_H */ diff --git a/include/crypto/internal/blake2s.h b/include/crypto/internal/blake2s.h new file mode 100644 -index 000000000000..941693effc7d +index 0000000000000..941693effc7d2 --- /dev/null +++ b/include/crypto/internal/blake2s.h @@ -0,0 +1,19 @@ @@ -12051,7 +12051,7 @@ index 000000000000..941693effc7d + +#endif /* BLAKE2S_INTERNAL_H */ diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index d15ec5382986..7ad98b624e55 100644 +index d15ec53829861..7ad98b624e554 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -8,6 +8,31 @@ config CRYPTO_LIB_AES @@ -12087,7 +12087,7 @@ index d15ec5382986..7ad98b624e55 100644 tristate help diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile -index b58ab6843a9d..8ca66b5f9807 100644 +index b58ab6843a9dc..8ca66b5f9807b 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -10,6 +10,12 @@ libaes-y := aes.o @@ -12113,7 +12113,7 @@ index b58ab6843a9d..8ca66b5f9807 100644 +endif diff --git a/lib/crypto/blake2s-generic.c b/lib/crypto/blake2s-generic.c new file mode 100644 -index 000000000000..04ff8df24513 +index 0000000000000..04ff8df245136 --- /dev/null +++ b/lib/crypto/blake2s-generic.c @@ -0,0 +1,111 @@ @@ -12230,7 +12230,7 @@ index 000000000000..04ff8df24513 +MODULE_AUTHOR("Jason A. Donenfeld "); diff --git a/lib/crypto/blake2s-selftest.c b/lib/crypto/blake2s-selftest.c new file mode 100644 -index 000000000000..79ef404a990d +index 0000000000000..79ef404a990d2 --- /dev/null +++ b/lib/crypto/blake2s-selftest.c @@ -0,0 +1,622 @@ @@ -12858,7 +12858,7 @@ index 000000000000..79ef404a990d +} diff --git a/lib/crypto/blake2s.c b/lib/crypto/blake2s.c new file mode 100644 -index 000000000000..41025a30c524 +index 0000000000000..41025a30c524c --- /dev/null +++ b/lib/crypto/blake2s.c @@ -0,0 +1,126 @@ @@ -12992,10 +12992,10 @@ index 000000000000..41025a30c524 2.18.4 -From 9f42471294df40d5298cb9f5c5d0dc39a39b25ae Mon Sep 17 00:00:00 2001 +From 239fea475b647d30a4176d28736f5c6c4b3fda7f Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:29 +0100 -Subject: [PATCH 022/117] crypto: testmgr - add test cases for Blake2s +Subject: [PATCH 022/115] crypto: testmgr - add test cases for Blake2s commit 17e1df67023a5c9ccaeb5de8bf5b88f63127ecf7 upstream. @@ -13024,7 +13024,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 275 insertions(+) diff --git a/crypto/testmgr.c b/crypto/testmgr.c -index 7473c5bc06b1..711390861f71 100644 +index 7473c5bc06b1a..711390861f716 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4034,6 +4034,30 @@ static const struct alg_test_desc alg_test_descs[] = { @@ -13059,7 +13059,7 @@ index 7473c5bc06b1..711390861f71 100644 .alg = "cbc(aes)", .test = alg_test_skcipher, diff --git a/crypto/testmgr.h b/crypto/testmgr.h -index ef7d21f39d4a..102fcad54966 100644 +index ef7d21f39d4a9..102fcad549665 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -31567,4 +31567,255 @@ static const struct aead_testvec essiv_hmac_sha256_aes_cbc_tv_temp[] = { @@ -13322,10 +13322,10 @@ index ef7d21f39d4a..102fcad54966 100644 2.18.4 -From 424391960ba71b4c1489700275b1786b3679642d Mon Sep 17 00:00:00 2001 +From 89c49ee948f065cc5050666bd4a55203607bda70 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:30 +0100 -Subject: [PATCH 023/117] crypto: blake2s - implement generic shash driver +Subject: [PATCH 023/115] crypto: blake2s - implement generic shash driver commit 7f9b0880925f1f9d7d59504ea0892d2ae9cfc233 upstream. @@ -13343,7 +13343,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 crypto/blake2s_generic.c diff --git a/crypto/Kconfig b/crypto/Kconfig -index 0be5b4092f18..81c8a4059afc 100644 +index 0be5b4092f189..81c8a4059afcf 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -639,6 +639,24 @@ config CRYPTO_XXHASH @@ -13372,7 +13372,7 @@ index 0be5b4092f18..81c8a4059afc 100644 tristate "CRCT10DIF algorithm" select CRYPTO_HASH diff --git a/crypto/Makefile b/crypto/Makefile -index aa740c8492b9..fd27edea7c8e 100644 +index aa740c8492b9d..fd27edea7c8ec 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -74,6 +74,7 @@ obj-$(CONFIG_CRYPTO_STREEBOG) += streebog_generic.o @@ -13385,7 +13385,7 @@ index aa740c8492b9..fd27edea7c8e 100644 obj-$(CONFIG_CRYPTO_CBC) += cbc.o diff --git a/crypto/blake2s_generic.c b/crypto/blake2s_generic.c new file mode 100644 -index 000000000000..ed0c74640470 +index 0000000000000..ed0c746404703 --- /dev/null +++ b/crypto/blake2s_generic.c @@ -0,0 +1,171 @@ @@ -13561,7 +13561,7 @@ index 000000000000..ed0c74640470 +MODULE_ALIAS_CRYPTO("blake2s-256-generic"); +MODULE_LICENSE("GPL v2"); diff --git a/include/crypto/internal/blake2s.h b/include/crypto/internal/blake2s.h -index 941693effc7d..74ff77032e52 100644 +index 941693effc7d2..74ff77032e526 100644 --- a/include/crypto/internal/blake2s.h +++ b/include/crypto/internal/blake2s.h @@ -5,6 +5,11 @@ @@ -13580,10 +13580,10 @@ index 941693effc7d..74ff77032e52 100644 2.18.4 -From 338024d73271473dbada45b583fa4b1ae6ed4153 Mon Sep 17 00:00:00 2001 +From 09f81cbc867616e252332ff2c4ec84024dc7f832 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:31 +0100 -Subject: [PATCH 024/117] crypto: blake2s - x86_64 SIMD implementation +Subject: [PATCH 024/115] crypto: blake2s - x86_64 SIMD implementation commit ed0356eda153f6a95649e11feb7b07083caf9e20 upstream. @@ -13608,7 +13608,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 arch/x86/crypto/blake2s-glue.c diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile -index 759b1a927826..922c8ecfa00f 100644 +index 759b1a927826b..922c8ecfa00f5 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile @@ -48,6 +48,7 @@ ifeq ($(avx_supported),yes) @@ -13629,7 +13629,7 @@ index 759b1a927826..922c8ecfa00f 100644 camellia-aesni-avx-x86_64-y := camellia-aesni-avx-asm_64.o \ diff --git a/arch/x86/crypto/blake2s-core.S b/arch/x86/crypto/blake2s-core.S new file mode 100644 -index 000000000000..8591938eee26 +index 0000000000000..8591938eee26d --- /dev/null +++ b/arch/x86/crypto/blake2s-core.S @@ -0,0 +1,258 @@ @@ -13893,7 +13893,7 @@ index 000000000000..8591938eee26 +#endif /* CONFIG_AS_AVX512 */ diff --git a/arch/x86/crypto/blake2s-glue.c b/arch/x86/crypto/blake2s-glue.c new file mode 100644 -index 000000000000..4a37ba7cdbe5 +index 0000000000000..4a37ba7cdbe52 --- /dev/null +++ b/arch/x86/crypto/blake2s-glue.c @@ -0,0 +1,233 @@ @@ -14131,7 +14131,7 @@ index 000000000000..4a37ba7cdbe5 +MODULE_ALIAS_CRYPTO("blake2s-256-x86"); +MODULE_LICENSE("GPL v2"); diff --git a/crypto/Kconfig b/crypto/Kconfig -index 81c8a4059afc..8fd3954bf64c 100644 +index 81c8a4059afcf..8fd3954bf64c5 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -657,6 +657,12 @@ config CRYPTO_BLAKE2S @@ -14151,10 +14151,10 @@ index 81c8a4059afc..8fd3954bf64c 100644 2.18.4 -From 2c61e345954094816c7b2f1acb21e04935efc2c3 Mon Sep 17 00:00:00 2001 +From 0d751552c61cd6e4b186d92b630b9d119c828cbe Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:32 +0100 -Subject: [PATCH 025/117] crypto: curve25519 - generic C library +Subject: [PATCH 025/115] crypto: curve25519 - generic C library implementations commit 0ed42a6f431e930b2e8fae21955406e09fe75d70 upstream. @@ -14195,7 +14195,7 @@ Signed-off-by: Jason A. Donenfeld diff --git a/include/crypto/curve25519.h b/include/crypto/curve25519.h new file mode 100644 -index 000000000000..4e6dc840b159 +index 0000000000000..4e6dc840b1592 --- /dev/null +++ b/include/crypto/curve25519.h @@ -0,0 +1,71 @@ @@ -14271,7 +14271,7 @@ index 000000000000..4e6dc840b159 + +#endif /* CURVE25519_H */ diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index 7ad98b624e55..b1d830dc1c9e 100644 +index 7ad98b624e554..b1d830dc1c9e0 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -59,6 +59,31 @@ config CRYPTO_LIB_CHACHA @@ -14307,7 +14307,7 @@ index 7ad98b624e55..b1d830dc1c9e 100644 tristate diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile -index 8ca66b5f9807..273c55d5e147 100644 +index 8ca66b5f9807b..273c55d5e147b 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -16,6 +16,11 @@ libblake2s-generic-y += blake2s-generic.o @@ -14324,7 +14324,7 @@ index 8ca66b5f9807..273c55d5e147 100644 diff --git a/lib/crypto/curve25519-fiat32.c b/lib/crypto/curve25519-fiat32.c new file mode 100644 -index 000000000000..1c455207341d +index 0000000000000..1c455207341d3 --- /dev/null +++ b/lib/crypto/curve25519-fiat32.c @@ -0,0 +1,864 @@ @@ -15194,7 +15194,7 @@ index 000000000000..1c455207341d +} diff --git a/lib/crypto/curve25519-hacl64.c b/lib/crypto/curve25519-hacl64.c new file mode 100644 -index 000000000000..771d82dc5f14 +index 0000000000000..771d82dc5f14e --- /dev/null +++ b/lib/crypto/curve25519-hacl64.c @@ -0,0 +1,788 @@ @@ -15988,7 +15988,7 @@ index 000000000000..771d82dc5f14 +} diff --git a/lib/crypto/curve25519.c b/lib/crypto/curve25519.c new file mode 100644 -index 000000000000..0106bebe6900 +index 0000000000000..0106bebe69008 --- /dev/null +++ b/lib/crypto/curve25519.c @@ -0,0 +1,25 @@ @@ -16021,10 +16021,10 @@ index 000000000000..0106bebe6900 2.18.4 -From 02e6878712b24efce89e3abee79df1218f60d1c4 Mon Sep 17 00:00:00 2001 +From a40eeb82471e0ef3ebaf65329704f571c044a95b Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:33 +0100 -Subject: [PATCH 026/117] crypto: curve25519 - add kpp selftest +Subject: [PATCH 026/115] crypto: curve25519 - add kpp selftest commit f613457a7af085728297bef71233c37faf3c01b1 upstream. @@ -16041,7 +16041,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 1231 insertions(+) diff --git a/crypto/testmgr.c b/crypto/testmgr.c -index 711390861f71..57ab993b9ad2 100644 +index 711390861f716..57ab993b9ad25 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4295,6 +4295,12 @@ static const struct alg_test_desc alg_test_descs[] = { @@ -16058,7 +16058,7 @@ index 711390861f71..57ab993b9ad2 100644 .alg = "deflate", .test = alg_test_comp, diff --git a/crypto/testmgr.h b/crypto/testmgr.h -index 102fcad54966..5d132ae996b4 100644 +index 102fcad549665..5d132ae996b4a 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -1030,6 +1030,1231 @@ static const struct kpp_testvec dh_tv_template[] = { @@ -17297,10 +17297,10 @@ index 102fcad54966..5d132ae996b4 100644 2.18.4 -From 3951d5b12d76eefa2a00056eed4a16243379deae Mon Sep 17 00:00:00 2001 +From 65f2f0623cff1e3160affdcfb726b784ead866d8 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:34 +0100 -Subject: [PATCH 027/117] crypto: curve25519 - implement generic KPP driver +Subject: [PATCH 027/115] crypto: curve25519 - implement generic KPP driver commit ee772cb641135739c1530647391d5a04c39db192 upstream. @@ -17317,7 +17317,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 crypto/curve25519-generic.c diff --git a/crypto/Kconfig b/crypto/Kconfig -index 8fd3954bf64c..a3fc859830c1 100644 +index 8fd3954bf64c5..a3fc859830c1e 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -264,6 +264,11 @@ config CRYPTO_ECRDSA @@ -17333,7 +17333,7 @@ index 8fd3954bf64c..a3fc859830c1 100644 config CRYPTO_CCM diff --git a/crypto/Makefile b/crypto/Makefile -index fd27edea7c8e..4e7a0a8f7e35 100644 +index fd27edea7c8ec..4e7a0a8f7e357 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -167,6 +167,7 @@ obj-$(CONFIG_CRYPTO_ZSTD) += zstd.o @@ -17346,7 +17346,7 @@ index fd27edea7c8e..4e7a0a8f7e35 100644 ecdh_generic-y += ecdh_helper.o diff --git a/crypto/curve25519-generic.c b/crypto/curve25519-generic.c new file mode 100644 -index 000000000000..bd88fd571393 +index 0000000000000..bd88fd571393d --- /dev/null +++ b/crypto/curve25519-generic.c @@ -0,0 +1,90 @@ @@ -17444,10 +17444,10 @@ index 000000000000..bd88fd571393 2.18.4 -From 8c6522f3a73d68c4ccef0f0850e9c34e144de042 Mon Sep 17 00:00:00 2001 +From 4277abf75253a08ebc0ea9638cf413fa8949d243 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:35 +0100 -Subject: [PATCH 028/117] crypto: lib/curve25519 - work around Clang stack +Subject: [PATCH 028/115] crypto: lib/curve25519 - work around Clang stack spilling issue commit 660bb8e1f833ea63185fe80fde847e3e42f18e3b upstream. @@ -17473,7 +17473,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/crypto/curve25519-fiat32.c b/lib/crypto/curve25519-fiat32.c -index 1c455207341d..2fde0ec33dbd 100644 +index 1c455207341d3..2fde0ec33dbd0 100644 --- a/lib/crypto/curve25519-fiat32.c +++ b/lib/crypto/curve25519-fiat32.c @@ -223,7 +223,7 @@ static __always_inline void fe_1(fe *h) @@ -17525,10 +17525,10 @@ index 1c455207341d..2fde0ec33dbd 100644 2.18.4 -From b61eb8cd17fecacf95a07d9d9cba19c05015a770 Mon Sep 17 00:00:00 2001 +From 8cde457048ca90996bb4c61871fa365620654050 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:36 +0100 -Subject: [PATCH 029/117] crypto: curve25519 - x86_64 library and KPP +Subject: [PATCH 029/115] crypto: curve25519 - x86_64 library and KPP implementations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -17560,7 +17560,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 arch/x86/crypto/curve25519-x86_64.c diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile -index 922c8ecfa00f..958440eae27e 100644 +index 922c8ecfa00f5..958440eae27ec 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_CRYPTO_AEGIS128_AESNI_SSE2) += aegis128-aesni.o @@ -17573,7 +17573,7 @@ index 922c8ecfa00f..958440eae27e 100644 ifeq ($(avx_supported),yes) diff --git a/arch/x86/crypto/curve25519-x86_64.c b/arch/x86/crypto/curve25519-x86_64.c new file mode 100644 -index 000000000000..a52a3fb15727 +index 0000000000000..a52a3fb157279 --- /dev/null +++ b/arch/x86/crypto/curve25519-x86_64.c @@ -0,0 +1,2475 @@ @@ -20053,7 +20053,7 @@ index 000000000000..a52a3fb15727 +MODULE_ALIAS_CRYPTO("curve25519-x86"); +MODULE_LICENSE("GPL v2"); diff --git a/crypto/Kconfig b/crypto/Kconfig -index a3fc859830c1..b8b738bcc312 100644 +index a3fc859830c1e..b8b738bcc3120 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -269,6 +269,12 @@ config CRYPTO_CURVE25519 @@ -20073,10 +20073,10 @@ index a3fc859830c1..b8b738bcc312 100644 2.18.4 -From 3ad42670d1a9a760cc14405a60f0c68b6246accb Mon Sep 17 00:00:00 2001 +From 0ac330f3e7a1b6da6001ce7271180d9615df308e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:37 +0100 -Subject: [PATCH 030/117] crypto: arm/curve25519 - import Bernstein and +Subject: [PATCH 030/115] crypto: arm/curve25519 - import Bernstein and Schwabe's Curve25519 ARM implementation commit f0fb006b604f98e2309a30f34ef455ac734f7c1c upstream. @@ -20102,7 +20102,7 @@ Signed-off-by: Jason A. Donenfeld diff --git a/arch/arm/crypto/curve25519-core.S b/arch/arm/crypto/curve25519-core.S new file mode 100644 -index 000000000000..f33b85fef382 +index 0000000000000..f33b85fef3823 --- /dev/null +++ b/arch/arm/crypto/curve25519-core.S @@ -0,0 +1,2105 @@ @@ -22215,10 +22215,10 @@ index 000000000000..f33b85fef382 2.18.4 -From 02073ed5ab5ec53969d0b7ed3e41f070f4e61864 Mon Sep 17 00:00:00 2001 +From ca5550b1462848bd20f90039977f3ae87f632945 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 8 Nov 2019 13:22:38 +0100 -Subject: [PATCH 031/117] crypto: arm/curve25519 - wire up NEON implementation +Subject: [PATCH 031/115] crypto: arm/curve25519 - wire up NEON implementation commit d8f1308a025fc7e00414194ed742d5f05a21e13c upstream. @@ -22266,7 +22266,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 arch/arm/crypto/curve25519-glue.c diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig -index 2e8a9289bded..61fa7e4aa8f9 100644 +index 2e8a9289bded3..61fa7e4aa8f9e 100644 --- a/arch/arm/crypto/Kconfig +++ b/arch/arm/crypto/Kconfig @@ -141,4 +141,10 @@ config CRYPTO_NHPOLY1305_NEON @@ -22281,7 +22281,7 @@ index 2e8a9289bded..61fa7e4aa8f9 100644 + endif diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile -index 4f6a8a81dabc..7700385cec9f 100644 +index 4f6a8a81dabc1..7700385cec9ff 100644 --- a/arch/arm/crypto/Makefile +++ b/arch/arm/crypto/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o @@ -22301,7 +22301,7 @@ index 4f6a8a81dabc..7700385cec9f 100644 ifdef REGENERATE_ARM_CRYPTO quiet_cmd_perl = PERL $@ diff --git a/arch/arm/crypto/curve25519-core.S b/arch/arm/crypto/curve25519-core.S -index f33b85fef382..be18af52e7dc 100644 +index f33b85fef3823..be18af52e7dc9 100644 --- a/arch/arm/crypto/curve25519-core.S +++ b/arch/arm/crypto/curve25519-core.S @@ -1,43 +1,35 @@ @@ -23151,7 +23151,7 @@ index f33b85fef382..be18af52e7dc 100644 +ENDPROC(curve25519_neon) diff --git a/arch/arm/crypto/curve25519-glue.c b/arch/arm/crypto/curve25519-glue.c new file mode 100644 -index 000000000000..2e9e12d2f642 +index 0000000000000..2e9e12d2f642a --- /dev/null +++ b/arch/arm/crypto/curve25519-glue.c @@ -0,0 +1,127 @@ @@ -23286,10 +23286,10 @@ index 000000000000..2e9e12d2f642 2.18.4 -From ac04076064addfc5598008e780dd3a8777c3cec8 Mon Sep 17 00:00:00 2001 +From 82eeda8cb54b3f3011e49c86be311814770b8745 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:39 +0100 -Subject: [PATCH 032/117] crypto: chacha20poly1305 - import construction and +Subject: [PATCH 032/115] crypto: chacha20poly1305 - import construction and selftest from Zinc commit ed20078b7e3331e82828be357147af6a3282e4ce upstream. @@ -23319,7 +23319,7 @@ Signed-off-by: Jason A. Donenfeld diff --git a/include/crypto/chacha20poly1305.h b/include/crypto/chacha20poly1305.h new file mode 100644 -index 000000000000..ad3b1de58df8 +index 0000000000000..ad3b1de58df89 --- /dev/null +++ b/include/crypto/chacha20poly1305.h @@ -0,0 +1,37 @@ @@ -23361,7 +23361,7 @@ index 000000000000..ad3b1de58df8 + +#endif /* __CHACHA20POLY1305_H */ diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index b1d830dc1c9e..0b2c4fce26d9 100644 +index b1d830dc1c9e0..0b2c4fce26d95 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -119,5 +119,12 @@ config CRYPTO_LIB_POLY1305 @@ -23378,7 +23378,7 @@ index b1d830dc1c9e..0b2c4fce26d9 100644 config CRYPTO_LIB_SHA256 tristate diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile -index 273c55d5e147..34a701ab8b92 100644 +index 273c55d5e147b..34a701ab8b92e 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -16,6 +16,9 @@ libblake2s-generic-y += blake2s-generic.o @@ -23399,7 +23399,7 @@ index 273c55d5e147..34a701ab8b92 100644 endif diff --git a/lib/crypto/chacha20poly1305-selftest.c b/lib/crypto/chacha20poly1305-selftest.c new file mode 100644 -index 000000000000..d1ed0f27cfdb +index 0000000000000..d1ed0f27cfdbd --- /dev/null +++ b/lib/crypto/chacha20poly1305-selftest.c @@ -0,0 +1,7348 @@ @@ -30753,7 +30753,7 @@ index 000000000000..d1ed0f27cfdb +} diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c new file mode 100644 -index 000000000000..c12ddbe9eb92 +index 0000000000000..c12ddbe9eb92a --- /dev/null +++ b/lib/crypto/chacha20poly1305.c @@ -0,0 +1,219 @@ @@ -30980,10 +30980,10 @@ index 000000000000..c12ddbe9eb92 2.18.4 -From 11518a9a623618b7a02d621f75f341770185e44d Mon Sep 17 00:00:00 2001 +From a3dd68c75fa2e267ebc0e2619cfa3bc2924474d3 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 8 Nov 2019 13:22:40 +0100 -Subject: [PATCH 033/117] crypto: lib/chacha20poly1305 - reimplement +Subject: [PATCH 033/115] crypto: lib/chacha20poly1305 - reimplement crypt_from_sg() routine commit d95312a3ccc0cd544d374be2fc45aeaa803e5fd9 upstream. @@ -31017,7 +31017,7 @@ Signed-off-by: Jason A. Donenfeld 3 files changed, 206 insertions(+) diff --git a/include/crypto/chacha20poly1305.h b/include/crypto/chacha20poly1305.h -index ad3b1de58df8..234ee28078ef 100644 +index ad3b1de58df89..234ee28078efd 100644 --- a/include/crypto/chacha20poly1305.h +++ b/include/crypto/chacha20poly1305.h @@ -7,6 +7,7 @@ @@ -31044,7 +31044,7 @@ index ad3b1de58df8..234ee28078ef 100644 + #endif /* __CHACHA20POLY1305_H */ diff --git a/lib/crypto/chacha20poly1305-selftest.c b/lib/crypto/chacha20poly1305-selftest.c -index d1ed0f27cfdb..465de46dbdef 100644 +index d1ed0f27cfdbd..465de46dbdef2 100644 --- a/lib/crypto/chacha20poly1305-selftest.c +++ b/lib/crypto/chacha20poly1305-selftest.c @@ -7250,6 +7250,7 @@ bool __init chacha20poly1305_selftest(void) @@ -31114,7 +31114,7 @@ index d1ed0f27cfdb..465de46dbdef 100644 for (i = 0; i < ARRAY_SIZE(xchacha20poly1305_enc_vectors); ++i) { memset(computed_output, 0, MAXIMUM_TEST_BUFFER_LEN); diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c -index c12ddbe9eb92..821e5cc9b14e 100644 +index c12ddbe9eb92a..821e5cc9b14eb 100644 --- a/lib/crypto/chacha20poly1305.c +++ b/lib/crypto/chacha20poly1305.c @@ -11,6 +11,7 @@ @@ -31285,10 +31285,10 @@ index c12ddbe9eb92..821e5cc9b14e 100644 2.18.4 -From 43eef635407f6e17a86aedf9302d60bf595af851 Mon Sep 17 00:00:00 2001 +From ae6edeabca36ddc9a7dcad0798b70b469cafcbb0 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 17 Nov 2019 23:21:29 -0800 -Subject: [PATCH 034/117] crypto: chacha_generic - remove unnecessary setkey() +Subject: [PATCH 034/115] crypto: chacha_generic - remove unnecessary setkey() functions commit 2043323a799a660bc84bbee404cf7a2617ec6157 upstream. @@ -31306,7 +31306,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c -index c1b147318393..8beea79ab117 100644 +index c1b1473183938..8beea79ab1178 100644 --- a/crypto/chacha_generic.c +++ b/crypto/chacha_generic.c @@ -37,18 +37,6 @@ static int chacha_stream_xor(struct skcipher_request *req, @@ -31359,10 +31359,10 @@ index c1b147318393..8beea79ab117 100644 2.18.4 -From 3ef9f1930acdb457134a24dabfb719073d63a8be Mon Sep 17 00:00:00 2001 +From 89f5ca0475e73f4752d3a6795c1949ed2a76d29e Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 17 Nov 2019 23:21:58 -0800 -Subject: [PATCH 035/117] crypto: x86/chacha - only unregister algorithms if +Subject: [PATCH 035/115] crypto: x86/chacha - only unregister algorithms if registered commit b62755aed3a3f5ca9edd2718339ccea3b6bbbe57 upstream. @@ -31380,7 +31380,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c -index b391e13a9e41..a94e30b6f941 100644 +index b391e13a9e415..a94e30b6f9413 100644 --- a/arch/x86/crypto/chacha_glue.c +++ b/arch/x86/crypto/chacha_glue.c @@ -304,7 +304,8 @@ static int __init chacha_simd_mod_init(void) @@ -31397,10 +31397,10 @@ index b391e13a9e41..a94e30b6f941 100644 2.18.4 -From e01b39b5457012eb184ed3058222f0276401be12 Mon Sep 17 00:00:00 2001 +From 1c70211beccb66b1b506cc8006c147a9d59bd7f2 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 17 Nov 2019 23:22:16 -0800 -Subject: [PATCH 036/117] crypto: lib/chacha20poly1305 - use chacha20_crypt() +Subject: [PATCH 036/115] crypto: lib/chacha20poly1305 - use chacha20_crypt() commit 413808b71e6204b0cc1eeaa77960f7c3cd381d33 upstream. @@ -31417,7 +31417,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c -index 821e5cc9b14e..6d83cafebc69 100644 +index 821e5cc9b14eb..6d83cafebc69c 100644 --- a/lib/crypto/chacha20poly1305.c +++ b/lib/crypto/chacha20poly1305.c @@ -66,14 +66,14 @@ __chacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len, @@ -31486,10 +31486,10 @@ index 821e5cc9b14e..6d83cafebc69 100644 2.18.4 -From 7553c9edd4fc620058f9149d1db82dba088cff68 Mon Sep 17 00:00:00 2001 +From 2882dd79df72546111aaecd936be7e5b40507d32 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 25 Nov 2019 11:31:12 +0100 -Subject: [PATCH 037/117] crypto: arch - conditionalize crypto api in arch glue +Subject: [PATCH 037/115] crypto: arch - conditionalize crypto api in arch glue for lib code commit 8394bfec51e0e565556101bcc4e2fe7551104cd8 upstream. @@ -31519,7 +31519,7 @@ Signed-off-by: Jason A. Donenfeld 11 files changed, 53 insertions(+), 32 deletions(-) diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c -index 3f0c057aa050..7bdf8823066d 100644 +index 3f0c057aa0502..7bdf8823066d0 100644 --- a/arch/arm/crypto/chacha-glue.c +++ b/arch/arm/crypto/chacha-glue.c @@ -286,11 +286,13 @@ static struct skcipher_alg neon_algs[] = { @@ -31570,7 +31570,7 @@ index 3f0c057aa050..7bdf8823066d 100644 module_init(chacha_simd_mod_init); diff --git a/arch/arm/crypto/curve25519-glue.c b/arch/arm/crypto/curve25519-glue.c -index 2e9e12d2f642..f3f42cf3b893 100644 +index 2e9e12d2f642a..f3f42cf3b8937 100644 --- a/arch/arm/crypto/curve25519-glue.c +++ b/arch/arm/crypto/curve25519-glue.c @@ -108,14 +108,15 @@ static int __init mod_init(void) @@ -31592,7 +31592,7 @@ index 2e9e12d2f642..f3f42cf3b893 100644 } diff --git a/arch/arm/crypto/poly1305-glue.c b/arch/arm/crypto/poly1305-glue.c -index 74a725ac89c9..abe3f2d587dc 100644 +index 74a725ac89c9f..abe3f2d587dcb 100644 --- a/arch/arm/crypto/poly1305-glue.c +++ b/arch/arm/crypto/poly1305-glue.c @@ -249,16 +249,19 @@ static int __init arm_poly1305_mod_init(void) @@ -31619,7 +31619,7 @@ index 74a725ac89c9..abe3f2d587dc 100644 crypto_unregister_shash(&arm_poly1305_algs[0]); return; diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c -index b08029d7bde6..71c11d2e9fcd 100644 +index b08029d7bde62..71c11d2e9fcda 100644 --- a/arch/arm64/crypto/chacha-neon-glue.c +++ b/arch/arm64/crypto/chacha-neon-glue.c @@ -211,12 +211,13 @@ static int __init chacha_simd_mod_init(void) @@ -31639,7 +31639,7 @@ index b08029d7bde6..71c11d2e9fcd 100644 } diff --git a/arch/arm64/crypto/poly1305-glue.c b/arch/arm64/crypto/poly1305-glue.c -index dd843d0ee83a..83a2338a8826 100644 +index dd843d0ee83ab..83a2338a88263 100644 --- a/arch/arm64/crypto/poly1305-glue.c +++ b/arch/arm64/crypto/poly1305-glue.c @@ -220,12 +220,13 @@ static int __init neon_poly1305_mod_init(void) @@ -31659,7 +31659,7 @@ index dd843d0ee83a..83a2338a8826 100644 } diff --git a/arch/mips/crypto/chacha-glue.c b/arch/mips/crypto/chacha-glue.c -index 779e399c9bef..90896029d0cd 100644 +index 779e399c9befd..90896029d0cdf 100644 --- a/arch/mips/crypto/chacha-glue.c +++ b/arch/mips/crypto/chacha-glue.c @@ -128,12 +128,14 @@ static struct skcipher_alg algs[] = { @@ -31680,7 +31680,7 @@ index 779e399c9bef..90896029d0cd 100644 module_init(chacha_simd_mod_init); diff --git a/arch/mips/crypto/poly1305-glue.c b/arch/mips/crypto/poly1305-glue.c -index b759b6ccc361..b37d29cf5d0a 100644 +index b759b6ccc361c..b37d29cf5d0a8 100644 --- a/arch/mips/crypto/poly1305-glue.c +++ b/arch/mips/crypto/poly1305-glue.c @@ -187,12 +187,14 @@ static struct shash_alg mips_poly1305_alg = { @@ -31701,7 +31701,7 @@ index b759b6ccc361..b37d29cf5d0a 100644 module_init(mips_poly1305_mod_init); diff --git a/arch/x86/crypto/blake2s-glue.c b/arch/x86/crypto/blake2s-glue.c -index 4a37ba7cdbe5..1d9ff8a45e1f 100644 +index 4a37ba7cdbe52..1d9ff8a45e1fd 100644 --- a/arch/x86/crypto/blake2s-glue.c +++ b/arch/x86/crypto/blake2s-glue.c @@ -210,12 +210,14 @@ static int __init blake2s_mod_init(void) @@ -31722,7 +31722,7 @@ index 4a37ba7cdbe5..1d9ff8a45e1f 100644 } diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c -index a94e30b6f941..1bebe11b9ec9 100644 +index a94e30b6f9413..1bebe11b9ec95 100644 --- a/arch/x86/crypto/chacha_glue.c +++ b/arch/x86/crypto/chacha_glue.c @@ -299,12 +299,13 @@ static int __init chacha_simd_mod_init(void) @@ -31742,7 +31742,7 @@ index a94e30b6f941..1bebe11b9ec9 100644 } diff --git a/arch/x86/crypto/curve25519-x86_64.c b/arch/x86/crypto/curve25519-x86_64.c -index a52a3fb15727..eec7d2d24239 100644 +index a52a3fb157279..eec7d2d242396 100644 --- a/arch/x86/crypto/curve25519-x86_64.c +++ b/arch/x86/crypto/curve25519-x86_64.c @@ -2457,13 +2457,14 @@ static int __init curve25519_mod_init(void) @@ -31764,7 +31764,7 @@ index a52a3fb15727..eec7d2d24239 100644 } diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index 370cd88068ec..0cc4537e6617 100644 +index 370cd88068ec1..0cc4537e6617c 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -224,12 +224,13 @@ static int __init poly1305_simd_mod_init(void) @@ -31787,10 +31787,10 @@ index 370cd88068ec..0cc4537e6617 100644 2.18.4 -From 43a81baff514a4fdc89594156a520b9f86c8bfb9 Mon Sep 17 00:00:00 2001 +From 74b89ee28db1d76c44ea3f1e9ef5839a803de29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valdis=20Kl=C4=93tnieks?= Date: Thu, 5 Dec 2019 20:58:36 -0500 -Subject: [PATCH 038/117] crypto: chacha - fix warning message in header file +Subject: [PATCH 038/115] crypto: chacha - fix warning message in header file commit 579d705cd64e44f3fcda1a6cfd5f37468a5ddf63 upstream. @@ -31812,7 +31812,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/crypto/internal/chacha.h b/include/crypto/internal/chacha.h -index aa5d4a16aac5..b085dc1ac151 100644 +index aa5d4a16aac5d..b085dc1ac1516 100644 --- a/include/crypto/internal/chacha.h +++ b/include/crypto/internal/chacha.h @@ -34,7 +34,7 @@ static inline int chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key, @@ -31828,10 +31828,10 @@ index aa5d4a16aac5..b085dc1ac151 100644 2.18.4 -From ea1b43de85bc840383235c460b249d326a4ab8ad Mon Sep 17 00:00:00 2001 +From 4b798e161c3f1a846a48ea91b27f3cb18100220a Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 11 Dec 2019 10:26:39 +0100 -Subject: [PATCH 039/117] crypto: arm/curve25519 - add arch-specific key +Subject: [PATCH 039/115] crypto: arm/curve25519 - add arch-specific key generation function commit 84faa307249b341f6ad8de3e1869d77a65e26669 upstream. @@ -31851,7 +31851,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 7 insertions(+) diff --git a/arch/arm/crypto/curve25519-glue.c b/arch/arm/crypto/curve25519-glue.c -index f3f42cf3b893..776ae07e0469 100644 +index f3f42cf3b8937..776ae07e04697 100644 --- a/arch/arm/crypto/curve25519-glue.c +++ b/arch/arm/crypto/curve25519-glue.c @@ -38,6 +38,13 @@ void curve25519_arch(u8 out[CURVE25519_KEY_SIZE], @@ -31872,10 +31872,10 @@ index f3f42cf3b893..776ae07e0469 100644 2.18.4 -From fae58695a6e4bb3a22a234a3bd212c65daaf3183 Mon Sep 17 00:00:00 2001 +From c8c17cad23f8635d751ec0aad621fdf7ded5d6d1 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 16 Dec 2019 19:53:26 +0100 -Subject: [PATCH 040/117] crypto: lib/curve25519 - re-add selftests +Subject: [PATCH 040/115] crypto: lib/curve25519 - re-add selftests commit aa127963f1cab2b93c74c9b128a84610203fb674 upstream. @@ -31895,7 +31895,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 lib/crypto/curve25519-selftest.c diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile -index 34a701ab8b92..f97f9b941110 100644 +index 34a701ab8b92e..f97f9b9411105 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -36,4 +36,5 @@ libsha256-y := sha256.o @@ -31906,7 +31906,7 @@ index 34a701ab8b92..f97f9b941110 100644 endif diff --git a/lib/crypto/curve25519-selftest.c b/lib/crypto/curve25519-selftest.c new file mode 100644 -index 000000000000..c85e85381e78 +index 0000000000000..c85e85381e788 --- /dev/null +++ b/lib/crypto/curve25519-selftest.c @@ -0,0 +1,1321 @@ @@ -33232,7 +33232,7 @@ index 000000000000..c85e85381e78 + return success; +} diff --git a/lib/crypto/curve25519.c b/lib/crypto/curve25519.c -index 0106bebe6900..c03ccdb99434 100644 +index 0106bebe69008..c03ccdb994340 100644 --- a/lib/crypto/curve25519.c +++ b/lib/crypto/curve25519.c @@ -13,6 +13,8 @@ @@ -33270,10 +33270,10 @@ index 0106bebe6900..c03ccdb99434 100644 2.18.4 -From 5f996db51979df92dc9ee78a1101bec85a9a04af Mon Sep 17 00:00:00 2001 +From 78834bc0be45631e091ada3cdad050267aa962cd Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 5 Jan 2020 22:40:46 -0500 -Subject: [PATCH 041/117] crypto: poly1305 - add new 32 and 64-bit generic +Subject: [PATCH 041/115] crypto: poly1305 - add new 32 and 64-bit generic versions commit 1c08a104360f3e18f4ee6346c21cc3923efb952e upstream. @@ -33328,7 +33328,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 lib/crypto/poly1305-donna64.c diff --git a/arch/x86/crypto/poly1305-avx2-x86_64.S b/arch/x86/crypto/poly1305-avx2-x86_64.S -index 8b341bc29d41..1688fb551070 100644 +index 8b341bc29d416..1688fb551070c 100644 --- a/arch/x86/crypto/poly1305-avx2-x86_64.S +++ b/arch/x86/crypto/poly1305-avx2-x86_64.S @@ -34,16 +34,16 @@ ORMASK: .octa 0x00000000010000000000000001000000 @@ -33359,7 +33359,7 @@ index 8b341bc29d41..1688fb551070 100644 #define hc0 %ymm0 #define hc1 %ymm1 diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index 0cc4537e6617..edb7113e36f3 100644 +index 0cc4537e6617c..edb7113e36f32 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -25,6 +25,21 @@ asmlinkage void poly1305_4block_avx2(u32 *h, const u8 *src, const u32 *r, @@ -33621,7 +33621,7 @@ index 0cc4537e6617..edb7113e36f3 100644 } diff --git a/crypto/adiantum.c b/crypto/adiantum.c -index aded26092268..c846a887abe1 100644 +index aded260922684..c846a887abe19 100644 --- a/crypto/adiantum.c +++ b/crypto/adiantum.c @@ -72,7 +72,7 @@ struct adiantum_tfm_ctx { @@ -33643,7 +33643,7 @@ index aded26092268..c846a887abe1 100644 /* Hash the left-hand part (the "bulk") of the message using NHPoly1305 */ diff --git a/crypto/nhpoly1305.c b/crypto/nhpoly1305.c -index f6b6a52092b4..8a3006c3b51b 100644 +index f6b6a52092b49..8a3006c3b51b9 100644 --- a/crypto/nhpoly1305.c +++ b/crypto/nhpoly1305.c @@ -210,7 +210,7 @@ int crypto_nhpoly1305_final_helper(struct shash_desc *desc, u8 *dst, nh_t nh_fn) @@ -33656,7 +33656,7 @@ index f6b6a52092b4..8a3006c3b51b 100644 } EXPORT_SYMBOL(crypto_nhpoly1305_final_helper); diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c -index 21edbd8c99fb..94af47eb6fa6 100644 +index 21edbd8c99fbc..94af47eb6fa69 100644 --- a/crypto/poly1305_generic.c +++ b/crypto/poly1305_generic.c @@ -31,6 +31,29 @@ static int crypto_poly1305_init(struct shash_desc *desc) @@ -33699,7 +33699,7 @@ index 21edbd8c99fb..94af47eb6fa6 100644 } diff --git a/include/crypto/internal/poly1305.h b/include/crypto/internal/poly1305.h -index 479b0cab2a1a..064e52ca5248 100644 +index 479b0cab2a1ad..064e52ca52480 100644 --- a/include/crypto/internal/poly1305.h +++ b/include/crypto/internal/poly1305.h @@ -11,48 +11,23 @@ @@ -33762,7 +33762,7 @@ index 479b0cab2a1a..064e52ca5248 100644 #endif diff --git a/include/crypto/nhpoly1305.h b/include/crypto/nhpoly1305.h -index 53c04423c582..306925fea190 100644 +index 53c04423c582e..306925fea1904 100644 --- a/include/crypto/nhpoly1305.h +++ b/include/crypto/nhpoly1305.h @@ -7,7 +7,7 @@ @@ -33784,7 +33784,7 @@ index 53c04423c582..306925fea190 100644 }; diff --git a/include/crypto/poly1305.h b/include/crypto/poly1305.h -index 74c6e1cd73ee..f1f67fc749cf 100644 +index 74c6e1cd73eee..f1f67fc749cf4 100644 --- a/include/crypto/poly1305.h +++ b/include/crypto/poly1305.h @@ -13,12 +13,29 @@ @@ -33832,7 +33832,7 @@ index 74c6e1cd73ee..f1f67fc749cf 100644 void poly1305_init_arch(struct poly1305_desc_ctx *desc, const u8 *key); diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile -index f97f9b941110..6ecaf83a5a9a 100644 +index f97f9b9411105..6ecaf83a5a9aa 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -28,7 +28,9 @@ obj-$(CONFIG_CRYPTO_LIB_DES) += libdes.o @@ -33848,7 +33848,7 @@ index f97f9b941110..6ecaf83a5a9a 100644 libsha256-y := sha256.o diff --git a/lib/crypto/poly1305-donna32.c b/lib/crypto/poly1305-donna32.c new file mode 100644 -index 000000000000..3cc77d94390b +index 0000000000000..3cc77d94390b2 --- /dev/null +++ b/lib/crypto/poly1305-donna32.c @@ -0,0 +1,204 @@ @@ -34058,7 +34058,7 @@ index 000000000000..3cc77d94390b +EXPORT_SYMBOL(poly1305_core_emit); diff --git a/lib/crypto/poly1305-donna64.c b/lib/crypto/poly1305-donna64.c new file mode 100644 -index 000000000000..6ae181bb4345 +index 0000000000000..6ae181bb43450 --- /dev/null +++ b/lib/crypto/poly1305-donna64.c @@ -0,0 +1,185 @@ @@ -34248,7 +34248,7 @@ index 000000000000..6ae181bb4345 +} +EXPORT_SYMBOL(poly1305_core_emit); diff --git a/lib/crypto/poly1305.c b/lib/crypto/poly1305.c -index 32ec293c65ae..9d2d14df0fee 100644 +index 32ec293c65ae7..9d2d14df0fee5 100644 --- a/lib/crypto/poly1305.c +++ b/lib/crypto/poly1305.c @@ -12,151 +12,9 @@ @@ -34465,10 +34465,10 @@ index 32ec293c65ae..9d2d14df0fee 100644 2.18.4 -From cf9813215cb5b32c82af3d478c2ccc538d006af4 Mon Sep 17 00:00:00 2001 +From 58127c498379d26e9fceea96c1808c88338c874e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 5 Jan 2020 22:40:47 -0500 -Subject: [PATCH 042/117] crypto: x86/poly1305 - import unmodified cryptogams +Subject: [PATCH 042/115] crypto: x86/poly1305 - import unmodified cryptogams implementation commit 0896ca2a0cb6127e8a129f1f2a680d49b6b0f65c upstream. @@ -34488,7 +34488,7 @@ Signed-off-by: Jason A. Donenfeld diff --git a/arch/x86/crypto/poly1305-x86_64-cryptogams.pl b/arch/x86/crypto/poly1305-x86_64-cryptogams.pl new file mode 100644 -index 000000000000..342ad7f18aa7 +index 0000000000000..342ad7f18aa71 --- /dev/null +++ b/arch/x86/crypto/poly1305-x86_64-cryptogams.pl @@ -0,0 +1,4159 @@ @@ -38655,10 +38655,10 @@ index 000000000000..342ad7f18aa7 2.18.4 -From a24ec3524a4acab25230f46ff6660f432419d9bc Mon Sep 17 00:00:00 2001 +From 1de7e70cdad987e708e276ed6c584f17f44a445a Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 5 Jan 2020 22:40:48 -0500 -Subject: [PATCH 043/117] crypto: x86/poly1305 - wire up faster implementations +Subject: [PATCH 043/115] crypto: x86/poly1305 - wire up faster implementations for kernel commit d7d7b853566254648df59f7ea27ea05952a6cfa8 upstream. @@ -38783,13 +38783,13 @@ Signed-off-by: Jason A. Donenfeld diff --git a/arch/x86/crypto/.gitignore b/arch/x86/crypto/.gitignore new file mode 100644 -index 000000000000..c406ea6571fa +index 0000000000000..c406ea6571fac --- /dev/null +++ b/arch/x86/crypto/.gitignore @@ -0,0 +1 @@ +poly1305-x86_64.S diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile -index 958440eae27e..b69e00bf20b8 100644 +index 958440eae27ec..b69e00bf20b82 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile @@ -73,6 +73,10 @@ aegis128-aesni-y := aegis128-aesni-asm.o aegis128-aesni-glue.o @@ -38825,7 +38825,7 @@ index 958440eae27e..b69e00bf20b8 100644 + $(call if_changed,perlasm) diff --git a/arch/x86/crypto/poly1305-avx2-x86_64.S b/arch/x86/crypto/poly1305-avx2-x86_64.S deleted file mode 100644 -index 1688fb551070..000000000000 +index 1688fb551070c..0000000000000 --- a/arch/x86/crypto/poly1305-avx2-x86_64.S +++ /dev/null @@ -1,390 +0,0 @@ @@ -39221,7 +39221,7 @@ index 1688fb551070..000000000000 -ENDPROC(poly1305_4block_avx2) diff --git a/arch/x86/crypto/poly1305-sse2-x86_64.S b/arch/x86/crypto/poly1305-sse2-x86_64.S deleted file mode 100644 -index 5578f846e622..000000000000 +index 5578f846e622b..0000000000000 --- a/arch/x86/crypto/poly1305-sse2-x86_64.S +++ /dev/null @@ -1,590 +0,0 @@ @@ -39816,7 +39816,7 @@ index 5578f846e622..000000000000 - ret -ENDPROC(poly1305_2block_sse2) diff --git a/arch/x86/crypto/poly1305-x86_64-cryptogams.pl b/arch/x86/crypto/poly1305-x86_64-cryptogams.pl -index 342ad7f18aa7..80061bea6b16 100644 +index 342ad7f18aa71..80061bea6b16a 100644 --- a/arch/x86/crypto/poly1305-x86_64-cryptogams.pl +++ b/arch/x86/crypto/poly1305-x86_64-cryptogams.pl @@ -1,11 +1,14 @@ @@ -40987,7 +40987,7 @@ index 342ad7f18aa7..80061bea6b16 100644 } close STDOUT; diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index edb7113e36f3..657363588e0c 100644 +index edb7113e36f32..657363588e0c8 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -1,8 +1,6 @@ @@ -41576,7 +41576,7 @@ index edb7113e36f3..657363588e0c 100644 MODULE_ALIAS_CRYPTO("poly1305"); MODULE_ALIAS_CRYPTO("poly1305-simd"); diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig -index 0b2c4fce26d9..14c032de276e 100644 +index 0b2c4fce26d95..14c032de276e6 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -90,7 +90,7 @@ config CRYPTO_LIB_DES @@ -41592,10 +41592,10 @@ index 0b2c4fce26d9..14c032de276e 100644 2.18.4 -From 30fba118109bf9f9246d8fee7841e7c1a4f10512 Mon Sep 17 00:00:00 2001 +From 9d88649f8ef5028453ecde65a843e711b0945eec Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 5 Jan 2020 22:40:49 -0500 -Subject: [PATCH 044/117] crypto: {arm,arm64,mips}/poly1305 - remove redundant +Subject: [PATCH 044/115] crypto: {arm,arm64,mips}/poly1305 - remove redundant non-reduction from emit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -41641,7 +41641,7 @@ Signed-off-by: Jason A. Donenfeld 3 files changed, 6 insertions(+), 48 deletions(-) diff --git a/arch/arm/crypto/poly1305-glue.c b/arch/arm/crypto/poly1305-glue.c -index abe3f2d587dc..ceec04ec2f40 100644 +index abe3f2d587dcb..ceec04ec2f405 100644 --- a/arch/arm/crypto/poly1305-glue.c +++ b/arch/arm/crypto/poly1305-glue.c @@ -20,7 +20,7 @@ @@ -41684,7 +41684,7 @@ index abe3f2d587dc..ceec04ec2f40 100644 } EXPORT_SYMBOL(poly1305_final_arch); diff --git a/arch/arm64/crypto/poly1305-glue.c b/arch/arm64/crypto/poly1305-glue.c -index 83a2338a8826..e97b092f56b8 100644 +index 83a2338a88263..e97b092f56b8f 100644 --- a/arch/arm64/crypto/poly1305-glue.c +++ b/arch/arm64/crypto/poly1305-glue.c @@ -21,7 +21,7 @@ @@ -41727,7 +41727,7 @@ index 83a2338a8826..e97b092f56b8 100644 } EXPORT_SYMBOL(poly1305_final_arch); diff --git a/arch/mips/crypto/poly1305-glue.c b/arch/mips/crypto/poly1305-glue.c -index b37d29cf5d0a..fc881b46d911 100644 +index b37d29cf5d0a8..fc881b46d9111 100644 --- a/arch/mips/crypto/poly1305-glue.c +++ b/arch/mips/crypto/poly1305-glue.c @@ -15,7 +15,7 @@ @@ -41773,10 +41773,10 @@ index b37d29cf5d0a..fc881b46d911 100644 2.18.4 -From 6737f9545cacd65ae9799a645b620347ee7a51d2 Mon Sep 17 00:00:00 2001 +From 57a90de716992b58c20baa24628e902cce26e4fd Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 8 Jan 2020 12:37:35 +0800 -Subject: [PATCH 045/117] crypto: curve25519 - Fix selftest build error +Subject: [PATCH 045/115] crypto: curve25519 - Fix selftest build error commit a8bdf2c42ee4d1ee42af1f3601f85de94e70a421 upstream. @@ -41815,7 +41815,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100644 lib/crypto/curve25519-generic.c diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile -index 6ecaf83a5a9a..3a435629d9ce 100644 +index 6ecaf83a5a9aa..3a435629d9ce9 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -19,9 +19,12 @@ libblake2s-y += blake2s.o @@ -41836,7 +41836,7 @@ index 6ecaf83a5a9a..3a435629d9ce 100644 obj-$(CONFIG_CRYPTO_LIB_DES) += libdes.o diff --git a/lib/crypto/curve25519-generic.c b/lib/crypto/curve25519-generic.c new file mode 100644 -index 000000000000..de7c99172fa2 +index 0000000000000..de7c99172fa25 --- /dev/null +++ b/lib/crypto/curve25519-generic.c @@ -0,0 +1,24 @@ @@ -41865,7 +41865,7 @@ index 000000000000..de7c99172fa2 +MODULE_DESCRIPTION("Curve25519 scalar multiplication"); +MODULE_AUTHOR("Jason A. Donenfeld "); diff --git a/lib/crypto/curve25519.c b/lib/crypto/curve25519.c -index c03ccdb99434..288a62cd29b2 100644 +index c03ccdb994340..288a62cd29b22 100644 --- a/lib/crypto/curve25519.c +++ b/lib/crypto/curve25519.c @@ -15,13 +15,6 @@ @@ -41886,10 +41886,10 @@ index c03ccdb99434..288a62cd29b2 100644 2.18.4 -From e702869c233b03f1d1d767c036a03c09606419ea Mon Sep 17 00:00:00 2001 +From 209d764b1645563f12dc852cd5124d158aa7f2ed Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 16 Jan 2020 18:23:55 +0100 -Subject: [PATCH 046/117] crypto: x86/poly1305 - fix .gitignore typo +Subject: [PATCH 046/115] crypto: x86/poly1305 - fix .gitignore typo commit 1f6868995326cc82102049e349d8dbd116bdb656 upstream. @@ -41905,7 +41905,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/crypto/.gitignore b/arch/x86/crypto/.gitignore -index c406ea6571fa..30be0400a439 100644 +index c406ea6571fac..30be0400a4392 100644 --- a/arch/x86/crypto/.gitignore +++ b/arch/x86/crypto/.gitignore @@ -1 +1 @@ @@ -41915,10 +41915,10 @@ index c406ea6571fa..30be0400a439 100644 2.18.4 -From 3dc8b37f6bcbf7e98b786c34370960d7470ba724 Mon Sep 17 00:00:00 2001 +From aa5d3f33ed4293ebe39f4a00f334df6cf058a97c Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 16 Jan 2020 21:26:34 +0100 -Subject: [PATCH 047/117] crypto: chacha20poly1305 - add back missing test +Subject: [PATCH 047/115] crypto: chacha20poly1305 - add back missing test vectors and test chunking commit 72c7943792c9e7788ddd182337bcf8f650cf56f5 upstream. @@ -41942,7 +41942,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1698 insertions(+), 14 deletions(-) diff --git a/lib/crypto/chacha20poly1305-selftest.c b/lib/crypto/chacha20poly1305-selftest.c -index 465de46dbdef..c391a91364e9 100644 +index 465de46dbdef2..c391a91364e9d 100644 --- a/lib/crypto/chacha20poly1305-selftest.c +++ b/lib/crypto/chacha20poly1305-selftest.c @@ -4,6 +4,7 @@ @@ -43779,10 +43779,10 @@ index 465de46dbdef..c391a91364e9 100644 2.18.4 -From ce650dc24906469138236b00ef851cb7e32e84f7 Mon Sep 17 00:00:00 2001 +From b9130d65de27aa574c43d36309566d2d661f562e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 17 Jan 2020 11:42:22 +0100 -Subject: [PATCH 048/117] crypto: x86/poly1305 - emit does base conversion +Subject: [PATCH 048/115] crypto: x86/poly1305 - emit does base conversion itself commit f9e7fe32a792726186301423ff63a465d63386e1 upstream. @@ -43799,7 +43799,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index 657363588e0c..79bb58737d52 100644 +index 657363588e0c8..79bb58737d528 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -123,13 +123,9 @@ static void poly1305_simd_blocks(void *ctx, const u8 *inp, size_t len, @@ -43822,10 +43822,10 @@ index 657363588e0c..79bb58737d52 100644 2.18.4 -From 761be588ab38a61c4b7288322750b02ddc4da2ee Mon Sep 17 00:00:00 2001 +From e4912683de95e6badfefdfcab00e5728580acfe3 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 17 Jan 2020 17:43:18 +0100 -Subject: [PATCH 049/117] crypto: arm/chacha - fix build failured when kernel +Subject: [PATCH 049/115] crypto: arm/chacha - fix build failured when kernel mode NEON is disabled commit 0bc81767c5bd9d005fae1099fb39eb3688370cb1 upstream. @@ -43861,7 +43861,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c -index 7bdf8823066d..893692ed12b7 100644 +index 7bdf8823066d0..893692ed12b76 100644 --- a/arch/arm/crypto/chacha-glue.c +++ b/arch/arm/crypto/chacha-glue.c @@ -115,7 +115,7 @@ static int chacha_stream_xor(struct skcipher_request *req, @@ -43886,10 +43886,10 @@ index 7bdf8823066d..893692ed12b7 100644 2.18.4 -From c3efcd3d0abfa6027751040d89c769bcd10e1667 Mon Sep 17 00:00:00 2001 +From c0906d8f3e64011cbde6687f67dfd224a7a01055 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 17 Jan 2020 12:01:36 +0100 -Subject: [PATCH 050/117] crypto: Kconfig - allow tests to be disabled when +Subject: [PATCH 050/115] crypto: Kconfig - allow tests to be disabled when manager is disabled commit 2343d1529aff8b552589f622c23932035ed7a05d upstream. @@ -43907,7 +43907,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 4 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig -index b8b738bcc312..8fcf630471dc 100644 +index b8b738bcc3120..8fcf630471dcf 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -136,8 +136,6 @@ config CRYPTO_USER @@ -43932,10 +43932,10 @@ index b8b738bcc312..8fcf630471dc 100644 2.18.4 -From 48681c2021772277b48acd1069157075d352f40d Mon Sep 17 00:00:00 2001 +From 44e282e3975c6fd03529c5524c2dd7ef7cb87a69 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 6 Feb 2020 12:42:01 +0100 -Subject: [PATCH 051/117] crypto: chacha20poly1305 - prevent integer overflow +Subject: [PATCH 051/115] crypto: chacha20poly1305 - prevent integer overflow on large input commit c9cc0517bba9f0213f1e55172feceb99e5512daf upstream. @@ -43961,7 +43961,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 3 insertions(+) diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c -index 6d83cafebc69..ad0699ce702f 100644 +index 6d83cafebc69c..ad0699ce702f9 100644 --- a/lib/crypto/chacha20poly1305.c +++ b/lib/crypto/chacha20poly1305.c @@ -235,6 +235,9 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src, @@ -43978,10 +43978,10 @@ index 6d83cafebc69..ad0699ce702f 100644 2.18.4 -From c0726d01004c0f482aed8ef2bc71726ce4d327e4 Mon Sep 17 00:00:00 2001 +From 783a2c65af5ba9746c9aa98116fff07cbadb4b45 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 1 Mar 2020 22:52:35 +0800 -Subject: [PATCH 052/117] crypto: x86/curve25519 - support assemblers with no +Subject: [PATCH 052/115] crypto: x86/curve25519 - support assemblers with no adx support commit 1579f1bc3b753d17a44de3457d5c6f4a5b14c752 upstream. @@ -44003,7 +44003,7 @@ Signed-off-by: Jason A. Donenfeld 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile -index 94df0868804b..513a55562d75 100644 +index 94df0868804bc..513a55562d750 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -194,9 +194,10 @@ avx2_instr :=$(call as-instr,vpbroadcastb %xmm0$(comma)%ymm1,-DCONFIG_AS_AVX2=1) @@ -44020,7 +44020,7 @@ index 94df0868804b..513a55562d75 100644 KBUILD_LDFLAGS := -m elf_$(UTS_MACHINE) diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile -index b69e00bf20b8..8c2e9eadee8a 100644 +index b69e00bf20b82..8c2e9eadee8a0 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile @@ -11,6 +11,7 @@ avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\ @@ -44045,7 +44045,7 @@ index b69e00bf20b8..8c2e9eadee8a 100644 # These modules require assembler to support AVX. ifeq ($(avx_supported),yes) diff --git a/include/crypto/curve25519.h b/include/crypto/curve25519.h -index 4e6dc840b159..9ecb3c1f0f15 100644 +index 4e6dc840b1592..9ecb3c1f0f15d 100644 --- a/include/crypto/curve25519.h +++ b/include/crypto/curve25519.h @@ -33,7 +33,8 @@ bool __must_check curve25519(u8 mypublic[CURVE25519_KEY_SIZE], @@ -44072,10 +44072,10 @@ index 4e6dc840b159..9ecb3c1f0f15 100644 2.18.4 -From 589bee17e20a2ad4b8b20955ee9c970e4a377a2a Mon Sep 17 00:00:00 2001 +From 445cdda06d2d6cf0aeb6ff3c96c18d1970bbb622 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 18 Mar 2020 20:27:32 -0600 -Subject: [PATCH 053/117] crypto: arm64/chacha - correctly walk through blocks +Subject: [PATCH 053/115] crypto: arm64/chacha - correctly walk through blocks commit c8cfcb78c65877313cda7bcbace624d3dbd1f3b3 upstream. @@ -44103,7 +44103,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c -index 71c11d2e9fcd..218943612261 100644 +index 71c11d2e9fcda..2189436122617 100644 --- a/arch/arm64/crypto/chacha-neon-glue.c +++ b/arch/arm64/crypto/chacha-neon-glue.c @@ -55,10 +55,10 @@ static void chacha_doneon(u32 *state, u8 *dst, const u8 *src, @@ -44122,7 +44122,7 @@ index 71c11d2e9fcd..218943612261 100644 } diff --git a/lib/crypto/chacha20poly1305-selftest.c b/lib/crypto/chacha20poly1305-selftest.c -index c391a91364e9..fa43deda2660 100644 +index c391a91364e9d..fa43deda2660d 100644 --- a/lib/crypto/chacha20poly1305-selftest.c +++ b/lib/crypto/chacha20poly1305-selftest.c @@ -9028,10 +9028,15 @@ bool __init chacha20poly1305_selftest(void) @@ -44148,10 +44148,10 @@ index c391a91364e9..fa43deda2660 100644 2.18.4 -From d9083adec8a8c5f981dcb02daf8eac99d682946b Mon Sep 17 00:00:00 2001 +From 79a9b936012f72abf2e10ba16fc449f2a0905eef Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 20 Jan 2020 18:18:15 +0100 -Subject: [PATCH 054/117] crypto: x86/curve25519 - replace with formally +Subject: [PATCH 054/115] crypto: x86/curve25519 - replace with formally verified implementation commit 07b586fe06625b0b610dc3d3a969c51913d143d4 upstream. @@ -44231,7 +44231,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1292 insertions(+), 2254 deletions(-) diff --git a/arch/x86/crypto/curve25519-x86_64.c b/arch/x86/crypto/curve25519-x86_64.c -index eec7d2d24239..e4e58b8e9afe 100644 +index eec7d2d242396..e4e58b8e9afe4 100644 --- a/arch/x86/crypto/curve25519-x86_64.c +++ b/arch/x86/crypto/curve25519-x86_64.c @@ -1,8 +1,7 @@ @@ -47905,10 +47905,10 @@ index eec7d2d24239..e4e58b8e9afe 100644 2.18.4 -From 6eef3f525ec5236732d20e8a1177fd8cf8cb25bb Mon Sep 17 00:00:00 2001 +From 816354525a1157f6243e1e992dffa6bed19db5d5 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 1 Mar 2020 16:06:56 +0800 -Subject: [PATCH 055/117] crypto: x86/curve25519 - leave r12 as spare register +Subject: [PATCH 055/115] crypto: x86/curve25519 - leave r12 as spare register commit dc7fc3a53ae158263196b1892b672aedf67796c5 upstream. @@ -47924,7 +47924,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/arch/x86/crypto/curve25519-x86_64.c b/arch/x86/crypto/curve25519-x86_64.c -index e4e58b8e9afe..8a17621f7d3a 100644 +index e4e58b8e9afe4..8a17621f7d3a3 100644 --- a/arch/x86/crypto/curve25519-x86_64.c +++ b/arch/x86/crypto/curve25519-x86_64.c @@ -167,28 +167,28 @@ static inline void fmul(u64 *out, const u64 *f1, const u64 *f2, u64 *tmp) @@ -48287,10 +48287,10 @@ index e4e58b8e9afe..8a17621f7d3a 100644 2.18.4 -From e43146bf39f9bf1210d49fe6aefc4937f88b8a62 Mon Sep 17 00:00:00 2001 +From 37c87cbf1de4258cadb0417f95c8e37eda4c06ac Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 19 Mar 2020 11:56:17 -0600 -Subject: [PATCH 056/117] crypto: arm[64]/poly1305 - add artifact to .gitignore +Subject: [PATCH 056/115] crypto: arm[64]/poly1305 - add artifact to .gitignore files commit 6e4e00d8b68ca7eb30d08afb740033e0d36abe55 upstream. @@ -48311,7 +48311,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 2 insertions(+) diff --git a/arch/arm/crypto/.gitignore b/arch/arm/crypto/.gitignore -index 31e1f538df7d..a3c7ad52a469 100644 +index 31e1f538df7de..a3c7ad52a469f 100644 --- a/arch/arm/crypto/.gitignore +++ b/arch/arm/crypto/.gitignore @@ -1,3 +1,4 @@ @@ -48320,7 +48320,7 @@ index 31e1f538df7d..a3c7ad52a469 100644 sha512-core.S +poly1305-core.S diff --git a/arch/arm64/crypto/.gitignore b/arch/arm64/crypto/.gitignore -index 879df8781ed5..e403b1343328 100644 +index 879df8781ed56..e403b1343328d 100644 --- a/arch/arm64/crypto/.gitignore +++ b/arch/arm64/crypto/.gitignore @@ -1,2 +1,3 @@ @@ -48331,10 +48331,10 @@ index 879df8781ed5..e403b1343328 100644 2.18.4 -From 0d3456f5b8bf4246e5f9ec45f688a6f6586a38dd Mon Sep 17 00:00:00 2001 +From 47b920bf9d66a9e52905251430a3612c43fe16d5 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 23 Apr 2020 15:54:04 -0600 -Subject: [PATCH 057/117] crypto: arch/lib - limit simd usage to 4k chunks +Subject: [PATCH 057/115] crypto: arch/lib - limit simd usage to 4k chunks commit 706024a52c614b478b63f7728d202532ce6591a9 upstream. @@ -48380,7 +48380,7 @@ Signed-off-by: Jason A. Donenfeld 7 files changed, 65 insertions(+), 30 deletions(-) diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c -index 893692ed12b7..cd131b454c2e 100644 +index 893692ed12b76..cd131b454c2ee 100644 --- a/arch/arm/crypto/chacha-glue.c +++ b/arch/arm/crypto/chacha-glue.c @@ -91,9 +91,17 @@ void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes, @@ -48405,7 +48405,7 @@ index 893692ed12b7..cd131b454c2e 100644 EXPORT_SYMBOL(chacha_crypt_arch); diff --git a/arch/arm/crypto/poly1305-glue.c b/arch/arm/crypto/poly1305-glue.c -index ceec04ec2f40..13cfef4ae22e 100644 +index ceec04ec2f405..13cfef4ae22e3 100644 --- a/arch/arm/crypto/poly1305-glue.c +++ b/arch/arm/crypto/poly1305-glue.c @@ -160,13 +160,20 @@ void poly1305_update_arch(struct poly1305_desc_ctx *dctx, const u8 *src, @@ -48434,7 +48434,7 @@ index ceec04ec2f40..13cfef4ae22e 100644 } diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c -index 218943612261..1d9824c4ae43 100644 +index 2189436122617..1d9824c4ae43b 100644 --- a/arch/arm64/crypto/chacha-neon-glue.c +++ b/arch/arm64/crypto/chacha-neon-glue.c @@ -87,9 +87,17 @@ void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes, @@ -48459,7 +48459,7 @@ index 218943612261..1d9824c4ae43 100644 EXPORT_SYMBOL(chacha_crypt_arch); diff --git a/arch/arm64/crypto/poly1305-glue.c b/arch/arm64/crypto/poly1305-glue.c -index e97b092f56b8..f33ada70c4ed 100644 +index e97b092f56b8f..f33ada70c4ed8 100644 --- a/arch/arm64/crypto/poly1305-glue.c +++ b/arch/arm64/crypto/poly1305-glue.c @@ -143,13 +143,20 @@ void poly1305_update_arch(struct poly1305_desc_ctx *dctx, const u8 *src, @@ -48488,7 +48488,7 @@ index e97b092f56b8..f33ada70c4ed 100644 } diff --git a/arch/x86/crypto/blake2s-glue.c b/arch/x86/crypto/blake2s-glue.c -index 1d9ff8a45e1f..94ac5bdd9f6f 100644 +index 1d9ff8a45e1fd..94ac5bdd9f6f2 100644 --- a/arch/x86/crypto/blake2s-glue.c +++ b/arch/x86/crypto/blake2s-glue.c @@ -32,16 +32,16 @@ void blake2s_compress_arch(struct blake2s_state *state, @@ -48524,7 +48524,7 @@ index 1d9ff8a45e1f..94ac5bdd9f6f 100644 EXPORT_SYMBOL(blake2s_compress_arch); diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c -index 1bebe11b9ec9..f3bfce21bc0d 100644 +index 1bebe11b9ec95..f3bfce21bc0d4 100644 --- a/arch/x86/crypto/chacha_glue.c +++ b/arch/x86/crypto/chacha_glue.c @@ -154,9 +154,17 @@ void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes, @@ -48549,7 +48549,7 @@ index 1bebe11b9ec9..f3bfce21bc0d 100644 EXPORT_SYMBOL(chacha_crypt_arch); diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index 79bb58737d52..61b2bc8b6986 100644 +index 79bb58737d528..61b2bc8b69861 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -91,8 +91,8 @@ static void poly1305_simd_blocks(void *ctx, const u8 *inp, size_t len, @@ -48592,10 +48592,10 @@ index 79bb58737d52..61b2bc8b6986 100644 2.18.4 -From 7b7550e61d7662fe40c6a31e0c9a131e21c2b518 Mon Sep 17 00:00:00 2001 +From 487339cfa7eef7b7be65777ac82ba738108d4288 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 8 Jul 2020 12:41:13 +1000 -Subject: [PATCH 058/117] crypto: lib/chacha20poly1305 - Add missing function +Subject: [PATCH 058/115] crypto: lib/chacha20poly1305 - Add missing function declaration commit 06cc2afbbdf9a9e8df3e2f8db724997dd6e1b4ac upstream. @@ -48611,7 +48611,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/crypto/chacha20poly1305.h b/include/crypto/chacha20poly1305.h -index 234ee28078ef..d2ac3ff7dc1e 100644 +index 234ee28078efd..d2ac3ff7dc1ec 100644 --- a/include/crypto/chacha20poly1305.h +++ b/include/crypto/chacha20poly1305.h @@ -45,4 +45,6 @@ bool chacha20poly1305_decrypt_sg_inplace(struct scatterlist *src, size_t src_len @@ -48622,7 +48622,7 @@ index 234ee28078ef..d2ac3ff7dc1e 100644 + #endif /* __CHACHA20POLY1305_H */ diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c -index ad0699ce702f..431e04280332 100644 +index ad0699ce702f9..431e042803327 100644 --- a/lib/crypto/chacha20poly1305.c +++ b/lib/crypto/chacha20poly1305.c @@ -21,8 +21,6 @@ @@ -48638,10 +48638,10 @@ index ad0699ce702f..431e04280332 100644 2.18.4 -From 46032c60e3eaf64fe98fac85e658c15137140ab1 Mon Sep 17 00:00:00 2001 +From c331c0664a83c27565d6fa1b6d8d9f40f6ff5d7f Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 8 Jul 2020 12:11:18 +0300 -Subject: [PATCH 059/117] crypto: x86/chacha-sse3 - use unaligned loads for +Subject: [PATCH 059/115] crypto: x86/chacha-sse3 - use unaligned loads for state array commit e79a31715193686e92dadb4caedfbb1f5de3659c upstream. @@ -48672,7 +48672,7 @@ Signed-off-by: Jason A. Donenfeld 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/arch/x86/crypto/chacha-ssse3-x86_64.S b/arch/x86/crypto/chacha-ssse3-x86_64.S -index 2d86c7d6dc88..a556a57f1a4a 100644 +index 2d86c7d6dc88c..a556a57f1a4af 100644 --- a/arch/x86/crypto/chacha-ssse3-x86_64.S +++ b/arch/x86/crypto/chacha-ssse3-x86_64.S @@ -120,10 +120,10 @@ ENTRY(chacha_block_xor_ssse3) @@ -48706,7 +48706,7 @@ index 2d86c7d6dc88..a556a57f1a4a 100644 mov %edx,%r8d call chacha_permute diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c -index f3bfce21bc0d..4c4dc64398cb 100644 +index f3bfce21bc0d4..4c4dc64398cbb 100644 --- a/arch/x86/crypto/chacha_glue.c +++ b/arch/x86/crypto/chacha_glue.c @@ -14,8 +14,6 @@ @@ -48777,7 +48777,7 @@ index f3bfce21bc0d..4c4dc64398cb 100644 if (req->cryptlen > CHACHA_BLOCK_SIZE && crypto_simd_usable()) { diff --git a/include/crypto/chacha.h b/include/crypto/chacha.h -index 2676f4fbd4c1..3a1c72fdb7cf 100644 +index 2676f4fbd4c16..3a1c72fdb7cf5 100644 --- a/include/crypto/chacha.h +++ b/include/crypto/chacha.h @@ -25,11 +25,7 @@ @@ -48796,10 +48796,10 @@ index 2676f4fbd4c1..3a1c72fdb7cf 100644 2.18.4 -From d187d34e30b2e271c8f1df2d4b3f64c931d970d2 Mon Sep 17 00:00:00 2001 +From 57637608dd8f1939dac22e52e325bbf2f12a7c47 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 23 Jul 2020 17:50:48 +1000 -Subject: [PATCH 060/117] crypto: x86/curve25519 - Remove unused carry +Subject: [PATCH 060/115] crypto: x86/curve25519 - Remove unused carry variables commit 054a5540fb8f7268e2c79e9deab4242db15c8cba upstream. @@ -48817,7 +48817,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/crypto/curve25519-x86_64.c b/arch/x86/crypto/curve25519-x86_64.c -index 8a17621f7d3a..8acbb6584a37 100644 +index 8a17621f7d3a3..8acbb6584a370 100644 --- a/arch/x86/crypto/curve25519-x86_64.c +++ b/arch/x86/crypto/curve25519-x86_64.c @@ -948,10 +948,8 @@ static void store_felem(u64 *b, u64 *f) @@ -48849,10 +48849,10 @@ index 8a17621f7d3a..8acbb6584a37 100644 2.18.4 -From 4b4f358b85ee2326462429c7769133396f3aac3b Mon Sep 17 00:00:00 2001 +From 3b768a37972cfa1441f0a4a4018e068f814bdaae Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 24 Aug 2020 11:09:53 -0300 -Subject: [PATCH 061/117] crypto: arm/curve25519 - include +Subject: [PATCH 061/115] crypto: arm/curve25519 - include commit 6779d0e6b0fe193ab3010ea201782ca6f75a3862 upstream. @@ -48877,7 +48877,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+) diff --git a/arch/arm/crypto/curve25519-glue.c b/arch/arm/crypto/curve25519-glue.c -index 776ae07e0469..31eb75b6002f 100644 +index 776ae07e04697..31eb75b6002fb 100644 --- a/arch/arm/crypto/curve25519-glue.c +++ b/arch/arm/crypto/curve25519-glue.c @@ -16,6 +16,7 @@ @@ -48892,10 +48892,10 @@ index 776ae07e0469..31eb75b6002f 100644 2.18.4 -From e1ef395778860e98d3a5bb72cb9752e4708edf4a Mon Sep 17 00:00:00 2001 +From 0d2293356e77e411eb0018c97876730ca3230be8 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Tue, 25 Aug 2020 11:23:00 +1000 -Subject: [PATCH 062/117] crypto: arm/poly1305 - Add prototype for +Subject: [PATCH 062/115] crypto: arm/poly1305 - Add prototype for poly1305_blocks_neon commit 51982ea02aef972132eb35c583d3e4c5b83166e5 upstream. @@ -48917,7 +48917,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+) diff --git a/arch/arm/crypto/poly1305-glue.c b/arch/arm/crypto/poly1305-glue.c -index 13cfef4ae22e..3023c1acfa19 100644 +index 13cfef4ae22e3..3023c1acfa194 100644 --- a/arch/arm/crypto/poly1305-glue.c +++ b/arch/arm/crypto/poly1305-glue.c @@ -20,6 +20,7 @@ @@ -48932,10 +48932,10 @@ index 13cfef4ae22e..3023c1acfa19 100644 2.18.4 -From 9cae67a1eae75350c36e399f47b9a73d9d3633fe Mon Sep 17 00:00:00 2001 +From 7c4160370b416193dafaee369d8225f212217c6c Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Thu, 27 Aug 2020 19:30:58 +0200 -Subject: [PATCH 063/117] crypto: curve25519-x86_64 - Use XORL r32,32 +Subject: [PATCH 063/115] crypto: curve25519-x86_64 - Use XORL r32,32 commit db719539fd3889836900bf912755aa30a5985e9a upstream. @@ -48954,7 +48954,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/arch/x86/crypto/curve25519-x86_64.c b/arch/x86/crypto/curve25519-x86_64.c -index 8acbb6584a37..a9edb6f8a0ba 100644 +index 8acbb6584a370..a9edb6f8a0ba6 100644 --- a/arch/x86/crypto/curve25519-x86_64.c +++ b/arch/x86/crypto/curve25519-x86_64.c @@ -45,11 +45,11 @@ static inline u64 add_scalar(u64 *out, const u64 *f1, u64 f2) @@ -49199,10 +49199,10 @@ index 8acbb6584a37..a9edb6f8a0ba 100644 2.18.4 -From 6f0e39358e26838078348467159fe1c87ba52761 Mon Sep 17 00:00:00 2001 +From 3683d0494205583fd48a4e1e66b1171c50e1ce4d Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Thu, 27 Aug 2020 19:38:31 +0200 -Subject: [PATCH 064/117] crypto: poly1305-x86_64 - Use XORL r32,32 +Subject: [PATCH 064/115] crypto: poly1305-x86_64 - Use XORL r32,32 commit 7dfd1e01b3dfc13431b1b25720cf2692a7e111ef upstream. @@ -49221,7 +49221,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/crypto/poly1305-x86_64-cryptogams.pl b/arch/x86/crypto/poly1305-x86_64-cryptogams.pl -index 80061bea6b16..5b593990501d 100644 +index 80061bea6b16a..5b593990501d3 100644 --- a/arch/x86/crypto/poly1305-x86_64-cryptogams.pl +++ b/arch/x86/crypto/poly1305-x86_64-cryptogams.pl @@ -246,7 +246,7 @@ $code.=<<___ if (!$kernel); @@ -49264,10 +49264,10 @@ index 80061bea6b16..5b593990501d 100644 2.18.4 -From 2482cf2431216e859c36dcd145d2c6bbcef81062 Mon Sep 17 00:00:00 2001 +From d178f243b50c4d96ca2e837e24fc6a4eae120f06 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 24 Sep 2020 13:29:04 +1000 -Subject: [PATCH 065/117] crypto: x86/poly1305 - Remove assignments with no +Subject: [PATCH 065/115] crypto: x86/poly1305 - Remove assignments with no effect commit 4a0c1de64bf9d9027a6f19adfba89fc27893db23 upstream. @@ -49283,7 +49283,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 3 deletions(-) diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index 61b2bc8b6986..7de5046fe583 100644 +index 61b2bc8b69861..7de5046fe5832 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -157,9 +157,6 @@ static unsigned int crypto_poly1305_setdctxkey(struct poly1305_desc_ctx *dctx, @@ -49300,10 +49300,10 @@ index 61b2bc8b6986..7de5046fe583 100644 2.18.4 -From 4e551d7df6818bbe788c01da7d2c6a3af0c2f5c5 Mon Sep 17 00:00:00 2001 +From 03b3e2d25b02791303c5025c620b8a9c04f2fe8b Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 23 Oct 2020 15:27:48 -0700 -Subject: [PATCH 066/117] crypto: x86/poly1305 - add back a needed assignment +Subject: [PATCH 066/115] crypto: x86/poly1305 - add back a needed assignment commit c3a98c3ad5c0dc60a1ac66bf91147a3f39cac96b upstream. @@ -49324,7 +49324,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+) diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c -index 7de5046fe583..b69e362730d0 100644 +index 7de5046fe5832..b69e362730d02 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -157,6 +157,7 @@ static unsigned int crypto_poly1305_setdctxkey(struct poly1305_desc_ctx *dctx, @@ -49339,10 +49339,10 @@ index 7de5046fe583..b69e362730d0 100644 2.18.4 -From 6a36f18ecb9d1454314a5d8860f82906ca3e5188 Mon Sep 17 00:00:00 2001 +From 527d549345d69bce58e7664d454cb65588a257f3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 2 Nov 2020 14:48:15 +0100 -Subject: [PATCH 067/117] crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires +Subject: [PATCH 067/115] crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires the manager commit 6569e3097f1c4a490bdf2b23d326855e04942dfd upstream. @@ -49362,7 +49362,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/Kconfig b/crypto/Kconfig -index 8fcf630471dc..fd5a8724ed38 100644 +index 8fcf630471dcf..fd5a8724ed385 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -145,7 +145,7 @@ config CRYPTO_MANAGER_DISABLE_TESTS @@ -49378,10 +49378,10 @@ index 8fcf630471dc..fd5a8724ed38 100644 2.18.4 -From d847e1ea725d22908f4e1e8b723205939d3a947a Mon Sep 17 00:00:00 2001 +From ace7208e3bb70742cd2717770424234424cabf93 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Tue, 3 Nov 2020 17:28:09 +0100 -Subject: [PATCH 068/117] crypto: arm/chacha-neon - optimize for non-block size +Subject: [PATCH 068/115] crypto: arm/chacha-neon - optimize for non-block size multiples commit 86cd97ec4b943af35562a74688bc4e909b32c3d1 upstream. @@ -49424,7 +49424,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 107 insertions(+), 24 deletions(-) diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c -index cd131b454c2e..f603184dc0f5 100644 +index cd131b454c2ee..f603184dc0f58 100644 --- a/arch/arm/crypto/chacha-glue.c +++ b/arch/arm/crypto/chacha-glue.c @@ -23,7 +23,7 @@ @@ -49478,7 +49478,7 @@ index cd131b454c2e..f603184dc0f5 100644 } diff --git a/arch/arm/crypto/chacha-neon-core.S b/arch/arm/crypto/chacha-neon-core.S -index eb22926d4912..13d12f672656 100644 +index eb22926d49127..13d12f672656b 100644 --- a/arch/arm/crypto/chacha-neon-core.S +++ b/arch/arm/crypto/chacha-neon-core.S @@ -47,6 +47,7 @@ @@ -49658,10 +49658,10 @@ index eb22926d4912..13d12f672656 100644 2.18.4 -From c5520fdf42a2d4f06ae977e2f6da1216b73a180a Mon Sep 17 00:00:00 2001 +From c3c512ae16575c9a768cbe0c678812cea27cacc0 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 6 Nov 2020 17:39:38 +0100 -Subject: [PATCH 069/117] crypto: arm64/chacha - simplify tail block handling +Subject: [PATCH 069/115] crypto: arm64/chacha - simplify tail block handling commit c4fc6328d6c67690a7e6e03f43a5a976a13120ef upstream. @@ -49691,7 +49691,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 69 insertions(+), 124 deletions(-) diff --git a/arch/arm64/crypto/chacha-neon-core.S b/arch/arm64/crypto/chacha-neon-core.S -index 706c4e10e9e2..50d9dd173be7 100644 +index 706c4e10e9e29..50d9dd173be79 100644 --- a/arch/arm64/crypto/chacha-neon-core.S +++ b/arch/arm64/crypto/chacha-neon-core.S @@ -195,7 +195,6 @@ ENTRY(chacha_4block_xor_neon) @@ -49988,10 +49988,10 @@ index 706c4e10e9e2..50d9dd173be7 100644 2.18.4 -From c896750facb1b60386a2db00930d4f493bf3f9f3 Mon Sep 17 00:00:00 2001 +From d08426b3c0fc045f9794e7e3f2adb1d909dbd165 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 11 Feb 2020 20:47:05 +0100 -Subject: [PATCH 070/117] icmp: introduce helper for nat'd source address in +Subject: [PATCH 070/115] icmp: introduce helper for nat'd source address in network device context commit 0b41713b606694257b90d61ba7e2712d8457648b upstream. @@ -50014,7 +50014,7 @@ Signed-off-by: Jason A. Donenfeld 4 files changed, 83 insertions(+) diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h -index a8f888976137..024b7a4cd98e 100644 +index a8f8889761378..024b7a4cd98e2 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h @@ -22,12 +22,22 @@ extern int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn); @@ -50041,7 +50041,7 @@ index a8f888976137..024b7a4cd98e 100644 #endif diff --git a/include/net/icmp.h b/include/net/icmp.h -index 5d4bfdba9adf..9ac2d2672a93 100644 +index 5d4bfdba9adf0..9ac2d2672a938 100644 --- a/include/net/icmp.h +++ b/include/net/icmp.h @@ -43,6 +43,12 @@ static inline void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 @@ -50058,7 +50058,7 @@ index 5d4bfdba9adf..9ac2d2672a93 100644 int icmp_err(struct sk_buff *skb, u32 info); int icmp_init(void); diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c -index d00533aea1f0..5b7717da168d 100644 +index d00533aea1f05..5b7717da168db 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -750,6 +750,39 @@ out:; @@ -50102,7 +50102,7 @@ index d00533aea1f0..5b7717da168d 100644 static void icmp_socket_deliver(struct sk_buff *skb, u32 info) { diff --git a/net/ipv6/ip6_icmp.c b/net/ipv6/ip6_icmp.c -index 02045494c24c..e0086758b6ee 100644 +index 02045494c24cc..e0086758b6ee3 100644 --- a/net/ipv6/ip6_icmp.c +++ b/net/ipv6/ip6_icmp.c @@ -45,4 +45,38 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) @@ -50148,10 +50148,10 @@ index 02045494c24c..e0086758b6ee 100644 2.18.4 -From d3f3014bf616f4cfadddad719c5fed79c3995612 Mon Sep 17 00:00:00 2001 +From 39f2f7f90703df3f272dd8d2bd88fbe1542eb512 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 9 Dec 2019 00:27:34 +0100 -Subject: [PATCH 071/117] net: WireGuard secure network tunnel +Subject: [PATCH 071/115] net: WireGuard secure network tunnel commit e7096c131e5161fa3b8e52a650d7719d2857adfd upstream. @@ -50340,7 +50340,7 @@ Signed-off-by: Jason A. Donenfeld create mode 100755 tools/testing/selftests/wireguard/netns.sh diff --git a/MAINTAINERS b/MAINTAINERS -index 1407008df749..2395dfb37d1a 100644 +index 1407008df7491..2395dfb37d1ac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17584,6 +17584,14 @@ L: linux-gpio@vger.kernel.org @@ -50359,7 +50359,7 @@ index 1407008df749..2395dfb37d1a 100644 M: Miloslav Trmac S: Maintained diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig -index df3cd2589bcf..16ad145e22c9 100644 +index df3cd2589bcfe..16ad145e22c91 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -71,6 +71,47 @@ config DUMMY @@ -50411,7 +50411,7 @@ index df3cd2589bcf..16ad145e22c9 100644 tristate "EQL (serial line load balancing) support" ---help--- diff --git a/drivers/net/Makefile b/drivers/net/Makefile -index 0d3ba056cda3..953b7c12f0b0 100644 +index 0d3ba056cda3c..953b7c12f0b0c 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_BONDING) += bonding/ @@ -50424,7 +50424,7 @@ index 0d3ba056cda3..953b7c12f0b0 100644 obj-$(CONFIG_MACSEC) += macsec.o diff --git a/drivers/net/wireguard/Makefile b/drivers/net/wireguard/Makefile new file mode 100644 -index 000000000000..fc52b2cb500b +index 0000000000000..fc52b2cb500b3 --- /dev/null +++ b/drivers/net/wireguard/Makefile @@ -0,0 +1,18 @@ @@ -50448,7 +50448,7 @@ index 000000000000..fc52b2cb500b +obj-$(CONFIG_WIREGUARD) := wireguard.o diff --git a/drivers/net/wireguard/allowedips.c b/drivers/net/wireguard/allowedips.c new file mode 100644 -index 000000000000..72667d5399c3 +index 0000000000000..72667d5399c34 --- /dev/null +++ b/drivers/net/wireguard/allowedips.c @@ -0,0 +1,381 @@ @@ -50835,7 +50835,7 @@ index 000000000000..72667d5399c3 +#include "selftest/allowedips.c" diff --git a/drivers/net/wireguard/allowedips.h b/drivers/net/wireguard/allowedips.h new file mode 100644 -index 000000000000..e5c83cafcef4 +index 0000000000000..e5c83cafcef4c --- /dev/null +++ b/drivers/net/wireguard/allowedips.h @@ -0,0 +1,59 @@ @@ -50900,7 +50900,7 @@ index 000000000000..e5c83cafcef4 +#endif /* _WG_ALLOWEDIPS_H */ diff --git a/drivers/net/wireguard/cookie.c b/drivers/net/wireguard/cookie.c new file mode 100644 -index 000000000000..4956f0499c19 +index 0000000000000..4956f0499c198 --- /dev/null +++ b/drivers/net/wireguard/cookie.c @@ -0,0 +1,236 @@ @@ -51142,7 +51142,7 @@ index 000000000000..4956f0499c19 +} diff --git a/drivers/net/wireguard/cookie.h b/drivers/net/wireguard/cookie.h new file mode 100644 -index 000000000000..c4bd61ca03f2 +index 0000000000000..c4bd61ca03f24 --- /dev/null +++ b/drivers/net/wireguard/cookie.h @@ -0,0 +1,59 @@ @@ -51207,7 +51207,7 @@ index 000000000000..c4bd61ca03f2 +#endif /* _WG_COOKIE_H */ diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c new file mode 100644 -index 000000000000..16b19824b9ad +index 0000000000000..16b19824b9ad0 --- /dev/null +++ b/drivers/net/wireguard/device.c @@ -0,0 +1,458 @@ @@ -51671,7 +51671,7 @@ index 000000000000..16b19824b9ad +} diff --git a/drivers/net/wireguard/device.h b/drivers/net/wireguard/device.h new file mode 100644 -index 000000000000..c91f3051c5c7 +index 0000000000000..c91f3051c5c78 --- /dev/null +++ b/drivers/net/wireguard/device.h @@ -0,0 +1,73 @@ @@ -51750,7 +51750,7 @@ index 000000000000..c91f3051c5c7 +#endif /* _WG_DEVICE_H */ diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c new file mode 100644 -index 000000000000..10c0a40f6a9e +index 0000000000000..10c0a40f6a9e5 --- /dev/null +++ b/drivers/net/wireguard/main.c @@ -0,0 +1,64 @@ @@ -51820,7 +51820,7 @@ index 000000000000..10c0a40f6a9e +MODULE_ALIAS_GENL_FAMILY(WG_GENL_NAME); diff --git a/drivers/net/wireguard/messages.h b/drivers/net/wireguard/messages.h new file mode 100644 -index 000000000000..b8a7b9ce32ba +index 0000000000000..b8a7b9ce32ba7 --- /dev/null +++ b/drivers/net/wireguard/messages.h @@ -0,0 +1,128 @@ @@ -51954,7 +51954,7 @@ index 000000000000..b8a7b9ce32ba +#endif /* _WG_MESSAGES_H */ diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c new file mode 100644 -index 000000000000..0739a2cd1920 +index 0000000000000..0739a2cd19203 --- /dev/null +++ b/drivers/net/wireguard/netlink.c @@ -0,0 +1,648 @@ @@ -52608,7 +52608,7 @@ index 000000000000..0739a2cd1920 +} diff --git a/drivers/net/wireguard/netlink.h b/drivers/net/wireguard/netlink.h new file mode 100644 -index 000000000000..15100d92e2e3 +index 0000000000000..15100d92e2e32 --- /dev/null +++ b/drivers/net/wireguard/netlink.h @@ -0,0 +1,12 @@ @@ -52626,7 +52626,7 @@ index 000000000000..15100d92e2e3 +#endif /* _WG_NETLINK_H */ diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c new file mode 100644 -index 000000000000..d71c8db68a8c +index 0000000000000..d71c8db68a8ce --- /dev/null +++ b/drivers/net/wireguard/noise.c @@ -0,0 +1,828 @@ @@ -53460,7 +53460,7 @@ index 000000000000..d71c8db68a8c +} diff --git a/drivers/net/wireguard/noise.h b/drivers/net/wireguard/noise.h new file mode 100644 -index 000000000000..138a07bb817c +index 0000000000000..138a07bb817ce --- /dev/null +++ b/drivers/net/wireguard/noise.h @@ -0,0 +1,137 @@ @@ -53603,7 +53603,7 @@ index 000000000000..138a07bb817c +#endif /* _WG_NOISE_H */ diff --git a/drivers/net/wireguard/peer.c b/drivers/net/wireguard/peer.c new file mode 100644 -index 000000000000..071eedf33f5a +index 0000000000000..071eedf33f5aa --- /dev/null +++ b/drivers/net/wireguard/peer.c @@ -0,0 +1,240 @@ @@ -53849,7 +53849,7 @@ index 000000000000..071eedf33f5a +} diff --git a/drivers/net/wireguard/peer.h b/drivers/net/wireguard/peer.h new file mode 100644 -index 000000000000..23af40922997 +index 0000000000000..23af409229972 --- /dev/null +++ b/drivers/net/wireguard/peer.h @@ -0,0 +1,83 @@ @@ -53938,7 +53938,7 @@ index 000000000000..23af40922997 +#endif /* _WG_PEER_H */ diff --git a/drivers/net/wireguard/peerlookup.c b/drivers/net/wireguard/peerlookup.c new file mode 100644 -index 000000000000..e4deb331476b +index 0000000000000..e4deb331476b3 --- /dev/null +++ b/drivers/net/wireguard/peerlookup.c @@ -0,0 +1,221 @@ @@ -54165,7 +54165,7 @@ index 000000000000..e4deb331476b +} diff --git a/drivers/net/wireguard/peerlookup.h b/drivers/net/wireguard/peerlookup.h new file mode 100644 -index 000000000000..ced811797680 +index 0000000000000..ced8117976800 --- /dev/null +++ b/drivers/net/wireguard/peerlookup.h @@ -0,0 +1,64 @@ @@ -54235,7 +54235,7 @@ index 000000000000..ced811797680 +#endif /* _WG_PEERLOOKUP_H */ diff --git a/drivers/net/wireguard/queueing.c b/drivers/net/wireguard/queueing.c new file mode 100644 -index 000000000000..5c964fcb994e +index 0000000000000..5c964fcb994ec --- /dev/null +++ b/drivers/net/wireguard/queueing.c @@ -0,0 +1,53 @@ @@ -54294,7 +54294,7 @@ index 000000000000..5c964fcb994e +} diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h new file mode 100644 -index 000000000000..58fdd630b246 +index 0000000000000..58fdd630b246c --- /dev/null +++ b/drivers/net/wireguard/queueing.h @@ -0,0 +1,197 @@ @@ -54497,7 +54497,7 @@ index 000000000000..58fdd630b246 +#endif /* _WG_QUEUEING_H */ diff --git a/drivers/net/wireguard/ratelimiter.c b/drivers/net/wireguard/ratelimiter.c new file mode 100644 -index 000000000000..3fedd1d21f5e +index 0000000000000..3fedd1d21f5ee --- /dev/null +++ b/drivers/net/wireguard/ratelimiter.c @@ -0,0 +1,223 @@ @@ -54726,7 +54726,7 @@ index 000000000000..3fedd1d21f5e +#include "selftest/ratelimiter.c" diff --git a/drivers/net/wireguard/ratelimiter.h b/drivers/net/wireguard/ratelimiter.h new file mode 100644 -index 000000000000..83067f71ea99 +index 0000000000000..83067f71ea99e --- /dev/null +++ b/drivers/net/wireguard/ratelimiter.h @@ -0,0 +1,19 @@ @@ -54751,7 +54751,7 @@ index 000000000000..83067f71ea99 +#endif /* _WG_RATELIMITER_H */ diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c new file mode 100644 -index 000000000000..7e675f541491 +index 0000000000000..7e675f5414910 --- /dev/null +++ b/drivers/net/wireguard/receive.c @@ -0,0 +1,595 @@ @@ -55352,7 +55352,7 @@ index 000000000000..7e675f541491 +} diff --git a/drivers/net/wireguard/selftest/allowedips.c b/drivers/net/wireguard/selftest/allowedips.c new file mode 100644 -index 000000000000..846db14cb046 +index 0000000000000..846db14cb046b --- /dev/null +++ b/drivers/net/wireguard/selftest/allowedips.c @@ -0,0 +1,683 @@ @@ -56041,7 +56041,7 @@ index 000000000000..846db14cb046 +#endif diff --git a/drivers/net/wireguard/selftest/counter.c b/drivers/net/wireguard/selftest/counter.c new file mode 100644 -index 000000000000..f4fbb9072ed7 +index 0000000000000..f4fbb9072ed73 --- /dev/null +++ b/drivers/net/wireguard/selftest/counter.c @@ -0,0 +1,104 @@ @@ -56151,7 +56151,7 @@ index 000000000000..f4fbb9072ed7 +#endif diff --git a/drivers/net/wireguard/selftest/ratelimiter.c b/drivers/net/wireguard/selftest/ratelimiter.c new file mode 100644 -index 000000000000..bcd6462e4540 +index 0000000000000..bcd6462e45401 --- /dev/null +++ b/drivers/net/wireguard/selftest/ratelimiter.c @@ -0,0 +1,226 @@ @@ -56383,7 +56383,7 @@ index 000000000000..bcd6462e4540 +#endif diff --git a/drivers/net/wireguard/send.c b/drivers/net/wireguard/send.c new file mode 100644 -index 000000000000..c13260563446 +index 0000000000000..c132605634460 --- /dev/null +++ b/drivers/net/wireguard/send.c @@ -0,0 +1,413 @@ @@ -56802,7 +56802,7 @@ index 000000000000..c13260563446 +} diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c new file mode 100644 -index 000000000000..c46256d0d81c +index 0000000000000..c46256d0d81c1 --- /dev/null +++ b/drivers/net/wireguard/socket.c @@ -0,0 +1,437 @@ @@ -57245,7 +57245,7 @@ index 000000000000..c46256d0d81c +} diff --git a/drivers/net/wireguard/socket.h b/drivers/net/wireguard/socket.h new file mode 100644 -index 000000000000..bab5848efbcd +index 0000000000000..bab5848efbcdf --- /dev/null +++ b/drivers/net/wireguard/socket.h @@ -0,0 +1,44 @@ @@ -57295,7 +57295,7 @@ index 000000000000..bab5848efbcd +#endif /* _WG_SOCKET_H */ diff --git a/drivers/net/wireguard/timers.c b/drivers/net/wireguard/timers.c new file mode 100644 -index 000000000000..d54d32ac9bc4 +index 0000000000000..d54d32ac9bc41 --- /dev/null +++ b/drivers/net/wireguard/timers.c @@ -0,0 +1,243 @@ @@ -57544,7 +57544,7 @@ index 000000000000..d54d32ac9bc4 +} diff --git a/drivers/net/wireguard/timers.h b/drivers/net/wireguard/timers.h new file mode 100644 -index 000000000000..f0653dcb1326 +index 0000000000000..f0653dcb13266 --- /dev/null +++ b/drivers/net/wireguard/timers.h @@ -0,0 +1,31 @@ @@ -57581,14 +57581,14 @@ index 000000000000..f0653dcb1326 +#endif /* _WG_TIMERS_H */ diff --git a/drivers/net/wireguard/version.h b/drivers/net/wireguard/version.h new file mode 100644 -index 000000000000..a1a269a11634 +index 0000000000000..a1a269a116344 --- /dev/null +++ b/drivers/net/wireguard/version.h @@ -0,0 +1 @@ +#define WIREGUARD_VERSION "1.0.0" diff --git a/include/uapi/linux/wireguard.h b/include/uapi/linux/wireguard.h new file mode 100644 -index 000000000000..dd8a47c4ad11 +index 0000000000000..dd8a47c4ad11f --- /dev/null +++ b/include/uapi/linux/wireguard.h @@ -0,0 +1,196 @@ @@ -57790,7 +57790,7 @@ index 000000000000..dd8a47c4ad11 +#endif /* _WG_UAPI_WIREGUARD_H */ diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh new file mode 100755 -index 000000000000..e7310d9390f7 +index 0000000000000..e7310d9390f7e --- /dev/null +++ b/tools/testing/selftests/wireguard/netns.sh @@ -0,0 +1,537 @@ @@ -58335,10 +58335,10 @@ index 000000000000..e7310d9390f7 2.18.4 -From ff03dd85c86a85e0a5e0b66cf35d50aa8bdf9e10 Mon Sep 17 00:00:00 2001 +From b1a7d1d40af85d1e0376bfd6d731601c5e1c395a Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 15 Dec 2019 22:08:00 +0100 -Subject: [PATCH 072/117] wireguard: selftests: import harness makefile for +Subject: [PATCH 072/115] wireguard: selftests: import harness makefile for test suite commit 65d88d04114bca7d85faebd5fed61069cb2b632c upstream. @@ -58415,7 +58415,7 @@ Signed-off-by: Jason A. Donenfeld diff --git a/tools/testing/selftests/wireguard/qemu/.gitignore b/tools/testing/selftests/wireguard/qemu/.gitignore new file mode 100644 -index 000000000000..415b542a9d59 +index 0000000000000..415b542a9d599 --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/.gitignore @@ -0,0 +1,2 @@ @@ -58423,7 +58423,7 @@ index 000000000000..415b542a9d59 +distfiles/ diff --git a/tools/testing/selftests/wireguard/qemu/Makefile b/tools/testing/selftests/wireguard/qemu/Makefile new file mode 100644 -index 000000000000..6d51bf78eeff +index 0000000000000..6d51bf78eeff4 --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/Makefile @@ -0,0 +1,385 @@ @@ -58814,7 +58814,7 @@ index 000000000000..6d51bf78eeff +.DELETE_ON_ERROR: diff --git a/tools/testing/selftests/wireguard/qemu/arch/aarch64.config b/tools/testing/selftests/wireguard/qemu/arch/aarch64.config new file mode 100644 -index 000000000000..3d063bb247bb +index 0000000000000..3d063bb247bbe --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/aarch64.config @@ -0,0 +1,5 @@ @@ -58825,7 +58825,7 @@ index 000000000000..3d063bb247bb +CONFIG_FRAME_WARN=1280 diff --git a/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config b/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config new file mode 100644 -index 000000000000..dbdc7e406a7b +index 0000000000000..dbdc7e406a7ba --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config @@ -0,0 +1,6 @@ @@ -58837,7 +58837,7 @@ index 000000000000..dbdc7e406a7b +CONFIG_FRAME_WARN=1280 diff --git a/tools/testing/selftests/wireguard/qemu/arch/arm.config b/tools/testing/selftests/wireguard/qemu/arch/arm.config new file mode 100644 -index 000000000000..148f49905418 +index 0000000000000..148f499054182 --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/arm.config @@ -0,0 +1,9 @@ @@ -58852,7 +58852,7 @@ index 000000000000..148f49905418 +CONFIG_FRAME_WARN=1024 diff --git a/tools/testing/selftests/wireguard/qemu/arch/armeb.config b/tools/testing/selftests/wireguard/qemu/arch/armeb.config new file mode 100644 -index 000000000000..bd76b07d00a2 +index 0000000000000..bd76b07d00a2c --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/armeb.config @@ -0,0 +1,10 @@ @@ -58868,7 +58868,7 @@ index 000000000000..bd76b07d00a2 +CONFIG_FRAME_WARN=1024 diff --git a/tools/testing/selftests/wireguard/qemu/arch/i686.config b/tools/testing/selftests/wireguard/qemu/arch/i686.config new file mode 100644 -index 000000000000..a85025d7206e +index 0000000000000..a85025d7206ee --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/i686.config @@ -0,0 +1,5 @@ @@ -58879,7 +58879,7 @@ index 000000000000..a85025d7206e +CONFIG_FRAME_WARN=1024 diff --git a/tools/testing/selftests/wireguard/qemu/arch/m68k.config b/tools/testing/selftests/wireguard/qemu/arch/m68k.config new file mode 100644 -index 000000000000..5381ea10896c +index 0000000000000..5381ea10896c3 --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/m68k.config @@ -0,0 +1,9 @@ @@ -58894,7 +58894,7 @@ index 000000000000..5381ea10896c +CONFIG_FRAME_WARN=1024 diff --git a/tools/testing/selftests/wireguard/qemu/arch/mips.config b/tools/testing/selftests/wireguard/qemu/arch/mips.config new file mode 100644 -index 000000000000..df71d6b95546 +index 0000000000000..df71d6b95546f --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/mips.config @@ -0,0 +1,11 @@ @@ -58911,7 +58911,7 @@ index 000000000000..df71d6b95546 +CONFIG_FRAME_WARN=1024 diff --git a/tools/testing/selftests/wireguard/qemu/arch/mips64.config b/tools/testing/selftests/wireguard/qemu/arch/mips64.config new file mode 100644 -index 000000000000..90c783f725c4 +index 0000000000000..90c783f725c4d --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/mips64.config @@ -0,0 +1,14 @@ @@ -58931,7 +58931,7 @@ index 000000000000..90c783f725c4 +CONFIG_FRAME_WARN=1280 diff --git a/tools/testing/selftests/wireguard/qemu/arch/mips64el.config b/tools/testing/selftests/wireguard/qemu/arch/mips64el.config new file mode 100644 -index 000000000000..435b0b43e00c +index 0000000000000..435b0b43e00cb --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/mips64el.config @@ -0,0 +1,15 @@ @@ -58952,7 +58952,7 @@ index 000000000000..435b0b43e00c +CONFIG_FRAME_WARN=1280 diff --git a/tools/testing/selftests/wireguard/qemu/arch/mipsel.config b/tools/testing/selftests/wireguard/qemu/arch/mipsel.config new file mode 100644 -index 000000000000..62bb50c4a85f +index 0000000000000..62bb50c4a85fc --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/mipsel.config @@ -0,0 +1,12 @@ @@ -58970,7 +58970,7 @@ index 000000000000..62bb50c4a85f +CONFIG_FRAME_WARN=1024 diff --git a/tools/testing/selftests/wireguard/qemu/arch/powerpc.config b/tools/testing/selftests/wireguard/qemu/arch/powerpc.config new file mode 100644 -index 000000000000..57957093b71b +index 0000000000000..57957093b71b8 --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/powerpc.config @@ -0,0 +1,10 @@ @@ -58986,7 +58986,7 @@ index 000000000000..57957093b71b +CONFIG_FRAME_WARN=1024 diff --git a/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config b/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config new file mode 100644 -index 000000000000..990c510a9cfa +index 0000000000000..990c510a9cfa5 --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config @@ -0,0 +1,12 @@ @@ -59004,7 +59004,7 @@ index 000000000000..990c510a9cfa +CONFIG_FRAME_WARN=1280 diff --git a/tools/testing/selftests/wireguard/qemu/arch/x86_64.config b/tools/testing/selftests/wireguard/qemu/arch/x86_64.config new file mode 100644 -index 000000000000..00a1ef4869d5 +index 0000000000000..00a1ef4869d58 --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/arch/x86_64.config @@ -0,0 +1,5 @@ @@ -59015,7 +59015,7 @@ index 000000000000..00a1ef4869d5 +CONFIG_FRAME_WARN=1280 diff --git a/tools/testing/selftests/wireguard/qemu/debug.config b/tools/testing/selftests/wireguard/qemu/debug.config new file mode 100644 -index 000000000000..b9c72706fe4d +index 0000000000000..b9c72706fe4db --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/debug.config @@ -0,0 +1,67 @@ @@ -59088,7 +59088,7 @@ index 000000000000..b9c72706fe4d +CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y diff --git a/tools/testing/selftests/wireguard/qemu/init.c b/tools/testing/selftests/wireguard/qemu/init.c new file mode 100644 -index 000000000000..51e5ddedee88 +index 0000000000000..51e5ddedee886 --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/init.c @@ -0,0 +1,284 @@ @@ -59378,7 +59378,7 @@ index 000000000000..51e5ddedee88 +} diff --git a/tools/testing/selftests/wireguard/qemu/kernel.config b/tools/testing/selftests/wireguard/qemu/kernel.config new file mode 100644 -index 000000000000..9cca30206014 +index 0000000000000..9cca30206014d --- /dev/null +++ b/tools/testing/selftests/wireguard/qemu/kernel.config @@ -0,0 +1,86 @@ @@ -59472,10 +59472,10 @@ index 000000000000..9cca30206014 2.18.4 -From 66ccca5752057dec27807224049365b2ffe9acc7 Mon Sep 17 00:00:00 2001 +From 8dc975a7427f7038811800fef712fd713aae7a61 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 15 Dec 2019 22:08:01 +0100 -Subject: [PATCH 073/117] wireguard: Kconfig: select parent dependency for +Subject: [PATCH 073/115] wireguard: Kconfig: select parent dependency for crypto commit d7c68a38bb4f9b7c1a2e4a772872c752ee5c44a6 upstream. @@ -59493,7 +59493,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig -index 16ad145e22c9..57f1ba924f4e 100644 +index 16ad145e22c91..57f1ba924f4ec 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -85,6 +85,8 @@ config WIREGUARD @@ -59509,10 +59509,10 @@ index 16ad145e22c9..57f1ba924f4e 100644 2.18.4 -From c11e11e6b0e6a2397e799c3992181031ed3eae04 Mon Sep 17 00:00:00 2001 +From 585480d0587e45e1e266a071224e05ec33bfc115 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Sun, 15 Dec 2019 22:08:02 +0100 -Subject: [PATCH 074/117] wireguard: global: fix spelling mistakes in comments +Subject: [PATCH 074/115] wireguard: global: fix spelling mistakes in comments commit a2ec8b5706944d228181c8b91d815f41d6dd8e7b upstream. @@ -59529,7 +59529,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index 7e675f541491..9c6bab9c981f 100644 +index 7e675f5414910..9c6bab9c981f4 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -380,7 +380,7 @@ static void wg_packet_consume_data_done(struct wg_peer *peer, @@ -59542,7 +59542,7 @@ index 7e675f541491..9c6bab9c981f 100644 */ skb->ip_summed = CHECKSUM_UNNECESSARY; diff --git a/include/uapi/linux/wireguard.h b/include/uapi/linux/wireguard.h -index dd8a47c4ad11..ae88be14c947 100644 +index dd8a47c4ad11f..ae88be14c9478 100644 --- a/include/uapi/linux/wireguard.h +++ b/include/uapi/linux/wireguard.h @@ -18,13 +18,13 @@ @@ -59583,10 +59583,10 @@ index dd8a47c4ad11..ae88be14c947 100644 2.18.4 -From 868dfe47cfe68645314493b71fde4eb081bf6fef Mon Sep 17 00:00:00 2001 +From 06066ce74329f8b71dab647b3793da9baf7ee235 Mon Sep 17 00:00:00 2001 From: YueHaibing Date: Sun, 15 Dec 2019 22:08:03 +0100 -Subject: [PATCH 075/117] wireguard: main: remove unused include +Subject: [PATCH 075/115] wireguard: main: remove unused include commit 43967b6ff91e53bcce5ae08c16a0588a475b53a1 upstream. @@ -59603,7 +59603,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c -index 10c0a40f6a9e..7a7d5f1a80fc 100644 +index 10c0a40f6a9e5..7a7d5f1a80fc7 100644 --- a/drivers/net/wireguard/main.c +++ b/drivers/net/wireguard/main.c @@ -12,7 +12,6 @@ @@ -59618,10 +59618,10 @@ index 10c0a40f6a9e..7a7d5f1a80fc 100644 2.18.4 -From 96d9926cb49105e894d6395995fb591542ed36f6 Mon Sep 17 00:00:00 2001 +From dd22819ca61b35927811636f161b46dca950a3fa Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Sun, 15 Dec 2019 22:08:04 +0100 -Subject: [PATCH 076/117] wireguard: allowedips: use kfree_rcu() instead of +Subject: [PATCH 076/115] wireguard: allowedips: use kfree_rcu() instead of call_rcu() commit d89ee7d5c73af15c1c6f12b016cdf469742b5726 upstream. @@ -59638,7 +59638,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/wireguard/allowedips.c b/drivers/net/wireguard/allowedips.c -index 72667d5399c3..121d9ea0f135 100644 +index 72667d5399c34..121d9ea0f1358 100644 --- a/drivers/net/wireguard/allowedips.c +++ b/drivers/net/wireguard/allowedips.c @@ -31,11 +31,6 @@ static void copy_and_assign_cidr(struct allowedips_node *node, const u8 *src, @@ -59666,10 +59666,10 @@ index 72667d5399c3..121d9ea0f135 100644 2.18.4 -From c53da73ef139d2cf7f6be32859a3006dc383a52d Mon Sep 17 00:00:00 2001 +From 6e7cae5376e453f49a50cf28e2136b40d515520f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 2 Jan 2020 17:47:49 +0100 -Subject: [PATCH 077/117] wireguard: selftests: remove ancient kernel +Subject: [PATCH 077/115] wireguard: selftests: remove ancient kernel compatibility code commit 9a69a4c8802adf642bc4a13d471b5a86b44ed434 upstream. @@ -59696,7 +59696,7 @@ Signed-off-by: Jason A. Donenfeld 5 files changed, 50 insertions(+), 48 deletions(-) diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh -index e7310d9390f7..d5c85c7494f2 100755 +index e7310d9390f7e..d5c85c7494f2e 100755 --- a/tools/testing/selftests/wireguard/netns.sh +++ b/tools/testing/selftests/wireguard/netns.sh @@ -37,7 +37,7 @@ n2() { pretty 2 "$*"; maybe_exec ip netns exec $netns2 "$@"; } @@ -59725,7 +59725,7 @@ index e7310d9390f7..d5c85c7494f2 100755 n0 iptables -t nat -F ip0 link del vethrc diff --git a/tools/testing/selftests/wireguard/qemu/Makefile b/tools/testing/selftests/wireguard/qemu/Makefile -index 6d51bf78eeff..f10aa3590adc 100644 +index 6d51bf78eeff4..f10aa3590adc4 100644 --- a/tools/testing/selftests/wireguard/qemu/Makefile +++ b/tools/testing/selftests/wireguard/qemu/Makefile @@ -5,6 +5,7 @@ @@ -60003,7 +60003,7 @@ index 6d51bf78eeff..f10aa3590adc 100644 .PHONY: qemu build clean distclean menuconfig .DELETE_ON_ERROR: diff --git a/tools/testing/selftests/wireguard/qemu/arch/m68k.config b/tools/testing/selftests/wireguard/qemu/arch/m68k.config -index 5381ea10896c..62a15bdb877e 100644 +index 5381ea10896c3..62a15bdb877e7 100644 --- a/tools/testing/selftests/wireguard/qemu/arch/m68k.config +++ b/tools/testing/selftests/wireguard/qemu/arch/m68k.config @@ -1,9 +1,9 @@ @@ -60018,7 +60018,7 @@ index 5381ea10896c..62a15bdb877e 100644 CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" CONFIG_FRAME_WARN=1024 diff --git a/tools/testing/selftests/wireguard/qemu/init.c b/tools/testing/selftests/wireguard/qemu/init.c -index 51e5ddedee88..90bc9813cadc 100644 +index 51e5ddedee886..90bc9813cadcd 100644 --- a/tools/testing/selftests/wireguard/qemu/init.c +++ b/tools/testing/selftests/wireguard/qemu/init.c @@ -21,6 +21,7 @@ @@ -60030,7 +60030,7 @@ index 51e5ddedee88..90bc9813cadc 100644 #include diff --git a/tools/testing/selftests/wireguard/qemu/kernel.config b/tools/testing/selftests/wireguard/qemu/kernel.config -index 9cca30206014..af9323a0b6e0 100644 +index 9cca30206014d..af9323a0b6e09 100644 --- a/tools/testing/selftests/wireguard/qemu/kernel.config +++ b/tools/testing/selftests/wireguard/qemu/kernel.config @@ -39,6 +39,7 @@ CONFIG_PRINTK=y @@ -60053,10 +60053,10 @@ index 9cca30206014..af9323a0b6e0 100644 2.18.4 -From cef197f8fda5274ed18dfac7a9f8b56dacd40375 Mon Sep 17 00:00:00 2001 +From fd376f084fcdb55820e412bb59b3057089c5d240 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 2 Jan 2020 17:47:50 +0100 -Subject: [PATCH 078/117] wireguard: queueing: do not account for pfmemalloc +Subject: [PATCH 078/115] wireguard: queueing: do not account for pfmemalloc when clearing skb header commit 04d2ea92a18417619182cbb79063f154892b0150 upstream. @@ -60077,7 +60077,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 3 deletions(-) diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h -index 58fdd630b246..e62c714a548e 100644 +index 58fdd630b246c..e62c714a548ee 100644 --- a/drivers/net/wireguard/queueing.h +++ b/drivers/net/wireguard/queueing.h @@ -83,13 +83,10 @@ static inline __be16 wg_skb_examine_untrusted_ip_hdr(struct sk_buff *skb) @@ -60098,10 +60098,10 @@ index 58fdd630b246..e62c714a548e 100644 2.18.4 -From 35250a750b764c1cfe9f551ad26e27384de913cc Mon Sep 17 00:00:00 2001 +From b4d022a01246cfc45f3a851582fe4e3a7bc05399 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 2 Jan 2020 17:47:51 +0100 -Subject: [PATCH 079/117] wireguard: socket: mark skbs as not on list when +Subject: [PATCH 079/115] wireguard: socket: mark skbs as not on list when receiving via gro commit 736775d06bac60d7a353e405398b48b2bd8b1e54 upstream. @@ -60123,7 +60123,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c -index c46256d0d81c..262f3b5c819d 100644 +index c46256d0d81c1..262f3b5c819d5 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -333,6 +333,7 @@ static int wg_receive(struct sock *sk, struct sk_buff *skb) @@ -60138,129 +60138,10 @@ index c46256d0d81c..262f3b5c819d 100644 2.18.4 -From 5ec10b531579f77bfc70a15e7418819511a42d73 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Wed, 8 Jan 2020 16:59:02 -0500 -Subject: [PATCH 080/117] net: introduce skb_list_walk_safe for skb segment - walking - -commit dcfea72e79b0aa7a057c8f6024169d86a1bbc84b upstream. - -As part of the continual effort to remove direct usage of skb->next and -skb->prev, this patch adds a helper for iterating through the -singly-linked variant of skb lists, which are used for lists of GSO -packet. The name "skb_list_..." has been chosen to match the existing -function, "kfree_skb_list, which also operates on these singly-linked -lists, and the "..._walk_safe" part is the same idiom as elsewhere in -the kernel. - -This patch removes the helper from wireguard and puts it into -linux/skbuff.h, while making it a bit more robust for general usage. In -particular, parenthesis are added around the macro argument usage, and it -now accounts for trying to iterate through an already-null skb pointer, -which will simply run the iteration zero times. This latter enhancement -means it can be used to replace both do { ... } while and while (...) -open-coded idioms. - -This should take care of these three possible usages, which match all -current methods of iterations. - -skb_list_walk_safe(segs, skb, next) { ... } -skb_list_walk_safe(skb, skb, next) { ... } -skb_list_walk_safe(segs, skb, segs) { ... } - -Gcc appears to generate efficient code for each of these. - -Signed-off-by: Jason A. Donenfeld -Signed-off-by: David S. Miller -Signed-off-by: Jason A. Donenfeld ---- - drivers/net/wireguard/device.h | 8 -------- - include/linux/skbuff.h | 5 +++++ - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/drivers/net/wireguard/device.h b/drivers/net/wireguard/device.h -index c91f3051c5c7..b15a8be9d816 100644 ---- a/drivers/net/wireguard/device.h -+++ b/drivers/net/wireguard/device.h -@@ -62,12 +62,4 @@ struct wg_device { - int wg_device_init(void); - void wg_device_uninit(void); - --/* Later after the dust settles, this can be moved into include/linux/skbuff.h, -- * where virtually all code that deals with GSO segs can benefit, around ~30 -- * drivers as of writing. -- */ --#define skb_list_walk_safe(first, skb, next) \ -- for (skb = first, next = skb->next; skb; \ -- skb = next, next = skb ? skb->next : NULL) -- - #endif /* _WG_DEVICE_H */ -diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 68139cc2f3ca..03cf61e8a43f 100644 ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -1480,6 +1480,11 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb) - skb->next = NULL; - } - -+/* Iterate through singly-linked GSO fragments of an skb. */ -+#define skb_list_walk_safe(first, skb, next) \ -+ for ((skb) = (first), (next) = (skb) ? (skb)->next : NULL; (skb); \ -+ (skb) = (next), (next) = (skb) ? (skb)->next : NULL) -+ - static inline void skb_list_del_init(struct sk_buff *skb) - { - __list_del_entry(&skb->list); --- -2.18.4 - - -From a423ad10a308831d50f86c81f0291b51d801e53c Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Mon, 13 Jan 2020 18:42:26 -0500 -Subject: [PATCH 081/117] net: skbuff: disambiguate argument and member for - skb_list_walk_safe helper - -commit 5eee7bd7e245914e4e050c413dfe864e31805207 upstream. - -This worked before, because we made all callers name their next pointer -"next". But in trying to be more "drop-in" ready, the silliness here is -revealed. This commit fixes the problem by making the macro argument and -the member use different names. - -Signed-off-by: Jason A. Donenfeld -Signed-off-by: David S. Miller -Signed-off-by: Jason A. Donenfeld ---- - include/linux/skbuff.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 03cf61e8a43f..6493c98c8631 100644 ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -1481,9 +1481,9 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb) - } - - /* Iterate through singly-linked GSO fragments of an skb. */ --#define skb_list_walk_safe(first, skb, next) \ -- for ((skb) = (first), (next) = (skb) ? (skb)->next : NULL; (skb); \ -- (skb) = (next), (next) = (skb) ? (skb)->next : NULL) -+#define skb_list_walk_safe(first, skb, next_skb) \ -+ for ((skb) = (first), (next_skb) = (skb) ? (skb)->next : NULL; (skb); \ -+ (skb) = (next_skb), (next_skb) = (skb) ? (skb)->next : NULL) - - static inline void skb_list_del_init(struct sk_buff *skb) - { --- -2.18.4 - - -From e257c5a9de187ade2531a9075aa84a78e182166d Mon Sep 17 00:00:00 2001 +From 98f74bef92c9a71e0b13fa71019c7cf4d9edb33d Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 4 Feb 2020 22:17:25 +0100 -Subject: [PATCH 082/117] wireguard: allowedips: fix use-after-free in +Subject: [PATCH 080/115] wireguard: allowedips: fix use-after-free in root_remove_peer_lists commit 9981159fc3b677b357f84e069a11de5a5ec8a2a8 upstream. @@ -60412,7 +60293,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireguard/allowedips.c b/drivers/net/wireguard/allowedips.c -index 121d9ea0f135..3725e9cd85f4 100644 +index 121d9ea0f1358..3725e9cd85f4f 100644 --- a/drivers/net/wireguard/allowedips.c +++ b/drivers/net/wireguard/allowedips.c @@ -263,6 +263,7 @@ static int add(struct allowedips_node __rcu **trie, u8 bits, const u8 *key, @@ -60427,10 +60308,10 @@ index 121d9ea0f135..3725e9cd85f4 100644 2.18.4 -From b3d2803255c144d08798504d6885de4ca725b132 Mon Sep 17 00:00:00 2001 +From 9f8727b2a89423083a3d0a9d2a05613e5702f2c3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 4 Feb 2020 22:17:26 +0100 -Subject: [PATCH 083/117] wireguard: noise: reject peers with low order public +Subject: [PATCH 081/115] wireguard: noise: reject peers with low order public keys commit ec31c2676a10e064878927b243fada8c2fb0c03c upstream. @@ -60620,7 +60501,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c -index 0739a2cd1920..45a631e79d7a 100644 +index 0739a2cd19203..45a631e79d7ab 100644 --- a/drivers/net/wireguard/netlink.c +++ b/drivers/net/wireguard/netlink.c @@ -575,10 +575,8 @@ static int wg_set_device(struct sk_buff *skb, struct genl_info *info) @@ -60637,7 +60518,7 @@ index 0739a2cd1920..45a631e79d7a 100644 wg_cookie_checker_precompute_device_keys(&wg->cookie_checker); up_write(&wg->static_identity.lock); diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c -index d71c8db68a8c..919d9d866446 100644 +index d71c8db68a8ce..919d9d866446a 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -46,17 +46,21 @@ void __init wg_noise_init(void) @@ -60669,10 +60550,10 @@ index d71c8db68a8c..919d9d866446 100644 2.18.4 -From 40409019d17b22d196464112350e574ad17edcf7 Mon Sep 17 00:00:00 2001 +From 63c65ef93ff74fe306f16513a29ae71ddb5039f6 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 4 Feb 2020 22:17:27 +0100 -Subject: [PATCH 084/117] wireguard: selftests: ensure non-addition of peers +Subject: [PATCH 082/115] wireguard: selftests: ensure non-addition of peers with failed precomputation commit f9398acba6a4ae9cb98bfe4d56414d376eff8d57 upstream. @@ -60689,7 +60570,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh -index d5c85c7494f2..b03647d1bbf6 100755 +index d5c85c7494f2e..b03647d1bbf6c 100755 --- a/tools/testing/selftests/wireguard/netns.sh +++ b/tools/testing/selftests/wireguard/netns.sh @@ -516,6 +516,12 @@ n0 wg set wg0 peer "$pub2" allowed-ips 0.0.0.0/0,10.0.0.0/8,100.0.0.0/10,172.16. @@ -60709,10 +60590,10 @@ index d5c85c7494f2..b03647d1bbf6 100755 2.18.4 -From b7ddef4ada39278975785409561342e6ab55162e Mon Sep 17 00:00:00 2001 +From 1fcd6b9256a02f1cab771dad818fc2b96d5260b0 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 4 Feb 2020 22:17:29 +0100 -Subject: [PATCH 085/117] wireguard: selftests: tie socket waiting to target +Subject: [PATCH 083/115] wireguard: selftests: tie socket waiting to target pid commit 88f404a9b1d75388225b1c67b6dd327cb2182777 upstream. @@ -60729,7 +60610,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh -index b03647d1bbf6..f5ab1cda8bb5 100755 +index b03647d1bbf6c..f5ab1cda8bb55 100755 --- a/tools/testing/selftests/wireguard/netns.sh +++ b/tools/testing/selftests/wireguard/netns.sh @@ -38,9 +38,8 @@ ip0() { pretty 0 "ip $*"; ip -n $netns0 "$@"; } @@ -60793,10 +60674,10 @@ index b03647d1bbf6..f5ab1cda8bb5 100755 2.18.4 -From 515d03a657177e95843fe3540e56d162b820c396 Mon Sep 17 00:00:00 2001 +From 91973a963eefb5a01dc58ad39556b7b2bdbd1fc6 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 11 Feb 2020 20:47:08 +0100 -Subject: [PATCH 086/117] wireguard: device: use icmp_ndo_send helper +Subject: [PATCH 084/115] wireguard: device: use icmp_ndo_send helper commit a12d7f3cbdc72c7625881c8dc2660fc2c979fdf2 upstream. @@ -60816,7 +60697,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c -index 16b19824b9ad..43db442b1373 100644 +index 16b19824b9ad0..43db442b13730 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -203,9 +203,9 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) @@ -60832,7 +60713,7 @@ index 16b19824b9ad..43db442b1373 100644 return ret; } diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh -index f5ab1cda8bb5..138d46b3f330 100755 +index f5ab1cda8bb55..138d46b3f3306 100755 --- a/tools/testing/selftests/wireguard/netns.sh +++ b/tools/testing/selftests/wireguard/netns.sh @@ -24,6 +24,7 @@ @@ -60865,10 +60746,10 @@ index f5ab1cda8bb5..138d46b3f330 100755 2.18.4 -From 9fb389b4fef1f060e62cb931a07e6c1da5633624 Mon Sep 17 00:00:00 2001 +From fd3733b4a7d72a7010acbea75ff2998f1f0176cc Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 14 Feb 2020 23:57:20 +0100 -Subject: [PATCH 087/117] wireguard: selftests: reduce complexity and fix make +Subject: [PATCH 085/115] wireguard: selftests: reduce complexity and fix make races commit 04ddf1208f03e1dbc39a4619c40eba640051b950 upstream. @@ -60885,7 +60766,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/tools/testing/selftests/wireguard/qemu/Makefile b/tools/testing/selftests/wireguard/qemu/Makefile -index f10aa3590adc..28d477683e8a 100644 +index f10aa3590adc4..28d477683e8ab 100644 --- a/tools/testing/selftests/wireguard/qemu/Makefile +++ b/tools/testing/selftests/wireguard/qemu/Makefile @@ -38,19 +38,17 @@ endef @@ -60975,10 +60856,10 @@ index f10aa3590adc..28d477683e8a 100644 2.18.4 -From 831a463b30cad290fc7d008bdac2845288375602 Mon Sep 17 00:00:00 2001 +From 58a6e7b509abdf6f12213d1d25c79f03a60723dc Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 14 Feb 2020 23:57:21 +0100 -Subject: [PATCH 088/117] wireguard: receive: reset last_under_load to zero +Subject: [PATCH 086/115] wireguard: receive: reset last_under_load to zero commit 2a8a4df36462aa85b0db87b7c5ea145ba67e34a8 upstream. @@ -60996,7 +60877,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index 9c6bab9c981f..4a153894cee2 100644 +index 9c6bab9c981f4..4a153894cee25 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -118,10 +118,13 @@ static void wg_receive_handshake_packet(struct wg_device *wg, @@ -61019,10 +60900,10 @@ index 9c6bab9c981f..4a153894cee2 100644 2.18.4 -From ea70fcce15dab5f0054b4ca65217e5a305e3c145 Mon Sep 17 00:00:00 2001 +From 15e63b5f5a1d129aeb5a2c485826e276e5b1f82d Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 14 Feb 2020 23:57:22 +0100 -Subject: [PATCH 089/117] wireguard: send: account for mtu=0 devices +Subject: [PATCH 087/115] wireguard: send: account for mtu=0 devices commit 175f1ca9a9ed8689d2028da1a7c624bb4fb4ff7e upstream. @@ -61062,7 +60943,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c -index 43db442b1373..cdc96968b0f4 100644 +index 43db442b13730..cdc96968b0f4b 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -258,6 +258,8 @@ static void wg_setup(struct net_device *dev) @@ -61087,7 +60968,7 @@ index 43db442b1373..cdc96968b0f4 100644 SET_NETDEV_DEVTYPE(dev, &device_type); diff --git a/drivers/net/wireguard/send.c b/drivers/net/wireguard/send.c -index c13260563446..7348c10cbae3 100644 +index c132605634460..7348c10cbae3d 100644 --- a/drivers/net/wireguard/send.c +++ b/drivers/net/wireguard/send.c @@ -143,16 +143,22 @@ static void keep_key_fresh(struct wg_peer *peer) @@ -61122,10 +61003,10 @@ index c13260563446..7348c10cbae3 100644 2.18.4 -From 1d6e9ae34f4a1c67c53b7b715ae514cde6ace0eb Mon Sep 17 00:00:00 2001 +From 0e1149c0ddd63ffa1e1dd5698f5f185df5047295 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 14 Feb 2020 23:57:23 +0100 -Subject: [PATCH 090/117] wireguard: socket: remove extra call to +Subject: [PATCH 088/115] wireguard: socket: remove extra call to synchronize_net commit 1fbc33b0a7feb6ca72bf7dc8a05d81485ee8ee2e upstream. @@ -61146,7 +61027,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c -index 262f3b5c819d..b0d6541582d3 100644 +index 262f3b5c819d5..b0d6541582d31 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -432,7 +432,6 @@ void wg_socket_reinit(struct wg_device *wg, struct sock *new4, @@ -61161,10 +61042,10 @@ index 262f3b5c819d..b0d6541582d3 100644 2.18.4 -From ce08a51556bf3f07c0c8312338a3035d8a2421d1 Mon Sep 17 00:00:00 2001 +From 9b5ab1284d6ca4040320e85c7e38edafad633aae Mon Sep 17 00:00:00 2001 From: YueHaibing Date: Wed, 18 Mar 2020 18:30:43 -0600 -Subject: [PATCH 091/117] wireguard: selftests: remove duplicated include +Subject: [PATCH 089/115] wireguard: selftests: remove duplicated include commit 166391159c5deb84795d2ff46e95f276177fa5fb upstream. @@ -61180,7 +61061,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/wireguard/qemu/init.c b/tools/testing/selftests/wireguard/qemu/init.c -index 90bc9813cadc..c9698120ac9d 100644 +index 90bc9813cadcd..c9698120ac9d8 100644 --- a/tools/testing/selftests/wireguard/qemu/init.c +++ b/tools/testing/selftests/wireguard/qemu/init.c @@ -13,7 +13,6 @@ @@ -61195,10 +61076,10 @@ index 90bc9813cadc..c9698120ac9d 100644 2.18.4 -From aac50fb5b0eb9316f18cca18bed61919b88d41a0 Mon Sep 17 00:00:00 2001 +From 835cf5da1ed821bc7add3f7a83de43785bd76393 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 18 Mar 2020 18:30:45 -0600 -Subject: [PATCH 092/117] wireguard: queueing: account for skb->protocol==0 +Subject: [PATCH 090/115] wireguard: queueing: account for skb->protocol==0 commit a5588604af448664e796daf3c1d5a4523c60667b upstream. @@ -61241,7 +61122,7 @@ Signed-off-by: Jason A. Donenfeld 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c -index cdc96968b0f4..3ac3f8570ca1 100644 +index cdc96968b0f4b..3ac3f8570ca1b 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -122,7 +122,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) @@ -61254,7 +61135,7 @@ index cdc96968b0f4..3ac3f8570ca1 100644 net_dbg_ratelimited("%s: Invalid IP packet\n", dev->name); goto err; diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h -index e62c714a548e..3432232afe06 100644 +index e62c714a548ee..3432232afe061 100644 --- a/drivers/net/wireguard/queueing.h +++ b/drivers/net/wireguard/queueing.h @@ -66,7 +66,7 @@ struct packet_cb { @@ -61280,7 +61161,7 @@ index e62c714a548e..3432232afe06 100644 { skb_scrub_packet(skb, true); diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index 4a153894cee2..243ed7172dd2 100644 +index 4a153894cee25..243ed7172dd27 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -56,7 +56,7 @@ static int prepare_skb_header(struct sk_buff *skb, struct wg_device *wg) @@ -61305,10 +61186,10 @@ index 4a153894cee2..243ed7172dd2 100644 2.18.4 -From 964ce837b332aa9bdc060eb00c2211017838cd82 Mon Sep 17 00:00:00 2001 +From ba8c8c7deda3d34c1e87a7c5d57c3df7dd090426 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 18 Mar 2020 18:30:46 -0600 -Subject: [PATCH 093/117] wireguard: receive: remove dead code from default +Subject: [PATCH 091/115] wireguard: receive: remove dead code from default packet type case commit 2b8765c52db24c0fbcc81bac9b5e8390f2c7d3c8 upstream. @@ -61329,7 +61210,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index 243ed7172dd2..da3b782ab7d3 100644 +index 243ed7172dd27..da3b782ab7d31 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -587,8 +587,7 @@ void wg_packet_receive(struct wg_device *wg, struct sk_buff *skb) @@ -61346,10 +61227,10 @@ index 243ed7172dd2..da3b782ab7d3 100644 2.18.4 -From 27990b9e02e291207a49ea24bd9cd64ab4c53619 Mon Sep 17 00:00:00 2001 +From 8add8fff243ce9509db0e4cafed3134d326d966e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 18 Mar 2020 18:30:47 -0600 -Subject: [PATCH 094/117] wireguard: noise: error out precomputed DH during +Subject: [PATCH 092/115] wireguard: noise: error out precomputed DH during handshake rather than config commit 11a7686aa99c7fe4b3f80f6dcccd54129817984d upstream. @@ -61379,7 +61260,7 @@ Signed-off-by: Jason A. Donenfeld 5 files changed, 49 insertions(+), 48 deletions(-) diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c -index 45a631e79d7a..ab6cbe95a652 100644 +index 45a631e79d7ab..ab6cbe95a6527 100644 --- a/drivers/net/wireguard/netlink.c +++ b/drivers/net/wireguard/netlink.c @@ -417,11 +417,7 @@ static int set_peer(struct wg_device *wg, struct nlattr **attrs) @@ -61405,7 +61286,7 @@ index 45a631e79d7a..ab6cbe95a652 100644 } wg_cookie_checker_precompute_device_keys(&wg->cookie_checker); diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c -index 919d9d866446..708dc61c974f 100644 +index 919d9d866446a..708dc61c974f7 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -44,32 +44,23 @@ void __init wg_noise_init(void) @@ -61507,7 +61388,7 @@ index 919d9d866446..708dc61c974f 100644 /* {t} */ if (!message_decrypt(t, src->encrypted_timestamp, diff --git a/drivers/net/wireguard/noise.h b/drivers/net/wireguard/noise.h -index 138a07bb817c..f532d59d3f19 100644 +index 138a07bb817ce..f532d59d3f19a 100644 --- a/drivers/net/wireguard/noise.h +++ b/drivers/net/wireguard/noise.h @@ -94,11 +94,11 @@ struct noise_handshake { @@ -61537,7 +61418,7 @@ index 138a07bb817c..f532d59d3f19 100644 bool wg_noise_handshake_create_initiation(struct message_handshake_initiation *dst, diff --git a/drivers/net/wireguard/peer.c b/drivers/net/wireguard/peer.c -index 071eedf33f5a..1d634bd3038f 100644 +index 071eedf33f5aa..1d634bd3038f0 100644 --- a/drivers/net/wireguard/peer.c +++ b/drivers/net/wireguard/peer.c @@ -34,11 +34,8 @@ struct wg_peer *wg_peer_create(struct wg_device *wg, @@ -61555,7 +61436,7 @@ index 071eedf33f5a..1d634bd3038f 100644 goto err_1; if (wg_packet_queue_init(&peer->tx_queue, wg_packet_tx_worker, false, diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh -index 138d46b3f330..936e1ca9410e 100755 +index 138d46b3f3306..936e1ca9410ec 100755 --- a/tools/testing/selftests/wireguard/netns.sh +++ b/tools/testing/selftests/wireguard/netns.sh @@ -527,11 +527,16 @@ n0 wg set wg0 peer "$pub2" allowed-ips 0.0.0.0/0 @@ -61584,10 +61465,10 @@ index 138d46b3f330..936e1ca9410e 100755 2.18.4 -From e3d013e38879c1a7e93dad7c4cceec6017d0e71e Mon Sep 17 00:00:00 2001 +From bf4d1401c6da622c07cd83e0ebdb80cd822826c3 Mon Sep 17 00:00:00 2001 From: Sultan Alsawaf Date: Wed, 29 Apr 2020 14:59:20 -0600 -Subject: [PATCH 095/117] wireguard: send: remove errant newline from +Subject: [PATCH 093/115] wireguard: send: remove errant newline from packet_encrypt_worker commit d6833e42786e050e7522d6a91a9361e54085897d upstream. @@ -61604,7 +61485,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireguard/send.c b/drivers/net/wireguard/send.c -index 7348c10cbae3..3e030d614df5 100644 +index 7348c10cbae3d..3e030d614df5f 100644 --- a/drivers/net/wireguard/send.c +++ b/drivers/net/wireguard/send.c @@ -304,7 +304,6 @@ void wg_packet_encrypt_worker(struct work_struct *work) @@ -61619,10 +61500,10 @@ index 7348c10cbae3..3e030d614df5 100644 2.18.4 -From 23400553fb68a0eb36708c8a767d68385a795ebf Mon Sep 17 00:00:00 2001 +From 0af14f05e0409c9c654872128d3bd38db881a9dc Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 29 Apr 2020 14:59:21 -0600 -Subject: [PATCH 096/117] wireguard: queueing: cleanup ptr_ring in error path +Subject: [PATCH 094/115] wireguard: queueing: cleanup ptr_ring in error path of packet_queue_init commit 130c58606171326c81841a49cc913cd354113dd9 upstream. @@ -61641,7 +61522,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireguard/queueing.c b/drivers/net/wireguard/queueing.c -index 5c964fcb994e..71b8e80b58e1 100644 +index 5c964fcb994ec..71b8e80b58e12 100644 --- a/drivers/net/wireguard/queueing.c +++ b/drivers/net/wireguard/queueing.c @@ -35,8 +35,10 @@ int wg_packet_queue_init(struct crypt_queue *queue, work_func_t function, @@ -61660,10 +61541,10 @@ index 5c964fcb994e..71b8e80b58e1 100644 2.18.4 -From faab18ac509618e078a2b4e125fc2b9b9d01cdc2 Mon Sep 17 00:00:00 2001 +From 4876e7f6852def2ce21465e276dc0b41970519cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 29 Apr 2020 14:59:22 -0600 -Subject: [PATCH 097/117] wireguard: receive: use tunnel helpers for +Subject: [PATCH 095/115] wireguard: receive: use tunnel helpers for decapsulating ECN markings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -61693,7 +61574,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index da3b782ab7d3..267f202f1931 100644 +index da3b782ab7d31..267f202f19314 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -393,13 +393,11 @@ static void wg_packet_consume_data_done(struct wg_peer *peer, @@ -61716,10 +61597,10 @@ index da3b782ab7d3..267f202f1931 100644 2.18.4 -From 4df414e69f6e40c5cf8242f301a6cb01226cc8a9 Mon Sep 17 00:00:00 2001 +From 20c723b26247f0b52316021a834a507fbed7413f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:02 -0600 -Subject: [PATCH 098/117] wireguard: selftests: use normal kernel stack size on +Subject: [PATCH 096/115] wireguard: selftests: use normal kernel stack size on ppc64 commit a0fd7cc87a018df1a17f9d3f0bd994c1f22c6b34 upstream. @@ -61739,7 +61620,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config b/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config -index 990c510a9cfa..f52f1e2bc7f6 100644 +index 990c510a9cfa5..f52f1e2bc7f64 100644 --- a/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config +++ b/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config @@ -10,3 +10,4 @@ CONFIG_CMDLINE_BOOL=y @@ -61751,10 +61632,10 @@ index 990c510a9cfa..f52f1e2bc7f6 100644 2.18.4 -From a0746efe2e6f0487c565b6c739de99180f829ec8 Mon Sep 17 00:00:00 2001 +From 30922f6bb8e31e980d5e112304649de435757819 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:03 -0600 -Subject: [PATCH 099/117] wireguard: socket: remove errant restriction on +Subject: [PATCH 097/115] wireguard: socket: remove errant restriction on looping to self commit b673e24aad36981f327a6570412ffa7754de8911 upstream. @@ -61788,7 +61669,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 51 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c -index b0d6541582d3..f9018027fc13 100644 +index b0d6541582d31..f9018027fc133 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -76,12 +76,6 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, @@ -61818,7 +61699,7 @@ index b0d6541582d3..f9018027fc13 100644 if (cache) dst_cache_set_ip6(cache, dst, &fl.saddr); diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh -index 936e1ca9410e..17a1f53ceba0 100755 +index 936e1ca9410ec..17a1f53ceba01 100755 --- a/tools/testing/selftests/wireguard/netns.sh +++ b/tools/testing/selftests/wireguard/netns.sh @@ -48,8 +48,11 @@ cleanup() { @@ -61921,10 +61802,10 @@ index 936e1ca9410e..17a1f53ceba0 100755 2.18.4 -From 16cbafae73e8af8c3b283aaaa785c497e9ee89b4 Mon Sep 17 00:00:00 2001 +From 13059d9ab6aacc2835ce37a7e0be71da26fa8615 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:04 -0600 -Subject: [PATCH 100/117] wireguard: send/receive: cond_resched() when +Subject: [PATCH 098/115] wireguard: send/receive: cond_resched() when processing worker ringbuffers commit 4005f5c3c9d006157ba716594e0d70c88a235c5e upstream. @@ -61949,7 +61830,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 6 insertions(+) diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index 267f202f1931..2566e13a292d 100644 +index 267f202f19314..2566e13a292de 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -516,6 +516,8 @@ void wg_packet_decrypt_worker(struct work_struct *work) @@ -61962,7 +61843,7 @@ index 267f202f1931..2566e13a292d 100644 } diff --git a/drivers/net/wireguard/send.c b/drivers/net/wireguard/send.c -index 3e030d614df5..dc3079e17c7f 100644 +index 3e030d614df5f..dc3079e17c7fc 100644 --- a/drivers/net/wireguard/send.c +++ b/drivers/net/wireguard/send.c @@ -281,6 +281,8 @@ void wg_packet_tx_worker(struct work_struct *work) @@ -61987,10 +61868,10 @@ index 3e030d614df5..dc3079e17c7f 100644 2.18.4 -From e2fc9350897b60a116ef4e5ab1a37e2122d734ae Mon Sep 17 00:00:00 2001 +From 10c20143d8ae47a6afbe2c4b50d74928267c4e7c Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:05 -0600 -Subject: [PATCH 101/117] wireguard: selftests: initalize ipv6 members to NULL +Subject: [PATCH 099/115] wireguard: selftests: initalize ipv6 members to NULL to squelch clang warning commit 4fed818ef54b08d4b29200e416cce65546ad5312 upstream. @@ -62025,7 +61906,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireguard/selftest/ratelimiter.c b/drivers/net/wireguard/selftest/ratelimiter.c -index bcd6462e4540..007cd4457c5f 100644 +index bcd6462e45401..007cd4457c5f6 100644 --- a/drivers/net/wireguard/selftest/ratelimiter.c +++ b/drivers/net/wireguard/selftest/ratelimiter.c @@ -120,9 +120,9 @@ bool __init wg_ratelimiter_selftest(void) @@ -62044,10 +61925,10 @@ index bcd6462e4540..007cd4457c5f 100644 2.18.4 -From 7181768ebd2a5227be5150ce3ec0b31cc0526951 Mon Sep 17 00:00:00 2001 +From 56b4e8a94219a5ddb5c379a315785dfd04c8aaf4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 6 May 2020 15:33:06 -0600 -Subject: [PATCH 102/117] wireguard: send/receive: use explicit unlikely branch +Subject: [PATCH 100/115] wireguard: send/receive: use explicit unlikely branch instead of implicit coalescing commit 243f2148937adc72bcaaa590d482d599c936efde upstream. @@ -62074,7 +61955,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index 2566e13a292d..3bb5b9ae7cd1 100644 +index 2566e13a292de..3bb5b9ae7cd15 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -226,21 +226,20 @@ void wg_packet_handshake_receive_worker(struct work_struct *work) @@ -62106,7 +61987,7 @@ index 2566e13a292d..3bb5b9ae7cd1 100644 wg_packet_send_queued_handshake_initiation(peer, false); } diff --git a/drivers/net/wireguard/send.c b/drivers/net/wireguard/send.c -index dc3079e17c7f..6687db699803 100644 +index dc3079e17c7fc..6687db6998035 100644 --- a/drivers/net/wireguard/send.c +++ b/drivers/net/wireguard/send.c @@ -124,20 +124,17 @@ void wg_packet_send_handshake_cookie(struct wg_device *wg, @@ -62140,10 +62021,10 @@ index dc3079e17c7f..6687db699803 100644 2.18.4 -From 99d8e0929c8bb68772a3da8669c7a9d7a609deca Mon Sep 17 00:00:00 2001 +From 88d56a14ac2ba38ae63931921d00a218e5df57ba Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 May 2020 22:49:27 -0600 -Subject: [PATCH 103/117] wireguard: selftests: use newer iproute2 for gcc-10 +Subject: [PATCH 101/115] wireguard: selftests: use newer iproute2 for gcc-10 commit ee3c1aa3f34b7842c1557cfe5d8c3f7b8c692de8 upstream. @@ -62161,7 +62042,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/wireguard/qemu/Makefile b/tools/testing/selftests/wireguard/qemu/Makefile -index 28d477683e8a..2dab4f57516d 100644 +index 28d477683e8ab..2dab4f57516dc 100644 --- a/tools/testing/selftests/wireguard/qemu/Makefile +++ b/tools/testing/selftests/wireguard/qemu/Makefile @@ -44,7 +44,7 @@ endef @@ -62177,10 +62058,10 @@ index 28d477683e8a..2dab4f57516d 100644 2.18.4 -From 0df08bac3b1a5b8b47093b93803943e644b6cf65 Mon Sep 17 00:00:00 2001 +From 6a5a86046d080b05bf9b7f6522451c3862bf8b51 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 May 2020 22:49:28 -0600 -Subject: [PATCH 104/117] wireguard: noise: read preshared key while taking +Subject: [PATCH 102/115] wireguard: noise: read preshared key while taking lock commit bc67d371256f5c47d824e2eec51e46c8d62d022e upstream. @@ -62204,7 +62085,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c -index 708dc61c974f..07eb438a6dee 100644 +index 708dc61c974f7..07eb438a6deee 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -715,6 +715,7 @@ wg_noise_handshake_consume_response(struct message_handshake_response *src, @@ -62245,10 +62126,10 @@ index 708dc61c974f..07eb438a6dee 100644 2.18.4 -From ec6425628d4fa655a92ae6984ebda0be980016ed Mon Sep 17 00:00:00 2001 +From 7b2b427ec4f4a0543122a3b5ae2b8ffcc17651a8 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 May 2020 22:49:29 -0600 -Subject: [PATCH 105/117] wireguard: queueing: preserve flow hash across packet +Subject: [PATCH 103/115] wireguard: queueing: preserve flow hash across packet scrubbing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -62293,7 +62174,7 @@ Signed-off-by: Jason A. Donenfeld 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireguard/messages.h b/drivers/net/wireguard/messages.h -index b8a7b9ce32ba..208da72673fc 100644 +index b8a7b9ce32ba7..208da72673fc0 100644 --- a/drivers/net/wireguard/messages.h +++ b/drivers/net/wireguard/messages.h @@ -32,7 +32,7 @@ enum cookie_values { @@ -62306,7 +62187,7 @@ index b8a7b9ce32ba..208da72673fc 100644 COUNTER_WINDOW_SIZE = COUNTER_BITS_TOTAL - COUNTER_REDUNDANT_BITS }; diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h -index 3432232afe06..c58df439dbbe 100644 +index 3432232afe061..c58df439dbbe0 100644 --- a/drivers/net/wireguard/queueing.h +++ b/drivers/net/wireguard/queueing.h @@ -87,12 +87,20 @@ static inline bool wg_check_packet_protocol(struct sk_buff *skb) @@ -62332,7 +62213,7 @@ index 3432232afe06..c58df439dbbe 100644 skb->nohdr = 0; skb->peeked = 0; diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index 3bb5b9ae7cd1..d0eebd90c9d5 100644 +index 3bb5b9ae7cd15..d0eebd90c9d50 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -484,7 +484,7 @@ int wg_packet_rx_poll(struct napi_struct *napi, int budget) @@ -62345,7 +62226,7 @@ index 3bb5b9ae7cd1..d0eebd90c9d5 100644 free = false; diff --git a/drivers/net/wireguard/send.c b/drivers/net/wireguard/send.c -index 6687db699803..2f5119ff93d8 100644 +index 6687db6998035..2f5119ff93d8f 100644 --- a/drivers/net/wireguard/send.c +++ b/drivers/net/wireguard/send.c @@ -167,6 +167,11 @@ static bool encrypt_packet(struct sk_buff *skb, struct noise_keypair *keypair) @@ -62373,10 +62254,10 @@ index 6687db699803..2f5119ff93d8 100644 2.18.4 -From 84c0736cea5596e02ecce0bea45a69718704432d Mon Sep 17 00:00:00 2001 +From 38d02be9e01adc98e3e86b49fc1a5c0d56a73510 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 May 2020 22:49:30 -0600 -Subject: [PATCH 106/117] wireguard: noise: separate receive counter from send +Subject: [PATCH 104/115] wireguard: noise: separate receive counter from send counter commit a9e90d9931f3a474f04bab782ccd9d77904941e9 upstream. @@ -62425,7 +62306,7 @@ Signed-off-by: Jason A. Donenfeld 5 files changed, 48 insertions(+), 53 deletions(-) diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c -index 07eb438a6dee..626433690abb 100644 +index 07eb438a6deee..626433690abb3 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -104,6 +104,7 @@ static struct noise_keypair *keypair_create(struct wg_peer *peer) @@ -62466,7 +62347,7 @@ index 07eb438a6dee..626433690abb 100644 static bool __must_check mix_dh(u8 chaining_key[NOISE_HASH_LEN], diff --git a/drivers/net/wireguard/noise.h b/drivers/net/wireguard/noise.h -index f532d59d3f19..c527253dba80 100644 +index f532d59d3f19a..c527253dba80e 100644 --- a/drivers/net/wireguard/noise.h +++ b/drivers/net/wireguard/noise.h @@ -15,18 +15,14 @@ @@ -62503,7 +62384,7 @@ index f532d59d3f19..c527253dba80 100644 bool i_am_the_initiator; struct kref refcount; diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index d0eebd90c9d5..91438144e4f7 100644 +index d0eebd90c9d50..91438144e4f7a 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -245,20 +245,20 @@ static void keep_key_fresh(struct wg_peer *peer) @@ -62621,7 +62502,7 @@ index d0eebd90c9d5..91438144e4f7 100644 wg_queue_enqueue_per_peer_napi(skb, state); if (need_resched()) diff --git a/drivers/net/wireguard/selftest/counter.c b/drivers/net/wireguard/selftest/counter.c -index f4fbb9072ed7..ec3c156bf91b 100644 +index f4fbb9072ed73..ec3c156bf91ba 100644 --- a/drivers/net/wireguard/selftest/counter.c +++ b/drivers/net/wireguard/selftest/counter.c @@ -6,18 +6,24 @@ @@ -62663,7 +62544,7 @@ index f4fbb9072ed7..ec3c156bf91b 100644 } #endif diff --git a/drivers/net/wireguard/send.c b/drivers/net/wireguard/send.c -index 2f5119ff93d8..f74b9341ab0f 100644 +index 2f5119ff93d8f..f74b9341ab0fe 100644 --- a/drivers/net/wireguard/send.c +++ b/drivers/net/wireguard/send.c @@ -129,7 +129,7 @@ static void keep_key_fresh(struct wg_peer *peer) @@ -62718,10 +62599,10 @@ index 2f5119ff93d8..f74b9341ab0f 100644 2.18.4 -From b8b2620c99253cac9a5008249391fee8fb3d0377 Mon Sep 17 00:00:00 2001 +From f6351f448c77e1588d85dae86c42f4f87ff40986 Mon Sep 17 00:00:00 2001 From: Frank Werner-Krippendorf Date: Tue, 23 Jun 2020 03:59:44 -0600 -Subject: [PATCH 107/117] wireguard: noise: do not assign initiation time in if +Subject: [PATCH 105/115] wireguard: noise: do not assign initiation time in if condition commit 558b353c9c2a717509f291c066c6bd8f5f5e21be upstream. @@ -62739,7 +62620,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c -index 626433690abb..201a22681945 100644 +index 626433690abb3..201a22681945f 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -617,8 +617,8 @@ wg_noise_handshake_consume_initiation(struct message_handshake_initiation *src, @@ -62757,10 +62638,10 @@ index 626433690abb..201a22681945 100644 2.18.4 -From b1f3bfdc335281a83df2ee57d277345df076043c Mon Sep 17 00:00:00 2001 +From 3e9fd6a6a7152497d8cb3fb7e2af0a6872e3fcab Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 23 Jun 2020 03:59:45 -0600 -Subject: [PATCH 108/117] wireguard: device: avoid circular netns references +Subject: [PATCH 106/115] wireguard: device: avoid circular netns references commit 900575aa33a3eaaef802b31de187a85c4a4b4bd0 upstream. @@ -62789,7 +62670,7 @@ Signed-off-by: Jason A. Donenfeld 5 files changed, 67 insertions(+), 46 deletions(-) diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c -index 3ac3f8570ca1..a8f151b1b5fa 100644 +index 3ac3f8570ca1b..a8f151b1b5fab 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -45,17 +45,18 @@ static int wg_open(struct net_device *dev) @@ -62925,7 +62806,7 @@ index 3ac3f8570ca1..a8f151b1b5fa 100644 unregister_pm_notifier(&pm_notifier); #endif diff --git a/drivers/net/wireguard/device.h b/drivers/net/wireguard/device.h -index b15a8be9d816..4d0144e16947 100644 +index c91f3051c5c78..3e01b4c1a60eb 100644 --- a/drivers/net/wireguard/device.h +++ b/drivers/net/wireguard/device.h @@ -40,7 +40,7 @@ struct wg_device { @@ -62946,7 +62827,7 @@ index b15a8be9d816..4d0144e16947 100644 int wg_device_init(void); diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c -index ab6cbe95a652..9756239416fd 100644 +index ab6cbe95a6527..9756239416fde 100644 --- a/drivers/net/wireguard/netlink.c +++ b/drivers/net/wireguard/netlink.c @@ -517,11 +517,15 @@ static int wg_set_device(struct sk_buff *skb, struct genl_info *info) @@ -62971,7 +62852,7 @@ index ab6cbe95a652..9756239416fd 100644 ++wg->device_update_gen; diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c -index f9018027fc13..c33e2c81635f 100644 +index f9018027fc133..c33e2c81635fa 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -347,6 +347,7 @@ static void set_sock_opts(struct socket *sock) @@ -63038,7 +62919,7 @@ index f9018027fc13..c33e2c81635f 100644 void wg_socket_reinit(struct wg_device *wg, struct sock *new4, diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh -index 17a1f53ceba0..d77f4829f1e0 100755 +index 17a1f53ceba01..d77f4829f1e07 100755 --- a/tools/testing/selftests/wireguard/netns.sh +++ b/tools/testing/selftests/wireguard/netns.sh @@ -587,9 +587,20 @@ ip0 link set wg0 up @@ -63067,10 +62948,10 @@ index 17a1f53ceba0..d77f4829f1e0 100755 2.18.4 -From 6638d3114d662c256cea902f042dc1cf214eb0b5 Mon Sep 17 00:00:00 2001 +From c610930f666bf70111be96306a961534e88d96a3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 24 Jun 2020 16:06:03 -0600 -Subject: [PATCH 109/117] wireguard: receive: account for napi_gro_receive +Subject: [PATCH 107/115] wireguard: receive: account for napi_gro_receive never returning GRO_DROP commit df08126e3833e9dca19e2407db5f5860a7c194fb upstream. @@ -63091,7 +62972,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index 91438144e4f7..9b2ab6fc91cd 100644 +index 91438144e4f7a..9b2ab6fc91cdd 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -414,14 +414,8 @@ static void wg_packet_consume_data_done(struct wg_peer *peer, @@ -63115,10 +62996,10 @@ index 91438144e4f7..9b2ab6fc91cd 100644 2.18.4 -From cf6318bad2a0c74fa1537902c214db46b2863da6 Mon Sep 17 00:00:00 2001 +From e4ce95508d0975af13acb0ebe9ad0cdb64136852 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 29 Jun 2020 19:06:18 -0600 -Subject: [PATCH 110/117] net: ip_tunnel: add header_ops for layer 3 devices +Subject: [PATCH 108/115] net: ip_tunnel: add header_ops for layer 3 devices commit 2606aff916854b61234bf85001be9777bab2d5f8 upstream. @@ -63138,7 +63019,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 21 insertions(+) diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index 56deb2501e96..8545fa25c7bf 100644 +index 56deb2501e962..8545fa25c7bf4 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -289,6 +289,9 @@ int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[], @@ -63152,7 +63033,7 @@ index 56deb2501e96..8545fa25c7bf 100644 size_t (*encap_hlen)(struct ip_tunnel_encap *e); int (*build_header)(struct sk_buff *skb, struct ip_tunnel_encap *e, diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c -index 1452a97914a0..cfe21c3ddfc2 100644 +index 1452a97914a0d..cfe21c3ddfc24 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -446,3 +446,21 @@ void ip_tunnel_unneed_metadata(void) @@ -63181,10 +63062,10 @@ index 1452a97914a0..cfe21c3ddfc2 100644 2.18.4 -From e5bb1068b8eeb03f0b5659de02a16c968ce46e0c Mon Sep 17 00:00:00 2001 +From 2d9a30f41f6e2cb5d94b654f234eefb65db32b6d Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 29 Jun 2020 19:06:20 -0600 -Subject: [PATCH 111/117] wireguard: implement header_ops->parse_protocol for +Subject: [PATCH 109/115] wireguard: implement header_ops->parse_protocol for AF_PACKET commit 01a4967c71c004f8ecad4ab57021348636502fa9 upstream. @@ -63209,7 +63090,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c -index a8f151b1b5fa..c9f65e96ccb0 100644 +index a8f151b1b5fab..c9f65e96ccb04 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -262,6 +262,7 @@ static void wg_setup(struct net_device *dev) @@ -63224,10 +63105,10 @@ index a8f151b1b5fa..c9f65e96ccb0 100644 2.18.4 -From 6b54af46ff60f401fdb246c9edc0af9f5ee065f1 Mon Sep 17 00:00:00 2001 +From fb8a80f749b420706a45b3554f852506e38de557 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 29 Jun 2020 19:06:21 -0600 -Subject: [PATCH 112/117] wireguard: queueing: make use of +Subject: [PATCH 110/115] wireguard: queueing: make use of ip_tunnel_parse_protocol commit 1a574074ae7d1d745c16f7710655f38a53174c27 upstream. @@ -63246,7 +63127,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h -index c58df439dbbe..dfb674e03076 100644 +index c58df439dbbe0..dfb674e030764 100644 --- a/drivers/net/wireguard/queueing.h +++ b/drivers/net/wireguard/queueing.h @@ -11,6 +11,7 @@ @@ -63285,7 +63166,7 @@ index c58df439dbbe..dfb674e03076 100644 } diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c -index 9b2ab6fc91cd..2c9551ea6dc7 100644 +index 9b2ab6fc91cdd..2c9551ea6dc73 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -387,7 +387,7 @@ static void wg_packet_consume_data_done(struct wg_peer *peer, @@ -63301,10 +63182,10 @@ index 9b2ab6fc91cd..2c9551ea6dc7 100644 2.18.4 -From ae9aa1fe3f8a82b199ea467ce59bf60ce11728b7 Mon Sep 17 00:00:00 2001 +From dbd344b57d163cd9978e382cede26bdda32b9b4a Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 18 Aug 2020 10:17:31 +0200 -Subject: [PATCH 113/117] netlink: consistently use NLA_POLICY_EXACT_LEN() +Subject: [PATCH 111/115] netlink: consistently use NLA_POLICY_EXACT_LEN() commit 8140860c817f3e9f78bcd1e420b9777ddcbaa629 upstream. @@ -63322,7 +63203,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c -index 9756239416fd..2a14f564033a 100644 +index 9756239416fde..2a14f564033a4 100644 --- a/drivers/net/wireguard/netlink.c +++ b/drivers/net/wireguard/netlink.c @@ -22,8 +22,8 @@ static struct genl_family genl_family; @@ -63356,10 +63237,10 @@ index 9756239416fd..2a14f564033a 100644 2.18.4 -From 26ffe7c1fb4e919f0fb1182f61fb3ea0b80eaa44 Mon Sep 17 00:00:00 2001 +From f9709ed12e3d82b6e842f8419e646bfdd96d399a Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 18 Aug 2020 10:17:32 +0200 -Subject: [PATCH 114/117] netlink: consistently use NLA_POLICY_MIN_LEN() +Subject: [PATCH 112/115] netlink: consistently use NLA_POLICY_MIN_LEN() commit bc0435855041d7fff0b83dd992fc4be34aa11afb upstream. @@ -63376,7 +63257,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c -index 2a14f564033a..1c69eb8735d5 100644 +index 2a14f564033a4..1c69eb8735d53 100644 --- a/drivers/net/wireguard/netlink.c +++ b/drivers/net/wireguard/netlink.c @@ -34,7 +34,7 @@ static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = { @@ -63401,10 +63282,10 @@ index 2a14f564033a..1c69eb8735d5 100644 2.18.4 -From bd6ee2b1c576a65d4ac641274c36a8e2f9eaa547 Mon Sep 17 00:00:00 2001 +From 70d652fcdfed63b718add26c1a9ba2701e284bb1 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 9 Sep 2020 13:58:14 +0200 -Subject: [PATCH 115/117] wireguard: noise: take lock when removing handshake +Subject: [PATCH 113/115] wireguard: noise: take lock when removing handshake entry from table commit 9179ba31367bcf481c3c79b5f028c94faad9f30a upstream. @@ -63510,7 +63391,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c -index 201a22681945..27cb5045bed2 100644 +index 201a22681945f..27cb5045bed2d 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -87,15 +87,12 @@ static void handshake_zero(struct noise_handshake *handshake) @@ -63534,10 +63415,10 @@ index 201a22681945..27cb5045bed2 100644 2.18.4 -From 5003c5d6a8698bce404a9e68528ec994ba1a0f12 Mon Sep 17 00:00:00 2001 +From db4ade5b7260adf3619652d8b62fe43a6c73e123 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 9 Sep 2020 13:58:15 +0200 -Subject: [PATCH 116/117] wireguard: peerlookup: take lock before checking hash +Subject: [PATCH 114/115] wireguard: peerlookup: take lock before checking hash in replace operation commit 6147f7b1e90ff09bd52afc8b9206a7fcd133daf7 upstream. @@ -63568,7 +63449,7 @@ Signed-off-by: Jason A. Donenfeld 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireguard/peerlookup.c b/drivers/net/wireguard/peerlookup.c -index e4deb331476b..f2783aa7a88f 100644 +index e4deb331476b3..f2783aa7a88f1 100644 --- a/drivers/net/wireguard/peerlookup.c +++ b/drivers/net/wireguard/peerlookup.c @@ -167,9 +167,13 @@ bool wg_index_hashtable_replace(struct index_hashtable *table, @@ -63602,10 +63483,10 @@ index e4deb331476b..f2783aa7a88f 100644 2.18.4 -From 2d4c3892646cdd41486dc4b1aab1fc2942b49f10 Mon Sep 17 00:00:00 2001 +From 3f0fd35bef6cd99bbc1537e497171e52c73e5d28 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 29 Oct 2020 03:56:05 +0100 -Subject: [PATCH 117/117] wireguard: selftests: check that route_me_harder +Subject: [PATCH 115/115] wireguard: selftests: check that route_me_harder packets use the right sk commit af8afcf1fdd5f365f70e2386c2d8c7a1abd853d7 upstream. @@ -63627,7 +63508,7 @@ Signed-off-by: Jason A. Donenfeld 2 files changed, 10 insertions(+) diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh -index d77f4829f1e0..74c69b75f6f5 100755 +index d77f4829f1e07..74c69b75f6f5a 100755 --- a/tools/testing/selftests/wireguard/netns.sh +++ b/tools/testing/selftests/wireguard/netns.sh @@ -316,6 +316,14 @@ pp sleep 3 @@ -63646,7 +63527,7 @@ index d77f4829f1e0..74c69b75f6f5 100755 n1 wg set wg0 peer "$pub3" allowed-ips 192.168.242.2/32 endpoint 192.168.241.2:5 ip1 addr add 192.168.242.1/24 dev wg0 diff --git a/tools/testing/selftests/wireguard/qemu/kernel.config b/tools/testing/selftests/wireguard/qemu/kernel.config -index af9323a0b6e0..9864d106e818 100644 +index af9323a0b6e09..9864d106e8189 100644 --- a/tools/testing/selftests/wireguard/qemu/kernel.config +++ b/tools/testing/selftests/wireguard/qemu/kernel.config @@ -18,10 +18,12 @@ CONFIG_NF_NAT=y diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index bc98139..59f3e1f 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,5 +1,5 @@ -%global commit_firmware_long 934252b0b5258a6f1caedc6708393d44e6710cbc -%global commit_linux_long 617a1c1722aeaa4d69356e18b88d569366f1ac1b +%global commit_firmware_long 7d91570f20378afc9414107dccdad70705a8a342 +%global commit_linux_long 61e5a224f7ae0752fc28aea296436f2a0992ba9a ExclusiveArch: aarch64 armv7hl @@ -32,7 +32,7 @@ ExclusiveArch: aarch64 armv7hl %define extra_version 1 %define kversion 5.4 -%define kfullversion %{kversion}.88 +%define kfullversion %{kversion}.96 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 Feb 7 2021 Pablo Greco - 5.4.96 +- Update to version v5.4.96 + * Sun Jan 10 2021 Pablo Greco - 5.4.88 - Update to version v5.4.88