kernel: bump 5.4 to 5.4.63

Manually merged:
 hack-5.4
  230-openwrt_lzma_options.patch
 bcm27xx
  950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
 x86
  011-tune_lzma_options.patch

Remove upstreamed patches in collaboration with Ansuel Smith:
 ipq806x
  093-1-v5.8-ipq806x-PCI-qcom-Add-missing-ipq806x-clocks-in-PCIe-driver.patch
  093-2-v5.8-ipq806x-PCI-qcom-Change-duplicate-PCI-reset-to-phy-reset.patch
  093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch

All other modifications made by update_kernel.sh

Build-tested: bcm27xx/bcm2708, ipq806x, x86/64
Run-tested: ipq806x (R7800), x86/64

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>
[update commit message/tested]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

5 files changed, 56 insertions, 69 deletions

diff --git a/target/linux/layerscape/patches-5.4/701-net-0408-sdk_fman-fix-CONFIG_COMPAT-leak-during-headers-insta.patch b/target/linux/layerscape/patches-5.4/701-net-0408-sdk_fman-fix-CONFIG_COMPAT-leak-during-headers-insta.patch
index 209b0347c9..bff431c52d 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0408-sdk_fman-fix-CONFIG_COMPAT-leak-during-headers-insta.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0408-sdk_fman-fix-CONFIG_COMPAT-leak-during-headers-insta.patch
@@ -15,8 +15,6 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  .../uapi/linux/fmd/Peripherals/fm_test_ioctls.h    |  4 +-
  5 files changed, 58 insertions(+), 53 deletions(-)
 
-diff --git a/drivers/net/ethernet/freescale/sdk_fman/ncsw_config.mk b/drivers/net/ethernet/freescale/sdk_fman/ncsw_config.mk
-index 586f9c7..99a0b73 100644
 --- a/drivers/net/ethernet/freescale/sdk_fman/ncsw_config.mk
 +++ b/drivers/net/ethernet/freescale/sdk_fman/ncsw_config.mk
 @@ -44,6 +44,11 @@ ifdef CONFIG_FMAN_ARM
@@ -31,11 +29,9 @@ index 586f9c7..99a0b73 100644
  ccflags-y += -I$(FMAN)/src/inc
  ccflags-y += -I$(FMAN)/src/inc/system
  ccflags-y += -I$(FMAN)/src/inc/wrapper
-diff --git a/include/uapi/linux/fmd/Peripherals/fm_ioctls.h b/include/uapi/linux/fmd/Peripherals/fm_ioctls.h
-index e0c2dd3..ff9e66b6 100644
 --- a/include/uapi/linux/fmd/Peripherals/fm_ioctls.h
 +++ b/include/uapi/linux/fmd/Peripherals/fm_ioctls.h
