kernel: bump 5.4 to 5.4.211

Similar version was upstreamed:
 bcm27xx/patches-5.4/950-0392-tty-amba-pl011-Add-un-throttle-support.patch

Manually adapted:
 ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
 layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch

Compile-tested: x86/64
Run-tested: x86/64

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

9 files changed, 30 insertions, 30 deletions

diff --git a/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch b/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch
index e2da01fb0f..f232198319 100644
--- a/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch
+++ b/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch
@@ -63,8 +63,8 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
   * address space as memory. Needed when the kernel wants to execute
 --- a/arch/arm/mm/mmu.c
 +++ b/arch/arm/mm/mmu.c
-@@ -316,6 +316,13 @@ static struct mem_type mem_types[] __ro_
- 		.prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
+@@ -323,6 +323,13 @@ static struct mem_type mem_types[] __ro_
+ 		.prot_sect = PMD_TYPE_SECT,
  		.domain    = DOMAIN_KERNEL,
  	},
 +	[MT_MEMORY_RW_NS] = {
@@ -77,7 +77,7 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
  	[MT_ROM] = {
  		.prot_sect = PMD_TYPE_SECT,
  		.domain    = DOMAIN_KERNEL,
-@@ -652,6 +659,7 @@ static void __init build_mem_type_table(
+@@ -663,6 +670,7 @@ static void __init build_mem_type_table(
  	}
  	kern_pgprot |= PTE_EXT_AF;
  	vecs_pgprot |= PTE_EXT_AF;
@@ -85,11 +85,11 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
  
  	/*
  	 * Set PXN for user mappings
-@@ -680,6 +688,7 @@ static void __init build_mem_type_table(
+@@ -691,6 +699,7 @@ static void __init build_mem_type_table(
  	mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
  	mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
  	mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
 +	mem_types[MT_MEMORY_RW_NS].prot_sect |= ecc_mask | cp->pmd;
+ 	mem_types[MT_MEMORY_RO].prot_sect |= ecc_mask | cp->pmd;
+ 	mem_types[MT_MEMORY_RO].prot_pte |= kern_pgprot;
  	mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
- 	mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
- 	mem_types[MT_ROM].prot_sect |= cp->pmd;
diff --git a/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch b/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
index f2559cdab3..79323b618d 100644
--- a/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
+++ b/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
@@ -27,7 +27,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	/* internal flags, do not use outside cgroup core proper */
  	__CFTYPE_ONLY_ON_DFL	= (1 << 16),	/* only on default hierarchy */
  	__CFTYPE_NOT_ON_DFL	= (1 << 17),	/* not on default hierarchy */
-@@ -544,6 +546,7 @@ struct cftype {
+@@ -545,6 +547,7 @@ struct cftype {
  	 * end of cftype array.
  	 */
  	char name[MAX_CFTYPE_NAME];
@@ -37,7 +37,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	/*
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -1465,8 +1465,8 @@ struct cgroup *task_cgroup_from_root(str
+@@ -1467,8 +1467,8 @@ struct cgroup *task_cgroup_from_root(str
  
  static struct kernfs_syscall_ops cgroup_kf_syscall_ops;
  
@@ -48,7 +48,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  {
  	struct cgroup_subsys *ss = cft->ss;
  
-@@ -1476,13 +1476,26 @@ static char *cgroup_file_name(struct cgr
+@@ -1478,13 +1478,26 @@ static char *cgroup_file_name(struct cgr
  
  		snprintf(buf, CGROUP_FILE_NAME_MAX, "%s%s.%s",
  			 dbg, cgroup_on_dfl(cgrp) ? ss->name : ss->legacy_name,
@@ -77,7 +77,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  /**
   * cgroup_file_mode - deduce file mode of a control file
   * @cft: the control file in question
-@@ -1641,6 +1654,9 @@ static void cgroup_rm_file(struct cgroup
+@@ -1643,6 +1656,9 @@ static void cgroup_rm_file(struct cgroup
  	}
  
  	kernfs_remove_by_name(cgrp->kn, cgroup_file_name(cgrp, cft, name));
@@ -87,7 +87,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  }
  
  /**
-@@ -3924,6 +3940,7 @@ static int cgroup_add_file(struct cgroup
+@@ -3933,6 +3949,7 @@ static int cgroup_add_file(struct cgroup
  {
  	char name[CGROUP_FILE_NAME_MAX];
  	struct kernfs_node *kn;
@@ -95,7 +95,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	struct lock_class_key *key = NULL;
  	int ret;
  
-@@ -3954,6 +3971,14 @@ static int cgroup_add_file(struct cgroup
+@@ -3963,6 +3980,14 @@ static int cgroup_add_file(struct cgroup
  		spin_unlock_irq(&cgroup_file_kn_lock);
  	}
  
diff --git a/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch b/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
index 4126b873bb..0a2925f583 100644
--- a/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
+++ b/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
@@ -29,7 +29,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	/* internal flags, do not use outside cgroup core proper */
  	__CFTYPE_ONLY_ON_DFL	= (1 << 16),	/* only on default hierarchy */
  	__CFTYPE_NOT_ON_DFL	= (1 << 17),	/* not on default hierarchy */
-@@ -546,7 +544,6 @@ struct cftype {
+@@ -547,7 +545,6 @@ struct cftype {
  	 * end of cftype array.
  	 */
  	char name[MAX_CFTYPE_NAME];
@@ -39,7 +39,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	/*
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -1465,8 +1465,8 @@ struct cgroup *task_cgroup_from_root(str
+@@ -1467,8 +1467,8 @@ struct cgroup *task_cgroup_from_root(str
  
  static struct kernfs_syscall_ops cgroup_kf_syscall_ops;
  
@@ -50,7 +50,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  {
  	struct cgroup_subsys *ss = cft->ss;
  
-@@ -1476,26 +1476,13 @@ static char *cgroup_fill_name(struct cgr
+@@ -1478,26 +1478,13 @@ static char *cgroup_fill_name(struct cgr
  
  		snprintf(buf, CGROUP_FILE_NAME_MAX, "%s%s.%s",
  			 dbg, cgroup_on_dfl(cgrp) ? ss->name : ss->legacy_name,
@@ -79,7 +79,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  /**
   * cgroup_file_mode - deduce file mode of a control file
   * @cft: the control file in question
-@@ -1654,9 +1641,6 @@ static void cgroup_rm_file(struct cgroup
+@@ -1656,9 +1643,6 @@ static void cgroup_rm_file(struct cgroup
  	}
  
  	kernfs_remove_by_name(cgrp->kn, cgroup_file_name(cgrp, cft, name));
@@ -89,7 +89,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  }
  
  /**
-@@ -3940,7 +3924,6 @@ static int cgroup_add_file(struct cgroup
+@@ -3949,7 +3933,6 @@ static int cgroup_add_file(struct cgroup
  {
  	char name[CGROUP_FILE_NAME_MAX];
  	struct kernfs_node *kn;
@@ -97,7 +97,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	struct lock_class_key *key = NULL;
  	int ret;
  
-@@ -3971,14 +3954,6 @@ static int cgroup_add_file(struct cgroup
+@@ -3980,14 +3963,6 @@ static int cgroup_add_file(struct cgroup
  		spin_unlock_irq(&cgroup_file_kn_lock);
  	}
  
diff --git a/target/linux/layerscape/patches-5.4/816-sdhc-0001-mmc-sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch b/target/linux/layerscape/patches-5.4/816-sdhc-0001-mmc-sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch
index ec1f8324d4..35f4c1bf84 100644
--- a/target/linux/layerscape/patches-5.4/816-sdhc-0001-mmc-sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch
+++ b/target/linux/layerscape/patches-5.4/816-sdhc-0001-mmc-sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch
@@ -58,7 +58,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  	}
  
  	/* Wait max 20 ms */
-@@ -892,10 +916,7 @@ static void esdhc_tuning_block_enable(st
+@@ -893,10 +917,7 @@ static void esdhc_tuning_block_enable(st
  	u32 val;
  
  	esdhc_clock_enable(host, false);
diff --git a/target/linux/layerscape/patches-5.4/816-sdhc-0002-LF-605-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch b/target/linux/layerscape/patches-5.4/816-sdhc-0002-LF-605-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch
index 71db685b7f..66518ca01e 100644
--- a/target/linux/layerscape/patches-5.4/816-sdhc-0002-LF-605-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch
+++ b/target/linux/layerscape/patches-5.4/816-sdhc-0002-LF-605-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch
@@ -15,7 +15,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
 
 --- a/drivers/mmc/host/sdhci-of-esdhc.c
 +++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -928,20 +928,11 @@ static void esdhc_tuning_block_enable(st
+@@ -929,20 +929,11 @@ static void esdhc_tuning_block_enable(st
  	esdhc_clock_enable(host, true);
  }
  
@@ -37,7 +37,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
  	/* Write TBCTL[11:8]=4'h8 */
  	val = sdhci_readl(host, ESDHC_TBCTL);
  	val &= ~(0xf << 8);
-@@ -960,6 +951,25 @@ static void esdhc_prepare_sw_tuning(stru
+@@ -961,6 +952,25 @@ static void esdhc_prepare_sw_tuning(stru
  	val = sdhci_readl(host, ESDHC_TBSTAT);
  	val = sdhci_readl(host, ESDHC_TBSTAT);
  
@@ -63,7 +63,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
  	/* Reset data lines by setting ESDHCCTL[RSTD] */
  	sdhci_reset(host, SDHCI_RESET_DATA);
  	/* Write 32'hFFFF_FFFF to IRQSTAT register */
-@@ -970,10 +980,8 @@ static void esdhc_prepare_sw_tuning(stru
+@@ -971,10 +981,8 @@ static void esdhc_prepare_sw_tuning(stru
  	 * then program TBPTR[TB_WNDW_END_PTR] = 4 * div_ratio
  	 * and program TBPTR[TB_WNDW_START_PTR] = 8 * div_ratio.
  	 */
diff --git a/target/linux/layerscape/patches-5.4/816-sdhc-0003-LF-605-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch b/target/linux/layerscape/patches-5.4/816-sdhc-0003-LF-605-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch
index f9dc0c0ca8..f9722b3698 100644
--- a/target/linux/layerscape/patches-5.4/816-sdhc-0003-LF-605-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch
+++ b/target/linux/layerscape/patches-5.4/816-sdhc-0003-LF-605-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch
@@ -20,7 +20,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
 
 --- a/drivers/mmc/host/sdhci-of-esdhc.c
 +++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -894,20 +894,20 @@ static int esdhc_signal_voltage_switch(s
+@@ -895,20 +895,20 @@ static int esdhc_signal_voltage_switch(s
  }
  
  static struct soc_device_attribute soc_tuning_erratum_type1[] = {
@@ -51,7 +51,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
  	{ },
  };
  
-@@ -975,13 +975,13 @@ static void esdhc_prepare_sw_tuning(stru
+@@ -976,13 +976,13 @@ static void esdhc_prepare_sw_tuning(stru
  	/* Write 32'hFFFF_FFFF to IRQSTAT register */
  	sdhci_writel(host, 0xFFFFFFFF, SDHCI_INT_STATUS);
  
@@ -68,7 +68,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
  		*window_start = 8 * esdhc->div_ratio;
  		*window_end = 4 * esdhc->div_ratio;
  	} else {
-@@ -1065,6 +1065,19 @@ static int esdhc_execute_tuning(struct m
+@@ -1066,6 +1066,19 @@ static int esdhc_execute_tuning(struct m
  		if (ret)
  			break;
  
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 cd6c0f66f6..b27e6bd468 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
-@@ -3699,6 +3699,10 @@ int dwc3_gadget_init(struct dwc3 *dwc)
+@@ -3701,6 +3701,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-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch b/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
index e4feadec9f..e232cee622 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
@@ -20,7 +20,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
 
 --- a/drivers/usb/core/hcd.c
 +++ b/drivers/usb/core/hcd.c
-@@ -2125,6 +2125,140 @@ int usb_hcd_get_frame_number (struct usb
+@@ -2128,6 +2128,140 @@ int usb_hcd_get_frame_number (struct usb
  }
  
  /*-------------------------------------------------------------------------*/
@@ -335,7 +335,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
  	int             is_setup
 --- a/include/linux/usb/hcd.h
 +++ b/include/linux/usb/hcd.h
-@@ -411,7 +411,10 @@ struct hc_driver {
+@@ -412,7 +412,10 @@ struct hc_driver {
  	int	(*find_raw_port_number)(struct usb_hcd *, int);
  	/* Call for power on/off the port if necessary */
  	int	(*port_power)(struct usb_hcd *hcd, int portnum, bool enable);
@@ -347,7 +347,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
  };
  
  static inline int hcd_giveback_urb_in_bh(struct usb_hcd *hcd)
-@@ -476,6 +479,14 @@ int usb_hcd_setup_local_mem(struct usb_h
+@@ -477,6 +480,14 @@ int usb_hcd_setup_local_mem(struct usb_h
  
  struct platform_device;
  extern void usb_hcd_platform_shutdown(struct platform_device *dev);
diff --git a/target/linux/layerscape/patches-5.4/901-fix_irq_type_of_pca953x.patch b/target/linux/layerscape/patches-5.4/901-fix_irq_type_of_pca953x.patch
index 5f022ac27f..0293254e8e 100644
--- a/target/linux/layerscape/patches-5.4/901-fix_irq_type_of_pca953x.patch
+++ b/target/linux/layerscape/patches-5.4/901-fix_irq_type_of_pca953x.patch
@@ -11,7 +11,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
 
 --- a/drivers/gpio/gpio-pca953x.c
 +++ b/drivers/gpio/gpio-pca953x.c
-@@ -881,10 +881,12 @@ static int pca953x_irq_setup(struct pca9
+@@ -884,10 +884,12 @@ static int pca953x_irq_setup(struct pca9
  	for (i = 0; i < NBANK(chip); i++)
  		chip->irq_stat[i] &= reg_direction[i];
  	mutex_init(&chip->irq_lock);