aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-20 09:47:47 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-20 15:48:48 +0200
commit6592dddd1567817bcb07a5ec2bbed2876fe38c0c (patch)
treec6fc070ae5ee6734c777f6eb270c5ba215130a03 /target/linux/layerscape/patches-4.14
parent71f0333480f1640de62a83ef577ec50dfa9fa24f (diff)
downloadupstream-6592dddd1567817bcb07a5ec2bbed2876fe38c0c.tar.gz
upstream-6592dddd1567817bcb07a5ec2bbed2876fe38c0c.tar.bz2
upstream-6592dddd1567817bcb07a5ec2bbed2876fe38c0c.zip
kernel: bump 4.14 to 4.14.128
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.14')
-rw-r--r--target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch b/target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch
index 7c11e2c84b..973146cedf 100644
--- a/target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch
@@ -93,7 +93,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
#include "io-pgtable.h"
#include "arm-smmu-regs.h"
-@@ -1465,6 +1466,8 @@ static struct iommu_group *arm_smmu_devi
+@@ -1474,6 +1475,8 @@ static struct iommu_group *arm_smmu_devi
if (dev_is_pci(dev))
group = pci_device_group(dev);
@@ -102,7 +102,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
else
group = generic_device_group(dev);
-@@ -2043,6 +2046,10 @@ static void arm_smmu_bus_init(void)
+@@ -2052,6 +2055,10 @@ static void arm_smmu_bus_init(void)
bus_set_iommu(&pci_bus_type, &arm_smmu_ops);
}
#endif