-@@ -434,7 +434,7 @@ typedef struct ioc_fm_ctrl_mon_counters_params_t {
+@@ -434,7 +434,7 @@ typedef struct ioc_fm_ctrl_mon_counters_
  
   @Retval        Handle to FM VSP object, or NULL for Failure.
  *//***************************************************************************/
@@ -44,7 +40,7 @@ index e0c2dd3..ff9e66b6 100644
  #define FM_IOC_VSP_CONFIG_COMPAT                             _IOWR(FM_IOC_TYPE_BASE, FM_IOC_NUM(8), ioc_compat_fm_vsp_params_t)
  #endif
  #define FM_IOC_VSP_CONFIG                                    _IOWR(FM_IOC_TYPE_BASE, FM_IOC_NUM(8), ioc_fm_vsp_params_t)
-@@ -448,7 +448,7 @@ typedef struct ioc_fm_ctrl_mon_counters_params_t {
+@@ -448,7 +448,7 @@ typedef struct ioc_fm_ctrl_mon_counters_
  
   @Return        E_OK on success; Error code otherwise.
  *//***************************************************************************/
@@ -53,7 +49,7 @@ index e0c2dd3..ff9e66b6 100644
  #define FM_IOC_VSP_INIT_COMPAT                               _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(9), ioc_compat_fm_obj_t)
  #endif
  #define FM_IOC_VSP_INIT                                      _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(9), ioc_fm_obj_t)
-@@ -464,7 +464,7 @@ typedef struct ioc_fm_ctrl_mon_counters_params_t {
+@@ -464,7 +464,7 @@ typedef struct ioc_fm_ctrl_mon_counters_
  
   @Return        E_OK on success; Error code otherwise.
  *//***************************************************************************/
@@ -62,7 +58,7 @@ index e0c2dd3..ff9e66b6 100644
  #define FM_IOC_VSP_FREE_COMPAT                               _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(10), ioc_compat_fm_obj_t)
  #endif
  #define FM_IOC_VSP_FREE                                      _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(10), ioc_fm_obj_t)
-@@ -482,7 +482,7 @@ typedef struct ioc_fm_ctrl_mon_counters_params_t {
+@@ -482,7 +482,7 @@ typedef struct ioc_fm_ctrl_mon_counters_
  
   @Cautions      Allowed only following FM_VSP_Config() and before FM_VSP_Init().
  *//***************************************************************************/
@@ -71,7 +67,7 @@ index e0c2dd3..ff9e66b6 100644
  #define FM_IOC_VSP_CONFIG_POOL_DEPLETION_COMPAT              _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(11), ioc_compat_fm_buf_pool_depletion_params_t)
  #endif
  #define FM_IOC_VSP_CONFIG_POOL_DEPLETION                     _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(11), ioc_fm_buf_pool_depletion_params_t)
-@@ -512,7 +512,7 @@ typedef struct ioc_fm_ctrl_mon_counters_params_t {
+@@ -512,7 +512,7 @@ typedef struct ioc_fm_ctrl_mon_counters_
  
   @Cautions      Allowed only following FM_VSP_Config() and before FM_VSP_Init().
  *//***************************************************************************/
@@ -80,7 +76,7 @@ index e0c2dd3..ff9e66b6 100644
  #define FM_IOC_VSP_CONFIG_BUFFER_PREFIX_CONTENT_COMPAT       _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(12), ioc_compat_fm_buffer_prefix_content_params_t)
  #endif
  #define FM_IOC_VSP_CONFIG_BUFFER_PREFIX_CONTENT              _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(12), ioc_fm_buffer_prefix_content_params_t)
-@@ -530,7 +530,7 @@ typedef struct ioc_fm_ctrl_mon_counters_params_t {
+@@ -530,7 +530,7 @@ typedef struct ioc_fm_ctrl_mon_counters_
  
   @Cautions      Allowed only following FM_VSP_Config() and before FM_VSP_Init().
  *//***************************************************************************/
@@ -89,7 +85,7 @@ index e0c2dd3..ff9e66b6 100644
  #define FM_IOC_VSP_CONFIG_NO_SG_COMPAT                     _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(13), ioc_compat_fm_vsp_config_no_sg_params_t)
  #endif
  #define FM_IOC_VSP_CONFIG_NO_SG                            _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(13), ioc_fm_vsp_config_no_sg_params_t)
-@@ -554,7 +554,7 @@ typedef struct ioc_fm_ctrl_mon_counters_params_t {
+@@ -554,7 +554,7 @@ typedef struct ioc_fm_ctrl_mon_counters_
  
   @Cautions      Allowed only following FM_VSP_Init().
  *//***************************************************************************/
@@ -98,7 +94,7 @@ index e0c2dd3..ff9e66b6 100644
  #define FM_IOC_VSP_GET_BUFFER_PRS_RESULT_COMPAT            _IOWR(FM_IOC_TYPE_BASE, FM_IOC_NUM(14), ioc_compat_fm_vsp_prs_result_params_t)
  #endif
  #define FM_IOC_VSP_GET_BUFFER_PRS_RESULT                   _IOWR(FM_IOC_TYPE_BASE, FM_IOC_NUM(14), ioc_fm_vsp_prs_result_params_t)
-@@ -612,7 +612,7 @@ typedef struct ioc_fm_ctrl_mon_counters_params_t {
+@@ -612,7 +612,7 @@ typedef struct ioc_fm_ctrl_mon_counters_
  
   @Cautions      Allowed only following FM_Init().
  *//***************************************************************************/
@@ -107,11 +103,9 @@ index e0c2dd3..ff9e66b6 100644
  #define FM_IOC_CTRL_MON_GET_COUNTERS_COMPAT                _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(17), ioc_compat_fm_ctrl_mon_counters_params_t)
  #endif
  #define FM_IOC_CTRL_MON_GET_COUNTERS                       _IOW(FM_IOC_TYPE_BASE, FM_IOC_NUM(17), ioc_fm_ctrl_mon_counters_params_t)
-diff --git a/include/uapi/linux/fmd/Peripherals/fm_pcd_ioctls.h b/include/uapi/linux/fmd/Peripherals/fm_pcd_ioctls.h
-index d13e878..0606e80 100644
 --- a/include/uapi/linux/fmd/Peripherals/fm_pcd_ioctls.h
 +++ b/include/uapi/linux/fmd/Peripherals/fm_pcd_ioctls.h
-@@ -312,7 +312,7 @@ typedef struct ioc_fm_pcd_kg_dflt_value_params_t {
+@@ -312,7 +312,7 @@ typedef struct ioc_fm_pcd_kg_dflt_value_
  
   @Cautions      Allowed only when PCD is disabled.
  *//***************************************************************************/
@@ -120,7 +114,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_PRS_LOAD_SW_COMPAT  _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(3), ioc_compat_fm_pcd_prs_sw_params_t)
  #endif
  #define FM_PCD_IOC_PRS_LOAD_SW  _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(3), ioc_fm_pcd_prs_sw_params_t)
-@@ -385,7 +385,7 @@ typedef struct ioc_fm_pcd_kg_dflt_value_params_t {
+@@ -385,7 +385,7 @@ typedef struct ioc_fm_pcd_kg_dflt_value_
  
   @Cautions      Allowed only following FM_PCD_Init() & FM_PCD_KgSchemeSet().
  *//***************************************************************************/
@@ -129,7 +123,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_KG_SCHEME_GET_CNTR_COMPAT  _IOR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(4), ioc_compat_fm_pcd_kg_scheme_spc_t)
  #endif
  #define FM_PCD_IOC_KG_SCHEME_GET_CNTR  _IOR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(4), ioc_fm_pcd_kg_scheme_spc_t)
-@@ -2413,7 +2413,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2413,7 +2413,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
   @Cautions      Allowed only following FM_PCD_MatchTableSet().
  *//***************************************************************************/
  
@@ -138,7 +132,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_GET_KEY_STAT_COMPAT   _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(12), ioc_compat_fm_pcd_cc_tbl_get_stats_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_GET_KEY_STAT  _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(12), ioc_fm_pcd_cc_tbl_get_stats_t)
-@@ -2439,7 +2439,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2439,7 +2439,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
   @Cautions      Allowed only following FM_PCD_MatchTableSet().
  *//***************************************************************************/
  
@@ -147,7 +141,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_GET_MISS_STAT_COMPAT   _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(13), ioc_compat_fm_pcd_cc_tbl_get_stats_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_GET_MISS_STAT  _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(13), ioc_fm_pcd_cc_tbl_get_stats_t)
-@@ -2463,7 +2463,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2463,7 +2463,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
   @Cautions      Allowed only following FM_PCD_HashTableSet().
  *//***************************************************************************/
  
@@ -156,7 +150,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_HASH_TABLE_GET_MISS_STAT_COMPAT   _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(14), ioc_compat_fm_pcd_cc_tbl_get_stats_t)
  #endif
  #define FM_PCD_IOC_HASH_TABLE_GET_MISS_STAT  _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(14), ioc_fm_pcd_cc_tbl_get_stats_t)
-@@ -2511,7 +2511,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2511,7 +2511,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -165,7 +159,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_NET_ENV_CHARACTERISTICS_SET_COMPAT   _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(20), ioc_compat_fm_pcd_net_env_params_t)
  #endif
  #define FM_PCD_IOC_NET_ENV_CHARACTERISTICS_SET  _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(20), ioc_fm_pcd_net_env_params_t)
-@@ -2525,7 +2525,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2525,7 +2525,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -174,7 +168,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_NET_ENV_CHARACTERISTICS_DELETE_COMPAT  _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(21), ioc_compat_fm_obj_t)
  #endif
  #define FM_PCD_IOC_NET_ENV_CHARACTERISTICS_DELETE   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(21), ioc_fm_obj_t)
-@@ -2544,7 +2544,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2544,7 +2544,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -183,7 +177,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_KG_SCHEME_SET_COMPAT     _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(24), ioc_compat_fm_pcd_kg_scheme_params_t)
  #endif
  #define FM_PCD_IOC_KG_SCHEME_SET    _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(24), ioc_fm_pcd_kg_scheme_params_t)
-@@ -2558,7 +2558,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2558,7 +2558,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -192,7 +186,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_KG_SCHEME_DELETE_COMPAT  _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(25), ioc_compat_fm_obj_t)
  #endif
  #define FM_PCD_IOC_KG_SCHEME_DELETE     _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(25), ioc_fm_obj_t)
-@@ -2575,7 +2575,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2575,7 +2575,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -201,7 +195,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_CC_ROOT_BUILD_COMPAT _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(26), compat_uptr_t)
  #endif
  #define FM_PCD_IOC_CC_ROOT_BUILD    _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(26), void *) /* workaround ...*/
