diff options
| author | John Audia <graysky@archlinux.us> | 2021-03-30 10:52:07 -0400 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-04-02 16:45:28 +0200 |
| commit | ec6293febc244d187e71a6e54f44920be679cde4 (patch) | |
| tree | eef61941fd6caa9c36ecdd369a37d9383cbff6a8 /target/linux/layerscape/patches-5.4/302-dts-0008-arm64-dts-ls1046a-accumulated-change-to-ls1046a-boar.patch | |
| parent | 209c5918b511d9e406a094ba246a985b640e519f (diff) | |
| download | upstream-ec6293febc244d187e71a6e54f44920be679cde4.tar.gz upstream-ec6293febc244d187e71a6e54f44920be679cde4.tar.bz2 upstream-ec6293febc244d187e71a6e54f44920be679cde4.zip | |
kernel: bump 5.4 to 5.4.109
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased:
pending-5.4/611-netfilter_match_bypass_default_table.patch
The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].
Build system: x86_64
Build-tested: ipq806x/R7800
[1] 9b1b89229f0e ("kernel: bump 5.4 to 5.4.86")
Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/302-dts-0008-arm64-dts-ls1046a-accumulated-change-to-ls1046a-boar.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/302-dts-0008-arm64-dts-ls1046a-accumulated-change-to-ls1046a-boar.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/layerscape/patches-5.4/302-dts-0008-arm64-dts-ls1046a-accumulated-change-to-ls1046a-boar.patch b/target/linux/layerscape/patches-5.4/302-dts-0008-arm64-dts-ls1046a-accumulated-change-to-ls1046a-boar.patch index 5079a815c2..8ef6d031ef 100644 --- a/target/linux/layerscape/patches-5.4/302-dts-0008-arm64-dts-ls1046a-accumulated-change-to-ls1046a-boar.patch +++ b/target/linux/layerscape/patches-5.4/302-dts-0008-arm64-dts-ls1046a-accumulated-change-to-ls1046a-boar.patch @@ -277,7 +277,7 @@ Date: Fri May 5 17:53:27 2017 +0800 compatible = "spansion,m25p80"; --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi -@@ -376,7 +376,7 @@ +@@ -377,7 +377,7 @@ }; i2c0: i2c@2180000 { @@ -286,7 +286,7 @@ Date: Fri May 5 17:53:27 2017 +0800 #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2180000 0x0 0x10000>; -@@ -385,6 +385,7 @@ +@@ -386,6 +386,7 @@ dmas = <&edma0 1 39>, <&edma0 1 38>; dma-names = "tx", "rx"; @@ -294,7 +294,7 @@ Date: Fri May 5 17:53:27 2017 +0800 status = "disabled"; }; -@@ -409,12 +410,13 @@ +@@ -410,12 +411,13 @@ }; i2c3: i2c@21b0000 { @@ -309,7 +309,7 @@ Date: Fri May 5 17:53:27 2017 +0800 status = "disabled"; }; -@@ -544,6 +546,15 @@ +@@ -545,6 +547,15 @@ status = "disabled"; }; @@ -325,7 +325,7 @@ Date: Fri May 5 17:53:27 2017 +0800 wdog0: watchdog@2ad0000 { compatible = "fsl,imx21-wdt"; reg = <0x0 0x2ad0000 0x0 0x10000>; -@@ -576,6 +587,8 @@ +@@ -577,6 +588,8 @@ snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; @@ -334,7 +334,7 @@ Date: Fri May 5 17:53:27 2017 +0800 }; usb1: usb@3000000 { -@@ -586,6 +599,8 @@ +@@ -587,6 +600,8 @@ snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; @@ -343,7 +343,7 @@ Date: Fri May 5 17:53:27 2017 +0800 }; usb2: usb@3100000 { -@@ -596,6 +611,8 @@ +@@ -597,6 +612,8 @@ snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; @@ -352,7 +352,7 @@ Date: Fri May 5 17:53:27 2017 +0800 }; sata: sata@3200000 { -@@ -637,6 +654,11 @@ +@@ -638,6 +655,11 @@ <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>; }; |