kernel: bump 4.14 to 4.14.96

[openwrt/staging/chunkeey.git] / target / linux / sunxi / patches-4.14 / 080-arm64-allwinner-a64-add-SPI-nodes.patch

diff --git a/target/linux/sunxi/patches-4.14/080-arm64-allwinner-a64-add-SPI-nodes.patch b/target/linux/sunxi/patches-4.14/080-arm64-allwinner-a64-add-SPI-nodes.patch
index 0608f13629250fcb114afef32668386264b716f9..5374547e92b02e290400c5cbb5dbddb4f6972b35 100644 (file)
--- a/target/linux/sunxi/patches-4.14/080-arm64-allwinner-a64-add-SPI-nodes.patch
+++ b/target/linux/sunxi/patches-4.14/080-arm64-allwinner-a64-add-SPI-nodes.patch
@@ -19,8 +19,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 41 +++++++++++++++++++
  1 file changed, 41 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 8c8db1b057df..20aba7b186aa 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
 @@ -325,6 +325,16 @@
@@ -40,8 +38,8 @@ index 8c8db1b057df..20aba7b186aa 100644
                        uart0_pins_a: uart0@0 {
                                pins = "PB8", "PB9";
                                function = "uart0";
-@@ -449,6 +459,37 @@
-                       #size-cells = <0>;
+@@ -470,6 +480,37 @@
+                       };
                };
  
 +
@@ -78,6 +76,3 @@ index 8c8db1b057df..20aba7b186aa 100644
                gic: interrupt-controller@1c81000 {
                        compatible = "arm,gic-400";
                        reg = <0x01c81000 0x1000>,
--- 
-2.17.1
-