From nobody Fri Nov 20 01:13:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jVy5j3gYdz71pn1 for ; Fri, 20 Nov 2026 01:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVy5j1bh0z4YWD for ; Fri, 20 Nov 2026 01:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795137225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yuQzjeC4P2SQfXx/v2oYkp6pVQZFSeS5r3rPJbIbGZM=; b=BqOFoqxcBgjJukljo0ZH9lvdnFXyK/jdr+h0cEdda6HIuWfgzRalIcxz8uwc5vvzmlk+9z 7niatVNsjAS+49QBw87YFVnWbdSuZqTe1cvBU28NMB13A7uN7pSUxBr7T+VpL7VIz0HpCh hndicQUvk8cDeeNAN0ZlYHrpLP62zEw0roRGTCSHqv6+1y6FG+atr4FS1f5TWlOMbPQ08B EJOkrku+If99CalbZhRPa3fRqLonMZNBYGaf4E3CdjPTyrnCcKPDhUwGxfRpaHmX0J28Ox kfW06t9IxEpgjp/d8u8UILoPFjmoBQmLpA+r4NKPHwJgyufoeuba27xI7ji6RQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795137225; b=S1njQ6cw82jkHRD9n9eMC2ZPe2i8CDRUIdiHcl2TkldrxIC5pucue8Sal0iTK+aoVlrpjg 5fYKTibBaKQpgiU0H2mO64VyaUaJaC4NfJzSF2tVk5ABO9W5+kiQZy31s3H1p4k0ndsSVM KLaFxAhMpbjIFN0QXVnjDKLQC1e8l6Ul/knrHPmvhb72SS66gd0M406GWYZRrGgBKoh4xD dHsyOz1Qg6XDA3wklSGQv8/oxmP1oqI+3NXTQFPrCTMfehWNEv+4HYe4QPw6OZeJa6N0kT dIjsjvkpB08RRUT05qLtZFr2DSak/jLnW0KvCgiBe6wf3qVpzVVOM3t7VXC7Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795137225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yuQzjeC4P2SQfXx/v2oYkp6pVQZFSeS5r3rPJbIbGZM=; b=jCtpy88oJBNWT4f+xtIGK0A0f8Gjy4LJONPi34tEEw0c90yGgoEFWzGy+NtgLLVSC3tF9l UuQPjSfECkrx7ZGcEBcJIgihdi8YuBJT0u4OmyTZ7EzjCvHY52WD0sEifw7vrgZG9uDBD3 nouG44zmdNRpFXZavM8I8grwHepjJUHZ41tH88eUw0M59RERbg8MSlibpbW/y/moag8mua 8fbP6qc/YEsoTiyqtYW0tabW6+sbF/08aoWDGvCEoTpq/4MjkNJRSgck25qhNvX8/fd9j7 AARn+ya8z7t45GPoBSx9HOJi83cNRwViq4fsI/GFEX+RjoEg1QeRKXb7oQ8o7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jVy5j0rZpzQQp for ; Fri, 20 Nov 2026 01:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 01:13:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hayzam Sherif Subject: git: cd20e8dcebd5 - main - clk/mediatek: Add MT7986 APMIXEDSYS PLL controller List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hayzam X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd20e8dcebd5ad49c03c6fb711eefab070a875b8 Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 01:13:45 +0000 Message-Id: <6aff9ec9.22f2.3eb038ba@gitrepo.freebsd.org> The branch main has been updated by hayzam: URL: https://cgit.FreeBSD.org/src/commit/?id=cd20e8dcebd5ad49c03c6fb711eefab070a875b8 commit cd20e8dcebd5ad49c03c6fb711eefab070a875b8 Author: Hayzam Sherif AuthorDate: 2026-11-04 10:26:50 +0000 Commit: Hayzam Sherif CommitDate: 2026-11-20 01:10:53 +0000 clk/mediatek: Add MT7986 APMIXEDSYS PLL controller Add the eight MT7986 PLLs, all fed by the 40 MHz crystal. MPLL, NET1PLL and NET2PLL never stop: they feed the DRAM, bus and 26 MHz clocks. ARMPLL clocks the CPUs; to change its rate, a cpufreq driver moves them to another clock first. APMIXEDSYS attaches after the fixed clocks. The rates are the ones set by TF-A BL2, which also starts every PLL. The register layout and the reset bar bit (CON0 bit 24 on NET2PLL, MMPLL, WEDMCUPLL, NET1PLL and MPLL) follow MediaTek's TF-A [1][2]. [1] https://github.com/mtk-openwrt/arm-trusted-firmware/blob/a229810586d8/plat/mediatek/mt7986/drivers/pll/pll.c [2] https://github.com/mtk-openwrt/arm-trusted-firmware/blob/a229810586d8/plat/mediatek/mt7986/drivers/pll/pll.h Reviewed by: mmel Approved by: markj (mentor) Sponsored by: Alchemilla Ventures Private Limited Differential Revision: https://reviews.freebsd.org/D61188 --- sys/conf/files.arm64 | 1 + sys/dev/clk/mediatek/mt7986_apmixedsys.c | 98 ++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 80e58541b4c8..631be0833ab0 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -849,6 +849,7 @@ dev/clk/mediatek/mtk_clk.c optional fdt soc_mediatek dev/clk/mediatek/mtk_clk_gate.c optional fdt soc_mediatek dev/clk/mediatek/mtk_clk_mux.c optional fdt soc_mediatek dev/clk/mediatek/mtk_clk_pll.c optional fdt soc_mediatek +dev/clk/mediatek/mt7986_apmixedsys.c optional fdt soc_mediatek_mt7986 # RockChip Clock support dev/clk/rockchip/rk_cru.c optional fdt soc_rockchip diff --git a/sys/dev/clk/mediatek/mt7986_apmixedsys.c b/sys/dev/clk/mediatek/mt7986_apmixedsys.c new file mode 100644 index 000000000000..ecf1fabd30e8 --- /dev/null +++ b/sys/dev/clk/mediatek/mt7986_apmixedsys.c @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2026 Hayzam Sherif + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * MediaTek MT7986 APMIXEDSYS: the PLLs, all fed by the 40 MHz crystal. + * NET2PLL, MMPLL, WEDMCUPLL, NET1PLL and MPLL also have a reset bar bit + * (CON0 bit 24) that is released once the PLL has locked. + */ + +#include +#include +#include +#include +#include + +#include +#include + +#include + +#include + +#define MT7986_RST_BAR (1u << 24) + +#define MT7986_PLL(_id, _name, _con0, _rst_bar, _flags) \ + { .type = MTK_CLK_PLL, .pll = { \ + .clkdef = { .name = (_name), .id = (_id), \ + .parent_names = (const char *[]){ "clkxtal" }, \ + .parent_cnt = 1, .flags = (_flags) }, \ + .con0 = (_con0), .rst_bar = (_rst_bar) } } + +static struct mtk_clk_def mt7986_apmixedsys_clks[] = { + /* 40 MHz crystal, provided by a fixed-clock node */ + MTK_LINK("clkxtal"), + + /* + * MPLL, NET1PLL and NET2PLL feed the DRAM, bus and 26 MHz clocks: none + * of them may ever stop. ARMPLL clocks the CPUs through a mux in + * MCUSYS, where a cpufreq driver moves them to another clock while it + * changes the rate. + */ + MT7986_PLL(CLK_APMIXED_ARMPLL, "armpll", 0x200, 0, 0), + MT7986_PLL(CLK_APMIXED_NET2PLL, "net2pll", 0x210, MT7986_RST_BAR, + CLK_NODE_CANNOT_STOP), + MT7986_PLL(CLK_APMIXED_MMPLL, "mmpll", 0x220, MT7986_RST_BAR, + 0), + MT7986_PLL(CLK_APMIXED_SGMPLL, "sgmpll", 0x230, 0, 0), + MT7986_PLL(CLK_APMIXED_WEDMCUPLL, "wedmcupll", 0x240, MT7986_RST_BAR, + 0), + MT7986_PLL(CLK_APMIXED_NET1PLL, "net1pll", 0x250, MT7986_RST_BAR, + CLK_NODE_CANNOT_STOP), + MT7986_PLL(CLK_APMIXED_MPLL, "mpll", 0x260, MT7986_RST_BAR, + CLK_NODE_CANNOT_STOP), + MT7986_PLL(CLK_APMIXED_APLL2, "apll2", 0x278, 0, 0), +}; + +static const struct mtk_clk_desc mt7986_apmixedsys_desc = { + .clks = mt7986_apmixedsys_clks, + .nclks = nitems(mt7986_apmixedsys_clks), +}; + +static struct ofw_compat_data compat_data[] = { + { "mediatek,mt7986-apmixedsys", 1 }, + { NULL, 0 } +}; + +static int +mt7986_apmixedsys_probe(device_t dev) +{ + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + device_set_desc(dev, "MediaTek MT7986 PLL controller"); + return (BUS_PROBE_DEFAULT); +} + +static int +mt7986_apmixedsys_attach(device_t dev) +{ + return (mtk_clk_attach(dev, &mt7986_apmixedsys_desc)); +} + +static device_method_t mt7986_apmixedsys_methods[] = { + DEVMETHOD(device_probe, mt7986_apmixedsys_probe), + DEVMETHOD(device_attach, mt7986_apmixedsys_attach), + DEVMETHOD_END +}; + +DEFINE_CLASS_1(mt7986_apmixedsys, mt7986_apmixedsys_driver, + mt7986_apmixedsys_methods, sizeof(struct mtk_clk_softc), mtk_clk_driver); + +/* After the fixed clocks, so the ARMPLL reference reaches the crystal. */ +EARLY_DRIVER_MODULE(mt7986_apmixedsys, simplebus, mt7986_apmixedsys_driver, + NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE + 1);