aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-04-07 10:08:16 +0200
committerPetr Štetiar <ynezz@true.cz>2020-04-09 00:12:46 +0200
commitb299002877c801202c3b61d5e09865e88f506176 (patch)
treecf1d30e16b53a53e4d04630527f67b01eac38181 /target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
parent196cab719f8f318ec771e5f1a07728c12b7fa207 (diff)
downloadupstream-b299002877c801202c3b61d5e09865e88f506176.tar.gz
upstream-b299002877c801202c3b61d5e09865e88f506176.tar.bz2
upstream-b299002877c801202c3b61d5e09865e88f506176.zip
kernel: bump 5.4 to 5.4.31
Refreshed patches, removed upstreamed patches: oxnas: 003-ARM-dts-oxnas-Fix-clear-mask-property.patch generic: 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch Run tested: apu2, qemu-x86-64, apalis Build tested: sunxi/a53, imx6, x86/64, ipq40xx Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2] Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch')
-rw-r--r--target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch b/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
index 7c135cf2bf..4e10319508 100644
--- a/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
+++ b/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
@@ -1,6 +1,5 @@
-diff -urN a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
---- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi 2020-03-02 17:16:13.700464470 +0800
-+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi 2020-03-02 17:15:55.276885406 +0800
+--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -554,6 +554,19 @@
status = "disabled";
};
@@ -21,9 +20,8 @@ diff -urN a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/media
nor_flash: spi@11014000 {
compatible = "mediatek,mt7622-nor",
"mediatek,mt8173-nor";
-diff -urN a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
---- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts 2020-03-02 17:16:25.492193459 +0800
-+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts 2020-03-02 17:16:35.243968416 +0800
+--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
++++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
@@ -108,7 +108,7 @@
};