From d0839e020d0a80b3529a6a8fbbd5d618dfecafa3 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 4 Jul 2018 11:54:47 +0200 Subject: kernel: bump 4.14 to 4.14.53 Refreshed all patches Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte --- ...-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 4 ++-- ...400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch | 2 +- target/linux/mediatek/patches-4.14/0064-dts.patch | 14 +++++++------- .../0225-arm-dts-Add-missing-mt7623-pcie-nodes.patch | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'target') diff --git a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 2a09caf442..63afabb1d9 100644 --- a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1168,6 +1168,49 @@ static struct mtd_info * __init open_mtd +@@ -1171,6 +1171,49 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle static int __init ubi_init(void) { int err, i, k; -@@ -1251,6 +1294,12 @@ static int __init ubi_init(void) +@@ -1254,6 +1297,12 @@ static int __init ubi_init(void) } } diff --git a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch index 8a9da2c088..4ee79515c9 100644 --- a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch +++ b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch @@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1181,6 +1181,9 @@ static void __init ubi_auto_attach(void) +@@ -1184,6 +1184,9 @@ static void __init ubi_auto_attach(void) mtd = open_mtd_device("ubi"); if (IS_ERR(mtd)) mtd = open_mtd_device("data"); diff --git a/target/linux/mediatek/patches-4.14/0064-dts.patch b/target/linux/mediatek/patches-4.14/0064-dts.patch index cfae4fee64..08feb8d731 100644 --- a/target/linux/mediatek/patches-4.14/0064-dts.patch +++ b/target/linux/mediatek/patches-4.14/0064-dts.patch @@ -11,8 +11,8 @@ cpus { cpu@0 { proc-supply = <&mt6323_vproc_reg>; -@@ -102,6 +106,10 @@ - memory@80000000 { +@@ -103,6 +107,10 @@ + device_type = "memory"; reg = <0 0x80000000 0 0x40000000>; }; + @@ -22,7 +22,7 @@ }; &cir { -@@ -129,11 +137,24 @@ +@@ -130,11 +138,24 @@ }; }; @@ -49,7 +49,7 @@ compatible = "mediatek,mt7530"; #address-cells = <1>; #size-cells = <0>; -@@ -143,6 +164,8 @@ +@@ -144,6 +165,8 @@ core-supply = <&mt6323_vpa_reg>; io-supply = <&mt6323_vemc3v3_reg>; @@ -58,7 +58,7 @@ ports { #address-cells = <1>; #size-cells = <0>; -@@ -151,29 +174,46 @@ +@@ -152,29 +175,46 @@ port@0 { reg = <0>; label = "wan"; @@ -106,7 +106,7 @@ reg = <6>; label = "cpu"; ethernet = <&gmac0>; -@@ -186,8 +226,6 @@ +@@ -187,8 +227,6 @@ }; }; }; @@ -579,7 +579,7 @@ + --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi -@@ -322,6 +322,7 @@ +@@ -323,6 +323,7 @@ "syscon"; reg = <0 0x10209000 0 0x1000>; #clock-cells = <1>; diff --git a/target/linux/mediatek/patches-4.14/0225-arm-dts-Add-missing-mt7623-pcie-nodes.patch b/target/linux/mediatek/patches-4.14/0225-arm-dts-Add-missing-mt7623-pcie-nodes.patch index 6e94015dc5..68dd23bdb9 100644 --- a/target/linux/mediatek/patches-4.14/0225-arm-dts-Add-missing-mt7623-pcie-nodes.patch +++ b/target/linux/mediatek/patches-4.14/0225-arm-dts-Add-missing-mt7623-pcie-nodes.patch @@ -9,7 +9,7 @@ Subject: [PATCH] arm: dts: Add missing mt7623 pcie nodes --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi -@@ -670,6 +670,111 @@ +@@ -671,6 +671,111 @@ #reset-cells = <1>; }; -- cgit v1.2.3