aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-09 17:16:11 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-10 18:43:23 +0200
commit0ddb34b6b56d613939d4e6844b79415f9bf16939 (patch)
tree83e92363a1d2a11a28d238ac6c6726663254d01d /target/linux/sunxi
parent21a229317f63e89be9184f614a3270b0c9ec7100 (diff)
downloadupstream-0ddb34b6b56d613939d4e6844b79415f9bf16939.tar.gz
upstream-0ddb34b6b56d613939d4e6844b79415f9bf16939.tar.bz2
upstream-0ddb34b6b56d613939d4e6844b79415f9bf16939.zip
kernel: bump 4.14 to 4.14.62
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>
Diffstat (limited to 'target/linux/sunxi')
-rw-r--r--target/linux/sunxi/patches-4.14/301-orangepi_pc2_usb_otg_to_host_key_power.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/sunxi/patches-4.14/301-orangepi_pc2_usb_otg_to_host_key_power.patch b/target/linux/sunxi/patches-4.14/301-orangepi_pc2_usb_otg_to_host_key_power.patch
index 799e900a8d..d8693374d2 100644
--- a/target/linux/sunxi/patches-4.14/301-orangepi_pc2_usb_otg_to_host_key_power.patch
+++ b/target/linux/sunxi/patches-4.14/301-orangepi_pc2_usb_otg_to_host_key_power.patch
@@ -1,7 +1,6 @@
-diff -Naur linux-4.14.20.ori/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts linux-4.14.20/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
---- linux-4.14.20.ori/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts 2018-03-02 09:40:04.794444000 +0100
-+++ linux-4.14.20/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts 2018-03-02 09:41:04.880472000 +0100
-@@ -88,7 +88,7 @@
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
+@@ -87,7 +87,7 @@
sw4 {
label = "sw4";
@@ -18,3 +17,4 @@ diff -Naur linux-4.14.20.ori/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc
+ dr_mode = "host";
status = "okay";
};
+