diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-20 09:49:08 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-20 15:50:00 +0200 |
commit | 9ed98198cb5096be60db7f44127c69d0a4eee214 (patch) | |
tree | 4d0ba19df71c8180b4a74b5f07eabe68556841c4 /target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch | |
parent | 76c963bb01fbd97a26f9fba6310d6ba71b659895 (diff) | |
download | upstream-9ed98198cb5096be60db7f44127c69d0a4eee214.tar.gz upstream-9ed98198cb5096be60db7f44127c69d0a4eee214.tar.bz2 upstream-9ed98198cb5096be60db7f44127c69d0a4eee214.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/821-smmu-support-layerscape.patch')
-rw-r--r-- | target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch | 4 |
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 |