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 <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte 2018-07-04 11:54:47 +02:00
parent 01ca20cdfd
commit d0839e020d
5 changed files with 13 additions and 13 deletions

View file

@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- 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 <daniel@makrotopia.org>
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)
}
}

View file

@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
--- 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");

View file

@ -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>;

View file

@ -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>;
};