mediatek: mt7986: add tag to upstreamed patches

The patch "210-pinctrl-mediatek-add-support-for-MT7986-SoC.patch" and
"212-clk-mediatek-add-mt7986-clock-support.patch" are upstreamed.

Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/target/linux/mediatek/patches-5.15/210-pinctrl-mediatek-add-support-for-MT7986-SoC.patch b/target/linux/mediatek/patches-5.15/210-pinctrl-mediatek-add-support-for-MT7986-SoC.patch
deleted file mode 100644 (file)
index 0761e1d..0000000
--- a/target/linux/mediatek/patches-5.15/210-pinctrl-mediatek-add-support-for-MT7986-SoC.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/pinctrl/mediatek/Kconfig
-+++ b/drivers/pinctrl/mediatek/Kconfig
-@@ -120,6 +120,13 @@ config PINCTRL_MT7622
-       default ARM64 && ARCH_MEDIATEK
-       select PINCTRL_MTK_MOORE
- 
-+config PINCTRL_MT7986
-+      bool "Mediatek MT7986 pin control"
-+      depends on OF
-+      depends on ARM64 || COMPILE_TEST
-+      default ARM64 && ARCH_MEDIATEK
-+      select PINCTRL_MTK_MOORE
-+
- config PINCTRL_MT8167
-       bool "Mediatek MT8167 pin control"
-       depends on OF
---- a/drivers/pinctrl/mediatek/Makefile
-+++ b/drivers/pinctrl/mediatek/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_PINCTRL_MT6797) += pinctrl-
- obj-$(CONFIG_PINCTRL_MT7622)  += pinctrl-mt7622.o
- obj-$(CONFIG_PINCTRL_MT7623)  += pinctrl-mt7623.o
- obj-$(CONFIG_PINCTRL_MT7629)  += pinctrl-mt7629.o
-+obj-$(CONFIG_PINCTRL_MT7986)  += pinctrl-mt7986.o
- obj-$(CONFIG_PINCTRL_MT8167)  += pinctrl-mt8167.o
- obj-$(CONFIG_PINCTRL_MT8173)  += pinctrl-mt8173.o
- obj-$(CONFIG_PINCTRL_MT8183)  += pinctrl-mt8183.o

diff --git a/target/linux/mediatek/patches-5.15/210-v6.1-pinctrl-mediatek-add-support-for-MT7986-SoC.patch b/target/linux/mediatek/patches-5.15/210-v6.1-pinctrl-mediatek-add-support-for-MT7986-SoC.patch
new file mode 100644 (file)
index 0000000..0761e1d
--- /dev/null
+++ b/target/linux/mediatek/patches-5.15/210-v6.1-pinctrl-mediatek-add-support-for-MT7986-SoC.patch
@@ -0,0 +1,26 @@
+--- a/drivers/pinctrl/mediatek/Kconfig
++++ b/drivers/pinctrl/mediatek/Kconfig
+@@ -120,6 +120,13 @@ config PINCTRL_MT7622
+       default ARM64 && ARCH_MEDIATEK
+       select PINCTRL_MTK_MOORE
+ 
++config PINCTRL_MT7986
++      bool "Mediatek MT7986 pin control"
++      depends on OF
++      depends on ARM64 || COMPILE_TEST
++      default ARM64 && ARCH_MEDIATEK
++      select PINCTRL_MTK_MOORE
++
+ config PINCTRL_MT8167
+       bool "Mediatek MT8167 pin control"
+       depends on OF
+--- a/drivers/pinctrl/mediatek/Makefile
++++ b/drivers/pinctrl/mediatek/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_PINCTRL_MT6797) += pinctrl-
+ obj-$(CONFIG_PINCTRL_MT7622)  += pinctrl-mt7622.o
+ obj-$(CONFIG_PINCTRL_MT7623)  += pinctrl-mt7623.o
+ obj-$(CONFIG_PINCTRL_MT7629)  += pinctrl-mt7629.o
++obj-$(CONFIG_PINCTRL_MT7986)  += pinctrl-mt7986.o
+ obj-$(CONFIG_PINCTRL_MT8167)  += pinctrl-mt8167.o
+ obj-$(CONFIG_PINCTRL_MT8173)  += pinctrl-mt8173.o
+ obj-$(CONFIG_PINCTRL_MT8183)  += pinctrl-mt8183.o