-@@ -2587,7 +2587,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2587,7 +2587,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Param[in]     ioc_fm_obj_t - The id of a CC tree.
  *//***************************************************************************/
@@ -210,7 +204,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_CC_ROOT_DELETE_COMPAT    _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(27), ioc_compat_fm_obj_t)
  #endif
  #define FM_PCD_IOC_CC_ROOT_DELETE    _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(27), ioc_fm_obj_t)
-@@ -2604,7 +2604,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2604,7 +2604,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -219,7 +213,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_SET_COMPAT    _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(28), compat_uptr_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_SET    _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(28), void *) /* workaround ...*/
-@@ -2618,7 +2618,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2618,7 +2618,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -228,7 +222,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_DELETE_COMPAT    _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(29), ioc_compat_fm_obj_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_DELETE   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(29), ioc_fm_obj_t)
-@@ -2634,7 +2634,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2634,7 +2634,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_CcRootBuild().
  *//***************************************************************************/
@@ -237,7 +231,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_CC_ROOT_MODIFY_NEXT_ENGINE_COMPAT   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(30), ioc_compat_fm_pcd_cc_tree_modify_next_engine_params_t)
  #endif
  #define FM_PCD_IOC_CC_ROOT_MODIFY_NEXT_ENGINE   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(30), ioc_fm_pcd_cc_tree_modify_next_engine_params_t)
