[openwrt/openwrt] mediatek: replace mt7988 clk files with accepted patches
LEDE Commits
lede-commits at lists.infradead.org
Thu Feb 15 11:34:55 PST 2024
dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/d4b4bc98bb07c094d3ffec025a3404d4c6e9e6be
commit d4b4bc98bb07c094d3ffec025a3404d4c6e9e6be
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Sun Jan 28 03:45:53 2024 +0000
mediatek: replace mt7988 clk files with accepted patches
Replace clock drivers for MT7988 with backported upstream commits.
Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
.../drivers/clk/mediatek/clk-mt7988-apmixed.c | 113 ---
.../drivers/clk/mediatek/clk-mt7988-eth.c | 141 ---
.../drivers/clk/mediatek/clk-mt7988-infracfg.c | 376 -------
.../drivers/clk/mediatek/clk-mt7988-topckgen.c | 446 ---------
.../dt-bindings/clock/mediatek,mt7988-clk.h | 276 ------
...41-clk-mediatek-Add-pcw-chg-shift-control.patch | 24 -
...bindings-clock-Add-compatibles-for-MT7981.patch | 75 ++
...242-clk-mediatek-add-mt7988-clock-support.patch | 31 -
...-arm-mediatek-sgmiisys-Convert-to-DT-sche.patch | 107 ++
...-net-pcs-mediatek-sgmiisys-add-MT7981-SoC.patch | 37 +
...-arm-mediatek-move-ethsys-controller-conv.patch | 113 +++
...-reset-mediatek-add-MT7988-ethwarp-reset-.patch | 35 +
...dings-clock-mediatek-add-MT7988-clock-IDs.patch | 302 ++++++
...-clock-mediatek-add-clock-controllers-of-.patch | 260 +++++
...k-add-pcw_chg_bit-control-for-PLLs-of-MT7.patch | 50 +
...8-clk-mediatek-add-drivers-for-MT7988-SoC.patch | 1026 ++++++++++++++++++++
...k-add-infracfg-reset-controller-for-mt798.patch | 57 ++
...dings-reset-mediatek-add-MT7988-reset-IDs.patch | 25 +
...-watchdog-mediatek-mt7988-add-wdt-support.patch | 125 +++
19 files changed, 2212 insertions(+), 1407 deletions(-)
diff --git a/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-apmixed.c b/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-apmixed.c
deleted file mode 100644
index 3f1edc231e..0000000000
--- a/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-apmixed.c
+++ /dev/null
@@ -1,113 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2023 MediaTek Inc.
- * Author: Sam Shih <sam.shih at mediatek.com>
- * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
- */
-
-#include <linux/clk-provider.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_device.h>
-#include <linux/platform_device.h>
-#include "clk-mtk.h"
-#include "clk-gate.h"
-#include "clk-mux.h"
-#include "clk-pll.h"
-#include <dt-bindings/clock/mediatek,mt7988-clk.h>
-
-#define MT7988_PLL_FMAX (2500UL * MHZ)
-#define MT7988_PCW_CHG_SHIFT 2
-
-#define PLL_xtal(_id, _name, _reg, _pwr_reg, _en_mask, _flags, _rst_bar_mask, \
- _pcwbits, _pd_reg, _pd_shift, _tuner_reg, _tuner_en_reg, \
- _tuner_en_bit, _pcw_reg, _pcw_shift, _pcw_chg_reg, \
- _div_table) \
- { \
- .id = _id, .name = _name, .reg = _reg, .pwr_reg = _pwr_reg, \
- .en_mask = _en_mask, .flags = _flags, \
- .rst_bar_mask = BIT(_rst_bar_mask), .fmax = MT7988_PLL_FMAX, \
- .pcwbits = _pcwbits, .pd_reg = _pd_reg, \
- .pd_shift = _pd_shift, .tuner_reg = _tuner_reg, \
- .tuner_en_reg = _tuner_en_reg, .tuner_en_bit = _tuner_en_bit, \
- .pcw_reg = _pcw_reg, .pcw_shift = _pcw_shift, \
- .pcw_chg_reg = _pcw_chg_reg, \
- .pcw_chg_shift = MT7988_PCW_CHG_SHIFT, \
- .div_table = _div_table, .parent_name = "clkxtal", \
- }
-
-#define PLL(_id, _name, _reg, _pwr_reg, _en_mask, _flags, _rst_bar_mask, \
- _pcwbits, _pd_reg, _pd_shift, _tuner_reg, _tuner_en_reg, \
- _tuner_en_bit, _pcw_reg, _pcw_shift, _pcw_chg_reg) \
- PLL_xtal(_id, _name, _reg, _pwr_reg, _en_mask, _flags, _rst_bar_mask, \
- _pcwbits, _pd_reg, _pd_shift, _tuner_reg, _tuner_en_reg, \
- _tuner_en_bit, _pcw_reg, _pcw_shift, _pcw_chg_reg, NULL)
-
-static const struct mtk_pll_data plls[] = {
- PLL(CLK_APMIXED_NETSYSPLL, "netsyspll", 0x0104, 0x0110, 0x00000001, 0,
- 0, 32, 0x0104, 4, 0, 0, 0, 0x0108, 0, 0x0104),
- PLL(CLK_APMIXED_MPLL, "mpll", 0x0114, 0x0120, 0xff000001, HAVE_RST_BAR,
- 23, 32, 0x0114, 4, 0, 0, 0, 0x0118, 0, 0x0114),
- PLL(CLK_APMIXED_MMPLL, "mmpll", 0x0124, 0x0130, 0xff000001,
- HAVE_RST_BAR, 23, 32, 0x0124, 4, 0, 0, 0, 0x0128, 0, 0x0124),
- PLL(CLK_APMIXED_APLL2, "apll2", 0x0134, 0x0140, 0x00000001, 0, 0, 32,
- 0x0134, 4, 0x0704, 0x0700, 1, 0x0138, 0, 0x0134),
- PLL(CLK_APMIXED_NET1PLL, "net1pll", 0x0144, 0x0150, 0xff000001,
- HAVE_RST_BAR, 23, 32, 0x0144, 4, 0, 0, 0, 0x0148, 0, 0x0144),
- PLL(CLK_APMIXED_NET2PLL, "net2pll", 0x0154, 0x0160, 0xff000001,
- (HAVE_RST_BAR | PLL_AO), 23, 32, 0x0154, 4, 0, 0, 0, 0x0158, 0,
- 0x0154),
- PLL(CLK_APMIXED_WEDMCUPLL, "wedmcupll", 0x0164, 0x0170, 0x00000001, 0,
- 0, 32, 0x0164, 4, 0, 0, 0, 0x0168, 0, 0x0164),
- PLL(CLK_APMIXED_SGMPLL, "sgmpll", 0x0174, 0x0180, 0x00000001, 0, 0, 32,
- 0x0174, 4, 0, 0, 0, 0x0178, 0, 0x0174),
- PLL(CLK_APMIXED_ARM_B, "arm_b", 0x0204, 0x0210, 0xff000001,
- (HAVE_RST_BAR | PLL_AO), 23, 32, 0x0204, 4, 0, 0, 0, 0x0208, 0,
- 0x0204),
- PLL(CLK_APMIXED_CCIPLL2_B, "ccipll2_b", 0x0214, 0x0220, 0xff000001,
- HAVE_RST_BAR, 23, 32, 0x0214, 4, 0, 0, 0, 0x0218, 0, 0x0214),
- PLL(CLK_APMIXED_USXGMIIPLL, "usxgmiipll", 0x0304, 0x0310, 0xff000001,
- HAVE_RST_BAR, 23, 32, 0x0304, 4, 0, 0, 0, 0x0308, 0, 0x0304),
- PLL(CLK_APMIXED_MSDCPLL, "msdcpll", 0x0314, 0x0320, 0x00000001, 0, 0,
- 32, 0x0314, 4, 0, 0, 0, 0x0318, 0, 0x0314),
-};
-
-static const struct of_device_id of_match_clk_mt7988_apmixed[] = {
- { .compatible = "mediatek,mt7988-apmixedsys", },
- { /* sentinel */ }
-};
-
-static int clk_mt7988_apmixed_probe(struct platform_device *pdev)
-{
- struct clk_hw_onecell_data *clk_data;
- struct device_node *node = pdev->dev.of_node;
- int r;
-
- clk_data = mtk_alloc_clk_data(ARRAY_SIZE(plls));
- if (!clk_data)
- return -ENOMEM;
-
- mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data);
-
- r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
- if (r) {
- pr_err("%s(): could not register clock provider: %d\n",
- __func__, r);
- goto free_apmixed_data;
- }
- return r;
-
-free_apmixed_data:
- mtk_free_clk_data(clk_data);
- return r;
-}
-
-static struct platform_driver clk_mt7988_apmixed_drv = {
- .probe = clk_mt7988_apmixed_probe,
- .driver = {
- .name = "clk-mt7988-apmixed",
- .of_match_table = of_match_clk_mt7988_apmixed,
- },
-};
-builtin_platform_driver(clk_mt7988_apmixed_drv);
-MODULE_LICENSE("GPL");
diff --git a/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-eth.c b/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-eth.c
deleted file mode 100644
index 14b877f8cb..0000000000
--- a/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-eth.c
+++ /dev/null
@@ -1,141 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2023 MediaTek Inc.
- * Author: Sam Shih <sam.shih at mediatek.com>
- * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
- */
-
-#include <linux/clk-provider.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_device.h>
-#include <linux/platform_device.h>
-#include "clk-mtk.h"
-#include "clk-gate.h"
-#include <dt-bindings/clock/mediatek,mt7988-clk.h>
-
-static const struct mtk_gate_regs ethdma_cg_regs = {
- .set_ofs = 0x30,
- .clr_ofs = 0x30,
- .sta_ofs = 0x30,
-};
-
-#define GATE_ETHDMA(_id, _name, _parent, _shift) \
- { \
- .id = _id, .name = _name, .parent_name = _parent, \
- .regs = ðdma_cg_regs, .shift = _shift, \
- .ops = &mtk_clk_gate_ops_no_setclr_inv, \
- }
-
-static const struct mtk_gate ethdma_clks[] = {
- GATE_ETHDMA(CLK_ETHDMA_XGP1_EN, "ethdma_xgp1_en", "top_xtal", 0),
- GATE_ETHDMA(CLK_ETHDMA_XGP2_EN, "ethdma_xgp2_en", "top_xtal", 1),
- GATE_ETHDMA(CLK_ETHDMA_XGP3_EN, "ethdma_xgp3_en", "top_xtal", 2),
- GATE_ETHDMA(CLK_ETHDMA_FE_EN, "ethdma_fe_en", "netsys_2x_sel", 6),
- GATE_ETHDMA(CLK_ETHDMA_GP2_EN, "ethdma_gp2_en", "top_xtal", 7),
- GATE_ETHDMA(CLK_ETHDMA_GP1_EN, "ethdma_gp1_en", "top_xtal", 8),
- GATE_ETHDMA(CLK_ETHDMA_GP3_EN, "ethdma_gp3_en", "top_xtal", 10),
- GATE_ETHDMA(CLK_ETHDMA_ESW_EN, "ethdma_esw_en", "netsys_gsw_sel", 16),
- GATE_ETHDMA(CLK_ETHDMA_CRYPT0_EN, "ethdma_crypt0_en", "eip197_sel",
- 29),
-};
-
-static const struct mtk_clk_desc ethdma_desc = {
- .clks = ethdma_clks,
- .num_clks = ARRAY_SIZE(ethdma_clks),
-};
-
-static const struct mtk_gate_regs sgmii0_cg_regs = {
- .set_ofs = 0xe4,
- .clr_ofs = 0xe4,
- .sta_ofs = 0xe4,
-};
-
-#define GATE_SGMII0(_id, _name, _parent, _shift) \
- { \
- .id = _id, .name = _name, .parent_name = _parent, \
- .regs = &sgmii0_cg_regs, .shift = _shift, \
- .ops = &mtk_clk_gate_ops_no_setclr_inv, \
- }
-
-static const struct mtk_gate sgmii0_clks[] = {
- GATE_SGMII0(CLK_SGM0_TX_EN, "sgm0_tx_en", "top_xtal", 2),
- GATE_SGMII0(CLK_SGM0_RX_EN, "sgm0_rx_en", "top_xtal", 3),
-};
-
-static const struct mtk_clk_desc sgmii0_desc = {
- .clks = sgmii0_clks,
- .num_clks = ARRAY_SIZE(sgmii0_clks),
-};
-
-static const struct mtk_gate_regs sgmii1_cg_regs = {
- .set_ofs = 0xe4,
- .clr_ofs = 0xe4,
- .sta_ofs = 0xe4,
-};
-
-#define GATE_SGMII1(_id, _name, _parent, _shift) \
- { \
- .id = _id, .name = _name, .parent_name = _parent, \
- .regs = &sgmii1_cg_regs, .shift = _shift, \
- .ops = &mtk_clk_gate_ops_no_setclr_inv, \
- }
-
-static const struct mtk_gate sgmii1_clks[] = {
- GATE_SGMII1(CLK_SGM1_TX_EN, "sgm1_tx_en", "top_xtal", 2),
- GATE_SGMII1(CLK_SGM1_RX_EN, "sgm1_rx_en", "top_xtal", 3),
-};
-
-static const struct mtk_clk_desc sgmii1_desc = {
- .clks = sgmii1_clks,
- .num_clks = ARRAY_SIZE(sgmii1_clks),
-};
-
-static const struct mtk_gate_regs ethwarp_cg_regs = {
- .set_ofs = 0x14,
- .clr_ofs = 0x14,
- .sta_ofs = 0x14,
-};
-
-#define GATE_ETHWARP(_id, _name, _parent, _shift) \
- { \
- .id = _id, .name = _name, .parent_name = _parent, \
- .regs = ðwarp_cg_regs, .shift = _shift, \
- .ops = &mtk_clk_gate_ops_no_setclr_inv, \
- }
-
-static const struct mtk_gate ethwarp_clks[] = {
- GATE_ETHWARP(CLK_ETHWARP_WOCPU2_EN, "ethwarp_wocpu2_en",
- "netsys_mcu_sel", 13),
- GATE_ETHWARP(CLK_ETHWARP_WOCPU1_EN, "ethwarp_wocpu1_en",
- "netsys_mcu_sel", 14),
- GATE_ETHWARP(CLK_ETHWARP_WOCPU0_EN, "ethwarp_wocpu0_en",
- "netsys_mcu_sel", 15),
-};
-
-static const struct mtk_clk_desc ethwarp_desc = {
- .clks = ethwarp_clks,
- .num_clks = ARRAY_SIZE(ethwarp_clks),
-};
-
-static const struct of_device_id of_match_clk_mt7986_eth[] = {
- { .compatible = "mediatek,mt7988-ethsys", .data = ðdma_desc },
- { .compatible = "mediatek,mt7988-sgmiisys_0", .data = &sgmii0_desc },
- { .compatible = "mediatek,mt7988-sgmiisys_1", .data = &sgmii1_desc },
- { .compatible = "mediatek,mt7988-ethwarp", .data = ðwarp_desc },
- { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, of_match_clk_mt7988_eth);
-
-static struct platform_driver clk_mt7988_eth_drv = {
- .driver = {
- .name = "clk-mt7988-eth",
- .of_match_table = of_match_clk_mt7986_eth,
- },
- .probe = mtk_clk_simple_probe,
- .remove = mtk_clk_simple_remove,
-};
-module_platform_driver(clk_mt7988_eth_drv);
-
-MODULE_DESCRIPTION("MediaTek MT7988 Ethernet clocks driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-infracfg.c b/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-infracfg.c
deleted file mode 100644
index a5d21d756d..0000000000
--- a/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-infracfg.c
+++ /dev/null
@@ -1,376 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2023 MediaTek Inc.
- * Author: Sam Shih <sam.shih at mediatek.com>
- * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
- */
-
-#include <linux/clk-provider.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_device.h>
-#include <linux/platform_device.h>
-#include "clk-mtk.h"
-#include "clk-gate.h"
-#include "clk-mux.h"
-#include <dt-bindings/clock/mediatek,mt7988-clk.h>
-
-static DEFINE_SPINLOCK(mt7988_clk_lock);
-
-static const char *const infra_mux_uart0_parents[] __initconst = {
- "csw_infra_f26m_sel", "uart_sel"
-};
-
-static const char *const infra_mux_uart1_parents[] __initconst = {
- "csw_infra_f26m_sel", "uart_sel"
-};
-
-static const char *const infra_mux_uart2_parents[] __initconst = {
- "csw_infra_f26m_sel", "uart_sel"
-};
-
-static const char *const infra_mux_spi0_parents[] __initconst = { "i2c_sel",
- "spi_sel" };
-
-static const char *const infra_mux_spi1_parents[] __initconst = {
- "i2c_sel", "spim_mst_sel"
-};
-
-static const char *const infra_pwm_bck_parents[] __initconst = {
- "top_rtc_32p7k", "csw_infra_f26m_sel", "sysaxi_sel", "pwm_sel"
-};
-
-static const char *const infra_pcie_gfmux_tl_ck_o_p0_parents[] __initconst = {
- "top_rtc_32p7k", "csw_infra_f26m_sel", "csw_infra_f26m_sel",
- "pextp_tl_sel"
-};
-
-static const char *const infra_pcie_gfmux_tl_ck_o_p1_parents[] __initconst = {
- "top_rtc_32p7k", "csw_infra_f26m_sel", "csw_infra_f26m_sel",
- "pextp_tl_p1_sel"
-};
-
-static const char *const infra_pcie_gfmux_tl_ck_o_p2_parents[] __initconst = {
- "top_rtc_32p7k", "csw_infra_f26m_sel", "csw_infra_f26m_sel",
- "pextp_tl_p2_sel"
-};
-
-static const char *const infra_pcie_gfmux_tl_ck_o_p3_parents[] __initconst = {
- "top_rtc_32p7k", "csw_infra_f26m_sel", "csw_infra_f26m_sel",
- "pextp_tl_p3_sel"
-};
-
-static const struct mtk_mux infra_muxes[] = {
- /* MODULE_CLK_SEL_0 */
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_UART0_SEL, "infra_mux_uart0_sel",
- infra_mux_uart0_parents, 0x0018, 0x0010, 0x0014,
- 0, 1, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_UART1_SEL, "infra_mux_uart1_sel",
- infra_mux_uart1_parents, 0x0018, 0x0010, 0x0014,
- 1, 1, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_UART2_SEL, "infra_mux_uart2_sel",
- infra_mux_uart2_parents, 0x0018, 0x0010, 0x0014,
- 2, 1, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_SPI0_SEL, "infra_mux_spi0_sel",
- infra_mux_spi0_parents, 0x0018, 0x0010, 0x0014, 4,
- 1, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_SPI1_SEL, "infra_mux_spi1_sel",
- infra_mux_spi1_parents, 0x0018, 0x0010, 0x0014, 5,
- 1, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_SPI2_SEL, "infra_mux_spi2_sel",
- infra_mux_spi0_parents, 0x0018, 0x0010, 0x0014, 6,
- 1, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_SEL, "infra_pwm_sel",
- infra_pwm_bck_parents, 0x0018, 0x0010, 0x0014, 14,
- 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK1_SEL, "infra_pwm_ck1_sel",
- infra_pwm_bck_parents, 0x0018, 0x0010, 0x0014, 16,
- 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK2_SEL, "infra_pwm_ck2_sel",
- infra_pwm_bck_parents, 0x0018, 0x0010, 0x0014, 18,
- 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK3_SEL, "infra_pwm_ck3_sel",
- infra_pwm_bck_parents, 0x0018, 0x0010, 0x0014, 20,
- 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK4_SEL, "infra_pwm_ck4_sel",
- infra_pwm_bck_parents, 0x0018, 0x0010, 0x0014, 22,
- 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK5_SEL, "infra_pwm_ck5_sel",
- infra_pwm_bck_parents, 0x0018, 0x0010, 0x0014, 24,
- 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK6_SEL, "infra_pwm_ck6_sel",
- infra_pwm_bck_parents, 0x0018, 0x0010, 0x0014, 26,
- 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK7_SEL, "infra_pwm_ck7_sel",
- infra_pwm_bck_parents, 0x0018, 0x0010, 0x0014, 28,
- 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK8_SEL, "infra_pwm_ck8_sel",
- infra_pwm_bck_parents, 0x0018, 0x0010, 0x0014, 30,
- 2, -1, -1, -1),
- /* MODULE_CLK_SEL_1 */
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PCIE_GFMUX_TL_O_P0_SEL,
- "infra_pcie_gfmux_tl_o_p0_sel",
- infra_pcie_gfmux_tl_ck_o_p0_parents, 0x0028,
- 0x0020, 0x0024, 0, 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PCIE_GFMUX_TL_O_P1_SEL,
- "infra_pcie_gfmux_tl_o_p1_sel",
- infra_pcie_gfmux_tl_ck_o_p1_parents, 0x0028,
- 0x0020, 0x0024, 2, 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PCIE_GFMUX_TL_O_P2_SEL,
- "infra_pcie_gfmux_tl_o_p2_sel",
- infra_pcie_gfmux_tl_ck_o_p2_parents, 0x0028,
- 0x0020, 0x0024, 4, 2, -1, -1, -1),
- MUX_GATE_CLR_SET_UPD(CLK_INFRA_PCIE_GFMUX_TL_O_P3_SEL,
- "infra_pcie_gfmux_tl_o_p3_sel",
- infra_pcie_gfmux_tl_ck_o_p3_parents, 0x0028,
- 0x0020, 0x0024, 6, 2, -1, -1, -1),
-};
-
-static const struct mtk_gate_regs infra0_cg_regs = {
- .set_ofs = 0x10,
- .clr_ofs = 0x14,
- .sta_ofs = 0x18,
-};
-
-static const struct mtk_gate_regs infra1_cg_regs = {
- .set_ofs = 0x40,
- .clr_ofs = 0x44,
- .sta_ofs = 0x48,
-};
-
-static const struct mtk_gate_regs infra2_cg_regs = {
- .set_ofs = 0x50,
- .clr_ofs = 0x54,
- .sta_ofs = 0x58,
-};
-
-static const struct mtk_gate_regs infra3_cg_regs = {
- .set_ofs = 0x60,
- .clr_ofs = 0x64,
- .sta_ofs = 0x68,
-};
-
-#define GATE_INFRA0_FLAGS(_id, _name, _parent, _shift, _flags) \
- { \
- .id = _id, .name = _name, .parent_name = _parent, \
- .regs = &infra0_cg_regs, .shift = _shift, \
- .ops = &mtk_clk_gate_ops_setclr, .flags = _flags, \
- }
-
-#define GATE_INFRA1_FLAGS(_id, _name, _parent, _shift, _flags) \
- { \
- .id = _id, .name = _name, .parent_name = _parent, \
- .regs = &infra1_cg_regs, .shift = _shift, \
- .ops = &mtk_clk_gate_ops_setclr, .flags = _flags, \
- }
-
-#define GATE_INFRA2_FLAGS(_id, _name, _parent, _shift, _flags) \
- { \
- .id = _id, .name = _name, .parent_name = _parent, \
- .regs = &infra2_cg_regs, .shift = _shift, \
- .ops = &mtk_clk_gate_ops_setclr, .flags = _flags, \
- }
-
-#define GATE_INFRA3_FLAGS(_id, _name, _parent, _shift, _flags) \
- { \
- .id = _id, .name = _name, .parent_name = _parent, \
- .regs = &infra3_cg_regs, .shift = _shift, \
- .ops = &mtk_clk_gate_ops_setclr, .flags = _flags, \
- }
-
-#define GATE_INFRA0(_id, _name, _parent, _shift) \
- GATE_INFRA0_FLAGS(_id, _name, _parent, _shift, 0)
-
-#define GATE_INFRA1(_id, _name, _parent, _shift) \
- GATE_INFRA1_FLAGS(_id, _name, _parent, _shift, 0)
-
-#define GATE_INFRA2(_id, _name, _parent, _shift) \
- GATE_INFRA2_FLAGS(_id, _name, _parent, _shift, 0)
-
-#define GATE_INFRA3(_id, _name, _parent, _shift) \
- GATE_INFRA3_FLAGS(_id, _name, _parent, _shift, 0)
-
-#define GATE_CRITICAL(_id, _name, _parent, _regs, _shift) { \
- .id = _id, .name = _name, .parent_name = _parent, \
- .regs = _regs, .shift = _shift, \
- .flags = CLK_IS_CRITICAL, \
- .ops = &mtk_clk_gate_ops_setclr, \
- }
-
-static const struct mtk_gate infra_clks[] = {
- /* INFRA0 */
- GATE_INFRA0(CLK_INFRA_PCIE_PERI_26M_CK_P0,
- "infra_pcie_peri_ck_26m_ck_p0", "csw_infra_f26m_sel", 7),
- GATE_INFRA0(CLK_INFRA_PCIE_PERI_26M_CK_P1,
- "infra_pcie_peri_ck_26m_ck_p1", "csw_infra_f26m_sel", 8),
- GATE_INFRA0(CLK_INFRA_PCIE_PERI_26M_CK_P2,
- "infra_pcie_peri_ck_26m_ck_p2", "csw_infra_f26m_sel", 9),
- GATE_INFRA0(CLK_INFRA_PCIE_PERI_26M_CK_P3,
- "infra_pcie_peri_ck_26m_ck_p3", "csw_infra_f26m_sel", 10),
- /* INFRA1 */
- GATE_INFRA1(CLK_INFRA_66M_GPT_BCK, "infra_hf_66m_gpt_bck",
- "sysaxi_sel", 0),
- GATE_INFRA1(CLK_INFRA_66M_PWM_HCK, "infra_hf_66m_pwm_hck",
- "sysaxi_sel", 1),
- GATE_INFRA1(CLK_INFRA_66M_PWM_BCK, "infra_hf_66m_pwm_bck",
- "infra_pwm_sel", 2),
- GATE_INFRA1(CLK_INFRA_66M_PWM_CK1, "infra_hf_66m_pwm_ck1",
- "infra_pwm_ck1_sel", 3),
- GATE_INFRA1(CLK_INFRA_66M_PWM_CK2, "infra_hf_66m_pwm_ck2",
- "infra_pwm_ck2_sel", 4),
- GATE_INFRA1(CLK_INFRA_66M_PWM_CK3, "infra_hf_66m_pwm_ck3",
- "infra_pwm_ck3_sel", 5),
- GATE_INFRA1(CLK_INFRA_66M_PWM_CK4, "infra_hf_66m_pwm_ck4",
- "infra_pwm_ck4_sel", 6),
- GATE_INFRA1(CLK_INFRA_66M_PWM_CK5, "infra_hf_66m_pwm_ck5",
- "infra_pwm_ck5_sel", 7),
- GATE_INFRA1(CLK_INFRA_66M_PWM_CK6, "infra_hf_66m_pwm_ck6",
- "infra_pwm_ck6_sel", 8),
- GATE_INFRA1(CLK_INFRA_66M_PWM_CK7, "infra_hf_66m_pwm_ck7",
- "infra_pwm_ck7_sel", 9),
- GATE_INFRA1(CLK_INFRA_66M_PWM_CK8, "infra_hf_66m_pwm_ck8",
- "infra_pwm_ck8_sel", 10),
- GATE_INFRA1(CLK_INFRA_133M_CQDMA_BCK, "infra_hf_133m_cqdma_bck",
- "sysaxi_sel", 12),
- GATE_INFRA1(CLK_INFRA_66M_AUD_SLV_BCK, "infra_66m_aud_slv_bck",
- "sysaxi_sel", 13),
- GATE_INFRA1(CLK_INFRA_AUD_26M, "infra_f_faud_26m",
- "csw_infra_f26m_sel", 14),
- GATE_INFRA1(CLK_INFRA_AUD_L, "infra_f_faud_l", "aud_l_sel", 15),
- GATE_INFRA1(CLK_INFRA_AUD_AUD, "infra_f_aud_aud", "a1sys_sel", 16),
- GATE_INFRA1(CLK_INFRA_AUD_EG2, "infra_f_faud_eg2", "a_tuner_sel", 18),
- GATE_INFRA1_FLAGS(CLK_INFRA_DRAMC_F26M, "infra_dramc_f26m",
- "csw_infra_f26m_sel", 19, CLK_IS_CRITICAL),
- // JTAG
- GATE_INFRA1_FLAGS(CLK_INFRA_133M_DBG_ACKM, "infra_hf_133m_dbg_ackm",
- "sysaxi_sel", 20, CLK_IS_CRITICAL),
- GATE_INFRA1(CLK_INFRA_66M_AP_DMA_BCK, "infra_66m_ap_dma_bck",
- "sysaxi_sel", 21),
- GATE_INFRA1(CLK_INFRA_66M_SEJ_BCK, "infra_hf_66m_sej_bck",
- "sysaxi_sel", 29),
- GATE_INFRA1(CLK_INFRA_PRE_CK_SEJ_F13M, "infra_pre_ck_sej_f13m",
- "csw_infra_f26m_sel", 30),
- /* INFRA2 */
- GATE_INFRA2(CLK_INFRA_26M_THERM_SYSTEM, "infra_hf_26m_therm_system",
- "csw_infra_f26m_sel", 0),
- GATE_INFRA2(CLK_INFRA_I2C_BCK, "infra_i2c_bck", "i2c_sel", 1),
- GATE_INFRA2(CLK_INFRA_52M_UART0_CK, "infra_f_52m_uart0",
- "infra_mux_uart0_sel", 3),
- GATE_INFRA2(CLK_INFRA_52M_UART1_CK, "infra_f_52m_uart1",
- "infra_mux_uart1_sel", 4),
- GATE_INFRA2(CLK_INFRA_52M_UART2_CK, "infra_f_52m_uart2",
- "infra_mux_uart2_sel", 5),
- GATE_INFRA2(CLK_INFRA_NFI, "infra_f_fnfi", "nfi1x_sel", 9),
- GATE_INFRA2(CLK_INFRA_SPINFI, "infra_f_fspinfi", "spinfi_sel", 10),
- GATE_INFRA2_FLAGS(CLK_INFRA_66M_NFI_HCK, "infra_hf_66m_nfi_hck",
- "sysaxi_sel", 11, CLK_IS_CRITICAL),
- GATE_INFRA2_FLAGS(CLK_INFRA_104M_SPI0, "infra_hf_104m_spi0",
- "infra_mux_spi0_sel", 12, CLK_IS_CRITICAL),
- GATE_INFRA2(CLK_INFRA_104M_SPI1, "infra_hf_104m_spi1",
- "infra_mux_spi1_sel", 13),
- GATE_INFRA2(CLK_INFRA_104M_SPI2_BCK, "infra_hf_104m_spi2_bck",
- "infra_mux_spi2_sel", 14),
- GATE_INFRA2_FLAGS(CLK_INFRA_66M_SPI0_HCK, "infra_hf_66m_spi0_hck",
- "sysaxi_sel", 15, CLK_IS_CRITICAL),
- GATE_INFRA2(CLK_INFRA_66M_SPI1_HCK, "infra_hf_66m_spi1_hck",
- "sysaxi_sel", 16),
- GATE_INFRA2(CLK_INFRA_66M_SPI2_HCK, "infra_hf_66m_spi2_hck",
- "sysaxi_sel", 17),
- GATE_INFRA2(CLK_INFRA_66M_FLASHIF_AXI, "infra_hf_66m_flashif_axi",
- "sysaxi_sel", 18),
- GATE_CRITICAL(CLK_INFRA_RTC, "infra_f_frtc", "top_rtc_32k", &infra2_cg_regs, 19),
- GATE_INFRA2(CLK_INFRA_26M_ADC_BCK, "infra_f_26m_adc_bck",
- "csw_infra_f26m_sel", 20),
- GATE_INFRA2(CLK_INFRA_RC_ADC, "infra_f_frc_adc", "infra_f_26m_adc_bck",
- 21),
- GATE_INFRA2(CLK_INFRA_MSDC400, "infra_f_fmsdc400", "emmc_400m_sel",
- 22),
- GATE_INFRA2(CLK_INFRA_MSDC2_HCK, "infra_f_fmsdc2_hck", "emmc_250m_sel",
- 23),
- GATE_INFRA2(CLK_INFRA_133M_MSDC_0_HCK, "infra_hf_133m_msdc_0_hck",
- "sysaxi_sel", 24),
- GATE_INFRA2(CLK_INFRA_66M_MSDC_0_HCK, "infra_66m_msdc_0_hck",
- "sysaxi_sel", 25),
- GATE_INFRA2(CLK_INFRA_133M_CPUM_BCK, "infra_hf_133m_cpum_bck",
- "sysaxi_sel", 26),
- GATE_INFRA2(CLK_INFRA_BIST2FPC, "infra_hf_fbist2fpc", "nfi1x_sel", 27),
- GATE_INFRA2(CLK_INFRA_I2C_X16W_MCK_CK_P1,
- "infra_hf_i2c_x16w_mck_ck_p1", "sysaxi_sel", 29),
- GATE_INFRA2(CLK_INFRA_I2C_X16W_PCK_CK_P1,
- "infra_hf_i2c_x16w_pck_ck_p1", "sysaxi_sel", 31),
- /* INFRA3 */
- GATE_INFRA3(CLK_INFRA_133M_USB_HCK, "infra_133m_usb_hck", "sysaxi_sel",
- 0),
- GATE_INFRA3(CLK_INFRA_133M_USB_HCK_CK_P1, "infra_133m_usb_hck_ck_p1",
- "sysaxi_sel", 1),
- GATE_INFRA3(CLK_INFRA_66M_USB_HCK, "infra_66m_usb_hck", "sysaxi_sel",
- 2),
- GATE_INFRA3(CLK_INFRA_66M_USB_HCK_CK_P1, "infra_66m_usb_hck_ck_p1",
- "sysaxi_sel", 3),
- GATE_INFRA3(CLK_INFRA_USB_SYS, "infra_usb_sys", "usb_sys_sel", 4),
- GATE_INFRA3(CLK_INFRA_USB_SYS_CK_P1, "infra_usb_sys_ck_p1",
- "usb_sys_p1_sel", 5),
- GATE_INFRA3(CLK_INFRA_USB_REF, "infra_usb_ref", "top_xtal", 6),
- GATE_INFRA3(CLK_INFRA_USB_CK_P1, "infra_usb_ck_p1", "top_xtal", 7),
- GATE_INFRA3_FLAGS(CLK_INFRA_USB_FRMCNT, "infra_usb_frmcnt",
- "usb_frmcnt_sel", 8, CLK_IS_CRITICAL),
- GATE_INFRA3_FLAGS(CLK_INFRA_USB_FRMCNT_CK_P1, "infra_usb_frmcnt_ck_p1",
- "usb_frmcnt_p1_sel", 9, CLK_IS_CRITICAL),
- GATE_INFRA3(CLK_INFRA_USB_PIPE, "infra_usb_pipe", "sspxtp_sel", 10),
- GATE_INFRA3(CLK_INFRA_USB_PIPE_CK_P1, "infra_usb_pipe_ck_p1",
- "usb_phy_sel", 11),
- GATE_INFRA3(CLK_INFRA_USB_UTMI, "infra_usb_utmi", "top_xtal", 12),
- GATE_INFRA3(CLK_INFRA_USB_UTMI_CK_P1, "infra_usb_utmi_ck_p1",
- "top_xtal", 13),
- GATE_INFRA3(CLK_INFRA_USB_XHCI, "infra_usb_xhci", "usb_xhci_sel", 14),
- GATE_INFRA3(CLK_INFRA_USB_XHCI_CK_P1, "infra_usb_xhci_ck_p1",
- "usb_xhci_p1_sel", 15),
- GATE_INFRA3(CLK_INFRA_PCIE_GFMUX_TL_P0, "infra_pcie_gfmux_tl_ck_p0",
- "infra_pcie_gfmux_tl_o_p0_sel", 20),
- GATE_INFRA3(CLK_INFRA_PCIE_GFMUX_TL_P1, "infra_pcie_gfmux_tl_ck_p1",
- "infra_pcie_gfmux_tl_o_p1_sel", 21),
- GATE_INFRA3(CLK_INFRA_PCIE_GFMUX_TL_P2, "infra_pcie_gfmux_tl_ck_p2",
- "infra_pcie_gfmux_tl_o_p2_sel", 22),
- GATE_INFRA3(CLK_INFRA_PCIE_GFMUX_TL_P3, "infra_pcie_gfmux_tl_ck_p3",
- "infra_pcie_gfmux_tl_o_p3_sel", 23),
- GATE_INFRA3(CLK_INFRA_PCIE_PIPE_P0, "infra_pcie_pipe_ck_p0",
- "top_xtal", 24),
- GATE_INFRA3(CLK_INFRA_PCIE_PIPE_P1, "infra_pcie_pipe_ck_p1",
- "top_xtal", 25),
- GATE_INFRA3(CLK_INFRA_PCIE_PIPE_P2, "infra_pcie_pipe_ck_p2",
- "top_xtal", 26),
- GATE_INFRA3(CLK_INFRA_PCIE_PIPE_P3, "infra_pcie_pipe_ck_p3",
- "top_xtal", 27),
- GATE_INFRA3(CLK_INFRA_133M_PCIE_CK_P0, "infra_133m_pcie_ck_p0",
- "sysaxi_sel", 28),
- GATE_INFRA3(CLK_INFRA_133M_PCIE_CK_P1, "infra_133m_pcie_ck_p1",
- "sysaxi_sel", 29),
- GATE_INFRA3(CLK_INFRA_133M_PCIE_CK_P2, "infra_133m_pcie_ck_p2",
- "sysaxi_sel", 30),
- GATE_INFRA3(CLK_INFRA_133M_PCIE_CK_P3, "infra_133m_pcie_ck_p3",
- "sysaxi_sel", 31),
-};
-
-static const struct mtk_clk_desc infra_desc = {
- .clks = infra_clks,
- .num_clks = ARRAY_SIZE(infra_clks),
- .mux_clks = infra_muxes,
- .num_mux_clks = ARRAY_SIZE(infra_muxes),
- .clk_lock = &mt7988_clk_lock,
-};
-
-static const struct of_device_id of_match_clk_mt7988_infracfg[] = {
- { .compatible = "mediatek,mt7988-infracfg", .data = &infra_desc },
- { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, of_match_clk_mt7988_infracfg);
-
-static struct platform_driver clk_mt7988_infracfg_drv = {
- .driver = {
- .name = "clk-mt7988-infracfg",
- .of_match_table = of_match_clk_mt7988_infracfg,
- },
- .probe = mtk_clk_simple_probe,
- .remove = mtk_clk_simple_remove,
-};
-module_platform_driver(clk_mt7988_infracfg_drv);
diff --git a/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-topckgen.c b/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-topckgen.c
deleted file mode 100644
index b0745d6508..0000000000
--- a/target/linux/mediatek/files-6.1/drivers/clk/mediatek/clk-mt7988-topckgen.c
+++ /dev/null
@@ -1,446 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2023 MediaTek Inc.
- * Author: Sam Shih <sam.shih at mediatek.com>
- * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
- */
-
-#include <linux/clk-provider.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_device.h>
-#include <linux/platform_device.h>
-#include "clk-mtk.h"
-#include "clk-gate.h"
-#include "clk-mux.h"
-#include <dt-bindings/clock/mediatek,mt7988-clk.h>
-
-static DEFINE_SPINLOCK(mt7988_clk_lock);
-
-static const struct mtk_fixed_clk top_fixed_clks[] = {
- FIXED_CLK(CLK_TOP_XTAL, "top_xtal", "clkxtal", 40000000),
-};
-
-static const struct mtk_fixed_factor top_divs[] = {
- FACTOR(CLK_TOP_XTAL_D2, "top_xtal_d2", "top_xtal", 1, 2),
- FACTOR(CLK_TOP_RTC_32K, "top_rtc_32k", "top_xtal", 1, 1250),
- FACTOR(CLK_TOP_RTC_32P7K, "top_rtc_32p7k", "top_xtal", 1, 1220),
- FACTOR(CLK_TOP_MPLL_D2, "mpll_d2", "mpll", 1, 2),
- FACTOR(CLK_TOP_MPLL_D3_D2, "mpll_d3_d2", "mpll", 1, 2),
- FACTOR(CLK_TOP_MPLL_D4, "mpll_d4", "mpll", 1, 4),
- FACTOR(CLK_TOP_MPLL_D8, "mpll_d8", "mpll", 1, 8),
- FACTOR(CLK_TOP_MPLL_D8_D2, "mpll_d8_d2", "mpll", 1, 16),
- FACTOR(CLK_TOP_MMPLL_D2, "mmpll_d2", "mmpll", 1, 2),
- FACTOR(CLK_TOP_MMPLL_D3_D5, "mmpll_d3_d5", "mmpll", 1, 15),
- FACTOR(CLK_TOP_MMPLL_D4, "mmpll_d4", "mmpll", 1, 4),
- FACTOR(CLK_TOP_MMPLL_D6_D2, "mmpll_d6_d2", "mmpll", 1, 12),
- FACTOR(CLK_TOP_MMPLL_D8, "mmpll_d8", "mmpll", 1, 8),
- FACTOR(CLK_TOP_APLL2_D4, "apll2_d4", "apll2", 1, 4),
- FACTOR(CLK_TOP_NET1PLL_D4, "net1pll_d4", "net1pll", 1, 4),
- FACTOR(CLK_TOP_NET1PLL_D5, "net1pll_d5", "net1pll", 1, 5),
- FACTOR(CLK_TOP_NET1PLL_D5_D2, "net1pll_d5_d2", "net1pll", 1, 10),
- FACTOR(CLK_TOP_NET1PLL_D5_D4, "net1pll_d5_d4", "net1pll", 1, 20),
- FACTOR(CLK_TOP_NET1PLL_D8, "net1pll_d8", "net1pll", 1, 8),
- FACTOR(CLK_TOP_NET1PLL_D8_D2, "net1pll_d8_d2", "net1pll", 1, 16),
- FACTOR(CLK_TOP_NET1PLL_D8_D4, "net1pll_d8_d4", "net1pll", 1, 32),
- FACTOR(CLK_TOP_NET1PLL_D8_D8, "net1pll_d8_d8", "net1pll", 1, 64),
- FACTOR(CLK_TOP_NET1PLL_D8_D16, "net1pll_d8_d16", "net1pll", 1, 128),
- FACTOR(CLK_TOP_NET2PLL_D2, "net2pll_d2", "net2pll", 1, 2),
- FACTOR(CLK_TOP_NET2PLL_D4, "net2pll_d4", "net2pll", 1, 4),
- FACTOR(CLK_TOP_NET2PLL_D4_D4, "net2pll_d4_d4", "net2pll", 1, 16),
- FACTOR(CLK_TOP_NET2PLL_D4_D8, "net2pll_d4_d8", "net2pll", 1, 32),
- FACTOR(CLK_TOP_NET2PLL_D6, "net2pll_d6", "net2pll", 1, 6),
- FACTOR(CLK_TOP_NET2PLL_D8, "net2pll_d8", "net2pll", 1, 8),
-};
-
-static const char *const netsys_parents[] = { "top_xtal", "net2pll_d2",
- "mmpll_d2" };
-
-static const char *const netsys_500m_parents[] = { "top_xtal", "net1pll_d5",
- "net1pll_d5_d2" };
-
-static const char *const netsys_2x_parents[] = { "top_xtal", "net2pll",
- "mmpll" };
-
-static const char *const netsys_gsw_parents[] = { "top_xtal", "net1pll_d4",
- "net1pll_d5" };
-
-static const char *const eth_gmii_parents[] = { "top_xtal", "net1pll_d5_d4" };
-
-static const char *const netsys_mcu_parents[] = { "top_xtal", "net2pll",
- "mmpll", "net1pll_d4",
- "net1pll_d5", "mpll" };
-
-static const char *const eip197_parents[] = { "top_xtal", "netsyspll",
- "net2pll", "mmpll",
- "net1pll_d4", "net1pll_d5" };
-
-static const char *const axi_infra_parents[] = { "top_xtal", "net1pll_d8_d2" };
-
-static const char *const uart_parents[] = { "top_xtal", "mpll_d8",
- "mpll_d8_d2" };
-
-static const char *const emmc_250m_parents[] = { "top_xtal", "net1pll_d5_d2",
- "mmpll_d4" };
-
-static const char *const emmc_400m_parents[] = { "top_xtal", "msdcpll",
- "mmpll_d2", "mpll_d2",
- "mmpll_d4", "net1pll_d8_d2" };
-
-static const char *const spi_parents[] = { "top_xtal", "mpll_d2",
- "mmpll_d4", "net1pll_d8_d2",
- "net2pll_d6", "net1pll_d5_d4",
- "mpll_d4", "net1pll_d8_d4" };
-
-static const char *const nfi1x_parents[] = { "top_xtal", "mmpll_d4",
- "net1pll_d8_d2", "net2pll_d6",
- "mpll_d4", "mmpll_d8",
- "net1pll_d8_d4", "mpll_d8" };
-
-static const char *const spinfi_parents[] = { "top_xtal_d2", "top_xtal",
- "net1pll_d5_d4", "mpll_d4",
- "mmpll_d8", "net1pll_d8_d4",
- "mmpll_d6_d2", "mpll_d8" };
-
-static const char *const pwm_parents[] = { "top_xtal", "net1pll_d8_d2",
- "net1pll_d5_d4", "mpll_d4",
- "mpll_d8_d2", "top_rtc_32k" };
-
-static const char *const i2c_parents[] = { "top_xtal", "net1pll_d5_d4",
- "mpll_d4", "net1pll_d8_d4" };
-
-static const char *const pcie_mbist_250m_parents[] = { "top_xtal",
- "net1pll_d5_d2" };
-
-static const char *const pextp_tl_ck_parents[] = { "top_xtal", "net2pll_d6",
- "mmpll_d8", "mpll_d8_d2",
- "top_rtc_32k" };
-
-static const char *const usb_frmcnt_parents[] = { "top_xtal", "mmpll_d3_d5" };
-
-static const char *const aud_parents[] = { "top_xtal", "apll2" };
-
-static const char *const a1sys_parents[] = { "top_xtal", "apll2_d4" };
-
-static const char *const aud_l_parents[] = { "top_xtal", "apll2",
- "mpll_d8_d2" };
-
-static const char *const sspxtp_parents[] = { "top_xtal_d2", "mpll_d8_d2" };
-
-static const char *const usxgmii_sbus_0_parents[] = { "top_xtal",
- "net1pll_d8_d4" };
-
-static const char *const sgm_0_parents[] = { "top_xtal", "sgmpll" };
-
-static const char *const sysapb_parents[] = { "top_xtal", "mpll_d3_d2" };
-
-static const char *const eth_refck_50m_parents[] = { "top_xtal",
- "net2pll_d4_d4" };
-
-static const char *const eth_sys_200m_parents[] = { "top_xtal", "net2pll_d4" };
-
-static const char *const eth_xgmii_parents[] = { "top_xtal_d2",
- "net1pll_d8_d8",
- "net1pll_d8_d16" };
-
-static const char *const bus_tops_parents[] = { "top_xtal", "net1pll_d5",
- "net2pll_d2" };
-
-static const char *const npu_tops_parents[] = { "top_xtal", "net2pll" };
-
-static const char *const dramc_md32_parents[] = { "top_xtal", "mpll_d2",
- "wedmcupll" };
-
-static const char *const da_xtp_glb_p0_parents[] = { "top_xtal",
- "net2pll_d8" };
-
-static const char *const mcusys_backup_625m_parents[] = { "top_xtal",
- "net1pll_d4" };
-
-static const char *const macsec_parents[] = { "top_xtal", "sgmpll",
- "net1pll_d8" };
-
-static const char *const netsys_tops_400m_parents[] = { "top_xtal",
- "net2pll_d2" };
-
-static const char *const eth_mii_parents[] = { "top_xtal_d2",
- "net2pll_d4_d8" };
-
-static const struct mtk_mux top_muxes[] = {
- /* CLK_CFG_0 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_SEL, "netsys_sel", netsys_parents,
- 0x000, 0x004, 0x008, 0, 2, 7, 0x1c0, 0),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_500M_SEL, "netsys_500m_sel",
- netsys_500m_parents, 0x000, 0x004, 0x008, 8, 2,
- 15, 0x1C0, 1),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_2X_SEL, "netsys_2x_sel",
- netsys_2x_parents, 0x000, 0x004, 0x008, 16, 2, 23,
- 0x1C0, 2),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_GSW_SEL, "netsys_gsw_sel",
- netsys_gsw_parents, 0x000, 0x004, 0x008, 24, 2,
- 31, 0x1C0, 3),
- /* CLK_CFG_1 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_GMII_SEL, "eth_gmii_sel",
- eth_gmii_parents, 0x010, 0x014, 0x018, 0, 1, 7,
- 0x1C0, 4),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_MCU_SEL, "netsys_mcu_sel",
- netsys_mcu_parents, 0x010, 0x014, 0x018, 8, 3, 15,
- 0x1C0, 5),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_PAO_2X_SEL, "netsys_pao_2x_sel",
- netsys_mcu_parents, 0x010, 0x014, 0x018, 16, 3,
- 23, 0x1C0, 6),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_EIP197_SEL, "eip197_sel", eip197_parents,
- 0x010, 0x014, 0x018, 24, 3, 31, 0x1c0, 7),
- /* CLK_CFG_2 */
- MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_AXI_INFRA_SEL, "axi_infra_sel",
- axi_infra_parents, 0x020, 0x024, 0x028, 0,
- 1, 7, 0x1C0, 8, CLK_IS_CRITICAL),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_UART_SEL, "uart_sel", uart_parents, 0x020,
- 0x024, 0x028, 8, 2, 15, 0x1c0, 9),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_EMMC_250M_SEL, "emmc_250m_sel",
- emmc_250m_parents, 0x020, 0x024, 0x028, 16, 2, 23,
- 0x1C0, 10),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_EMMC_400M_SEL, "emmc_400m_sel",
- emmc_400m_parents, 0x020, 0x024, 0x028, 24, 3, 31,
- 0x1C0, 11),
- /* CLK_CFG_3 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_SPI_SEL, "spi_sel", spi_parents, 0x030,
- 0x034, 0x038, 0, 3, 7, 0x1c0, 12),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_SPIM_MST_SEL, "spim_mst_sel", spi_parents,
- 0x030, 0x034, 0x038, 8, 3, 15, 0x1c0, 13),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NFI1X_SEL, "nfi1x_sel", nfi1x_parents,
- 0x030, 0x034, 0x038, 16, 3, 23, 0x1c0, 14),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_SPINFI_SEL, "spinfi_sel", spinfi_parents,
- 0x030, 0x034, 0x038, 24, 3, 31, 0x1c0, 15),
- /* CLK_CFG_4 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PWM_SEL, "pwm_sel", pwm_parents, 0x040,
- 0x044, 0x048, 0, 3, 7, 0x1c0, 16),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_I2C_SEL, "i2c_sel", i2c_parents, 0x040,
- 0x044, 0x048, 8, 2, 15, 0x1c0, 17),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PCIE_MBIST_250M_SEL,
- "pcie_mbist_250m_sel", pcie_mbist_250m_parents,
- 0x040, 0x044, 0x048, 16, 1, 23, 0x1C0, 18),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_TL_SEL, "pextp_tl_sel",
- pextp_tl_ck_parents, 0x040, 0x044, 0x048, 24, 3,
- 31, 0x1C0, 19),
- /* CLK_CFG_5 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_TL_P1_SEL, "pextp_tl_p1_sel",
- pextp_tl_ck_parents, 0x050, 0x054, 0x058, 0, 3, 7,
- 0x1C0, 20),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_TL_P2_SEL, "pextp_tl_p2_sel",
- pextp_tl_ck_parents, 0x050, 0x054, 0x058, 8, 3,
- 15, 0x1C0, 21),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_TL_P3_SEL, "pextp_tl_p3_sel",
- pextp_tl_ck_parents, 0x050, 0x054, 0x058, 16, 3,
- 23, 0x1C0, 22),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_SYS_SEL, "usb_sys_sel",
- eth_gmii_parents, 0x050, 0x054, 0x058, 24, 1, 31,
- 0x1C0, 23),
- /* CLK_CFG_6 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_SYS_P1_SEL, "usb_sys_p1_sel",
- eth_gmii_parents, 0x060, 0x064, 0x068, 0, 1, 7,
- 0x1C0, 24),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_XHCI_SEL, "usb_xhci_sel",
- eth_gmii_parents, 0x060, 0x064, 0x068, 8, 1, 15,
- 0x1C0, 25),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_XHCI_P1_SEL, "usb_xhci_p1_sel",
- eth_gmii_parents, 0x060, 0x064, 0x068, 16, 1, 23,
- 0x1C0, 26),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_FRMCNT_SEL, "usb_frmcnt_sel",
- usb_frmcnt_parents, 0x060, 0x064, 0x068, 24, 1,
- 31, 0x1C0, 27),
- /* CLK_CFG_7 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_FRMCNT_P1_SEL, "usb_frmcnt_p1_sel",
- usb_frmcnt_parents, 0x070, 0x074, 0x078, 0, 1, 7,
- 0x1C0, 28),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_AUD_SEL, "aud_sel", aud_parents, 0x070,
- 0x074, 0x078, 8, 1, 15, 0x1c0, 29),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_A1SYS_SEL, "a1sys_sel", a1sys_parents,
- 0x070, 0x074, 0x078, 16, 1, 23, 0x1c0, 30),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_AUD_L_SEL, "aud_l_sel", aud_l_parents,
- 0x070, 0x074, 0x078, 24, 2, 31, 0x1c4, 0),
- /* CLK_CFG_8 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_A_TUNER_SEL, "a_tuner_sel", a1sys_parents,
- 0x080, 0x084, 0x088, 0, 1, 7, 0x1c4, 1),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_SSPXTP_SEL, "sspxtp_sel", sspxtp_parents,
- 0x080, 0x084, 0x088, 8, 1, 15, 0x1c4, 2),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_PHY_SEL, "usb_phy_sel",
- sspxtp_parents, 0x080, 0x084, 0x088, 16, 1, 23,
- 0x1c4, 3),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_USXGMII_SBUS_0_SEL, "usxgmii_sbus_0_sel",
- usxgmii_sbus_0_parents, 0x080, 0x084, 0x088, 24,
- 1, 31, 0x1C4, 4),
- /* CLK_CFG_9 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_USXGMII_SBUS_1_SEL, "usxgmii_sbus_1_sel",
- usxgmii_sbus_0_parents, 0x090, 0x094, 0x098, 0, 1,
- 7, 0x1C4, 5),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_SGM_0_SEL, "sgm_0_sel", sgm_0_parents,
- 0x090, 0x094, 0x098, 8, 1, 15, 0x1c4, 6),
- MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_SGM_SBUS_0_SEL, "sgm_sbus_0_sel",
- usxgmii_sbus_0_parents, 0x090, 0x094, 0x098,
- 16, 1, 23, 0x1C4, 7, CLK_IS_CRITICAL),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_SGM_1_SEL, "sgm_1_sel", sgm_0_parents,
- 0x090, 0x094, 0x098, 24, 1, 31, 0x1c4, 8),
- /* CLK_CFG_10 */
- MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_SGM_SBUS_1_SEL, "sgm_sbus_1_sel",
- usxgmii_sbus_0_parents, 0x0a0, 0x0a4, 0x0a8,
- 0, 1, 7, 0x1C4, 9, CLK_IS_CRITICAL),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_XFI_PHY_0_XTAL_SEL, "xfi_phy_0_xtal_sel",
- sspxtp_parents, 0x0a0, 0x0a4, 0x0a8, 8, 1, 15,
- 0x1C4, 10),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_XFI_PHY_1_XTAL_SEL, "xfi_phy_1_xtal_sel",
- sspxtp_parents, 0x0a0, 0x0a4, 0x0a8, 16, 1, 23,
- 0x1C4, 11),
- /* CLK_CFG_11 */
- MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_SYSAXI_SEL, "sysaxi_sel",
- axi_infra_parents, 0x0a0, 0x0a4, 0x0a8, 24,
- 1, 31, 0x1C4, 12, CLK_IS_CRITICAL),
- MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_SYSAPB_SEL, "sysapb_sel",
- sysapb_parents, 0x0b0, 0x0b4, 0x0b8, 0, 1,
- 7, 0x1c4, 13, CLK_IS_CRITICAL),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_REFCK_50M_SEL, "eth_refck_50m_sel",
- eth_refck_50m_parents, 0x0b0, 0x0b4, 0x0b8, 8, 1,
- 15, 0x1C4, 14),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_SYS_200M_SEL, "eth_sys_200m_sel",
- eth_sys_200m_parents, 0x0b0, 0x0b4, 0x0b8, 16, 1,
- 23, 0x1C4, 15),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_SYS_SEL, "eth_sys_sel",
- pcie_mbist_250m_parents, 0x0b0, 0x0b4, 0x0b8, 24,
- 1, 31, 0x1C4, 16),
- /* CLK_CFG_12 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_XGMII_SEL, "eth_xgmii_sel",
- eth_xgmii_parents, 0x0c0, 0x0c4, 0x0c8, 0, 2, 7,
- 0x1C4, 17),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_BUS_TOPS_SEL, "bus_tops_sel",
- bus_tops_parents, 0x0c0, 0x0c4, 0x0c8, 8, 2, 15,
- 0x1C4, 18),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NPU_TOPS_SEL, "npu_tops_sel",
- npu_tops_parents, 0x0c0, 0x0c4, 0x0c8, 16, 1, 23,
- 0x1C4, 19),
- MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_DRAMC_SEL, "dramc_sel",
- sspxtp_parents, 0x0c0, 0x0c4, 0x0c8, 24, 1,
- 31, 0x1C4, 20, CLK_IS_CRITICAL),
- /* CLK_CFG_13 */
- MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_DRAMC_MD32_SEL, "dramc_md32_sel",
- dramc_md32_parents, 0x0d0, 0x0d4, 0x0d8, 0,
- 2, 7, 0x1C4, 21, CLK_IS_CRITICAL),
- MUX_GATE_CLR_SET_UPD_FLAGS(
- CLK_TOP_INFRA_F26M_SEL, "csw_infra_f26m_sel", sspxtp_parents,
- 0x0d0, 0x0d4, 0x0d8, 8, 1, 15, 0x1C4, 22, CLK_IS_CRITICAL),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_P0_SEL, "pextp_p0_sel",
- sspxtp_parents, 0x0d0, 0x0d4, 0x0d8, 16, 1, 23,
- 0x1C4, 23),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_P1_SEL, "pextp_p1_sel",
- sspxtp_parents, 0x0d0, 0x0d4, 0x0d8, 24, 1, 31,
- 0x1C4, 24),
- /* CLK_CFG_14 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_P2_SEL, "pextp_p2_sel",
- sspxtp_parents, 0x0e0, 0x0e4, 0x0e8, 0, 1, 7,
- 0x1C4, 25),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_P3_SEL, "pextp_p3_sel",
- sspxtp_parents, 0x0e0, 0x0e4, 0x0e8, 8, 1, 15,
- 0x1C4, 26),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_XTP_GLB_P0_SEL, "da_xtp_glb_p0_sel",
- da_xtp_glb_p0_parents, 0x0e0, 0x0e4, 0x0e8, 16, 1,
- 23, 0x1C4, 27),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_XTP_GLB_P1_SEL, "da_xtp_glb_p1_sel",
- da_xtp_glb_p0_parents, 0x0e0, 0x0e4, 0x0e8, 24, 1,
- 31, 0x1C4, 28),
- /* CLK_CFG_15 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_XTP_GLB_P2_SEL, "da_xtp_glb_p2_sel",
- da_xtp_glb_p0_parents, 0x0f0, 0x0f4, 0x0f8, 0, 1,
- 7, 0x1C4, 29),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_XTP_GLB_P3_SEL, "da_xtp_glb_p3_sel",
- da_xtp_glb_p0_parents, 0x0f0, 0x0f4, 0x0f8, 8, 1,
- 15, 0x1C4, 30),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_CKM_SEL, "ckm_sel", sspxtp_parents, 0x0F0,
- 0x0f4, 0x0f8, 16, 1, 23, 0x1c8, 0),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_SEL, "da_sel", sspxtp_parents, 0x0f0,
- 0x0f4, 0x0f8, 24, 1, 31, 0x1C8, 1),
- /* CLK_CFG_16 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_SEL, "pextp_sel", sspxtp_parents,
- 0x0100, 0x104, 0x108, 0, 1, 7, 0x1c8, 2),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_TOPS_P2_26M_SEL, "tops_p2_26m_sel",
- sspxtp_parents, 0x0100, 0x104, 0x108, 8, 1, 15,
- 0x1C8, 3),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_MCUSYS_BACKUP_625M_SEL,
- "mcusys_backup_625m_sel",
- mcusys_backup_625m_parents, 0x0100, 0x104, 0x108,
- 16, 1, 23, 0x1C8, 4),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_SYNC_250M_SEL,
- "netsys_sync_250m_sel", pcie_mbist_250m_parents,
- 0x0100, 0x104, 0x108, 24, 1, 31, 0x1c8, 5),
- /* CLK_CFG_17 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_MACSEC_SEL, "macsec_sel", macsec_parents,
- 0x0110, 0x114, 0x118, 0, 2, 7, 0x1c8, 6),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_TOPS_400M_SEL,
- "netsys_tops_400m_sel", netsys_tops_400m_parents,
- 0x0110, 0x114, 0x118, 8, 1, 15, 0x1c8, 7),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_PPEFB_250M_SEL,
- "netsys_ppefb_250m_sel", pcie_mbist_250m_parents,
- 0x0110, 0x114, 0x118, 16, 1, 23, 0x1c8, 8),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_WARP_SEL, "netsys_warp_sel",
- netsys_parents, 0x0110, 0x114, 0x118, 24, 2, 31,
- 0x1C8, 9),
- /* CLK_CFG_18 */
- MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_MII_SEL, "eth_mii_sel",
- eth_mii_parents, 0x0120, 0x124, 0x128, 0, 1, 7,
- 0x1c8, 10),
- MUX_GATE_CLR_SET_UPD(CLK_TOP_NPU_SEL, "ck_npu_sel", netsys_2x_parents,
- 0x0120, 0x124, 0x128, 8, 2, 15, 0x1c8, 11),
-};
-
-static const struct mtk_composite top_aud_divs[] = {
- DIV_GATE(CLK_TOP_AUD_I2S_M, "aud_i2s_m", "aud_sel", 0x0420, 0, 0x0420,
- 8, 8),
-};
-
-static const struct mtk_clk_desc topck_desc = {
- .fixed_clks = top_fixed_clks,
- .num_fixed_clks = ARRAY_SIZE(top_fixed_clks),
- .factor_clks = top_divs,
- .num_factor_clks = ARRAY_SIZE(top_divs),
- .mux_clks = top_muxes,
- .num_mux_clks = ARRAY_SIZE(top_muxes),
- .composite_clks = top_aud_divs,
- .num_composite_clks = ARRAY_SIZE(top_aud_divs),
- .clk_lock = &mt7988_clk_lock,
-};
-
-static const char *const mcu_bus_div_parents[] = { "top_xtal", "ccipll2_b",
- "net1pll_d4" };
-
-static const char *const mcu_arm_div_parents[] = { "top_xtal", "arm_b",
- "net1pll_d4" };
-
-static struct mtk_composite mcu_muxes[] = {
- /* bus_pll_divider_cfg */
- MUX_GATE_FLAGS(CLK_MCU_BUS_DIV_SEL, "mcu_bus_div_sel",
- mcu_bus_div_parents, 0x7C0, 9, 2, -1, CLK_IS_CRITICAL),
- /* mp2_pll_divider_cfg */
- MUX_GATE_FLAGS(CLK_MCU_ARM_DIV_SEL, "mcu_arm_div_sel",
- mcu_arm_div_parents, 0x7A8, 9, 2, -1, CLK_IS_CRITICAL),
-};
-
-static const struct mtk_clk_desc mcusys_desc = {
- .composite_clks = mcu_muxes,
- .num_composite_clks = ARRAY_SIZE(mcu_muxes),
-};
-
-static const struct of_device_id of_match_clk_mt7988_topckgen[] = {
- { .compatible = "mediatek,mt7988-topckgen", .data = &topck_desc },
- { .compatible = "mediatek,mt7988-mcusys", .data = &mcusys_desc },
- { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, of_match_clk_mt7988_topckgen);
-
-static struct platform_driver clk_mt7988_topckgen_drv = {
- .probe = mtk_clk_simple_probe,
- .remove = mtk_clk_simple_remove,
- .driver = {
- .name = "clk-mt7988-topckgen",
- .of_match_table = of_match_clk_mt7988_topckgen,
- },
-};
-module_platform_driver(clk_mt7988_topckgen_drv);
-MODULE_LICENSE("GPL");
diff --git a/target/linux/mediatek/files-6.1/include/dt-bindings/clock/mediatek,mt7988-clk.h b/target/linux/mediatek/files-6.1/include/dt-bindings/clock/mediatek,mt7988-clk.h
deleted file mode 100644
index 77cfea4a8e..0000000000
--- a/target/linux/mediatek/files-6.1/include/dt-bindings/clock/mediatek,mt7988-clk.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
-/*
- * Copyright (c) 2023 MediaTek Inc.
- * Author: Sam Shih <sam.shih at mediatek.com>
- * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
- */
-
-#ifndef _DT_BINDINGS_CLK_MT7988_H
-#define _DT_BINDINGS_CLK_MT7988_H
-
-/* APMIXEDSYS */
-
-#define CLK_APMIXED_NETSYSPLL 0
-#define CLK_APMIXED_MPLL 1
-#define CLK_APMIXED_MMPLL 2
-#define CLK_APMIXED_APLL2 3
-#define CLK_APMIXED_NET1PLL 4
-#define CLK_APMIXED_NET2PLL 5
-#define CLK_APMIXED_WEDMCUPLL 6
-#define CLK_APMIXED_SGMPLL 7
-#define CLK_APMIXED_ARM_B 8
-#define CLK_APMIXED_CCIPLL2_B 9
-#define CLK_APMIXED_USXGMIIPLL 10
-#define CLK_APMIXED_MSDCPLL 11
-
-/* TOPCKGEN */
-
-#define CLK_TOP_XTAL 0
-#define CLK_TOP_XTAL_D2 1
-#define CLK_TOP_RTC_32K 2
-#define CLK_TOP_RTC_32P7K 3
-#define CLK_TOP_MPLL_D2 4
-#define CLK_TOP_MPLL_D3_D2 5
-#define CLK_TOP_MPLL_D4 6
-#define CLK_TOP_MPLL_D8 7
-#define CLK_TOP_MPLL_D8_D2 8
-#define CLK_TOP_MMPLL_D2 9
-#define CLK_TOP_MMPLL_D3_D5 10
-#define CLK_TOP_MMPLL_D4 11
-#define CLK_TOP_MMPLL_D6_D2 12
-#define CLK_TOP_MMPLL_D8 13
-#define CLK_TOP_APLL2_D4 14
-#define CLK_TOP_NET1PLL_D4 15
-#define CLK_TOP_NET1PLL_D5 16
-#define CLK_TOP_NET1PLL_D5_D2 17
-#define CLK_TOP_NET1PLL_D5_D4 18
-#define CLK_TOP_NET1PLL_D8 19
-#define CLK_TOP_NET1PLL_D8_D2 20
-#define CLK_TOP_NET1PLL_D8_D4 21
-#define CLK_TOP_NET1PLL_D8_D8 22
-#define CLK_TOP_NET1PLL_D8_D16 23
-#define CLK_TOP_NET2PLL_D2 24
-#define CLK_TOP_NET2PLL_D4 25
-#define CLK_TOP_NET2PLL_D4_D4 26
-#define CLK_TOP_NET2PLL_D4_D8 27
-#define CLK_TOP_NET2PLL_D6 28
-#define CLK_TOP_NET2PLL_D8 29
-#define CLK_TOP_NETSYS_SEL 30
-#define CLK_TOP_NETSYS_500M_SEL 31
-#define CLK_TOP_NETSYS_2X_SEL 32
-#define CLK_TOP_NETSYS_GSW_SEL 33
-#define CLK_TOP_ETH_GMII_SEL 34
-#define CLK_TOP_NETSYS_MCU_SEL 35
-#define CLK_TOP_NETSYS_PAO_2X_SEL 36
-#define CLK_TOP_EIP197_SEL 37
-#define CLK_TOP_AXI_INFRA_SEL 38
-#define CLK_TOP_UART_SEL 39
-#define CLK_TOP_EMMC_250M_SEL 40
-#define CLK_TOP_EMMC_400M_SEL 41
-#define CLK_TOP_SPI_SEL 42
-#define CLK_TOP_SPIM_MST_SEL 43
-#define CLK_TOP_NFI1X_SEL 44
-#define CLK_TOP_SPINFI_SEL 45
-#define CLK_TOP_PWM_SEL 46
-#define CLK_TOP_I2C_SEL 47
-#define CLK_TOP_PCIE_MBIST_250M_SEL 48
-#define CLK_TOP_PEXTP_TL_SEL 49
-#define CLK_TOP_PEXTP_TL_P1_SEL 50
-#define CLK_TOP_PEXTP_TL_P2_SEL 51
-#define CLK_TOP_PEXTP_TL_P3_SEL 52
-#define CLK_TOP_USB_SYS_SEL 53
-#define CLK_TOP_USB_SYS_P1_SEL 54
-#define CLK_TOP_USB_XHCI_SEL 55
-#define CLK_TOP_USB_XHCI_P1_SEL 56
-#define CLK_TOP_USB_FRMCNT_SEL 57
-#define CLK_TOP_USB_FRMCNT_P1_SEL 58
-#define CLK_TOP_AUD_SEL 59
-#define CLK_TOP_A1SYS_SEL 60
-#define CLK_TOP_AUD_L_SEL 61
-#define CLK_TOP_A_TUNER_SEL 62
-#define CLK_TOP_SSPXTP_SEL 63
-#define CLK_TOP_USB_PHY_SEL 64
-#define CLK_TOP_USXGMII_SBUS_0_SEL 65
-#define CLK_TOP_USXGMII_SBUS_1_SEL 66
-#define CLK_TOP_SGM_0_SEL 67
-#define CLK_TOP_SGM_SBUS_0_SEL 68
-#define CLK_TOP_SGM_1_SEL 69
-#define CLK_TOP_SGM_SBUS_1_SEL 70
-#define CLK_TOP_XFI_PHY_0_XTAL_SEL 71
-#define CLK_TOP_XFI_PHY_1_XTAL_SEL 72
-#define CLK_TOP_SYSAXI_SEL 73
-#define CLK_TOP_SYSAPB_SEL 74
-#define CLK_TOP_ETH_REFCK_50M_SEL 75
-#define CLK_TOP_ETH_SYS_200M_SEL 76
-#define CLK_TOP_ETH_SYS_SEL 77
-#define CLK_TOP_ETH_XGMII_SEL 78
-#define CLK_TOP_BUS_TOPS_SEL 79
-#define CLK_TOP_NPU_TOPS_SEL 80
-#define CLK_TOP_DRAMC_SEL 81
-#define CLK_TOP_DRAMC_MD32_SEL 82
-#define CLK_TOP_INFRA_F26M_SEL 83
-#define CLK_TOP_PEXTP_P0_SEL 84
-#define CLK_TOP_PEXTP_P1_SEL 85
-#define CLK_TOP_PEXTP_P2_SEL 86
-#define CLK_TOP_PEXTP_P3_SEL 87
-#define CLK_TOP_DA_XTP_GLB_P0_SEL 88
-#define CLK_TOP_DA_XTP_GLB_P1_SEL 89
-#define CLK_TOP_DA_XTP_GLB_P2_SEL 90
-#define CLK_TOP_DA_XTP_GLB_P3_SEL 91
-#define CLK_TOP_CKM_SEL 92
-#define CLK_TOP_DA_SEL 93
-#define CLK_TOP_PEXTP_SEL 94
-#define CLK_TOP_TOPS_P2_26M_SEL 95
-#define CLK_TOP_MCUSYS_BACKUP_625M_SEL 96
-#define CLK_TOP_NETSYS_SYNC_250M_SEL 97
-#define CLK_TOP_MACSEC_SEL 98
-#define CLK_TOP_NETSYS_TOPS_400M_SEL 99
-#define CLK_TOP_NETSYS_PPEFB_250M_SEL 100
-#define CLK_TOP_NETSYS_WARP_SEL 101
-#define CLK_TOP_ETH_MII_SEL 102
-#define CLK_TOP_NPU_SEL 103
-#define CLK_TOP_AUD_I2S_M 104
-
-/* MCUSYS */
-
-#define CLK_MCU_BUS_DIV_SEL 0
-#define CLK_MCU_ARM_DIV_SEL 1
-
-/* INFRACFG_AO */
-
-#define CLK_INFRA_MUX_UART0_SEL 0
-#define CLK_INFRA_MUX_UART1_SEL 1
-#define CLK_INFRA_MUX_UART2_SEL 2
-#define CLK_INFRA_MUX_SPI0_SEL 3
-#define CLK_INFRA_MUX_SPI1_SEL 4
-#define CLK_INFRA_MUX_SPI2_SEL 5
-#define CLK_INFRA_PWM_SEL 6
-#define CLK_INFRA_PWM_CK1_SEL 7
-#define CLK_INFRA_PWM_CK2_SEL 8
-#define CLK_INFRA_PWM_CK3_SEL 9
-#define CLK_INFRA_PWM_CK4_SEL 10
-#define CLK_INFRA_PWM_CK5_SEL 11
-#define CLK_INFRA_PWM_CK6_SEL 12
-#define CLK_INFRA_PWM_CK7_SEL 13
-#define CLK_INFRA_PWM_CK8_SEL 14
-#define CLK_INFRA_PCIE_GFMUX_TL_O_P0_SEL 15
-#define CLK_INFRA_PCIE_GFMUX_TL_O_P1_SEL 16
-#define CLK_INFRA_PCIE_GFMUX_TL_O_P2_SEL 17
-#define CLK_INFRA_PCIE_GFMUX_TL_O_P3_SEL 18
-
-/* INFRACFG */
-
-#define CLK_INFRA_PCIE_PERI_26M_CK_P0 19
-#define CLK_INFRA_PCIE_PERI_26M_CK_P1 20
-#define CLK_INFRA_PCIE_PERI_26M_CK_P2 21
-#define CLK_INFRA_PCIE_PERI_26M_CK_P3 22
-#define CLK_INFRA_66M_GPT_BCK 23
-#define CLK_INFRA_66M_PWM_HCK 24
-#define CLK_INFRA_66M_PWM_BCK 25
-#define CLK_INFRA_66M_PWM_CK1 26
-#define CLK_INFRA_66M_PWM_CK2 27
-#define CLK_INFRA_66M_PWM_CK3 28
-#define CLK_INFRA_66M_PWM_CK4 29
-#define CLK_INFRA_66M_PWM_CK5 30
-#define CLK_INFRA_66M_PWM_CK6 31
-#define CLK_INFRA_66M_PWM_CK7 32
-#define CLK_INFRA_66M_PWM_CK8 33
-#define CLK_INFRA_133M_CQDMA_BCK 34
-#define CLK_INFRA_66M_AUD_SLV_BCK 35
-#define CLK_INFRA_AUD_26M 36
-#define CLK_INFRA_AUD_L 37
-#define CLK_INFRA_AUD_AUD 38
-#define CLK_INFRA_AUD_EG2 39
-#define CLK_INFRA_DRAMC_F26M 40
-#define CLK_INFRA_133M_DBG_ACKM 41
-#define CLK_INFRA_66M_AP_DMA_BCK 42
-#define CLK_INFRA_66M_SEJ_BCK 43
-#define CLK_INFRA_PRE_CK_SEJ_F13M 44
-#define CLK_INFRA_26M_THERM_SYSTEM 45
-#define CLK_INFRA_I2C_BCK 46
-#define CLK_INFRA_52M_UART0_CK 47
-#define CLK_INFRA_52M_UART1_CK 48
-#define CLK_INFRA_52M_UART2_CK 49
-#define CLK_INFRA_NFI 50
-#define CLK_INFRA_SPINFI 51
-#define CLK_INFRA_66M_NFI_HCK 52
-#define CLK_INFRA_104M_SPI0 53
-#define CLK_INFRA_104M_SPI1 54
-#define CLK_INFRA_104M_SPI2_BCK 55
-#define CLK_INFRA_66M_SPI0_HCK 56
-#define CLK_INFRA_66M_SPI1_HCK 57
-#define CLK_INFRA_66M_SPI2_HCK 58
-#define CLK_INFRA_66M_FLASHIF_AXI 59
-#define CLK_INFRA_RTC 60
-#define CLK_INFRA_26M_ADC_BCK 61
-#define CLK_INFRA_RC_ADC 62
-#define CLK_INFRA_MSDC400 63
-#define CLK_INFRA_MSDC2_HCK 64
-#define CLK_INFRA_133M_MSDC_0_HCK 65
-#define CLK_INFRA_66M_MSDC_0_HCK 66
-#define CLK_INFRA_133M_CPUM_BCK 67
-#define CLK_INFRA_BIST2FPC 68
-#define CLK_INFRA_I2C_X16W_MCK_CK_P1 69
-#define CLK_INFRA_I2C_X16W_PCK_CK_P1 70
-#define CLK_INFRA_133M_USB_HCK 71
-#define CLK_INFRA_133M_USB_HCK_CK_P1 72
-#define CLK_INFRA_66M_USB_HCK 73
-#define CLK_INFRA_66M_USB_HCK_CK_P1 74
-#define CLK_INFRA_USB_SYS 75
-#define CLK_INFRA_USB_SYS_CK_P1 76
-#define CLK_INFRA_USB_REF 77
-#define CLK_INFRA_USB_CK_P1 78
-#define CLK_INFRA_USB_FRMCNT 79
-#define CLK_INFRA_USB_FRMCNT_CK_P1 80
-#define CLK_INFRA_USB_PIPE 81
-#define CLK_INFRA_USB_PIPE_CK_P1 82
-#define CLK_INFRA_USB_UTMI 83
-#define CLK_INFRA_USB_UTMI_CK_P1 84
-#define CLK_INFRA_USB_XHCI 85
-#define CLK_INFRA_USB_XHCI_CK_P1 86
-#define CLK_INFRA_PCIE_GFMUX_TL_P0 87
-#define CLK_INFRA_PCIE_GFMUX_TL_P1 88
-#define CLK_INFRA_PCIE_GFMUX_TL_P2 89
-#define CLK_INFRA_PCIE_GFMUX_TL_P3 90
-#define CLK_INFRA_PCIE_PIPE_P0 91
-#define CLK_INFRA_PCIE_PIPE_P1 92
-#define CLK_INFRA_PCIE_PIPE_P2 93
-#define CLK_INFRA_PCIE_PIPE_P3 94
-#define CLK_INFRA_133M_PCIE_CK_P0 95
-#define CLK_INFRA_133M_PCIE_CK_P1 96
-#define CLK_INFRA_133M_PCIE_CK_P2 97
-#define CLK_INFRA_133M_PCIE_CK_P3 98
-
-/* ETHDMA */
-
-#define CLK_ETHDMA_XGP1_EN 0
-#define CLK_ETHDMA_XGP2_EN 1
-#define CLK_ETHDMA_XGP3_EN 2
-#define CLK_ETHDMA_FE_EN 3
-#define CLK_ETHDMA_GP2_EN 4
-#define CLK_ETHDMA_GP1_EN 5
-#define CLK_ETHDMA_GP3_EN 6
-#define CLK_ETHDMA_ESW_EN 7
-#define CLK_ETHDMA_CRYPT0_EN 8
-#define CLK_ETHDMA_NR_CLK 9
-
-/* SGMIISYS_0 */
-
-#define CLK_SGM0_TX_EN 0
-#define CLK_SGM0_RX_EN 1
-#define CLK_SGMII0_NR_CLK 2
-
-/* SGMIISYS_1 */
-
-#define CLK_SGM1_TX_EN 0
-#define CLK_SGM1_RX_EN 1
-#define CLK_SGMII1_NR_CLK 2
-
-/* ETHWARP */
-
-#define CLK_ETHWARP_WOCPU2_EN 0
-#define CLK_ETHWARP_WOCPU1_EN 1
-#define CLK_ETHWARP_WOCPU0_EN 2
-#define CLK_ETHWARP_NR_CLK 3
-
-#endif /* _DT_BINDINGS_CLK_MT7988_H */
diff --git a/target/linux/mediatek/patches-6.1/241-clk-mediatek-Add-pcw-chg-shift-control.patch b/target/linux/mediatek/patches-6.1/241-clk-mediatek-Add-pcw-chg-shift-control.patch
deleted file mode 100644
index 75ca114a58..0000000000
--- a/target/linux/mediatek/patches-6.1/241-clk-mediatek-Add-pcw-chg-shift-control.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/clk/mediatek/clk-pll.c
-+++ b/drivers/clk/mediatek/clk-pll.c
-@@ -141,7 +141,10 @@ static void mtk_pll_set_rate_regs(struct
- pll->data->pcw_shift);
- val |= pcw << pll->data->pcw_shift;
- writel(val, pll->pcw_addr);
-- chg = readl(pll->pcw_chg_addr) | PCW_CHG_MASK;
-+ if (pll->data->pcw_chg_shift)
-+ chg = readl(pll->pcw_chg_addr) | BIT(pll->data->pcw_chg_shift);
-+ else
-+ chg = readl(pll->pcw_chg_addr) | PCW_CHG_MASK;
- writel(chg, pll->pcw_chg_addr);
- if (pll->tuner_addr)
- writel(val + 1, pll->tuner_addr);
---- a/drivers/clk/mediatek/clk-pll.h
-+++ b/drivers/clk/mediatek/clk-pll.h
-@@ -42,6 +42,7 @@ struct mtk_pll_data {
- u32 pcw_reg;
- int pcw_shift;
- u32 pcw_chg_reg;
-+ int pcw_chg_shift;
- const struct mtk_pll_div_table *div_table;
- const char *parent_name;
- u32 en_reg;
diff --git a/target/linux/mediatek/patches-6.1/241-v6.3-dt-bindings-clock-Add-compatibles-for-MT7981.patch b/target/linux/mediatek/patches-6.1/241-v6.3-dt-bindings-clock-Add-compatibles-for-MT7981.patch
new file mode 100644
index 0000000000..ad4ecdf83f
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/241-v6.3-dt-bindings-clock-Add-compatibles-for-MT7981.patch
@@ -0,0 +1,75 @@
+From cc4d9e0c77494fcf6bccbc57e23db0007cf681b7 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel at makrotopia.org>
+Date: Thu, 26 Jan 2023 03:33:46 +0000
+Subject: [PATCH] dt-bindings: clock: Add compatibles for MT7981
+
+Add compatible string for MT7981 to existing bindings at
+ - mediatek,apmixedsys.yaml
+ - mediatek,topckgen.yaml
+ - mediatek,ethsys.txt
+ - mediatek,infracfg.yaml
+ - mediatek,sgmiisys.txt
+
+Signed-off-by: Jianhui Zhao <zhaojh329 at gmail.com>
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Link: https://lore.kernel.org/r/cc85ee470c781ff4013f6c21c92c0a21574b12b2.1674703830.git.daniel@makrotopia.org
+Signed-off-by: Stephen Boyd <sboyd at kernel.org>
+---
+ .../devicetree/bindings/arm/mediatek/mediatek,ethsys.txt | 1 +
+ .../devicetree/bindings/arm/mediatek/mediatek,infracfg.yaml | 1 +
+ .../devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt | 2 ++
+ .../devicetree/bindings/clock/mediatek,apmixedsys.yaml | 1 +
+ Documentation/devicetree/bindings/clock/mediatek,topckgen.yaml | 1 +
+ 5 files changed, 6 insertions(+)
+
+--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt
++++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt
+@@ -10,6 +10,7 @@ Required Properties:
+ - "mediatek,mt7622-ethsys", "syscon"
+ - "mediatek,mt7623-ethsys", "mediatek,mt2701-ethsys", "syscon"
+ - "mediatek,mt7629-ethsys", "syscon"
++ - "mediatek,mt7981-ethsys", "syscon"
+ - "mediatek,mt7986-ethsys", "syscon"
+ - #clock-cells: Must be 1
+ - #reset-cells: Must be 1
+--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.yaml
++++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.yaml
+@@ -28,6 +28,7 @@ properties:
+ - mediatek,mt6797-infracfg
+ - mediatek,mt7622-infracfg
+ - mediatek,mt7629-infracfg
++ - mediatek,mt7981-infracfg
+ - mediatek,mt7986-infracfg
+ - mediatek,mt8135-infracfg
+ - mediatek,mt8167-infracfg
+--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt
++++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt
+@@ -8,6 +8,8 @@ Required Properties:
+ - compatible: Should be:
+ - "mediatek,mt7622-sgmiisys", "syscon"
+ - "mediatek,mt7629-sgmiisys", "syscon"
++ - "mediatek,mt7981-sgmiisys_0", "syscon"
++ - "mediatek,mt7981-sgmiisys_1", "syscon"
+ - "mediatek,mt7986-sgmiisys_0", "syscon"
+ - "mediatek,mt7986-sgmiisys_1", "syscon"
+ - #clock-cells: Must be 1
+--- a/Documentation/devicetree/bindings/clock/mediatek,apmixedsys.yaml
++++ b/Documentation/devicetree/bindings/clock/mediatek,apmixedsys.yaml
+@@ -20,6 +20,7 @@ properties:
+ - enum:
+ - mediatek,mt6797-apmixedsys
+ - mediatek,mt7622-apmixedsys
++ - mediatek,mt7981-apmixedsys
+ - mediatek,mt7986-apmixedsys
+ - mediatek,mt8135-apmixedsys
+ - mediatek,mt8173-apmixedsys
+--- a/Documentation/devicetree/bindings/clock/mediatek,topckgen.yaml
++++ b/Documentation/devicetree/bindings/clock/mediatek,topckgen.yaml
+@@ -35,6 +35,7 @@ properties:
+ - mediatek,mt6779-topckgen
+ - mediatek,mt6795-topckgen
+ - mediatek,mt7629-topckgen
++ - mediatek,mt7981-topckgen
+ - mediatek,mt7986-topckgen
+ - mediatek,mt8167-topckgen
+ - mediatek,mt8183-topckgen
diff --git a/target/linux/mediatek/patches-6.1/242-clk-mediatek-add-mt7988-clock-support.patch b/target/linux/mediatek/patches-6.1/242-clk-mediatek-add-mt7988-clock-support.patch
deleted file mode 100644
index 3ced012495..0000000000
--- a/target/linux/mediatek/patches-6.1/242-clk-mediatek-add-mt7988-clock-support.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/clk/mediatek/Kconfig
-+++ b/drivers/clk/mediatek/Kconfig
-@@ -415,6 +415,15 @@ config COMMON_CLK_MT7986_ETHSYS
- This driver adds support for clocks for Ethernet and SGMII
- required on MediaTek MT7986 SoC.
-
-+config COMMON_CLK_MT7988
-+ bool "Clock driver for MediaTek MT7988"
-+ depends on ARCH_MEDIATEK || COMPILE_TEST
-+ select COMMON_CLK_MEDIATEK
-+ default ARCH_MEDIATEK
-+ help
-+ This driver supports MediaTek MT7988 basic clocks and clocks
-+ required for various periperals found on MediaTek.
-+
- 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
-@@ -60,6 +60,10 @@ obj-$(CONFIG_COMMON_CLK_MT7986) += clk-m
- 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_MT7988) += clk-mt7988-apmixed.o
-+obj-$(CONFIG_COMMON_CLK_MT7988) += clk-mt7988-topckgen.o
-+obj-$(CONFIG_COMMON_CLK_MT7988) += clk-mt7988-infracfg.o
-+obj-$(CONFIG_COMMON_CLK_MT7988) += clk-mt7988-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-6.1/242-v6.4-dt-bindings-arm-mediatek-sgmiisys-Convert-to-DT-sche.patch b/target/linux/mediatek/patches-6.1/242-v6.4-dt-bindings-arm-mediatek-sgmiisys-Convert-to-DT-sche.patch
new file mode 100644
index 0000000000..48d3d4e90c
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/242-v6.4-dt-bindings-arm-mediatek-sgmiisys-Convert-to-DT-sche.patch
@@ -0,0 +1,107 @@
+From d4f08a703565abf47baa5a77d05365cf4598d55c Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel at makrotopia.org>
+Date: Sun, 19 Mar 2023 12:56:52 +0000
+Subject: [PATCH 1/2] dt-bindings: arm: mediatek: sgmiisys: Convert to DT
+ schema
+
+Convert mediatek,sgmiiisys bindings to DT schema format.
+Add maintainer Matthias Brugger, no maintainers were listed in the
+original documentation.
+As this node is also referenced by the Ethernet controller and used
+as SGMII PCS add this fact to the description.
+Move the file to Documentation/devicetree/bindings/net/pcs/ which seems
+more appropriate given that the great majority of registers are related
+to SGMII PCS functionality and only one register represents clock bits.
+
+Reviewed-by: Rob Herring <robh at kernel.org>
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Signed-off-by: Jakub Kicinski <kuba at kernel.org>
+---
+ .../arm/mediatek/mediatek,sgmiisys.txt | 27 ----------
+ .../bindings/net/pcs/mediatek,sgmiisys.yaml | 49 +++++++++++++++++++
+ 2 files changed, 49 insertions(+), 27 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt
+ create mode 100644 Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml
+
+--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt
++++ /dev/null
+@@ -1,27 +0,0 @@
+-MediaTek SGMIISYS controller
+-============================
+-
+-The MediaTek SGMIISYS controller provides various clocks to the system.
+-
+-Required Properties:
+-
+-- compatible: Should be:
+- - "mediatek,mt7622-sgmiisys", "syscon"
+- - "mediatek,mt7629-sgmiisys", "syscon"
+- - "mediatek,mt7981-sgmiisys_0", "syscon"
+- - "mediatek,mt7981-sgmiisys_1", "syscon"
+- - "mediatek,mt7986-sgmiisys_0", "syscon"
+- - "mediatek,mt7986-sgmiisys_1", "syscon"
+-- #clock-cells: Must be 1
+-
+-The SGMIISYS controller uses the common clk binding from
+-Documentation/devicetree/bindings/clock/clock-bindings.txt
+-The available clocks are defined in dt-bindings/clock/mt*-clk.h.
+-
+-Example:
+-
+-sgmiisys: sgmiisys at 1b128000 {
+- compatible = "mediatek,mt7622-sgmiisys", "syscon";
+- reg = <0 0x1b128000 0 0x1000>;
+- #clock-cells = <1>;
+-};
+--- /dev/null
++++ b/Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml
+@@ -0,0 +1,49 @@
++# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/net/pcs/mediatek,sgmiisys.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: MediaTek SGMIISYS Controller
++
++maintainers:
++ - Matthias Brugger <matthias.bgg at gmail.com>
++
++description:
++ The MediaTek SGMIISYS controller provides a SGMII PCS and some clocks
++ to the ethernet subsystem to which it is attached.
++
++properties:
++ compatible:
++ items:
++ - enum:
++ - mediatek,mt7622-sgmiisys
++ - mediatek,mt7629-sgmiisys
++ - mediatek,mt7986-sgmiisys_0
++ - mediatek,mt7986-sgmiisys_1
++ - const: syscon
++
++ reg:
++ maxItems: 1
++
++ '#clock-cells':
++ const: 1
++
++required:
++ - compatible
++ - reg
++ - '#clock-cells'
++
++additionalProperties: false
++
++examples:
++ - |
++ soc {
++ #address-cells = <2>;
++ #size-cells = <2>;
++ sgmiisys: syscon at 1b128000 {
++ compatible = "mediatek,mt7622-sgmiisys", "syscon";
++ reg = <0 0x1b128000 0 0x1000>;
++ #clock-cells = <1>;
++ };
++ };
diff --git a/target/linux/mediatek/patches-6.1/243-v6.4-dt-bindings-net-pcs-mediatek-sgmiisys-add-MT7981-SoC.patch b/target/linux/mediatek/patches-6.1/243-v6.4-dt-bindings-net-pcs-mediatek-sgmiisys-add-MT7981-SoC.patch
new file mode 100644
index 0000000000..62a64b9dd0
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/243-v6.4-dt-bindings-net-pcs-mediatek-sgmiisys-add-MT7981-SoC.patch
@@ -0,0 +1,37 @@
+From 4f7eb19c4f44078100659f6ba073b0cc7191bc91 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel at makrotopia.org>
+Date: Sun, 19 Mar 2023 12:57:04 +0000
+Subject: [PATCH 2/2] dt-bindings: net: pcs: mediatek,sgmiisys: add MT7981 SoC
+
+Add mediatek,pnswap boolean property needed on many boards using the
+MediaTek MT7981 SoC.
+
+Reviewed-by: Rob Herring <robh at kernel.org>
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Signed-off-by: Jakub Kicinski <kuba at kernel.org>
+---
+ .../devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml
++++ b/Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml
+@@ -19,6 +19,8 @@ properties:
+ - enum:
+ - mediatek,mt7622-sgmiisys
+ - mediatek,mt7629-sgmiisys
++ - mediatek,mt7981-sgmiisys_0
++ - mediatek,mt7981-sgmiisys_1
+ - mediatek,mt7986-sgmiisys_0
+ - mediatek,mt7986-sgmiisys_1
+ - const: syscon
+@@ -29,6 +31,10 @@ properties:
+ '#clock-cells':
+ const: 1
+
++ mediatek,pnswap:
++ description: Invert polarity of the SGMII data lanes
++ type: boolean
++
+ required:
+ - compatible
+ - reg
diff --git a/target/linux/mediatek/patches-6.1/244-v6.8-dt-bindings-arm-mediatek-move-ethsys-controller-conv.patch b/target/linux/mediatek/patches-6.1/244-v6.8-dt-bindings-arm-mediatek-move-ethsys-controller-conv.patch
new file mode 100644
index 0000000000..946db82235
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/244-v6.8-dt-bindings-arm-mediatek-move-ethsys-controller-conv.patch
@@ -0,0 +1,113 @@
+From 94b0f301f6ee92f79a2fe2c655dfdbdfe2aec536 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
+Date: Sun, 19 Nov 2023 22:24:16 +0100
+Subject: [PATCH] dt-bindings: arm: mediatek: move ethsys controller & convert
+ to DT schema
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+DT schema helps validating DTS files. Binding was moved to clock/ as
+this hardware is a clock provider. Example required a small fix for
+"reg" value (1 address cell + 1 size cell).
+
+Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+Reviewed-by: Rob Herring <robh at kernel.org>
+Link: https://lore.kernel.org/r/20231119212416.2682-1-zajec5@gmail.com
+Signed-off-by: Stephen Boyd <sboyd at kernel.org>
+---
+ .../bindings/arm/mediatek/mediatek,ethsys.txt | 29 ----------
+ .../bindings/clock/mediatek,ethsys.yaml | 54 +++++++++++++++++++
+ 2 files changed, 54 insertions(+), 29 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/mediatek,ethsys.yaml
+
+--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt
++++ /dev/null
+@@ -1,29 +0,0 @@
+-Mediatek ethsys controller
+-============================
+-
+-The Mediatek ethsys controller provides various clocks to the system.
+-
+-Required Properties:
+-
+-- compatible: Should be:
+- - "mediatek,mt2701-ethsys", "syscon"
+- - "mediatek,mt7622-ethsys", "syscon"
+- - "mediatek,mt7623-ethsys", "mediatek,mt2701-ethsys", "syscon"
+- - "mediatek,mt7629-ethsys", "syscon"
+- - "mediatek,mt7981-ethsys", "syscon"
+- - "mediatek,mt7986-ethsys", "syscon"
+-- #clock-cells: Must be 1
+-- #reset-cells: Must be 1
+-
+-The ethsys controller uses the common clk binding from
+-Documentation/devicetree/bindings/clock/clock-bindings.txt
+-The available clocks are defined in dt-bindings/clock/mt*-clk.h.
+-
+-Example:
+-
+-ethsys: clock-controller at 1b000000 {
+- compatible = "mediatek,mt2701-ethsys", "syscon";
+- reg = <0 0x1b000000 0 0x1000>;
+- #clock-cells = <1>;
+- #reset-cells = <1>;
+-};
+--- /dev/null
++++ b/Documentation/devicetree/bindings/clock/mediatek,ethsys.yaml
+@@ -0,0 +1,54 @@
++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/clock/mediatek,ethsys.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Mediatek ethsys controller
++
++description:
++ The available clocks are defined in dt-bindings/clock/mt*-clk.h.
++
++maintainers:
++ - James Liao <jamesjj.liao at mediatek.com>
++
++properties:
++ compatible:
++ oneOf:
++ - items:
++ - enum:
++ - mediatek,mt2701-ethsys
++ - mediatek,mt7622-ethsys
++ - mediatek,mt7629-ethsys
++ - mediatek,mt7981-ethsys
++ - mediatek,mt7986-ethsys
++ - const: syscon
++ - items:
++ - const: mediatek,mt7623-ethsys
++ - const: mediatek,mt2701-ethsys
++ - const: syscon
++
++ reg:
++ maxItems: 1
++
++ "#clock-cells":
++ const: 1
++
++ "#reset-cells":
++ const: 1
++
++required:
++ - reg
++ - "#clock-cells"
++ - "#reset-cells"
++
++additionalProperties: false
++
++examples:
++ - |
++ clock-controller at 1b000000 {
++ compatible = "mediatek,mt2701-ethsys", "syscon";
++ reg = <0x1b000000 0x1000>;
++ #clock-cells = <1>;
++ #reset-cells = <1>;
++ };
diff --git a/target/linux/mediatek/patches-6.1/245-v6.8-dt-bindings-reset-mediatek-add-MT7988-ethwarp-reset-.patch b/target/linux/mediatek/patches-6.1/245-v6.8-dt-bindings-reset-mediatek-add-MT7988-ethwarp-reset-.patch
new file mode 100644
index 0000000000..47f05e93c6
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/245-v6.8-dt-bindings-reset-mediatek-add-MT7988-ethwarp-reset-.patch
@@ -0,0 +1,35 @@
+From 5cfa3beb7761cb84be77225902e018d9d3f9b973 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel at makrotopia.org>
+Date: Sun, 17 Dec 2023 21:49:45 +0000
+Subject: [PATCH 1/4] dt-bindings: reset: mediatek: add MT7988 ethwarp reset
+ IDs
+
+Add reset ID for ethwarp subsystem allowing to reset the built-in
+Ethernet switch of the MediaTek MT7988 SoC.
+
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>
+Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org>
+Link: https://lore.kernel.org/r/0c14bbacf471683af67ffa7572bfa1d5c45a0b5d.1702849494.git.daniel@makrotopia.org
+Signed-off-by: Stephen Boyd <sboyd at kernel.org>
+---
+ include/dt-bindings/reset/mediatek,mt7988-resets.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+ create mode 100644 include/dt-bindings/reset/mediatek,mt7988-resets.h
+
+--- /dev/null
++++ b/include/dt-bindings/reset/mediatek,mt7988-resets.h
+@@ -0,0 +1,13 @@
++/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
++/*
++ * Copyright (c) 2023 Daniel Golle <daniel at makrotopia.org>
++ * Author: Daniel Golle <daniel at makrotopia.org>
++ */
++
++#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT7988
++#define _DT_BINDINGS_RESET_CONTROLLER_MT7988
++
++/* ETHWARP resets */
++#define MT7988_ETHWARP_RST_SWITCH 0
++
++#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT7988 */
diff --git a/target/linux/mediatek/patches-6.1/246-v6.8-dt-bindings-clock-mediatek-add-MT7988-clock-IDs.patch b/target/linux/mediatek/patches-6.1/246-v6.8-dt-bindings-clock-mediatek-add-MT7988-clock-IDs.patch
new file mode 100644
index 0000000000..cf5cae6341
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/246-v6.8-dt-bindings-clock-mediatek-add-MT7988-clock-IDs.patch
@@ -0,0 +1,302 @@
+From 8187e001de156e99ef95366ffd10d627ed090826 Mon Sep 17 00:00:00 2001
+From: Sam Shih <sam.shih at mediatek.com>
+Date: Sun, 17 Dec 2023 21:49:33 +0000
+Subject: [PATCH] dt-bindings: clock: mediatek: add MT7988 clock IDs
+
+Add MT7988 clock dt-bindings for topckgen, apmixedsys, infracfg,
+ethernet and xfipll subsystem clocks.
+
+Signed-off-by: Sam Shih <sam.shih at mediatek.com>
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>
+Link: https://lore.kernel.org/r/27f99db432e9ccc804cc5b6501d7d17d72cae879.1702849494.git.daniel@makrotopia.org
+Signed-off-by: Stephen Boyd <sboyd at kernel.org>
+---
+ .../dt-bindings/clock/mediatek,mt7988-clk.h | 280 ++++++++++++++++++
+ 1 file changed, 280 insertions(+)
+ create mode 100644 include/dt-bindings/clock/mediatek,mt7988-clk.h
+
+--- /dev/null
++++ b/include/dt-bindings/clock/mediatek,mt7988-clk.h
+@@ -0,0 +1,280 @@
++/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
++/*
++ * Copyright (c) 2023 MediaTek Inc.
++ * Author: Sam Shih <sam.shih at mediatek.com>
++ * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
++ */
++
++#ifndef _DT_BINDINGS_CLK_MT7988_H
++#define _DT_BINDINGS_CLK_MT7988_H
++
++/* APMIXEDSYS */
++
++#define CLK_APMIXED_NETSYSPLL 0
++#define CLK_APMIXED_MPLL 1
++#define CLK_APMIXED_MMPLL 2
++#define CLK_APMIXED_APLL2 3
++#define CLK_APMIXED_NET1PLL 4
++#define CLK_APMIXED_NET2PLL 5
++#define CLK_APMIXED_WEDMCUPLL 6
++#define CLK_APMIXED_SGMPLL 7
++#define CLK_APMIXED_ARM_B 8
++#define CLK_APMIXED_CCIPLL2_B 9
++#define CLK_APMIXED_USXGMIIPLL 10
++#define CLK_APMIXED_MSDCPLL 11
++
++/* TOPCKGEN */
++
++#define CLK_TOP_XTAL 0
++#define CLK_TOP_XTAL_D2 1
++#define CLK_TOP_RTC_32K 2
++#define CLK_TOP_RTC_32P7K 3
++#define CLK_TOP_MPLL_D2 4
++#define CLK_TOP_MPLL_D3_D2 5
++#define CLK_TOP_MPLL_D4 6
++#define CLK_TOP_MPLL_D8 7
++#define CLK_TOP_MPLL_D8_D2 8
++#define CLK_TOP_MMPLL_D2 9
++#define CLK_TOP_MMPLL_D3_D5 10
++#define CLK_TOP_MMPLL_D4 11
++#define CLK_TOP_MMPLL_D6_D2 12
++#define CLK_TOP_MMPLL_D8 13
++#define CLK_TOP_APLL2_D4 14
++#define CLK_TOP_NET1PLL_D4 15
++#define CLK_TOP_NET1PLL_D5 16
++#define CLK_TOP_NET1PLL_D5_D2 17
++#define CLK_TOP_NET1PLL_D5_D4 18
++#define CLK_TOP_NET1PLL_D8 19
++#define CLK_TOP_NET1PLL_D8_D2 20
++#define CLK_TOP_NET1PLL_D8_D4 21
++#define CLK_TOP_NET1PLL_D8_D8 22
++#define CLK_TOP_NET1PLL_D8_D16 23
++#define CLK_TOP_NET2PLL_D2 24
++#define CLK_TOP_NET2PLL_D4 25
++#define CLK_TOP_NET2PLL_D4_D4 26
++#define CLK_TOP_NET2PLL_D4_D8 27
++#define CLK_TOP_NET2PLL_D6 28
++#define CLK_TOP_NET2PLL_D8 29
++#define CLK_TOP_NETSYS_SEL 30
++#define CLK_TOP_NETSYS_500M_SEL 31
++#define CLK_TOP_NETSYS_2X_SEL 32
++#define CLK_TOP_NETSYS_GSW_SEL 33
++#define CLK_TOP_ETH_GMII_SEL 34
++#define CLK_TOP_NETSYS_MCU_SEL 35
++#define CLK_TOP_NETSYS_PAO_2X_SEL 36
++#define CLK_TOP_EIP197_SEL 37
++#define CLK_TOP_AXI_INFRA_SEL 38
++#define CLK_TOP_UART_SEL 39
++#define CLK_TOP_EMMC_250M_SEL 40
++#define CLK_TOP_EMMC_400M_SEL 41
++#define CLK_TOP_SPI_SEL 42
++#define CLK_TOP_SPIM_MST_SEL 43
++#define CLK_TOP_NFI1X_SEL 44
++#define CLK_TOP_SPINFI_SEL 45
++#define CLK_TOP_PWM_SEL 46
++#define CLK_TOP_I2C_SEL 47
++#define CLK_TOP_PCIE_MBIST_250M_SEL 48
++#define CLK_TOP_PEXTP_TL_SEL 49
++#define CLK_TOP_PEXTP_TL_P1_SEL 50
++#define CLK_TOP_PEXTP_TL_P2_SEL 51
++#define CLK_TOP_PEXTP_TL_P3_SEL 52
++#define CLK_TOP_USB_SYS_SEL 53
++#define CLK_TOP_USB_SYS_P1_SEL 54
++#define CLK_TOP_USB_XHCI_SEL 55
++#define CLK_TOP_USB_XHCI_P1_SEL 56
++#define CLK_TOP_USB_FRMCNT_SEL 57
++#define CLK_TOP_USB_FRMCNT_P1_SEL 58
++#define CLK_TOP_AUD_SEL 59
++#define CLK_TOP_A1SYS_SEL 60
++#define CLK_TOP_AUD_L_SEL 61
++#define CLK_TOP_A_TUNER_SEL 62
++#define CLK_TOP_SSPXTP_SEL 63
++#define CLK_TOP_USB_PHY_SEL 64
++#define CLK_TOP_USXGMII_SBUS_0_SEL 65
++#define CLK_TOP_USXGMII_SBUS_1_SEL 66
++#define CLK_TOP_SGM_0_SEL 67
++#define CLK_TOP_SGM_SBUS_0_SEL 68
++#define CLK_TOP_SGM_1_SEL 69
++#define CLK_TOP_SGM_SBUS_1_SEL 70
++#define CLK_TOP_XFI_PHY_0_XTAL_SEL 71
++#define CLK_TOP_XFI_PHY_1_XTAL_SEL 72
++#define CLK_TOP_SYSAXI_SEL 73
++#define CLK_TOP_SYSAPB_SEL 74
++#define CLK_TOP_ETH_REFCK_50M_SEL 75
++#define CLK_TOP_ETH_SYS_200M_SEL 76
++#define CLK_TOP_ETH_SYS_SEL 77
++#define CLK_TOP_ETH_XGMII_SEL 78
++#define CLK_TOP_BUS_TOPS_SEL 79
++#define CLK_TOP_NPU_TOPS_SEL 80
++#define CLK_TOP_DRAMC_SEL 81
++#define CLK_TOP_DRAMC_MD32_SEL 82
++#define CLK_TOP_INFRA_F26M_SEL 83
++#define CLK_TOP_PEXTP_P0_SEL 84
++#define CLK_TOP_PEXTP_P1_SEL 85
++#define CLK_TOP_PEXTP_P2_SEL 86
++#define CLK_TOP_PEXTP_P3_SEL 87
++#define CLK_TOP_DA_XTP_GLB_P0_SEL 88
++#define CLK_TOP_DA_XTP_GLB_P1_SEL 89
++#define CLK_TOP_DA_XTP_GLB_P2_SEL 90
++#define CLK_TOP_DA_XTP_GLB_P3_SEL 91
++#define CLK_TOP_CKM_SEL 92
++#define CLK_TOP_DA_SEL 93
++#define CLK_TOP_PEXTP_SEL 94
++#define CLK_TOP_TOPS_P2_26M_SEL 95
++#define CLK_TOP_MCUSYS_BACKUP_625M_SEL 96
++#define CLK_TOP_NETSYS_SYNC_250M_SEL 97
++#define CLK_TOP_MACSEC_SEL 98
++#define CLK_TOP_NETSYS_TOPS_400M_SEL 99
++#define CLK_TOP_NETSYS_PPEFB_250M_SEL 100
++#define CLK_TOP_NETSYS_WARP_SEL 101
++#define CLK_TOP_ETH_MII_SEL 102
++#define CLK_TOP_NPU_SEL 103
++#define CLK_TOP_AUD_I2S_M 104
++
++/* MCUSYS */
++
++#define CLK_MCU_BUS_DIV_SEL 0
++#define CLK_MCU_ARM_DIV_SEL 1
++
++/* INFRACFG_AO */
++
++#define CLK_INFRA_MUX_UART0_SEL 0
++#define CLK_INFRA_MUX_UART1_SEL 1
++#define CLK_INFRA_MUX_UART2_SEL 2
++#define CLK_INFRA_MUX_SPI0_SEL 3
++#define CLK_INFRA_MUX_SPI1_SEL 4
++#define CLK_INFRA_MUX_SPI2_SEL 5
++#define CLK_INFRA_PWM_SEL 6
++#define CLK_INFRA_PWM_CK1_SEL 7
++#define CLK_INFRA_PWM_CK2_SEL 8
++#define CLK_INFRA_PWM_CK3_SEL 9
++#define CLK_INFRA_PWM_CK4_SEL 10
++#define CLK_INFRA_PWM_CK5_SEL 11
++#define CLK_INFRA_PWM_CK6_SEL 12
++#define CLK_INFRA_PWM_CK7_SEL 13
++#define CLK_INFRA_PWM_CK8_SEL 14
++#define CLK_INFRA_PCIE_GFMUX_TL_O_P0_SEL 15
++#define CLK_INFRA_PCIE_GFMUX_TL_O_P1_SEL 16
++#define CLK_INFRA_PCIE_GFMUX_TL_O_P2_SEL 17
++#define CLK_INFRA_PCIE_GFMUX_TL_O_P3_SEL 18
++
++/* INFRACFG */
++
++#define CLK_INFRA_PCIE_PERI_26M_CK_P0 19
++#define CLK_INFRA_PCIE_PERI_26M_CK_P1 20
++#define CLK_INFRA_PCIE_PERI_26M_CK_P2 21
++#define CLK_INFRA_PCIE_PERI_26M_CK_P3 22
++#define CLK_INFRA_66M_GPT_BCK 23
++#define CLK_INFRA_66M_PWM_HCK 24
++#define CLK_INFRA_66M_PWM_BCK 25
++#define CLK_INFRA_66M_PWM_CK1 26
++#define CLK_INFRA_66M_PWM_CK2 27
++#define CLK_INFRA_66M_PWM_CK3 28
++#define CLK_INFRA_66M_PWM_CK4 29
++#define CLK_INFRA_66M_PWM_CK5 30
++#define CLK_INFRA_66M_PWM_CK6 31
++#define CLK_INFRA_66M_PWM_CK7 32
++#define CLK_INFRA_66M_PWM_CK8 33
++#define CLK_INFRA_133M_CQDMA_BCK 34
++#define CLK_INFRA_66M_AUD_SLV_BCK 35
++#define CLK_INFRA_AUD_26M 36
++#define CLK_INFRA_AUD_L 37
++#define CLK_INFRA_AUD_AUD 38
++#define CLK_INFRA_AUD_EG2 39
++#define CLK_INFRA_DRAMC_F26M 40
++#define CLK_INFRA_133M_DBG_ACKM 41
++#define CLK_INFRA_66M_AP_DMA_BCK 42
++#define CLK_INFRA_66M_SEJ_BCK 43
++#define CLK_INFRA_PRE_CK_SEJ_F13M 44
++#define CLK_INFRA_26M_THERM_SYSTEM 45
++#define CLK_INFRA_I2C_BCK 46
++#define CLK_INFRA_52M_UART0_CK 47
++#define CLK_INFRA_52M_UART1_CK 48
++#define CLK_INFRA_52M_UART2_CK 49
++#define CLK_INFRA_NFI 50
++#define CLK_INFRA_SPINFI 51
++#define CLK_INFRA_66M_NFI_HCK 52
++#define CLK_INFRA_104M_SPI0 53
++#define CLK_INFRA_104M_SPI1 54
++#define CLK_INFRA_104M_SPI2_BCK 55
++#define CLK_INFRA_66M_SPI0_HCK 56
++#define CLK_INFRA_66M_SPI1_HCK 57
++#define CLK_INFRA_66M_SPI2_HCK 58
++#define CLK_INFRA_66M_FLASHIF_AXI 59
++#define CLK_INFRA_RTC 60
++#define CLK_INFRA_26M_ADC_BCK 61
++#define CLK_INFRA_RC_ADC 62
++#define CLK_INFRA_MSDC400 63
++#define CLK_INFRA_MSDC2_HCK 64
++#define CLK_INFRA_133M_MSDC_0_HCK 65
++#define CLK_INFRA_66M_MSDC_0_HCK 66
++#define CLK_INFRA_133M_CPUM_BCK 67
++#define CLK_INFRA_BIST2FPC 68
++#define CLK_INFRA_I2C_X16W_MCK_CK_P1 69
++#define CLK_INFRA_I2C_X16W_PCK_CK_P1 70
++#define CLK_INFRA_133M_USB_HCK 71
++#define CLK_INFRA_133M_USB_HCK_CK_P1 72
++#define CLK_INFRA_66M_USB_HCK 73
++#define CLK_INFRA_66M_USB_HCK_CK_P1 74
++#define CLK_INFRA_USB_SYS 75
++#define CLK_INFRA_USB_SYS_CK_P1 76
++#define CLK_INFRA_USB_REF 77
++#define CLK_INFRA_USB_CK_P1 78
++#define CLK_INFRA_USB_FRMCNT 79
++#define CLK_INFRA_USB_FRMCNT_CK_P1 80
++#define CLK_INFRA_USB_PIPE 81
++#define CLK_INFRA_USB_PIPE_CK_P1 82
++#define CLK_INFRA_USB_UTMI 83
++#define CLK_INFRA_USB_UTMI_CK_P1 84
++#define CLK_INFRA_USB_XHCI 85
++#define CLK_INFRA_USB_XHCI_CK_P1 86
++#define CLK_INFRA_PCIE_GFMUX_TL_P0 87
++#define CLK_INFRA_PCIE_GFMUX_TL_P1 88
++#define CLK_INFRA_PCIE_GFMUX_TL_P2 89
++#define CLK_INFRA_PCIE_GFMUX_TL_P3 90
++#define CLK_INFRA_PCIE_PIPE_P0 91
++#define CLK_INFRA_PCIE_PIPE_P1 92
++#define CLK_INFRA_PCIE_PIPE_P2 93
++#define CLK_INFRA_PCIE_PIPE_P3 94
++#define CLK_INFRA_133M_PCIE_CK_P0 95
++#define CLK_INFRA_133M_PCIE_CK_P1 96
++#define CLK_INFRA_133M_PCIE_CK_P2 97
++#define CLK_INFRA_133M_PCIE_CK_P3 98
++
++/* ETHDMA */
++
++#define CLK_ETHDMA_XGP1_EN 0
++#define CLK_ETHDMA_XGP2_EN 1
++#define CLK_ETHDMA_XGP3_EN 2
++#define CLK_ETHDMA_FE_EN 3
++#define CLK_ETHDMA_GP2_EN 4
++#define CLK_ETHDMA_GP1_EN 5
++#define CLK_ETHDMA_GP3_EN 6
++#define CLK_ETHDMA_ESW_EN 7
++#define CLK_ETHDMA_CRYPT0_EN 8
++#define CLK_ETHDMA_NR_CLK 9
++
++/* SGMIISYS_0 */
++
++#define CLK_SGM0_TX_EN 0
++#define CLK_SGM0_RX_EN 1
++#define CLK_SGMII0_NR_CLK 2
++
++/* SGMIISYS_1 */
++
++#define CLK_SGM1_TX_EN 0
++#define CLK_SGM1_RX_EN 1
++#define CLK_SGMII1_NR_CLK 2
++
++/* ETHWARP */
++
++#define CLK_ETHWARP_WOCPU2_EN 0
++#define CLK_ETHWARP_WOCPU1_EN 1
++#define CLK_ETHWARP_WOCPU0_EN 2
++#define CLK_ETHWARP_NR_CLK 3
++
++/* XFIPLL */
++#define CLK_XFIPLL_PLL 0
++#define CLK_XFIPLL_PLL_EN 1
++
++#endif /* _DT_BINDINGS_CLK_MT7988_H */
diff --git a/target/linux/mediatek/patches-6.1/247-v6.8-dt-bindings-clock-mediatek-add-clock-controllers-of-.patch b/target/linux/mediatek/patches-6.1/247-v6.8-dt-bindings-clock-mediatek-add-clock-controllers-of-.patch
new file mode 100644
index 0000000000..79088b461b
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/247-v6.8-dt-bindings-clock-mediatek-add-clock-controllers-of-.patch
@@ -0,0 +1,260 @@
+From afd36e9d91b0a840983b829a9e95407d8151f7e7 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel at makrotopia.org>
+Date: Sun, 17 Dec 2023 21:49:55 +0000
+Subject: [PATCH 2/4] dt-bindings: clock: mediatek: add clock controllers of
+ MT7988
+
+Add various clock controllers found in the MT7988 SoC to existing
+bindings (if applicable) and add files for the new ethwarp, mcusys
+and xfi-pll clock controllers not previously present in any SoC.
+
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>
+Link: https://lore.kernel.org/r/07e76a544ce4392bcb88e34d5480e99bb7994618.1702849494.git.daniel@makrotopia.org
+Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org>
+Signed-off-by: Stephen Boyd <sboyd at kernel.org>
+---
+ .../arm/mediatek/mediatek,infracfg.yaml | 1 +
+ .../bindings/clock/mediatek,apmixedsys.yaml | 1 +
+ .../bindings/clock/mediatek,ethsys.yaml | 1 +
+ .../clock/mediatek,mt7988-ethwarp.yaml | 52 +++++++++++++++
+ .../clock/mediatek,mt7988-xfi-pll.yaml | 48 ++++++++++++++
+ .../bindings/clock/mediatek,topckgen.yaml | 2 +
+ .../bindings/net/pcs/mediatek,sgmiisys.yaml | 65 ++++++++++++++++---
+ 7 files changed, 161 insertions(+), 9 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt7988-ethwarp.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt7988-xfi-pll.yaml
+
+--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.yaml
++++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.yaml
+@@ -30,6 +30,7 @@ properties:
+ - mediatek,mt7629-infracfg
+ - mediatek,mt7981-infracfg
+ - mediatek,mt7986-infracfg
++ - mediatek,mt7988-infracfg
+ - mediatek,mt8135-infracfg
+ - mediatek,mt8167-infracfg
+ - mediatek,mt8173-infracfg
+--- a/Documentation/devicetree/bindings/clock/mediatek,apmixedsys.yaml
++++ b/Documentation/devicetree/bindings/clock/mediatek,apmixedsys.yaml
+@@ -22,6 +22,7 @@ properties:
+ - mediatek,mt7622-apmixedsys
+ - mediatek,mt7981-apmixedsys
+ - mediatek,mt7986-apmixedsys
++ - mediatek,mt7988-apmixedsys
+ - mediatek,mt8135-apmixedsys
+ - mediatek,mt8173-apmixedsys
+ - mediatek,mt8516-apmixedsys
+--- a/Documentation/devicetree/bindings/clock/mediatek,ethsys.yaml
++++ b/Documentation/devicetree/bindings/clock/mediatek,ethsys.yaml
+@@ -22,6 +22,7 @@ properties:
+ - mediatek,mt7629-ethsys
+ - mediatek,mt7981-ethsys
+ - mediatek,mt7986-ethsys
++ - mediatek,mt7988-ethsys
+ - const: syscon
+ - items:
+ - const: mediatek,mt7623-ethsys
+--- /dev/null
++++ b/Documentation/devicetree/bindings/clock/mediatek,mt7988-ethwarp.yaml
+@@ -0,0 +1,52 @@
++# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/clock/mediatek,mt7988-ethwarp.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: MediaTek MT7988 ethwarp Controller
++
++maintainers:
++ - Daniel Golle <daniel at makrotopia.org>
++
++description:
++ The Mediatek MT7988 ethwarp controller provides clocks and resets for the
++ Ethernet related subsystems found the MT7988 SoC.
++ The clock values can be found in <dt-bindings/clock/mt*-clk.h>.
++
++properties:
++ compatible:
++ items:
++ - const: mediatek,mt7988-ethwarp
++
++ reg:
++ maxItems: 1
++
++ '#clock-cells':
++ const: 1
++
++ '#reset-cells':
++ const: 1
++
++required:
++ - compatible
++ - reg
++ - '#clock-cells'
++ - '#reset-cells'
++
++additionalProperties: false
++
++examples:
++ - |
++ #include <dt-bindings/reset/ti-syscon.h>
++ soc {
++ #address-cells = <2>;
++ #size-cells = <2>;
++
++ clock-controller at 15031000 {
++ compatible = "mediatek,mt7988-ethwarp";
++ reg = <0 0x15031000 0 0x1000>;
++ #clock-cells = <1>;
++ #reset-cells = <1>;
++ };
++ };
+--- /dev/null
++++ b/Documentation/devicetree/bindings/clock/mediatek,mt7988-xfi-pll.yaml
+@@ -0,0 +1,48 @@
++# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/clock/mediatek,mt7988-xfi-pll.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: MediaTek MT7988 XFI PLL Clock Controller
++
++maintainers:
++ - Daniel Golle <daniel at makrotopia.org>
++
++description:
++ The MediaTek XFI PLL controller provides the 156.25MHz clock for the
++ Ethernet SerDes PHY from the 40MHz top_xtal clock.
++
++properties:
++ compatible:
++ const: mediatek,mt7988-xfi-pll
++
++ reg:
++ maxItems: 1
++
++ resets:
++ maxItems: 1
++
++ '#clock-cells':
++ const: 1
++
++required:
++ - compatible
++ - reg
++ - resets
++ - '#clock-cells'
++
++additionalProperties: false
++
++examples:
++ - |
++ soc {
++ #address-cells = <2>;
++ #size-cells = <2>;
++ clock-controller at 11f40000 {
++ compatible = "mediatek,mt7988-xfi-pll";
++ reg = <0 0x11f40000 0 0x1000>;
++ resets = <&watchdog 16>;
++ #clock-cells = <1>;
++ };
++ };
+--- a/Documentation/devicetree/bindings/clock/mediatek,topckgen.yaml
++++ b/Documentation/devicetree/bindings/clock/mediatek,topckgen.yaml
+@@ -37,6 +37,8 @@ properties:
+ - mediatek,mt7629-topckgen
+ - mediatek,mt7981-topckgen
+ - mediatek,mt7986-topckgen
++ - mediatek,mt7988-mcusys
++ - mediatek,mt7988-topckgen
+ - mediatek,mt8167-topckgen
+ - mediatek,mt8183-topckgen
+ - const: syscon
+--- a/Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml
++++ b/Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml
+@@ -15,15 +15,22 @@ description:
+
+ properties:
+ compatible:
+- items:
+- - enum:
+- - mediatek,mt7622-sgmiisys
+- - mediatek,mt7629-sgmiisys
+- - mediatek,mt7981-sgmiisys_0
+- - mediatek,mt7981-sgmiisys_1
+- - mediatek,mt7986-sgmiisys_0
+- - mediatek,mt7986-sgmiisys_1
+- - const: syscon
++ oneOf:
++ - items:
++ - enum:
++ - mediatek,mt7622-sgmiisys
++ - mediatek,mt7629-sgmiisys
++ - mediatek,mt7981-sgmiisys_0
++ - mediatek,mt7981-sgmiisys_1
++ - mediatek,mt7986-sgmiisys_0
++ - mediatek,mt7986-sgmiisys_1
++ - const: syscon
++ - items:
++ - enum:
++ - mediatek,mt7988-sgmiisys0
++ - mediatek,mt7988-sgmiisys1
++ - const: simple-mfd
++ - const: syscon
+
+ reg:
+ maxItems: 1
+@@ -35,11 +42,51 @@ properties:
+ description: Invert polarity of the SGMII data lanes
+ type: boolean
+
++ pcs:
++ type: object
++ description: MediaTek LynxI HSGMII PCS
++ properties:
++ compatible:
++ const: mediatek,mt7988-sgmii
++
++ clocks:
++ maxItems: 3
++
++ clock-names:
++ items:
++ - const: sgmii_sel
++ - const: sgmii_tx
++ - const: sgmii_rx
++
++ required:
++ - compatible
++ - clocks
++ - clock-names
++
++ additionalProperties: false
++
+ required:
+ - compatible
+ - reg
+ - '#clock-cells'
+
++allOf:
++ - if:
++ properties:
++ compatible:
++ contains:
++ enum:
++ - mediatek,mt7988-sgmiisys0
++ - mediatek,mt7988-sgmiisys1
++
++ then:
++ required:
++ - pcs
++
++ else:
++ properties:
++ pcs: false
++
+ additionalProperties: false
+
+ examples:
diff --git a/target/linux/mediatek/patches-6.1/248-v6.8-clk-mediatek-add-pcw_chg_bit-control-for-PLLs-of-MT7.patch b/target/linux/mediatek/patches-6.1/248-v6.8-clk-mediatek-add-pcw_chg_bit-control-for-PLLs-of-MT7.patch
new file mode 100644
index 0000000000..ca37fc793a
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/248-v6.8-clk-mediatek-add-pcw_chg_bit-control-for-PLLs-of-MT7.patch
@@ -0,0 +1,50 @@
+From d9bf944beaaad1890ad3fcb755c61e1c7e4c5630 Mon Sep 17 00:00:00 2001
+From: Sam Shih <sam.shih at mediatek.com>
+Date: Sun, 17 Dec 2023 21:50:07 +0000
+Subject: [PATCH 3/4] clk: mediatek: add pcw_chg_bit control for PLLs of MT7988
+
+Introduce pcw_chg_bit member to struct mtk_pll_data and use it instead
+of the previously hardcoded PCW_CHG_MASK macro if set.
+This will needed for clocks on the MT7988 SoC.
+
+Signed-off-by: Sam Shih <sam.shih at mediatek.com>
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>
+Link: https://lore.kernel.org/r/3b9c65ddb08c8bedf790aacf29871af026b6f0b7.1702849494.git.daniel@makrotopia.org
+Signed-off-by: Stephen Boyd <sboyd at kernel.org>
+---
+ drivers/clk/mediatek/clk-pll.c | 5 +++--
+ drivers/clk/mediatek/clk-pll.h | 1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/clk/mediatek/clk-pll.c
++++ b/drivers/clk/mediatek/clk-pll.c
+@@ -23,7 +23,7 @@
+ #define CON0_BASE_EN BIT(0)
+ #define CON0_PWR_ON BIT(0)
+ #define CON0_ISO_EN BIT(1)
+-#define PCW_CHG_MASK BIT(31)
++#define PCW_CHG_BIT 31
+
+ #define AUDPLL_TUNER_EN BIT(31)
+
+@@ -141,7 +141,8 @@ static void mtk_pll_set_rate_regs(struct
+ pll->data->pcw_shift);
+ val |= pcw << pll->data->pcw_shift;
+ writel(val, pll->pcw_addr);
+- chg = readl(pll->pcw_chg_addr) | PCW_CHG_MASK;
++ chg = readl(pll->pcw_chg_addr) |
++ BIT(pll->data->pcw_chg_bit ? : PCW_CHG_BIT);
+ writel(chg, pll->pcw_chg_addr);
+ if (pll->tuner_addr)
+ writel(val + 1, pll->tuner_addr);
+--- a/drivers/clk/mediatek/clk-pll.h
++++ b/drivers/clk/mediatek/clk-pll.h
+@@ -46,6 +46,7 @@ struct mtk_pll_data {
+ const char *parent_name;
+ u32 en_reg;
+ u8 pll_en_bit; /* Assume 0, indicates BIT(0) by default */
++ u8 pcw_chg_bit;
+ };
+
+ int mtk_clk_register_plls(struct device_node *node,
diff --git a/target/linux/mediatek/patches-6.1/249-v6.8-clk-mediatek-add-drivers-for-MT7988-SoC.patch b/target/linux/mediatek/patches-6.1/249-v6.8-clk-mediatek-add-drivers-for-MT7988-SoC.patch
new file mode 100644
index 0000000000..61664b934c
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/249-v6.8-clk-mediatek-add-drivers-for-MT7988-SoC.patch
@@ -0,0 +1,1026 @@
+From 4b4719437d85f0173d344f2c76fa1a5b7f7d184b Mon Sep 17 00:00:00 2001
+From: Sam Shih <sam.shih at mediatek.com>
+Date: Sun, 17 Dec 2023 21:50:15 +0000
+Subject: [PATCH 4/4] clk: mediatek: add drivers for MT7988 SoC
+
+Add APMIXED, ETH, INFRACFG and TOPCKGEN clock drivers which are
+typical MediaTek designs.
+
+Also add driver for XFIPLL clock generating the 156.25MHz clock for
+the XFI SerDes. It needs an undocumented software workaround and has
+an unknown internal design.
+
+Signed-off-by: Sam Shih <sam.shih at mediatek.com>
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>
+Link: https://lore.kernel.org/r/c7574d808e2da1a530182f0fd790c1337c336e1b.1702849494.git.daniel@makrotopia.org
+[sboyd at kernel.org: Add module license to infracfg file]
+Signed-off-by: Stephen Boyd <sboyd at kernel.org>
+---
+ drivers/clk/mediatek/Kconfig | 9 +
+ drivers/clk/mediatek/Makefile | 5 +
+ drivers/clk/mediatek/clk-mt7988-apmixed.c | 114 ++++++++
+ drivers/clk/mediatek/clk-mt7988-eth.c | 150 ++++++++++
+ drivers/clk/mediatek/clk-mt7988-infracfg.c | 275 +++++++++++++++++
+ drivers/clk/mediatek/clk-mt7988-topckgen.c | 325 +++++++++++++++++++++
+ drivers/clk/mediatek/clk-mt7988-xfipll.c | 82 ++++++
+ 7 files changed, 960 insertions(+)
+ create mode 100644 drivers/clk/mediatek/clk-mt7988-apmixed.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7988-eth.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7988-infracfg.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7988-topckgen.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7988-xfipll.c
+
+--- a/drivers/clk/mediatek/Kconfig
++++ b/drivers/clk/mediatek/Kconfig
+@@ -415,6 +415,15 @@ config COMMON_CLK_MT7986_ETHSYS
+ This driver adds support for clocks for Ethernet and SGMII
+ required on MediaTek MT7986 SoC.
+
++config COMMON_CLK_MT7988
++ tristate "Clock driver for MediaTek MT7988"
++ depends on ARCH_MEDIATEK || COMPILE_TEST
++ select COMMON_CLK_MEDIATEK
++ default ARCH_MEDIATEK
++ help
++ This driver supports MediaTek MT7988 basic clocks and clocks
++ required for various periperals found on this 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
+@@ -60,6 +60,11 @@ obj-$(CONFIG_COMMON_CLK_MT7986) += clk-m
+ 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_MT7988) += clk-mt7988-apmixed.o
++obj-$(CONFIG_COMMON_CLK_MT7988) += clk-mt7988-topckgen.o
++obj-$(CONFIG_COMMON_CLK_MT7988) += clk-mt7988-infracfg.o
++obj-$(CONFIG_COMMON_CLK_MT7988) += clk-mt7988-eth.o
++obj-$(CONFIG_COMMON_CLK_MT7988) += clk-mt7988-xfipll.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
+--- /dev/null
++++ b/drivers/clk/mediatek/clk-mt7988-apmixed.c
+@@ -0,0 +1,114 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (c) 2023 MediaTek Inc.
++ * Author: Sam Shih <sam.shih at mediatek.com>
++ * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
++ */
++
++#include <linux/clk-provider.h>
++#include <linux/of.h>
++#include <linux/of_address.h>
++#include <linux/of_device.h>
++#include <linux/platform_device.h>
++#include "clk-mtk.h"
++#include "clk-gate.h"
++#include "clk-mux.h"
++#include "clk-pll.h"
++#include <dt-bindings/clock/mediatek,mt7988-clk.h>
++
++#define MT7988_PLL_FMAX (2500UL * MHZ)
++#define MT7988_PCW_CHG_BIT 2
++
++#define PLL(_id, _name, _reg, _pwr_reg, _en_mask, _flags, _rst_bar_mask, _pcwbits, _pd_reg, \
++ _pd_shift, _tuner_reg, _tuner_en_reg, _tuner_en_bit, _pcw_reg, _pcw_shift, \
++ _pcw_chg_reg) \
++ { \
++ .id = _id, \
++ .name = _name, \
++ .reg = _reg, \
++ .pwr_reg = _pwr_reg, \
++ .en_mask = _en_mask, \
++ .flags = _flags, \
++ .rst_bar_mask = BIT(_rst_bar_mask), \
++ .fmax = MT7988_PLL_FMAX, \
++ .pcwbits = _pcwbits, \
++ .pd_reg = _pd_reg, \
++ .pd_shift = _pd_shift, \
++ .tuner_reg = _tuner_reg, \
++ .tuner_en_reg = _tuner_en_reg, \
++ .tuner_en_bit = _tuner_en_bit, \
++ .pcw_reg = _pcw_reg, \
++ .pcw_shift = _pcw_shift, \
++ .pcw_chg_reg = _pcw_chg_reg, \
++ .pcw_chg_bit = MT7988_PCW_CHG_BIT, \
++ .parent_name = "clkxtal", \
++ }
++
++static const struct mtk_pll_data plls[] = {
++ PLL(CLK_APMIXED_NETSYSPLL, "netsyspll", 0x0104, 0x0110, 0x00000001, 0, 0, 32, 0x0104, 4, 0,
++ 0, 0, 0x0108, 0, 0x0104),
++ PLL(CLK_APMIXED_MPLL, "mpll", 0x0114, 0x0120, 0xff000001, HAVE_RST_BAR, 23, 32, 0x0114, 4,
++ 0, 0, 0, 0x0118, 0, 0x0114),
++ PLL(CLK_APMIXED_MMPLL, "mmpll", 0x0124, 0x0130, 0xff000001, HAVE_RST_BAR, 23, 32, 0x0124, 4,
++ 0, 0, 0, 0x0128, 0, 0x0124),
++ PLL(CLK_APMIXED_APLL2, "apll2", 0x0134, 0x0140, 0x00000001, 0, 0, 32, 0x0134, 4, 0x0704,
++ 0x0700, 1, 0x0138, 0, 0x0134),
++ PLL(CLK_APMIXED_NET1PLL, "net1pll", 0x0144, 0x0150, 0xff000001, HAVE_RST_BAR, 23, 32,
++ 0x0144, 4, 0, 0, 0, 0x0148, 0, 0x0144),
++ PLL(CLK_APMIXED_NET2PLL, "net2pll", 0x0154, 0x0160, 0xff000001, (HAVE_RST_BAR | PLL_AO), 23,
++ 32, 0x0154, 4, 0, 0, 0, 0x0158, 0, 0x0154),
++ PLL(CLK_APMIXED_WEDMCUPLL, "wedmcupll", 0x0164, 0x0170, 0x00000001, 0, 0, 32, 0x0164, 4, 0,
++ 0, 0, 0x0168, 0, 0x0164),
++ PLL(CLK_APMIXED_SGMPLL, "sgmpll", 0x0174, 0x0180, 0x00000001, 0, 0, 32, 0x0174, 4, 0, 0, 0,
++ 0x0178, 0, 0x0174),
++ PLL(CLK_APMIXED_ARM_B, "arm_b", 0x0204, 0x0210, 0xff000001, (HAVE_RST_BAR | PLL_AO), 23, 32,
++ 0x0204, 4, 0, 0, 0, 0x0208, 0, 0x0204),
++ PLL(CLK_APMIXED_CCIPLL2_B, "ccipll2_b", 0x0214, 0x0220, 0xff000001, HAVE_RST_BAR, 23, 32,
++ 0x0214, 4, 0, 0, 0, 0x0218, 0, 0x0214),
++ PLL(CLK_APMIXED_USXGMIIPLL, "usxgmiipll", 0x0304, 0x0310, 0xff000001, HAVE_RST_BAR, 23, 32,
++ 0x0304, 4, 0, 0, 0, 0x0308, 0, 0x0304),
++ PLL(CLK_APMIXED_MSDCPLL, "msdcpll", 0x0314, 0x0320, 0x00000001, 0, 0, 32, 0x0314, 4, 0, 0,
++ 0, 0x0318, 0, 0x0314),
++};
++
++static const struct of_device_id of_match_clk_mt7988_apmixed[] = {
++ { .compatible = "mediatek,mt7988-apmixedsys" },
++ { /* sentinel */ }
++};
++
++static int clk_mt7988_apmixed_probe(struct platform_device *pdev)
++{
++ struct clk_hw_onecell_data *clk_data;
++ struct device_node *node = pdev->dev.of_node;
++ int r;
++
++ clk_data = mtk_alloc_clk_data(ARRAY_SIZE(plls));
++ if (!clk_data)
++ return -ENOMEM;
++
++ r = mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data);
++ if (r)
++ goto free_apmixed_data;
++
++ r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
++ if (r)
++ goto unregister_plls;
++
++ return r;
++
++unregister_plls:
++ mtk_clk_unregister_plls(plls, ARRAY_SIZE(plls), clk_data);
++free_apmixed_data:
++ mtk_free_clk_data(clk_data);
++ return r;
++}
++
++static struct platform_driver clk_mt7988_apmixed_drv = {
++ .probe = clk_mt7988_apmixed_probe,
++ .driver = {
++ .name = "clk-mt7988-apmixed",
++ .of_match_table = of_match_clk_mt7988_apmixed,
++ },
++};
++builtin_platform_driver(clk_mt7988_apmixed_drv);
++MODULE_LICENSE("GPL");
+--- /dev/null
++++ b/drivers/clk/mediatek/clk-mt7988-eth.c
+@@ -0,0 +1,150 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (c) 2023 MediaTek Inc.
++ * Author: Sam Shih <sam.shih at mediatek.com>
++ * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
++ */
++
++#include <linux/clk-provider.h>
++#include <linux/of.h>
++#include <linux/of_address.h>
++#include <linux/of_device.h>
++#include <linux/platform_device.h>
++#include "clk-mtk.h"
++#include "clk-gate.h"
++#include "reset.h"
++#include <dt-bindings/clock/mediatek,mt7988-clk.h>
++#include <dt-bindings/reset/mediatek,mt7988-resets.h>
++
++static const struct mtk_gate_regs ethdma_cg_regs = {
++ .set_ofs = 0x30,
++ .clr_ofs = 0x30,
++ .sta_ofs = 0x30,
++};
++
++#define GATE_ETHDMA(_id, _name, _parent, _shift) \
++ { \
++ .id = _id, \
++ .name = _name, \
++ .parent_name = _parent, \
++ .regs = ðdma_cg_regs, \
++ .shift = _shift, \
++ .ops = &mtk_clk_gate_ops_no_setclr_inv, \
++ }
++
++static const struct mtk_gate ethdma_clks[] = {
++ GATE_ETHDMA(CLK_ETHDMA_XGP1_EN, "ethdma_xgp1_en", "top_xtal", 0),
++ GATE_ETHDMA(CLK_ETHDMA_XGP2_EN, "ethdma_xgp2_en", "top_xtal", 1),
++ GATE_ETHDMA(CLK_ETHDMA_XGP3_EN, "ethdma_xgp3_en", "top_xtal", 2),
++ GATE_ETHDMA(CLK_ETHDMA_FE_EN, "ethdma_fe_en", "netsys_2x_sel", 6),
++ GATE_ETHDMA(CLK_ETHDMA_GP2_EN, "ethdma_gp2_en", "top_xtal", 7),
++ GATE_ETHDMA(CLK_ETHDMA_GP1_EN, "ethdma_gp1_en", "top_xtal", 8),
++ GATE_ETHDMA(CLK_ETHDMA_GP3_EN, "ethdma_gp3_en", "top_xtal", 10),
++ GATE_ETHDMA(CLK_ETHDMA_ESW_EN, "ethdma_esw_en", "netsys_gsw_sel", 16),
++ GATE_ETHDMA(CLK_ETHDMA_CRYPT0_EN, "ethdma_crypt0_en", "eip197_sel", 29),
++};
++
++static const struct mtk_clk_desc ethdma_desc = {
++ .clks = ethdma_clks,
++ .num_clks = ARRAY_SIZE(ethdma_clks),
++};
++
++static const struct mtk_gate_regs sgmii_cg_regs = {
++ .set_ofs = 0xe4,
++ .clr_ofs = 0xe4,
++ .sta_ofs = 0xe4,
++};
++
++#define GATE_SGMII(_id, _name, _parent, _shift) \
++ { \
++ .id = _id, \
++ .name = _name, \
++ .parent_name = _parent, \
++ .regs = &sgmii_cg_regs, \
++ .shift = _shift, \
++ .ops = &mtk_clk_gate_ops_no_setclr_inv, \
++ }
++
++static const struct mtk_gate sgmii0_clks[] = {
++ GATE_SGMII(CLK_SGM0_TX_EN, "sgm0_tx_en", "top_xtal", 2),
++ GATE_SGMII(CLK_SGM0_RX_EN, "sgm0_rx_en", "top_xtal", 3),
++};
++
++static const struct mtk_clk_desc sgmii0_desc = {
++ .clks = sgmii0_clks,
++ .num_clks = ARRAY_SIZE(sgmii0_clks),
++};
++
++static const struct mtk_gate sgmii1_clks[] = {
++ GATE_SGMII(CLK_SGM1_TX_EN, "sgm1_tx_en", "top_xtal", 2),
++ GATE_SGMII(CLK_SGM1_RX_EN, "sgm1_rx_en", "top_xtal", 3),
++};
++
++static const struct mtk_clk_desc sgmii1_desc = {
++ .clks = sgmii1_clks,
++ .num_clks = ARRAY_SIZE(sgmii1_clks),
++};
++
++static const struct mtk_gate_regs ethwarp_cg_regs = {
++ .set_ofs = 0x14,
++ .clr_ofs = 0x14,
++ .sta_ofs = 0x14,
++};
++
++#define GATE_ETHWARP(_id, _name, _parent, _shift) \
++ { \
++ .id = _id, \
++ .name = _name, \
++ .parent_name = _parent, \
++ .regs = ðwarp_cg_regs, \
++ .shift = _shift, \
++ .ops = &mtk_clk_gate_ops_no_setclr_inv, \
++ }
++
++static const struct mtk_gate ethwarp_clks[] = {
++ GATE_ETHWARP(CLK_ETHWARP_WOCPU2_EN, "ethwarp_wocpu2_en", "netsys_mcu_sel", 13),
++ GATE_ETHWARP(CLK_ETHWARP_WOCPU1_EN, "ethwarp_wocpu1_en", "netsys_mcu_sel", 14),
++ GATE_ETHWARP(CLK_ETHWARP_WOCPU0_EN, "ethwarp_wocpu0_en", "netsys_mcu_sel", 15),
++};
++
++static u16 ethwarp_rst_ofs[] = { 0x8 };
++
++static u16 ethwarp_idx_map[] = {
++ [MT7988_ETHWARP_RST_SWITCH] = 9,
++};
++
++static const struct mtk_clk_rst_desc ethwarp_rst_desc = {
++ .version = MTK_RST_SIMPLE,
++ .rst_bank_ofs = ethwarp_rst_ofs,
++ .rst_bank_nr = ARRAY_SIZE(ethwarp_rst_ofs),
++ .rst_idx_map = ethwarp_idx_map,
++ .rst_idx_map_nr = ARRAY_SIZE(ethwarp_idx_map),
++};
++
++static const struct mtk_clk_desc ethwarp_desc = {
++ .clks = ethwarp_clks,
++ .num_clks = ARRAY_SIZE(ethwarp_clks),
++ .rst_desc = ðwarp_rst_desc,
++};
++
++static const struct of_device_id of_match_clk_mt7988_eth[] = {
++ { .compatible = "mediatek,mt7988-ethsys", .data = ðdma_desc },
++ { .compatible = "mediatek,mt7988-sgmiisys0", .data = &sgmii0_desc },
++ { .compatible = "mediatek,mt7988-sgmiisys1", .data = &sgmii1_desc },
++ { .compatible = "mediatek,mt7988-ethwarp", .data = ðwarp_desc },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, of_match_clk_mt7988_eth);
++
++static struct platform_driver clk_mt7988_eth_drv = {
++ .driver = {
++ .name = "clk-mt7988-eth",
++ .of_match_table = of_match_clk_mt7988_eth,
++ },
++ .probe = mtk_clk_simple_probe,
++ .remove = mtk_clk_simple_remove,
++};
++module_platform_driver(clk_mt7988_eth_drv);
++
++MODULE_DESCRIPTION("MediaTek MT7988 Ethernet clocks driver");
++MODULE_LICENSE("GPL");
+--- /dev/null
++++ b/drivers/clk/mediatek/clk-mt7988-infracfg.c
+@@ -0,0 +1,275 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (c) 2023 MediaTek Inc.
++ * Author: Sam Shih <sam.shih at mediatek.com>
++ * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
++ */
++
++#include <linux/clk-provider.h>
++#include <linux/of.h>
++#include <linux/of_address.h>
++#include <linux/of_device.h>
++#include <linux/platform_device.h>
++#include "clk-mtk.h"
++#include "clk-gate.h"
++#include "clk-mux.h"
++#include <dt-bindings/clock/mediatek,mt7988-clk.h>
++
++static DEFINE_SPINLOCK(mt7988_clk_lock);
++
++static const char *const infra_mux_uart0_parents[] __initconst = { "csw_infra_f26m_sel",
++ "uart_sel" };
++
++static const char *const infra_mux_uart1_parents[] __initconst = { "csw_infra_f26m_sel",
++ "uart_sel" };
++
++static const char *const infra_mux_uart2_parents[] __initconst = { "csw_infra_f26m_sel",
++ "uart_sel" };
++
++static const char *const infra_mux_spi0_parents[] __initconst = { "i2c_sel", "spi_sel" };
++
++static const char *const infra_mux_spi1_parents[] __initconst = { "i2c_sel", "spim_mst_sel" };
++
++static const char *const infra_pwm_bck_parents[] __initconst = { "top_rtc_32p7k",
++ "csw_infra_f26m_sel", "sysaxi_sel",
++ "pwm_sel" };
++
++static const char *const infra_pcie_gfmux_tl_ck_o_p0_parents[] __initconst = {
++ "top_rtc_32p7k", "csw_infra_f26m_sel", "csw_infra_f26m_sel", "pextp_tl_sel"
++};
++
++static const char *const infra_pcie_gfmux_tl_ck_o_p1_parents[] __initconst = {
++ "top_rtc_32p7k", "csw_infra_f26m_sel", "csw_infra_f26m_sel", "pextp_tl_p1_sel"
++};
++
++static const char *const infra_pcie_gfmux_tl_ck_o_p2_parents[] __initconst = {
++ "top_rtc_32p7k", "csw_infra_f26m_sel", "csw_infra_f26m_sel", "pextp_tl_p2_sel"
++};
++
++static const char *const infra_pcie_gfmux_tl_ck_o_p3_parents[] __initconst = {
++ "top_rtc_32p7k", "csw_infra_f26m_sel", "csw_infra_f26m_sel", "pextp_tl_p3_sel"
++};
++
++static const struct mtk_mux infra_muxes[] = {
++ /* MODULE_CLK_SEL_0 */
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_UART0_SEL, "infra_mux_uart0_sel",
++ infra_mux_uart0_parents, 0x0018, 0x0010, 0x0014, 0, 1, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_UART1_SEL, "infra_mux_uart1_sel",
++ infra_mux_uart1_parents, 0x0018, 0x0010, 0x0014, 1, 1, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_UART2_SEL, "infra_mux_uart2_sel",
++ infra_mux_uart2_parents, 0x0018, 0x0010, 0x0014, 2, 1, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_SPI0_SEL, "infra_mux_spi0_sel", infra_mux_spi0_parents,
++ 0x0018, 0x0010, 0x0014, 4, 1, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_SPI1_SEL, "infra_mux_spi1_sel", infra_mux_spi1_parents,
++ 0x0018, 0x0010, 0x0014, 5, 1, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_MUX_SPI2_SEL, "infra_mux_spi2_sel", infra_mux_spi0_parents,
++ 0x0018, 0x0010, 0x0014, 6, 1, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_SEL, "infra_pwm_sel", infra_pwm_bck_parents, 0x0018,
++ 0x0010, 0x0014, 14, 2, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK1_SEL, "infra_pwm_ck1_sel", infra_pwm_bck_parents,
++ 0x0018, 0x0010, 0x0014, 16, 2, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK2_SEL, "infra_pwm_ck2_sel", infra_pwm_bck_parents,
++ 0x0018, 0x0010, 0x0014, 18, 2, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK3_SEL, "infra_pwm_ck3_sel", infra_pwm_bck_parents,
++ 0x0018, 0x0010, 0x0014, 20, 2, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK4_SEL, "infra_pwm_ck4_sel", infra_pwm_bck_parents,
++ 0x0018, 0x0010, 0x0014, 22, 2, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK5_SEL, "infra_pwm_ck5_sel", infra_pwm_bck_parents,
++ 0x0018, 0x0010, 0x0014, 24, 2, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK6_SEL, "infra_pwm_ck6_sel", infra_pwm_bck_parents,
++ 0x0018, 0x0010, 0x0014, 26, 2, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK7_SEL, "infra_pwm_ck7_sel", infra_pwm_bck_parents,
++ 0x0018, 0x0010, 0x0014, 28, 2, -1, -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PWM_CK8_SEL, "infra_pwm_ck8_sel", infra_pwm_bck_parents,
++ 0x0018, 0x0010, 0x0014, 30, 2, -1, -1, -1),
++ /* MODULE_CLK_SEL_1 */
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PCIE_GFMUX_TL_O_P0_SEL, "infra_pcie_gfmux_tl_o_p0_sel",
++ infra_pcie_gfmux_tl_ck_o_p0_parents, 0x0028, 0x0020, 0x0024, 0, 2, -1,
++ -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PCIE_GFMUX_TL_O_P1_SEL, "infra_pcie_gfmux_tl_o_p1_sel",
++ infra_pcie_gfmux_tl_ck_o_p1_parents, 0x0028, 0x0020, 0x0024, 2, 2, -1,
++ -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PCIE_GFMUX_TL_O_P2_SEL, "infra_pcie_gfmux_tl_o_p2_sel",
++ infra_pcie_gfmux_tl_ck_o_p2_parents, 0x0028, 0x0020, 0x0024, 4, 2, -1,
++ -1, -1),
++ MUX_GATE_CLR_SET_UPD(CLK_INFRA_PCIE_GFMUX_TL_O_P3_SEL, "infra_pcie_gfmux_tl_o_p3_sel",
++ infra_pcie_gfmux_tl_ck_o_p3_parents, 0x0028, 0x0020, 0x0024, 6, 2, -1,
++ -1, -1),
++};
++
++static const struct mtk_gate_regs infra0_cg_regs = {
++ .set_ofs = 0x10,
++ .clr_ofs = 0x14,
++ .sta_ofs = 0x18,
++};
++
++static const struct mtk_gate_regs infra1_cg_regs = {
++ .set_ofs = 0x40,
++ .clr_ofs = 0x44,
++ .sta_ofs = 0x48,
++};
++
++static const struct mtk_gate_regs infra2_cg_regs = {
++ .set_ofs = 0x50,
++ .clr_ofs = 0x54,
++ .sta_ofs = 0x58,
++};
++
++static const struct mtk_gate_regs infra3_cg_regs = {
++ .set_ofs = 0x60,
++ .clr_ofs = 0x64,
++ .sta_ofs = 0x68,
++};
++
++#define GATE_INFRA0_FLAGS(_id, _name, _parent, _shift, _flags) \
++ GATE_MTK_FLAGS(_id, _name, _parent, &infra0_cg_regs, _shift, &mtk_clk_gate_ops_setclr, \
++ _flags)
++
++#define GATE_INFRA1_FLAGS(_id, _name, _parent, _shift, _flags) \
++ GATE_MTK_FLAGS(_id, _name, _parent, &infra1_cg_regs, _shift, &mtk_clk_gate_ops_setclr, \
++ _flags)
++
++#define GATE_INFRA2_FLAGS(_id, _name, _parent, _shift, _flags) \
++ GATE_MTK_FLAGS(_id, _name, _parent, &infra2_cg_regs, _shift, &mtk_clk_gate_ops_setclr, \
++ _flags)
++
++#define GATE_INFRA3_FLAGS(_id, _name, _parent, _shift, _flags) \
++ GATE_MTK_FLAGS(_id, _name, _parent, &infra3_cg_regs, _shift, &mtk_clk_gate_ops_setclr, \
++ _flags)
++
++#define GATE_INFRA0(_id, _name, _parent, _shift) GATE_INFRA0_FLAGS(_id, _name, _parent, _shift, 0)
++
++#define GATE_INFRA1(_id, _name, _parent, _shift) GATE_INFRA1_FLAGS(_id, _name, _parent, _shift, 0)
++
++#define GATE_INFRA2(_id, _name, _parent, _shift) GATE_INFRA2_FLAGS(_id, _name, _parent, _shift, 0)
++
++#define GATE_INFRA3(_id, _name, _parent, _shift) GATE_INFRA3_FLAGS(_id, _name, _parent, _shift, 0)
++
++static const struct mtk_gate infra_clks[] = {
++ /* INFRA0 */
++ GATE_INFRA0(CLK_INFRA_PCIE_PERI_26M_CK_P0, "infra_pcie_peri_ck_26m_ck_p0",
++ "csw_infra_f26m_sel", 7),
++ GATE_INFRA0(CLK_INFRA_PCIE_PERI_26M_CK_P1, "infra_pcie_peri_ck_26m_ck_p1",
++ "csw_infra_f26m_sel", 8),
++ GATE_INFRA0(CLK_INFRA_PCIE_PERI_26M_CK_P2, "infra_pcie_peri_ck_26m_ck_p2",
++ "csw_infra_f26m_sel", 9),
++ GATE_INFRA0(CLK_INFRA_PCIE_PERI_26M_CK_P3, "infra_pcie_peri_ck_26m_ck_p3",
++ "csw_infra_f26m_sel", 10),
++ /* INFRA1 */
++ GATE_INFRA1(CLK_INFRA_66M_GPT_BCK, "infra_hf_66m_gpt_bck", "sysaxi_sel", 0),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_HCK, "infra_hf_66m_pwm_hck", "sysaxi_sel", 1),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_BCK, "infra_hf_66m_pwm_bck", "infra_pwm_sel", 2),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_CK1, "infra_hf_66m_pwm_ck1", "infra_pwm_ck1_sel", 3),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_CK2, "infra_hf_66m_pwm_ck2", "infra_pwm_ck2_sel", 4),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_CK3, "infra_hf_66m_pwm_ck3", "infra_pwm_ck3_sel", 5),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_CK4, "infra_hf_66m_pwm_ck4", "infra_pwm_ck4_sel", 6),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_CK5, "infra_hf_66m_pwm_ck5", "infra_pwm_ck5_sel", 7),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_CK6, "infra_hf_66m_pwm_ck6", "infra_pwm_ck6_sel", 8),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_CK7, "infra_hf_66m_pwm_ck7", "infra_pwm_ck7_sel", 9),
++ GATE_INFRA1(CLK_INFRA_66M_PWM_CK8, "infra_hf_66m_pwm_ck8", "infra_pwm_ck8_sel", 10),
++ GATE_INFRA1(CLK_INFRA_133M_CQDMA_BCK, "infra_hf_133m_cqdma_bck", "sysaxi_sel", 12),
++ GATE_INFRA1(CLK_INFRA_66M_AUD_SLV_BCK, "infra_66m_aud_slv_bck", "sysaxi_sel", 13),
++ GATE_INFRA1(CLK_INFRA_AUD_26M, "infra_f_faud_26m", "csw_infra_f26m_sel", 14),
++ GATE_INFRA1(CLK_INFRA_AUD_L, "infra_f_faud_l", "aud_l_sel", 15),
++ GATE_INFRA1(CLK_INFRA_AUD_AUD, "infra_f_aud_aud", "a1sys_sel", 16),
++ GATE_INFRA1(CLK_INFRA_AUD_EG2, "infra_f_faud_eg2", "a_tuner_sel", 18),
++ GATE_INFRA1_FLAGS(CLK_INFRA_DRAMC_F26M, "infra_dramc_f26m", "csw_infra_f26m_sel", 19,
++ CLK_IS_CRITICAL),
++ /* JTAG */
++ GATE_INFRA1_FLAGS(CLK_INFRA_133M_DBG_ACKM, "infra_hf_133m_dbg_ackm", "sysaxi_sel", 20,
++ CLK_IS_CRITICAL),
++ GATE_INFRA1(CLK_INFRA_66M_AP_DMA_BCK, "infra_66m_ap_dma_bck", "sysaxi_sel", 21),
++ GATE_INFRA1(CLK_INFRA_66M_SEJ_BCK, "infra_hf_66m_sej_bck", "sysaxi_sel", 29),
++ GATE_INFRA1(CLK_INFRA_PRE_CK_SEJ_F13M, "infra_pre_ck_sej_f13m", "csw_infra_f26m_sel", 30),
++ /* INFRA2 */
++ GATE_INFRA2(CLK_INFRA_26M_THERM_SYSTEM, "infra_hf_26m_therm_system", "csw_infra_f26m_sel",
++ 0),
++ GATE_INFRA2(CLK_INFRA_I2C_BCK, "infra_i2c_bck", "i2c_sel", 1),
++ GATE_INFRA2(CLK_INFRA_52M_UART0_CK, "infra_f_52m_uart0", "infra_mux_uart0_sel", 3),
++ GATE_INFRA2(CLK_INFRA_52M_UART1_CK, "infra_f_52m_uart1", "infra_mux_uart1_sel", 4),
++ GATE_INFRA2(CLK_INFRA_52M_UART2_CK, "infra_f_52m_uart2", "infra_mux_uart2_sel", 5),
++ GATE_INFRA2(CLK_INFRA_NFI, "infra_f_fnfi", "nfi1x_sel", 9),
++ GATE_INFRA2(CLK_INFRA_SPINFI, "infra_f_fspinfi", "spinfi_sel", 10),
++ GATE_INFRA2_FLAGS(CLK_INFRA_66M_NFI_HCK, "infra_hf_66m_nfi_hck", "sysaxi_sel", 11,
++ CLK_IS_CRITICAL),
++ GATE_INFRA2_FLAGS(CLK_INFRA_104M_SPI0, "infra_hf_104m_spi0", "infra_mux_spi0_sel", 12,
++ CLK_IS_CRITICAL),
++ GATE_INFRA2(CLK_INFRA_104M_SPI1, "infra_hf_104m_spi1", "infra_mux_spi1_sel", 13),
++ GATE_INFRA2(CLK_INFRA_104M_SPI2_BCK, "infra_hf_104m_spi2_bck", "infra_mux_spi2_sel", 14),
++ GATE_INFRA2_FLAGS(CLK_INFRA_66M_SPI0_HCK, "infra_hf_66m_spi0_hck", "sysaxi_sel", 15,
++ CLK_IS_CRITICAL),
++ GATE_INFRA2(CLK_INFRA_66M_SPI1_HCK, "infra_hf_66m_spi1_hck", "sysaxi_sel", 16),
++ GATE_INFRA2(CLK_INFRA_66M_SPI2_HCK, "infra_hf_66m_spi2_hck", "sysaxi_sel", 17),
++ GATE_INFRA2(CLK_INFRA_66M_FLASHIF_AXI, "infra_hf_66m_flashif_axi", "sysaxi_sel", 18),
++ GATE_INFRA2_FLAGS(CLK_INFRA_RTC, "infra_f_frtc", "top_rtc_32k", 19, CLK_IS_CRITICAL),
++ GATE_INFRA2(CLK_INFRA_26M_ADC_BCK, "infra_f_26m_adc_bck", "csw_infra_f26m_sel", 20),
++ GATE_INFRA2(CLK_INFRA_RC_ADC, "infra_f_frc_adc", "infra_f_26m_adc_bck", 21),
++ GATE_INFRA2(CLK_INFRA_MSDC400, "infra_f_fmsdc400", "emmc_400m_sel", 22),
++ GATE_INFRA2(CLK_INFRA_MSDC2_HCK, "infra_f_fmsdc2_hck", "emmc_250m_sel", 23),
++ GATE_INFRA2(CLK_INFRA_133M_MSDC_0_HCK, "infra_hf_133m_msdc_0_hck", "sysaxi_sel", 24),
++ GATE_INFRA2(CLK_INFRA_66M_MSDC_0_HCK, "infra_66m_msdc_0_hck", "sysaxi_sel", 25),
++ GATE_INFRA2(CLK_INFRA_133M_CPUM_BCK, "infra_hf_133m_cpum_bck", "sysaxi_sel", 26),
++ GATE_INFRA2(CLK_INFRA_BIST2FPC, "infra_hf_fbist2fpc", "nfi1x_sel", 27),
++ GATE_INFRA2(CLK_INFRA_I2C_X16W_MCK_CK_P1, "infra_hf_i2c_x16w_mck_ck_p1", "sysaxi_sel", 29),
++ GATE_INFRA2(CLK_INFRA_I2C_X16W_PCK_CK_P1, "infra_hf_i2c_x16w_pck_ck_p1", "sysaxi_sel", 31),
++ /* INFRA3 */
++ GATE_INFRA3(CLK_INFRA_133M_USB_HCK, "infra_133m_usb_hck", "sysaxi_sel", 0),
++ GATE_INFRA3(CLK_INFRA_133M_USB_HCK_CK_P1, "infra_133m_usb_hck_ck_p1", "sysaxi_sel", 1),
++ GATE_INFRA3(CLK_INFRA_66M_USB_HCK, "infra_66m_usb_hck", "sysaxi_sel", 2),
++ GATE_INFRA3(CLK_INFRA_66M_USB_HCK_CK_P1, "infra_66m_usb_hck_ck_p1", "sysaxi_sel", 3),
++ GATE_INFRA3(CLK_INFRA_USB_SYS, "infra_usb_sys", "usb_sys_sel", 4),
++ GATE_INFRA3(CLK_INFRA_USB_SYS_CK_P1, "infra_usb_sys_ck_p1", "usb_sys_p1_sel", 5),
++ GATE_INFRA3(CLK_INFRA_USB_REF, "infra_usb_ref", "top_xtal", 6),
++ GATE_INFRA3(CLK_INFRA_USB_CK_P1, "infra_usb_ck_p1", "top_xtal", 7),
++ GATE_INFRA3_FLAGS(CLK_INFRA_USB_FRMCNT, "infra_usb_frmcnt", "usb_frmcnt_sel", 8,
++ CLK_IS_CRITICAL),
++ GATE_INFRA3_FLAGS(CLK_INFRA_USB_FRMCNT_CK_P1, "infra_usb_frmcnt_ck_p1", "usb_frmcnt_p1_sel",
++ 9, CLK_IS_CRITICAL),
++ GATE_INFRA3(CLK_INFRA_USB_PIPE, "infra_usb_pipe", "sspxtp_sel", 10),
++ GATE_INFRA3(CLK_INFRA_USB_PIPE_CK_P1, "infra_usb_pipe_ck_p1", "usb_phy_sel", 11),
++ GATE_INFRA3(CLK_INFRA_USB_UTMI, "infra_usb_utmi", "top_xtal", 12),
++ GATE_INFRA3(CLK_INFRA_USB_UTMI_CK_P1, "infra_usb_utmi_ck_p1", "top_xtal", 13),
++ GATE_INFRA3(CLK_INFRA_USB_XHCI, "infra_usb_xhci", "usb_xhci_sel", 14),
++ GATE_INFRA3(CLK_INFRA_USB_XHCI_CK_P1, "infra_usb_xhci_ck_p1", "usb_xhci_p1_sel", 15),
++ GATE_INFRA3(CLK_INFRA_PCIE_GFMUX_TL_P0, "infra_pcie_gfmux_tl_ck_p0",
++ "infra_pcie_gfmux_tl_o_p0_sel", 20),
++ GATE_INFRA3(CLK_INFRA_PCIE_GFMUX_TL_P1, "infra_pcie_gfmux_tl_ck_p1",
++ "infra_pcie_gfmux_tl_o_p1_sel", 21),
++ GATE_INFRA3(CLK_INFRA_PCIE_GFMUX_TL_P2, "infra_pcie_gfmux_tl_ck_p2",
++ "infra_pcie_gfmux_tl_o_p2_sel", 22),
++ GATE_INFRA3(CLK_INFRA_PCIE_GFMUX_TL_P3, "infra_pcie_gfmux_tl_ck_p3",
++ "infra_pcie_gfmux_tl_o_p3_sel", 23),
++ GATE_INFRA3(CLK_INFRA_PCIE_PIPE_P0, "infra_pcie_pipe_ck_p0", "top_xtal", 24),
++ GATE_INFRA3(CLK_INFRA_PCIE_PIPE_P1, "infra_pcie_pipe_ck_p1", "top_xtal", 25),
++ GATE_INFRA3(CLK_INFRA_PCIE_PIPE_P2, "infra_pcie_pipe_ck_p2", "top_xtal", 26),
++ GATE_INFRA3(CLK_INFRA_PCIE_PIPE_P3, "infra_pcie_pipe_ck_p3", "top_xtal", 27),
++ GATE_INFRA3(CLK_INFRA_133M_PCIE_CK_P0, "infra_133m_pcie_ck_p0", "sysaxi_sel", 28),
++ GATE_INFRA3(CLK_INFRA_133M_PCIE_CK_P1, "infra_133m_pcie_ck_p1", "sysaxi_sel", 29),
++ GATE_INFRA3(CLK_INFRA_133M_PCIE_CK_P2, "infra_133m_pcie_ck_p2", "sysaxi_sel", 30),
++ GATE_INFRA3(CLK_INFRA_133M_PCIE_CK_P3, "infra_133m_pcie_ck_p3", "sysaxi_sel", 31),
++};
++
++static const struct mtk_clk_desc infra_desc = {
++ .clks = infra_clks,
++ .num_clks = ARRAY_SIZE(infra_clks),
++ .mux_clks = infra_muxes,
++ .num_mux_clks = ARRAY_SIZE(infra_muxes),
++ .clk_lock = &mt7988_clk_lock,
++};
++
++static const struct of_device_id of_match_clk_mt7988_infracfg[] = {
++ { .compatible = "mediatek,mt7988-infracfg", .data = &infra_desc },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, of_match_clk_mt7988_infracfg);
++
++static struct platform_driver clk_mt7988_infracfg_drv = {
++ .driver = {
++ .name = "clk-mt7988-infracfg",
++ .of_match_table = of_match_clk_mt7988_infracfg,
++ },
++ .probe = mtk_clk_simple_probe,
++ .remove = mtk_clk_simple_remove,
++};
++module_platform_driver(clk_mt7988_infracfg_drv);
++MODULE_LICENSE("GPL");
+--- /dev/null
++++ b/drivers/clk/mediatek/clk-mt7988-topckgen.c
+@@ -0,0 +1,325 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (c) 2023 MediaTek Inc.
++ * Author: Sam Shih <sam.shih at mediatek.com>
++ * Author: Xiufeng Li <Xiufeng.Li at mediatek.com>
++ */
++
++#include <linux/clk-provider.h>
++#include <linux/of.h>
++#include <linux/of_address.h>
++#include <linux/of_device.h>
++#include <linux/platform_device.h>
++#include "clk-mtk.h"
++#include "clk-gate.h"
++#include "clk-mux.h"
++#include <dt-bindings/clock/mediatek,mt7988-clk.h>
++
++static DEFINE_SPINLOCK(mt7988_clk_lock);
++
++static const struct mtk_fixed_clk top_fixed_clks[] = {
++ FIXED_CLK(CLK_TOP_XTAL, "top_xtal", "clkxtal", 40000000),
++};
++
++static const struct mtk_fixed_factor top_divs[] = {
++ FACTOR(CLK_TOP_XTAL_D2, "top_xtal_d2", "top_xtal", 1, 2),
++ FACTOR(CLK_TOP_RTC_32K, "top_rtc_32k", "top_xtal", 1, 1250),
++ FACTOR(CLK_TOP_RTC_32P7K, "top_rtc_32p7k", "top_xtal", 1, 1220),
++ FACTOR(CLK_TOP_MPLL_D2, "mpll_d2", "mpll", 1, 2),
++ FACTOR(CLK_TOP_MPLL_D3_D2, "mpll_d3_d2", "mpll", 1, 2),
++ FACTOR(CLK_TOP_MPLL_D4, "mpll_d4", "mpll", 1, 4),
++ FACTOR(CLK_TOP_MPLL_D8, "mpll_d8", "mpll", 1, 8),
++ FACTOR(CLK_TOP_MPLL_D8_D2, "mpll_d8_d2", "mpll", 1, 16),
++ FACTOR(CLK_TOP_MMPLL_D2, "mmpll_d2", "mmpll", 1, 2),
++ FACTOR(CLK_TOP_MMPLL_D3_D5, "mmpll_d3_d5", "mmpll", 1, 15),
++ FACTOR(CLK_TOP_MMPLL_D4, "mmpll_d4", "mmpll", 1, 4),
++ FACTOR(CLK_TOP_MMPLL_D6_D2, "mmpll_d6_d2", "mmpll", 1, 12),
++ FACTOR(CLK_TOP_MMPLL_D8, "mmpll_d8", "mmpll", 1, 8),
++ FACTOR(CLK_TOP_APLL2_D4, "apll2_d4", "apll2", 1, 4),
++ FACTOR(CLK_TOP_NET1PLL_D4, "net1pll_d4", "net1pll", 1, 4),
++ FACTOR(CLK_TOP_NET1PLL_D5, "net1pll_d5", "net1pll", 1, 5),
++ FACTOR(CLK_TOP_NET1PLL_D5_D2, "net1pll_d5_d2", "net1pll", 1, 10),
++ FACTOR(CLK_TOP_NET1PLL_D5_D4, "net1pll_d5_d4", "net1pll", 1, 20),
++ FACTOR(CLK_TOP_NET1PLL_D8, "net1pll_d8", "net1pll", 1, 8),
++ FACTOR(CLK_TOP_NET1PLL_D8_D2, "net1pll_d8_d2", "net1pll", 1, 16),
++ FACTOR(CLK_TOP_NET1PLL_D8_D4, "net1pll_d8_d4", "net1pll", 1, 32),
++ FACTOR(CLK_TOP_NET1PLL_D8_D8, "net1pll_d8_d8", "net1pll", 1, 64),
++ FACTOR(CLK_TOP_NET1PLL_D8_D16, "net1pll_d8_d16", "net1pll", 1, 128),
++ FACTOR(CLK_TOP_NET2PLL_D2, "net2pll_d2", "net2pll", 1, 2),
++ FACTOR(CLK_TOP_NET2PLL_D4, "net2pll_d4", "net2pll", 1, 4),
++ FACTOR(CLK_TOP_NET2PLL_D4_D4, "net2pll_d4_d4", "net2pll", 1, 16),
++ FACTOR(CLK_TOP_NET2PLL_D4_D8, "net2pll_d4_d8", "net2pll", 1, 32),
++ FACTOR(CLK_TOP_NET2PLL_D6, "net2pll_d6", "net2pll", 1, 6),
++ FACTOR(CLK_TOP_NET2PLL_D8, "net2pll_d8", "net2pll", 1, 8),
++};
++
++static const char *const netsys_parents[] = { "top_xtal", "net2pll_d2", "mmpll_d2" };
++static const char *const netsys_500m_parents[] = { "top_xtal", "net1pll_d5", "net1pll_d5_d2" };
++static const char *const netsys_2x_parents[] = { "top_xtal", "net2pll", "mmpll" };
++static const char *const netsys_gsw_parents[] = { "top_xtal", "net1pll_d4", "net1pll_d5" };
++static const char *const eth_gmii_parents[] = { "top_xtal", "net1pll_d5_d4" };
++static const char *const netsys_mcu_parents[] = { "top_xtal", "net2pll", "mmpll",
++ "net1pll_d4", "net1pll_d5", "mpll" };
++static const char *const eip197_parents[] = { "top_xtal", "netsyspll", "net2pll",
++ "mmpll", "net1pll_d4", "net1pll_d5" };
++static const char *const axi_infra_parents[] = { "top_xtal", "net1pll_d8_d2" };
++static const char *const uart_parents[] = { "top_xtal", "mpll_d8", "mpll_d8_d2" };
++static const char *const emmc_250m_parents[] = { "top_xtal", "net1pll_d5_d2", "mmpll_d4" };
++static const char *const emmc_400m_parents[] = { "top_xtal", "msdcpll", "mmpll_d2",
++ "mpll_d2", "mmpll_d4", "net1pll_d8_d2" };
++static const char *const spi_parents[] = { "top_xtal", "mpll_d2", "mmpll_d4",
++ "net1pll_d8_d2", "net2pll_d6", "net1pll_d5_d4",
++ "mpll_d4", "net1pll_d8_d4" };
++static const char *const nfi1x_parents[] = { "top_xtal", "mmpll_d4", "net1pll_d8_d2", "net2pll_d6",
++ "mpll_d4", "mmpll_d8", "net1pll_d8_d4", "mpll_d8" };
++static const char *const spinfi_parents[] = { "top_xtal_d2", "top_xtal", "net1pll_d5_d4",
++ "mpll_d4", "mmpll_d8", "net1pll_d8_d4",
++ "mmpll_d6_d2", "mpll_d8" };
++static const char *const pwm_parents[] = { "top_xtal", "net1pll_d8_d2", "net1pll_d5_d4",
++ "mpll_d4", "mpll_d8_d2", "top_rtc_32k" };
++static const char *const i2c_parents[] = { "top_xtal", "net1pll_d5_d4", "mpll_d4",
++ "net1pll_d8_d4" };
++static const char *const pcie_mbist_250m_parents[] = { "top_xtal", "net1pll_d5_d2" };
++static const char *const pextp_tl_ck_parents[] = { "top_xtal", "net2pll_d6", "mmpll_d8",
++ "mpll_d8_d2", "top_rtc_32k" };
++static const char *const usb_frmcnt_parents[] = { "top_xtal", "mmpll_d3_d5" };
++static const char *const aud_parents[] = { "top_xtal", "apll2" };
++static const char *const a1sys_parents[] = { "top_xtal", "apll2_d4" };
++static const char *const aud_l_parents[] = { "top_xtal", "apll2", "mpll_d8_d2" };
++static const char *const sspxtp_parents[] = { "top_xtal_d2", "mpll_d8_d2" };
++static const char *const usxgmii_sbus_0_parents[] = { "top_xtal", "net1pll_d8_d4" };
++static const char *const sgm_0_parents[] = { "top_xtal", "sgmpll" };
++static const char *const sysapb_parents[] = { "top_xtal", "mpll_d3_d2" };
++static const char *const eth_refck_50m_parents[] = { "top_xtal", "net2pll_d4_d4" };
++static const char *const eth_sys_200m_parents[] = { "top_xtal", "net2pll_d4" };
++static const char *const eth_xgmii_parents[] = { "top_xtal_d2", "net1pll_d8_d8", "net1pll_d8_d16" };
++static const char *const bus_tops_parents[] = { "top_xtal", "net1pll_d5", "net2pll_d2" };
++static const char *const npu_tops_parents[] = { "top_xtal", "net2pll" };
++static const char *const dramc_md32_parents[] = { "top_xtal", "mpll_d2", "wedmcupll" };
++static const char *const da_xtp_glb_p0_parents[] = { "top_xtal", "net2pll_d8" };
++static const char *const mcusys_backup_625m_parents[] = { "top_xtal", "net1pll_d4" };
++static const char *const macsec_parents[] = { "top_xtal", "sgmpll", "net1pll_d8" };
++static const char *const netsys_tops_400m_parents[] = { "top_xtal", "net2pll_d2" };
++static const char *const eth_mii_parents[] = { "top_xtal_d2", "net2pll_d4_d8" };
++
++static const struct mtk_mux top_muxes[] = {
++ /* CLK_CFG_0 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_SEL, "netsys_sel", netsys_parents, 0x000, 0x004, 0x008,
++ 0, 2, 7, 0x1c0, 0),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_500M_SEL, "netsys_500m_sel", netsys_500m_parents, 0x000,
++ 0x004, 0x008, 8, 2, 15, 0x1C0, 1),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_2X_SEL, "netsys_2x_sel", netsys_2x_parents, 0x000,
++ 0x004, 0x008, 16, 2, 23, 0x1C0, 2),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_GSW_SEL, "netsys_gsw_sel", netsys_gsw_parents, 0x000,
++ 0x004, 0x008, 24, 2, 31, 0x1C0, 3),
++ /* CLK_CFG_1 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_GMII_SEL, "eth_gmii_sel", eth_gmii_parents, 0x010, 0x014,
++ 0x018, 0, 1, 7, 0x1C0, 4),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_MCU_SEL, "netsys_mcu_sel", netsys_mcu_parents, 0x010,
++ 0x014, 0x018, 8, 3, 15, 0x1C0, 5),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_PAO_2X_SEL, "netsys_pao_2x_sel", netsys_mcu_parents,
++ 0x010, 0x014, 0x018, 16, 3, 23, 0x1C0, 6),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_EIP197_SEL, "eip197_sel", eip197_parents, 0x010, 0x014, 0x018,
++ 24, 3, 31, 0x1c0, 7),
++ /* CLK_CFG_2 */
++ MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_AXI_INFRA_SEL, "axi_infra_sel", axi_infra_parents, 0x020,
++ 0x024, 0x028, 0, 1, 7, 0x1C0, 8, CLK_IS_CRITICAL),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_UART_SEL, "uart_sel", uart_parents, 0x020, 0x024, 0x028, 8, 2,
++ 15, 0x1c0, 9),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_EMMC_250M_SEL, "emmc_250m_sel", emmc_250m_parents, 0x020,
++ 0x024, 0x028, 16, 2, 23, 0x1C0, 10),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_EMMC_400M_SEL, "emmc_400m_sel", emmc_400m_parents, 0x020,
++ 0x024, 0x028, 24, 3, 31, 0x1C0, 11),
++ /* CLK_CFG_3 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_SPI_SEL, "spi_sel", spi_parents, 0x030, 0x034, 0x038, 0, 3, 7,
++ 0x1c0, 12),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_SPIM_MST_SEL, "spim_mst_sel", spi_parents, 0x030, 0x034, 0x038,
++ 8, 3, 15, 0x1c0, 13),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NFI1X_SEL, "nfi1x_sel", nfi1x_parents, 0x030, 0x034, 0x038, 16,
++ 3, 23, 0x1c0, 14),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_SPINFI_SEL, "spinfi_sel", spinfi_parents, 0x030, 0x034, 0x038,
++ 24, 3, 31, 0x1c0, 15),
++ /* CLK_CFG_4 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PWM_SEL, "pwm_sel", pwm_parents, 0x040, 0x044, 0x048, 0, 3, 7,
++ 0x1c0, 16),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_I2C_SEL, "i2c_sel", i2c_parents, 0x040, 0x044, 0x048, 8, 2, 15,
++ 0x1c0, 17),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PCIE_MBIST_250M_SEL, "pcie_mbist_250m_sel",
++ pcie_mbist_250m_parents, 0x040, 0x044, 0x048, 16, 1, 23, 0x1C0, 18),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_TL_SEL, "pextp_tl_sel", pextp_tl_ck_parents, 0x040,
++ 0x044, 0x048, 24, 3, 31, 0x1C0, 19),
++ /* CLK_CFG_5 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_TL_P1_SEL, "pextp_tl_p1_sel", pextp_tl_ck_parents, 0x050,
++ 0x054, 0x058, 0, 3, 7, 0x1C0, 20),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_TL_P2_SEL, "pextp_tl_p2_sel", pextp_tl_ck_parents, 0x050,
++ 0x054, 0x058, 8, 3, 15, 0x1C0, 21),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_TL_P3_SEL, "pextp_tl_p3_sel", pextp_tl_ck_parents, 0x050,
++ 0x054, 0x058, 16, 3, 23, 0x1C0, 22),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_SYS_SEL, "usb_sys_sel", eth_gmii_parents, 0x050, 0x054,
++ 0x058, 24, 1, 31, 0x1C0, 23),
++ /* CLK_CFG_6 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_SYS_P1_SEL, "usb_sys_p1_sel", eth_gmii_parents, 0x060,
++ 0x064, 0x068, 0, 1, 7, 0x1C0, 24),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_XHCI_SEL, "usb_xhci_sel", eth_gmii_parents, 0x060, 0x064,
++ 0x068, 8, 1, 15, 0x1C0, 25),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_XHCI_P1_SEL, "usb_xhci_p1_sel", eth_gmii_parents, 0x060,
++ 0x064, 0x068, 16, 1, 23, 0x1C0, 26),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_FRMCNT_SEL, "usb_frmcnt_sel", usb_frmcnt_parents, 0x060,
++ 0x064, 0x068, 24, 1, 31, 0x1C0, 27),
++ /* CLK_CFG_7 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_FRMCNT_P1_SEL, "usb_frmcnt_p1_sel", usb_frmcnt_parents,
++ 0x070, 0x074, 0x078, 0, 1, 7, 0x1C0, 28),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_AUD_SEL, "aud_sel", aud_parents, 0x070, 0x074, 0x078, 8, 1, 15,
++ 0x1c0, 29),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_A1SYS_SEL, "a1sys_sel", a1sys_parents, 0x070, 0x074, 0x078, 16,
++ 1, 23, 0x1c0, 30),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_AUD_L_SEL, "aud_l_sel", aud_l_parents, 0x070, 0x074, 0x078, 24,
++ 2, 31, 0x1c4, 0),
++ /* CLK_CFG_8 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_A_TUNER_SEL, "a_tuner_sel", a1sys_parents, 0x080, 0x084, 0x088,
++ 0, 1, 7, 0x1c4, 1),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_SSPXTP_SEL, "sspxtp_sel", sspxtp_parents, 0x080, 0x084, 0x088,
++ 8, 1, 15, 0x1c4, 2),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_USB_PHY_SEL, "usb_phy_sel", sspxtp_parents, 0x080, 0x084,
++ 0x088, 16, 1, 23, 0x1c4, 3),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_USXGMII_SBUS_0_SEL, "usxgmii_sbus_0_sel",
++ usxgmii_sbus_0_parents, 0x080, 0x084, 0x088, 24, 1, 31, 0x1C4, 4),
++ /* CLK_CFG_9 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_USXGMII_SBUS_1_SEL, "usxgmii_sbus_1_sel",
++ usxgmii_sbus_0_parents, 0x090, 0x094, 0x098, 0, 1, 7, 0x1C4, 5),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_SGM_0_SEL, "sgm_0_sel", sgm_0_parents, 0x090, 0x094, 0x098, 8,
++ 1, 15, 0x1c4, 6),
++ MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_SGM_SBUS_0_SEL, "sgm_sbus_0_sel", usxgmii_sbus_0_parents,
++ 0x090, 0x094, 0x098, 16, 1, 23, 0x1C4, 7, CLK_IS_CRITICAL),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_SGM_1_SEL, "sgm_1_sel", sgm_0_parents, 0x090, 0x094, 0x098, 24,
++ 1, 31, 0x1c4, 8),
++ /* CLK_CFG_10 */
++ MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_SGM_SBUS_1_SEL, "sgm_sbus_1_sel", usxgmii_sbus_0_parents,
++ 0x0a0, 0x0a4, 0x0a8, 0, 1, 7, 0x1C4, 9, CLK_IS_CRITICAL),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_XFI_PHY_0_XTAL_SEL, "xfi_phy_0_xtal_sel", sspxtp_parents,
++ 0x0a0, 0x0a4, 0x0a8, 8, 1, 15, 0x1C4, 10),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_XFI_PHY_1_XTAL_SEL, "xfi_phy_1_xtal_sel", sspxtp_parents,
++ 0x0a0, 0x0a4, 0x0a8, 16, 1, 23, 0x1C4, 11),
++ /* CLK_CFG_11 */
++ MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_SYSAXI_SEL, "sysaxi_sel", axi_infra_parents, 0x0a0,
++ 0x0a4, 0x0a8, 24, 1, 31, 0x1C4, 12, CLK_IS_CRITICAL),
++ MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_SYSAPB_SEL, "sysapb_sel", sysapb_parents, 0x0b0, 0x0b4,
++ 0x0b8, 0, 1, 7, 0x1c4, 13, CLK_IS_CRITICAL),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_REFCK_50M_SEL, "eth_refck_50m_sel", eth_refck_50m_parents,
++ 0x0b0, 0x0b4, 0x0b8, 8, 1, 15, 0x1C4, 14),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_SYS_200M_SEL, "eth_sys_200m_sel", eth_sys_200m_parents,
++ 0x0b0, 0x0b4, 0x0b8, 16, 1, 23, 0x1C4, 15),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_SYS_SEL, "eth_sys_sel", pcie_mbist_250m_parents, 0x0b0,
++ 0x0b4, 0x0b8, 24, 1, 31, 0x1C4, 16),
++ /* CLK_CFG_12 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_XGMII_SEL, "eth_xgmii_sel", eth_xgmii_parents, 0x0c0,
++ 0x0c4, 0x0c8, 0, 2, 7, 0x1C4, 17),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_BUS_TOPS_SEL, "bus_tops_sel", bus_tops_parents, 0x0c0, 0x0c4,
++ 0x0c8, 8, 2, 15, 0x1C4, 18),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NPU_TOPS_SEL, "npu_tops_sel", npu_tops_parents, 0x0c0, 0x0c4,
++ 0x0c8, 16, 1, 23, 0x1C4, 19),
++ MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_DRAMC_SEL, "dramc_sel", sspxtp_parents, 0x0c0, 0x0c4,
++ 0x0c8, 24, 1, 31, 0x1C4, 20, CLK_IS_CRITICAL),
++ /* CLK_CFG_13 */
++ MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_DRAMC_MD32_SEL, "dramc_md32_sel", dramc_md32_parents,
++ 0x0d0, 0x0d4, 0x0d8, 0, 2, 7, 0x1C4, 21, CLK_IS_CRITICAL),
++ MUX_GATE_CLR_SET_UPD_FLAGS(CLK_TOP_INFRA_F26M_SEL, "csw_infra_f26m_sel", sspxtp_parents,
++ 0x0d0, 0x0d4, 0x0d8, 8, 1, 15, 0x1C4, 22, CLK_IS_CRITICAL),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_P0_SEL, "pextp_p0_sel", sspxtp_parents, 0x0d0, 0x0d4,
++ 0x0d8, 16, 1, 23, 0x1C4, 23),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_P1_SEL, "pextp_p1_sel", sspxtp_parents, 0x0d0, 0x0d4,
++ 0x0d8, 24, 1, 31, 0x1C4, 24),
++ /* CLK_CFG_14 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_P2_SEL, "pextp_p2_sel", sspxtp_parents, 0x0e0, 0x0e4,
++ 0x0e8, 0, 1, 7, 0x1C4, 25),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_P3_SEL, "pextp_p3_sel", sspxtp_parents, 0x0e0, 0x0e4,
++ 0x0e8, 8, 1, 15, 0x1C4, 26),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_XTP_GLB_P0_SEL, "da_xtp_glb_p0_sel", da_xtp_glb_p0_parents,
++ 0x0e0, 0x0e4, 0x0e8, 16, 1, 23, 0x1C4, 27),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_XTP_GLB_P1_SEL, "da_xtp_glb_p1_sel", da_xtp_glb_p0_parents,
++ 0x0e0, 0x0e4, 0x0e8, 24, 1, 31, 0x1C4, 28),
++ /* CLK_CFG_15 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_XTP_GLB_P2_SEL, "da_xtp_glb_p2_sel", da_xtp_glb_p0_parents,
++ 0x0f0, 0x0f4, 0x0f8, 0, 1, 7, 0x1C4, 29),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_XTP_GLB_P3_SEL, "da_xtp_glb_p3_sel", da_xtp_glb_p0_parents,
++ 0x0f0, 0x0f4, 0x0f8, 8, 1, 15, 0x1C4, 30),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_CKM_SEL, "ckm_sel", sspxtp_parents, 0x0F0, 0x0f4, 0x0f8, 16, 1,
++ 23, 0x1c8, 0),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_DA_SEL, "da_sel", sspxtp_parents, 0x0f0, 0x0f4, 0x0f8, 24, 1,
++ 31, 0x1C8, 1),
++ /* CLK_CFG_16 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_PEXTP_SEL, "pextp_sel", sspxtp_parents, 0x0100, 0x104, 0x108,
++ 0, 1, 7, 0x1c8, 2),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_TOPS_P2_26M_SEL, "tops_p2_26m_sel", sspxtp_parents, 0x0100,
++ 0x104, 0x108, 8, 1, 15, 0x1C8, 3),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_MCUSYS_BACKUP_625M_SEL, "mcusys_backup_625m_sel",
++ mcusys_backup_625m_parents, 0x0100, 0x104, 0x108, 16, 1, 23, 0x1C8, 4),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_SYNC_250M_SEL, "netsys_sync_250m_sel",
++ pcie_mbist_250m_parents, 0x0100, 0x104, 0x108, 24, 1, 31, 0x1c8, 5),
++ /* CLK_CFG_17 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_MACSEC_SEL, "macsec_sel", macsec_parents, 0x0110, 0x114, 0x118,
++ 0, 2, 7, 0x1c8, 6),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_TOPS_400M_SEL, "netsys_tops_400m_sel",
++ netsys_tops_400m_parents, 0x0110, 0x114, 0x118, 8, 1, 15, 0x1c8, 7),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_PPEFB_250M_SEL, "netsys_ppefb_250m_sel",
++ pcie_mbist_250m_parents, 0x0110, 0x114, 0x118, 16, 1, 23, 0x1c8, 8),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NETSYS_WARP_SEL, "netsys_warp_sel", netsys_parents, 0x0110,
++ 0x114, 0x118, 24, 2, 31, 0x1C8, 9),
++ /* CLK_CFG_18 */
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_ETH_MII_SEL, "eth_mii_sel", eth_mii_parents, 0x0120, 0x124,
++ 0x128, 0, 1, 7, 0x1c8, 10),
++ MUX_GATE_CLR_SET_UPD(CLK_TOP_NPU_SEL, "ck_npu_sel", netsys_2x_parents, 0x0120, 0x124, 0x128,
++ 8, 2, 15, 0x1c8, 11),
++};
++
++static const struct mtk_composite top_aud_divs[] = {
++ DIV_GATE(CLK_TOP_AUD_I2S_M, "aud_i2s_m", "aud_sel", 0x0420, 0, 0x0420, 8, 8),
++};
++
++static const struct mtk_clk_desc topck_desc = {
++ .fixed_clks = top_fixed_clks,
++ .num_fixed_clks = ARRAY_SIZE(top_fixed_clks),
++ .factor_clks = top_divs,
++ .num_factor_clks = ARRAY_SIZE(top_divs),
++ .mux_clks = top_muxes,
++ .num_mux_clks = ARRAY_SIZE(top_muxes),
++ .composite_clks = top_aud_divs,
++ .num_composite_clks = ARRAY_SIZE(top_aud_divs),
++ .clk_lock = &mt7988_clk_lock,
++};
++
++static const char *const mcu_bus_div_parents[] = { "top_xtal", "ccipll2_b", "net1pll_d4" };
++
++static const char *const mcu_arm_div_parents[] = { "top_xtal", "arm_b", "net1pll_d4" };
++
++static struct mtk_composite mcu_muxes[] = {
++ /* bus_pll_divider_cfg */
++ MUX_GATE_FLAGS(CLK_MCU_BUS_DIV_SEL, "mcu_bus_div_sel", mcu_bus_div_parents, 0x7C0, 9, 2, -1,
++ CLK_IS_CRITICAL),
++ /* mp2_pll_divider_cfg */
++ MUX_GATE_FLAGS(CLK_MCU_ARM_DIV_SEL, "mcu_arm_div_sel", mcu_arm_div_parents, 0x7A8, 9, 2, -1,
++ CLK_IS_CRITICAL),
++};
++
++static const struct mtk_clk_desc mcusys_desc = {
++ .composite_clks = mcu_muxes,
++ .num_composite_clks = ARRAY_SIZE(mcu_muxes),
++};
++
++static const struct of_device_id of_match_clk_mt7988_topckgen[] = {
++ { .compatible = "mediatek,mt7988-topckgen", .data = &topck_desc },
++ { .compatible = "mediatek,mt7988-mcusys", .data = &mcusys_desc },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, of_match_clk_mt7988_topckgen);
++
++static struct platform_driver clk_mt7988_topckgen_drv = {
++ .probe = mtk_clk_simple_probe,
++ .remove = mtk_clk_simple_remove,
++ .driver = {
++ .name = "clk-mt7988-topckgen",
++ .of_match_table = of_match_clk_mt7988_topckgen,
++ },
++};
++module_platform_driver(clk_mt7988_topckgen_drv);
++MODULE_LICENSE("GPL");
+--- /dev/null
++++ b/drivers/clk/mediatek/clk-mt7988-xfipll.c
+@@ -0,0 +1,82 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (c) 2023 Daniel Golle <daniel at makrotopia.org>
++ */
++
++#include <linux/clk-provider.h>
++#include <linux/of.h>
++#include <linux/of_address.h>
++#include <linux/of_device.h>
++#include <linux/platform_device.h>
++#include "clk-mtk.h"
++#include "clk-gate.h"
++#include <dt-bindings/clock/mediatek,mt7988-clk.h>
++
++/* Register to control USXGMII XFI PLL analog */
++#define XFI_PLL_ANA_GLB8 0x108
++#define RG_XFI_PLL_ANA_SWWA 0x02283248
++
++static const struct mtk_gate_regs xfipll_cg_regs = {
++ .set_ofs = 0x8,
++ .clr_ofs = 0x8,
++ .sta_ofs = 0x8,
++};
++
++#define GATE_XFIPLL(_id, _name, _parent, _shift) \
++ { \
++ .id = _id, \
++ .name = _name, \
++ .parent_name = _parent, \
++ .regs = &xfipll_cg_regs, \
++ .shift = _shift, \
++ .ops = &mtk_clk_gate_ops_no_setclr_inv, \
++ }
++
++static const struct mtk_fixed_factor xfipll_divs[] = {
++ FACTOR(CLK_XFIPLL_PLL, "xfipll_pll", "top_xtal", 125, 32),
++};
++
++static const struct mtk_gate xfipll_clks[] = {
++ GATE_XFIPLL(CLK_XFIPLL_PLL_EN, "xfipll_pll_en", "xfipll_pll", 31),
++};
++
++static const struct mtk_clk_desc xfipll_desc = {
++ .clks = xfipll_clks,
++ .num_clks = ARRAY_SIZE(xfipll_clks),
++ .factor_clks = xfipll_divs,
++ .num_factor_clks = ARRAY_SIZE(xfipll_divs),
++};
++
++static int clk_mt7988_xfipll_probe(struct platform_device *pdev)
++{
++ struct device_node *node = pdev->dev.of_node;
++ void __iomem *base = of_iomap(node, 0);
++
++ if (!base)
++ return -ENOMEM;
++
++ /* Apply software workaround for USXGMII PLL TCL issue */
++ writel(RG_XFI_PLL_ANA_SWWA, base + XFI_PLL_ANA_GLB8);
++ iounmap(base);
++
++ return mtk_clk_simple_probe(pdev);
++};
++
++static const struct of_device_id of_match_clk_mt7988_xfipll[] = {
++ { .compatible = "mediatek,mt7988-xfi-pll", .data = &xfipll_desc },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, of_match_clk_mt7988_xfipll);
++
++static struct platform_driver clk_mt7988_xfipll_drv = {
++ .driver = {
++ .name = "clk-mt7988-xfipll",
++ .of_match_table = of_match_clk_mt7988_xfipll,
++ },
++ .probe = clk_mt7988_xfipll_probe,
++ .remove = mtk_clk_simple_remove,
++};
++module_platform_driver(clk_mt7988_xfipll_drv);
++
++MODULE_DESCRIPTION("MediaTek MT7988 XFI PLL clock driver");
++MODULE_LICENSE("GPL");
diff --git a/target/linux/mediatek/patches-6.1/250-clk-mediatek-add-infracfg-reset-controller-for-mt798.patch b/target/linux/mediatek/patches-6.1/250-clk-mediatek-add-infracfg-reset-controller-for-mt798.patch
new file mode 100644
index 0000000000..cecf095e92
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/250-clk-mediatek-add-infracfg-reset-controller-for-mt798.patch
@@ -0,0 +1,57 @@
+From 26ced94177b150710d94cf365002a09cc48950e9 Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w at public-files.de>
+Date: Wed, 17 Jan 2024 19:41:11 +0100
+Subject: [PATCH] clk: mediatek: add infracfg reset controller for mt7988
+
+Infracfg can also operate as reset controller, add support for it.
+
+Signed-off-by: Frank Wunderlich <frank-w at public-files.de>
+---
+ drivers/clk/mediatek/clk-mt7988-infracfg.c | 23 ++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+--- a/drivers/clk/mediatek/clk-mt7988-infracfg.c
++++ b/drivers/clk/mediatek/clk-mt7988-infracfg.c
+@@ -14,6 +14,10 @@
+ #include "clk-gate.h"
+ #include "clk-mux.h"
+ #include <dt-bindings/clock/mediatek,mt7988-clk.h>
++#include <dt-bindings/reset/mediatek,mt7988-resets.h>
++
++#define MT7988_INFRA_RST0_SET_OFFSET 0x70
++#define MT7988_INFRA_RST1_SET_OFFSET 0x80
+
+ static DEFINE_SPINLOCK(mt7988_clk_lock);
+
+@@ -249,12 +253,31 @@ static const struct mtk_gate infra_clks[
+ GATE_INFRA3(CLK_INFRA_133M_PCIE_CK_P3, "infra_133m_pcie_ck_p3", "sysaxi_sel", 31),
+ };
+
++static u16 infra_rst_ofs[] = {
++ MT7988_INFRA_RST0_SET_OFFSET,
++ MT7988_INFRA_RST1_SET_OFFSET,
++};
++
++static u16 infra_idx_map[] = {
++ [MT7988_INFRA_RST0_PEXTP_MAC_SWRST] = 0 * RST_NR_PER_BANK + 6,
++ [MT7988_INFRA_RST1_THERM_CTRL_SWRST] = 1 * RST_NR_PER_BANK + 9,
++};
++
++static struct mtk_clk_rst_desc infra_rst_desc = {
++ .version = MTK_RST_SET_CLR,
++ .rst_bank_ofs = infra_rst_ofs,
++ .rst_bank_nr = ARRAY_SIZE(infra_rst_ofs),
++ .rst_idx_map = infra_idx_map,
++ .rst_idx_map_nr = ARRAY_SIZE(infra_idx_map),
++};
++
+ static const struct mtk_clk_desc infra_desc = {
+ .clks = infra_clks,
+ .num_clks = ARRAY_SIZE(infra_clks),
+ .mux_clks = infra_muxes,
+ .num_mux_clks = ARRAY_SIZE(infra_muxes),
+ .clk_lock = &mt7988_clk_lock,
++ .rst_desc = &infra_rst_desc,
+ };
+
+ static const struct of_device_id of_match_clk_mt7988_infracfg[] = {
diff --git a/target/linux/mediatek/patches-6.1/250-dt-bindings-reset-mediatek-add-MT7988-reset-IDs.patch b/target/linux/mediatek/patches-6.1/250-dt-bindings-reset-mediatek-add-MT7988-reset-IDs.patch
new file mode 100644
index 0000000000..d353074e84
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/250-dt-bindings-reset-mediatek-add-MT7988-reset-IDs.patch
@@ -0,0 +1,25 @@
+From 3c810da3206f2e52c92f9f15a87f05db4bbba734 Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w at public-files.de>
+Date: Wed, 17 Jan 2024 19:41:10 +0100
+Subject: [PATCH] dt-bindings: reset: mediatek: add MT7988 reset IDs
+
+Add reset constants for using as index in driver and dts.
+
+Signed-off-by: Frank Wunderlich <frank-w at public-files.de>
+---
+ include/dt-bindings/reset/mediatek,mt7988-resets.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/include/dt-bindings/reset/mediatek,mt7988-resets.h
++++ b/include/dt-bindings/reset/mediatek,mt7988-resets.h
+@@ -10,4 +10,10 @@
+ /* ETHWARP resets */
+ #define MT7988_ETHWARP_RST_SWITCH 0
+
++/* INFRA resets */
++#define MT7988_INFRA_RST0_PEXTP_MAC_SWRST 0
++#define MT7988_INFRA_RST1_THERM_CTRL_SWRST 1
++
++
+ #endif /* _DT_BINDINGS_RESET_CONTROLLER_MT7988 */
++
diff --git a/target/linux/mediatek/patches-6.1/251-v6.8-watchdog-mediatek-mt7988-add-wdt-support.patch b/target/linux/mediatek/patches-6.1/251-v6.8-watchdog-mediatek-mt7988-add-wdt-support.patch
new file mode 100644
index 0000000000..cb49ce1d25
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/251-v6.8-watchdog-mediatek-mt7988-add-wdt-support.patch
@@ -0,0 +1,125 @@
+From 137c9e08e5e542d58aa606b0bb4f0990117309a0 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel at makrotopia.org>
+Date: Mon, 20 Nov 2023 18:22:31 +0000
+Subject: [PATCH] watchdog: mediatek: mt7988: add wdt support
+
+Add support for watchdog and reset generator unit of the MediaTek
+MT7988 SoC.
+
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>
+Reviewed-by: Guenter Roeck <linux at roeck-us.net>
+Link: https://lore.kernel.org/r/c0cf5f701801cce60470853fa15f1d9dced78c4f.1700504385.git.daniel@makrotopia.org
+Signed-off-by: Guenter Roeck <linux at roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
+---
+ drivers/watchdog/mtk_wdt.c | 42 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+--- a/drivers/watchdog/mtk_wdt.c
++++ b/drivers/watchdog/mtk_wdt.c
+@@ -56,9 +56,13 @@
+ #define WDT_SWSYSRST 0x18U
+ #define WDT_SWSYS_RST_KEY 0x88000000
+
++#define WDT_SWSYSRST_EN 0xfc
++
+ #define DRV_NAME "mtk-wdt"
+ #define DRV_VERSION "1.0"
+
++#define MT7988_TOPRGU_SW_RST_NUM 24
++
+ static bool nowayout = WATCHDOG_NOWAYOUT;
+ static unsigned int timeout;
+
+@@ -68,10 +72,12 @@ struct mtk_wdt_dev {
+ spinlock_t lock; /* protects WDT_SWSYSRST reg */
+ struct reset_controller_dev rcdev;
+ bool disable_wdt_extrst;
++ bool has_swsysrst_en;
+ };
+
+ struct mtk_wdt_data {
+ int toprgu_sw_rst_num;
++ bool has_swsysrst_en;
+ };
+
+ static const struct mtk_wdt_data mt2712_data = {
+@@ -82,6 +88,11 @@ static const struct mtk_wdt_data mt7986_
+ .toprgu_sw_rst_num = MT7986_TOPRGU_SW_RST_NUM,
+ };
+
++static const struct mtk_wdt_data mt7988_data = {
++ .toprgu_sw_rst_num = MT7988_TOPRGU_SW_RST_NUM,
++ .has_swsysrst_en = true,
++};
++
+ static const struct mtk_wdt_data mt8183_data = {
+ .toprgu_sw_rst_num = MT8183_TOPRGU_SW_RST_NUM,
+ };
+@@ -98,6 +109,28 @@ static const struct mtk_wdt_data mt8195_
+ .toprgu_sw_rst_num = MT8195_TOPRGU_SW_RST_NUM,
+ };
+
++/**
++ * toprgu_reset_sw_en_unlocked() - enable/disable software control for reset bit
++ * @data: Pointer to instance of driver data.
++ * @id: Bit number identifying the reset to be enabled or disabled.
++ * @enable: If true, enable software control for that bit, disable otherwise.
++ *
++ * Context: The caller must hold lock of struct mtk_wdt_dev.
++ */
++static void toprgu_reset_sw_en_unlocked(struct mtk_wdt_dev *data,
++ unsigned long id, bool enable)
++{
++ u32 tmp;
++
++ tmp = readl(data->wdt_base + WDT_SWSYSRST_EN);
++ if (enable)
++ tmp |= BIT(id);
++ else
++ tmp &= ~BIT(id);
++
++ writel(tmp, data->wdt_base + WDT_SWSYSRST_EN);
++}
++
+ static int toprgu_reset_update(struct reset_controller_dev *rcdev,
+ unsigned long id, bool assert)
+ {
+@@ -108,6 +141,9 @@ static int toprgu_reset_update(struct re
+
+ spin_lock_irqsave(&data->lock, flags);
+
++ if (assert && data->has_swsysrst_en)
++ toprgu_reset_sw_en_unlocked(data, id, true);
++
+ tmp = readl(data->wdt_base + WDT_SWSYSRST);
+ if (assert)
+ tmp |= BIT(id);
+@@ -116,6 +152,9 @@ static int toprgu_reset_update(struct re
+ tmp |= WDT_SWSYS_RST_KEY;
+ writel(tmp, data->wdt_base + WDT_SWSYSRST);
+
++ if (!assert && data->has_swsysrst_en)
++ toprgu_reset_sw_en_unlocked(data, id, false);
++
+ spin_unlock_irqrestore(&data->lock, flags);
+
+ return 0;
+@@ -393,6 +432,8 @@ static int mtk_wdt_probe(struct platform
+ wdt_data->toprgu_sw_rst_num);
+ if (err)
+ return err;
++
++ mtk_wdt->has_swsysrst_en = wdt_data->has_swsysrst_en;
+ }
+
+ mtk_wdt->disable_wdt_extrst =
+@@ -427,6 +468,7 @@ static const struct of_device_id mtk_wdt
+ { .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data },
+ { .compatible = "mediatek,mt6589-wdt" },
+ { .compatible = "mediatek,mt7986-wdt", .data = &mt7986_data },
++ { .compatible = "mediatek,mt7988-wdt", .data = &mt7988_data },
+ { .compatible = "mediatek,mt8183-wdt", .data = &mt8183_data },
+ { .compatible = "mediatek,mt8186-wdt", .data = &mt8186_data },
+ { .compatible = "mediatek,mt8192-wdt", .data = &mt8192_data },
More information about the lede-commits
mailing list