From 22c4f06097169e7ffda0b2c1aa37ab9a3e1837a0 Mon Sep 17 00:00:00 2001
From: Pablo Greco <pgreco@centosproject.org>
Date: Mar 28 2021 13:46:09 +0000
Subject: Fix honeycomb patch


---

diff --git a/SOURCES/linux-5.10-lx2160a-network.patch b/SOURCES/linux-5.10-lx2160a-network.patch
index 648976f..3e2b443 100644
--- a/SOURCES/linux-5.10-lx2160a-network.patch
+++ b/SOURCES/linux-5.10-lx2160a-network.patch
@@ -242,10 +242,10 @@ Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
  drivers/mmc/core/host.c            | 30 +++++++++-----
  drivers/mmc/host/of_mmc_spi.c      |  2 +-
  drivers/mmc/host/sdhci-esdhc-imx.c |  2 +-
- drivers/mmc/host/sdhci-of-esdhc.c  | 64 +++++++++++++++++++-----------
+ drivers/mmc/host/sdhci-of-esdhc.c  | 66 +++++++++++++++++++-----------
  drivers/mmc/host/sdhci-pltfm.c     |  1 +
  include/linux/mmc/host.h           |  2 +-
- 7 files changed, 65 insertions(+), 38 deletions(-)
+ 7 files changed, 67 insertions(+), 38 deletions(-)
 
 diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
 index d42037f0f10d..35649b95a860 100644
@@ -444,11 +444,13 @@ index ab5ab969f711..62a70b39497d 100644
  
  	ret = sdhci_add_host(host);
  	if (ret)
-@@ -1506,6 +1521,7 @@ static struct platform_driver sdhci_esdhc_driver = {
+@@ -1506,6 +1521,9 @@ static struct platform_driver sdhci_esdhc_driver = {
  		.name = "sdhci-esdhc",
  		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
  		.of_match_table = sdhci_esdhc_of_match,
++#ifdef CONFIG_ACPI
 +		.acpi_match_table = sdhci_esdhc_ids,
++#endif
  		.pm = &esdhc_of_dev_pm_ops,
  	},
  	.probe = sdhci_esdhc_probe,
@@ -873,9 +875,9 @@ and set up necessary mappings.
 Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
 ---
  drivers/iommu/dma-iommu.c | 36 ++++++++++++++++++++++++++++++++++++
- include/linux/dma-iommu.h |  7 +++++++
+ include/linux/dma-iommu.h |  8 ++++++++
  include/linux/iommu.h     | 16 ++++++++++++++++
- 3 files changed, 59 insertions(+)
+ 3 files changed, 60 insertions(+)
 
 diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
 index 0cbcd3fc3e7e..d73768ecdd1a 100644
@@ -928,7 +930,7 @@ diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
 index 2112f21f73d8..f502855e4da0 100644
 --- a/include/linux/dma-iommu.h
 +++ b/include/linux/dma-iommu.h
-@@ -37,6 +37,9 @@ void iommu_dma_compose_msi_msg(struct msi_desc *desc,
+@@ -37,7 +37,11 @@ void iommu_dma_compose_msi_msg(struct msi_desc *desc,
  
  void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list);
  
@@ -936,13 +938,15 @@ index 2112f21f73d8..f502855e4da0 100644
 +struct iommu_rmr *iommu_dma_alloc_rmr(u64 base, u64 length,
 +				      u32 *ids, int num_ids);
  #else /* CONFIG_IOMMU_DMA */
++#include <linux/fwnode.h>
  
  struct iommu_domain;
-@@ -78,5 +81,9 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he
+ struct msi_desc;
+@@ -78,5 +82,9 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he
  {
  }
  
-+int iommu_dma_get_rmrs(struct fwnode_handle *iommu, struct list_head *list)
++static inline int iommu_dma_get_rmrs(struct fwnode_handle *iommu, struct list_head *list)
 +{
 +	return 0;
 +}
@@ -995,8 +999,8 @@ Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
 ---
  drivers/acpi/arm64/iort.c | 60 +++++++++++++++++++++++++++++++++++++++
  drivers/iommu/dma-iommu.c |  3 ++
- include/linux/acpi_iort.h |  7 +++++
- 3 files changed, 70 insertions(+)
+ include/linux/acpi_iort.h |  6 ++++
+ 3 files changed, 69 insertions(+)
 
 diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
 index 69a20d7e0c84..8f86779d283a 100644