-@@ -2650,7 +2650,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2650,7 +2650,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_MatchTableSet().
  *//***************************************************************************/
@@ -246,7 +240,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_MODIFY_NEXT_ENGINE_COMPAT   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(31), ioc_compat_fm_pcd_cc_node_modify_next_engine_params_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_MODIFY_NEXT_ENGINE   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(31), ioc_fm_pcd_cc_node_modify_next_engine_params_t)
-@@ -2666,7 +2666,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2666,7 +2666,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_MatchTableSet().
  *//***************************************************************************/
@@ -255,7 +249,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_MODIFY_MISS_NEXT_ENGINE_COMPAT   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(32), ioc_compat_fm_pcd_cc_node_modify_next_engine_params_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_MODIFY_MISS_NEXT_ENGINE _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(32), ioc_fm_pcd_cc_node_modify_next_engine_params_t)
-@@ -2684,7 +2684,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2684,7 +2684,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
   @Cautions      Allowed only after FM_PCD_MatchTableSet() has been called for this
                  node and for all of the nodes that lead to it.
  *//***************************************************************************/
@@ -264,7 +258,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_REMOVE_KEY_COMPAT    _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(33), ioc_compat_fm_pcd_cc_node_remove_key_params_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_REMOVE_KEY   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(33), ioc_fm_pcd_cc_node_remove_key_params_t)
-@@ -2705,7 +2705,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2705,7 +2705,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
   @Cautions      Allowed only after FM_PCD_MatchTableSet() has been called for this
                  node and for all of the nodes that lead to it.
  *//***************************************************************************/
