From 07fa9114d63217edcf2cddc977f2ddecbe5bd703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Hwong?= <88561480+JoseCoW@users.noreply.github.com> Date: Thu, 21 Apr 2022 22:41:18 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.190 (#9287) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * kernel: bump 5.4 to 5.4.189 Signed-off-by: José Hwong <88561480+JoseCoW@users.noreply.github.com> * kernel: bump 5.4 to 5.4.190 Signed-off-by: José Hwong <88561480+JoseCoW@users.noreply.github.com> --- include/kernel-5.4 | 4 +-- ...cks-early-during-the-boot-process-so.patch | 4 +-- ...Mark-used-PLLs-and-dividers-CRITICAL.patch | 2 +- ...lk-bcm2835-Add-claim-clocks-property.patch | 14 ++++---- ...35-Read-max-core-clock-from-firmware.patch | 8 ++--- ...-GPIO-clocks-enabled-at-boot-as-crit.patch | 2 +- ...-0027-mm-Remove-the-PFN-busy-warning.patch | 2 +- ...8-ASoC-Add-prompt-for-ICS43432-codec.patch | 2 +- ...8xx-Enable-LEDs-and-auto-negotiation.patch | 6 ++-- ...1-Don-t-use-DT-aliases-for-numbering.patch | 2 +- ...0032-amba_pl011-Round-input-clock-up.patch | 6 ++-- ...Add-cts-event-workaround-DT-property.patch | 2 +- .../950-0037-Add-dwc_otg-driver.patch | 2 +- ...043-MMC-added-alternative-MMC-driver.patch | 2 +- ...BCM2708-Add-core-Device-Tree-support.patch | 22 ++++++------ ...50-0059-ASoC-Add-support-for-Rpi-DAC.patch | 2 +- ...-HiFiBerry-Amp-amplifier-add-on-boar.patch | 2 +- ...oup-Disable-cgroup-memory-by-default.patch | 8 ++--- ...78xx-Read-initial-EEE-status-from-DT.patch | 2 +- ...Disable-TCP-Segmentation-Offload-TSO.patch | 4 +-- ...e-enabling-of-EEE-into-PHY-init-code.patch | 4 +-- .../950-0119-Add-rpi-poe-fan-driver.patch | 2 +- ...e-link-events-to-minimize-poll-storm.patch | 4 +-- ...xx-EEE-support-is-now-a-PHY-property.patch | 2 +- ...iophonics-I-Sabre-9038Q2M-DAC-driver.patch | 2 +- ...use-default-alignment-for-rx-buffers.patch | 2 +- ...-bcm2835-Use-zd-when-printing-size_t.patch | 2 +- ...Better-coalescing-parameter-defaults.patch | 2 +- ...ci-Disable-the-XHCI-5-second-timeout.patch | 29 --------------- ...Show-that-the-VIA-VL805-supports-LPM.patch | 2 +- ...support-for-setting-leaf-clock-rates.patch | 4 +-- ...w-reparenting-leaf-clocks-while-they.patch | 10 +++--- ...-for-updating-interrupt-endpoint-int.patch | 4 +-- ...hci_fixup_endpoint-for-interval-adju.patch | 4 +-- ...or-host-controllers-that-don-t-updat.patch | 8 ++--- ...bcm2835-Avoid-null-pointer-exception.patch | 2 +- ...ore-event-ring-segment-table-entries.patch | 2 +- ...ma-direct-Temporary-DMA-fix-on-arm64.patch | 2 +- ...ow-ethernet-LED-mode-to-be-set-via-d.patch | 6 ++-- ...nge-the-default-ethernet-LED-actions.patch | 4 +-- ...0-0347-clk-bcm2835-Disable-v3d-clock.patch | 4 +-- ...-Remove-simple-bus-from-fixed-clocks.patch | 2 +- ...Move-pixelvalve-to-bcm2835-common.dt.patch | 4 +-- ...lise-rpi-firmware-before-clk-bcm2835.patch | 2 +- ...y-amba-pl011-Add-un-throttle-support.patch | 2 +- ...rt-all-changes-to-upstream-dts-files.patch | 18 +++++----- ...n-ARCH_ZONE_DMA_BITS-into-a-variable.patch | 4 +-- ...-inbound-resource-parsing-to-helpers.patch | 6 ++-- ...de-dma_direct_map_resource-from-the-.patch | 6 ++-- ...reat-dev-bus_dma_mask-as-a-DMA-limit.patch | 4 +-- ...merus-amp-soundcard-and-ma120x0p-cod.patch | 2 +- ...finitions-for-HEVC-stateless-decodin.patch | 2 +- ...h-Add-a-format-for-column-YUV4-2-0-m.patch | 2 +- ...-0504-mmc-sdhci-Silence-MMC-warnings.patch | 4 +-- ...core-Add-sensor-ancillary-data-V4L2-.patch | 2 +- ...mplement-an-I2C-pinctrl-mux-for-BSC0.patch | 4 +-- ...core-Add-ISP-statistics-output-V4L2-.patch | 2 +- ...inter-to-the-miscdevice-in-dma-buf-p.patch | 6 ++-- ...car-csi2-Negotiate-data-lanes-number.patch | 10 +++--- ...l-Add-14-bit-raw-bayer-pixel-formats.patch | 2 +- ...dd-14-bit-raw-greyscale-pixel-format.patch | 2 +- ...l-format-for-MIPI-packed-12bit-luma-.patch | 2 +- ...l-format-for-MIPI-packed-14bit-luma-.patch | 2 +- ...m-Add-compatible-string-for-BCM43540.patch | 2 +- ...Add-entry-for-BCM4335A0-UART-bluetoo.patch | 2 +- ...cm-Disallow-set_baudrate-for-BCM4354.patch | 6 ++-- ...th-hci_bcm-Support-pcm-params-in-dts.patch | 8 ++--- ...-hci_bcm-Drive-RTS-only-for-BCM43438.patch | 4 +-- ...tft-Add-support-for-display-variants.patch | 6 ++-- ...et-bcmgenet-Reset-RBUF-on-first-open.patch | 2 +- ...-quirks-add-link-TRB-quirk-for-VL805.patch | 6 ++-- ...it-out-the-BCM54213PE-from-the-BCM54.patch | 6 ++-- ...roadcom-Add-bcm54213pe-configuration.patch | 4 +-- ...-Ack-pending-PHY-ints-when-resetting.patch | 2 +- ...01X-Update-Ethernet-switch-node-name.patch | 4 +-- ...-Add-a-default-compatible-for-switch.patch | 2 +- ...-Provide-defaults-ports-container-no.patch | 2 +- ...support-for-performing-fake-doorbell.patch | 6 ++-- ...01X-Update-Northstar-pinctrl-binding.patch | 2 +- ...22-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch | 1 + ...e6xxx-Add-support-for-port-mirroring.patch | 4 +-- ...x-fix-broken-if-statement-because-of.patch | 2 +- ...the-dst-buffer-to-of_get_mac_address.patch | 4 +-- ...mtd-device-named-ubi-or-data-on-boot.patch | 4 +-- .../pending-5.4/532-jffs2_eofdetect.patch | 2 +- ...-netfilter_optional_tcp_window_check.patch | 2 +- ...net-mtk_eth_soc-enable-threaded-NAPI.patch | 12 +++---- ...equest-assisted-learning-on-CPU-port.patch | 2 +- ..._eth_soc-implement-dynamic-interrupt.patch | 4 +-- ...iatek-mtk_eth_soc-add-support-for-in.patch | 4 +-- .../pending-5.4/834-ledtrig-libata.patch | 8 ++--- ...-backport-wireless-ethernet-dispatch.patch | 36 +++---------------- ...ntries-in-dts-files-for-NSS-support.patch} | 2 +- .../999-03a-qca-nss-ecm-support.patch | 6 ++-- .../999-03b-qca-nss-ecm-support.patch | 22 ++++++------ .../999-07c-qca-nss-clients-ppp-support.patch | 8 ++--- .../999-07d-qca-nss-clients-ppp-support.patch | 6 ++-- ...-attach-do-not-return-EINVAL-if-the-.patch | 2 +- ...0031-uvc-add-iPassion-iP2970-support.patch | 2 +- ...122-mips-ralink-enable-zboot-support.patch | 2 +- .../302-spi-nor-add-gd25q512.patch | 2 +- .../patches-5.4/303-mtd-scpart-parser.patch | 4 +-- ...ethernet-mediatek-support-net-labels.patch | 4 +-- .../linux/ramips/patches-5.4/991-at803x.patch | 2 +- 104 files changed, 221 insertions(+), 279 deletions(-) delete mode 100644 target/linux/bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch rename target/linux/ipq806x/patches-5.4/{990-00-Add-required-entries-in-dts-files-for-NSS-support.patch.patch => 990-00-Add-required-entries-in-dts-files-for-NSS-support.patch} (98%) diff --git a/include/kernel-5.4 b/include/kernel-5.4 index ee1778581..954b8a1a7 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .188 -LINUX_KERNEL_HASH-5.4.188 = 9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc +LINUX_VERSION-5.4 = .190 +LINUX_KERNEL_HASH-5.4.190 = 81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194 diff --git a/target/linux/bcm27xx/patches-5.4/950-0018-Register-the-clocks-early-during-the-boot-process-so.patch b/target/linux/bcm27xx/patches-5.4/950-0018-Register-the-clocks-early-during-the-boot-process-so.patch index 64b984802..5b22f1691 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0018-Register-the-clocks-early-during-the-boot-process-so.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0018-Register-the-clocks-early-during-the-boot-process-so.patch @@ -13,7 +13,7 @@ Signed-off-by: Martin Sperl --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -2267,8 +2267,15 @@ static int bcm2835_clk_probe(struct plat +@@ -2262,8 +2262,15 @@ static int bcm2835_clk_probe(struct plat if (ret) return ret; @@ -30,7 +30,7 @@ Signed-off-by: Martin Sperl } static const struct cprman_plat_data cprman_bcm2835_plat_data = { -@@ -2294,7 +2301,11 @@ static struct platform_driver bcm2835_cl +@@ -2289,7 +2296,11 @@ static struct platform_driver bcm2835_cl .probe = bcm2835_clk_probe, }; diff --git a/target/linux/bcm27xx/patches-5.4/950-0020-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch b/target/linux/bcm27xx/patches-5.4/950-0020-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch index 309655861..e4faba4b8 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0020-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0020-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1381,6 +1381,11 @@ bcm2835_register_pll_divider(struct bcm2 +@@ -1376,6 +1376,11 @@ bcm2835_register_pll_divider(struct bcm2 divider->div.hw.init = &init; divider->div.table = NULL; diff --git a/target/linux/bcm27xx/patches-5.4/950-0021-clk-bcm2835-Add-claim-clocks-property.patch b/target/linux/bcm27xx/patches-5.4/950-0021-clk-bcm2835-Add-claim-clocks-property.patch index 7479210c1..b732c4f16 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0021-clk-bcm2835-Add-claim-clocks-property.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0021-clk-bcm2835-Add-claim-clocks-property.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- 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_ +@@ -1306,6 +1306,8 @@ static const struct clk_ops bcm2835_vpu_ .debug_init = bcm2835_clock_debug_init, }; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman, const struct bcm2835_pll_data *data) { -@@ -1327,6 +1329,9 @@ static struct clk_hw *bcm2835_register_p +@@ -1322,6 +1324,9 @@ static struct clk_hw *bcm2835_register_p init.ops = &bcm2835_pll_clk_ops; init.flags = CLK_IGNORE_UNUSED; @@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell pll = kzalloc(sizeof(*pll), GFP_KERNEL); if (!pll) return NULL; -@@ -1382,8 +1387,10 @@ bcm2835_register_pll_divider(struct bcm2 +@@ -1377,8 +1382,10 @@ bcm2835_register_pll_divider(struct bcm2 divider->div.table = NULL; if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) { @@ -49,7 +49,7 @@ Signed-off-by: Phil Elwell } divider->cprman = cprman; -@@ -2191,6 +2198,8 @@ static const struct bcm2835_clk_desc clk +@@ -2186,6 +2193,8 @@ static const struct bcm2835_clk_desc clk .ctl_reg = CM_PERIICTL), }; @@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell /* * Permanently take a reference on the parent of the SDRAM clock. * -@@ -2210,6 +2219,19 @@ static int bcm2835_mark_sdc_parent_criti +@@ -2205,6 +2214,19 @@ static int bcm2835_mark_sdc_parent_criti return clk_prepare_enable(parent); } @@ -78,7 +78,7 @@ Signed-off-by: Phil Elwell static int bcm2835_clk_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -2220,6 +2242,7 @@ static int bcm2835_clk_probe(struct plat +@@ -2215,6 +2237,7 @@ static int bcm2835_clk_probe(struct plat const size_t asize = ARRAY_SIZE(clk_desc_array); const struct cprman_plat_data *pdata; size_t i; @@ -86,7 +86,7 @@ Signed-off-by: Phil Elwell int ret; pdata = of_device_get_match_data(&pdev->dev); -@@ -2239,6 +2262,13 @@ static int bcm2835_clk_probe(struct plat +@@ -2234,6 +2257,13 @@ static int bcm2835_clk_probe(struct plat if (IS_ERR(cprman->regs)) return PTR_ERR(cprman->regs); diff --git a/target/linux/bcm27xx/patches-5.4/950-0022-clk-bcm2835-Read-max-core-clock-from-firmware.patch b/target/linux/bcm27xx/patches-5.4/950-0022-clk-bcm2835-Read-max-core-clock-from-firmware.patch index 0ddcf6f1a..b391bf057 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0022-clk-bcm2835-Read-max-core-clock-from-firmware.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0022-clk-bcm2835-Read-max-core-clock-from-firmware.patch @@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell spinlock_t regs_lock; /* spinlock for all clocks */ unsigned int soc; -@@ -1015,6 +1019,30 @@ static unsigned long bcm2835_clock_get_r +@@ -1010,6 +1014,30 @@ static unsigned long bcm2835_clock_get_r return bcm2835_clock_rate_from_divisor(clock, parent_rate, div); } @@ -81,7 +81,7 @@ Signed-off-by: Phil Elwell static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock) { struct bcm2835_cprman *cprman = clock->cprman; -@@ -1303,7 +1331,7 @@ static int bcm2835_vpu_clock_is_on(struc +@@ -1298,7 +1326,7 @@ static int bcm2835_vpu_clock_is_on(struc */ static const struct clk_ops bcm2835_vpu_clock_clk_ops = { .is_prepared = bcm2835_vpu_clock_is_on, @@ -90,7 +90,7 @@ Signed-off-by: Phil Elwell .set_rate = bcm2835_clock_set_rate, .determine_rate = bcm2835_clock_determine_rate, .set_parent = bcm2835_clock_set_parent, -@@ -2241,6 +2269,7 @@ static int bcm2835_clk_probe(struct plat +@@ -2236,6 +2264,7 @@ static int bcm2835_clk_probe(struct plat const struct bcm2835_clk_desc *desc; const size_t asize = ARRAY_SIZE(clk_desc_array); const struct cprman_plat_data *pdata; @@ -98,7 +98,7 @@ Signed-off-by: Phil Elwell size_t i; u32 clk_id; int ret; -@@ -2262,6 +2291,14 @@ static int bcm2835_clk_probe(struct plat +@@ -2257,6 +2286,14 @@ static int bcm2835_clk_probe(struct plat if (IS_ERR(cprman->regs)) return PTR_ERR(cprman->regs); diff --git a/target/linux/bcm27xx/patches-5.4/950-0023-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch b/target/linux/bcm27xx/patches-5.4/950-0023-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch index 61d9edf3e..e6835780b 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0023-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0023-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch @@ -20,7 +20,7 @@ Signed-off-by: Eric Anholt --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1473,6 +1473,15 @@ static struct clk_hw *bcm2835_register_c +@@ -1468,6 +1468,15 @@ static struct clk_hw *bcm2835_register_c init.flags = data->flags | CLK_IGNORE_UNUSED; /* diff --git a/target/linux/bcm27xx/patches-5.4/950-0027-mm-Remove-the-PFN-busy-warning.patch b/target/linux/bcm27xx/patches-5.4/950-0027-mm-Remove-the-PFN-busy-warning.patch index d64365674..95956dc1d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0027-mm-Remove-the-PFN-busy-warning.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0027-mm-Remove-the-PFN-busy-warning.patch @@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -8512,8 +8512,6 @@ int alloc_contig_range(unsigned long sta +@@ -8521,8 +8521,6 @@ int alloc_contig_range(unsigned long sta /* Make sure the range is really isolated. */ if (test_pages_isolated(outer_start, end, false)) { diff --git a/target/linux/bcm27xx/patches-5.4/950-0028-ASoC-Add-prompt-for-ICS43432-codec.patch b/target/linux/bcm27xx/patches-5.4/950-0028-ASoC-Add-prompt-for-ICS43432-codec.patch index 767cec19d..fa22a659e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0028-ASoC-Add-prompt-for-ICS43432-codec.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0028-ASoC-Add-prompt-for-ICS43432-codec.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig -@@ -710,7 +710,7 @@ config SND_SOC_HDAC_HDA +@@ -715,7 +715,7 @@ config SND_SOC_HDAC_HDA select SND_HDA config SND_SOC_ICS43432 diff --git a/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch index 3b1d4332d..1964988c7 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2469,6 +2469,11 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2471,6 +2471,11 @@ static int lan78xx_reset(struct lan78xx_ int ret = 0; unsigned long timeout; u8 sig; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_LRST_; -@@ -2522,6 +2527,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2524,6 +2529,9 @@ static int lan78xx_reset(struct lan78xx_ ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_MEF_; @@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell ret = lan78xx_write_reg(dev, HW_CFG, buf); ret = lan78xx_read_reg(dev, USB_CFG0, &buf); -@@ -2577,6 +2585,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2579,6 +2587,9 @@ static int lan78xx_reset(struct lan78xx_ buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_; } } diff --git a/target/linux/bcm27xx/patches-5.4/950-0031-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/target/linux/bcm27xx/patches-5.4/950-0031-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch index 79212447f..16a835f5a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0031-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0031-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch @@ -14,7 +14,7 @@ use the same logic. --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2578,7 +2578,12 @@ static int pl011_setup_port(struct devic +@@ -2557,7 +2557,12 @@ static int pl011_setup_port(struct devic if (IS_ERR(base)) return PTR_ERR(base); diff --git a/target/linux/bcm27xx/patches-5.4/950-0032-amba_pl011-Round-input-clock-up.patch b/target/linux/bcm27xx/patches-5.4/950-0032-amba_pl011-Round-input-clock-up.patch index 912ff563c..e7892d310 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0032-amba_pl011-Round-input-clock-up.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0032-amba_pl011-Round-input-clock-up.patch @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell /* Clear pending error and receive interrupts */ pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS | -@@ -2324,7 +2341,7 @@ static int pl011_console_setup(struct co +@@ -2303,7 +2320,7 @@ static int pl011_console_setup(struct co plat->init(); } @@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell if (uap->vendor->fixed_options) { baud = uap->fixed_baud; -@@ -2509,6 +2526,7 @@ static struct uart_driver amba_reg = { +@@ -2488,6 +2505,7 @@ static struct uart_driver amba_reg = { .cons = AMBA_CONSOLE, }; @@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell static int pl011_probe_dt_alias(int index, struct device *dev) { struct device_node *np; -@@ -2540,6 +2558,7 @@ static int pl011_probe_dt_alias(int inde +@@ -2519,6 +2537,7 @@ static int pl011_probe_dt_alias(int inde return ret; } diff --git a/target/linux/bcm27xx/patches-5.4/950-0034-amba_pl011-Add-cts-event-workaround-DT-property.patch b/target/linux/bcm27xx/patches-5.4/950-0034-amba_pl011-Add-cts-event-workaround-DT-property.patch index df8e9aba7..3bbbed2f9 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0034-amba_pl011-Add-cts-event-workaround-DT-property.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0034-amba_pl011-Add-cts-event-workaround-DT-property.patch @@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell - reg --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2665,6 +2665,11 @@ static int pl011_probe(struct amba_devic +@@ -2644,6 +2644,11 @@ static int pl011_probe(struct amba_devic if (IS_ERR(uap->clk)) return PTR_ERR(uap->clk); diff --git a/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch index f514d9940..c79751c2c 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch @@ -1040,7 +1040,7 @@ Signed-off-by: Jonathan Bell } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5369,7 +5369,7 @@ static void port_event(struct usb_hub *h +@@ -5382,7 +5382,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.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 378c605d3..ce51e004c 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 @@ -279,7 +279,7 @@ Signed-off-by: Yaroslav Rosomakho } --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c -@@ -434,15 +434,30 @@ struct mmc_host *mmc_alloc_host(int extr +@@ -443,15 +443,30 @@ struct mmc_host *mmc_alloc_host(int extr { int err; struct mmc_host *host; diff --git a/target/linux/bcm27xx/patches-5.4/950-0053-BCM2708-Add-core-Device-Tree-support.patch b/target/linux/bcm27xx/patches-5.4/950-0053-BCM2708-Add-core-Device-Tree-support.patch index 89ce98a49..83ed665c8 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0053-BCM2708-Add-core-Device-Tree-support.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0053-BCM2708-Add-core-Device-Tree-support.patch @@ -4281,9 +4281,9 @@ index 90125ce19a1b..d7c955443138 100644 compatible = "brcm,bcm2835-rng"; reg = <0x7e104000 0x10>; interrupts = <2 29>; -@@ -184,8 +166,7 @@ - interrupt-controller; +@@ -185,8 +167,7 @@ #interrupt-cells = <2>; + gpio-ranges = <&gpio 0 0 54>; - /* Defines pin muxing groups according to - * BCM2835-ARM-Peripherals.pdf page 102. @@ -4291,7 +4291,7 @@ index 90125ce19a1b..d7c955443138 100644 * * While each pin can have its mux selected * for various functions individually, some -@@ -263,15 +244,7 @@ +@@ -264,15 +245,7 @@ brcm,pins = <44 45>; brcm,function = ; }; @@ -4307,7 +4307,7 @@ index 90125ce19a1b..d7c955443138 100644 jtag_gpio22: jtag_gpio22 { brcm,pins = <22 23 24 25 26 27>; brcm,function = ; -@@ -410,7 +383,7 @@ +@@ -411,7 +384,7 @@ reg = <0x7e202000 0x100>; interrupts = <2 24>; clocks = <&clocks BCM2835_CLOCK_VPU>; @@ -4316,8 +4316,8 @@ index 90125ce19a1b..d7c955443138 100644 dma-names = "rx-tx"; status = "disabled"; }; -@@ -490,14 +463,6 @@ - +@@ -492,14 +465,6 @@ + status = "disabled"; }; - thermal: thermal@7e212000 { @@ -4331,7 +4331,7 @@ index 90125ce19a1b..d7c955443138 100644 aux: aux@7e215000 { compatible = "brcm,bcm2835-aux"; #clock-cells = <1>; -@@ -577,6 +542,32 @@ +@@ -579,6 +544,32 @@ status = "disabled"; }; @@ -4364,7 +4364,7 @@ index 90125ce19a1b..d7c955443138 100644 i2c1: i2c@7e804000 { compatible = "brcm,bcm2835-i2c"; reg = <0x7e804000 0x1000>; -@@ -637,13 +628,6 @@ +@@ -639,13 +630,6 @@ phy-names = "usb2-phy"; }; @@ -22580,7 +22580,7 @@ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 179d55af5852..2cfce19f9f73 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -254,6 +254,7 @@ DTC ?= $(objtree)/scripts/dtc/dtc +@@ -240,6 +240,7 @@ DTC ?= $(objtree)/scripts/dtc/dtc ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),) DTC_FLAGS += -Wno-unit_address_vs_reg \ -Wno-unit_address_format \ @@ -22588,9 +22588,9 @@ index 179d55af5852..2cfce19f9f73 100644 -Wno-avoid_unnecessary_addr_size \ -Wno-alias_paths \ -Wno-graph_child_address \ -@@ -313,6 +314,18 @@ endef +@@ -299,6 +300,18 @@ endef $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE - $(call if_changed_rule,dtc_dt_yaml) + $(call if_changed_rule,dtc,yaml) +quiet_cmd_dtco = DTCO $@ +cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \ diff --git a/target/linux/bcm27xx/patches-5.4/950-0059-ASoC-Add-support-for-Rpi-DAC.patch b/target/linux/bcm27xx/patches-5.4/950-0059-ASoC-Add-support-for-Rpi-DAC.patch index b226f2910..2cbd46deb 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0059-ASoC-Add-support-for-Rpi-DAC.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0059-ASoC-Add-support-for-Rpi-DAC.patch @@ -20,7 +20,7 @@ Subject: [PATCH] ASoC: Add support for Rpi-DAC select SND_SOC_PCM3008 select SND_SOC_PCM3060_I2C if I2C select SND_SOC_PCM3060_SPI if SPI_MASTER -@@ -980,6 +981,10 @@ config SND_SOC_RT5616 +@@ -985,6 +986,10 @@ config SND_SOC_RT5616 tristate "Realtek RT5616 CODEC" depends on I2C diff --git a/target/linux/bcm27xx/patches-5.4/950-0062-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch b/target/linux/bcm27xx/patches-5.4/950-0062-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch index 63fa3b1a5..0ceb277a8 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0062-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0062-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch @@ -35,7 +35,7 @@ Some code to load the driver based on device-tree-overlays was missing. This is select SND_SOC_TLV320AIC26 if SPI_MASTER select SND_SOC_TLV320AIC31XX if I2C select SND_SOC_TLV320AIC32X4_I2C if I2C && COMMON_CLK -@@ -1143,6 +1144,9 @@ config SND_SOC_TFA9879 +@@ -1148,6 +1149,9 @@ config SND_SOC_TFA9879 tristate "NXP Semiconductors TFA9879 amplifier" depends on I2C diff --git a/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch index d3ae747a7..cb1b7d72e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5749,6 +5749,9 @@ int __init cgroup_init_early(void) +@@ -5788,6 +5788,9 @@ int __init cgroup_init_early(void) return 0; } @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell /** * cgroup_init - cgroup initialization * -@@ -5787,6 +5790,12 @@ int __init cgroup_init(void) +@@ -5826,6 +5829,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -6196,6 +6205,10 @@ static int __init cgroup_disable(char *s +@@ -6235,6 +6244,10 @@ static int __init cgroup_disable(char *s strcmp(token, ss->legacy_name)) continue; @@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell static_branch_disable(cgroup_subsys_enabled_key[i]); pr_info("Disabling %s control group subsystem\n", ss->name); -@@ -6205,6 +6218,31 @@ static int __init cgroup_disable(char *s +@@ -6244,6 +6257,31 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); diff --git a/target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch index c4200203d..796ec2fe8 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2651,6 +2651,22 @@ static int lan78xx_open(struct net_devic +@@ -2653,6 +2653,22 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index 735e9d3f8..531056983 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -425,6 +425,15 @@ static int msg_level = -1; +@@ -427,6 +427,15 @@ static int msg_level = -1; module_param(msg_level, int, 0); MODULE_PARM_DESC(msg_level, "Override default message level"); @@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -2933,8 +2942,14 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2935,8 +2944,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; diff --git a/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch index 29a5d22eb..7b931de95 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2183,6 +2183,22 @@ static int lan78xx_phy_init(struct lan78 +@@ -2185,6 +2185,22 @@ static int lan78xx_phy_init(struct lan78 mii_adv_to_linkmode_adv_t(fc, mii_adv); linkmode_or(phydev->advertising, fc, phydev->advertising); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell if (phydev->mdio.dev.of_node) { u32 reg; int len; -@@ -2660,22 +2676,6 @@ static int lan78xx_open(struct net_devic +@@ -2662,22 +2678,6 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch index 8a1f57ad0..e8e3ddb6d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch @@ -108,7 +108,7 @@ Signed-off-by: Serge Schneider +the fan to the user space through the hwmon sysfs interface. --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig -@@ -1356,6 +1356,17 @@ config SENSORS_RASPBERRYPI_HWMON +@@ -1357,6 +1357,17 @@ config SENSORS_RASPBERRYPI_HWMON This driver can also be built as a module. If so, the module will be called raspberrypi-hwmon. diff --git a/target/linux/bcm27xx/patches-5.4/950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/bcm27xx/patches-5.4/950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index 19ea77e99..fe073c66d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -15,7 +15,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 1 file changed, 11 insertions(+), 1 deletion(-) --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -434,6 +434,11 @@ static bool enable_tso; +@@ -436,6 +436,11 @@ static bool enable_tso; module_param(enable_tso, bool, 0644); MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload"); @@ -27,7 +27,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3776,7 +3781,12 @@ static int lan78xx_probe(struct usb_inte +@@ -3778,7 +3783,12 @@ static int lan78xx_probe(struct usb_inte netdev->max_mtu = MAX_SINGLE_PACKET_SIZE; netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER); diff --git a/target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch index b30d95694..719264994 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2188,7 +2188,7 @@ static int lan78xx_phy_init(struct lan78 +@@ -2190,7 +2190,7 @@ static int lan78xx_phy_init(struct lan78 mii_adv_to_linkmode_adv_t(fc, mii_adv); linkmode_or(phydev->advertising, fc, phydev->advertising); diff --git a/target/linux/bcm27xx/patches-5.4/950-0144-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0144-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch index 501e81092..f5e38a30e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0144-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0144-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch @@ -226,7 +226,7 @@ Signed-off-by: Hui Wang select SND_SOC_JZ4740_CODEC select SND_SOC_JZ4725B_CODEC select SND_SOC_LM4857 if I2C -@@ -1497,4 +1498,8 @@ config SND_SOC_TPA6130A2 +@@ -1502,4 +1503,8 @@ config SND_SOC_TPA6130A2 tristate "Texas Instruments TPA6130A2 headphone amplifier" depends on I2C diff --git a/target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch b/target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch index e1f21e397..6784c906e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch @@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing. --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -3177,7 +3177,7 @@ static int rx_submit(struct lan78xx_net +@@ -3179,7 +3179,7 @@ static int rx_submit(struct lan78xx_net size_t size = dev->rx_urb_size; int ret = 0; diff --git a/target/linux/bcm27xx/patches-5.4/950-0177-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch b/target/linux/bcm27xx/patches-5.4/950-0177-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch index c8acb1a37..6cdab9c2a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0177-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0177-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch @@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -2354,7 +2354,7 @@ static int bcm2835_clk_probe(struct plat +@@ -2349,7 +2349,7 @@ static int bcm2835_clk_probe(struct plat return ret; /* note that we have registered all the clocks */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch index 6ab928ed3..c62a98928 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell /* Disable rate control for now */ bcmgenet_tdma_ring_writel(priv, index, flow_period_val, TDMA_FLOW_PERIOD); -@@ -3575,9 +3575,12 @@ static int bcmgenet_probe(struct platfor +@@ -3577,9 +3577,12 @@ static int bcmgenet_probe(struct platfor netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); /* Set default coalescing parameters */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch b/target/linux/bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch deleted file mode 100644 index 2f5e08b7a..000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a71750c83a6f1f2f7c22864bbb4e62af5e70c214 Mon Sep 17 00:00:00 2001 -From: Tim Gover -Date: Fri, 22 Mar 2019 09:47:14 +0000 -Subject: [PATCH] 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 -delay on the first boot. Remove the timeout. - -This is common code and probably can't be upstreamed unless the timeout -can be configurable somehow or perhaps the XHCI driver can be skipped -on the first boot. ---- - drivers/usb/host/xhci.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/host/xhci.c -+++ b/drivers/usb/host/xhci.c -@@ -196,8 +196,9 @@ int xhci_reset(struct xhci_hcd *xhci) - if (xhci->quirks & XHCI_INTEL_HOST) - udelay(1000); - -+ // Hack: reduce handshake timeout from 10s 0.5s due to unprogrammed vl805 - ret = xhci_handshake(&xhci->op_regs->command, -- CMD_RESET, 0, 10 * 1000 * 1000); -+ CMD_RESET, 0, 500 * 1000); - if (ret) - return ret; - diff --git a/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch b/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch index 567912610..0bd2f1030 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -257,6 +257,10 @@ static void xhci_pci_quirks(struct devic +@@ -271,6 +271,10 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x3432) xhci->quirks |= XHCI_BROKEN_STREAMS; diff --git a/target/linux/bcm27xx/patches-5.4/950-0216-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch b/target/linux/bcm27xx/patches-5.4/950-0216-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch index 3227f8c91..064e464df 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0216-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0216-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch @@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt --- 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 +@@ -1109,15 +1109,19 @@ static int bcm2835_clock_set_rate(struct spin_lock(&cprman->regs_lock); @@ -42,7 +42,7 @@ Signed-off-by: Eric Anholt ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0; cprman_write(cprman, data->ctl_reg, ctl); -@@ -1494,7 +1498,7 @@ static struct clk_hw *bcm2835_register_c +@@ -1489,7 +1493,7 @@ static struct clk_hw *bcm2835_register_c init.ops = &bcm2835_vpu_clock_clk_ops; } else { init.ops = &bcm2835_clock_clk_ops; diff --git a/target/linux/bcm27xx/patches-5.4/950-0217-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch b/target/linux/bcm27xx/patches-5.4/950-0217-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch index bae0f84e1..5b49ee727 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0217-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0217-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch @@ -15,7 +15,7 @@ Signed-off-by: Eric Anholt --- 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_h +@@ -1098,8 +1098,10 @@ static int bcm2835_clock_on(struct clk_h return 0; } @@ -28,7 +28,7 @@ Signed-off-by: Eric Anholt { struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); struct bcm2835_cprman *cprman = clock->cprman; -@@ -1126,6 +1128,11 @@ static int bcm2835_clock_set_rate(struct +@@ -1121,6 +1123,11 @@ static int bcm2835_clock_set_rate(struct bcm2835_clock_wait_busy(clock); } @@ -40,7 +40,7 @@ Signed-off-by: Eric Anholt ctl &= ~CM_FRAC; ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0; cprman_write(cprman, data->ctl_reg, ctl); -@@ -1137,6 +1144,12 @@ static int bcm2835_clock_set_rate(struct +@@ -1132,6 +1139,12 @@ static int bcm2835_clock_set_rate(struct return 0; } @@ -53,7 +53,7 @@ Signed-off-by: Eric Anholt static bool bcm2835_clk_is_pllc(struct clk_hw *hw) { -@@ -1320,6 +1333,7 @@ static const struct clk_ops bcm2835_cloc +@@ -1315,6 +1328,7 @@ static const struct clk_ops bcm2835_cloc .unprepare = bcm2835_clock_off, .recalc_rate = bcm2835_clock_get_rate, .set_rate = bcm2835_clock_set_rate, @@ -61,7 +61,7 @@ Signed-off-by: Eric Anholt .determine_rate = bcm2835_clock_determine_rate, .set_parent = bcm2835_clock_set_parent, .get_parent = bcm2835_clock_get_parent, -@@ -1498,7 +1512,6 @@ static struct clk_hw *bcm2835_register_c +@@ -1493,7 +1507,6 @@ static struct clk_hw *bcm2835_register_c init.ops = &bcm2835_vpu_clock_clk_ops; } else { init.ops = &bcm2835_clock_clk_ops; diff --git a/target/linux/bcm27xx/patches-5.4/950-0218-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/bcm27xx/patches-5.4/950-0218-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch index 7efa6d533..9c0f2cdb8 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0218-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0218-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch @@ -81,7 +81,7 @@ Signed-off-by: Jonathan Bell extern int usb_driver_set_configuration(struct usb_device *udev, int config); --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -384,6 +384,11 @@ struct hc_driver { +@@ -382,6 +382,11 @@ struct hc_driver { * or bandwidth constraints. */ void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *); @@ -93,7 +93,7 @@ Signed-off-by: Jonathan Bell /* Returns the hardware-chosen device address */ int (*address_device)(struct usb_hcd *, struct usb_device *udev); /* prepares the hardware to send commands to the device */ -@@ -445,6 +450,8 @@ extern void usb_hcd_unmap_urb_setup_for_ +@@ -443,6 +448,8 @@ extern void usb_hcd_unmap_urb_setup_for_ extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *); extern void usb_hcd_flush_endpoint(struct usb_device *udev, struct usb_host_endpoint *ep); diff --git a/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index d69d14d91..ea99a9ae0 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1475,6 +1475,103 @@ command_cleanup: +@@ -1472,6 +1472,103 @@ command_cleanup: } /* @@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -5376,6 +5473,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5373,6 +5470,7 @@ static const struct hc_driver xhci_hc_dr .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, diff --git a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch index 947b00b39..cb57cae76 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -258,8 +258,10 @@ static void xhci_pci_quirks(struct devic +@@ -272,8 +272,10 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_BROKEN_STREAMS; if (pdev->vendor == PCI_VENDOR_ID_VIA && @@ -37,7 +37,7 @@ Signed-off-by: Jonathan Bell pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -550,7 +550,10 @@ void xhci_find_new_dequeue_state(struct +@@ -563,7 +563,10 @@ void xhci_find_new_dequeue_state(struct struct xhci_virt_ep *ep = &dev->eps[ep_index]; struct xhci_ring *ep_ring; struct xhci_segment *new_seg; @@ -48,7 +48,7 @@ Signed-off-by: Jonathan Bell dma_addr_t addr; u64 hw_dequeue; bool cycle_found = false; -@@ -588,7 +591,28 @@ void xhci_find_new_dequeue_state(struct +@@ -601,7 +604,28 @@ void xhci_find_new_dequeue_state(struct hw_dequeue = xhci_get_hw_deq(xhci, dev, ep_index, stream_id); new_seg = ep_ring->deq_seg; new_deq = ep_ring->dequeue; @@ -80,7 +80,7 @@ Signed-off-by: Jonathan Bell /* --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1877,6 +1877,7 @@ struct xhci_hcd { +@@ -1880,6 +1880,7 @@ struct xhci_hcd { #define XHCI_DEFAULT_PM_RUNTIME_ALLOW BIT_ULL(33) #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) diff --git a/target/linux/bcm27xx/patches-5.4/950-0267-clk-bcm2835-Avoid-null-pointer-exception.patch b/target/linux/bcm27xx/patches-5.4/950-0267-clk-bcm2835-Avoid-null-pointer-exception.patch index 8a529af7b..100474bf7 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0267-clk-bcm2835-Avoid-null-pointer-exception.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0267-clk-bcm2835-Avoid-null-pointer-exception.patch @@ -12,7 +12,7 @@ Signed-off-by: popcornmix --- 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 +@@ -2275,9 +2275,11 @@ static bool bcm2835_clk_is_claimed(const int i; for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) { diff --git a/target/linux/bcm27xx/patches-5.4/950-0293-xhci-Use-more-event-ring-segment-table-entries.patch b/target/linux/bcm27xx/patches-5.4/950-0293-xhci-Use-more-event-ring-segment-table-entries.patch index edddd313a..d03ce7ccc 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0293-xhci-Use-more-event-ring-segment-table-entries.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0293-xhci-Use-more-event-ring-segment-table-entries.patch @@ -47,7 +47,7 @@ Signed-off-by: Jonathan Bell val); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1653,8 +1653,8 @@ struct urb_priv { +@@ -1656,8 +1656,8 @@ struct urb_priv { * Each segment table entry is 4*32bits long. 1K seems like an ok size: * (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table, * meaning 64 ring segments. diff --git a/target/linux/bcm27xx/patches-5.4/950-0314-dma-direct-Temporary-DMA-fix-on-arm64.patch b/target/linux/bcm27xx/patches-5.4/950-0314-dma-direct-Temporary-DMA-fix-on-arm64.patch index 327a77c42..066b7f1bf 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0314-dma-direct-Temporary-DMA-fix-on-arm64.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0314-dma-direct-Temporary-DMA-fix-on-arm64.patch @@ -12,7 +12,7 @@ Signed-off-by: Phil Elwell --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c -@@ -398,7 +398,7 @@ int dma_direct_supported(struct device * +@@ -399,7 +399,7 @@ int dma_direct_supported(struct device * if (IS_ENABLED(CONFIG_ZONE_DMA)) min_mask = DMA_BIT_MASK(ARCH_ZONE_DMA_BITS); else diff --git a/target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch b/target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch index b3e237fdf..e323d9ff4 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch @@ -87,7 +87,7 @@ Signed-off-by: James Hughes (default "off") --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -267,6 +267,9 @@ static void bcm54xx_adjust_rxrefclk(stru +@@ -268,6 +268,9 @@ static void bcm54xx_adjust_rxrefclk(stru static int bcm54xx_config_init(struct phy_device *phydev) { int reg, err, val; @@ -97,7 +97,7 @@ Signed-off-by: James Hughes reg = phy_read(phydev, MII_BCM54XX_ECR); if (reg < 0) -@@ -318,6 +321,8 @@ static int bcm54xx_config_init(struct ph +@@ -319,6 +322,8 @@ static int bcm54xx_config_init(struct ph bcm54xx_phydsp_config(phydev); @@ -106,7 +106,7 @@ Signed-off-by: James Hughes /* Encode link speed into LED1 and LED3 pair (green/amber). * Also flash these two LEDs on activity. This means configuring * them for MULTICOLOR and encoding link/activity into them. -@@ -327,8 +332,8 @@ static int bcm54xx_config_init(struct ph +@@ -328,8 +333,8 @@ static int bcm54xx_config_init(struct ph bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val); val = BCM_LED_MULTICOLOR_IN_PHASE | diff --git a/target/linux/bcm27xx/patches-5.4/950-0341-net-phy-2711-Change-the-default-ethernet-LED-actions.patch b/target/linux/bcm27xx/patches-5.4/950-0341-net-phy-2711-Change-the-default-ethernet-LED-actions.patch index d76fd0ec0..555641827 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0341-net-phy-2711-Change-the-default-ethernet-LED-actions.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0341-net-phy-2711-Change-the-default-ethernet-LED-actions.patch @@ -11,7 +11,7 @@ releases. --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -268,7 +268,7 @@ static int bcm54xx_config_init(struct ph +@@ -269,7 +269,7 @@ static int bcm54xx_config_init(struct ph { int reg, err, val; u32 led_modes[] = {BCM_LED_MULTICOLOR_LINK_ACT, @@ -20,7 +20,7 @@ releases. struct device_node *np = phydev->mdio.dev.of_node; reg = phy_read(phydev, MII_BCM54XX_ECR); -@@ -323,10 +323,6 @@ static int bcm54xx_config_init(struct ph +@@ -324,10 +324,6 @@ static int bcm54xx_config_init(struct ph of_property_read_u32_array(np, "led-modes", led_modes, 2); diff --git a/target/linux/bcm27xx/patches-5.4/950-0347-clk-bcm2835-Disable-v3d-clock.patch b/target/linux/bcm27xx/patches-5.4/950-0347-clk-bcm2835-Disable-v3d-clock.patch index a7a5221fa..49a47c729 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0347-clk-bcm2835-Disable-v3d-clock.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0347-clk-bcm2835-Disable-v3d-clock.patch @@ -12,7 +12,7 @@ Signed-off-by: popcornmix --- 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 +@@ -1729,16 +1729,12 @@ static const struct bcm2835_clk_desc clk .hold_mask = CM_PLLA_HOLDCORE, .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), @@ -35,7 +35,7 @@ Signed-off-by: popcornmix [BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV( SOC_ALL, .name = "plla_dsi0", -@@ -2021,14 +2017,12 @@ static const struct bcm2835_clk_desc clk +@@ -2016,14 +2012,12 @@ static const struct bcm2835_clk_desc clk .int_bits = 6, .frac_bits = 0, .tcnt_mux = 3), diff --git a/target/linux/bcm27xx/patches-5.4/950-0364-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch b/target/linux/bcm27xx/patches-5.4/950-0364-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch index db9005534..6f0044a84 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0364-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0364-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch @@ -24,7 +24,7 @@ Signed-off-by: Stefan Wahren --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -635,22 +635,16 @@ +@@ -636,22 +636,16 @@ }; clocks { diff --git a/target/linux/bcm27xx/patches-5.4/950-0366-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch b/target/linux/bcm27xx/patches-5.4/950-0366-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch index 218a846fa..5be973835 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0366-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0366-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch @@ -78,7 +78,7 @@ Signed-off-by: Stefan Wahren arm-pmu { --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -432,18 +432,6 @@ +@@ -433,18 +433,6 @@ status = "disabled"; }; @@ -97,7 +97,7 @@ Signed-off-by: Stefan Wahren dpi: dpi@7e208000 { compatible = "brcm,bcm2835-dpi"; reg = <0x7e208000 0x8c>; -@@ -608,12 +596,6 @@ +@@ -609,12 +597,6 @@ status = "disabled"; }; diff --git a/target/linux/bcm27xx/patches-5.4/950-0389-Initialise-rpi-firmware-before-clk-bcm2835.patch b/target/linux/bcm27xx/patches-5.4/950-0389-Initialise-rpi-firmware-before-clk-bcm2835.patch index cdd5e7e9a..ec26bfbb7 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0389-Initialise-rpi-firmware-before-clk-bcm2835.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0389-Initialise-rpi-firmware-before-clk-bcm2835.patch @@ -25,7 +25,7 @@ Co-authored-by: Phil Elwell --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -2401,7 +2401,7 @@ static int __init __bcm2835_clk_driver_i +@@ -2396,7 +2396,7 @@ static int __init __bcm2835_clk_driver_i { return platform_driver_register(&bcm2835_clk_driver); } diff --git a/target/linux/bcm27xx/patches-5.4/950-0392-tty-amba-pl011-Add-un-throttle-support.patch b/target/linux/bcm27xx/patches-5.4/950-0392-tty-amba-pl011-Add-un-throttle-support.patch index ced0bf2b7..e08323759 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0392-tty-amba-pl011-Add-un-throttle-support.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0392-tty-amba-pl011-Add-un-throttle-support.patch @@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell static void pl011_stop_rx(struct uart_port *port) { struct uart_amba_port *uap = -@@ -2167,6 +2193,8 @@ static const struct uart_ops amba_pl011_ +@@ -2150,6 +2176,8 @@ static const struct uart_ops amba_pl011_ .stop_tx = pl011_stop_tx, .start_tx = pl011_start_tx, .stop_rx = pl011_stop_rx, diff --git a/target/linux/bcm27xx/patches-5.4/950-0411-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch b/target/linux/bcm27xx/patches-5.4/950-0411-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch index 403f534ba..9c3e59733 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0411-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0411-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch @@ -1771,7 +1771,7 @@ Signed-off-by: Phil Elwell compatible = "brcm,bcm2835-rng"; reg = <0x7e104000 0x10>; interrupts = <2 29>; -@@ -269,35 +212,6 @@ +@@ -270,35 +213,6 @@ brcm,function = ; }; @@ -1807,7 +1807,7 @@ Signed-off-by: Phil Elwell sdhost_gpio48: sdhost_gpio48 { brcm,pins = <48 49 50 51 52 53>; brcm,function = ; -@@ -379,7 +293,7 @@ +@@ -380,7 +294,7 @@ }; uart0: serial@7e201000 { @@ -1816,7 +1816,7 @@ Signed-off-by: Phil Elwell reg = <0x7e201000 0x200>; interrupts = <2 25>; clocks = <&clocks BCM2835_CLOCK_UART>, -@@ -393,8 +307,6 @@ +@@ -394,8 +308,6 @@ reg = <0x7e202000 0x100>; interrupts = <2 24>; clocks = <&clocks BCM2835_CLOCK_VPU>; @@ -1825,7 +1825,7 @@ Signed-off-by: Phil Elwell status = "disabled"; }; -@@ -402,10 +314,6 @@ +@@ -403,10 +315,6 @@ compatible = "brcm,bcm2835-i2s"; reg = <0x7e203000 0x24>; clocks = <&clocks BCM2835_CLOCK_PCM>; @@ -1836,7 +1836,7 @@ Signed-off-by: Phil Elwell status = "disabled"; }; -@@ -414,8 +322,6 @@ +@@ -415,8 +323,6 @@ reg = <0x7e204000 0x200>; interrupts = <2 22>; clocks = <&clocks BCM2835_CLOCK_VPU>; @@ -1845,7 +1845,7 @@ Signed-off-by: Phil Elwell #address-cells = <1>; #size-cells = <0>; status = "disabled"; -@@ -541,32 +447,6 @@ +@@ -542,32 +448,6 @@ status = "disabled"; }; @@ -1878,7 +1878,7 @@ Signed-off-by: Phil Elwell i2c1: i2c@7e804000 { compatible = "brcm,bcm2835-i2c"; reg = <0x7e804000 0x1000>; -@@ -577,16 +457,6 @@ +@@ -578,16 +458,6 @@ status = "disabled"; }; @@ -1895,7 +1895,7 @@ Signed-off-by: Phil Elwell vec: vec@7e806000 { compatible = "brcm,bcm2835-vec"; reg = <0x7e806000 0x1000>; -@@ -595,20 +465,6 @@ +@@ -596,20 +466,6 @@ status = "disabled"; }; @@ -1916,7 +1916,7 @@ Signed-off-by: Phil Elwell usb: usb@7e980000 { compatible = "brcm,bcm2835-usb"; reg = <0x7e980000 0x10000>; -@@ -620,10 +476,6 @@ +@@ -621,10 +477,6 @@ phys = <&usbphy>; phy-names = "usb2-phy"; }; diff --git a/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch b/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch index 127d4c51d..4fe3df06d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch @@ -65,7 +65,7 @@ Signed-off-by: Catalin Marinas arm64_dma32_phys_limit = max_zone_phys(32); --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h -@@ -334,13 +334,4 @@ struct vm_area_struct; +@@ -338,13 +338,4 @@ struct vm_area_struct; #endif /* __ASSEMBLY__ */ #include @@ -184,7 +184,7 @@ Signed-off-by: Catalin Marinas return GFP_DMA; if (*phys_mask <= DMA_BIT_MASK(32)) return GFP_DMA32; -@@ -396,7 +395,7 @@ int dma_direct_supported(struct device * +@@ -397,7 +396,7 @@ int dma_direct_supported(struct device * u64 min_mask; if (IS_ENABLED(CONFIG_ZONE_DMA)) diff --git a/target/linux/bcm27xx/patches-5.4/950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch b/target/linux/bcm27xx/patches-5.4/950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch index bbcb3aeed..2c9ed3534 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch @@ -82,7 +82,7 @@ Cc: linux-rockchip@lists.infradead.org --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c -@@ -1176,7 +1176,8 @@ static int advk_pcie_probe(struct platfo +@@ -1523,7 +1523,8 @@ static int advk_pcie_probe(struct platfo return ret; } @@ -402,7 +402,7 @@ Cc: linux-rockchip@lists.infradead.org } --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -2279,6 +2279,7 @@ struct irq_domain; +@@ -2282,6 +2282,7 @@ struct irq_domain; struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus); int pci_parse_request_of_pci_ranges(struct device *dev, struct list_head *resources, @@ -410,7 +410,7 @@ Cc: linux-rockchip@lists.infradead.org struct resource **bus_range); /* Arch may override this (weak) */ -@@ -2287,9 +2288,11 @@ struct device_node *pcibios_get_phb_of_n +@@ -2290,9 +2291,11 @@ struct device_node *pcibios_get_phb_of_n #else /* CONFIG_OF */ static inline struct irq_domain * pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; } diff --git a/target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch b/target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch index 2534b71b7..de53f028f 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch @@ -84,7 +84,7 @@ Tested-by: Marek Szyprowski --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c -@@ -326,7 +326,7 @@ static inline bool dma_direct_possible(s +@@ -327,7 +327,7 @@ static inline bool dma_direct_possible(s size_t size) { return swiotlb_force != SWIOTLB_FORCE && @@ -93,7 +93,7 @@ Tested-by: Marek Szyprowski } dma_addr_t dma_direct_map_page(struct device *dev, struct page *page, -@@ -375,7 +375,7 @@ dma_addr_t dma_direct_map_resource(struc +@@ -376,7 +376,7 @@ dma_addr_t dma_direct_map_resource(struc { dma_addr_t dma_addr = paddr; @@ -104,7 +104,7 @@ Tested-by: Marek Szyprowski } --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c -@@ -682,7 +682,7 @@ bool swiotlb_map(struct device *dev, phy +@@ -683,7 +683,7 @@ bool swiotlb_map(struct device *dev, phy /* Ensure that the address returned is DMA'ble */ *dma_addr = __phys_to_dma(dev, *phys); diff --git a/target/linux/bcm27xx/patches-5.4/950-0445-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch b/target/linux/bcm27xx/patches-5.4/950-0445-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch index 711d06fd5..2f99b22cd 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0445-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0445-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch @@ -187,7 +187,7 @@ Signed-off-by: Christoph Hellwig } --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c -@@ -900,7 +900,7 @@ static int ahci_configure_dma_masks(stru +@@ -901,7 +901,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 @@ -271,7 +271,7 @@ Signed-off-by: Christoph Hellwig u64 dma_direct_get_required_mask(struct device *dev); --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h -@@ -697,7 +697,7 @@ static inline int dma_coerce_mask_and_co +@@ -705,7 +705,7 @@ static inline int dma_coerce_mask_and_co */ static inline bool dma_addressing_limited(struct device *dev) { diff --git a/target/linux/bcm27xx/patches-5.4/950-0464-Add-support-for-merus-amp-soundcard-and-ma120x0p-cod.patch b/target/linux/bcm27xx/patches-5.4/950-0464-Add-support-for-merus-amp-soundcard-and-ma120x0p-cod.patch index 8e66bccf6..527bffbac 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0464-Add-support-for-merus-amp-soundcard-and-ma120x0p-cod.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0464-Add-support-for-merus-amp-soundcard-and-ma120x0p-cod.patch @@ -168,7 +168,7 @@ Signed-off-by: AMuszkat select SND_SOC_MAX98088 if I2C select SND_SOC_MAX98090 if I2C select SND_SOC_MAX98095 if I2C -@@ -732,6 +733,13 @@ config SND_SOC_LOCHNAGAR_SC +@@ -737,6 +738,13 @@ config SND_SOC_LOCHNAGAR_SC This driver support the sound card functionality of the Cirrus Logic Lochnagar audio development board. diff --git a/target/linux/bcm27xx/patches-5.4/950-0492-media-v4l-Add-definitions-for-HEVC-stateless-decodin.patch b/target/linux/bcm27xx/patches-5.4/950-0492-media-v4l-Add-definitions-for-HEVC-stateless-decodin.patch index effff9b74..f0c311d91 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0492-media-v4l-Add-definitions-for-HEVC-stateless-decodin.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0492-media-v4l-Add-definitions-for-HEVC-stateless-decodin.patch @@ -838,7 +838,7 @@ Signed-off-by: Mauro Carvalho Chehab break; --- 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 +@@ -1374,6 +1374,7 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_PIX_FMT_VP8_FRAME: descr = "VP8 Frame"; break; case V4L2_PIX_FMT_VP9: descr = "VP9"; break; case V4L2_PIX_FMT_HEVC: descr = "HEVC"; break; /* aka H.265 */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0499-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch b/target/linux/bcm27xx/patches-5.4/950-0499-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch index 5a309827e..e2e0ec72d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0499-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0499-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch @@ -278,7 +278,7 @@ Signed-off-by: Dave Stevenson pixfmt-nv24 --- 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 +@@ -1276,6 +1276,8 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_PIX_FMT_NV61M: descr = "Y/CrCb 4:2:2 (N-C)"; break; case V4L2_PIX_FMT_NV12MT: descr = "Y/CbCr 4:2:0 (64x32 MB, N-C)"; break; case V4L2_PIX_FMT_NV12MT_16X16: descr = "Y/CbCr 4:2:0 (16x16 MB, N-C)"; break; diff --git a/target/linux/bcm27xx/patches-5.4/950-0504-mmc-sdhci-Silence-MMC-warnings.patch b/target/linux/bcm27xx/patches-5.4/950-0504-mmc-sdhci-Silence-MMC-warnings.patch index 89fd58dca..bf1507158 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0504-mmc-sdhci-Silence-MMC-warnings.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0504-mmc-sdhci-Silence-MMC-warnings.patch @@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard #define MAX_TUNING_LOOP 40 -@@ -2762,7 +2762,7 @@ static void sdhci_timeout_timer(struct t +@@ -2780,7 +2780,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 mmc_hostname(host->mmc)); sdhci_dumpregs(host); -@@ -2784,7 +2784,7 @@ static void sdhci_timeout_data_timer(str +@@ -2802,7 +2802,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.4/950-0641-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch b/target/linux/bcm27xx/patches-5.4/950-0641-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch index 69414e381..3fa056258 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0641-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0641-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch @@ -65,7 +65,7 @@ Signed-off-by: Naushir Patuck + --- 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 +@@ -1350,6 +1350,7 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_META_FMT_VSP1_HGT: descr = "R-Car VSP1 2-D Histogram"; break; case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break; case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break; diff --git a/target/linux/bcm27xx/patches-5.4/950-0658-dt-Implement-an-I2C-pinctrl-mux-for-BSC0.patch b/target/linux/bcm27xx/patches-5.4/950-0658-dt-Implement-an-I2C-pinctrl-mux-for-BSC0.patch index 002ad8686..4adbd3ab7 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0658-dt-Implement-an-I2C-pinctrl-mux-for-BSC0.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0658-dt-Implement-an-I2C-pinctrl-mux-for-BSC0.patch @@ -392,7 +392,7 @@ Signed-off-by: Dave Stevenson +}; --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -340,7 +340,7 @@ +@@ -341,7 +341,7 @@ status = "disabled"; }; @@ -401,7 +401,7 @@ Signed-off-by: Dave Stevenson compatible = "brcm,bcm2835-i2c"; reg = <0x7e205000 0x200>; interrupts = <2 21>; -@@ -350,6 +350,30 @@ +@@ -351,6 +351,30 @@ status = "disabled"; }; diff --git a/target/linux/bcm27xx/patches-5.4/950-0669-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch b/target/linux/bcm27xx/patches-5.4/950-0669-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch index 082dff510..d3404b853 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0669-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0669-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch @@ -74,7 +74,7 @@ Signed-off-by: Naushir Patuck + --- 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 +@@ -1351,6 +1351,7 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break; case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break; case V4L2_META_FMT_SENSOR_DATA: descr = "Sensor Ancillary Metadata"; break; diff --git a/target/linux/bcm27xx/patches-5.4/950-0718-udmabuf-add-a-pointer-to-the-miscdevice-in-dma-buf-p.patch b/target/linux/bcm27xx/patches-5.4/950-0718-udmabuf-add-a-pointer-to-the-miscdevice-in-dma-buf-p.patch index 68feae3d4..b5ae5052b 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0718-udmabuf-add-a-pointer-to-the-miscdevice-in-dma-buf-p.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0718-udmabuf-add-a-pointer-to-the-miscdevice-in-dma-buf-p.patch @@ -39,7 +39,7 @@ Signed-off-by: Gerd Hoffmann { DEFINE_DMA_BUF_EXPORT_INFO(exp_info); struct file *memfd = NULL; -@@ -172,6 +174,7 @@ static long udmabuf_create(const struct +@@ -176,6 +178,7 @@ static long udmabuf_create(const struct exp_info.priv = ubuf; exp_info.flags = O_RDWR; @@ -47,7 +47,7 @@ Signed-off-by: Gerd Hoffmann buf = dma_buf_export(&exp_info); if (IS_ERR(buf)) { ret = PTR_ERR(buf); -@@ -209,7 +212,7 @@ static long udmabuf_ioctl_create(struct +@@ -213,7 +216,7 @@ static long udmabuf_ioctl_create(struct list.offset = create.offset; list.size = create.size; @@ -56,7 +56,7 @@ Signed-off-by: Gerd Hoffmann } static long udmabuf_ioctl_create_list(struct file *filp, unsigned long arg) -@@ -228,7 +231,7 @@ static long udmabuf_ioctl_create_list(st +@@ -232,7 +235,7 @@ static long udmabuf_ioctl_create_list(st if (IS_ERR(list)) return PTR_ERR(list); diff --git a/target/linux/bcm27xx/patches-5.4/950-0803-media-rcar-csi2-Negotiate-data-lanes-number.patch b/target/linux/bcm27xx/patches-5.4/950-0803-media-rcar-csi2-Negotiate-data-lanes-number.patch index f54b33e59..f3b298de4 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0803-media-rcar-csi2-Negotiate-data-lanes-number.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0803-media-rcar-csi2-Negotiate-data-lanes-number.patch @@ -44,7 +44,7 @@ Signed-off-by: Jacopo Mondi if ((rcsi2_read(priv, PHCLM_REG) & PHCLM_STOPSTATECKL) && (rcsi2_read(priv, PHDLM_REG) & lane_mask) == lane_mask) -@@ -445,7 +447,8 @@ static int rcsi2_set_phypll(struct rcar_ +@@ -452,7 +454,8 @@ static int rcsi2_set_phypll(struct rcar_ return 0; } @@ -54,7 +54,7 @@ Signed-off-by: Jacopo Mondi { struct v4l2_subdev *source; struct v4l2_ctrl *ctrl; -@@ -470,15 +473,63 @@ static int rcsi2_calc_mbps(struct rcar_c +@@ -477,15 +480,63 @@ static int rcsi2_calc_mbps(struct rcar_c * bps = link_freq * 2 */ mbps = v4l2_ctrl_g_ctrl_int64(ctrl) * bpp; @@ -119,7 +119,7 @@ Signed-off-by: Jacopo Mondi unsigned int i; int mbps, ret; -@@ -520,10 +571,18 @@ static int rcsi2_start_receiver(struct r +@@ -529,10 +580,18 @@ static int rcsi2_start_receiver(struct r fld |= FLD_FLD_NUM(1); } @@ -140,7 +140,7 @@ Signed-off-by: Jacopo Mondi if (mbps < 0) return mbps; -@@ -570,7 +629,7 @@ static int rcsi2_start_receiver(struct r +@@ -579,7 +638,7 @@ static int rcsi2_start_receiver(struct r rcsi2_write(priv, PHYCNT_REG, phycnt | PHYCNT_SHUTDOWNZ); rcsi2_write(priv, PHYCNT_REG, phycnt | PHYCNT_SHUTDOWNZ | PHYCNT_RSTZ); @@ -149,7 +149,7 @@ Signed-off-by: Jacopo Mondi if (ret) return ret; -@@ -747,6 +806,7 @@ static int rcsi2_notify_bound(struct v4l +@@ -756,6 +815,7 @@ static int rcsi2_notify_bound(struct v4l } priv->remote = subdev; diff --git a/target/linux/bcm27xx/patches-5.4/950-0844-media-v4l-Add-14-bit-raw-bayer-pixel-formats.patch b/target/linux/bcm27xx/patches-5.4/950-0844-media-v4l-Add-14-bit-raw-bayer-pixel-formats.patch index 1bb9a932a..4717f0dbc 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0844-media-v4l-Add-14-bit-raw-bayer-pixel-formats.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0844-media-v4l-Add-14-bit-raw-bayer-pixel-formats.patch @@ -125,7 +125,7 @@ Signed-off-by: Mauro Carvalho Chehab + - R\ :sub:`33high` --- 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 +@@ -1316,6 +1316,10 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_PIX_FMT_SGBRG12P: descr = "12-bit Bayer GBGB/RGRG Packed"; break; case V4L2_PIX_FMT_SGRBG12P: descr = "12-bit Bayer GRGR/BGBG Packed"; break; case V4L2_PIX_FMT_SRGGB12P: descr = "12-bit Bayer RGRG/GBGB Packed"; break; diff --git a/target/linux/bcm27xx/patches-5.4/950-0845-media-v4l-Add-14-bit-raw-greyscale-pixel-format.patch b/target/linux/bcm27xx/patches-5.4/950-0845-media-v4l-Add-14-bit-raw-greyscale-pixel-format.patch index 191066859..52bff95e5 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0845-media-v4l-Add-14-bit-raw-greyscale-pixel-format.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0845-media-v4l-Add-14-bit-raw-greyscale-pixel-format.patch @@ -111,7 +111,7 @@ Signed-off-by: Mauro Carvalho Chehab pixfmt-y16 --- 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 +@@ -1230,6 +1230,7 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_PIX_FMT_Y6: descr = "6-bit Greyscale"; break; case V4L2_PIX_FMT_Y10: descr = "10-bit Greyscale"; break; case V4L2_PIX_FMT_Y12: descr = "12-bit Greyscale"; break; diff --git a/target/linux/bcm27xx/patches-5.4/950-0847-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch b/target/linux/bcm27xx/patches-5.4/950-0847-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch index b5d407b20..1f562bc1c 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0847-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0847-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch @@ -75,7 +75,7 @@ Signed-off-by: Dave Stevenson pixfmt-y10p --- 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 +@@ -1235,6 +1235,7 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_PIX_FMT_Y16_BE: descr = "16-bit Greyscale BE"; break; case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break; case V4L2_PIX_FMT_Y10P: descr = "10-bit Greyscale (MIPI Packed)"; break; diff --git a/target/linux/bcm27xx/patches-5.4/950-0848-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch b/target/linux/bcm27xx/patches-5.4/950-0848-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch index f8b255f15..4aefd822e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0848-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0848-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch @@ -84,7 +84,7 @@ Signed-off-by: Dave Stevenson pixfmt-y16 --- 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 +@@ -1236,6 +1236,7 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break; case V4L2_PIX_FMT_Y10P: descr = "10-bit Greyscale (MIPI Packed)"; break; case V4L2_PIX_FMT_Y12P: descr = "12-bit Greyscale (MIPI Packed)"; break; diff --git a/target/linux/bcm27xx/patches-5.4/950-0877-Bluetooth-hci_bcm-Add-compatible-string-for-BCM43540.patch b/target/linux/bcm27xx/patches-5.4/950-0877-Bluetooth-hci_bcm-Add-compatible-string-for-BCM43540.patch index f429b15a8..f42d990f7 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0877-Bluetooth-hci_bcm-Add-compatible-string-for-BCM43540.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0877-Bluetooth-hci_bcm-Add-compatible-string-for-BCM43540.patch @@ -18,7 +18,7 @@ Signed-off-by: Marcel Holtmann --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c -@@ -1427,6 +1427,7 @@ static const struct of_device_id bcm_blu +@@ -1432,6 +1432,7 @@ static const struct of_device_id bcm_blu { .compatible = "brcm,bcm4345c5" }, { .compatible = "brcm,bcm4330-bt" }, { .compatible = "brcm,bcm43438-bt" }, diff --git a/target/linux/bcm27xx/patches-5.4/950-0878-Bluetooth-btbcm-Add-entry-for-BCM4335A0-UART-bluetoo.patch b/target/linux/bcm27xx/patches-5.4/950-0878-Bluetooth-btbcm-Add-entry-for-BCM4335A0-UART-bluetoo.patch index e2ad19b67..9ddd761f0 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0878-Bluetooth-btbcm-Add-entry-for-BCM4335A0-UART-bluetoo.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0878-Bluetooth-btbcm-Add-entry-for-BCM4335A0-UART-bluetoo.patch @@ -48,7 +48,7 @@ Signed-off-by: Marcel Holtmann --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c -@@ -1428,6 +1428,7 @@ static const struct of_device_id bcm_blu +@@ -1433,6 +1433,7 @@ static const struct of_device_id bcm_blu { .compatible = "brcm,bcm4330-bt" }, { .compatible = "brcm,bcm43438-bt" }, { .compatible = "brcm,bcm43540-bt" }, diff --git a/target/linux/bcm27xx/patches-5.4/950-0879-Bluetooth-hci_bcm-Disallow-set_baudrate-for-BCM4354.patch b/target/linux/bcm27xx/patches-5.4/950-0879-Bluetooth-hci_bcm-Disallow-set_baudrate-for-BCM4354.patch index da8f37b3d..5c4fe60ed 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0879-Bluetooth-hci_bcm-Disallow-set_baudrate-for-BCM4354.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0879-Bluetooth-hci_bcm-Disallow-set_baudrate-for-BCM4354.patch @@ -76,7 +76,7 @@ Signed-off-by: Johan Hedberg else if (hu->proto->oper_speed) speed = hu->proto->oper_speed; else -@@ -1377,6 +1395,7 @@ static struct platform_driver bcm_driver +@@ -1382,6 +1400,7 @@ static struct platform_driver bcm_driver static int bcm_serdev_probe(struct serdev_device *serdev) { struct bcm_device *bcmdev; @@ -84,7 +84,7 @@ Signed-off-by: Johan Hedberg int err; bcmdev = devm_kzalloc(&serdev->dev, sizeof(*bcmdev), GFP_KERNEL); -@@ -1411,6 +1430,10 @@ static int bcm_serdev_probe(struct serde +@@ -1416,6 +1435,10 @@ static int bcm_serdev_probe(struct serde if (err) dev_err(&serdev->dev, "Failed to power down\n"); @@ -95,7 +95,7 @@ Signed-off-by: Johan Hedberg return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto); } -@@ -1422,12 +1445,16 @@ static void bcm_serdev_remove(struct ser +@@ -1427,12 +1450,16 @@ static void bcm_serdev_remove(struct ser } #ifdef CONFIG_OF diff --git a/target/linux/bcm27xx/patches-5.4/950-0881-Bluetooth-hci_bcm-Support-pcm-params-in-dts.patch b/target/linux/bcm27xx/patches-5.4/950-0881-Bluetooth-hci_bcm-Support-pcm-params-in-dts.patch index fa2de56bf..84f93dd3e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0881-Bluetooth-hci_bcm-Support-pcm-params-in-dts.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0881-Bluetooth-hci_bcm-Support-pcm-params-in-dts.patch @@ -52,9 +52,9 @@ Signed-off-by: Johan Hedberg return 0; } -@@ -1149,6 +1162,9 @@ static int bcm_probe(struct platform_dev - dev->dev = &pdev->dev; - dev->irq = platform_get_irq(pdev, 0); +@@ -1154,6 +1167,9 @@ static int bcm_probe(struct platform_dev + + dev->irq = ret; + /* Initialize routing field to an unused value */ + dev->pcm_int_params[0] = 0xff; @@ -62,7 +62,7 @@ Signed-off-by: Johan Hedberg if (has_acpi_companion(&pdev->dev)) { ret = bcm_acpi_probe(dev); if (ret) -@@ -1409,6 +1425,9 @@ static int bcm_serdev_probe(struct serde +@@ -1414,6 +1430,9 @@ static int bcm_serdev_probe(struct serde bcmdev->serdev_hu.serdev = serdev; serdev_device_set_drvdata(serdev, bcmdev); diff --git a/target/linux/bcm27xx/patches-5.4/950-0882-Bluetooth-hci_bcm-Drive-RTS-only-for-BCM43438.patch b/target/linux/bcm27xx/patches-5.4/950-0882-Bluetooth-hci_bcm-Drive-RTS-only-for-BCM43438.patch index 507f21ab6..e92d22239 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0882-Bluetooth-hci_bcm-Drive-RTS-only-for-BCM43438.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0882-Bluetooth-hci_bcm-Drive-RTS-only-for-BCM43438.patch @@ -61,7 +61,7 @@ Signed-off-by: Marcel Holtmann if (err) goto err_unset_hu; } -@@ -1450,8 +1457,10 @@ static int bcm_serdev_probe(struct serde +@@ -1455,8 +1462,10 @@ static int bcm_serdev_probe(struct serde dev_err(&serdev->dev, "Failed to power down\n"); data = device_get_match_data(bcmdev->dev); @@ -73,7 +73,7 @@ Signed-off-by: Marcel Holtmann return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto); } -@@ -1468,11 +1477,15 @@ static struct bcm_device_data bcm4354_de +@@ -1473,11 +1482,15 @@ static struct bcm_device_data bcm4354_de .no_early_set_baudrate = true, }; diff --git a/target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch b/target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch index 88a3c6be9..ba81518b4 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch @@ -94,7 +94,7 @@ Signed-off-by: Phil Elwell #include