aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-05-30 21:39:51 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-06-02 15:13:12 +0200
commit2328977fed81cf2fc367d8eea2f9bf04e51a761f (patch)
treeb6e2e89fcc861cf7fdba5e2979d7458ce912a348 /target/linux/layerscape
parent6e47c22268d5c89971950052aceda03810c88c75 (diff)
downloadupstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.gz
upstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.bz2
upstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.zip
kernel: bump kernel 4.4 to 4.4.135 for 17.01
* Refreshed patches Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/64b/config-default1
-rw-r--r--target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch2
-rw-r--r--target/linux/layerscape/patches-4.4/8236-clk-add-API-of-clks.patch2
3 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/layerscape/64b/config-default b/target/linux/layerscape/64b/config-default
index 960b0770e4..cc1d5eb16c 100644
--- a/target/linux/layerscape/64b/config-default
+++ b/target/linux/layerscape/64b/config-default
@@ -35,6 +35,7 @@ CONFIG_ARM64=y
CONFIG_ARM64_4K_PAGES=y
# CONFIG_ARM64_64K_PAGES is not set
# CONFIG_ARM64_CRYPTO is not set
+# CONFIG_ARM64_ERRATUM_1024718 is not set
CONFIG_ARM64_ERRATUM_819472=y
CONFIG_ARM64_ERRATUM_824069=y
CONFIG_ARM64_ERRATUM_826319=y
diff --git a/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch b/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch
index 906d336d38..4466b10566 100644
--- a/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch
+++ b/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch
@@ -204,7 +204,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
}
-@@ -3672,11 +3674,12 @@ static void quirk_fixed_dma_alias(struct
+@@ -3677,11 +3679,12 @@ static void quirk_fixed_dma_alias(struct
id = pci_match_id(fixed_dma_alias_tbl, dev);
if (id) {
diff --git a/target/linux/layerscape/patches-4.4/8236-clk-add-API-of-clks.patch b/target/linux/layerscape/patches-4.4/8236-clk-add-API-of-clks.patch
index ce8b518303..095fa9eb1d 100644
--- a/target/linux/layerscape/patches-4.4/8236-clk-add-API-of-clks.patch
+++ b/target/linux/layerscape/patches-4.4/8236-clk-add-API-of-clks.patch
@@ -32,7 +32,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
struct clk_hw *
clk_hw_get_parent_by_index(const struct clk_hw *hw, unsigned int index)
{
-@@ -2033,6 +2046,12 @@ static const struct file_operations clk_
+@@ -2036,6 +2049,12 @@ static const struct file_operations clk_
.release = single_release,
};