diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-18 23:51:48 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-19 22:47:17 +0200 |
| commit | a1d50e7b45080f60a0066e9ca88ad756480dd1f8 (patch) | |
| tree | 22dcfbbc4fc62d12483e9ffb961385d2da9993f3 /target | |
| parent | 88c8d0a2193bd3dd2cf00bc875def6155f2e34db (diff) | |
| download | upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.gz upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.bz2 upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.zip | |
kernel: bump 5.4 to 5.4.132
Manually rebased
layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch
All others updated automatically.
Compile-tested on: ramips/mt7621
Runtime-tested on: ramips/mt7621
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target')
41 files changed, 129 insertions, 129 deletions
diff --git a/target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch b/target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch index 0ffa12eec0..81b23e863e 100644 --- a/target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch +++ b/target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch @@ -9,7 +9,7 @@ struct fis_image_desc { unsigned char name[16]; // Null terminated name uint32_t flash_base; // Address within FLASH of image -@@ -67,6 +69,7 @@ static int parse_redboot_partitions(stru +@@ -72,6 +74,7 @@ static int parse_redboot_partitions(stru const struct mtd_partition **pparts, struct mtd_part_parser_data *data) { @@ -17,7 +17,7 @@ int nrparts = 0; struct fis_image_desc *buf; struct mtd_partition *parts; -@@ -234,14 +237,15 @@ static int parse_redboot_partitions(stru +@@ -239,14 +242,15 @@ static int parse_redboot_partitions(stru } } #endif @@ -35,7 +35,7 @@ #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED if (nulllen > 0) { strcpy(nullname, nullstring); -@@ -260,6 +264,8 @@ static int parse_redboot_partitions(stru +@@ -265,6 +269,8 @@ static int parse_redboot_partitions(stru } #endif for ( ; i<nrparts; i++) { @@ -44,7 +44,7 @@ parts[i].size = fl->img->size; parts[i].offset = fl->img->flash_base; parts[i].name = names; -@@ -293,6 +299,13 @@ static int parse_redboot_partitions(stru +@@ -298,6 +304,13 @@ static int parse_redboot_partitions(stru fl = fl->next; kfree(tmp_fl); } diff --git a/target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch b/target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch index 3302d6d247..343eedc075 100644 --- a/target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch +++ b/target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -88,12 +88,18 @@ static int parse_redboot_partitions(stru +@@ -93,12 +93,18 @@ static int parse_redboot_partitions(stru parse_redboot_of(master); @@ -19,7 +19,7 @@ return -EIO; } offset -= master->erasesize; -@@ -106,10 +112,6 @@ static int parse_redboot_partitions(stru +@@ -111,10 +117,6 @@ static int parse_redboot_partitions(stru goto nogood; } } @@ -30,7 +30,7 @@ printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", master->name, offset); -@@ -182,6 +184,11 @@ static int parse_redboot_partitions(stru +@@ -187,6 +189,11 @@ static int parse_redboot_partitions(stru } if (i == numslots) { /* Didn't find it */ diff --git a/target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch b/target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch index 2ac0eb92bf..55cf84eeff 100644 --- a/target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch +++ b/target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -65,6 +65,22 @@ static void parse_redboot_of(struct mtd_ +@@ -70,6 +70,22 @@ static void parse_redboot_of(struct mtd_ directory = dirblock; } @@ -23,7 +23,7 @@ static int parse_redboot_partitions(struct mtd_info *master, const struct mtd_partition **pparts, struct mtd_part_parser_data *data) -@@ -81,6 +97,7 @@ static int parse_redboot_partitions(stru +@@ -86,6 +102,7 @@ static int parse_redboot_partitions(stru int namelen = 0; int nulllen = 0; int numslots; @@ -31,7 +31,7 @@ unsigned long offset; #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED static char nullstring[] = "unallocated"; -@@ -195,7 +212,10 @@ static int parse_redboot_partitions(stru +@@ -200,7 +217,10 @@ static int parse_redboot_partitions(stru goto out; } @@ -43,7 +43,7 @@ struct fis_list *new_fl, **prev; if (buf[i].name[0] == 0xff) { -@@ -271,12 +291,13 @@ static int parse_redboot_partitions(stru +@@ -276,12 +296,13 @@ static int parse_redboot_partitions(stru } #endif for ( ; i<nrparts; i++) { @@ -59,7 +59,7 @@ strcpy(names, fl->img->name); #ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY if (!memcmp(names, "RedBoot", 8) || -@@ -306,7 +327,9 @@ static int parse_redboot_partitions(stru +@@ -311,7 +332,9 @@ static int parse_redboot_partitions(stru fl = fl->next; kfree(tmp_fl); } diff --git a/target/linux/ath79/patches-5.4/0003-leds-add-reset-controller-based-driver.patch b/target/linux/ath79/patches-5.4/0003-leds-add-reset-controller-based-driver.patch index 3249e1e82b..32a122fabe 100644 --- a/target/linux/ath79/patches-5.4/0003-leds-add-reset-controller-based-driver.patch +++ b/target/linux/ath79/patches-5.4/0003-leds-add-reset-controller-based-driver.patch @@ -13,7 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org> --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -823,6 +823,17 @@ config LEDS_LM36274 +@@ -824,6 +824,17 @@ config LEDS_LM36274 Say Y to enable the LM36274 LED driver for TI LMU devices. This supports the LED device LM36274. diff --git a/target/linux/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch b/target/linux/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch index 8f3ee32f57..e5b06e14a5 100644 --- a/target/linux/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch +++ b/target/linux/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -85,12 +85,18 @@ static int parse_redboot_partitions(stru +@@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru parse_redboot_of(master); @@ -19,7 +19,7 @@ return -EIO; } offset -= master->erasesize; -@@ -103,10 +109,6 @@ static int parse_redboot_partitions(stru +@@ -108,10 +114,6 @@ static int parse_redboot_partitions(stru goto nogood; } } @@ -30,7 +30,7 @@ printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", master->name, offset); -@@ -179,6 +181,11 @@ static int parse_redboot_partitions(stru +@@ -184,6 +186,11 @@ static int parse_redboot_partitions(stru } if (i == numslots) { /* Didn't find it */ diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch index 2440fbbb73..99520863d3 100644 --- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch @@ -267,7 +267,7 @@ case IPV6_2292HOPOPTS: --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c -@@ -752,7 +752,7 @@ static bool ipv6_hop_jumbo(struct sk_buf +@@ -751,7 +751,7 @@ static bool ipv6_hop_jumbo(struct sk_buf goto drop; } diff --git a/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch index 5540b8ae3a..60f8bdff79 100644 --- a/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch +++ b/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch @@ -23,7 +23,7 @@ +obj-$(CONFIG_MFD_RB4XX_CPLD) += rb4xx-cpld.o --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig -@@ -1406,6 +1406,12 @@ config GPIO_SODAVILLE +@@ -1408,6 +1408,12 @@ config GPIO_SODAVILLE help Say Y here to support Intel Sodaville GPIO. 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 a9f99add60..f70887855b 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 @@ -222,7 +222,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com> static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); -@@ -2884,6 +2891,7 @@ static int mmc_blk_probe(struct mmc_card +@@ -2892,6 +2899,7 @@ static int mmc_blk_probe(struct mmc_card { struct mmc_blk_data *md, *part_md; char cap_str[10]; @@ -230,7 +230,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com> /* * Check that the card supports the command class(es) we need. -@@ -2891,7 +2899,16 @@ static int mmc_blk_probe(struct mmc_card +@@ -2899,7 +2907,16 @@ static int mmc_blk_probe(struct mmc_card if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -248,7 +248,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com> card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -2906,9 +2923,14 @@ static int mmc_blk_probe(struct mmc_card +@@ -2914,9 +2931,14 @@ static int mmc_blk_probe(struct mmc_card string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2, cap_str, sizeof(cap_str)); diff --git a/target/linux/bcm27xx/patches-5.4/950-0153-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch b/target/linux/bcm27xx/patches-5.4/950-0153-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch index 2357c878d7..ef2193f4de 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0153-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0153-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch @@ -47,7 +47,7 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> switch (state->csi_lanes_in_use) { case 1: -@@ -2054,6 +2063,7 @@ static int tc358743_probe(struct i2c_cli +@@ -2055,6 +2064,7 @@ static int tc358743_probe(struct i2c_cli if (pdata) { state->pdata = *pdata; state->bus.flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; diff --git a/target/linux/bcm27xx/patches-5.4/950-0154-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch b/target/linux/bcm27xx/patches-5.4/950-0154-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch index 18ee169b1c..7166232c40 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0154-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0154-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch @@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> */ bps_pr_lane = 2 * endpoint.link_frequencies[0]; if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) { -@@ -1990,23 +1991,41 @@ static int tc358743_probe_of(struct tc35 +@@ -1991,23 +1992,41 @@ static int tc358743_probe_of(struct tc35 state->pdata.refclk_hz * state->pdata.pll_prd; /* diff --git a/target/linux/bcm27xx/patches-5.4/950-0155-media-tc358743-Check-I2C-succeeded-during-probe.patch b/target/linux/bcm27xx/patches-5.4/950-0155-media-tc358743-Check-I2C-succeeded-during-probe.patch index 653602b306..1a26997c36 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0155-media-tc358743-Check-I2C-succeeded-during-probe.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0155-media-tc358743-Check-I2C-succeeded-during-probe.patch @@ -78,7 +78,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val) { i2c_wrreg(sd, reg, val, 2); -@@ -2064,6 +2081,7 @@ static int tc358743_probe(struct i2c_cli +@@ -2065,6 +2082,7 @@ static int tc358743_probe(struct i2c_cli struct tc358743_platform_data *pdata = client->dev.platform_data; struct v4l2_subdev *sd; u16 irq_mask = MASK_HDMI_MSK | MASK_CSI_MSK; @@ -86,7 +86,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> int err; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) -@@ -2096,7 +2114,8 @@ static int tc358743_probe(struct i2c_cli +@@ -2097,7 +2115,8 @@ static int tc358743_probe(struct i2c_cli sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; /* i2c access */ 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 20bab47514..25c23a8257 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 @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2512,9 +2512,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2513,9 +2513,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, * Event ring setup: Allocate a normal ring, but also setup * the event ring segment table (ERST). Section 4.9.3. */ @@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> if (!xhci->event_ring) goto fail; if (xhci_check_trb_in_td_math(xhci) < 0) -@@ -2527,7 +2529,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2528,7 +2530,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, /* set ERST count with the number of entries in the segment table */ val = readl(&xhci->ir_set->erst_size); val &= ERST_SIZE_MASK; diff --git a/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch b/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch index 4e9598a54e..e3cf7bb9e1 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c -@@ -1249,6 +1249,8 @@ static int c_show(struct seq_file *m, vo +@@ -1251,6 +1251,8 @@ static int c_show(struct seq_file *m, vo { int i, j; u32 cpuid; @@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> for_each_online_cpu(i) { /* -@@ -1308,6 +1310,14 @@ static int c_show(struct seq_file *m, vo +@@ -1310,6 +1312,14 @@ static int c_show(struct seq_file *m, vo seq_printf(m, "Revision\t: %04x\n", system_rev); seq_printf(m, "Serial\t\t: %s\n", system_serial); 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 d968e93153..344e1ee37e 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 @@ -198,7 +198,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de> return 0; --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c -@@ -404,8 +404,7 @@ static dma_addr_t iommu_dma_alloc_iova(s +@@ -406,8 +406,7 @@ static dma_addr_t iommu_dma_alloc_iova(s if (iova_len < (1 << (IOVA_RANGE_CACHE_MAX_SIZE - 1))) iova_len = roundup_pow_of_two(iova_len); diff --git a/target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch index 05fa9f8f2e..8e85d6e29f 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch @@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -3116,6 +3116,7 @@ static int __spi_validate_bits_per_word( +@@ -3117,6 +3117,7 @@ static int __spi_validate_bits_per_word( */ int spi_setup(struct spi_device *spi) { @@ -31,7 +31,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> unsigned bad_bits, ugly_bits; int status; -@@ -3133,6 +3134,14 @@ int spi_setup(struct spi_device *spi) +@@ -3134,6 +3135,14 @@ int spi_setup(struct spi_device *spi) (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL | SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL))) return -EINVAL; diff --git a/target/linux/bcm27xx/patches-5.4/950-0690-SQUASH-spi-Demote-SPI_CS_HIGH-warning-to-KERN_DEBUG.patch b/target/linux/bcm27xx/patches-5.4/950-0690-SQUASH-spi-Demote-SPI_CS_HIGH-warning-to-KERN_DEBUG.patch index b821afb08b..641d768890 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0690-SQUASH-spi-Demote-SPI_CS_HIGH-warning-to-KERN_DEBUG.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0690-SQUASH-spi-Demote-SPI_CS_HIGH-warning-to-KERN_DEBUG.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -3128,8 +3128,8 @@ int spi_setup(struct spi_device *spi) +@@ -3129,8 +3129,8 @@ int spi_setup(struct spi_device *spi) if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods && ctlr->cs_gpiods[spi->chip_select] && !(spi->mode & SPI_CS_HIGH)) { diff --git a/target/linux/bcm27xx/patches-5.4/950-0698-media-i2c-tc358743-Fix-fallthrough-warning.patch b/target/linux/bcm27xx/patches-5.4/950-0698-media-i2c-tc358743-Fix-fallthrough-warning.patch index 26c1f95bf2..1a892b7d3c 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0698-media-i2c-tc358743-Fix-fallthrough-warning.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0698-media-i2c-tc358743-Fix-fallthrough-warning.patch @@ -10,7 +10,7 @@ Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com> --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c -@@ -2004,6 +2004,7 @@ static int tc358743_probe_of(struct tc35 +@@ -2005,6 +2005,7 @@ static int tc358743_probe_of(struct tc35 switch (bps_pr_lane) { default: dev_warn(dev, "untested bps per lane: %u bps\n", bps_pr_lane); 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 185e8eb493..7206bad51d 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 <phil@raspberrypi.com> #include <video/mipi_display.h> #include "fbtft.h" -@@ -1200,6 +1201,7 @@ static struct fbtft_platform_data *fbtft +@@ -1199,6 +1200,7 @@ static struct fbtft_platform_data *fbtft * @display: Display properties * @sdev: SPI device * @pdev: Platform device @@ -102,7 +102,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> * * Allocates, initializes and registers a framebuffer * -@@ -1209,12 +1211,15 @@ static struct fbtft_platform_data *fbtft +@@ -1208,12 +1210,15 @@ static struct fbtft_platform_data *fbtft */ int fbtft_probe_common(struct fbtft_display *display, struct spi_device *sdev, @@ -119,7 +119,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> int ret; if (sdev) -@@ -1230,6 +1235,14 @@ int fbtft_probe_common(struct fbtft_disp +@@ -1229,6 +1234,14 @@ int fbtft_probe_common(struct fbtft_disp pdata = fbtft_probe_dt(dev); if (IS_ERR(pdata)) return PTR_ERR(pdata); diff --git a/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch index f57950b44a..5a9532c321 100644 --- a/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch +++ b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch @@ -23,7 +23,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> .width = 2, --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -79,6 +79,7 @@ static int parse_redboot_partitions(stru +@@ -84,6 +84,7 @@ static int parse_redboot_partitions(stru int nulllen = 0; int numslots; unsigned long offset; @@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED static char nullstring[] = "unallocated"; #endif -@@ -185,6 +186,16 @@ static int parse_redboot_partitions(stru +@@ -190,6 +191,16 @@ static int parse_redboot_partitions(stru goto out; } @@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> for (i = 0; i < numslots; i++) { struct fis_list *new_fl, **prev; -@@ -205,10 +216,10 @@ static int parse_redboot_partitions(stru +@@ -210,10 +221,10 @@ static int parse_redboot_partitions(stru goto out; } new_fl->img = &buf[i]; diff --git a/target/linux/generic/hack-5.4/204-module_strip.patch b/target/linux/generic/hack-5.4/204-module_strip.patch index 22bb1ac33a..c6420739c0 100644 --- a/target/linux/generic/hack-5.4/204-module_strip.patch +++ b/target/linux/generic/hack-5.4/204-module_strip.patch @@ -96,7 +96,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/init/Kconfig +++ b/init/Kconfig -@@ -2195,6 +2195,13 @@ config TRIM_UNUSED_KSYMS +@@ -2198,6 +2198,13 @@ config TRIM_UNUSED_KSYMS If unsure, or if you need to build out-of-tree modules, say N. @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3252,9 +3252,11 @@ static int setup_load_info(struct load_i +@@ -3256,9 +3256,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3275,6 +3277,7 @@ static int check_modinfo(struct module * +@@ -3279,6 +3281,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-5.4/221-module_exports.patch b/target/linux/generic/hack-5.4/221-module_exports.patch index ef6e980892..0f7840b8d8 100644 --- a/target/linux/generic/hack-5.4/221-module_exports.patch +++ b/target/linux/generic/hack-5.4/221-module_exports.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/scripts/Makefile.build +++ b/scripts/Makefile.build -@@ -349,7 +349,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $( +@@ -350,7 +350,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $( # Linker scripts preprocessor (.lds.S -> .lds) # --------------------------------------------------------------------------- quiet_cmd_cpp_lds_S = LDS $@ diff --git a/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch index 6d0a54c01d..cdeac45f86 100644 --- a/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h -@@ -603,12 +603,13 @@ extern struct Qdisc_ops noop_qdisc_ops; +@@ -615,12 +615,13 @@ extern struct Qdisc_ops noop_qdisc_ops; extern struct Qdisc_ops pfifo_fast_ops; extern struct Qdisc_ops mq_qdisc_ops; extern struct Qdisc_ops noqueue_qdisc_ops; diff --git a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch index c4c13b9695..68a2d4d88f 100644 --- a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/init/Kconfig +++ b/init/Kconfig -@@ -1277,6 +1277,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW +@@ -1280,6 +1280,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW the unaligned access emulation. see arch/parisc/kernel/unaligned.c for reference diff --git a/target/linux/generic/pending-5.4/205-backtrace_module_info.patch b/target/linux/generic/pending-5.4/205-backtrace_module_info.patch index 39a4365113..6048c25957 100644 --- a/target/linux/generic/pending-5.4/205-backtrace_module_info.patch +++ b/target/linux/generic/pending-5.4/205-backtrace_module_info.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/lib/vsprintf.c +++ b/lib/vsprintf.c -@@ -914,8 +914,10 @@ char *symbol_string(char *buf, char *end +@@ -940,8 +940,10 @@ char *symbol_string(char *buf, char *end struct printf_spec spec, const char *fmt) { unsigned long value; @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif if (fmt[1] == 'R') -@@ -932,8 +934,14 @@ char *symbol_string(char *buf, char *end +@@ -958,8 +960,14 @@ char *symbol_string(char *buf, char *end return string_nocheck(buf, end, sym, spec); #else diff --git a/target/linux/generic/pending-5.4/419-mtd-redboot-add-of_match_table-with-DT-binding.patch b/target/linux/generic/pending-5.4/419-mtd-redboot-add-of_match_table-with-DT-binding.patch index 8358a307cd..7692f484ae 100644 --- a/target/linux/generic/pending-5.4/419-mtd-redboot-add-of_match_table-with-DT-binding.patch +++ b/target/linux/generic/pending-5.4/419-mtd-redboot-add-of_match_table-with-DT-binding.patch @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -300,6 +300,7 @@ static int parse_redboot_partitions(stru +@@ -305,6 +305,7 @@ static int parse_redboot_partitions(stru static const struct of_device_id mtd_parser_redboot_of_match_table[] = { { .compatible = "redboot-fis" }, diff --git a/target/linux/generic/pending-5.4/420-mtd-redboot_space.patch b/target/linux/generic/pending-5.4/420-mtd-redboot_space.patch index a2cf838989..a3cd4ecf1f 100644 --- a/target/linux/generic/pending-5.4/420-mtd-redboot_space.patch +++ b/target/linux/generic/pending-5.4/420-mtd-redboot_space.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -274,14 +274,21 @@ static int parse_redboot_partitions(stru +@@ -279,14 +279,21 @@ static int parse_redboot_partitions(stru #endif names += strlen(names)+1; diff --git a/target/linux/generic/pending-5.4/630-packet_socket_type.patch b/target/linux/generic/pending-5.4/630-packet_socket_type.patch index a137fb5a6d..d9bfda1303 100644 --- a/target/linux/generic/pending-5.4/630-packet_socket_type.patch +++ b/target/linux/generic/pending-5.4/630-packet_socket_type.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3922,6 +3925,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3924,6 +3927,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> default: return -ENOPROTOOPT; } -@@ -3978,6 +3991,13 @@ static int packet_getsockopt(struct sock +@@ -3980,6 +3993,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch index 7523b396ba..83db92609b 100644 --- a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> --- a/init/Kconfig +++ b/init/Kconfig -@@ -1662,6 +1662,15 @@ config EMBEDDED +@@ -1665,6 +1665,15 @@ config EMBEDDED an embedded system so certain expert options are available for configuration. diff --git a/target/linux/layerscape/patches-5.4/303-core-0007-of-of_reserved_mem-Ensure-cma-reserved-region-not-cr.patch b/target/linux/layerscape/patches-5.4/303-core-0007-of-of_reserved_mem-Ensure-cma-reserved-region-not-cr.patch index 7c385ea525..d95d1f0d53 100644 --- a/target/linux/layerscape/patches-5.4/303-core-0007-of-of_reserved_mem-Ensure-cma-reserved-region-not-cr.patch +++ b/target/linux/layerscape/patches-5.4/303-core-0007-of-of_reserved_mem-Ensure-cma-reserved-region-not-cr.patch @@ -70,7 +70,7 @@ Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com> + ret = early_init_dt_alloc_reserved_memory_arch(node, + size, align, start, end, nomap, &base); if (ret == 0) { - pr_debug("allocated memory for '%s' node: base %pa, size %ld MiB\n", + pr_debug("allocated memory for '%s' node: base %pa, size %lu MiB\n", uname, &base, @@ -143,8 +162,8 @@ static int __init __reserved_mem_alloc_s } @@ -81,5 +81,5 @@ Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com> + ret = early_init_dt_alloc_reserved_memory_arch(node, + size, align, 0, 0, nomap, &base); if (ret == 0) - pr_debug("allocated memory for '%s' node: base %pa, size %ld MiB\n", - uname, &base, (unsigned long)size / SZ_1M); + pr_debug("allocated memory for '%s' node: base %pa, size %lu MiB\n", + uname, &base, (unsigned long)(size / SZ_1M)); diff --git a/target/linux/layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch b/target/linux/layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch index aff53595b0..8ce4380664 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch @@ -56,10 +56,10 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (ret) { - DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret); + DRM_DEV_ERROR(dev, "Could not write to GRF: %d\n", ret); + clk_disable_unprepare(dp->grf_clk); return ret; } - -@@ -82,24 +82,25 @@ static int cdn_dp_grf_write(struct cdn_d +@@ -83,24 +83,25 @@ static int cdn_dp_grf_write(struct cdn_d static int cdn_dp_clk_enable(struct cdn_dp_device *dp) { @@ -89,7 +89,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> goto err_pm_runtime_get; } -@@ -112,18 +113,18 @@ static int cdn_dp_clk_enable(struct cdn_ +@@ -113,18 +114,18 @@ static int cdn_dp_clk_enable(struct cdn_ rate = clk_get_rate(dp->core_clk); if (!rate) { @@ -112,7 +112,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> err_pm_runtime_get: clk_disable_unprepare(dp->core_clk); err_core_clk: -@@ -134,7 +135,7 @@ err_pclk: +@@ -135,7 +136,7 @@ err_pclk: static void cdn_dp_clk_disable(struct cdn_dp_device *dp) { @@ -121,7 +121,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> clk_disable_unprepare(dp->pclk); clk_disable_unprepare(dp->core_clk); } -@@ -167,7 +168,7 @@ static int cdn_dp_get_sink_count(struct +@@ -168,7 +169,7 @@ static int cdn_dp_get_sink_count(struct u8 value; *sink_count = 0; @@ -130,7 +130,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (ret) return ret; -@@ -191,12 +192,13 @@ static struct cdn_dp_port *cdn_dp_connec +@@ -192,12 +193,13 @@ static struct cdn_dp_port *cdn_dp_connec static bool cdn_dp_check_sink_connection(struct cdn_dp_device *dp) { @@ -145,7 +145,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return false; } -@@ -218,7 +220,7 @@ static bool cdn_dp_check_sink_connection +@@ -219,7 +221,7 @@ static bool cdn_dp_check_sink_connection usleep_range(5000, 10000); } @@ -154,7 +154,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return false; } -@@ -260,7 +262,8 @@ static int cdn_dp_connector_get_modes(st +@@ -261,7 +263,8 @@ static int cdn_dp_connector_get_modes(st mutex_lock(&dp->lock); edid = dp->edid; if (edid) { @@ -164,7 +164,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> edid->width_cm, edid->height_cm); dp->sink_has_audio = drm_detect_monitor_audio(edid); -@@ -278,7 +281,8 @@ static int cdn_dp_connector_mode_valid(s +@@ -279,7 +282,8 @@ static int cdn_dp_connector_mode_valid(s struct drm_display_mode *mode) { struct cdn_dp_device *dp = connector_to_dp(connector); @@ -174,7 +174,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> u32 requested, actual, rate, sink_max, source_max = 0; u8 lanes, bpc; -@@ -304,7 +308,7 @@ static int cdn_dp_connector_mode_valid(s +@@ -305,7 +309,7 @@ static int cdn_dp_connector_mode_valid(s sink_max = drm_dp_max_lane_count(dp->dpcd); lanes = min(source_max, sink_max); @@ -183,7 +183,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> sink_max = drm_dp_max_link_rate(dp->dpcd); rate = min(source_max, sink_max); -@@ -314,7 +318,7 @@ static int cdn_dp_connector_mode_valid(s +@@ -315,7 +319,7 @@ static int cdn_dp_connector_mode_valid(s actual = actual * 8 / 10; if (requested > actual) { @@ -192,7 +192,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> "requested=%d, actual=%d, clock=%d\n", requested, actual, mode->clock); return MODE_CLOCK_HIGH; -@@ -334,28 +338,29 @@ static int cdn_dp_firmware_init(struct c +@@ -335,28 +339,29 @@ static int cdn_dp_firmware_init(struct c const u32 *iram_data, *dram_data; const struct firmware *fw = dp->fw; const struct cdn_firmware_header *hdr; @@ -228,7 +228,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp) -@@ -365,28 +370,29 @@ static int cdn_dp_get_sink_capability(st +@@ -366,28 +371,29 @@ static int cdn_dp_get_sink_capability(st if (!cdn_dp_check_sink_connection(dp)) return -ENODEV; @@ -264,7 +264,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> ret); goto err_phy; } -@@ -396,28 +402,28 @@ static int cdn_dp_enable_phy(struct cdn_ +@@ -397,28 +403,28 @@ static int cdn_dp_enable_phy(struct cdn_ ret = cdn_dp_grf_write(dp, GRF_SOC_CON26, DPTX_HPD_SEL_MASK | DPTX_HPD_SEL); if (ret) { @@ -299,7 +299,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> ret); goto err_power_on; } -@@ -427,7 +433,7 @@ static int cdn_dp_enable_phy(struct cdn_ +@@ -428,7 +434,7 @@ static int cdn_dp_enable_phy(struct cdn_ err_power_on: if (phy_power_off(port->phy)) @@ -308,7 +308,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> else port->phy_enabled = false; -@@ -445,7 +451,8 @@ static int cdn_dp_disable_phy(struct cdn +@@ -446,7 +452,8 @@ static int cdn_dp_disable_phy(struct cdn if (port->phy_enabled) { ret = phy_power_off(port->phy); if (ret) { @@ -318,7 +318,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return ret; } } -@@ -469,16 +476,16 @@ static int cdn_dp_disable(struct cdn_dp_ +@@ -470,16 +477,16 @@ static int cdn_dp_disable(struct cdn_dp_ ret = cdn_dp_grf_write(dp, GRF_SOC_CON26, DPTX_HPD_SEL_MASK | DPTX_HPD_DEL); if (ret) { @@ -339,7 +339,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (!dp->connected) { kfree(dp->edid); dp->edid = NULL; -@@ -491,11 +498,11 @@ static int cdn_dp_enable(struct cdn_dp_d +@@ -492,11 +499,11 @@ static int cdn_dp_enable(struct cdn_dp_d { int ret, i, lanes; struct cdn_dp_port *port; @@ -353,7 +353,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return -ENODEV; } -@@ -508,7 +515,7 @@ static int cdn_dp_enable(struct cdn_dp_d +@@ -509,7 +516,7 @@ static int cdn_dp_enable(struct cdn_dp_d ret = cdn_dp_firmware_init(dp); if (ret) { @@ -362,7 +362,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> goto err_clk_disable; } -@@ -542,8 +549,9 @@ static void cdn_dp_encoder_mode_set(stru +@@ -543,8 +550,9 @@ static void cdn_dp_encoder_mode_set(stru struct drm_display_mode *adjusted) { struct cdn_dp_device *dp = encoder_to_dp(encoder); @@ -374,7 +374,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> switch (display_info->bpc) { case 10: -@@ -561,7 +569,7 @@ static void cdn_dp_encoder_mode_set(stru +@@ -562,7 +570,7 @@ static void cdn_dp_encoder_mode_set(stru video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC); video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC); @@ -383,7 +383,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } static bool cdn_dp_check_link_status(struct cdn_dp_device *dp) -@@ -570,11 +578,11 @@ static bool cdn_dp_check_link_status(str +@@ -571,11 +579,11 @@ static bool cdn_dp_check_link_status(str struct cdn_dp_port *port = cdn_dp_connected_port(dp); u8 sink_lanes = drm_dp_max_lane_count(dp->dpcd); @@ -398,7 +398,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> DRM_ERROR("Failed to get link status\n"); return false; } -@@ -586,15 +594,16 @@ static bool cdn_dp_check_link_status(str +@@ -587,15 +595,16 @@ static bool cdn_dp_check_link_status(str static void cdn_dp_encoder_enable(struct drm_encoder *encoder) { struct cdn_dp_device *dp = encoder_to_dp(encoder); @@ -418,7 +418,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> (ret) ? "LIT" : "BIG"); if (ret) val = DP_SEL_VOP_LIT | (DP_SEL_VOP_LIT << 16); -@@ -609,33 +618,33 @@ static void cdn_dp_encoder_enable(struct +@@ -610,33 +619,33 @@ static void cdn_dp_encoder_enable(struct ret = cdn_dp_enable(dp); if (ret) { @@ -461,7 +461,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> goto out; } out: -@@ -651,7 +660,8 @@ static void cdn_dp_encoder_disable(struc +@@ -652,7 +661,8 @@ static void cdn_dp_encoder_disable(struc if (dp->active) { ret = cdn_dp_disable(dp); if (ret) { @@ -471,7 +471,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> ret); } } -@@ -695,7 +705,7 @@ static const struct drm_encoder_funcs cd +@@ -696,7 +706,7 @@ static const struct drm_encoder_funcs cd static int cdn_dp_parse_dt(struct cdn_dp_device *dp) { @@ -480,7 +480,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> struct device_node *np = dev->of_node; struct platform_device *pdev = to_platform_device(dev); struct resource *res; -@@ -707,10 +717,10 @@ static int cdn_dp_parse_dt(struct cdn_dp +@@ -708,10 +718,10 @@ static int cdn_dp_parse_dt(struct cdn_dp } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -494,7 +494,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } dp->core_clk = devm_clk_get(dev, "core-clk"); -@@ -725,10 +735,10 @@ static int cdn_dp_parse_dt(struct cdn_dp +@@ -726,10 +736,10 @@ static int cdn_dp_parse_dt(struct cdn_dp return PTR_ERR(dp->pclk); } @@ -508,7 +508,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } dp->grf_clk = devm_clk_get(dev, "grf"); -@@ -737,10 +747,10 @@ static int cdn_dp_parse_dt(struct cdn_dp +@@ -738,10 +748,10 @@ static int cdn_dp_parse_dt(struct cdn_dp return PTR_ERR(dp->grf_clk); } @@ -522,7 +522,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } dp->dptx_rst = devm_reset_control_get(dev, "dptx"); -@@ -795,7 +805,7 @@ static int cdn_dp_audio_hw_params(struct +@@ -796,7 +806,7 @@ static int cdn_dp_audio_hw_params(struct goto out; } @@ -531,7 +531,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (!ret) dp->audio_info = audio; -@@ -813,7 +823,7 @@ static void cdn_dp_audio_shutdown(struct +@@ -814,7 +824,7 @@ static void cdn_dp_audio_shutdown(struct if (!dp->active) goto out; @@ -540,7 +540,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (!ret) dp->audio_info.format = AFMT_UNUSED; out: -@@ -832,7 +842,7 @@ static int cdn_dp_audio_digital_mute(str +@@ -833,7 +843,7 @@ static int cdn_dp_audio_digital_mute(str goto out; } @@ -549,7 +549,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> out: mutex_unlock(&dp->lock); -@@ -844,7 +854,8 @@ static int cdn_dp_audio_get_eld(struct d +@@ -845,7 +855,8 @@ static int cdn_dp_audio_get_eld(struct d { struct cdn_dp_device *dp = dev_get_drvdata(dev); @@ -559,7 +559,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return 0; } -@@ -878,6 +889,7 @@ static int cdn_dp_request_firmware(struc +@@ -879,6 +890,7 @@ static int cdn_dp_request_firmware(struc int ret; unsigned long timeout = jiffies + msecs_to_jiffies(CDN_FW_TIMEOUT_MS); unsigned long sleep = 1000; @@ -567,7 +567,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> WARN_ON(!mutex_is_locked(&dp->lock)); -@@ -888,13 +900,13 @@ static int cdn_dp_request_firmware(struc +@@ -889,13 +901,13 @@ static int cdn_dp_request_firmware(struc mutex_unlock(&dp->lock); while (time_before(jiffies, timeout)) { @@ -583,7 +583,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> "failed to request firmware: %d\n", ret); goto out; } -@@ -904,7 +916,7 @@ static int cdn_dp_request_firmware(struc +@@ -905,7 +917,7 @@ static int cdn_dp_request_firmware(struc goto out; } @@ -592,7 +592,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> ret = -ETIMEDOUT; out: mutex_lock(&dp->lock); -@@ -915,8 +927,9 @@ static void cdn_dp_pd_event_work(struct +@@ -916,8 +928,9 @@ static void cdn_dp_pd_event_work(struct { struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device, event_work); @@ -603,7 +603,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> int ret; -@@ -933,44 +946,45 @@ static void cdn_dp_pd_event_work(struct +@@ -934,44 +947,45 @@ static void cdn_dp_pd_event_work(struct /* Not connected, notify userspace to disable the block */ if (!cdn_dp_connected_port(dp)) { @@ -662,7 +662,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> "Failed to config video %d\n", ret); } -@@ -1039,7 +1053,7 @@ static int cdn_dp_bind(struct device *de +@@ -1040,7 +1054,7 @@ static int cdn_dp_bind(struct device *de drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs); @@ -671,7 +671,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> connector->polled = DRM_CONNECTOR_POLL_HPD; connector->dpms = DRM_MODE_DPMS_OFF; -@@ -1063,7 +1077,7 @@ static int cdn_dp_bind(struct device *de +@@ -1064,7 +1078,7 @@ static int cdn_dp_bind(struct device *de port = dp->port[i]; port->event_nb.notifier_call = cdn_dp_pd_event; @@ -680,7 +680,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> EXTCON_DISP_DP, &port->event_nb); if (ret) { -@@ -1090,7 +1104,7 @@ static void cdn_dp_unbind(struct device +@@ -1091,7 +1105,7 @@ static void cdn_dp_unbind(struct device { struct cdn_dp_device *dp = dev_get_drvdata(dev); struct drm_encoder *encoder = &dp->encoder; @@ -689,7 +689,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> cancel_work_sync(&dp->event_work); cdn_dp_encoder_disable(encoder); -@@ -1150,7 +1164,7 @@ static int cdn_dp_probe(struct platform_ +@@ -1151,7 +1165,7 @@ static int cdn_dp_probe(struct platform_ dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); if (!dp) return -ENOMEM; @@ -698,7 +698,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> match = of_match_node(cdn_dp_dt_ids, pdev->dev.of_node); dp_data = (struct cdn_dp_data *)match->data; -@@ -1195,7 +1209,7 @@ static int cdn_dp_remove(struct platform +@@ -1196,7 +1210,7 @@ static int cdn_dp_remove(struct platform struct cdn_dp_device *dp = platform_get_drvdata(pdev); platform_device_unregister(dp->audio_pdev); @@ -707,7 +707,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> component_del(&pdev->dev, &cdn_dp_component_ops); return 0; -@@ -1205,7 +1219,7 @@ static void cdn_dp_shutdown(struct platf +@@ -1206,7 +1220,7 @@ static void cdn_dp_shutdown(struct platf { struct cdn_dp_device *dp = platform_get_drvdata(pdev); diff --git a/target/linux/layerscape/patches-5.4/805-display-0003-drm-bridge-add-Cadence-MHDP-HDMI-DP-API.patch b/target/linux/layerscape/patches-5.4/805-display-0003-drm-bridge-add-Cadence-MHDP-HDMI-DP-API.patch index 19e762618a..14089a7b36 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0003-drm-bridge-add-Cadence-MHDP-HDMI-DP-API.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0003-drm-bridge-add-Cadence-MHDP-HDMI-DP-API.patch @@ -1794,7 +1794,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> #define encoder_to_dp(c) \ container_of(c, struct cdn_dp_device, encoder) -@@ -282,7 +282,7 @@ static int cdn_dp_connector_mode_valid(s +@@ -283,7 +283,7 @@ static int cdn_dp_connector_mode_valid(s { struct cdn_dp_device *dp = connector_to_dp(connector); struct drm_display_info *display_info = @@ -1803,7 +1803,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> u32 requested, actual, rate, sink_max, source_max = 0; u8 lanes, bpc; -@@ -378,7 +378,7 @@ static int cdn_dp_get_sink_capability(st +@@ -379,7 +379,7 @@ static int cdn_dp_get_sink_capability(st } kfree(dp->edid); @@ -1812,7 +1812,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> cdns_mhdp_get_edid_block, &dp->mhdp); return 0; } -@@ -484,8 +484,8 @@ static int cdn_dp_disable(struct cdn_dp_ +@@ -485,8 +485,8 @@ static int cdn_dp_disable(struct cdn_dp_ cdns_mhdp_set_firmware_active(&dp->mhdp, false); cdn_dp_clk_disable(dp); dp->active = false; @@ -1823,7 +1823,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (!dp->connected) { kfree(dp->edid); dp->edid = NULL; -@@ -550,7 +550,7 @@ static void cdn_dp_encoder_mode_set(stru +@@ -551,7 +551,7 @@ static void cdn_dp_encoder_mode_set(stru { struct cdn_dp_device *dp = encoder_to_dp(encoder); struct drm_display_info *display_info = @@ -1832,7 +1832,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> struct video_info *video = &dp->mhdp.video_info; switch (display_info->bpc) { -@@ -578,7 +578,7 @@ static bool cdn_dp_check_link_status(str +@@ -579,7 +579,7 @@ static bool cdn_dp_check_link_status(str struct cdn_dp_port *port = cdn_dp_connected_port(dp); u8 sink_lanes = drm_dp_max_lane_count(dp->dpcd); @@ -1841,7 +1841,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return false; if (cdns_mhdp_dpcd_read(&dp->mhdp, DP_LANE0_1_STATUS, link_status, -@@ -807,7 +807,7 @@ static int cdn_dp_audio_hw_params(struct +@@ -808,7 +808,7 @@ static int cdn_dp_audio_hw_params(struct ret = cdns_mhdp_audio_config(&dp->mhdp, &audio); if (!ret) @@ -1850,7 +1850,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> out: mutex_unlock(&dp->lock); -@@ -823,9 +823,9 @@ static void cdn_dp_audio_shutdown(struct +@@ -824,9 +824,9 @@ static void cdn_dp_audio_shutdown(struct if (!dp->active) goto out; @@ -1862,7 +1862,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> out: mutex_unlock(&dp->lock); } -@@ -854,8 +854,8 @@ static int cdn_dp_audio_get_eld(struct d +@@ -855,8 +855,8 @@ static int cdn_dp_audio_get_eld(struct d { struct cdn_dp_device *dp = dev_get_drvdata(dev); @@ -1873,7 +1873,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return 0; } -@@ -877,11 +877,11 @@ static int cdn_dp_audio_codec_init(struc +@@ -878,11 +878,11 @@ static int cdn_dp_audio_codec_init(struc .max_i2s_channels = 8, }; @@ -1889,7 +1889,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } static int cdn_dp_request_firmware(struct cdn_dp_device *dp) -@@ -927,7 +927,7 @@ static void cdn_dp_pd_event_work(struct +@@ -928,7 +928,7 @@ static void cdn_dp_pd_event_work(struct { struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device, event_work); @@ -1898,7 +1898,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> enum drm_connector_status old_status; struct device *dev = dp->mhdp.dev; -@@ -965,8 +965,8 @@ static void cdn_dp_pd_event_work(struct +@@ -966,8 +966,8 @@ static void cdn_dp_pd_event_work(struct /* Enabled and connected with a sink, re-train if requested */ } else if (!cdn_dp_check_link_status(dp)) { @@ -1909,7 +1909,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> struct drm_display_mode *mode = &dp->mhdp.mode; DRM_DEV_INFO(dev, "Connected with sink. Re-train link\n"); -@@ -979,8 +979,8 @@ static void cdn_dp_pd_event_work(struct +@@ -980,8 +980,8 @@ static void cdn_dp_pd_event_work(struct /* If training result is changed, update the video config */ if (mode->clock && @@ -1920,7 +1920,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> ret = cdns_mhdp_config_video(&dp->mhdp); if (ret) { dp->connected = false; -@@ -1053,7 +1053,7 @@ static int cdn_dp_bind(struct device *de +@@ -1054,7 +1054,7 @@ static int cdn_dp_bind(struct device *de drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs); @@ -1929,7 +1929,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> connector->polled = DRM_CONNECTOR_POLL_HPD; connector->dpms = DRM_MODE_DPMS_OFF; -@@ -1104,7 +1104,7 @@ static void cdn_dp_unbind(struct device +@@ -1105,7 +1105,7 @@ static void cdn_dp_unbind(struct device { struct cdn_dp_device *dp = dev_get_drvdata(dev); struct drm_encoder *encoder = &dp->encoder; @@ -1938,7 +1938,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> cancel_work_sync(&dp->event_work); cdn_dp_encoder_disable(encoder); -@@ -1208,7 +1208,7 @@ static int cdn_dp_remove(struct platform +@@ -1209,7 +1209,7 @@ static int cdn_dp_remove(struct platform { struct cdn_dp_device *dp = platform_get_drvdata(pdev); diff --git a/target/linux/layerscape/patches-5.4/805-display-0009-drm-rockchip-Fix-build-failed-issue.patch b/target/linux/layerscape/patches-5.4/805-display-0009-drm-rockchip-Fix-build-failed-issue.patch index 106c1f7285..6f44ce2219 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0009-drm-rockchip-Fix-build-failed-issue.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0009-drm-rockchip-Fix-build-failed-issue.patch @@ -13,7 +13,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c -@@ -797,7 +797,7 @@ static int cdn_dp_audio_hw_params(struct +@@ -798,7 +798,7 @@ static int cdn_dp_audio_hw_params(struct audio.format = AFMT_I2S; break; case HDMI_SPDIF: diff --git a/target/linux/layerscape/patches-5.4/805-display-0012-drm-rockchip-change-base-address-name-from-regs-to-r.patch b/target/linux/layerscape/patches-5.4/805-display-0012-drm-rockchip-change-base-address-name-from-regs-to-r.patch index 2ba999050d..bb87fbcfbd 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0012-drm-rockchip-change-base-address-name-from-regs-to-r.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0012-drm-rockchip-change-base-address-name-from-regs-to-r.patch @@ -13,7 +13,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c -@@ -717,10 +717,10 @@ static int cdn_dp_parse_dt(struct cdn_dp +@@ -718,10 +718,10 @@ static int cdn_dp_parse_dt(struct cdn_dp } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch b/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch index 58df9b98aa..fba2ac4f02 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch @@ -142,7 +142,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> msg[4] = PTS1 | PTS2 | PTS3 | PTS4; --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c -@@ -305,12 +305,10 @@ static int cdn_dp_connector_mode_valid(s +@@ -306,12 +306,10 @@ static int cdn_dp_connector_mode_valid(s requested = mode->clock * bpc * 3 / 1000; source_max = dp->lanes; @@ -157,7 +157,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> actual = rate * lanes / 100; -@@ -365,21 +363,25 @@ static int cdn_dp_firmware_init(struct c +@@ -366,21 +364,25 @@ static int cdn_dp_firmware_init(struct c static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp) { @@ -188,7 +188,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return 0; } -@@ -421,7 +423,8 @@ static int cdn_dp_enable_phy(struct cdn_ +@@ -422,7 +424,8 @@ static int cdn_dp_enable_phy(struct cdn_ } port->lanes = cdn_dp_get_port_lanes(port); @@ -198,7 +198,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (ret) { DRM_DEV_ERROR(dev, "set host capabilities failed: %d\n", ret); -@@ -576,9 +579,9 @@ static bool cdn_dp_check_link_status(str +@@ -577,9 +580,9 @@ static bool cdn_dp_check_link_status(str { u8 link_status[DP_LINK_STATUS_SIZE]; struct cdn_dp_port *port = cdn_dp_connected_port(dp); diff --git a/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch b/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch index 07fac213ce..02562b7587 100644 --- a/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch +++ b/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch @@ -35,7 +35,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com> struct nxp_fspi { void __iomem *iobase; void __iomem *ahb_addr; -@@ -1083,6 +1099,8 @@ static int nxp_fspi_resume(struct device +@@ -1082,6 +1098,8 @@ static int nxp_fspi_resume(struct device static const struct of_device_id nxp_fspi_dt_ids[] = { { .compatible = "nxp,lx2160a-fspi", .data = (void *)&lx2160a_data, }, diff --git a/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch b/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch index a8db23cebb..534c014a2b 100644 --- a/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch +++ b/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch @@ -76,7 +76,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com> } else { if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT) nxp_fspi_fill_txfifo(f, op); -@@ -999,9 +1025,8 @@ static int nxp_fspi_probe(struct platfor +@@ -993,9 +1019,8 @@ static int nxp_fspi_probe(struct platfor /* find the resources - controller memory mapped space */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap"); @@ -88,7 +88,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com> goto err_put_ctrl; } -@@ -1080,6 +1105,9 @@ static int nxp_fspi_remove(struct platfo +@@ -1079,6 +1104,9 @@ static int nxp_fspi_remove(struct platfo mutex_destroy(&f->lock); diff --git a/target/linux/layerscape/patches-5.4/820-usb-0011-usb-dwc3-Add-cache-type-configuration-support.patch b/target/linux/layerscape/patches-5.4/820-usb-0011-usb-dwc3-Add-cache-type-configuration-support.patch index 3357acc76d..7c9a153aec 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0011-usb-dwc3-Add-cache-type-configuration-support.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0011-usb-dwc3-Add-cache-type-configuration-support.patch @@ -109,7 +109,7 @@ Reviewed-by: Jun Li <jun.li@nxp.com> usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -1931,12 +1983,9 @@ static const struct dev_pm_ops dwc3_dev_ +@@ -1932,12 +1984,9 @@ static const struct dev_pm_ops dwc3_dev_ #ifdef CONFIG_OF static const struct of_device_id of_dwc3_match[] = { diff --git a/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch b/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch index 4bc9f4d465..9a3d3f4a17 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch @@ -81,7 +81,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com> usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -1983,9 +1931,12 @@ static const struct dev_pm_ops dwc3_dev_ +@@ -1984,9 +1932,12 @@ static const struct dev_pm_ops dwc3_dev_ #ifdef CONFIG_OF static const struct of_device_id of_dwc3_match[] = { diff --git a/target/linux/layerscape/patches-5.4/820-usb-0025-LF-387-4-usb-dwc3-Add-cache-type-configuration-suppo.patch b/target/linux/layerscape/patches-5.4/820-usb-0025-LF-387-4-usb-dwc3-Add-cache-type-configuration-suppo.patch index 9c5818c268..f9de7035aa 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0025-LF-387-4-usb-dwc3-Add-cache-type-configuration-suppo.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0025-LF-387-4-usb-dwc3-Add-cache-type-configuration-suppo.patch @@ -108,7 +108,7 @@ Reviewed-by: Jun Li <jun.li@nxp.com> usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -1931,12 +1982,16 @@ static const struct dev_pm_ops dwc3_dev_ +@@ -1932,12 +1983,16 @@ static const struct dev_pm_ops dwc3_dev_ #ifdef CONFIG_OF static const struct of_device_id of_dwc3_match[] = { diff --git a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch index 92383f51b4..12844c860f 100644 --- a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2578,6 +2578,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2591,6 +2591,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/mediatek/patches-5.4/1021-ubnt-ledbar-driver.patch b/target/linux/mediatek/patches-5.4/1021-ubnt-ledbar-driver.patch index c971b9b4ca..41ab094e9f 100644 --- a/target/linux/mediatek/patches-5.4/1021-ubnt-ledbar-driver.patch +++ b/target/linux/mediatek/patches-5.4/1021-ubnt-ledbar-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -823,6 +823,16 @@ config LEDS_LM36274 +@@ -824,6 +824,16 @@ config LEDS_LM36274 Say Y to enable the LM36274 LED driver for TI LMU devices. This supports the LED device LM36274. |