From 7c468e5e64ac019554fe45b383fbea90c367e4e0 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 29 Feb 2024 23:52:56 +0000 Subject: [PATCH] mediatek: rename or replace accepted patches Rename kernel patches accepted upstream to indicate at which version they have been accepted, replacing downstream variants which what was accepted upstream. Note that some of them are fixes which will find their way to older kernel versions as well via linux-stable. No functional changes. Signed-off-by: Daniel Golle --- ...define-3W-max-power-to-both-SFP-on-.patch} | 0 ...m64-dts-mt7986-change-cooling-trips.patch} | 0 ...7986-change-thermal-trips-on-BPI-R3.patch} | 0 ...declare-SPI-NAND-present-on-BPI-R64.patch} | 22 ++++++++++++- ...80-dts-mt7622-bpi-r64-add-mt7531-irq.patch | 13 -------- ...-handle-interrupts-from-MT7531-switc.patch | 32 +++++++++++++++++++ ...assign-functions-to-configure-pin-b.patch} | 0 ...ge-soc-sync-driver-with-MediaTek-SD.patch} | 0 ... => 804-v6.2-pwm-add-mt7986-support.patch} | 0 .../911-dts-mt7622-bpi-r64-add-rootdisk.patch | 2 +- 10 files changed, 54 insertions(+), 15 deletions(-) rename target/linux/mediatek/patches-6.1/{020-arm64-dts-mt7986-define-3W-max-power-to-both-SFP-on-.patch => 020-v6.7-arm64-dts-mt7986-define-3W-max-power-to-both-SFP-on-.patch} (100%) rename target/linux/mediatek/patches-6.1/{021-arm64-dts-mt7986-change-cooling-trips.patch => 021-v6.7-arm64-dts-mt7986-change-cooling-trips.patch} (100%) rename target/linux/mediatek/patches-6.1/{022-arm64-dts-mt7986-change-thermal-trips-on-BPI-R3.patch => 022-v6.7-arm64-dts-mt7986-change-thermal-trips-on-BPI-R3.patch} (100%) rename target/linux/mediatek/patches-6.1/{115-dts-bpi64-add-snand-support.patch => 115-v6.5-arm64-dts-mt7622-declare-SPI-NAND-present-on-BPI-R64.patch} (50%) delete mode 100644 target/linux/mediatek/patches-6.1/180-dts-mt7622-bpi-r64-add-mt7531-irq.patch create mode 100644 target/linux/mediatek/patches-6.1/180-v6.5-arm64-dts-mt7622-handle-interrupts-from-MT7531-switc.patch rename target/linux/mediatek/patches-6.1/{219-pinctrl-mediatek-assign-functions-to-configure-pin-b.patch => 219-v6.6-pinctrl-mediatek-assign-functions-to-configure-pin-b.patch} (100%) rename target/linux/mediatek/patches-6.1/{734-net-phy-mediatek-ge-soc-sync-driver-with-MediaTek-SD.patch => 734-v6.8-net-phy-mediatek-ge-soc-sync-driver-with-MediaTek-SD.patch} (100%) rename target/linux/mediatek/patches-6.1/{804-pwm-add-mt7986-support.patch => 804-v6.2-pwm-add-mt7986-support.patch} (100%) diff --git a/target/linux/mediatek/patches-6.1/020-arm64-dts-mt7986-define-3W-max-power-to-both-SFP-on-.patch b/target/linux/mediatek/patches-6.1/020-v6.7-arm64-dts-mt7986-define-3W-max-power-to-both-SFP-on-.patch similarity index 100% rename from target/linux/mediatek/patches-6.1/020-arm64-dts-mt7986-define-3W-max-power-to-both-SFP-on-.patch rename to target/linux/mediatek/patches-6.1/020-v6.7-arm64-dts-mt7986-define-3W-max-power-to-both-SFP-on-.patch diff --git a/target/linux/mediatek/patches-6.1/021-arm64-dts-mt7986-change-cooling-trips.patch b/target/linux/mediatek/patches-6.1/021-v6.7-arm64-dts-mt7986-change-cooling-trips.patch similarity index 100% rename from target/linux/mediatek/patches-6.1/021-arm64-dts-mt7986-change-cooling-trips.patch rename to target/linux/mediatek/patches-6.1/021-v6.7-arm64-dts-mt7986-change-cooling-trips.patch diff --git a/target/linux/mediatek/patches-6.1/022-arm64-dts-mt7986-change-thermal-trips-on-BPI-R3.patch b/target/linux/mediatek/patches-6.1/022-v6.7-arm64-dts-mt7986-change-thermal-trips-on-BPI-R3.patch similarity index 100% rename from target/linux/mediatek/patches-6.1/022-arm64-dts-mt7986-change-thermal-trips-on-BPI-R3.patch rename to target/linux/mediatek/patches-6.1/022-v6.7-arm64-dts-mt7986-change-thermal-trips-on-BPI-R3.patch diff --git a/target/linux/mediatek/patches-6.1/115-dts-bpi64-add-snand-support.patch b/target/linux/mediatek/patches-6.1/115-v6.5-arm64-dts-mt7622-declare-SPI-NAND-present-on-BPI-R64.patch similarity index 50% rename from target/linux/mediatek/patches-6.1/115-dts-bpi64-add-snand-support.patch rename to target/linux/mediatek/patches-6.1/115-v6.5-arm64-dts-mt7622-declare-SPI-NAND-present-on-BPI-R64.patch index 16aed70b44..5fc55314ce 100644 --- a/target/linux/mediatek/patches-6.1/115-dts-bpi64-add-snand-support.patch +++ b/target/linux/mediatek/patches-6.1/115-v6.5-arm64-dts-mt7622-declare-SPI-NAND-present-on-BPI-R64.patch @@ -1,3 +1,23 @@ +From d278f43f25beedfd0cb784d1dd0a9e7e8c8f123f Mon Sep 17 00:00:00 2001 +From: Daniel Golle +Date: Wed, 19 Apr 2023 20:15:53 +0100 +Subject: [PATCH] arm64: dts: mt7622: declare SPI-NAND present on BPI-R64 + +The SPI-NOR node in the device tree of the BananaPi R64 has most likely +been copied from the reference board's device tree even though the R64 +comes with an SPI-NAND chip rather than SPI-NOR. + +Setup the Serial NAND Flash Interface (SNFI) controller, enable +hardware BCH error detection and correction engine and add the SPI-NAND +chip including basic partitions, + +Signed-off-by: Daniel Golle +Link: https://lore.kernel.org/r/ZEA96dmaXqTpk8u8@makrotopia.org +Signed-off-by: Matthias Brugger +--- + .../dts/mediatek/mt7622-bananapi-bpi-r64.dts | 38 ++++++++++++++++--- + 1 file changed, 33 insertions(+), 5 deletions(-) + --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts @@ -253,14 +253,42 @@ @@ -40,7 +60,7 @@ + read-only; + }; + -+ partition@280000 { ++ ubi: partition@280000 { + label = "ubi"; + reg = <0x280000 0x7d80000>; + }; diff --git a/target/linux/mediatek/patches-6.1/180-dts-mt7622-bpi-r64-add-mt7531-irq.patch b/target/linux/mediatek/patches-6.1/180-dts-mt7622-bpi-r64-add-mt7531-irq.patch deleted file mode 100644 index 03e7aef9f0..0000000000 --- a/target/linux/mediatek/patches-6.1/180-dts-mt7622-bpi-r64-add-mt7531-irq.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts -+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts -@@ -154,6 +154,10 @@ - switch@0 { - compatible = "mediatek,mt7531"; - reg = <0>; -+ interrupt-controller; -+ #interrupt-cells = <1>; -+ interrupt-parent = <&pio>; -+ interrupts = <53 IRQ_TYPE_LEVEL_HIGH>; - reset-gpios = <&pio 54 0>; - - ports { diff --git a/target/linux/mediatek/patches-6.1/180-v6.5-arm64-dts-mt7622-handle-interrupts-from-MT7531-switc.patch b/target/linux/mediatek/patches-6.1/180-v6.5-arm64-dts-mt7622-handle-interrupts-from-MT7531-switc.patch new file mode 100644 index 0000000000..0a971c1f45 --- /dev/null +++ b/target/linux/mediatek/patches-6.1/180-v6.5-arm64-dts-mt7622-handle-interrupts-from-MT7531-switc.patch @@ -0,0 +1,32 @@ +From 983f37ee08acb60435744f1b1e2afea2d2a09c48 Mon Sep 17 00:00:00 2001 +From: Daniel Golle +Date: Wed, 19 Apr 2023 20:16:29 +0100 +Subject: [PATCH] arm64: dts: mt7622: handle interrupts from MT7531 switch on + BPI-R64 + +Since commit ba751e28d442 ("net: dsa: mt7530: add interrupt support") +the mt7530 driver can act as an interrupt controller. Wire up irq line +of the MT7531 switch on the BananaPi BPi-R64 board, so the status of +the PHYs of the five 1000Base-T ports doesn't need to be polled any +more. + +Signed-off-by: Daniel Golle +Link: https://lore.kernel.org/r/ZEA-DV_OsmFg5egL@makrotopia.org +Signed-off-by: Matthias Brugger +--- + arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts ++++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +@@ -154,6 +154,10 @@ + switch@0 { + compatible = "mediatek,mt7531"; + reg = <0>; ++ interrupt-controller; ++ #interrupt-cells = <1>; ++ interrupt-parent = <&pio>; ++ interrupts = <53 IRQ_TYPE_LEVEL_HIGH>; + reset-gpios = <&pio 54 0>; + + ports { diff --git a/target/linux/mediatek/patches-6.1/219-pinctrl-mediatek-assign-functions-to-configure-pin-b.patch b/target/linux/mediatek/patches-6.1/219-v6.6-pinctrl-mediatek-assign-functions-to-configure-pin-b.patch similarity index 100% rename from target/linux/mediatek/patches-6.1/219-pinctrl-mediatek-assign-functions-to-configure-pin-b.patch rename to target/linux/mediatek/patches-6.1/219-v6.6-pinctrl-mediatek-assign-functions-to-configure-pin-b.patch diff --git a/target/linux/mediatek/patches-6.1/734-net-phy-mediatek-ge-soc-sync-driver-with-MediaTek-SD.patch b/target/linux/mediatek/patches-6.1/734-v6.8-net-phy-mediatek-ge-soc-sync-driver-with-MediaTek-SD.patch similarity index 100% rename from target/linux/mediatek/patches-6.1/734-net-phy-mediatek-ge-soc-sync-driver-with-MediaTek-SD.patch rename to target/linux/mediatek/patches-6.1/734-v6.8-net-phy-mediatek-ge-soc-sync-driver-with-MediaTek-SD.patch diff --git a/target/linux/mediatek/patches-6.1/804-pwm-add-mt7986-support.patch b/target/linux/mediatek/patches-6.1/804-v6.2-pwm-add-mt7986-support.patch similarity index 100% rename from target/linux/mediatek/patches-6.1/804-pwm-add-mt7986-support.patch rename to target/linux/mediatek/patches-6.1/804-v6.2-pwm-add-mt7986-support.patch diff --git a/target/linux/mediatek/patches-6.1/911-dts-mt7622-bpi-r64-add-rootdisk.patch b/target/linux/mediatek/patches-6.1/911-dts-mt7622-bpi-r64-add-rootdisk.patch index a141743194..5d3153ded4 100644 --- a/target/linux/mediatek/patches-6.1/911-dts-mt7622-bpi-r64-add-rootdisk.patch +++ b/target/linux/mediatek/patches-6.1/911-dts-mt7622-bpi-r64-add-rootdisk.patch @@ -73,7 +73,7 @@ - read-only; - }; - -- partition@280000 { +- ubi: partition@280000 { label = "ubi"; - reg = <0x280000 0x7d80000>; + reg = <0x80000 0x7f80000>; -- 2.30.2