]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
mediatek: replace patches with upstream version 22350/head
authorAleksander Jan Bajkowski <olek2@wp.pl>
Mon, 9 Mar 2026 21:56:12 +0000 (22:56 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 14 Mar 2026 20:44:11 +0000 (21:44 +0100)
No functional changes intended.

Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
Link: https://github.com/openwrt/openwrt/pull/22350
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
16 files changed:
target/linux/mediatek/patches-6.12/171-v6.16-arm64-dts-mediatek-mt7988-Add-xsphy-for-ssusb0-pcie2.patch [moved from target/linux/mediatek/patches-6.12/171-arm64-dts-mediatek-mt7988a-Add-xsphy-for-ssusb0-pcie2.patch with 89% similarity]
target/linux/mediatek/patches-6.12/172-v6.16-arm64-dts-mediatek-mt7988a-bpi-r4-enable-xsphy.patch [moved from target/linux/mediatek/patches-6.12/172-arm64-dts-mediatek-mt7988a-bpi-r4-enable-xsphy.patch with 82% similarity]
target/linux/mediatek/patches-6.12/174-arm64-dts-mediatek-mt7988-add-spi-controllers.patch [deleted file]
target/linux/mediatek/patches-6.12/174-v6.16-arm64-dts-mediatek-mt7988-add-spi-controllers.patch [new file with mode: 0644]
target/linux/mediatek/patches-6.12/175-arm64-dts-mediatek-mt7988-move-uart0-and-spi1-pins-to-soc-dtsi.patch [deleted file]
target/linux/mediatek/patches-6.12/175-v6.16-arm64-dts-mediatek-mt7988-move-uart0-and-spi1-pins-t.patch [new file with mode: 0644]
target/linux/mediatek/patches-6.12/176-arm64-dts-mediatek-mt7988-add-cci-node.patch [deleted file]
target/linux/mediatek/patches-6.12/176-v6.17-arm64-dts-mediatek-mt7988-add-cci-node.patch [new file with mode: 0644]
target/linux/mediatek/patches-6.12/177-arm64-dts-mediatek-mt7988-add-phy-calibration-efuse-subnodes.patch [deleted file]
target/linux/mediatek/patches-6.12/177-v6.16-arm64-dts-mediatek-mt7988-add-phy-calibration-efuse-.patch [new file with mode: 0644]
target/linux/mediatek/patches-6.12/180-arm64-dts-mediatek-mt7988a-bpi-r4-Add-fan-and-coolingmaps.patch [deleted file]
target/linux/mediatek/patches-6.12/180-v6.16-arm64-dts-mediatek-mt7988a-bpi-r4-Add-fan-and-coolin.patch [new file with mode: 0644]
target/linux/mediatek/patches-6.12/181-arm64-dts-mediatek-mt7988a-bpi-r4-configure-spi-nodes.patch [deleted file]
target/linux/mediatek/patches-6.12/181-v6.16-arm64-dts-mediatek-mt7988a-bpi-r4-configure-spi-node.patc [new file with mode: 0644]
target/linux/mediatek/patches-6.12/182-arm64-dts-mediatek-mt7988a-bpi-r4-add-proc-supply-for-cci.patch [deleted file]
target/linux/mediatek/patches-6.12/182-v6.17-arm64-dts-mediatek-mt7988a-bpi-r4-add-proc-supply-fo.patch [new file with mode: 0644]

similarity index 89%
rename from target/linux/mediatek/patches-6.12/171-arm64-dts-mediatek-mt7988a-Add-xsphy-for-ssusb0-pcie2.patch
rename to target/linux/mediatek/patches-6.12/171-v6.16-arm64-dts-mediatek-mt7988-Add-xsphy-for-ssusb0-pcie2.patch
index fac060ef16c3b7765f357232f9d2f775f813220f..18f1ddc5bf32f754560b8374ed842b9f786f1f77 100644 (file)
@@ -1,14 +1,15 @@
-From 1861c63ba7bb7f8a5145d4ceabcf346f274da61f Mon Sep 17 00:00:00 2001
+From 2400b24dfecea9a628f63089bf7eeb9a43b91021 Mon Sep 17 00:00:00 2001
 From: Frank Wunderlich <frank-w@public-files.de>
 Date: Tue, 22 Apr 2025 15:24:30 +0200
-Subject: [PATCH 28/32] arm64: dts: mediatek: mt7988: Add xsphy for
- ssusb0/pcie2
+Subject: [PATCH 28/32] arm64: dts: mediatek: mt7988: Add xsphy for ssusb0/pcie2
 
 First usb and third pcie controller on mt7988 need a xs-phy to work
 properly.
 
 Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
 Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Link: https://lore.kernel.org/r/20250422132438.15735-8-linux@fw-web.de
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
 ---
  arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 36 +++++++++++++++++++++++
  1 file changed, 36 insertions(+)
similarity index 82%
rename from target/linux/mediatek/patches-6.12/172-arm64-dts-mediatek-mt7988a-bpi-r4-enable-xsphy.patch
rename to target/linux/mediatek/patches-6.12/172-v6.16-arm64-dts-mediatek-mt7988a-bpi-r4-enable-xsphy.patch
index da26a93eb7091f42448a4d26744113ccfef765d4..d02bca2b4ec0dfc7ff533de192a06bfdda476569 100644 (file)
@@ -1,4 +1,4 @@
-From d326d21a44fbc48663840316c35524002029fbb1 Mon Sep 17 00:00:00 2001
+From bb5872c4b6cb0a8687b424b9970b2c3cca2ededd Mon Sep 17 00:00:00 2001
 From: Frank Wunderlich <frank-w@public-files.de>
 Date: Tue, 22 Apr 2025 15:24:31 +0200
 Subject: [PATCH 29/32] arm64: dts: mediatek: mt7988a-bpi-r4: enable xsphy
@@ -7,6 +7,8 @@ Enable XS-Phy on Bananapi R4 for pcie2.
 
 Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
 Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Link: https://lore.kernel.org/r/20250422132438.15735-9-linux@fw-web.de
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
 ---
  arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 4 ++++
  arch/arm64/boot/dts/mediatek/mt7988a.dtsi                 | 2 +-
diff --git a/target/linux/mediatek/patches-6.12/174-arm64-dts-mediatek-mt7988-add-spi-controllers.patch b/target/linux/mediatek/patches-6.12/174-arm64-dts-mediatek-mt7988-add-spi-controllers.patch
deleted file mode 100644 (file)
index a0557ab..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-From patchwork Sun May 11 14:19:20 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Frank Wunderlich <linux@fw-web.de>
-X-Patchwork-Id: 14084127
-From: Frank Wunderlich <linux@fw-web.de>
-To: Andrew Lunn <andrew@lunn.ch>,
-       Vladimir Oltean <olteanv@gmail.com>,
-       "David S. Miller" <davem@davemloft.net>,
-       Eric Dumazet <edumazet@google.com>,
-       Jakub Kicinski <kuba@kernel.org>,
-       Paolo Abeni <pabeni@redhat.com>,
-       Rob Herring <robh@kernel.org>,
-       Krzysztof Kozlowski <krzk+dt@kernel.org>,
-       Conor Dooley <conor+dt@kernel.org>,
-       Matthias Brugger <matthias.bgg@gmail.com>,
-       AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Subject: [PATCH v1 04/14] arm64: dts: mediatek: mt7988: add spi controllers
-Date: Sun, 11 May 2025 16:19:20 +0200
-Message-ID: <20250511141942.10284-5-linux@fw-web.de>
-X-Mailer: git-send-email 2.43.0
-In-Reply-To: <20250511141942.10284-1-linux@fw-web.de>
-References: <20250511141942.10284-1-linux@fw-web.de>
-MIME-Version: 1.0
-X-Mail-ID: 5110cbfc-28b8-49e4-b9da-560d0bd630a5
-X-BeenThere: linux-mediatek@lists.infradead.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: <linux-mediatek.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-mediatek/>
-List-Post: <mailto:linux-mediatek@lists.infradead.org>
-List-Help: <mailto:linux-mediatek-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=subscribe>
-Cc: devicetree@vger.kernel.org, Landen Chao <Landen.Chao@mediatek.com>,
-       =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>,
- netdev@vger.kernel.org, Sean Wang <sean.wang@mediatek.com>,
- Daniel Golle <daniel@makrotopia.org>, linux-kernel@vger.kernel.org,
- DENG Qingfang <dqfext@gmail.com>, linux-mediatek@lists.infradead.org,
- Lorenzo Bianconi <lorenzo@kernel.org>, linux-arm-kernel@lists.infradead.org,
- Felix Fietkau <nbd@nbd.name>
-Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org>
-Errors-To: 
- linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org
-
-From: Frank Wunderlich <frank-w@public-files.de>
-
-Add SPI controllers for mt7988.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
----
- arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 45 +++++++++++++++++++++++
- 1 file changed, 45 insertions(+)
-
---- a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
-@@ -311,6 +311,51 @@
-                       status = "disabled";
-               };
-+              spi0: spi@11007000 {
-+                      compatible = "mediatek,mt7988-spi-quad", "mediatek,spi-ipm";
-+                      reg = <0 0x11007000 0 0x100>;
-+                      interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
-+                      clocks = <&topckgen CLK_TOP_MPLL_D2>,
-+                               <&topckgen CLK_TOP_SPI_SEL>,
-+                               <&infracfg CLK_INFRA_104M_SPI0>,
-+                               <&infracfg CLK_INFRA_66M_SPI0_HCK>;
-+                      clock-names = "parent-clk", "sel-clk", "spi-clk",
-+                                    "hclk";
-+                      #address-cells = <1>;
-+                      #size-cells = <0>;
-+                      status = "disabled";
-+              };
-+
-+              spi1: spi@11008000 {
-+                      compatible = "mediatek,mt7988-spi-single", "mediatek,spi-ipm";
-+                      reg = <0 0x11008000 0 0x100>;
-+                      interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
-+                      clocks = <&topckgen CLK_TOP_MPLL_D2>,
-+                               <&topckgen CLK_TOP_SPIM_MST_SEL>,
-+                               <&infracfg CLK_INFRA_104M_SPI1>,
-+                               <&infracfg CLK_INFRA_66M_SPI1_HCK>;
-+                      clock-names = "parent-clk", "sel-clk", "spi-clk",
-+                                    "hclk";
-+                      #address-cells = <1>;
-+                      #size-cells = <0>;
-+                      status = "disabled";
-+              };
-+
-+              spi2: spi@11009000 {
-+                      compatible = "mediatek,mt7988-spi-quad", "mediatek,spi-ipm";
-+                      reg = <0 0x11009000 0 0x100>;
-+                      interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;
-+                      clocks = <&topckgen CLK_TOP_MPLL_D2>,
-+                               <&topckgen CLK_TOP_SPI_SEL>,
-+                               <&infracfg CLK_INFRA_104M_SPI2_BCK>,
-+                               <&infracfg CLK_INFRA_66M_SPI2_HCK>;
-+                      clock-names = "parent-clk", "sel-clk", "spi-clk",
-+                                    "hclk";
-+                      #address-cells = <1>;
-+                      #size-cells = <0>;
-+                      status = "disabled";
-+              };
-+
-               lvts: lvts@1100a000 {
-                       compatible = "mediatek,mt7988-lvts-ap";
-                       #thermal-sensor-cells = <1>;
diff --git a/target/linux/mediatek/patches-6.12/174-v6.16-arm64-dts-mediatek-mt7988-add-spi-controllers.patch b/target/linux/mediatek/patches-6.12/174-v6.16-arm64-dts-mediatek-mt7988-add-spi-controllers.patch
new file mode 100644 (file)
index 0000000..d634671
--- /dev/null
@@ -0,0 +1,69 @@
+From bf7c2ce439ca811dc1697b4bc19ab57bd8f13be3 Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Fri, 16 May 2025 20:01:35 +0200
+Subject: [PATCH] arm64: dts: mediatek: mt7988: add spi controllers
+
+Add SPI controllers for mt7988.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
+Link: https://lore.kernel.org/r/20250516180147.10416-6-linux@fw-web.de
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+---
+ arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 45 +++++++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+--- a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
+@@ -311,6 +311,51 @@
+                       status = "disabled";
+               };
++              spi0: spi@11007000 {
++                      compatible = "mediatek,mt7988-spi-quad", "mediatek,spi-ipm";
++                      reg = <0 0x11007000 0 0x100>;
++                      interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
++                      clocks = <&topckgen CLK_TOP_MPLL_D2>,
++                               <&topckgen CLK_TOP_SPI_SEL>,
++                               <&infracfg CLK_INFRA_104M_SPI0>,
++                               <&infracfg CLK_INFRA_66M_SPI0_HCK>;
++                      clock-names = "parent-clk", "sel-clk", "spi-clk",
++                                    "hclk";
++                      #address-cells = <1>;
++                      #size-cells = <0>;
++                      status = "disabled";
++              };
++
++              spi1: spi@11008000 {
++                      compatible = "mediatek,mt7988-spi-single", "mediatek,spi-ipm";
++                      reg = <0 0x11008000 0 0x100>;
++                      interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
++                      clocks = <&topckgen CLK_TOP_MPLL_D2>,
++                               <&topckgen CLK_TOP_SPIM_MST_SEL>,
++                               <&infracfg CLK_INFRA_104M_SPI1>,
++                               <&infracfg CLK_INFRA_66M_SPI1_HCK>;
++                      clock-names = "parent-clk", "sel-clk", "spi-clk",
++                                    "hclk";
++                      #address-cells = <1>;
++                      #size-cells = <0>;
++                      status = "disabled";
++              };
++
++              spi2: spi@11009000 {
++                      compatible = "mediatek,mt7988-spi-quad", "mediatek,spi-ipm";
++                      reg = <0 0x11009000 0 0x100>;
++                      interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;
++                      clocks = <&topckgen CLK_TOP_MPLL_D2>,
++                               <&topckgen CLK_TOP_SPI_SEL>,
++                               <&infracfg CLK_INFRA_104M_SPI2_BCK>,
++                               <&infracfg CLK_INFRA_66M_SPI2_HCK>;
++                      clock-names = "parent-clk", "sel-clk", "spi-clk",
++                                    "hclk";
++                      #address-cells = <1>;
++                      #size-cells = <0>;
++                      status = "disabled";
++              };
++
+               lvts: lvts@1100a000 {
+                       compatible = "mediatek,mt7988-lvts-ap";
+                       #thermal-sensor-cells = <1>;
diff --git a/target/linux/mediatek/patches-6.12/175-arm64-dts-mediatek-mt7988-move-uart0-and-spi1-pins-to-soc-dtsi.patch b/target/linux/mediatek/patches-6.12/175-arm64-dts-mediatek-mt7988-move-uart0-and-spi1-pins-to-soc-dtsi.patch
deleted file mode 100644 (file)
index 7dbc1e4..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-From patchwork Sun May 11 14:19:21 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Frank Wunderlich <linux@fw-web.de>
-X-Patchwork-Id: 14084155
-From: Frank Wunderlich <linux@fw-web.de>
-To: Andrew Lunn <andrew@lunn.ch>,
-       Vladimir Oltean <olteanv@gmail.com>,
-       "David S. Miller" <davem@davemloft.net>,
-       Eric Dumazet <edumazet@google.com>,
-       Jakub Kicinski <kuba@kernel.org>,
-       Paolo Abeni <pabeni@redhat.com>,
-       Rob Herring <robh@kernel.org>,
-       Krzysztof Kozlowski <krzk+dt@kernel.org>,
-       Conor Dooley <conor+dt@kernel.org>,
-       Matthias Brugger <matthias.bgg@gmail.com>,
-       AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Subject: [PATCH v1 05/14] arm64: dts: mediatek: mt7988: move uart0 and spi1
- pins to soc dtsi
-Date: Sun, 11 May 2025 16:19:21 +0200
-Message-ID: <20250511141942.10284-6-linux@fw-web.de>
-X-Mailer: git-send-email 2.43.0
-In-Reply-To: <20250511141942.10284-1-linux@fw-web.de>
-References: <20250511141942.10284-1-linux@fw-web.de>
-MIME-Version: 1.0
-X-Mail-ID: 730e5bd4-362e-4c00-a35e-0ec77e8f4691
-X-BeenThere: linux-mediatek@lists.infradead.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: <linux-mediatek.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-mediatek/>
-List-Post: <mailto:linux-mediatek@lists.infradead.org>
-List-Help: <mailto:linux-mediatek-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=subscribe>
-Cc: devicetree@vger.kernel.org, Landen Chao <Landen.Chao@mediatek.com>,
-       =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>,
- netdev@vger.kernel.org, Sean Wang <sean.wang@mediatek.com>,
- Daniel Golle <daniel@makrotopia.org>, linux-kernel@vger.kernel.org,
- DENG Qingfang <dqfext@gmail.com>, linux-mediatek@lists.infradead.org,
- Lorenzo Bianconi <lorenzo@kernel.org>, linux-arm-kernel@lists.infradead.org,
- Felix Fietkau <nbd@nbd.name>
-Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org>
-Errors-To: 
- linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org
-
-From: Frank Wunderlich <frank-w@public-files.de>
-
-In order to use uart0 or spi1 there is only 1 possible pin definition
-so move them to soc dtsi to reuse them in other boards and avoiding
-conflict if defined twice.
-
-Suggested-by: Daniel Golle <daniel@makrotopia.org>
-Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
----
- .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi  | 14 --------------
- arch/arm64/boot/dts/mediatek/mt7988a.dtsi      | 18 ++++++++++++++++++
- 2 files changed, 18 insertions(+), 14 deletions(-)
-
---- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
-@@ -328,13 +328,6 @@
-               };
-       };
--      uart0_pins: uart0-pins {
--              mux {
--                      function = "uart";
--                      groups =  "uart0";
--              };
--      };
--
-       snfi_pins: snfi-pins {
-               mux {
-                       function = "flash";
-@@ -356,13 +349,6 @@
-               };
-       };
--      spi1_pins: spi1-pins {
--              mux {
--                      function = "spi";
--                      groups = "spi1";
--              };
--      };
--
-       spi2_pins: spi2-pins {
-               mux {
-                       function = "spi";
---- a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
-@@ -209,6 +209,20 @@
-                                                "pcie_wake_n3_0";
-                               };
-                       };
-+
-+                      spi1_pins: spi1-pins {
-+                              mux {
-+                                      function = "spi";
-+                                      groups = "spi1";
-+                              };
-+                      };
-+
-+                      uart0_pins: uart0-pins {
-+                              mux {
-+                                      function = "uart";
-+                                      groups =  "uart0";
-+                              };
-+                      };
-               };
-               pwm: pwm@10048000 {
-@@ -244,6 +258,8 @@
-                       clocks = <&topckgen CLK_TOP_UART_SEL>,
-                                <&infracfg CLK_INFRA_52M_UART0_CK>;
-                       clock-names = "baud", "bus";
-+                      pinctrl-names = "default";
-+                      pinctrl-0 = <&uart0_pins>;
-                       status = "disabled";
-               };
-@@ -338,6 +354,8 @@
-                                     "hclk";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-+                      pinctrl-names = "default";
-+                      pinctrl-0 = <&spi1_pins>;
-                       status = "disabled";
-               };
diff --git a/target/linux/mediatek/patches-6.12/175-v6.16-arm64-dts-mediatek-mt7988-move-uart0-and-spi1-pins-t.patch b/target/linux/mediatek/patches-6.12/175-v6.16-arm64-dts-mediatek-mt7988-move-uart0-and-spi1-pins-t.patch
new file mode 100644 (file)
index 0000000..54d829c
--- /dev/null
@@ -0,0 +1,90 @@
+From b9ebd166b006f77cef4530b4bf4a291a112da4f2 Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Fri, 16 May 2025 20:01:36 +0200
+Subject: [PATCH] arm64: dts: mediatek: mt7988: move uart0 and spi1 pins to soc
+ dtsi
+
+In order to use uart0 or spi1 there is only 1 possible pin definition
+so move them to soc dtsi to reuse them in other boards and avoiding
+conflict if defined twice.
+
+Suggested-by: Daniel Golle <daniel@makrotopia.org>
+Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
+Link: https://lore.kernel.org/r/20250516180147.10416-7-linux@fw-web.de
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+---
+ .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi  | 14 --------------
+ arch/arm64/boot/dts/mediatek/mt7988a.dtsi      | 18 ++++++++++++++++++
+ 2 files changed, 18 insertions(+), 14 deletions(-)
+
+--- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
+@@ -328,13 +328,6 @@
+               };
+       };
+-      uart0_pins: uart0-pins {
+-              mux {
+-                      function = "uart";
+-                      groups =  "uart0";
+-              };
+-      };
+-
+       snfi_pins: snfi-pins {
+               mux {
+                       function = "flash";
+@@ -356,13 +349,6 @@
+               };
+       };
+-      spi1_pins: spi1-pins {
+-              mux {
+-                      function = "spi";
+-                      groups = "spi1";
+-              };
+-      };
+-
+       spi2_pins: spi2-pins {
+               mux {
+                       function = "spi";
+--- a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
+@@ -209,6 +209,20 @@
+                                                "pcie_wake_n3_0";
+                               };
+                       };
++
++                      spi1_pins: spi1-pins {
++                              mux {
++                                      function = "spi";
++                                      groups = "spi1";
++                              };
++                      };
++
++                      uart0_pins: uart0-pins {
++                              mux {
++                                      function = "uart";
++                                      groups =  "uart0";
++                              };
++                      };
+               };
+               pwm: pwm@10048000 {
+@@ -244,6 +258,8 @@
+                       clocks = <&topckgen CLK_TOP_UART_SEL>,
+                                <&infracfg CLK_INFRA_52M_UART0_CK>;
+                       clock-names = "baud", "bus";
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&uart0_pins>;
+                       status = "disabled";
+               };
+@@ -338,6 +354,8 @@
+                                     "hclk";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&spi1_pins>;
+                       status = "disabled";
+               };
diff --git a/target/linux/mediatek/patches-6.12/176-arm64-dts-mediatek-mt7988-add-cci-node.patch b/target/linux/mediatek/patches-6.12/176-arm64-dts-mediatek-mt7988-add-cci-node.patch
deleted file mode 100644 (file)
index 915c45c..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-From patchwork Sun May 11 14:19:22 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Frank Wunderlich <linux@fw-web.de>
-X-Patchwork-Id: 14084106
-From: Frank Wunderlich <linux@fw-web.de>
-To: Andrew Lunn <andrew@lunn.ch>,
-       Vladimir Oltean <olteanv@gmail.com>,
-       "David S. Miller" <davem@davemloft.net>,
-       Eric Dumazet <edumazet@google.com>,
-       Jakub Kicinski <kuba@kernel.org>,
-       Paolo Abeni <pabeni@redhat.com>,
-       Rob Herring <robh@kernel.org>,
-       Krzysztof Kozlowski <krzk+dt@kernel.org>,
-       Conor Dooley <conor+dt@kernel.org>,
-       Matthias Brugger <matthias.bgg@gmail.com>,
-       AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Subject: [PATCH v1 06/14] arm64: dts: mediatek: mt7988: add cci node
-Date: Sun, 11 May 2025 16:19:22 +0200
-Message-ID: <20250511141942.10284-7-linux@fw-web.de>
-X-Mailer: git-send-email 2.43.0
-In-Reply-To: <20250511141942.10284-1-linux@fw-web.de>
-References: <20250511141942.10284-1-linux@fw-web.de>
-MIME-Version: 1.0
-X-Mail-ID: beeb7784-23fa-410f-9e58-cc51116d869e
-X-BeenThere: linux-mediatek@lists.infradead.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: <linux-mediatek.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-mediatek/>
-List-Post: <mailto:linux-mediatek@lists.infradead.org>
-List-Help: <mailto:linux-mediatek-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=subscribe>
-Cc: devicetree@vger.kernel.org, Landen Chao <Landen.Chao@mediatek.com>,
-       =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>,
- netdev@vger.kernel.org, Sean Wang <sean.wang@mediatek.com>,
- Daniel Golle <daniel@makrotopia.org>, linux-kernel@vger.kernel.org,
- DENG Qingfang <dqfext@gmail.com>, linux-mediatek@lists.infradead.org,
- Lorenzo Bianconi <lorenzo@kernel.org>, linux-arm-kernel@lists.infradead.org,
- Felix Fietkau <nbd@nbd.name>
-Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org>
-Errors-To: 
- linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org
-
-From: Frank Wunderlich <frank-w@public-files.de>
-
-Add cci devicetree node for cpu frequency scaling.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
----
- arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 33 +++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
---- a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
-@@ -12,6 +12,35 @@
-       #address-cells = <2>;
-       #size-cells = <2>;
-+      cci: cci {
-+              compatible = "mediatek,mt8183-cci";
-+              clocks = <&mcusys CLK_MCU_BUS_DIV_SEL>,
-+                       <&topckgen CLK_TOP_XTAL>;
-+              clock-names = "cci", "intermediate";
-+              operating-points-v2 = <&cci_opp>;
-+      };
-+
-+      cci_opp: opp-table-cci {
-+              compatible = "operating-points-v2";
-+              opp-shared;
-+              opp-480000000 {
-+                      opp-hz = /bits/ 64 <480000000>;
-+                      opp-microvolt = <850000>;
-+              };
-+              opp-660000000 {
-+                      opp-hz = /bits/ 64 <660000000>;
-+                      opp-microvolt = <850000>;
-+              };
-+              opp-900000000 {
-+                      opp-hz = /bits/ 64 <900000000>;
-+                      opp-microvolt = <850000>;
-+              };
-+              opp-1080000000 {
-+                      opp-hz = /bits/ 64 <1080000000>;
-+                      opp-microvolt = <900000>;
-+              };
-+      };
-+
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-@@ -25,6 +54,7 @@
-                                <&topckgen CLK_TOP_XTAL>;
-                       clock-names = "cpu", "intermediate";
-                       operating-points-v2 = <&cluster0_opp>;
-+                      mediatek,cci = <&cci>;
-               };
-               cpu1: cpu@1 {
-@@ -36,6 +66,7 @@
-                                <&topckgen CLK_TOP_XTAL>;
-                       clock-names = "cpu", "intermediate";
-                       operating-points-v2 = <&cluster0_opp>;
-+                      mediatek,cci = <&cci>;
-               };
-               cpu2: cpu@2 {
-@@ -47,6 +78,7 @@
-                                <&topckgen CLK_TOP_XTAL>;
-                       clock-names = "cpu", "intermediate";
-                       operating-points-v2 = <&cluster0_opp>;
-+                      mediatek,cci = <&cci>;
-               };
-               cpu3: cpu@3 {
-@@ -58,6 +90,7 @@
-                                <&topckgen CLK_TOP_XTAL>;
-                       clock-names = "cpu", "intermediate";
-                       operating-points-v2 = <&cluster0_opp>;
-+                      mediatek,cci = <&cci>;
-               };
-               cluster0_opp: opp-table-0 {
diff --git a/target/linux/mediatek/patches-6.12/176-v6.17-arm64-dts-mediatek-mt7988-add-cci-node.patch b/target/linux/mediatek/patches-6.12/176-v6.17-arm64-dts-mediatek-mt7988-add-cci-node.patch
new file mode 100644 (file)
index 0000000..42a4aed
--- /dev/null
@@ -0,0 +1,86 @@
+From 0cbdb6d04689f8c05074e348c8e0a42b229ef9a3 Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Sun, 6 Jul 2025 15:22:03 +0200
+Subject: [PATCH] arm64: dts: mediatek: mt7988: add cci node
+
+Add cci devicetree node for cpu frequency scaling.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Link: https://lore.kernel.org/r/20250706132213.20412-9-linux@fw-web.de
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+---
+ arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 33 +++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+
+--- a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
+@@ -12,6 +12,35 @@
+       #address-cells = <2>;
+       #size-cells = <2>;
++      cci: cci {
++              compatible = "mediatek,mt7988-cci", "mediatek,mt8183-cci";
++              clocks = <&mcusys CLK_MCU_BUS_DIV_SEL>,
++                       <&topckgen CLK_TOP_XTAL>;
++              clock-names = "cci", "intermediate";
++              operating-points-v2 = <&cci_opp>;
++      };
++
++      cci_opp: opp-table-cci {
++              compatible = "operating-points-v2";
++              opp-shared;
++              opp-480000000 {
++                      opp-hz = /bits/ 64 <480000000>;
++                      opp-microvolt = <850000>;
++              };
++              opp-660000000 {
++                      opp-hz = /bits/ 64 <660000000>;
++                      opp-microvolt = <850000>;
++              };
++              opp-900000000 {
++                      opp-hz = /bits/ 64 <900000000>;
++                      opp-microvolt = <850000>;
++              };
++              opp-1080000000 {
++                      opp-hz = /bits/ 64 <1080000000>;
++                      opp-microvolt = <900000>;
++              };
++      };
++
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+@@ -25,6 +54,7 @@
+                                <&topckgen CLK_TOP_XTAL>;
+                       clock-names = "cpu", "intermediate";
+                       operating-points-v2 = <&cluster0_opp>;
++                      mediatek,cci = <&cci>;
+               };
+               cpu1: cpu@1 {
+@@ -36,6 +66,7 @@
+                                <&topckgen CLK_TOP_XTAL>;
+                       clock-names = "cpu", "intermediate";
+                       operating-points-v2 = <&cluster0_opp>;
++                      mediatek,cci = <&cci>;
+               };
+               cpu2: cpu@2 {
+@@ -47,6 +78,7 @@
+                                <&topckgen CLK_TOP_XTAL>;
+                       clock-names = "cpu", "intermediate";
+                       operating-points-v2 = <&cluster0_opp>;
++                      mediatek,cci = <&cci>;
+               };
+               cpu3: cpu@3 {
+@@ -58,6 +90,7 @@
+                                <&topckgen CLK_TOP_XTAL>;
+                       clock-names = "cpu", "intermediate";
+                       operating-points-v2 = <&cluster0_opp>;
++                      mediatek,cci = <&cci>;
+               };
+               cluster0_opp: opp-table-0 {
diff --git a/target/linux/mediatek/patches-6.12/177-arm64-dts-mediatek-mt7988-add-phy-calibration-efuse-subnodes.patch b/target/linux/mediatek/patches-6.12/177-arm64-dts-mediatek-mt7988-add-phy-calibration-efuse-subnodes.patch
deleted file mode 100644 (file)
index dc6df8e..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From patchwork Sun May 11 14:19:23 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Frank Wunderlich <linux@fw-web.de>
-X-Patchwork-Id: 14084124
-From: Frank Wunderlich <linux@fw-web.de>
-To: Andrew Lunn <andrew@lunn.ch>,
-       Vladimir Oltean <olteanv@gmail.com>,
-       "David S. Miller" <davem@davemloft.net>,
-       Eric Dumazet <edumazet@google.com>,
-       Jakub Kicinski <kuba@kernel.org>,
-       Paolo Abeni <pabeni@redhat.com>,
-       Rob Herring <robh@kernel.org>,
-       Krzysztof Kozlowski <krzk+dt@kernel.org>,
-       Conor Dooley <conor+dt@kernel.org>,
-       Matthias Brugger <matthias.bgg@gmail.com>,
-       AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Subject: [PATCH v1 07/14] arm64: dts: mediatek: mt7988: add phy calibration
- efuse subnodes
-Date: Sun, 11 May 2025 16:19:23 +0200
-Message-ID: <20250511141942.10284-8-linux@fw-web.de>
-X-Mailer: git-send-email 2.43.0
-In-Reply-To: <20250511141942.10284-1-linux@fw-web.de>
-References: <20250511141942.10284-1-linux@fw-web.de>
-MIME-Version: 1.0
-X-Mail-ID: b7327c0d-db13-43b6-8ec5-709b71d19c3b
-X-BeenThere: linux-mediatek@lists.infradead.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: <linux-mediatek.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-mediatek/>
-List-Post: <mailto:linux-mediatek@lists.infradead.org>
-List-Help: <mailto:linux-mediatek-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=subscribe>
-Cc: devicetree@vger.kernel.org, Landen Chao <Landen.Chao@mediatek.com>,
-       =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>,
- netdev@vger.kernel.org, Sean Wang <sean.wang@mediatek.com>,
- Daniel Golle <daniel@makrotopia.org>, linux-kernel@vger.kernel.org,
- DENG Qingfang <dqfext@gmail.com>, linux-mediatek@lists.infradead.org,
- Lorenzo Bianconi <lorenzo@kernel.org>, linux-arm-kernel@lists.infradead.org,
- Felix Fietkau <nbd@nbd.name>
-Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org>
-Errors-To: 
- linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org
-
-From: Frank Wunderlich <frank-w@public-files.de>
-
-MT7988 contains buildin mt753x switch which needs calibration data from
-efuse.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
----
- arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
-@@ -702,6 +702,22 @@
-                       lvts_calibration: calib@918 {
-                               reg = <0x918 0x28>;
-                       };
-+
-+                      phy_calibration_p0: calib@940 {
-+                              reg = <0x940 0x10>;
-+                      };
-+
-+                      phy_calibration_p1: calib@954 {
-+                              reg = <0x954 0x10>;
-+                      };
-+
-+                      phy_calibration_p2: calib@968 {
-+                              reg = <0x968 0x10>;
-+                      };
-+
-+                      phy_calibration_p3: calib@97c {
-+                              reg = <0x97c 0x10>;
-+                      };
-               };
-               clock-controller@15000000 {
diff --git a/target/linux/mediatek/patches-6.12/177-v6.16-arm64-dts-mediatek-mt7988-add-phy-calibration-efuse-.patch b/target/linux/mediatek/patches-6.12/177-v6.16-arm64-dts-mediatek-mt7988-add-phy-calibration-efuse-.patch
new file mode 100644 (file)
index 0000000..b657e22
--- /dev/null
@@ -0,0 +1,42 @@
+From e4950b016c727feb0c39ad12cfcb6182c9ef3814 Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Fri, 16 May 2025 20:01:38 +0200
+Subject: [PATCH] arm64: dts: mediatek: mt7988: add phy calibration efuse
+ subnodes
+
+MT7988 contains buildin mt753x switch which needs calibration data from
+efuse.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
+Link: https://lore.kernel.org/r/20250516180147.10416-9-linux@fw-web.de
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+---
+ arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
+@@ -702,6 +702,22 @@
+                       lvts_calibration: calib@918 {
+                               reg = <0x918 0x28>;
+                       };
++
++                      phy_calibration_p0: calib@940 {
++                              reg = <0x940 0x10>;
++                      };
++
++                      phy_calibration_p1: calib@954 {
++                              reg = <0x954 0x10>;
++                      };
++
++                      phy_calibration_p2: calib@968 {
++                              reg = <0x968 0x10>;
++                      };
++
++                      phy_calibration_p3: calib@97c {
++                              reg = <0x97c 0x10>;
++                      };
+               };
+               clock-controller@15000000 {
diff --git a/target/linux/mediatek/patches-6.12/180-arm64-dts-mediatek-mt7988a-bpi-r4-Add-fan-and-coolingmaps.patch b/target/linux/mediatek/patches-6.12/180-arm64-dts-mediatek-mt7988a-bpi-r4-Add-fan-and-coolingmaps.patch
deleted file mode 100644 (file)
index 4e3d4ae..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-From patchwork Sun May 11 14:26:50 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Frank Wunderlich <frank-w@public-files.de>
-X-Patchwork-Id: 14084133
-From: Frank Wunderlich <frank-w@public-files.de>
-To: Andrew Lunn <andrew@lunn.ch>,
-       Vladimir Oltean <olteanv@gmail.com>,
-       "David S. Miller" <davem@davemloft.net>,
-       Eric Dumazet <edumazet@google.com>,
-       Jakub Kicinski <kuba@kernel.org>,
-       Paolo Abeni <pabeni@redhat.com>,
-       Rob Herring <robh@kernel.org>,
-       Krzysztof Kozlowski <krzk+dt@kernel.org>,
-       Conor Dooley <conor+dt@kernel.org>,
-       Matthias Brugger <matthias.bgg@gmail.com>,
-       AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Subject: [PATCH v1 10/14] arm64: dts: mediatek: mt7988a-bpi-r4: Add fan and
- coolingmaps
-Date: Sun, 11 May 2025 16:26:50 +0200
-Message-ID: <20250511142655.11007-1-frank-w@public-files.de>
-X-Mailer: git-send-email 2.43.0
-MIME-Version: 1.0
-X-BeenThere: linux-mediatek@lists.infradead.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: <linux-mediatek.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-mediatek/>
-List-Post: <mailto:linux-mediatek@lists.infradead.org>
-List-Help: <mailto:linux-mediatek-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=subscribe>
-Cc: devicetree@vger.kernel.org, Landen Chao <Landen.Chao@mediatek.com>,
-       =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>,
- netdev@vger.kernel.org, Sean Wang <sean.wang@mediatek.com>,
- Daniel Golle <daniel@makrotopia.org>, linux-kernel@vger.kernel.org,
- DENG Qingfang <dqfext@gmail.com>, linux-mediatek@lists.infradead.org,
- Lorenzo Bianconi <lorenzo@kernel.org>, linux-arm-kernel@lists.infradead.org,
- Felix Fietkau <nbd@nbd.name>
-Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org>
-Errors-To: 
- linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org
-
-Add Fan and cooling maps for Bananpi-R4 board.
-
-Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
----
- .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 29 +++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
---- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
-@@ -12,6 +12,15 @@
-               stdout-path = "serial0:115200n8";
-       };
-+      fan: pwm-fan {
-+              compatible = "pwm-fan";
-+              /* cooling level (0, 1, 2, 3) : (0% duty, 30% duty, 50% duty, 100% duty) */
-+              cooling-levels = <0 80 128 255>;
-+              #cooling-cells = <2>;
-+              pwms = <&pwm 0 50000>;
-+              status = "okay";
-+      };
-+
-       reg_1p8v: regulator-1p8v {
-               compatible = "regulator-fixed";
-               regulator-name = "fixed-1.8V";
-@@ -73,6 +82,26 @@
-                       type = "active";
-               };
-       };
-+
-+      cooling-maps {
-+              map-cpu-active-high {
-+                      /* active: set fan to cooling level 2 */
-+                      cooling-device = <&fan 3 3>;
-+                      trip = <&cpu_trip_active_high>;
-+              };
-+
-+              map-cpu-active-med {
-+                      /* active: set fan to cooling level 1 */
-+                      cooling-device = <&fan 2 2>;
-+                      trip = <&cpu_trip_active_med>;
-+              };
-+
-+              map-cpu-active-low {
-+                      /* active: set fan to cooling level 0 */
-+                      cooling-device = <&fan 1 1>;
-+                      trip = <&cpu_trip_active_low>;
-+              };
-+      };
- };
- &i2c0 {
diff --git a/target/linux/mediatek/patches-6.12/180-v6.16-arm64-dts-mediatek-mt7988a-bpi-r4-Add-fan-and-coolin.patch b/target/linux/mediatek/patches-6.12/180-v6.16-arm64-dts-mediatek-mt7988a-bpi-r4-Add-fan-and-coolin.patch
new file mode 100644 (file)
index 0000000..9b616ce
--- /dev/null
@@ -0,0 +1,59 @@
+From 0f63e96e2ab422d1d35def1da75d3df299bf503e Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Fri, 16 May 2025 20:01:41 +0200
+Subject: [PATCH] arm64: dts: mediatek: mt7988a-bpi-r4: Add fan and coolingmaps
+
+Add Fan and cooling maps for Bananapi-R4 board.
+
+Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
+Link: https://lore.kernel.org/r/20250516180147.10416-12-linux@fw-web.de
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+---
+ .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 29 +++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+--- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
+@@ -12,6 +12,15 @@
+               stdout-path = "serial0:115200n8";
+       };
++      fan: pwm-fan {
++              compatible = "pwm-fan";
++              /* cooling level (0, 1, 2, 3) : (0% duty, 30% duty, 50% duty, 100% duty) */
++              cooling-levels = <0 80 128 255>;
++              #cooling-cells = <2>;
++              pwms = <&pwm 0 50000>;
++              status = "okay";
++      };
++
+       reg_1p8v: regulator-1p8v {
+               compatible = "regulator-fixed";
+               regulator-name = "fixed-1.8V";
+@@ -73,6 +82,26 @@
+                       type = "active";
+               };
+       };
++
++      cooling-maps {
++              map-cpu-active-high {
++                      /* active: set fan to cooling level 2 */
++                      cooling-device = <&fan 3 3>;
++                      trip = <&cpu_trip_active_high>;
++              };
++
++              map-cpu-active-med {
++                      /* active: set fan to cooling level 1 */
++                      cooling-device = <&fan 2 2>;
++                      trip = <&cpu_trip_active_med>;
++              };
++
++              map-cpu-active-low {
++                      /* active: set fan to cooling level 0 */
++                      cooling-device = <&fan 1 1>;
++                      trip = <&cpu_trip_active_low>;
++              };
++      };
+ };
+ &i2c0 {
diff --git a/target/linux/mediatek/patches-6.12/181-arm64-dts-mediatek-mt7988a-bpi-r4-configure-spi-nodes.patch b/target/linux/mediatek/patches-6.12/181-arm64-dts-mediatek-mt7988a-bpi-r4-configure-spi-nodes.patch
deleted file mode 100644 (file)
index c5c5e83..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-From patchwork Sun May 11 14:26:51 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Frank Wunderlich <frank-w@public-files.de>
-X-Patchwork-Id: 14084136
-Received: from frank-u24 ([194.15.84.99]) by mail.gmx.net (mrgmx104
- [212.227.17.168]) with ESMTPSA (Nemesis) id 1MD9XF-1u5YvB0cIj-00FOt5; Sun, 11
- May 2025 16:27:04 +0200
-From: Frank Wunderlich <frank-w@public-files.de>
-To: Andrew Lunn <andrew@lunn.ch>,
-       Vladimir Oltean <olteanv@gmail.com>,
-       "David S. Miller" <davem@davemloft.net>,
-       Eric Dumazet <edumazet@google.com>,
-       Jakub Kicinski <kuba@kernel.org>,
-       Paolo Abeni <pabeni@redhat.com>,
-       Rob Herring <robh@kernel.org>,
-       Krzysztof Kozlowski <krzk+dt@kernel.org>,
-       Conor Dooley <conor+dt@kernel.org>,
-       Matthias Brugger <matthias.bgg@gmail.com>,
-       AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Subject: [PATCH v1 11/14] arm64: dts: mediatek: mt7988a-bpi-r4: configure
- spi-nodes
-Date: Sun, 11 May 2025 16:26:51 +0200
-Message-ID: <20250511142655.11007-2-frank-w@public-files.de>
-X-Mailer: git-send-email 2.43.0
-In-Reply-To: <20250511142655.11007-1-frank-w@public-files.de>
-References: <20250511142655.11007-1-frank-w@public-files.de>
-MIME-Version: 1.0
-X-BeenThere: linux-mediatek@lists.infradead.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: <linux-mediatek.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-mediatek/>
-List-Post: <mailto:linux-mediatek@lists.infradead.org>
-List-Help: <mailto:linux-mediatek-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=subscribe>
-Cc: devicetree@vger.kernel.org, Landen Chao <Landen.Chao@mediatek.com>,
-       =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>,
- netdev@vger.kernel.org, Sean Wang <sean.wang@mediatek.com>,
- Daniel Golle <daniel@makrotopia.org>, linux-kernel@vger.kernel.org,
- DENG Qingfang <dqfext@gmail.com>, linux-mediatek@lists.infradead.org,
- Lorenzo Bianconi <lorenzo@kernel.org>, linux-arm-kernel@lists.infradead.org,
- Felix Fietkau <nbd@nbd.name>
-Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org>
-Errors-To: 
- linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org
-
-Configure and enable SPI nodes on Bananapi R4 board.
-
-Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
----
- .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 32 +++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
---- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
-@@ -401,6 +401,38 @@
-       status = "okay";
- };
-+&spi0 {
-+      pinctrl-names = "default";
-+      pinctrl-0 = <&spi0_flash_pins>;
-+      status = "okay";
-+
-+      spi_nand: flash@0 {
-+              compatible = "spi-nand";
-+              reg = <0>;
-+              spi-max-frequency = <52000000>;
-+              spi-tx-bus-width = <4>;
-+              spi-rx-bus-width = <4>;
-+      };
-+};
-+
-+&spi1 {
-+      status = "okay";
-+};
-+
-+&spi_nand {
-+      partitions {
-+              compatible = "fixed-partitions";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              partition@0 {
-+                      label = "bl2";
-+                      reg = <0x0 0x200000>;
-+                      read-only;
-+              };
-+      };
-+};
-+
- &ssusb1 {
-       status = "okay";
- };
diff --git a/target/linux/mediatek/patches-6.12/181-v6.16-arm64-dts-mediatek-mt7988a-bpi-r4-configure-spi-node.patc b/target/linux/mediatek/patches-6.12/181-v6.16-arm64-dts-mediatek-mt7988a-bpi-r4-configure-spi-node.patc
new file mode 100644 (file)
index 0000000..cffc022
--- /dev/null
@@ -0,0 +1,55 @@
+From 6b7642e9d095d33d8034b8b396a2de9e5ecb25a7 Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Fri, 16 May 2025 20:01:42 +0200
+Subject: [PATCH] arm64: dts: mediatek: mt7988a-bpi-r4: configure spi-nodes
+
+Configure and enable SPI nodes on Bananapi R4 board.
+
+Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
+Link: https://lore.kernel.org/r/20250516180147.10416-13-linux@fw-web.de
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+---
+ .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 32 +++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+
+--- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
+@@ -401,6 +401,38 @@
+       status = "okay";
+ };
++&spi0 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&spi0_flash_pins>;
++      status = "okay";
++
++      spi_nand: flash@0 {
++              compatible = "spi-nand";
++              reg = <0>;
++              spi-max-frequency = <52000000>;
++              spi-tx-bus-width = <4>;
++              spi-rx-bus-width = <4>;
++      };
++};
++
++&spi1 {
++      status = "okay";
++};
++
++&spi_nand {
++      partitions {
++              compatible = "fixed-partitions";
++              #address-cells = <1>;
++              #size-cells = <1>;
++
++              partition@0 {
++                      label = "bl2";
++                      reg = <0x0 0x200000>;
++                      read-only;
++              };
++      };
++};
++
+ &ssusb1 {
+       status = "okay";
+ };
diff --git a/target/linux/mediatek/patches-6.12/182-arm64-dts-mediatek-mt7988a-bpi-r4-add-proc-supply-for-cci.patch b/target/linux/mediatek/patches-6.12/182-arm64-dts-mediatek-mt7988a-bpi-r4-add-proc-supply-for-cci.patch
deleted file mode 100644 (file)
index f692a6f..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From patchwork Sun May 11 14:26:52 2025
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Frank Wunderlich <frank-w@public-files.de>
-X-Patchwork-Id: 14084137
-From: Frank Wunderlich <frank-w@public-files.de>
-To: Andrew Lunn <andrew@lunn.ch>,
-       Vladimir Oltean <olteanv@gmail.com>,
-       "David S. Miller" <davem@davemloft.net>,
-       Eric Dumazet <edumazet@google.com>,
-       Jakub Kicinski <kuba@kernel.org>,
-       Paolo Abeni <pabeni@redhat.com>,
-       Rob Herring <robh@kernel.org>,
-       Krzysztof Kozlowski <krzk+dt@kernel.org>,
-       Conor Dooley <conor+dt@kernel.org>,
-       Matthias Brugger <matthias.bgg@gmail.com>,
-       AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Subject: [PATCH v1 12/14] arm64: dts: mediatek: mt7988a-bpi-r4: add
- proc-supply for cci
-Date: Sun, 11 May 2025 16:26:52 +0200
-Message-ID: <20250511142655.11007-3-frank-w@public-files.de>
-X-Mailer: git-send-email 2.43.0
-In-Reply-To: <20250511142655.11007-1-frank-w@public-files.de>
-References: <20250511142655.11007-1-frank-w@public-files.de>
-MIME-Version: 1.0
-X-BeenThere: linux-mediatek@lists.infradead.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: <linux-mediatek.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-mediatek/>
-List-Post: <mailto:linux-mediatek@lists.infradead.org>
-List-Help: <mailto:linux-mediatek-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mediatek>,
- <mailto:linux-mediatek-request@lists.infradead.org?subject=subscribe>
-Cc: devicetree@vger.kernel.org, Landen Chao <Landen.Chao@mediatek.com>,
-       =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com>,
- netdev@vger.kernel.org, Sean Wang <sean.wang@mediatek.com>,
- Daniel Golle <daniel@makrotopia.org>, linux-kernel@vger.kernel.org,
- DENG Qingfang <dqfext@gmail.com>, linux-mediatek@lists.infradead.org,
- Lorenzo Bianconi <lorenzo@kernel.org>, linux-arm-kernel@lists.infradead.org,
- Felix Fietkau <nbd@nbd.name>
-Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org>
-Errors-To: 
- linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org
-
-CCI requires proc-supply. Add it on board level.
-
-Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
----
- arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
-@@ -40,6 +40,10 @@
-       };
- };
-+&cci {
-+      proc-supply = <&rt5190_buck3>;
-+};
-+
- &cpu0 {
-       proc-supply = <&rt5190_buck3>;
- };
diff --git a/target/linux/mediatek/patches-6.12/182-v6.17-arm64-dts-mediatek-mt7988a-bpi-r4-add-proc-supply-fo.patch b/target/linux/mediatek/patches-6.12/182-v6.17-arm64-dts-mediatek-mt7988a-bpi-r4-add-proc-supply-fo.patch
new file mode 100644 (file)
index 0000000..68858e7
--- /dev/null
@@ -0,0 +1,28 @@
+From b5a4ad957114b59a74b3e3f598ae0785dd86cd32 Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Sun, 6 Jul 2025 15:22:06 +0200
+Subject: [PATCH] arm64: dts: mediatek: mt7988a-bpi-r4: add proc-supply for cci
+
+CCI requires proc-supply. Add it on board level.
+
+Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Link: https://lore.kernel.org/r/20250706132213.20412-12-linux@fw-web.de
+Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+---
+ arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
+@@ -40,6 +40,10 @@
+       };
+ };
++&cci {
++      proc-supply = <&rt5190_buck3>;
++};
++
+ &cpu0 {
+       proc-supply = <&rt5190_buck3>;
+ };