diff options
| author | John Audia <graysky@archlinux.us> | 2021-12-01 06:28:02 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-12-12 21:11:30 +0100 |
| commit | 6c945fa379a1b59e6b439b0f6ffba4cbd3ca04d3 (patch) | |
| tree | c6a821be172fa7841d6c989c76f7763aba63bbd0 /target/linux/bcm27xx | |
| parent | a725bdc700c9a63666ce1ef9fec1b2a65216576f (diff) | |
| download | upstream-6c945fa379a1b59e6b439b0f6ffba4cbd3ca04d3.tar.gz upstream-6c945fa379a1b59e6b439b0f6ffba4cbd3ca04d3.tar.bz2 upstream-6c945fa379a1b59e6b439b0f6ffba4cbd3ca04d3.zip | |
kernel: bump 5.10 to 5.10.83
Removed upstreamed:
bcm53xx/patches-5.10/033-v5.16-0024-ARM-dts-BCM5301X-Fix-I2C-controller-interrupt.patch[1]
bcm53xx/patches-5.10/033-v5.16-0025-ARM-dts-BCM5301X-Add-interrupt-properties-to-GPIO-no.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=b2cd6fdcbe0a5cb44e4610a08cc58261d494a885
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=9db1d4a3c2700e1cc84c3d61199411d75c2a3ec6
Build system: x86_64*
Build-tested: bcm2711/RPi4B, ipq806x/R7800†
Run-tested: bcm2711/RPi4B, ipq806x/R7800†
* Had to revert 7c99085bd69742f66207d61e9f2da5ec4f8f9d2f in order to build
(latest bump of ca-certificates)
† Had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e in order to build
(binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm27xx')
6 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0040-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-5.10/950-0040-Add-dwc_otg-driver.patch index ec59069392..c0a315042a 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0040-Add-dwc_otg-driver.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0040-Add-dwc_otg-driver.patch @@ -1123,7 +1123,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5494,7 +5494,7 @@ static void port_event(struct usb_hub *h +@@ -5503,7 +5503,7 @@ static void port_event(struct usb_hub *h port_dev->over_current_count++; port_over_current_notify(port_dev); diff --git a/target/linux/bcm27xx/patches-5.10/950-0201-mmc-sdhci-Silence-MMC-warnings.patch b/target/linux/bcm27xx/patches-5.10/950-0201-mmc-sdhci-Silence-MMC-warnings.patch index ae6eba1cb4..fabb3b0e6d 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0201-mmc-sdhci-Silence-MMC-warnings.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0201-mmc-sdhci-Silence-MMC-warnings.patch @@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> #define MAX_TUNING_LOOP 40 -@@ -3133,7 +3133,7 @@ static void sdhci_timeout_timer(struct t +@@ -3145,7 +3145,7 @@ static void sdhci_timeout_timer(struct t spin_lock_irqsave(&host->lock, flags); if (host->cmd && !sdhci_data_line_cmd(host->cmd)) { @@ -31,7 +31,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> mmc_hostname(host->mmc)); sdhci_dumpregs(host); -@@ -3155,7 +3155,7 @@ static void sdhci_timeout_data_timer(str +@@ -3167,7 +3167,7 @@ static void sdhci_timeout_data_timer(str if (host->data || host->data_cmd || (host->cmd && sdhci_data_line_cmd(host->cmd))) { diff --git a/target/linux/bcm27xx/patches-5.10/950-0332-staging-fbtft-Add-support-for-display-variants.patch b/target/linux/bcm27xx/patches-5.10/950-0332-staging-fbtft-Add-support-for-display-variants.patch index 72f741fa89..7bdc80b46c 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0332-staging-fbtft-Add-support-for-display-variants.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0332-staging-fbtft-Add-support-for-display-variants.patch @@ -95,7 +95,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> #include <video/mipi_display.h> -@@ -1194,6 +1196,7 @@ static struct fbtft_platform_data *fbtft +@@ -1187,6 +1189,7 @@ static struct fbtft_platform_data *fbtft * @display: Display properties * @sdev: SPI device * @pdev: Platform device @@ -103,7 +103,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> * * Allocates, initializes and registers a framebuffer * -@@ -1203,12 +1206,15 @@ static struct fbtft_platform_data *fbtft +@@ -1196,12 +1199,15 @@ static struct fbtft_platform_data *fbtft */ int fbtft_probe_common(struct fbtft_display *display, struct spi_device *sdev, @@ -120,7 +120,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> int ret; if (sdev) -@@ -1224,6 +1230,14 @@ int fbtft_probe_common(struct fbtft_disp +@@ -1217,6 +1223,14 @@ int fbtft_probe_common(struct fbtft_disp pdata = fbtft_properties_read(dev); if (IS_ERR(pdata)) return PTR_ERR(pdata); diff --git a/target/linux/bcm27xx/patches-5.10/950-0361-ARM-dts-Expand-PCIe-space-on-BCM2711.patch b/target/linux/bcm27xx/patches-5.10/950-0361-ARM-dts-Expand-PCIe-space-on-BCM2711.patch index a791013aa0..5dfc9221c5 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0361-ARM-dts-Expand-PCIe-space-on-BCM2711.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0361-ARM-dts-Expand-PCIe-space-on-BCM2711.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -503,8 +503,8 @@ +@@ -509,8 +509,8 @@ msi-controller; msi-parent = <&pcie0>; diff --git a/target/linux/bcm27xx/patches-5.10/950-0388-dt-Use-compatible-string-for-BCM2711-DSI1.patch b/target/linux/bcm27xx/patches-5.10/950-0388-dt-Use-compatible-string-for-BCM2711-DSI1.patch index 635718e01d..b409d5c534 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0388-dt-Use-compatible-string-for-BCM2711-DSI1.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0388-dt-Use-compatible-string-for-BCM2711-DSI1.patch @@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -554,6 +554,7 @@ +@@ -560,6 +560,7 @@ &dsi1 { interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; diff --git a/target/linux/bcm27xx/patches-5.10/950-0697-ARM-dts-bcm2711-fold-in-the-correct-interrupt.patch b/target/linux/bcm27xx/patches-5.10/950-0697-ARM-dts-bcm2711-fold-in-the-correct-interrupt.patch index 103b5d5473..6720d08872 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0697-ARM-dts-bcm2711-fold-in-the-correct-interrupt.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0697-ARM-dts-bcm2711-fold-in-the-correct-interrupt.patch @@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> status = "disabled"; }; -@@ -1106,7 +1106,3 @@ +@@ -1112,7 +1112,3 @@ &usb { interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; }; |