diff --git a/include/kernel-5.4 b/include/kernel-5.4 index 01ed4f36a4..9188e0617c 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .252 -LINUX_KERNEL_HASH-5.4.252 = 3a78587523940374a7319089b63357c7dc412b90f5879d512265e59173588267 +LINUX_VERSION-5.4 = .255 +LINUX_KERNEL_HASH-5.4.255 = 34d5ed902f47d90f27b9d5d6b8db0d3fa660834111f9452e166d920968a4a061 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 d83d3d765f..e605e196f4 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 @@ -610,7 +610,7 @@ return false; return true; -@@ -741,13 +745,13 @@ static inline void ipv6_addr_set_v4mappe +@@ -737,13 +741,13 @@ static inline void ipv6_addr_set_v4mappe */ static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen) { @@ -626,7 +626,7 @@ if (xb) return i * 32 + 31 - __fls(ntohl(xb)); } -@@ -934,17 +938,18 @@ static inline int ip6_multipath_hash_pol +@@ -930,17 +934,18 @@ static inline int ip6_multipath_hash_pol static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass, __be32 flowlabel) { 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 6f3027e499..35fb316ad5 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 static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); -@@ -2895,6 +2902,7 @@ static int mmc_blk_probe(struct mmc_card +@@ -2896,6 +2903,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 /* * Check that the card supports the command class(es) we need. -@@ -2902,7 +2910,16 @@ static int mmc_blk_probe(struct mmc_card +@@ -2903,7 +2911,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 card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -2917,9 +2934,14 @@ static int mmc_blk_probe(struct mmc_card +@@ -2918,9 +2935,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-0280-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-5.4/950-0280-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index be7ace05e2..db5b98d21d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0280-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0280-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1272,6 +1275,9 @@ +@@ -1273,6 +1276,9 @@ #define USB_VENDOR_ID_XAT 0x2505 #define USB_DEVICE_ID_XAT_CSR 0x0220 @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, -@@ -196,6 +197,7 @@ static const struct hid_device_id hid_qu +@@ -197,6 +198,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, diff --git a/target/linux/bcm27xx/patches-5.4/950-0489-media-v4l2-mem2mem-add-stateless_-try_-decoder_cmd-i.patch b/target/linux/bcm27xx/patches-5.4/950-0489-media-v4l2-mem2mem-add-stateless_-try_-decoder_cmd-i.patch index 36e6942777..4a3aaec212 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0489-media-v4l2-mem2mem-add-stateless_-try_-decoder_cmd-i.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0489-media-v4l2-mem2mem-add-stateless_-try_-decoder_cmd-i.patch @@ -83,7 +83,7 @@ Signed-off-by: Mauro Carvalho Chehab * for the output and the capture buffer queue. --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h -@@ -701,6 +701,10 @@ int v4l2_m2m_ioctl_try_encoder_cmd(struc +@@ -715,6 +715,10 @@ int v4l2_m2m_ioctl_try_encoder_cmd(struc struct v4l2_encoder_cmd *ec); int v4l2_m2m_ioctl_try_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *dc); diff --git a/target/linux/bcm27xx/patches-5.4/950-1010-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch b/target/linux/bcm27xx/patches-5.4/950-1010-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch index 2ad75c4831..31add11d5f 100644 --- a/target/linux/bcm27xx/patches-5.4/950-1010-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch +++ b/target/linux/bcm27xx/patches-5.4/950-1010-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch @@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell return; val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3); -@@ -641,13 +642,21 @@ static struct phy_driver broadcom_driver +@@ -652,13 +653,21 @@ static struct phy_driver broadcom_driver .config_intr = bcm_phy_config_intr, }, { .phy_id = PHY_ID_BCM54210E, @@ -49,7 +49,7 @@ Signed-off-by: Jonathan Bell .phy_id = PHY_ID_BCM5461, .phy_id_mask = 0xfffffff0, .name = "Broadcom BCM5461", -@@ -775,7 +784,8 @@ module_phy_driver(broadcom_drivers); +@@ -788,7 +797,8 @@ module_phy_driver(broadcom_drivers); static struct mdio_device_id __maybe_unused broadcom_tbl[] = { { PHY_ID_BCM5411, 0xfffffff0 }, { PHY_ID_BCM5421, 0xfffffff0 }, diff --git a/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch b/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch index 55e99dbddd..1ccfdd6d78 100644 --- a/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch +++ b/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch @@ -8,7 +8,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485 --- --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h -@@ -243,6 +243,9 @@ +@@ -260,6 +260,9 @@ #ifndef cpu_has_pindexed_dcache #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) #endif diff --git a/target/linux/generic/backport-5.4/020-14-BACKPORT-FROMLIST-include-linux-mm.h-do-not-warn-in-.patch b/target/linux/generic/backport-5.4/020-14-BACKPORT-FROMLIST-include-linux-mm.h-do-not-warn-in-.patch index 88d49ddf1e..4202e583d0 100644 --- a/target/linux/generic/backport-5.4/020-14-BACKPORT-FROMLIST-include-linux-mm.h-do-not-warn-in-.patch +++ b/target/linux/generic/backport-5.4/020-14-BACKPORT-FROMLIST-include-linux-mm.h-do-not-warn-in-.patch @@ -47,7 +47,7 @@ Tested-by: Yu Zhao --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1327,7 +1327,6 @@ static inline struct mem_cgroup *page_me +@@ -1329,7 +1329,6 @@ static inline struct mem_cgroup *page_me } static inline struct mem_cgroup *page_memcg_rcu(struct page *page) { diff --git a/target/linux/generic/backport-5.4/020-19-BACKPORT-FROMLIST-mm-multigenerational-lru-groundwor.patch b/target/linux/generic/backport-5.4/020-19-BACKPORT-FROMLIST-mm-multigenerational-lru-groundwor.patch index 316e9b303b..0077dfe5c8 100644 --- a/target/linux/generic/backport-5.4/020-19-BACKPORT-FROMLIST-mm-multigenerational-lru-groundwor.patch +++ b/target/linux/generic/backport-5.4/020-19-BACKPORT-FROMLIST-mm-multigenerational-lru-groundwor.patch @@ -91,7 +91,7 @@ Commit-Queue: Yu Zhao return 1; --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -924,6 +924,8 @@ vm_fault_t finish_mkwrite_fault(struct v +@@ -926,6 +926,8 @@ vm_fault_t finish_mkwrite_fault(struct v #define ZONES_PGOFF (NODES_PGOFF - ZONES_WIDTH) #define LAST_CPUPID_PGOFF (ZONES_PGOFF - LAST_CPUPID_WIDTH) #define KASAN_TAG_PGOFF (LAST_CPUPID_PGOFF - KASAN_TAG_WIDTH) diff --git a/target/linux/generic/backport-5.4/020-20-BACKPORT-FROMLIST-mm-multigenerational-lru-activatio.patch b/target/linux/generic/backport-5.4/020-20-BACKPORT-FROMLIST-mm-multigenerational-lru-activatio.patch index 6c0bcbcd39..db0b36da73 100644 --- a/target/linux/generic/backport-5.4/020-20-BACKPORT-FROMLIST-mm-multigenerational-lru-activatio.patch +++ b/target/linux/generic/backport-5.4/020-20-BACKPORT-FROMLIST-mm-multigenerational-lru-activatio.patch @@ -104,7 +104,7 @@ Commit-Queue: Yu Zhao return false; --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1513,6 +1513,23 @@ void unmap_mapping_pages(struct address_ +@@ -1515,6 +1515,23 @@ void unmap_mapping_pages(struct address_ pgoff_t start, pgoff_t nr, bool even_cows); void unmap_mapping_range(struct address_space *mapping, loff_t const holebegin, loff_t const holelen, int even_cows); @@ -128,7 +128,7 @@ Commit-Queue: Yu Zhao #else static inline vm_fault_t handle_mm_fault(struct vm_area_struct *vma, unsigned long address, unsigned int flags) -@@ -1534,6 +1551,19 @@ static inline void unmap_mapping_pages(s +@@ -1536,6 +1553,19 @@ static inline void unmap_mapping_pages(s pgoff_t start, pgoff_t nr, bool even_cows) { } static inline void unmap_mapping_range(struct address_space *mapping, loff_t const holebegin, loff_t const holelen, int even_cows) { } diff --git a/target/linux/generic/backport-5.4/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch b/target/linux/generic/backport-5.4/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch index 501f42d88e..97700da05f 100644 --- a/target/linux/generic/backport-5.4/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch +++ b/target/linux/generic/backport-5.4/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch @@ -48,7 +48,7 @@ Signed-off-by: Pablo Neira Ayuso MODULE_AUTHOR("Pablo Neira Ayuso "); --- a/net/netfilter/nft_flow_offload.c +++ b/net/netfilter/nft_flow_offload.c -@@ -234,47 +234,14 @@ static struct nft_expr_type nft_flow_off +@@ -236,47 +236,14 @@ static struct nft_expr_type nft_flow_off .owner = THIS_MODULE, }; diff --git a/target/linux/generic/backport-5.4/704-v5.6-net-dsa-Get-information-about-stacked-DSA-protocol.patch b/target/linux/generic/backport-5.4/704-v5.6-net-dsa-Get-information-about-stacked-DSA-protocol.patch index 4ec12dabb5..469f44a431 100644 --- a/target/linux/generic/backport-5.4/704-v5.6-net-dsa-Get-information-about-stacked-DSA-protocol.patch +++ b/target/linux/generic/backport-5.4/704-v5.6-net-dsa-Get-information-about-stacked-DSA-protocol.patch @@ -202,7 +202,7 @@ Signed-off-by: David S. Miller } --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -4884,7 +4884,8 @@ static struct mv88e6xxx_chip *mv88e6xxx_ +@@ -4892,7 +4892,8 @@ static struct mv88e6xxx_chip *mv88e6xxx_ } static enum dsa_tag_protocol mv88e6xxx_get_tag_protocol(struct dsa_switch *ds, diff --git a/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch b/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch index 683178727c..4881281bdf 100644 --- a/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch +++ b/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2384,7 +2384,14 @@ static int mv88e6xxx_setup_upstream_port +@@ -2392,7 +2392,14 @@ static int mv88e6xxx_setup_upstream_port if (chip->info->ops->set_egress_port) { err = chip->info->ops->set_egress_port(chip, diff --git a/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch b/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch index 7cf5fc5893..d03a08bb86 100644 --- a/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch +++ b/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -4935,6 +4935,80 @@ static int mv88e6xxx_port_mdb_del(struct +@@ -4943,6 +4943,80 @@ static int mv88e6xxx_port_mdb_del(struct return err; } @@ -106,7 +106,7 @@ Signed-off-by: David S. Miller static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port, bool unicast, bool multicast) { -@@ -4989,6 +5063,8 @@ static const struct dsa_switch_ops mv88e +@@ -4997,6 +5071,8 @@ static const struct dsa_switch_ops mv88e .port_mdb_prepare = mv88e6xxx_port_mdb_prepare, .port_mdb_add = mv88e6xxx_port_mdb_add, .port_mdb_del = mv88e6xxx_port_mdb_del, diff --git a/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch b/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch index bc2a4085c0..0d7ec25707 100644 --- a/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch +++ b/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -5002,7 +5002,7 @@ static void mv88e6xxx_port_mirror_del(st +@@ -5010,7 +5010,7 @@ static void mv88e6xxx_port_mirror_del(st if (chip->info->ops->set_egress_port(chip, direction, dsa_upstream_port(ds, 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 e0d8b3fbb0..5eba93625a 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 @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau device, it has to decide which ones to send first, which ones to --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -2300,7 +2300,7 @@ static int __init pktsched_init(void) +@@ -2327,7 +2327,7 @@ static int __init pktsched_init(void) return err; } diff --git a/target/linux/generic/hack-5.4/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-5.4/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index 2344db3bcb..0e778e808e 100644 --- a/target/linux/generic/hack-5.4/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-5.4/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch @@ -1,6 +1,6 @@ --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2497,6 +2497,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -2505,6 +2505,9 @@ static int mv88e6xxx_setup_port(struct m if (dsa_is_cpu_port(ds, port)) reg = 0; diff --git a/target/linux/generic/hack-5.4/901-debloat_sock_diag.patch b/target/linux/generic/hack-5.4/901-debloat_sock_diag.patch index a52be65f2a..4e9eb3dd71 100644 --- a/target/linux/generic/hack-5.4/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-5.4/901-debloat_sock_diag.patch @@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) { struct dst_entry *dst = __sk_dst_get(sk); -@@ -1760,9 +1773,11 @@ static void __sk_free(struct sock *sk) +@@ -1763,9 +1776,11 @@ static void __sk_free(struct sock *sk) if (likely(sk->sk_net_refcnt)) sock_inuse_add(sock_net(sk), -1); diff --git a/target/linux/generic/hack-5.4/902-debloat_proc.patch b/target/linux/generic/hack-5.4/902-debloat_proc.patch index 5289d90a9e..609ab82c88 100644 --- a/target/linux/generic/hack-5.4/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.4/902-debloat_proc.patch @@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3668,6 +3668,8 @@ static __net_initdata struct pernet_oper +@@ -3671,6 +3671,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { diff --git a/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch index bd1e3e4e48..61772ecead 100644 --- a/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch +++ b/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch @@ -10,7 +10,7 @@ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -404,6 +404,7 @@ static void option_instat_callback(struc +@@ -406,6 +406,7 @@ static void option_instat_callback(struc * Mobidata, etc sell under their own brand names. */ #define LONGCHEER_VENDOR_ID 0x1c9e @@ -18,7 +18,7 @@ /* 4G Systems products */ /* This one was sold as the VW and Skoda "Carstick LTE" */ -@@ -621,6 +622,16 @@ static void option_instat_callback(struc +@@ -623,6 +624,16 @@ static void option_instat_callback(struc /* Device needs ZLP */ #define ZLP BIT(17) @@ -35,7 +35,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, -@@ -655,6 +666,8 @@ static const struct usb_device_id option +@@ -657,6 +668,8 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = RSVD(4) }, 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 a45d505962..7370f5edae 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 @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1802,6 +1802,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1806,6 +1806,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau /* * When we registered the protocol we saved the socket in the data -@@ -1809,6 +1810,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1813,6 +1814,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau /* * Yank back the headers [hope the device set this -@@ -1821,7 +1823,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1825,7 +1827,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2067,12 +2069,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -2071,12 +2073,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2198,12 +2200,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2202,12 +2204,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3313,6 +3315,7 @@ static int packet_create(struct net *net +@@ -3317,6 +3319,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3952,6 +3955,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3956,6 +3959,16 @@ packet_setsockopt(struct socket *sock, i WRITE_ONCE(po->xmit, val ? packet_direct_xmit : dev_queue_xmit); return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -4008,6 +4021,13 @@ static int packet_getsockopt(struct sock +@@ -4012,6 +4025,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/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index dc71c9b737..aa6c18ea32 100644 --- a/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5857,6 +5857,13 @@ static int nf_tables_flowtable_parse_hoo +@@ -5888,6 +5888,13 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) return err; @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL); if (!ops) return -ENOMEM; -@@ -5987,10 +5994,19 @@ static int nf_tables_newflowtable(struct +@@ -6023,10 +6030,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -6111,7 +6127,8 @@ static int nf_tables_fill_flowtable_info +@@ -6149,7 +6165,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), diff --git a/target/linux/generic/pending-5.4/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch b/target/linux/generic/pending-5.4/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch index c1ce9f066a..38449e8f1e 100644 --- a/target/linux/generic/pending-5.4/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch +++ b/target/linux/generic/pending-5.4/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch @@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2668,6 +2668,7 @@ static int mv88e6xxx_setup(struct dsa_sw +@@ -2676,6 +2676,7 @@ static int mv88e6xxx_setup(struct dsa_sw chip->ds = ds; ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip); diff --git a/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 13267a4002..8937564374 100644 --- a/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -5089,6 +5089,7 @@ static int mv88e6xxx_register_switch(str +@@ -5097,6 +5097,7 @@ static int mv88e6xxx_register_switch(str ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; diff --git a/target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Disable-bit-clock-with-transmitt.patch b/target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Disable-bit-clock-with-transmitt.patch new file mode 100644 index 0000000000..857fab36ab --- /dev/null +++ b/target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Disable-bit-clock-with-transmitt.patch @@ -0,0 +1,32 @@ +From 4eb89c73f32d3c87a6938065bd230b3a93619e3e Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Thu, 31 Aug 2023 11:04:59 +0800 +Subject: [PATCH] Revert "ASoC: fsl_sai: Disable bit clock with transmitter" + +This reverts commit 94239d1830a1f30c30cd0e14efcad47a4379563b. +--- + sound/soc/fsl/fsl_sai.c | 2 +- + sound/soc/fsl/fsl_sai.h | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +--- a/sound/soc/fsl/fsl_sai.c ++++ b/sound/soc/fsl/fsl_sai.c +@@ -548,7 +548,7 @@ static void fsl_sai_config_disable(struc + u32 xcsr, count = 100; + + regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), +- FSL_SAI_CSR_TERE | FSL_SAI_CSR_BCE, 0); ++ FSL_SAI_CSR_TERE, 0); + + /* TERE will remain set till the end of current frame */ + do { +--- a/sound/soc/fsl/fsl_sai.h ++++ b/sound/soc/fsl/fsl_sai.h +@@ -87,7 +87,6 @@ + /* SAI Transmit/Receive Control Register */ + #define FSL_SAI_CSR_TERE BIT(31) + #define FSL_SAI_CSR_SE BIT(30) +-#define FSL_SAI_CSR_BCE BIT(28) + #define FSL_SAI_CSR_FR BIT(25) + #define FSL_SAI_CSR_SR BIT(24) + #define FSL_SAI_CSR_xF_SHIFT 16 diff --git a/target/linux/layerscape/patches-5.4/801-audio-0002-Revert-ASoC-fsl_sai-Add-new-added-registers-and-new-.patch b/target/linux/layerscape/patches-5.4/801-audio-0002-Revert-ASoC-fsl_sai-Add-new-added-registers-and-new-.patch new file mode 100644 index 0000000000..334f0e8f7b --- /dev/null +++ b/target/linux/layerscape/patches-5.4/801-audio-0002-Revert-ASoC-fsl_sai-Add-new-added-registers-and-new-.patch @@ -0,0 +1,182 @@ +From 04493d5f2adffe3473941a860ef77bfd5ee05ed3 Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Thu, 31 Aug 2023 11:05:06 +0800 +Subject: [PATCH] Revert "ASoC: fsl_sai: Add new added registers and new bit + definition" + +This reverts commit ef9cae4a6c8d4f8822540bed20c2d1eb37722408. +--- + sound/soc/fsl/fsl_sai.c | 23 ---------------- + sound/soc/fsl/fsl_sai.h | 59 ----------------------------------------- + 2 files changed, 82 deletions(-) + +--- a/sound/soc/fsl/fsl_sai.c ++++ b/sound/soc/fsl/fsl_sai.c +@@ -810,8 +810,6 @@ static struct reg_default fsl_sai_reg_de + {FSL_SAI_RCR4(8), 0}, + {FSL_SAI_RCR5(8), 0}, + {FSL_SAI_RMR, 0}, +- {FSL_SAI_MCTL, 0}, +- {FSL_SAI_MDIV, 0}, + }; + + static bool fsl_sai_readable_reg(struct device *dev, unsigned int reg) +@@ -852,18 +850,6 @@ static bool fsl_sai_readable_reg(struct + case FSL_SAI_RFR6: + case FSL_SAI_RFR7: + case FSL_SAI_RMR: +- case FSL_SAI_MCTL: +- case FSL_SAI_MDIV: +- case FSL_SAI_VERID: +- case FSL_SAI_PARAM: +- case FSL_SAI_TTCTN: +- case FSL_SAI_RTCTN: +- case FSL_SAI_TTCTL: +- case FSL_SAI_TBCTN: +- case FSL_SAI_TTCAP: +- case FSL_SAI_RTCTL: +- case FSL_SAI_RBCTN: +- case FSL_SAI_RTCAP: + return true; + default: + return false; +@@ -878,10 +864,6 @@ static bool fsl_sai_volatile_reg(struct + if (reg == FSL_SAI_TCSR(ofs) || reg == FSL_SAI_RCSR(ofs)) + return true; + +- /* Set VERID and PARAM be volatile for reading value in probe */ +- if (ofs == 8 && (reg == FSL_SAI_VERID || reg == FSL_SAI_PARAM)) +- return true; +- + switch (reg) { + case FSL_SAI_TFR0: + case FSL_SAI_TFR1: +@@ -935,10 +917,6 @@ static bool fsl_sai_writeable_reg(struct + case FSL_SAI_TDR7: + case FSL_SAI_TMR: + case FSL_SAI_RMR: +- case FSL_SAI_MCTL: +- case FSL_SAI_MDIV: +- case FSL_SAI_TTCTL: +- case FSL_SAI_RTCTL: + return true; + default: + return false; +@@ -987,7 +965,6 @@ static int fsl_sai_probe(struct platform + + if (sai->soc_data->reg_offset == 8) { + fsl_sai_regmap_config.reg_defaults = fsl_sai_reg_defaults_ofs8; +- fsl_sai_regmap_config.max_register = FSL_SAI_MDIV; + fsl_sai_regmap_config.num_reg_defaults = + ARRAY_SIZE(fsl_sai_reg_defaults_ofs8); + } +--- a/sound/soc/fsl/fsl_sai.h ++++ b/sound/soc/fsl/fsl_sai.h +@@ -14,8 +14,6 @@ + SNDRV_PCM_FMTBIT_S32_LE) + + /* SAI Register Map Register */ +-#define FSL_SAI_VERID 0x00 /* SAI Version ID Register */ +-#define FSL_SAI_PARAM 0x04 /* SAI Parameter Register */ + #define FSL_SAI_TCSR(ofs) (0x00 + ofs) /* SAI Transmit Control */ + #define FSL_SAI_TCR1(ofs) (0x04 + ofs) /* SAI Transmit Configuration 1 */ + #define FSL_SAI_TCR2(ofs) (0x08 + ofs) /* SAI Transmit Configuration 2 */ +@@ -39,10 +37,6 @@ + #define FSL_SAI_TFR6 0x58 /* SAI Transmit FIFO 6 */ + #define FSL_SAI_TFR7 0x5C /* SAI Transmit FIFO 7 */ + #define FSL_SAI_TMR 0x60 /* SAI Transmit Mask */ +-#define FSL_SAI_TTCTL 0x70 /* SAI Transmit Timestamp Control Register */ +-#define FSL_SAI_TTCTN 0x74 /* SAI Transmit Timestamp Counter Register */ +-#define FSL_SAI_TBCTN 0x78 /* SAI Transmit Bit Counter Register */ +-#define FSL_SAI_TTCAP 0x7C /* SAI Transmit Timestamp Capture */ + #define FSL_SAI_RCSR(ofs) (0x80 + ofs) /* SAI Receive Control */ + #define FSL_SAI_RCR1(ofs) (0x84 + ofs)/* SAI Receive Configuration 1 */ + #define FSL_SAI_RCR2(ofs) (0x88 + ofs) /* SAI Receive Configuration 2 */ +@@ -66,13 +60,6 @@ + #define FSL_SAI_RFR6 0xd8 /* SAI Receive FIFO 6 */ + #define FSL_SAI_RFR7 0xdc /* SAI Receive FIFO 7 */ + #define FSL_SAI_RMR 0xe0 /* SAI Receive Mask */ +-#define FSL_SAI_RTCTL 0xf0 /* SAI Receive Timestamp Control Register */ +-#define FSL_SAI_RTCTN 0xf4 /* SAI Receive Timestamp Counter Register */ +-#define FSL_SAI_RBCTN 0xf8 /* SAI Receive Bit Counter Register */ +-#define FSL_SAI_RTCAP 0xfc /* SAI Receive Timestamp Capture */ +- +-#define FSL_SAI_MCTL 0x100 /* SAI MCLK Control Register */ +-#define FSL_SAI_MDIV 0x104 /* SAI MCLK Divide Register */ + + #define FSL_SAI_xCSR(tx, ofs) (tx ? FSL_SAI_TCSR(ofs) : FSL_SAI_RCSR(ofs)) + #define FSL_SAI_xCR1(tx, ofs) (tx ? FSL_SAI_TCR1(ofs) : FSL_SAI_RCR1(ofs)) +@@ -86,7 +73,6 @@ + + /* SAI Transmit/Receive Control Register */ + #define FSL_SAI_CSR_TERE BIT(31) +-#define FSL_SAI_CSR_SE BIT(30) + #define FSL_SAI_CSR_FR BIT(25) + #define FSL_SAI_CSR_SR BIT(24) + #define FSL_SAI_CSR_xF_SHIFT 16 +@@ -120,7 +106,6 @@ + #define FSL_SAI_CR2_MSEL(ID) ((ID) << 26) + #define FSL_SAI_CR2_BCP BIT(25) + #define FSL_SAI_CR2_BCD_MSTR BIT(24) +-#define FSL_SAI_CR2_BYP BIT(23) /* BCLK bypass */ + #define FSL_SAI_CR2_DIV_MASK 0xff + + /* SAI Transmit and Receive Configuration 3 Register */ +@@ -130,13 +115,6 @@ + #define FSL_SAI_CR3_WDFL_MASK 0x1f + + /* SAI Transmit and Receive Configuration 4 Register */ +- +-#define FSL_SAI_CR4_FCONT BIT(28) +-#define FSL_SAI_CR4_FCOMB_SHIFT BIT(26) +-#define FSL_SAI_CR4_FCOMB_SOFT BIT(27) +-#define FSL_SAI_CR4_FCOMB_MASK (0x3 << 26) +-#define FSL_SAI_CR4_FPACK_8 (0x2 << 24) +-#define FSL_SAI_CR4_FPACK_16 (0x3 << 24) + #define FSL_SAI_CR4_FRSZ(x) (((x) - 1) << 16) + #define FSL_SAI_CR4_FRSZ_MASK (0x1f << 16) + #define FSL_SAI_CR4_SYWD(x) (((x) - 1) << 8) +@@ -154,43 +132,6 @@ + #define FSL_SAI_CR5_FBT(x) ((x) << 8) + #define FSL_SAI_CR5_FBT_MASK (0x1f << 8) + +-/* SAI MCLK Control Register */ +-#define FSL_SAI_MCTL_MCLK_EN BIT(30) /* MCLK Enable */ +-#define FSL_SAI_MCTL_MSEL_MASK (0x3 << 24) +-#define FSL_SAI_MCTL_MSEL(ID) ((ID) << 24) +-#define FSL_SAI_MCTL_MSEL_BUS 0 +-#define FSL_SAI_MCTL_MSEL_MCLK1 BIT(24) +-#define FSL_SAI_MCTL_MSEL_MCLK2 BIT(25) +-#define FSL_SAI_MCTL_MSEL_MCLK3 (BIT(24) | BIT(25)) +-#define FSL_SAI_MCTL_DIV_EN BIT(23) +-#define FSL_SAI_MCTL_DIV_MASK 0xFF +- +-/* SAI VERID Register */ +-#define FSL_SAI_VERID_MAJOR_SHIFT 24 +-#define FSL_SAI_VERID_MAJOR_MASK GENMASK(31, 24) +-#define FSL_SAI_VERID_MINOR_SHIFT 16 +-#define FSL_SAI_VERID_MINOR_MASK GENMASK(23, 16) +-#define FSL_SAI_VERID_FEATURE_SHIFT 0 +-#define FSL_SAI_VERID_FEATURE_MASK GENMASK(15, 0) +-#define FSL_SAI_VERID_EFIFO_EN BIT(0) +-#define FSL_SAI_VERID_TSTMP_EN BIT(1) +- +-/* SAI PARAM Register */ +-#define FSL_SAI_PARAM_SPF_SHIFT 16 +-#define FSL_SAI_PARAM_SPF_MASK GENMASK(19, 16) +-#define FSL_SAI_PARAM_WPF_SHIFT 8 +-#define FSL_SAI_PARAM_WPF_MASK GENMASK(11, 8) +-#define FSL_SAI_PARAM_DLN_MASK GENMASK(3, 0) +- +-/* SAI MCLK Divide Register */ +-#define FSL_SAI_MDIV_MASK 0xFFFFF +- +-/* SAI timestamp and bitcounter */ +-#define FSL_SAI_xTCTL_TSEN BIT(0) +-#define FSL_SAI_xTCTL_TSINC BIT(1) +-#define FSL_SAI_xTCTL_RTSC BIT(8) +-#define FSL_SAI_xTCTL_RBC BIT(9) +- + /* SAI type */ + #define FSL_SAI_DMA BIT(0) + #define FSL_SAI_USE_AC97 BIT(1) diff --git a/target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Refine-enable-disable-TE-RE-sequ.patch b/target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Refine-enable-disable-TE-RE-sequ.patch new file mode 100644 index 0000000000..a810db7a10 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Refine-enable-disable-TE-RE-sequ.patch @@ -0,0 +1,175 @@ +From f12dcaf65b9a780f0cc72e3b86479e71a59116f1 Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Thu, 31 Aug 2023 11:05:11 +0800 +Subject: [PATCH] Revert "ASoC: fsl_sai: Refine enable/disable TE/RE sequence + in trigger()" + +This reverts commit 1b3d751045425ec38e1e68cd1d64da1856772144. +--- + sound/soc/fsl/fsl_sai.c | 126 +++++++++++++--------------------------- + 1 file changed, 41 insertions(+), 85 deletions(-) + +--- a/sound/soc/fsl/fsl_sai.c ++++ b/sound/soc/fsl/fsl_sai.c +@@ -37,24 +37,6 @@ static const struct snd_pcm_hw_constrain + .list = fsl_sai_rates, + }; + +-/** +- * fsl_sai_dir_is_synced - Check if stream is synced by the opposite stream +- * +- * SAI supports synchronous mode using bit/frame clocks of either Transmitter's +- * or Receiver's for both streams. This function is used to check if clocks of +- * the stream's are synced by the opposite stream. +- * +- * @sai: SAI context +- * @dir: stream direction +- */ +-static inline bool fsl_sai_dir_is_synced(struct fsl_sai *sai, int dir) +-{ +- int adir = (dir == TX) ? RX : TX; +- +- /* current dir in async mode while opposite dir in sync mode */ +- return !sai->synchronous[dir] && sai->synchronous[adir]; +-} +- + static irqreturn_t fsl_sai_isr(int irq, void *devid) + { + struct fsl_sai *sai = (struct fsl_sai *)devid; +@@ -541,38 +523,6 @@ static int fsl_sai_hw_free(struct snd_pc + return 0; + } + +-static void fsl_sai_config_disable(struct fsl_sai *sai, int dir) +-{ +- unsigned int ofs = sai->soc_data->reg_offset; +- bool tx = dir == TX; +- u32 xcsr, count = 100; +- +- regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), +- FSL_SAI_CSR_TERE, 0); +- +- /* TERE will remain set till the end of current frame */ +- do { +- udelay(10); +- regmap_read(sai->regmap, FSL_SAI_xCSR(tx, ofs), &xcsr); +- } while (--count && xcsr & FSL_SAI_CSR_TERE); +- +- regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), +- FSL_SAI_CSR_FR, FSL_SAI_CSR_FR); +- +- /* +- * For sai master mode, after several open/close sai, +- * there will be no frame clock, and can't recover +- * anymore. Add software reset to fix this issue. +- * This is a hardware bug, and will be fix in the +- * next sai version. +- */ +- if (!sai->is_slave_mode) { +- /* Software Reset */ +- regmap_write(sai->regmap, FSL_SAI_xCSR(tx, ofs), FSL_SAI_CSR_SR); +- /* Clear SR bit to finish the reset */ +- regmap_write(sai->regmap, FSL_SAI_xCSR(tx, ofs), 0); +- } +-} + + static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *cpu_dai) +@@ -581,9 +531,7 @@ static int fsl_sai_trigger(struct snd_pc + unsigned int ofs = sai->soc_data->reg_offset; + + bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; +- int adir = tx ? RX : TX; +- int dir = tx ? TX : RX; +- u32 xcsr; ++ u32 xcsr, count = 100; + + /* + * Asynchronous mode: Clear SYNC for both Tx and Rx. +@@ -606,22 +554,10 @@ static int fsl_sai_trigger(struct snd_pc + regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), + FSL_SAI_CSR_FRDE, FSL_SAI_CSR_FRDE); + +- regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), ++ regmap_update_bits(sai->regmap, FSL_SAI_RCSR(ofs), ++ FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE); ++ regmap_update_bits(sai->regmap, FSL_SAI_TCSR(ofs), + FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE); +- /* +- * Enable the opposite direction for synchronous mode +- * 1. Tx sync with Rx: only set RE for Rx; set TE & RE for Tx +- * 2. Rx sync with Tx: only set TE for Tx; set RE & TE for Rx +- * +- * RM recommends to enable RE after TE for case 1 and to enable +- * TE after RE for case 2, but we here may not always guarantee +- * that happens: "arecord 1.wav; aplay 2.wav" in case 1 enables +- * TE after RE, which is against what RM recommends but should +- * be safe to do, judging by years of testing results. +- */ +- if (fsl_sai_dir_is_synced(sai, adir)) +- regmap_update_bits(sai->regmap, FSL_SAI_xCSR((!tx), ofs), +- FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE); + + regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), + FSL_SAI_CSR_xIE_MASK, FSL_SAI_FLAGS); +@@ -636,23 +572,43 @@ static int fsl_sai_trigger(struct snd_pc + + /* Check if the opposite FRDE is also disabled */ + regmap_read(sai->regmap, FSL_SAI_xCSR(!tx, ofs), &xcsr); +- +- /* +- * If opposite stream provides clocks for synchronous mode and +- * it is inactive, disable it before disabling the current one +- */ +- if (fsl_sai_dir_is_synced(sai, adir) && !(xcsr & FSL_SAI_CSR_FRDE)) +- fsl_sai_config_disable(sai, adir); +- +- /* +- * Disable current stream if either of: +- * 1. current stream doesn't provide clocks for synchronous mode +- * 2. current stream provides clocks for synchronous mode but no +- * more stream is active. +- */ +- if (!fsl_sai_dir_is_synced(sai, dir) || !(xcsr & FSL_SAI_CSR_FRDE)) +- fsl_sai_config_disable(sai, dir); +- ++ if (!(xcsr & FSL_SAI_CSR_FRDE)) { ++ /* Disable both directions and reset their FIFOs */ ++ regmap_update_bits(sai->regmap, FSL_SAI_TCSR(ofs), ++ FSL_SAI_CSR_TERE, 0); ++ regmap_update_bits(sai->regmap, FSL_SAI_RCSR(ofs), ++ FSL_SAI_CSR_TERE, 0); ++ ++ /* TERE will remain set till the end of current frame */ ++ do { ++ udelay(10); ++ regmap_read(sai->regmap, ++ FSL_SAI_xCSR(tx, ofs), &xcsr); ++ } while (--count && xcsr & FSL_SAI_CSR_TERE); ++ ++ regmap_update_bits(sai->regmap, FSL_SAI_TCSR(ofs), ++ FSL_SAI_CSR_FR, FSL_SAI_CSR_FR); ++ regmap_update_bits(sai->regmap, FSL_SAI_RCSR(ofs), ++ FSL_SAI_CSR_FR, FSL_SAI_CSR_FR); ++ ++ /* ++ * For sai master mode, after several open/close sai, ++ * there will be no frame clock, and can't recover ++ * anymore. Add software reset to fix this issue. ++ * This is a hardware bug, and will be fix in the ++ * next sai version. ++ */ ++ if (!sai->is_slave_mode) { ++ /* Software Reset for both Tx and Rx */ ++ regmap_write(sai->regmap, FSL_SAI_TCSR(ofs), ++ FSL_SAI_CSR_SR); ++ regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), ++ FSL_SAI_CSR_SR); ++ /* Clear SR bit to finish the reset */ ++ regmap_write(sai->regmap, FSL_SAI_TCSR(ofs), 0); ++ regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), 0); ++ } ++ } + break; + default: + return -EINVAL; diff --git a/target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch b/target/linux/layerscape/patches-5.4/801-audio-0004-Revert-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0001-Revert-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch rename to target/linux/layerscape/patches-5.4/801-audio-0004-Revert-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0002-Revert-ASoC-fsl_sai-Implement-set_bclk_ratio.patch b/target/linux/layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Implement-set_bclk_ratio.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0002-Revert-ASoC-fsl_sai-Implement-set_bclk_ratio.patch rename to target/linux/layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Implement-set_bclk_ratio.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Add-support-for-imx8qm.patch b/target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Add-support-for-imx8qm.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0003-Revert-ASoC-fsl_sai-Add-support-for-imx8qm.patch rename to target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Add-support-for-imx8qm.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0004-Revert-ASoC-fsl_sai-Add-support-for-imx7ulp-imx8mq.patch b/target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-support-for-imx7ulp-imx8mq.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0004-Revert-ASoC-fsl_sai-Add-support-for-imx7ulp-imx8mq.patch rename to target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-support-for-imx7ulp-imx8mq.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch b/target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch rename to target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch b/target/linux/layerscape/patches-5.4/801-audio-0009-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch rename to target/linux/layerscape/patches-5.4/801-audio-0009-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch b/target/linux/layerscape/patches-5.4/801-audio-0010-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch rename to target/linux/layerscape/patches-5.4/801-audio-0010-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch b/target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch similarity index 99% rename from target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch rename to target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch index 9dfde30beb..9642a04e9c 100644 --- a/target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch +++ b/target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch @@ -168,7 +168,7 @@ This reverts commit cf9441adb1a35506d7606866c382b9d8614169b5. if (ret) { --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c -@@ -1248,8 +1248,10 @@ static int fsl_spdif_probe(struct platfo +@@ -1250,8 +1250,10 @@ static int fsl_spdif_probe(struct platfo } irq = platform_get_irq(pdev, 0); diff --git a/target/linux/layerscape/patches-5.4/801-audio-0009-Revert-ASoC-fsl_sai-mark-regmap-as-fast_io.patch b/target/linux/layerscape/patches-5.4/801-audio-0012-Revert-ASoC-fsl_sai-mark-regmap-as-fast_io.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0009-Revert-ASoC-fsl_sai-mark-regmap-as-fast_io.patch rename to target/linux/layerscape/patches-5.4/801-audio-0012-Revert-ASoC-fsl_sai-mark-regmap-as-fast_io.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0010-Revert-ASoC-fsl_sai-derive-TX-FIFO-watermark-from-FI.patch b/target/linux/layerscape/patches-5.4/801-audio-0013-Revert-ASoC-fsl_sai-derive-TX-FIFO-watermark-from-FI.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0010-Revert-ASoC-fsl_sai-derive-TX-FIFO-watermark-from-FI.patch rename to target/linux/layerscape/patches-5.4/801-audio-0013-Revert-ASoC-fsl_sai-derive-TX-FIFO-watermark-from-FI.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch b/target/linux/layerscape/patches-5.4/801-audio-0014-Revert-ASoC-fsl_sai-add-of_match-data.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch rename to target/linux/layerscape/patches-5.4/801-audio-0014-Revert-ASoC-fsl_sai-add-of_match-data.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0012-MLK-9974-ASoC-fsl_sai-There-is-underrun-detected-in-.patch b/target/linux/layerscape/patches-5.4/801-audio-0015-MLK-9974-ASoC-fsl_sai-There-is-underrun-detected-in-.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0012-MLK-9974-ASoC-fsl_sai-There-is-underrun-detected-in-.patch rename to target/linux/layerscape/patches-5.4/801-audio-0015-MLK-9974-ASoC-fsl_sai-There-is-underrun-detected-in-.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0013-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch b/target/linux/layerscape/patches-5.4/801-audio-0016-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0013-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch rename to target/linux/layerscape/patches-5.4/801-audio-0016-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0014-MLK-11628-ASoC-fsl_sai-add-initial-value-for-is_slav.patch b/target/linux/layerscape/patches-5.4/801-audio-0017-MLK-11628-ASoC-fsl_sai-add-initial-value-for-is_slav.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0014-MLK-11628-ASoC-fsl_sai-add-initial-value-for-is_slav.patch rename to target/linux/layerscape/patches-5.4/801-audio-0017-MLK-11628-ASoC-fsl_sai-add-initial-value-for-is_slav.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0015-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-SAI-master-mode.patch b/target/linux/layerscape/patches-5.4/801-audio-0018-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-SAI-master-mode.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0015-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-SAI-master-mode.patch rename to target/linux/layerscape/patches-5.4/801-audio-0018-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-SAI-master-mode.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0016-MLK-12374-ASoC-fsl_sai-Change-the-dev_warn-to-dev_db.patch b/target/linux/layerscape/patches-5.4/801-audio-0019-MLK-12374-ASoC-fsl_sai-Change-the-dev_warn-to-dev_db.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0016-MLK-12374-ASoC-fsl_sai-Change-the-dev_warn-to-dev_db.patch rename to target/linux/layerscape/patches-5.4/801-audio-0019-MLK-12374-ASoC-fsl_sai-Change-the-dev_warn-to-dev_db.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0017-MLK-12786-2-ASoC-fsl_sai-correct-the-clock-source-fo.patch b/target/linux/layerscape/patches-5.4/801-audio-0020-MLK-12786-2-ASoC-fsl_sai-correct-the-clock-source-fo.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0017-MLK-12786-2-ASoC-fsl_sai-correct-the-clock-source-fo.patch rename to target/linux/layerscape/patches-5.4/801-audio-0020-MLK-12786-2-ASoC-fsl_sai-correct-the-clock-source-fo.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch b/target/linux/layerscape/patches-5.4/801-audio-0021-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch rename to target/linux/layerscape/patches-5.4/801-audio-0021-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0019-MLK-13609-ASoC-fsl_sai-fix-for-synchronize-mode.patch b/target/linux/layerscape/patches-5.4/801-audio-0022-MLK-13609-ASoC-fsl_sai-fix-for-synchronize-mode.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0019-MLK-13609-ASoC-fsl_sai-fix-for-synchronize-mode.patch rename to target/linux/layerscape/patches-5.4/801-audio-0022-MLK-13609-ASoC-fsl_sai-fix-for-synchronize-mode.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0020-ASoC-fsl_-e-sai-introduce-shared-interrupt-DT-flag-p.patch b/target/linux/layerscape/patches-5.4/801-audio-0023-ASoC-fsl_-e-sai-introduce-shared-interrupt-DT-flag-p.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0020-ASoC-fsl_-e-sai-introduce-shared-interrupt-DT-flag-p.patch rename to target/linux/layerscape/patches-5.4/801-audio-0023-ASoC-fsl_-e-sai-introduce-shared-interrupt-DT-flag-p.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch b/target/linux/layerscape/patches-5.4/801-audio-0024-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch rename to target/linux/layerscape/patches-5.4/801-audio-0024-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0022-ASoC-fsl_sai-set-specific-fmt-for-I2S-XTOR.patch b/target/linux/layerscape/patches-5.4/801-audio-0025-ASoC-fsl_sai-set-specific-fmt-for-I2S-XTOR.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0022-ASoC-fsl_sai-set-specific-fmt-for-I2S-XTOR.patch rename to target/linux/layerscape/patches-5.4/801-audio-0025-ASoC-fsl_sai-set-specific-fmt-for-I2S-XTOR.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0024-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch b/target/linux/layerscape/patches-5.4/801-audio-0026-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0024-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch rename to target/linux/layerscape/patches-5.4/801-audio-0026-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0025-MLK-14870-ASoC-fsl_sai-Remove-support-for-S20_3LE.patch b/target/linux/layerscape/patches-5.4/801-audio-0027-MLK-14870-ASoC-fsl_sai-Remove-support-for-S20_3LE.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0025-MLK-14870-ASoC-fsl_sai-Remove-support-for-S20_3LE.patch rename to target/linux/layerscape/patches-5.4/801-audio-0027-MLK-14870-ASoC-fsl_sai-Remove-support-for-S20_3LE.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0026-MLK-14935-ASoC-fsl_sai-Fix-mixing-initialization-dat.patch b/target/linux/layerscape/patches-5.4/801-audio-0028-MLK-14935-ASoC-fsl_sai-Fix-mixing-initialization-dat.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0026-MLK-14935-ASoC-fsl_sai-Fix-mixing-initialization-dat.patch rename to target/linux/layerscape/patches-5.4/801-audio-0028-MLK-14935-ASoC-fsl_sai-Fix-mixing-initialization-dat.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0027-MLK-15140-1-ASoC-fsl_sai-support-latest-sai-module.patch b/target/linux/layerscape/patches-5.4/801-audio-0029-MLK-15140-1-ASoC-fsl_sai-support-latest-sai-module.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0027-MLK-15140-1-ASoC-fsl_sai-support-latest-sai-module.patch rename to target/linux/layerscape/patches-5.4/801-audio-0029-MLK-15140-1-ASoC-fsl_sai-support-latest-sai-module.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0028-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch b/target/linux/layerscape/patches-5.4/801-audio-0030-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0028-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch rename to target/linux/layerscape/patches-5.4/801-audio-0030-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0029-MLK-15960-1-ASoC-fsl_sai-update-fifo_depth-for-diffe.patch b/target/linux/layerscape/patches-5.4/801-audio-0031-MLK-15960-1-ASoC-fsl_sai-update-fifo_depth-for-diffe.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0029-MLK-15960-1-ASoC-fsl_sai-update-fifo_depth-for-diffe.patch rename to target/linux/layerscape/patches-5.4/801-audio-0031-MLK-15960-1-ASoC-fsl_sai-update-fifo_depth-for-diffe.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0030-MLK-15960-2-ASoC-fsl_sai-refine-the-pm-runtime-funct.patch b/target/linux/layerscape/patches-5.4/801-audio-0032-MLK-15960-2-ASoC-fsl_sai-refine-the-pm-runtime-funct.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0030-MLK-15960-2-ASoC-fsl_sai-refine-the-pm-runtime-funct.patch rename to target/linux/layerscape/patches-5.4/801-audio-0032-MLK-15960-2-ASoC-fsl_sai-refine-the-pm-runtime-funct.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0031-MLK-13975-ASoC-fsl_sai-Refine-master-flag-handling.patch b/target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13975-ASoC-fsl_sai-Refine-master-flag-handling.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0031-MLK-13975-ASoC-fsl_sai-Refine-master-flag-handling.patch rename to target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13975-ASoC-fsl_sai-Refine-master-flag-handling.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0032-MLK-16130-1-ASoC-fsl_sai-enable-TCE-RCE-according-to.patch b/target/linux/layerscape/patches-5.4/801-audio-0034-MLK-16130-1-ASoC-fsl_sai-enable-TCE-RCE-according-to.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0032-MLK-16130-1-ASoC-fsl_sai-enable-TCE-RCE-according-to.patch rename to target/linux/layerscape/patches-5.4/801-audio-0034-MLK-16130-1-ASoC-fsl_sai-enable-TCE-RCE-according-to.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch b/target/linux/layerscape/patches-5.4/801-audio-0035-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch rename to target/linux/layerscape/patches-5.4/801-audio-0035-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0034-MLK-13946-8-ASoC-fsl_sai-use-min-channels-slots-for-.patch b/target/linux/layerscape/patches-5.4/801-audio-0036-MLK-13946-8-ASoC-fsl_sai-use-min-channels-slots-for-.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0034-MLK-13946-8-ASoC-fsl_sai-use-min-channels-slots-for-.patch rename to target/linux/layerscape/patches-5.4/801-audio-0036-MLK-13946-8-ASoC-fsl_sai-use-min-channels-slots-for-.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0035-MLK-16929-1-ASoC-fsl_sai-add-bitclk_freq.patch b/target/linux/layerscape/patches-5.4/801-audio-0037-MLK-16929-1-ASoC-fsl_sai-add-bitclk_freq.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0035-MLK-16929-1-ASoC-fsl_sai-add-bitclk_freq.patch rename to target/linux/layerscape/patches-5.4/801-audio-0037-MLK-16929-1-ASoC-fsl_sai-add-bitclk_freq.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0037-MLK-16224-4-ASoC-fsl_sai-support-multi-fifo-and-DSD.patch b/target/linux/layerscape/patches-5.4/801-audio-0038-MLK-16224-4-ASoC-fsl_sai-support-multi-fifo-and-DSD.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0037-MLK-16224-4-ASoC-fsl_sai-support-multi-fifo-and-DSD.patch rename to target/linux/layerscape/patches-5.4/801-audio-0038-MLK-16224-4-ASoC-fsl_sai-support-multi-fifo-and-DSD.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0038-MLK-17467-ASoC-fsl_sai-fix-typo-for-fsl_sai.patch b/target/linux/layerscape/patches-5.4/801-audio-0039-MLK-17467-ASoC-fsl_sai-fix-typo-for-fsl_sai.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0038-MLK-17467-ASoC-fsl_sai-fix-typo-for-fsl_sai.patch rename to target/linux/layerscape/patches-5.4/801-audio-0039-MLK-17467-ASoC-fsl_sai-fix-typo-for-fsl_sai.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch b/target/linux/layerscape/patches-5.4/801-audio-0040-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch rename to target/linux/layerscape/patches-5.4/801-audio-0040-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0040-MLK-17428-8-ASoC-fsl_sai-support-768KHz-sample-rate.patch b/target/linux/layerscape/patches-5.4/801-audio-0041-MLK-17428-8-ASoC-fsl_sai-support-768KHz-sample-rate.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0040-MLK-17428-8-ASoC-fsl_sai-support-768KHz-sample-rate.patch rename to target/linux/layerscape/patches-5.4/801-audio-0041-MLK-17428-8-ASoC-fsl_sai-support-768KHz-sample-rate.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0041-MLK-17485-ASoC-fsl_sai-Specify-supported-rate_min-an.patch b/target/linux/layerscape/patches-5.4/801-audio-0042-MLK-17485-ASoC-fsl_sai-Specify-supported-rate_min-an.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0041-MLK-17485-ASoC-fsl_sai-Specify-supported-rate_min-an.patch rename to target/linux/layerscape/patches-5.4/801-audio-0042-MLK-17485-ASoC-fsl_sai-Specify-supported-rate_min-an.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0042-MLK-17566-ASoC-fsl_sai-fix-register-definition.patch b/target/linux/layerscape/patches-5.4/801-audio-0043-MLK-17566-ASoC-fsl_sai-fix-register-definition.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0042-MLK-17566-ASoC-fsl_sai-fix-register-definition.patch rename to target/linux/layerscape/patches-5.4/801-audio-0043-MLK-17566-ASoC-fsl_sai-fix-register-definition.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0043-MLK-17528-1-ASoC-fsl_sai-Introduce-FSL_SAI_CLK_BIT-c.patch b/target/linux/layerscape/patches-5.4/801-audio-0044-MLK-17528-1-ASoC-fsl_sai-Introduce-FSL_SAI_CLK_BIT-c.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0043-MLK-17528-1-ASoC-fsl_sai-Introduce-FSL_SAI_CLK_BIT-c.patch rename to target/linux/layerscape/patches-5.4/801-audio-0044-MLK-17528-1-ASoC-fsl_sai-Introduce-FSL_SAI_CLK_BIT-c.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0044-MLK-17528-3-ASoC-fsl_sai-Set-clock-rate-in-set_syscl.patch b/target/linux/layerscape/patches-5.4/801-audio-0045-MLK-17528-3-ASoC-fsl_sai-Set-clock-rate-in-set_syscl.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0044-MLK-17528-3-ASoC-fsl_sai-Set-clock-rate-in-set_syscl.patch rename to target/linux/layerscape/patches-5.4/801-audio-0045-MLK-17528-3-ASoC-fsl_sai-Set-clock-rate-in-set_syscl.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0045-MLK-17156-1-ASoC-fsl_sai-update-register-offset-for-.patch b/target/linux/layerscape/patches-5.4/801-audio-0046-MLK-17156-1-ASoC-fsl_sai-update-register-offset-for-.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0045-MLK-17156-1-ASoC-fsl_sai-update-register-offset-for-.patch rename to target/linux/layerscape/patches-5.4/801-audio-0046-MLK-17156-1-ASoC-fsl_sai-update-register-offset-for-.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0046-Sound-Soc-fsl-Set-SAI-Channel-Mode-to-Output-Mode.patch b/target/linux/layerscape/patches-5.4/801-audio-0047-Sound-Soc-fsl-Set-SAI-Channel-Mode-to-Output-Mode.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0046-Sound-Soc-fsl-Set-SAI-Channel-Mode-to-Output-Mode.patch rename to target/linux/layerscape/patches-5.4/801-audio-0047-Sound-Soc-fsl-Set-SAI-Channel-Mode-to-Output-Mode.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0047-MLK-17580-ASoC-fsl-dsd-Add-DSD-utilities-helper.patch b/target/linux/layerscape/patches-5.4/801-audio-0048-MLK-17580-ASoC-fsl-dsd-Add-DSD-utilities-helper.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0047-MLK-17580-ASoC-fsl-dsd-Add-DSD-utilities-helper.patch rename to target/linux/layerscape/patches-5.4/801-audio-0048-MLK-17580-ASoC-fsl-dsd-Add-DSD-utilities-helper.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0048-MLK-17580-ASoC-fsl-sai-Use-DSD-helper.patch b/target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-Use-DSD-helper.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0048-MLK-17580-ASoC-fsl-sai-Use-DSD-helper.patch rename to target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-Use-DSD-helper.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch b/target/linux/layerscape/patches-5.4/801-audio-0050-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch rename to target/linux/layerscape/patches-5.4/801-audio-0050-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0050-MLK-17531-1-ASoC-fsl-sai-add-support-for-SAI-v3.01.patch b/target/linux/layerscape/patches-5.4/801-audio-0051-MLK-17531-1-ASoC-fsl-sai-add-support-for-SAI-v3.01.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0050-MLK-17531-1-ASoC-fsl-sai-add-support-for-SAI-v3.01.patch rename to target/linux/layerscape/patches-5.4/801-audio-0051-MLK-17531-1-ASoC-fsl-sai-add-support-for-SAI-v3.01.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0051-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.patch b/target/linux/layerscape/patches-5.4/801-audio-0052-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0051-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.patch rename to target/linux/layerscape/patches-5.4/801-audio-0052-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0052-MLK-18682-1-ASoC-fsl-sai-use-set_bclk_ratio-to-calcu.patch b/target/linux/layerscape/patches-5.4/801-audio-0053-MLK-18682-1-ASoC-fsl-sai-use-set_bclk_ratio-to-calcu.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0052-MLK-18682-1-ASoC-fsl-sai-use-set_bclk_ratio-to-calcu.patch rename to target/linux/layerscape/patches-5.4/801-audio-0053-MLK-18682-1-ASoC-fsl-sai-use-set_bclk_ratio-to-calcu.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0053-MLK-18682-2-ASoC-fsl-sai-allow-dynamic-pll-switching.patch b/target/linux/layerscape/patches-5.4/801-audio-0054-MLK-18682-2-ASoC-fsl-sai-allow-dynamic-pll-switching.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0053-MLK-18682-2-ASoC-fsl-sai-allow-dynamic-pll-switching.patch rename to target/linux/layerscape/patches-5.4/801-audio-0054-MLK-18682-2-ASoC-fsl-sai-allow-dynamic-pll-switching.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0054-MLK-18947-ASoC-fsl_sai-fix-volatile-function.patch b/target/linux/layerscape/patches-5.4/801-audio-0055-MLK-18947-ASoC-fsl_sai-fix-volatile-function.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0054-MLK-18947-ASoC-fsl_sai-fix-volatile-function.patch rename to target/linux/layerscape/patches-5.4/801-audio-0055-MLK-18947-ASoC-fsl_sai-fix-volatile-function.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0055-MLK-18898-1-ASoC-fsl_sai-select-pinctrl-state-as-fun.patch b/target/linux/layerscape/patches-5.4/801-audio-0056-MLK-18898-1-ASoC-fsl_sai-select-pinctrl-state-as-fun.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0055-MLK-18898-1-ASoC-fsl_sai-select-pinctrl-state-as-fun.patch rename to target/linux/layerscape/patches-5.4/801-audio-0056-MLK-18898-1-ASoC-fsl_sai-select-pinctrl-state-as-fun.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0056-MLK-19573-1-ASoC-fsl-dsd-make-fsl_get_pins_state-inl.patch b/target/linux/layerscape/patches-5.4/801-audio-0057-MLK-19573-1-ASoC-fsl-dsd-make-fsl_get_pins_state-inl.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0056-MLK-19573-1-ASoC-fsl-dsd-make-fsl_get_pins_state-inl.patch rename to target/linux/layerscape/patches-5.4/801-audio-0057-MLK-19573-1-ASoC-fsl-dsd-make-fsl_get_pins_state-inl.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0057-MLK-15975-3-ASoC-fsl_sai-The-offset-of-fifo_off-is-c.patch b/target/linux/layerscape/patches-5.4/801-audio-0058-MLK-15975-3-ASoC-fsl_sai-The-offset-of-fifo_off-is-c.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0057-MLK-15975-3-ASoC-fsl_sai-The-offset-of-fifo_off-is-c.patch rename to target/linux/layerscape/patches-5.4/801-audio-0058-MLK-15975-3-ASoC-fsl_sai-The-offset-of-fifo_off-is-c.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0058-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch b/target/linux/layerscape/patches-5.4/801-audio-0059-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0058-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch rename to target/linux/layerscape/patches-5.4/801-audio-0059-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0059-MLK-20328-1-ASoC-fsl_sai-map-number-of-pins-to-datal.patch b/target/linux/layerscape/patches-5.4/801-audio-0060-MLK-20328-1-ASoC-fsl_sai-map-number-of-pins-to-datal.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0059-MLK-20328-1-ASoC-fsl_sai-map-number-of-pins-to-datal.patch rename to target/linux/layerscape/patches-5.4/801-audio-0060-MLK-20328-1-ASoC-fsl_sai-map-number-of-pins-to-datal.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0060-ASoC-fsl_sai-Support-EPROBE_DEFER.patch b/target/linux/layerscape/patches-5.4/801-audio-0061-ASoC-fsl_sai-Support-EPROBE_DEFER.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0060-ASoC-fsl_sai-Support-EPROBE_DEFER.patch rename to target/linux/layerscape/patches-5.4/801-audio-0061-ASoC-fsl_sai-Support-EPROBE_DEFER.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0061-ASoC-fsl_sai-support-multi-power-domain.patch b/target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl_sai-support-multi-power-domain.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0061-ASoC-fsl_sai-support-multi-power-domain.patch rename to target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl_sai-support-multi-power-domain.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch b/target/linux/layerscape/patches-5.4/801-audio-0063-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch rename to target/linux/layerscape/patches-5.4/801-audio-0063-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0063-MLK-21876-4-ASoC-fsl-sai-fix-build-for-next-20190524.patch b/target/linux/layerscape/patches-5.4/801-audio-0064-MLK-21876-4-ASoC-fsl-sai-fix-build-for-next-20190524.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0063-MLK-21876-4-ASoC-fsl-sai-fix-build-for-next-20190524.patch rename to target/linux/layerscape/patches-5.4/801-audio-0064-MLK-21876-4-ASoC-fsl-sai-fix-build-for-next-20190524.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0064-ASoC-fsl_sai-Mark-cache-dirty-at-resume.patch b/target/linux/layerscape/patches-5.4/801-audio-0065-ASoC-fsl_sai-Mark-cache-dirty-at-resume.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0064-ASoC-fsl_sai-Mark-cache-dirty-at-resume.patch rename to target/linux/layerscape/patches-5.4/801-audio-0065-ASoC-fsl_sai-Mark-cache-dirty-at-resume.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0065-LF-106-ASoC-fsl_sai-request-BUS_FREQ_AUDIO.patch b/target/linux/layerscape/patches-5.4/801-audio-0066-LF-106-ASoC-fsl_sai-request-BUS_FREQ_AUDIO.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0065-LF-106-ASoC-fsl_sai-request-BUS_FREQ_AUDIO.patch rename to target/linux/layerscape/patches-5.4/801-audio-0066-LF-106-ASoC-fsl_sai-request-BUS_FREQ_AUDIO.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0066-MLK-16224-2-ASoC-dmaengine_pcm-add-fifo_num-to-snd_d.patch b/target/linux/layerscape/patches-5.4/801-audio-0067-MLK-16224-2-ASoC-dmaengine_pcm-add-fifo_num-to-snd_d.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0066-MLK-16224-2-ASoC-dmaengine_pcm-add-fifo_num-to-snd_d.patch rename to target/linux/layerscape/patches-5.4/801-audio-0067-MLK-16224-2-ASoC-dmaengine_pcm-add-fifo_num-to-snd_d.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0069-MLK-21484-4-ASoC-fsl_sai-ensure-clk-not-in-use-prior.patch b/target/linux/layerscape/patches-5.4/801-audio-0068-MLK-21484-4-ASoC-fsl_sai-ensure-clk-not-in-use-prior.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0069-MLK-21484-4-ASoC-fsl_sai-ensure-clk-not-in-use-prior.patch rename to target/linux/layerscape/patches-5.4/801-audio-0068-MLK-21484-4-ASoC-fsl_sai-ensure-clk-not-in-use-prior.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0070-MLK-21957-1-ASoC-fsl_sai-remove-reset-code-from-dai_.patch b/target/linux/layerscape/patches-5.4/801-audio-0069-MLK-21957-1-ASoC-fsl_sai-remove-reset-code-from-dai_.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0070-MLK-21957-1-ASoC-fsl_sai-remove-reset-code-from-dai_.patch rename to target/linux/layerscape/patches-5.4/801-audio-0069-MLK-21957-1-ASoC-fsl_sai-remove-reset-code-from-dai_.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0071-MLK-21957-2-ASoC-fsl_sai-read-SAI-version-and-params.patch b/target/linux/layerscape/patches-5.4/801-audio-0070-MLK-21957-2-ASoC-fsl_sai-read-SAI-version-and-params.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0071-MLK-21957-2-ASoC-fsl_sai-read-SAI-version-and-params.patch rename to target/linux/layerscape/patches-5.4/801-audio-0070-MLK-21957-2-ASoC-fsl_sai-read-SAI-version-and-params.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0072-MLK-22522-ASoC-fsl_sai-fix-stack-out-of-bounds-KASAN.patch b/target/linux/layerscape/patches-5.4/801-audio-0071-MLK-22522-ASoC-fsl_sai-fix-stack-out-of-bounds-KASAN.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0072-MLK-22522-ASoC-fsl_sai-fix-stack-out-of-bounds-KASAN.patch rename to target/linux/layerscape/patches-5.4/801-audio-0071-MLK-22522-ASoC-fsl_sai-fix-stack-out-of-bounds-KASAN.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch b/target/linux/layerscape/patches-5.4/801-audio-0072-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch rename to target/linux/layerscape/patches-5.4/801-audio-0072-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch diff --git a/target/linux/layerscape/patches-5.4/801-audio-0074-ASoC-fsl_sai-fix-build-issue-of-incomplete-parenthes.patch b/target/linux/layerscape/patches-5.4/801-audio-0073-ASoC-fsl_sai-fix-build-issue-of-incomplete-parenthes.patch similarity index 100% rename from target/linux/layerscape/patches-5.4/801-audio-0074-ASoC-fsl_sai-fix-build-issue-of-incomplete-parenthes.patch rename to target/linux/layerscape/patches-5.4/801-audio-0073-ASoC-fsl_sai-fix-build-issue-of-incomplete-parenthes.patch diff --git a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch index 10c8d390a3..9b2cf32ac0 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch @@ -16,7 +16,7 @@ Signed-off-by: Peter Chen --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1275,6 +1275,17 @@ static void dwc3_get_properties(struct d +@@ -1259,6 +1259,17 @@ static void dwc3_get_properties(struct d dwc->maximum_speed = usb_get_maximum_speed(dev); dwc->dr_mode = usb_get_dr_mode(dev); @@ -36,7 +36,7 @@ Signed-off-by: Peter Chen dwc->sysdev_is_parent = device_property_read_bool(dev, --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -955,6 +955,7 @@ struct dwc3_scratchpad_array { +@@ -952,6 +952,7 @@ struct dwc3_scratchpad_array { * @nr_scratch: number of scratch buffers * @u1u2: only used on revisions <1.83a for workaround * @maximum_speed: maximum speed requested (mainly for testing purposes) @@ -44,7 +44,7 @@ Signed-off-by: Peter Chen * @revision: revision register contents * @version_type: VERSIONTYPE register contents, a sub release of a revision * @dr_mode: requested mode of operation -@@ -1112,6 +1113,7 @@ struct dwc3 { +@@ -1109,6 +1110,7 @@ struct dwc3 { u32 nr_scratch; u32 u1u2; u32 maximum_speed; @@ -54,7 +54,7 @@ Signed-off-by: Peter Chen * All 3.1 IP version constants are greater than the 3.0 IP --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -3713,6 +3713,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3718,6 +3718,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) dwc->gadget.sg_supported = true; dwc->gadget.name = "dwc3-gadget"; dwc->gadget.lpm_capable = true; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch b/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch index f2a8190509..95785792ac 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch @@ -23,7 +23,7 @@ Signed-off-by: Li Jun #include #include -@@ -1097,6 +1098,7 @@ struct dwc3 { +@@ -1094,6 +1095,7 @@ struct dwc3 { void __iomem *regs; size_t regs_size; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch index 487b0a4283..448d8b56ca 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch @@ -32,7 +32,7 @@ Reviewed-by: Peter Chen --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1370,6 +1370,9 @@ static void dwc3_get_properties(struct d +@@ -1354,6 +1354,9 @@ static void dwc3_get_properties(struct d dwc->dis_split_quirk = device_property_read_bool(dev, "snps,dis-split-quirk"); @@ -44,7 +44,7 @@ Reviewed-by: Peter Chen --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -1049,6 +1049,8 @@ struct dwc3_scratchpad_array { +@@ -1046,6 +1046,8 @@ struct dwc3_scratchpad_array { * 3 - Reserved * @dis_metastability_quirk: set to disable metastability quirk. * @dis_split_quirk: set to disable split boundary. @@ -53,7 +53,7 @@ Reviewed-by: Peter Chen * @imod_interval: set the interrupt moderation interval in 250ns * increments or 0 to disable. */ -@@ -1245,6 +1247,8 @@ struct dwc3 { +@@ -1242,6 +1244,8 @@ struct dwc3 { unsigned dis_split_quirk:1; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0010-MLK-22675-usb-dwc3-host-disable-park-mode.patch b/target/linux/layerscape/patches-5.4/820-usb-0010-MLK-22675-usb-dwc3-host-disable-park-mode.patch index dda8e2b1eb..7a23e7a15f 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0010-MLK-22675-usb-dwc3-host-disable-park-mode.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0010-MLK-22675-usb-dwc3-host-disable-park-mode.patch @@ -54,11 +54,12 @@ Signed-off-by: Li Jun --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1045,6 +1045,21 @@ static int dwc3_core_init(struct dwc3 *d - reg |= DWC3_GUCTL_HSTINAUTORETRY; +@@ -1031,6 +1031,24 @@ static int dwc3_core_init(struct dwc3 *d + dwc3_writel(dwc->regs, DWC3_GUCTL1, reg); + } - dwc3_writel(dwc->regs, DWC3_GUCTL, reg); -+ ++ if (dwc->dr_mode == USB_DR_MODE_HOST || ++ dwc->dr_mode == USB_DR_MODE_OTG) { + /* + * Disable Park Mode for super speed: + * Park mode is used in host mode when only a single async @@ -73,16 +74,8 @@ Signed-off-by: Li Jun + reg = dwc3_readl(dwc->regs, DWC3_GUCTL1); + reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS; + dwc3_writel(dwc->regs, DWC3_GUCTL1, reg); - } - ++ } ++ /* ---- a/drivers/usb/dwc3/core.h -+++ b/drivers/usb/dwc3/core.h -@@ -255,6 +255,7 @@ - #define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17) - #define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS BIT(28) - #define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW BIT(24) -+#define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17) - - /* Global Status Register */ - #define DWC3_GSTS_OTG_IP BIT(10) + * Must config both number of packets and max burst settings to enable + * RX and/or TX threshold. 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 c76ac325de..dfb0360968 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 usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -1935,12 +1987,9 @@ static const struct dev_pm_ops dwc3_dev_ +@@ -1922,12 +1974,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 93fe0cf795..efbd6e6893 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 usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -1987,9 +1935,12 @@ static const struct dev_pm_ops dwc3_dev_ +@@ -1974,9 +1922,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 31c49ccb4c..3e71c9f759 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 usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -1935,12 +1986,16 @@ static const struct dev_pm_ops dwc3_dev_ +@@ -1922,12 +1973,16 @@ static const struct dev_pm_ops dwc3_dev_ #ifdef CONFIG_OF static const struct of_device_id of_dwc3_match[] = {