diff options
author | Petr Štetiar <ynezz@true.cz> | 2020-04-07 10:08:16 +0200 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-04-09 00:12:46 +0200 |
commit | b299002877c801202c3b61d5e09865e88f506176 (patch) | |
tree | cf1d30e16b53a53e4d04630527f67b01eac38181 /target/linux/bcm27xx | |
parent | 196cab719f8f318ec771e5f1a07728c12b7fa207 (diff) | |
download | upstream-b299002877c801202c3b61d5e09865e88f506176.tar.gz upstream-b299002877c801202c3b61d5e09865e88f506176.tar.bz2 upstream-b299002877c801202c3b61d5e09865e88f506176.zip |
kernel: bump 5.4 to 5.4.31
Refreshed patches, removed upstreamed patches:
oxnas: 003-ARM-dts-oxnas-Fix-clear-mask-property.patch
generic: 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch
Run tested: apu2, qemu-x86-64, apalis
Build tested: sunxi/a53, imx6, x86/64, ipq40xx
Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/bcm27xx')
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch index 327aef06ee..362b5c9ada 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch @@ -267,7 +267,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com> goto out; --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c -@@ -1919,7 +1919,8 @@ EXPORT_SYMBOL(mmc_erase); +@@ -1922,7 +1922,8 @@ EXPORT_SYMBOL(mmc_erase); int mmc_can_erase(struct mmc_card *card) { if ((card->host->caps & MMC_CAP_ERASE) && diff --git a/target/linux/bcm27xx/patches-5.4/950-0128-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/bcm27xx/patches-5.4/950-0128-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index ca66626711..4286abf01a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0128-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0128-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /* Device and char device-related information */ static DEFINE_IDA(gpio_ida); static dev_t gpio_devt; -@@ -3084,8 +3086,8 @@ int gpiod_direction_output(struct gpio_d +@@ -3091,8 +3093,8 @@ int gpiod_direction_output(struct gpio_d value = !!value; /* GPIOs used for enabled IRQs shall not be set as output */ @@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> gpiod_err(desc, "%s: tried to set a GPIO tied to an IRQ as output\n", __func__); -@@ -3887,7 +3889,7 @@ int gpiochip_lock_as_irq(struct gpio_chi +@@ -3894,7 +3896,7 @@ int gpiochip_lock_as_irq(struct gpio_chi } } diff --git a/target/linux/bcm27xx/patches-5.4/950-0456-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch b/target/linux/bcm27xx/patches-5.4/950-0456-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch index 05dad5ddaf..155e18936a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0456-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0456-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch @@ -187,7 +187,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de> } --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c -@@ -899,7 +899,7 @@ static int ahci_configure_dma_masks(stru +@@ -900,7 +900,7 @@ static int ahci_configure_dma_masks(stru * value, don't extend it here. This happens on STA2X11, for example. * * XXX: manipulating the DMA mask from platform code is completely |