@@ -273,7 +267,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_ADD_KEY_COMPAT   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(34), ioc_compat_fm_pcd_cc_node_modify_key_and_next_engine_params_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_ADD_KEY  _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(34), ioc_fm_pcd_cc_node_modify_key_and_next_engine_params_t)
-@@ -2722,7 +2722,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2722,7 +2722,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
   @Cautions      Allowed only following FM_PCD_MatchTableSet() not only of the relevnt node but also
                  the node that points to this node
  *//***************************************************************************/
@@ -282,7 +276,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_MODIFY_KEY_AND_NEXT_ENGINE_COMPAT    _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(35), ioc_compat_fm_pcd_cc_node_modify_key_and_next_engine_params_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_MODIFY_KEY_AND_NEXT_ENGINE   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(35), ioc_fm_pcd_cc_node_modify_key_and_next_engine_params_t)
-@@ -2739,7 +2739,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2739,7 +2739,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
   @Cautions      Allowed only after FM_PCD_MatchTableSet() has been called for this
                  node and for all of the nodes that lead to it.
  *//***************************************************************************/
@@ -291,7 +285,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MATCH_TABLE_MODIFY_KEY_COMPAT    _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(36), ioc_compat_fm_pcd_cc_node_modify_key_params_t)
  #endif
  #define FM_PCD_IOC_MATCH_TABLE_MODIFY_KEY   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(36), ioc_fm_pcd_cc_node_modify_key_params_t)
-@@ -2766,7 +2766,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2766,7 +2766,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -300,7 +294,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_HASH_TABLE_SET_COMPAT _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(37), ioc_compat_fm_pcd_hash_table_params_t)
  #endif
  #define FM_PCD_IOC_HASH_TABLE_SET _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(37), ioc_fm_pcd_hash_table_params_t)
-@@ -2784,7 +2784,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2784,7 +2784,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_HashTableSet().
  *//***************************************************************************/
@@ -309,7 +303,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_HASH_TABLE_DELETE_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(37), ioc_compat_fm_obj_t)
  #endif
  #define FM_PCD_IOC_HASH_TABLE_DELETE _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(37), ioc_fm_obj_t)
-@@ -2803,7 +2803,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2803,7 +2803,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_HashTableSet().
  *//***************************************************************************/
@@ -318,7 +312,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_HASH_TABLE_ADD_KEY_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(39), ioc_compat_fm_pcd_hash_table_add_key_params_t)
  #endif
  #define FM_PCD_IOC_HASH_TABLE_ADD_KEY _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(39), ioc_fm_pcd_hash_table_add_key_params_t)
-@@ -2820,7 +2820,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2820,7 +2820,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_HashTableSet().
  *//***************************************************************************/
@@ -327,7 +321,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_HASH_TABLE_REMOVE_KEY_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(40), ioc_compat_fm_pcd_hash_table_remove_key_params_t)
  #endif
  #define FM_PCD_IOC_HASH_TABLE_REMOVE_KEY _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(40), ioc_fm_pcd_hash_table_remove_key_params_t)
-@@ -2836,7 +2836,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2836,7 +2836,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -336,7 +330,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_PLCR_PROFILE_SET_COMPAT     _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(41), ioc_compat_fm_pcd_plcr_profile_params_t)
  #endif
  #define FM_PCD_IOC_PLCR_PROFILE_SET     _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(41), ioc_fm_pcd_plcr_profile_params_t)
-@@ -2851,7 +2851,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2851,7 +2851,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -345,7 +339,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_PLCR_PROFILE_DELETE_COMPAT   _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(41), ioc_compat_fm_obj_t)
  #endif
  #define FM_PCD_IOC_PLCR_PROFILE_DELETE  _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(41), ioc_fm_obj_t)
-@@ -2867,7 +2867,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2867,7 +2867,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        A handle to the initialized object on success; NULL code otherwise.
  *//***************************************************************************/
@@ -354,7 +348,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MANIP_NODE_SET_COMPAT    _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(43), ioc_compat_fm_pcd_manip_params_t)
  #endif
  #define FM_PCD_IOC_MANIP_NODE_SET   _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(43), ioc_fm_pcd_manip_params_t)
-@@ -2887,7 +2887,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2887,7 +2887,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_ManipNodeSet().
  *//***************************************************************************/