diff --git a/target/linux/mediatek/patches-5.15/212-clk-mediatek-add-mt7986-clock-support.patch b/target/linux/mediatek/patches-5.15/212-clk-mediatek-add-mt7986-clock-support.patch
deleted file mode 100644 (file)
index 8e2365a..0000000
--- a/target/linux/mediatek/patches-5.15/212-clk-mediatek-add-mt7986-clock-support.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/drivers/clk/mediatek/Kconfig
-+++ b/drivers/clk/mediatek/Kconfig
-@@ -344,6 +344,23 @@ config COMMON_CLK_MT7629_HIFSYS
-         This driver supports MediaTek MT7629 HIFSYS clocks providing
-         to PCI-E and USB.
- 
-+config COMMON_CLK_MT7986
-+      bool "Clock driver for MediaTek MT7986"
-+      depends on ARCH_MEDIATEK || COMPILE_TEST
-+      select COMMON_CLK_MEDIATEK
-+      default ARCH_MEDIATEK
-+      help
-+        This driver supports MediaTek MT7986 basic clocks and clocks
-+        required for various periperals found on MediaTek.
-+
-+config COMMON_CLK_MT7986_ETHSYS
-+      bool "Clock driver for MediaTek MT7986 ETHSYS"
-+      depends on COMMON_CLK_MT7986
-+      default COMMON_CLK_MT7986
-+      help
-+        This driver add support for clocks for Ethernet and SGMII
-+        required on MediaTek MT7986 SoC.
-+
- config COMMON_CLK_MT8135
-       bool "Clock driver for MediaTek MT8135"
-       depends on (ARCH_MEDIATEK && ARM) || COMPILE_TEST
---- a/drivers/clk/mediatek/Makefile
-+++ b/drivers/clk/mediatek/Makefile
-@@ -46,6 +46,10 @@ obj-$(CONFIG_COMMON_CLK_MT7622_AUDSYS) +
- obj-$(CONFIG_COMMON_CLK_MT7629) += clk-mt7629.o
- obj-$(CONFIG_COMMON_CLK_MT7629_ETHSYS) += clk-mt7629-eth.o
- obj-$(CONFIG_COMMON_CLK_MT7629_HIFSYS) += clk-mt7629-hif.o
-+obj-$(CONFIG_COMMON_CLK_MT7986) += clk-mt7986-apmixed.o
-+obj-$(CONFIG_COMMON_CLK_MT7986) += clk-mt7986-topckgen.o
-+obj-$(CONFIG_COMMON_CLK_MT7986) += clk-mt7986-infracfg.o
-+obj-$(CONFIG_COMMON_CLK_MT7986_ETHSYS) += clk-mt7986-eth.o
- obj-$(CONFIG_COMMON_CLK_MT8135) += clk-mt8135.o
- obj-$(CONFIG_COMMON_CLK_MT8167) += clk-mt8167.o
- obj-$(CONFIG_COMMON_CLK_MT8167_AUDSYS) += clk-mt8167-aud.o

diff --git a/target/linux/mediatek/patches-5.15/212-v5.17-clk-mediatek-add-mt7986-clock-support.patch b/target/linux/mediatek/patches-5.15/212-v5.17-clk-mediatek-add-mt7986-clock-support.patch
new file mode 100644 (file)
index 0000000..8e2365a
--- /dev/null
+++ b/target/linux/mediatek/patches-5.15/212-v5.17-clk-mediatek-add-mt7986-clock-support.patch
@@ -0,0 +1,39 @@
+--- a/drivers/clk/mediatek/Kconfig
++++ b/drivers/clk/mediatek/Kconfig
+@@ -344,6 +344,23 @@ config COMMON_CLK_MT7629_HIFSYS
+         This driver supports MediaTek MT7629 HIFSYS clocks providing
+         to PCI-E and USB.
+ 
++config COMMON_CLK_MT7986
++      bool "Clock driver for MediaTek MT7986"
++      depends on ARCH_MEDIATEK || COMPILE_TEST
++      select COMMON_CLK_MEDIATEK
++      default ARCH_MEDIATEK
++      help
++        This driver supports MediaTek MT7986 basic clocks and clocks
++        required for various periperals found on MediaTek.
++
++config COMMON_CLK_MT7986_ETHSYS
++      bool "Clock driver for MediaTek MT7986 ETHSYS"
++      depends on COMMON_CLK_MT7986
++      default COMMON_CLK_MT7986
++      help
++        This driver add support for clocks for Ethernet and SGMII
++        required on MediaTek MT7986 SoC.
++
+ config COMMON_CLK_MT8135
+       bool "Clock driver for MediaTek MT8135"
+       depends on (ARCH_MEDIATEK && ARM) || COMPILE_TEST
+--- a/drivers/clk/mediatek/Makefile
++++ b/drivers/clk/mediatek/Makefile
+@@ -46,6 +46,10 @@ obj-$(CONFIG_COMMON_CLK_MT7622_AUDSYS) +
+ obj-$(CONFIG_COMMON_CLK_MT7629) += clk-mt7629.o
+ obj-$(CONFIG_COMMON_CLK_MT7629_ETHSYS) += clk-mt7629-eth.o
+ obj-$(CONFIG_COMMON_CLK_MT7629_HIFSYS) += clk-mt7629-hif.o
++obj-$(CONFIG_COMMON_CLK_MT7986) += clk-mt7986-apmixed.o
++obj-$(CONFIG_COMMON_CLK_MT7986) += clk-mt7986-topckgen.o
++obj-$(CONFIG_COMMON_CLK_MT7986) += clk-mt7986-infracfg.o
++obj-$(CONFIG_COMMON_CLK_MT7986_ETHSYS) += clk-mt7986-eth.o
+ obj-$(CONFIG_COMMON_CLK_MT8135) += clk-mt8135.o
+ obj-$(CONFIG_COMMON_CLK_MT8167) += clk-mt8167.o
+ obj-$(CONFIG_COMMON_CLK_MT8167_AUDSYS) += clk-mt8167-aud.o