mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-08 03:50:48 +00:00
kernel: bump 4.14 to 4.14.228
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@citymesh.com>
This commit is contained in:
parent
c43c434b58
commit
273ded68b8
@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
|
|||||||
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LINUX_VERSION-4.14 = .227
|
LINUX_VERSION-4.14 = .228
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-4.14.227 = 0722d3c4bc056ccee24d3d08792ba81b228a457ee4ed9c6f40bb1f407612e0c7
|
LINUX_KERNEL_HASH-4.14.228 = 15074d44ab330bba00518df1c86d3d2c304a34514d70958c0529a9d28d93815b
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||||
|
@ -1679,7 +1679,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -247,7 +229,7 @@
|
@@ -248,7 +230,7 @@
|
||||||
dcfg: dcfg@1ee0000 {
|
dcfg: dcfg@1ee0000 {
|
||||||
compatible = "fsl,ls1012a-dcfg",
|
compatible = "fsl,ls1012a-dcfg",
|
||||||
"syscon";
|
"syscon";
|
||||||
@ -1688,7 +1688,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
big-endian;
|
big-endian;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -304,44 +286,25 @@
|
@@ -305,44 +287,25 @@
|
||||||
#thermal-sensor-cells = <1>;
|
#thermal-sensor-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1744,7 +1744,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -351,7 +314,20 @@
|
@@ -352,7 +315,20 @@
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x0 0x2190000 0x0 0x10000>;
|
reg = <0x0 0x2190000 0x0 0x10000>;
|
||||||
interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
@ -1765,7 +1765,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -400,6 +376,20 @@
|
@@ -401,6 +377,20 @@
|
||||||
big-endian;
|
big-endian;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1786,7 +1786,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
sai1: sai@2b50000 {
|
sai1: sai@2b50000 {
|
||||||
#sound-dai-cells = <0>;
|
#sound-dai-cells = <0>;
|
||||||
compatible = "fsl,vf610-sai";
|
compatible = "fsl,vf610-sai";
|
||||||
@@ -451,6 +441,8 @@
|
@@ -452,6 +442,8 @@
|
||||||
dr_mode = "host";
|
dr_mode = "host";
|
||||||
snps,quirk-frame-length-adjustment = <0x20>;
|
snps,quirk-frame-length-adjustment = <0x20>;
|
||||||
snps,dis_rxdet_inp3_quirk;
|
snps,dis_rxdet_inp3_quirk;
|
||||||
@ -1795,7 +1795,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
};
|
};
|
||||||
|
|
||||||
sata: sata@3200000 {
|
sata: sata@3200000 {
|
||||||
@@ -471,5 +463,85 @@
|
@@ -472,5 +464,85 @@
|
||||||
dr_mode = "host";
|
dr_mode = "host";
|
||||||
phy_type = "ulpi";
|
phy_type = "ulpi";
|
||||||
};
|
};
|
||||||
@ -3100,7 +3100,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
scfg: scfg@1570000 {
|
scfg: scfg@1570000 {
|
||||||
compatible = "fsl,ls1043a-scfg", "syscon";
|
compatible = "fsl,ls1043a-scfg", "syscon";
|
||||||
reg = <0x0 0x1570000 0x0 0x10000>;
|
reg = <0x0 0x1570000 0x0 0x10000>;
|
||||||
@@ -255,7 +285,7 @@
|
@@ -256,7 +286,7 @@
|
||||||
|
|
||||||
dcfg: dcfg@1ee0000 {
|
dcfg: dcfg@1ee0000 {
|
||||||
compatible = "fsl,ls1043a-dcfg", "syscon";
|
compatible = "fsl,ls1043a-dcfg", "syscon";
|
||||||
@ -3109,7 +3109,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
big-endian;
|
big-endian;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -342,36 +372,7 @@
|
@@ -343,36 +373,7 @@
|
||||||
#thermal-sensor-cells = <1>;
|
#thermal-sensor-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -3147,7 +3147,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
|
|
||||||
qman: qman@1880000 {
|
qman: qman@1880000 {
|
||||||
compatible = "fsl,qman";
|
compatible = "fsl,qman";
|
||||||
@@ -422,7 +423,7 @@
|
@@ -423,7 +424,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c0: i2c@2180000 {
|
i2c0: i2c@2180000 {
|
||||||
@ -3156,7 +3156,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x0 0x2180000 0x0 0x10000>;
|
reg = <0x0 0x2180000 0x0 0x10000>;
|
||||||
@@ -432,6 +433,7 @@
|
@@ -433,6 +434,7 @@
|
||||||
dmas = <&edma0 1 39>,
|
dmas = <&edma0 1 39>,
|
||||||
<&edma0 1 38>;
|
<&edma0 1 38>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
@ -3164,7 +3164,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -536,6 +538,72 @@
|
@@ -537,6 +539,72 @@
|
||||||
#interrupt-cells = <2>;
|
#interrupt-cells = <2>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -3237,7 +3237,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
lpuart0: serial@2950000 {
|
lpuart0: serial@2950000 {
|
||||||
compatible = "fsl,ls1021a-lpuart";
|
compatible = "fsl,ls1021a-lpuart";
|
||||||
reg = <0x0 0x2950000 0x0 0x1000>;
|
reg = <0x0 0x2950000 0x0 0x1000>;
|
||||||
@@ -590,6 +658,16 @@
|
@@ -591,6 +659,16 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -3254,7 +3254,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
wdog0: wdog@2ad0000 {
|
wdog0: wdog@2ad0000 {
|
||||||
compatible = "fsl,ls1043a-wdt", "fsl,imx21-wdt";
|
compatible = "fsl,ls1043a-wdt", "fsl,imx21-wdt";
|
||||||
reg = <0x0 0x2ad0000 0x0 0x10000>;
|
reg = <0x0 0x2ad0000 0x0 0x10000>;
|
||||||
@@ -615,41 +693,81 @@
|
@@ -616,41 +694,81 @@
|
||||||
<&clockgen 4 0>;
|
<&clockgen 4 0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -3371,7 +3371,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
};
|
};
|
||||||
|
|
||||||
msi1: msi-controller1@1571000 {
|
msi1: msi-controller1@1571000 {
|
||||||
@@ -678,13 +796,13 @@
|
@@ -679,13 +797,13 @@
|
||||||
reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */
|
reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */
|
||||||
0x40 0x00000000 0x0 0x00002000>; /* configuration space */
|
0x40 0x00000000 0x0 0x00002000>; /* configuration space */
|
||||||
reg-names = "regs", "config";
|
reg-names = "regs", "config";
|
||||||
@ -3389,7 +3389,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
num-lanes = <4>;
|
num-lanes = <4>;
|
||||||
bus-range = <0x0 0xff>;
|
bus-range = <0x0 0xff>;
|
||||||
ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */
|
ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */
|
||||||
@@ -696,6 +814,7 @@
|
@@ -697,6 +815,7 @@
|
||||||
<0000 0 0 2 &gic 0 111 0x4>,
|
<0000 0 0 2 &gic 0 111 0x4>,
|
||||||
<0000 0 0 3 &gic 0 112 0x4>,
|
<0000 0 0 3 &gic 0 112 0x4>,
|
||||||
<0000 0 0 4 &gic 0 113 0x4>;
|
<0000 0 0 4 &gic 0 113 0x4>;
|
||||||
@ -3397,7 +3397,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
};
|
};
|
||||||
|
|
||||||
pcie@3500000 {
|
pcie@3500000 {
|
||||||
@@ -703,13 +822,13 @@
|
@@ -704,13 +823,13 @@
|
||||||
reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */
|
reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */
|
||||||
0x48 0x00000000 0x0 0x00002000>; /* configuration space */
|
0x48 0x00000000 0x0 0x00002000>; /* configuration space */
|
||||||
reg-names = "regs", "config";
|
reg-names = "regs", "config";
|
||||||
@ -3415,7 +3415,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
num-lanes = <2>;
|
num-lanes = <2>;
|
||||||
bus-range = <0x0 0xff>;
|
bus-range = <0x0 0xff>;
|
||||||
ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */
|
ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */
|
||||||
@@ -721,6 +840,7 @@
|
@@ -722,6 +841,7 @@
|
||||||
<0000 0 0 2 &gic 0 121 0x4>,
|
<0000 0 0 2 &gic 0 121 0x4>,
|
||||||
<0000 0 0 3 &gic 0 122 0x4>,
|
<0000 0 0 3 &gic 0 122 0x4>,
|
||||||
<0000 0 0 4 &gic 0 123 0x4>;
|
<0000 0 0 4 &gic 0 123 0x4>;
|
||||||
@ -3423,7 +3423,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
};
|
};
|
||||||
|
|
||||||
pcie@3600000 {
|
pcie@3600000 {
|
||||||
@@ -728,13 +848,13 @@
|
@@ -729,13 +849,13 @@
|
||||||
reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */
|
reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */
|
||||||
0x50 0x00000000 0x0 0x00002000>; /* configuration space */
|
0x50 0x00000000 0x0 0x00002000>; /* configuration space */
|
||||||
reg-names = "regs", "config";
|
reg-names = "regs", "config";
|
||||||
@ -3441,7 +3441,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
num-lanes = <2>;
|
num-lanes = <2>;
|
||||||
bus-range = <0x0 0xff>;
|
bus-range = <0x0 0xff>;
|
||||||
ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000 /* downstream I/O */
|
ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000 /* downstream I/O */
|
||||||
@@ -746,6 +866,14 @@
|
@@ -747,6 +867,14 @@
|
||||||
<0000 0 0 2 &gic 0 155 0x4>,
|
<0000 0 0 2 &gic 0 155 0x4>,
|
||||||
<0000 0 0 3 &gic 0 156 0x4>,
|
<0000 0 0 3 &gic 0 156 0x4>,
|
||||||
<0000 0 0 4 &gic 0 157 0x4>;
|
<0000 0 0 4 &gic 0 157 0x4>;
|
||||||
@ -3456,7 +3456,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -753,3 +881,29 @@
|
@@ -754,3 +882,29 @@
|
||||||
|
|
||||||
#include "qoriq-qman-portals.dtsi"
|
#include "qoriq-qman-portals.dtsi"
|
||||||
#include "qoriq-bman-portals.dtsi"
|
#include "qoriq-bman-portals.dtsi"
|
||||||
@ -4662,7 +4662,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
scfg: scfg@1570000 {
|
scfg: scfg@1570000 {
|
||||||
compatible = "fsl,ls1046a-scfg", "syscon";
|
compatible = "fsl,ls1046a-scfg", "syscon";
|
||||||
reg = <0x0 0x1570000 0x0 0x10000>;
|
reg = <0x0 0x1570000 0x0 0x10000>;
|
||||||
@@ -362,36 +369,7 @@
|
@@ -363,36 +370,7 @@
|
||||||
#thermal-sensor-cells = <1>;
|
#thermal-sensor-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -4700,7 +4700,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
|
|
||||||
dspi: dspi@2100000 {
|
dspi: dspi@2100000 {
|
||||||
compatible = "fsl,ls1021a-v1.0-dspi";
|
compatible = "fsl,ls1021a-v1.0-dspi";
|
||||||
@@ -407,7 +385,7 @@
|
@@ -408,7 +386,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c0: i2c@2180000 {
|
i2c0: i2c@2180000 {
|
||||||
@ -4709,7 +4709,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x0 0x2180000 0x0 0x10000>;
|
reg = <0x0 0x2180000 0x0 0x10000>;
|
||||||
@@ -416,6 +394,7 @@
|
@@ -417,6 +395,7 @@
|
||||||
dmas = <&edma0 1 39>,
|
dmas = <&edma0 1 39>,
|
||||||
<&edma0 1 38>;
|
<&edma0 1 38>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
@ -4717,7 +4717,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -440,12 +419,13 @@
|
@@ -441,12 +420,13 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c3: i2c@21b0000 {
|
i2c3: i2c@21b0000 {
|
||||||
@ -4732,7 +4732,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -571,6 +551,15 @@
|
@@ -572,6 +552,15 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -4748,7 +4748,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
wdog0: watchdog@2ad0000 {
|
wdog0: watchdog@2ad0000 {
|
||||||
compatible = "fsl,imx21-wdt";
|
compatible = "fsl,imx21-wdt";
|
||||||
reg = <0x0 0x2ad0000 0x0 0x10000>;
|
reg = <0x0 0x2ad0000 0x0 0x10000>;
|
||||||
@@ -595,40 +584,81 @@
|
@@ -596,40 +585,81 @@
|
||||||
<&clockgen 4 1>;
|
<&clockgen 4 1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -4864,7 +4864,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
};
|
};
|
||||||
|
|
||||||
msi1: msi-controller@1580000 {
|
msi1: msi-controller@1580000 {
|
||||||
@@ -661,6 +691,125 @@
|
@@ -662,6 +692,125 @@
|
||||||
<GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
|
<GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -4990,7 +4990,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
|||||||
};
|
};
|
||||||
|
|
||||||
reserved-memory {
|
reserved-memory {
|
||||||
@@ -689,7 +838,36 @@
|
@@ -690,7 +839,36 @@
|
||||||
no-map;
|
no-map;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -468,7 +468,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
|
|
||||||
/* platform data specifying hardware features and callbacks.
|
/* platform data specifying hardware features and callbacks.
|
||||||
* hardware features were copied from Allwinner drivers.
|
* hardware features were copied from Allwinner drivers.
|
||||||
@@ -979,9 +1047,34 @@ static int sun8i_dwmac_probe(struct plat
|
@@ -981,9 +1049,34 @@ static int sun8i_dwmac_probe(struct plat
|
||||||
|
|
||||||
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
|
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
|
|
||||||
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
|
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
|
||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
|
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
|
||||||
@@ -1078,6 +1078,14 @@ return ret;
|
@@ -1080,6 +1080,14 @@ return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id sun8i_dwmac_match[] = {
|
static const struct of_device_id sun8i_dwmac_match[] = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user