@@ -363,7 +357,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MANIP_NODE_REPLACE_COMPAT    FM_PCD_IOC_MANIP_NODE_SET_COMPAT
  #endif
  #define FM_PCD_IOC_MANIP_NODE_REPLACE           FM_PCD_IOC_MANIP_NODE_SET
-@@ -2903,7 +2903,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2903,7 +2903,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_ManipNodeSet().
  *//***************************************************************************/
@@ -372,7 +366,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MANIP_NODE_DELETE_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(44), ioc_compat_fm_obj_t)
  #endif
  #define FM_PCD_IOC_MANIP_NODE_DELETE    _IOW(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(44), ioc_fm_obj_t)
-@@ -2920,7 +2920,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2920,7 +2920,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_ManipNodeSet().
  *//***************************************************************************/
@@ -381,7 +375,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_MANIP_GET_STATS_COMPAT  _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(50), ioc_compat_fm_pcd_manip_get_stats_t)
  #endif
  #define FM_PCD_IOC_MANIP_GET_STATS   _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(50), ioc_fm_pcd_manip_get_stats_t)
-@@ -2953,7 +2953,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2953,7 +2953,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_Init().
  *//***************************************************************************/
@@ -390,7 +384,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_FRM_REPLIC_GROUP_SET_COMPAT _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(46), ioc_compat_fm_pcd_frm_replic_group_params_t)
  #endif
  #define FM_PCD_IOC_FRM_REPLIC_GROUP_SET _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(46), ioc_fm_pcd_frm_replic_group_params_t)
-@@ -2969,7 +2969,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2969,7 +2969,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_FrmReplicSetGroup().
  *//***************************************************************************/
@@ -399,7 +393,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_FRM_REPLIC_GROUP_DELETE_COMPAT _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(47), ioc_compat_fm_obj_t)
  #endif
  #define FM_PCD_IOC_FRM_REPLIC_GROUP_DELETE _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(47), ioc_fm_obj_t)
-@@ -2987,7 +2987,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -2987,7 +2987,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_FrmReplicSetGroup() of this group.
  *//***************************************************************************/
@@ -408,7 +402,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_FRM_REPLIC_MEMBER_ADD_COMPAT _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(48), ioc_compat_fm_pcd_frm_replic_member_params_t)
  #endif
  #define FM_PCD_IOC_FRM_REPLIC_MEMBER_ADD _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(48), ioc_fm_pcd_frm_replic_member_params_t)
-@@ -3004,7 +3004,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -3004,7 +3004,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Cautions      Allowed only following FM_PCD_FrmReplicSetGroup() of this group.
  *//***************************************************************************/
@@ -417,7 +411,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_FRM_REPLIC_MEMBER_REMOVE_COMPAT _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(49), ioc_compat_fm_pcd_frm_replic_member_t)
  #endif
  #define FM_PCD_IOC_FRM_REPLIC_MEMBER_REMOVE _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(49), ioc_fm_pcd_frm_replic_member_t)
-@@ -3021,7 +3021,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -3021,7 +3021,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  
   @Return        0 on success; Error code otherwise.
  *//***************************************************************************/
@@ -426,7 +420,7 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_STATISTICS_SET_NODE_COMPAT _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(45), void *)
  #endif
  #define FM_PCD_IOC_STATISTICS_SET_NODE _IOWR(FM_IOC_TYPE_BASE, FM_PCD_IOC_NUM(45), void *)
-@@ -3029,7 +3029,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_stats_t {
+@@ -3029,7 +3029,7 @@ typedef struct ioc_fm_pcd_cc_tbl_get_sta
  #endif /* FM_CAPWAP_SUPPORT */
  
  #ifdef NCSW_BACKWARD_COMPATIBLE_API
@@ -435,11 +429,9 @@ index d13e878..0606e80 100644
  #define FM_PCD_IOC_SET_NET_ENV_CHARACTERISTICS_COMPAT \
                                                  FM_PCD_IOC_NET_ENV_CHARACTERISTICS_SET_COMPAT
  #define FM_PCD_IOC_DELETE_NET_ENV_CHARACTERISTICS_COMPAT \
-diff --git a/include/uapi/linux/fmd/Peripherals/fm_port_ioctls.h b/include/uapi/linux/fmd/Peripherals/fm_port_ioctls.h
-index eb9bd9a..23150e5 100644
 --- a/include/uapi/linux/fmd/Peripherals/fm_port_ioctls.h
 +++ b/include/uapi/linux/fmd/Peripherals/fm_port_ioctls.h
-@@ -589,7 +589,7 @@ typedef struct ioc_fm_port_pcd_fqids_params_t {
+@@ -589,7 +589,7 @@ typedef struct ioc_fm_port_pcd_fqids_par
  
   @Return        0 on success; error code otherwise.
  *//***************************************************************************/
@@ -448,7 +440,7 @@ index eb9bd9a..23150e5 100644
  #define FM_PORT_IOC_SET_PCD_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(20), ioc_compat_fm_port_pcd_params_t)
  #endif
  #define FM_PORT_IOC_SET_PCD _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(20), ioc_fm_port_pcd_params_t)
-@@ -674,7 +674,7 @@ typedef struct ioc_fm_port_pcd_fqids_params_t {
+@@ -674,7 +674,7 @@ typedef struct ioc_fm_port_pcd_fqids_par
  
   @Return        0 on success; error code otherwise.
  *//***************************************************************************/
@@ -457,7 +449,7 @@ index eb9bd9a..23150e5 100644
  #define FM_PORT_IOC_PCD_KG_MODIFY_INITIAL_SCHEME_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(26), ioc_compat_fm_pcd_kg_scheme_select_t)
  #endif
  #define FM_PORT_IOC_PCD_KG_MODIFY_INITIAL_SCHEME _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(26), ioc_fm_pcd_kg_scheme_select_t)
-@@ -691,7 +691,7 @@ typedef struct ioc_fm_port_pcd_fqids_params_t {
+@@ -691,7 +691,7 @@ typedef struct ioc_fm_port_pcd_fqids_par
  
   @Return        0 on success; error code otherwise.
  *//***************************************************************************/
@@ -466,7 +458,7 @@ index eb9bd9a..23150e5 100644
  #define FM_PORT_IOC_PCD_PLCR_MODIFY_INITIAL_PROFILE_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(27), ioc_compat_fm_obj_t)
  #endif
  #define FM_PORT_IOC_PCD_PLCR_MODIFY_INITIAL_PROFILE _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(27), ioc_fm_obj_t)
-@@ -708,7 +708,7 @@ typedef struct ioc_fm_port_pcd_fqids_params_t {
+@@ -708,7 +708,7 @@ typedef struct ioc_fm_port_pcd_fqids_par
  
   @Cautions      Allowed only following FM_PORT_SetPCD() and FM_PORT_DetachPCD()
  *//***************************************************************************/
@@ -475,7 +467,7 @@ index eb9bd9a..23150e5 100644
  #define FM_PORT_IOC_PCD_CC_MODIFY_TREE_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(28), ioc_compat_fm_obj_t)
  #endif
  #define FM_PORT_IOC_PCD_CC_MODIFY_TREE _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(28), ioc_fm_obj_t)
-@@ -726,7 +726,7 @@ typedef struct ioc_fm_port_pcd_fqids_params_t {
+@@ -726,7 +726,7 @@ typedef struct ioc_fm_port_pcd_fqids_par
  
   @Cautions      Allowed only following FM_PORT_SetPCD().
  *//***************************************************************************/
@@ -484,7 +476,7 @@ index eb9bd9a..23150e5 100644
  #define FM_PORT_IOC_PCD_KG_BIND_SCHEMES_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(30), ioc_compat_fm_pcd_port_schemes_params_t)
  #endif
  #define FM_PORT_IOC_PCD_KG_BIND_SCHEMES _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(30), ioc_fm_pcd_port_schemes_params_t)
-@@ -744,7 +744,7 @@ typedef struct ioc_fm_port_pcd_fqids_params_t {
+@@ -744,7 +744,7 @@ typedef struct ioc_fm_port_pcd_fqids_par
  
   @Cautions      Allowed only following FM_PORT_SetPCD().
  *//***************************************************************************/
@@ -493,7 +485,7 @@ index eb9bd9a..23150e5 100644
  #define FM_PORT_IOC_PCD_KG_UNBIND_SCHEMES_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(31), ioc_compat_fm_pcd_port_schemes_params_t)
  #endif
  #define FM_PORT_IOC_PCD_KG_UNBIND_SCHEMES _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(31), ioc_fm_pcd_port_schemes_params_t)
-@@ -917,7 +917,7 @@ typedef struct ioc_fm_port_vsp_alloc_params_t {
+@@ -917,7 +917,7 @@ typedef struct ioc_fm_port_vsp_alloc_par
   @Cautions      Allowed only following FM_PORT_Init(), and before FM_PORT_SetPCD()
                  and also before FM_PORT_Enable() (i.e. the port should be disabled).
  *//***************************************************************************/
@@ -502,8 +494,6 @@ index eb9bd9a..23150e5 100644
  #define FM_PORT_IOC_VSP_ALLOC_COMPAT _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(38), ioc_compat_fm_port_vsp_alloc_params_t)
  #endif
  #define FM_PORT_IOC_VSP_ALLOC _IOW(FM_IOC_TYPE_BASE, FM_PORT_IOC_NUM(38), ioc_fm_port_vsp_alloc_params_t)
-diff --git a/include/uapi/linux/fmd/Peripherals/fm_test_ioctls.h b/include/uapi/linux/fmd/Peripherals/fm_test_ioctls.h
-index 207ed1e..2646704 100644
 --- a/include/uapi/linux/fmd/Peripherals/fm_test_ioctls.h
 +++ b/include/uapi/linux/fmd/Peripherals/fm_test_ioctls.h
 @@ -90,7 +90,7 @@ typedef struct ioc_fmt_buff_context_t {
@@ -524,6 +514,3 @@ index 207ed1e..2646704 100644
  typedef struct ioc_fmt_compat_buff_desc_t {
      uint32_t                qid;
      compat_uptr_t           p_data;
--- 
-2.7.4
-
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 c4dc00a916..1d1e63a07c 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
@@ -54,7 +54,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
  	 * 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
-@@ -3427,6 +3427,10 @@ int dwc3_gadget_init(struct dwc3 *dwc)
+@@ -3495,6 +3495,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-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch b/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
index 635850ec7b..0ecfb978e4 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
@@ -24,7 +24,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
 
 --- a/drivers/usb/host/xhci-hub.c
 +++ b/drivers/usb/host/xhci-hub.c
-@@ -1419,6 +1419,15 @@ int xhci_hub_control(struct usb_hcd *hcd
+@@ -1420,6 +1420,15 @@ int xhci_hub_control(struct usb_hcd *hcd
  			/* 4.19.6 Port Test Modes (USB2 Test Mode) */
  			if (hcd->speed != HCD_USB2)
  				goto error;
@@ -174,7 +174,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
   * bursts that are required to move all packets in this TD.  Only SuperSpeed
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -5361,6 +5361,7 @@ static const struct hc_driver xhci_hc_dr
+@@ -5362,6 +5362,7 @@ static const struct hc_driver xhci_hc_dr
  	.disable_usb3_lpm_timeout =	xhci_disable_usb3_lpm_timeout,
  	.find_raw_port_number =	xhci_find_raw_port_number,
  	.clear_tt_buffer_complete = xhci_clear_tt_buffer_complete,
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch b/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
index 57818b1136..3140058689 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
@@ -24,7 +24,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
 
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -5378,6 +5378,8 @@ void xhci_init_driver(struct hc_driver *
+@@ -5379,6 +5379,8 @@ void xhci_init_driver(struct hc_driver *
  			drv->reset = over->reset;
  		if (over->start)
  			drv->start = over->start;
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch b/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch
index 9cbf4ee139..b31c695794 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch
@@ -16,7 +16,7 @@ Signed-off-by: Li Jun <jun.li@nxp.com>
 
 --- a/drivers/usb/host/xhci-hub.c
 +++ b/drivers/usb/host/xhci-hub.c
-@@ -1732,7 +1732,8 @@ static bool xhci_port_missing_cas_quirk(
+@@ -1733,7 +1733,8 @@ static bool xhci_port_missing_cas_quirk(
  		return false;
  
  	if (((portsc & PORT_PLS_MASK) != XDEV_POLLING) &&