From patchwork Mon Apr 14 10:12:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu X-Patchwork-Id: 14050132 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 78BA6C369B2 for ; Mon, 14 Apr 2025 10:30:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Ews5Yh4nDqhFnqMwu96FJNN6oJXbxGsQPgM5ojFv9EA=; b=S1TdSmWcB8eY401y1XLn4WvcCu 1nmBKdRUvTeTS9UIdIDd+5Dd0j46cBPOGubUa35tFCAvMMoCgMjCrswSEJ32mP8kcRd9bxs2CmXuO BdOOo2uhPJYYBylWXRUWzGoe6wAR9Y2HcQ5nTiogn0Desvlpi5/0SIF2tC9j/wefewSN4wfAR1Edh qAPL0jNc4yZfnQIem3waRZWrwf6DOaeBJZB1OrjewA7GDYw+9qqh5H8yb8M3IhWBJ6GW4OP7h0Pj6 m3t5j2DQvCgIp722gxpR1aa24tKIE5ff9FxoaQpetAVjjPrKxyOU2UwLBjIYppARGTDh5mGt3iKcF raRB8FUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4H5J-00000001XmN-1Kje; Mon, 14 Apr 2025 10:30:37 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4Gog-00000001Rxx-2fjt; Mon, 14 Apr 2025 10:13:26 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 8FD0061148; Mon, 14 Apr 2025 10:12:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id AF9B7C4CEE5; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744625575; bh=Wutptj4TTqatUZ3B9nw/6gxUA67cI9AYWKb8DByZ0sw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=aCrmAO5Ubm6/7WN6Q9vVluLDsdS5puZF5L1qyhtA0vS/433vmsaItPjeZpoXKIAn8 gWupjkRoV+6uVfMSy82Wtu92uKbndd5oIVeKlmlq4TYHjlN1vk8iOvBeE4jELmp/dv ZIUz1ctxcRgecTGmyXOGzmHSVopCx2KspivhXockDzpkDq+jafYcbL3LFHSawDnMHV 6zFiKoHzfNSrVuBHWPd9Kc0gPdu1frUctvppV+f5C89pErV5JCD/IAoHeA504xcOmR ccTCpvtAkfrBhP7WwIqktXTa6sxKY4B8W2d7MVmnDwnUgd/rMnb1HX3Dpk1RMpeoSR rm0lQ3OoTsgAg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C1E3C369B6; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) Date: Mon, 14 Apr 2025 18:12:28 +0800 Subject: [PATCH v2 1/7] soc: amlogic: clk-measure: Define MSR_CLK's register offset separately MIME-Version: 1.0 Message-Id: <20250414-clk-measure-v2-1-65077690053a@amlogic.com> References: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> In-Reply-To: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1744625573; l=5775; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=By8GsacXTpSc4iTBr14dvYmj461RtPWVVIfMTZf+l5Y=; b=/Oan9OrYDRaJKIk9TmWDumuW8ZdHbA9Q7ZQA7WnSCPfQUtundkqmeSBf1bknFCImosyx6Ql8+ aa6NsdwtApqCeZpY4nY0YSWt7Y1c2FsoP8sbUa58K762wYbYHNdFjfy X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: chuan.liu@amlogic.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chuan Liu From: Chuan Liu Since the MSR_CLK register offset differs between chip variants, we replace the macro-based definition with chip-specific assignments. Change the max_register in regmap_config to be retrieved from DTS. Signed-off-by: Chuan Liu Reviewed-by: Neil Armstrong --- drivers/soc/amlogic/meson-clk-measure.c | 54 ++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c index 39638d6a593c..82c008ade894 100644 --- a/drivers/soc/amlogic/meson-clk-measure.c +++ b/drivers/soc/amlogic/meson-clk-measure.c @@ -14,11 +14,6 @@ static DEFINE_MUTEX(measure_lock); -#define MSR_CLK_DUTY 0x0 -#define MSR_CLK_REG0 0x4 -#define MSR_CLK_REG1 0x8 -#define MSR_CLK_REG2 0xc - #define MSR_DURATION GENMASK(15, 0) #define MSR_ENABLE BIT(16) #define MSR_CONT BIT(17) /* continuous measurement */ @@ -39,9 +34,17 @@ struct meson_msr_id { const char *name; }; +struct msr_reg_offset { + unsigned int duty_val; + unsigned int freq_ctrl; + unsigned int duty_ctrl; + unsigned int freq_val; +}; + struct meson_msr_data { struct meson_msr_id *msr_table; unsigned int msr_count; + struct msr_reg_offset *reg; }; struct meson_msr { @@ -495,6 +498,7 @@ static int meson_measure_id(struct meson_msr_id *clk_msr_id, unsigned int duration) { struct meson_msr *priv = clk_msr_id->priv; + struct msr_reg_offset *reg = priv->data.reg; unsigned int val; int ret; @@ -502,22 +506,22 @@ static int meson_measure_id(struct meson_msr_id *clk_msr_id, if (ret) return ret; - regmap_write(priv->regmap, MSR_CLK_REG0, 0); + regmap_write(priv->regmap, reg->freq_ctrl, 0); /* Set measurement duration */ - regmap_update_bits(priv->regmap, MSR_CLK_REG0, MSR_DURATION, + regmap_update_bits(priv->regmap, reg->freq_ctrl, MSR_DURATION, FIELD_PREP(MSR_DURATION, duration - 1)); /* Set ID */ - regmap_update_bits(priv->regmap, MSR_CLK_REG0, MSR_CLK_SRC, + regmap_update_bits(priv->regmap, reg->freq_ctrl, MSR_CLK_SRC, FIELD_PREP(MSR_CLK_SRC, clk_msr_id->id)); /* Enable & Start */ - regmap_update_bits(priv->regmap, MSR_CLK_REG0, + regmap_update_bits(priv->regmap, reg->freq_ctrl, MSR_RUN | MSR_ENABLE, MSR_RUN | MSR_ENABLE); - ret = regmap_read_poll_timeout(priv->regmap, MSR_CLK_REG0, + ret = regmap_read_poll_timeout(priv->regmap, reg->freq_ctrl, val, !(val & MSR_BUSY), 10, 10000); if (ret) { mutex_unlock(&measure_lock); @@ -525,10 +529,10 @@ static int meson_measure_id(struct meson_msr_id *clk_msr_id, } /* Disable */ - regmap_update_bits(priv->regmap, MSR_CLK_REG0, MSR_ENABLE, 0); + regmap_update_bits(priv->regmap, reg->freq_ctrl, MSR_ENABLE, 0); /* Get the value in multiple of gate time counts */ - regmap_read(priv->regmap, MSR_CLK_REG2, &val); + regmap_read(priv->regmap, reg->freq_val, &val); mutex_unlock(&measure_lock); @@ -599,11 +603,10 @@ static int clk_msr_summary_show(struct seq_file *s, void *data) } DEFINE_SHOW_ATTRIBUTE(clk_msr_summary); -static const struct regmap_config meson_clk_msr_regmap_config = { +static struct regmap_config meson_clk_msr_regmap_config = { .reg_bits = 32, .val_bits = 32, .reg_stride = 4, - .max_register = MSR_CLK_REG2, }; static int meson_msr_probe(struct platform_device *pdev) @@ -611,6 +614,7 @@ static int meson_msr_probe(struct platform_device *pdev) const struct meson_msr_data *match_data; struct meson_msr *priv; struct dentry *root, *clks; + struct resource *res; void __iomem *base; int i; @@ -636,15 +640,23 @@ static int meson_msr_probe(struct platform_device *pdev) match_data->msr_count * sizeof(struct meson_msr_id)); priv->data.msr_count = match_data->msr_count; - base = devm_platform_ioremap_resource(pdev, 0); + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(base)) return PTR_ERR(base); + meson_clk_msr_regmap_config.max_register = resource_size(res) - 4; priv->regmap = devm_regmap_init_mmio(&pdev->dev, base, &meson_clk_msr_regmap_config); if (IS_ERR(priv->regmap)) return PTR_ERR(priv->regmap); + priv->data.reg = devm_kzalloc(&pdev->dev, sizeof(struct msr_reg_offset), + GFP_KERNEL); + if (!priv->data.reg) + return -ENOMEM; + + memcpy(priv->data.reg, match_data->reg, sizeof(struct msr_reg_offset)); + root = debugfs_create_dir("meson-clk-msr", NULL); clks = debugfs_create_dir("clks", root); @@ -664,29 +676,41 @@ static int meson_msr_probe(struct platform_device *pdev) return 0; } +struct msr_reg_offset msr_reg_offset = { + .duty_val = 0x0, + .freq_ctrl = 0x4, + .duty_ctrl = 0x8, + .freq_val = 0xc, +}; + static const struct meson_msr_data clk_msr_gx_data = { .msr_table = (void *)clk_msr_gx, .msr_count = ARRAY_SIZE(clk_msr_gx), + .reg = &msr_reg_offset, }; static const struct meson_msr_data clk_msr_m8_data = { .msr_table = (void *)clk_msr_m8, .msr_count = ARRAY_SIZE(clk_msr_m8), + .reg = &msr_reg_offset, }; static const struct meson_msr_data clk_msr_axg_data = { .msr_table = (void *)clk_msr_axg, .msr_count = ARRAY_SIZE(clk_msr_axg), + .reg = &msr_reg_offset, }; static const struct meson_msr_data clk_msr_g12a_data = { .msr_table = (void *)clk_msr_g12a, .msr_count = ARRAY_SIZE(clk_msr_g12a), + .reg = &msr_reg_offset, }; static const struct meson_msr_data clk_msr_sm1_data = { .msr_table = (void *)clk_msr_sm1, .msr_count = ARRAY_SIZE(clk_msr_sm1), + .reg = &msr_reg_offset, }; static const struct of_device_id meson_msr_match_table[] = { From patchwork Mon Apr 14 10:12:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu X-Patchwork-Id: 14050131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 71053C369B2 for ; Mon, 14 Apr 2025 10:28:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pD63xWUiken4bOc7UVHKp4kXOXY2WeTmkakYs1rcMNg=; b=OnHY8CKLDFroFXjjgezu/vI6r2 Alj3SxNUUMVMR6oPOR3pNwTa8jgi4GA4vvNW1TOOcA1GFdu7ZQDwGqHC1/cxnhzpLYA+4TTXGNYot eW9tGeDOJSiWrD26jzoXUTenoXDlplOwzTdbRdwGK4o2A9Rrahf3mb2g2SNxFkkB5Mut/Q+GRbH+J /BheVZR5/hdI/KtTfnafCvP45SB7bpqLyykjbAZFI87gn2c6345abpmrlV5kwpoyiNWUkKQae/TR2 IiTypbENv3YZdGWpUJo3rYLRfSeOMrFHDb4YH467CMRuKKxrU2Jq03MBSUIvhUFDIy/xt4JOlaWDu 9J2fM78Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4H3T-00000001XFQ-10UT; Mon, 14 Apr 2025 10:28:43 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4GoC-00000001Rku-3N6m; Mon, 14 Apr 2025 10:13:00 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id EDFBE4A410; Mon, 14 Apr 2025 10:12:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id BBF1FC4CEEC; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744625575; bh=uMxf6PyjUiBPhkaKa+YXG1JpcOgoPD6r+dpLZyFYDyU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=pIUXq+DKYJunOHquufjQRstJNO2wNOohjDbCQwqFCZHKenOydN4YW9e0pXWmcf1v6 wi7oWJZpWFB2AFeJIF+TFz6u0jA3LxFDU9nWiI3StzLbgZDXxPU4HHAg4HrFGPlUap IekDNWLCNvdX93A78whKUEWkABaO8dI7BKrF60p7g+iaPqy1G3W2t/BupWI5yg1b1f jVWQIozTMszyzY43QD0mmaCHCUl03mFwYWNcnpoS1SLFQ/yINwyvRrYy5tctISvb83 w8RfskLfumOJ6HvQLvMLnwYVoMAgDs9XOKpfnNmlvRpLG9cfnP99RQ1xy5v/0/7MTL TevW5XZMyCJ/g== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACEC9C369B8; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) Date: Mon, 14 Apr 2025 18:12:29 +0800 Subject: [PATCH v2 2/7] dt-bindings: soc: amlogic: C3 supports clk-measure MIME-Version: 1.0 Message-Id: <20250414-clk-measure-v2-2-65077690053a@amlogic.com> References: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> In-Reply-To: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1744625573; l=875; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=P5KRner9ELHl3o409yiGCGnkva5HFExJ3rMn3+oG1ko=; b=OBeqwNSfKlp1ikH78aflX1hMLwcMKPmgvjsG+/sH9hULhjziPbD6BrLZo0QJOtrtPHjP37N20 1aTJ/JXfGobCpPe30pfYUiyMIXlkVgDOZFfw9ZKJEiaGMjYHVHX5Qd2 X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250414_031256_883457_AB4D5B84 X-CRM114-Status: UNSURE ( 7.04 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: chuan.liu@amlogic.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chuan Liu From: Chuan Liu C3 adds support for clk-measure. Acked-by: Rob Herring (Arm) Signed-off-by: Chuan Liu --- .../devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml b/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml index 77c281153010..275afe7fe374 100644 --- a/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml +++ b/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml @@ -22,6 +22,7 @@ properties: - amlogic,meson-axg-clk-measure - amlogic,meson-g12a-clk-measure - amlogic,meson-sm1-clk-measure + - amlogic,c3-clk-measure reg: maxItems: 1 From patchwork Mon Apr 14 10:12:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu X-Patchwork-Id: 14050125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7E574C369B5 for ; Mon, 14 Apr 2025 10:23:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4C9gyr7siZ0xEY4Hy2QnkKs2CQg9nQZqfR0oirdMTNQ=; b=geUsU13fppt7WxmLJNe4uG1u1h p+NA71Pt0/e/Fd7pDi2LFla1aiQfFe7xZL/LtvAKGPoPo+2zkH529jGeiJflK7rddoD6vrU2X5yJI jEhf5YCYmGwtivZ4OgNteK0GZ7p63PgryATocuWwdlpa0HzqSagYfXZjuzYyD36KL7NnorT4lmlxu 7yR5ICpUJxwchPCaIMDGNlVmwpmC5VYJO9DA4apyvfQ58XHZDpOQO7Fh2jkVdqudvtvHUcJ8WbJ7z OBl3fGHCdUV9YvCEXzpsU2pXJlQdEy6COWOfIa8F5+cYTc8qkTt6iwOXMQY1C7B+Ir7VbWTimEml6 YMoTYN/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4Gxn-00000001V7E-2DTy; Mon, 14 Apr 2025 10:22:51 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4GoC-00000001Rkv-2kCt; Mon, 14 Apr 2025 10:12:58 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 0B1B94A571; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id C6F8CC4CEEE; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744625575; bh=75keAXRMnoUm3nWjp9JCjWhNFcUePI50VoUETtE1kCQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=h79SvUhpxexqgyIMLxxDjXR9Ue7ikBs5MMi+HAT/F61BOT2gAed5XLssj8vTtZZ8x 2e+1T1AZm+ItaLqu4KwDif44gX+C/I4HvW7RVQAYqmQCnHrNMT7Fmgpj5S+5ZKrL5W NbQvIKyOTgsPCwi/f3jM5Lucz4eAEDA9wOGBjJLKP3K62RcOkZFmxnnl0V0oEd38VE bwnWREA81nNJpXpDDGQ3wjxu/fyjTncU6m3XHpg6DTvXnMkCx3a7gxncjktOK9O8Eq 6j6I3Px7OaDG9lWw0g5PlLytM44pERdlf58xxlR2ceIK5RT9IDhrrp4xZwjp7abGku 25Rb/JhC/2vXA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9F18C369B5; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) Date: Mon, 14 Apr 2025 18:12:30 +0800 Subject: [PATCH v2 3/7] dt-bindings: soc: amlogic: S4 supports clk-measure MIME-Version: 1.0 Message-Id: <20250414-clk-measure-v2-3-65077690053a@amlogic.com> References: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> In-Reply-To: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1744625573; l=868; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=Bv5Y4DpbmiEYh7fjv0Fc7kk2ovIc05XnT6FwbcehZ6c=; b=5MN7KmLfAj+nB4Y5624uTR7Cw0B5gifagMJGUugs2I5NWLbXhV5LZLPFeNIFM+GRwSb+IW0tQ ZkBf0C+mdWnDahWec+EGuf7p6pPd9W9TGu8CWl4atQ27TvqRVgjxCns X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250414_031256_718973_12F6EA1C X-CRM114-Status: UNSURE ( 7.04 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: chuan.liu@amlogic.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chuan Liu From: Chuan Liu S4 adds support for clk-measure. Acked-by: Rob Herring (Arm) Signed-off-by: Chuan Liu --- .../devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml b/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml index 275afe7fe374..39d4637c2d08 100644 --- a/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml +++ b/Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml @@ -23,6 +23,7 @@ properties: - amlogic,meson-g12a-clk-measure - amlogic,meson-sm1-clk-measure - amlogic,c3-clk-measure + - amlogic,s4-clk-measure reg: maxItems: 1 From patchwork Mon Apr 14 10:12:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu X-Patchwork-Id: 14050120 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 057B5C369B2 for ; Mon, 14 Apr 2025 10:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hHnZB0DU6EioUlWcnU2NPfLyBHxDTgWmrFuhhLqJ2tQ=; b=b/Vt53vvwotW3N75NLwXBrv0OP 1KJ4WSGQT+E/CPiuiH75ALjnM3beOlJRQ6X5S9B0ibZ4dRC1SXn1r44UU+O6pj2DCEKOCbvkPae/o Ka/+sdowmUosiuYjf6kT89l9WFR5D4dAGcbpTTheapPRTYOkVRIsGLGhUsZzjKV2eoXPgMR5XumiI oijooQqez8Rd4tPCDdc+mrTIxqnvFWnotOxaTL6CbUNMaHw0889rA93a6Bha9yuPNeOyiawcdh0G3 HjEZrXjwfaIGJWvEQCaeaTEV3VMCoJLtLziRxcO4H+hrXYCx54pjl00QFVVr+JBbgyrSL5+zMahfu sWDrKHDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4GuD-00000001UBu-1Zas; Mon, 14 Apr 2025 10:19:09 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4GoC-00000001Rl7-3aDX; Mon, 14 Apr 2025 10:12:56 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id C4DD66115E; Mon, 14 Apr 2025 10:12:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id D4B8DC4CEED; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744625575; bh=lawTPlEWBNrpmsUAEJ3a2nqdx22fCqWe8OZPiyf0Vpk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=fL6hDZHhHtmzEX7J0C+nt2NrcyxPHnF6KxscSkHIPGMhImzye42Bf7PXUGc7qmp4t jFpfSwnXIokmmTnFxQ52PmFTQihDDSHkbMsR2RuCCXjymVm/q4MSosR9ZKJgUBysdj ZpEK4NY9cvBHJHhMR6570mDTZUO/wIpCApyW24/+WuvRQBvV+Rf4QVeHkxcMjSh3Gn +lGazLDZd49zSY1YoAdi1ShTU+pdYBF82UMr2ZDbuxHiM41cRfHusdLSB6X44yjUeW r+q6ZKuD8WKQG9nb+EYnfsWlAzM1wWJ+bnv32AX78lk9Rx8gk9VyWF0BLBpOtc3wPi rdPoHMca01g+Q== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9A6FC369B9; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) Date: Mon, 14 Apr 2025 18:12:31 +0800 Subject: [PATCH v2 4/7] soc: amlogic: clk-measure: Add support for C3 MIME-Version: 1.0 Message-Id: <20250414-clk-measure-v2-4-65077690053a@amlogic.com> References: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> In-Reply-To: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1744625573; l=6690; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=5IKQzZzkHNcYRV76KtgkiOFs5UjhFwnt2rPvLFuVIO4=; b=acBLkRsoLCAmiIu3KkKqmnuwU0PJ0hBmrQm/D4kygfXKowcuP2kispAcyKocZkJbjCJ8OINaD MY6JNigM/aKC8z/SH4kjYhYwjcS3NUqgl0oy+jaxP5ZK6TX0+nbgiI7 X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: chuan.liu@amlogic.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chuan Liu From: Chuan Liu Add the clk-measurer clocks IDs for the Amlogic C3 SoC family. Signed-off-by: Chuan Liu Reviewed-by: Neil Armstrong --- drivers/soc/amlogic/meson-clk-measure.c | 157 ++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c index 82c008ade894..810454ac4119 100644 --- a/drivers/soc/amlogic/meson-clk-measure.c +++ b/drivers/soc/amlogic/meson-clk-measure.c @@ -494,6 +494,146 @@ static const struct meson_msr_id clk_msr_sm1[] = { CLK_MSR_ID(127, "csi2_data"), }; +static const struct meson_msr_id clk_msr_c3[] = { + CLK_MSR_ID(0, "sys_clk"), + CLK_MSR_ID(1, "axi_clk"), + CLK_MSR_ID(2, "rtc_clk"), + CLK_MSR_ID(3, "p20_usb2_ckout"), + CLK_MSR_ID(4, "eth_mpll_test"), + CLK_MSR_ID(5, "sys_pll"), + CLK_MSR_ID(6, "cpu_clk_div16"), + CLK_MSR_ID(7, "ts_pll"), + CLK_MSR_ID(8, "fclk_div2"), + CLK_MSR_ID(9, "fclk_div2p5"), + CLK_MSR_ID(10, "fclk_div3"), + CLK_MSR_ID(11, "fclk_div4"), + CLK_MSR_ID(12, "fclk_div5"), + CLK_MSR_ID(13, "fclk_div7"), + CLK_MSR_ID(15, "fclk_50m"), + CLK_MSR_ID(16, "sys_oscin32k_i"), + CLK_MSR_ID(17, "mclk_pll"), + CLK_MSR_ID(19, "hifi_pll"), + CLK_MSR_ID(20, "gp0_pll"), + CLK_MSR_ID(21, "gp1_pll"), + CLK_MSR_ID(22, "eth_mppll_50m_ckout"), + CLK_MSR_ID(23, "sys_pll_div16"), + CLK_MSR_ID(24, "ddr_dpll_pt_clk"), + CLK_MSR_ID(26, "nna_core"), + CLK_MSR_ID(27, "rtc_sec_pulse_out"), + CLK_MSR_ID(28, "rtc_osc_clk_out"), + CLK_MSR_ID(29, "debug_in_clk"), + CLK_MSR_ID(30, "mod_eth_phy_ref_clk"), + CLK_MSR_ID(31, "mod_eth_tx_clk"), + CLK_MSR_ID(32, "eth_125m"), + CLK_MSR_ID(33, "eth_rmii"), + CLK_MSR_ID(34, "co_clkin_to_mac"), + CLK_MSR_ID(36, "co_rx_clk"), + CLK_MSR_ID(37, "co_tx_clk"), + CLK_MSR_ID(38, "eth_phy_rxclk"), + CLK_MSR_ID(39, "eth_phy_plltxclk"), + CLK_MSR_ID(40, "ephy_test_clk"), + CLK_MSR_ID(66, "vapb"), + CLK_MSR_ID(67, "ge2d"), + CLK_MSR_ID(68, "dewarpa"), + CLK_MSR_ID(70, "mipi_dsi_meas"), + CLK_MSR_ID(71, "dsi_phy"), + CLK_MSR_ID(79, "rama"), + CLK_MSR_ID(94, "vc9000e_core"), + CLK_MSR_ID(95, "vc9000e_sys"), + CLK_MSR_ID(96, "vc9000e_aclk"), + CLK_MSR_ID(97, "hcodec"), + CLK_MSR_ID(106, "deskew_pll_clk_div32_out"), + CLK_MSR_ID(107, "mipi_csi_phy_clk_out[0]"), + CLK_MSR_ID(108, "mipi_csi_phy_clk_out[1]"), + CLK_MSR_ID(110, "spifc"), + CLK_MSR_ID(111, "saradc"), + CLK_MSR_ID(112, "ts"), + CLK_MSR_ID(113, "sd_emmc_c"), + CLK_MSR_ID(114, "sd_emmc_b"), + CLK_MSR_ID(115, "sd_emmc_a"), + CLK_MSR_ID(116, "gpio_msr_clk"), + CLK_MSR_ID(117, "spicc_b"), + CLK_MSR_ID(118, "spicc_a"), + CLK_MSR_ID(122, "mod_audio_pdm_dclk_o"), + CLK_MSR_ID(124, "o_earcrx_dmac_clk"), + CLK_MSR_ID(125, "o_earcrx_cmdc_clk"), + CLK_MSR_ID(126, "o_earctx_dmac_clk"), + CLK_MSR_ID(127, "o_earctx_cmdc_clk"), + CLK_MSR_ID(128, "o_tohdmitx_bclk"), + CLK_MSR_ID(129, "o_tohdmitx_mclk"), + CLK_MSR_ID(130, "o_tohdmitx_spdif_clk"), + CLK_MSR_ID(131, "o_toacodec_bclk"), + CLK_MSR_ID(132, "o_toacodec_mclk"), + CLK_MSR_ID(133, "o_spdifout_b_mst_clk"), + CLK_MSR_ID(134, "o_spdifout_mst_clk"), + CLK_MSR_ID(135, "o_spdifin_mst_clk"), + CLK_MSR_ID(136, "o_audio_mclk"), + CLK_MSR_ID(137, "o_vad_clk"), + CLK_MSR_ID(138, "o_tdmout_d_sclk"), + CLK_MSR_ID(139, "o_tdmout_c_sclk"), + CLK_MSR_ID(140, "o_tdmout_b_sclk"), + CLK_MSR_ID(141, "o_tdmout_a_sclk"), + CLK_MSR_ID(142, "o_tdminb_1b_sclk"), + CLK_MSR_ID(143, "o_tdmin_1b_sclk"), + CLK_MSR_ID(144, "o_tdmin_d_sclk"), + CLK_MSR_ID(145, "o_tdmin_c_sclk"), + CLK_MSR_ID(146, "o_tdmin_b_sclk"), + CLK_MSR_ID(147, "o_tdmin_a_sclk"), + CLK_MSR_ID(148, "o_resampleb_clk"), + CLK_MSR_ID(149, "o_resamplea_clk"), + CLK_MSR_ID(150, "o_pdmb_sysclk"), + CLK_MSR_ID(151, "o_pdmb_dclk"), + CLK_MSR_ID(152, "o_pdm_sysclk"), + CLK_MSR_ID(153, "o_pdm_dclk"), + CLK_MSR_ID(154, "c_alockerb_out_clk"), + CLK_MSR_ID(155, "c_alockerb_in_clk"), + CLK_MSR_ID(156, "c_alocker_out_clk"), + CLK_MSR_ID(157, "c_alocker_in_clk"), + CLK_MSR_ID(158, "audio_mst_clk[34]"), + CLK_MSR_ID(159, "audio_mst_clk[35]"), + CLK_MSR_ID(160, "pwm_n"), + CLK_MSR_ID(161, "pwm_m"), + CLK_MSR_ID(162, "pwm_l"), + CLK_MSR_ID(163, "pwm_k"), + CLK_MSR_ID(164, "pwm_j"), + CLK_MSR_ID(165, "pwm_i"), + CLK_MSR_ID(166, "pwm_h"), + CLK_MSR_ID(167, "pwm_g"), + CLK_MSR_ID(168, "pwm_f"), + CLK_MSR_ID(169, "pwm_e"), + CLK_MSR_ID(170, "pwm_d"), + CLK_MSR_ID(171, "pwm_c"), + CLK_MSR_ID(172, "pwm_b"), + CLK_MSR_ID(173, "pwm_a"), + CLK_MSR_ID(174, "AU_DAC1_CLK_TO_GPIO"), + CLK_MSR_ID(175, "AU_ADC_CLK_TO_GPIO"), + CLK_MSR_ID(176, "rng_ring_osc_clk[0]"), + CLK_MSR_ID(177, "rng_ring_osc_clk[1]"), + CLK_MSR_ID(178, "rng_ring_osc_clk[2]"), + CLK_MSR_ID(179, "rng_ring_osc_clk[3]"), + CLK_MSR_ID(180, "sys_cpu_ring_osc_clk[0]"), + CLK_MSR_ID(181, "sys_cpu_ring_osc_clk[1]"), + CLK_MSR_ID(182, "sys_cpu_ring_osc_clk[2]"), + CLK_MSR_ID(183, "sys_cpu_ring_osc_clk[3]"), + CLK_MSR_ID(184, "sys_cpu_ring_osc_clk[4]"), + CLK_MSR_ID(185, "sys_cpu_ring_osc_clk[5]"), + CLK_MSR_ID(186, "sys_cpu_ring_osc_clk[6]"), + CLK_MSR_ID(187, "sys_cpu_ring_osc_clk[7]"), + CLK_MSR_ID(188, "sys_cpu_ring_osc_clk[8]"), + CLK_MSR_ID(189, "sys_cpu_ring_osc_clk[9]"), + CLK_MSR_ID(190, "sys_cpu_ring_osc_clk[10]"), + CLK_MSR_ID(191, "sys_cpu_ring_osc_clk[11]"), + CLK_MSR_ID(192, "am_ring_osc_clk_out[12](dmc)"), + CLK_MSR_ID(193, "am_ring_osc_clk_out[13](rama)"), + CLK_MSR_ID(194, "am_ring_osc_clk_out[14](nna)"), + CLK_MSR_ID(195, "am_ring_osc_clk_out[15](nna)"), + CLK_MSR_ID(200, "rng_ring_osc_clk_1[0]"), + CLK_MSR_ID(201, "rng_ring_osc_clk_1[1]"), + CLK_MSR_ID(202, "rng_ring_osc_clk_1[2]"), + CLK_MSR_ID(203, "rng_ring_osc_clk_1[3]"), + +}; + static int meson_measure_id(struct meson_msr_id *clk_msr_id, unsigned int duration) { @@ -713,6 +853,19 @@ static const struct meson_msr_data clk_msr_sm1_data = { .reg = &msr_reg_offset, }; +struct msr_reg_offset msr_reg_offset_v2 = { + .freq_ctrl = 0x0, + .duty_ctrl = 0x4, + .freq_val = 0x8, + .duty_val = 0x18, +}; + +static const struct meson_msr_data clk_msr_c3_data = { + .msr_table = (void *)clk_msr_c3, + .msr_count = ARRAY_SIZE(clk_msr_c3), + .reg = &msr_reg_offset_v2, +}; + static const struct of_device_id meson_msr_match_table[] = { { .compatible = "amlogic,meson-gx-clk-measure", @@ -738,6 +891,10 @@ static const struct of_device_id meson_msr_match_table[] = { .compatible = "amlogic,meson-sm1-clk-measure", .data = &clk_msr_sm1_data, }, + { + .compatible = "amlogic,c3-clk-measure", + .data = &clk_msr_c3_data, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, meson_msr_match_table); From patchwork Mon Apr 14 10:12:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu X-Patchwork-Id: 14050130 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C2CE9C369B2 for ; Mon, 14 Apr 2025 10:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Tc+Ls8QmoJKRDueuGnjX5gVNyRNj3VbsSLtu8GhBELw=; b=gJj11BRZJeQVL1/ewQ95K2Ov+7 70aoSYxE6XmTjs4m9OhAFw6F7TXGh2iFMEW0XiJZGDwprEzjHWRyZ/JcDy3QhIMHuyIgnVUozgJ7T Q2jAjs7w1yrPKEY92p1pqgTQPlohWTql77QOfnwrQp2L28a0dZWhFNLosDihxBA4WuHjBResYlpUG acK+lBGAXjhrp9r3rOpUAjVKBu2lKL66dT8jeHEuTsgx6Ly3KD27MTpq7pxnK5X/AakGizUXnQaXy J18RULqEQeaX/09hIwR6dJ/ClXhFeQmTSSbOVeK+G3V3YAy/w5ZJecGS2Jx94hmLi/3aXtdZUe/S6 R+OteLFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4H1d-00000001WgF-1WoO; Mon, 14 Apr 2025 10:26:49 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4GoD-00000001Rl9-0WIR; Mon, 14 Apr 2025 10:13:00 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4A67D5C5420; Mon, 14 Apr 2025 10:10:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id E566FC4CEEB; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744625576; bh=53W1bNK9W7QQYZ6q3O5F0QS6Wr0aZL8OTvR5FfS4m5I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=WtNfq9DZaUJZBTjgwNHG1uk0idTsHZZh+OkaKxmr6V08euXlkfT3Wi2hItvPn3eLu t25Bitpm9+Vk8umrDmpKak5ZU6OmWAF8oapIXnIGRGrs1h3ZMz+4laYzzga1hgI0Th a/lpuRt3KPvAtvxf7cvIWLKQhSH0L2ulpoyV6qSLduj2NiuONQWCfFQ40xpyuv++E0 QvdmSYP14SIkQ9tBu7U1zvIYlxuWC2+6OoZFdP1w0+7FRK3cqn2LQUVK7AucsrT0/j 0/Wb4qpAzqzAPYU9wD21489zqHMDkH4Fc9GkfyK3NC6I7d+27P4yVnEaxwjOXwV9WE iBREDYDsjfXGw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB044C369BA; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) Date: Mon, 14 Apr 2025 18:12:32 +0800 Subject: [PATCH v2 5/7] soc: amlogic: clk-measure: Add support for S4 MIME-Version: 1.0 Message-Id: <20250414-clk-measure-v2-5-65077690053a@amlogic.com> References: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> In-Reply-To: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1744625573; l=6928; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=B+ImmzcSg0MnVcqeFPpwfyQB4KHRlMlguio/y8LkwZU=; b=tkfMcPfGE93Dh4PX41BJ/zc7JCsxxnVtg7yhCqo2w2OXsKiJKNdHloJ/VHZcYRxn7HhJ7Iwy/ aRJ0SlWgooeCMEfO6JriOE4LC/rCs99RVF054ta24l4EyckYC2XgIsQ X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250414_031257_280955_7D19D55D X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: chuan.liu@amlogic.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chuan Liu From: Chuan Liu Add the clk-measurer clocks IDs for the Amlogic S4 SoC family. Signed-off-by: Chuan Liu Reviewed-by: Neil Armstrong --- drivers/soc/amlogic/meson-clk-measure.c | 163 ++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c index 810454ac4119..f2fca59a6fc4 100644 --- a/drivers/soc/amlogic/meson-clk-measure.c +++ b/drivers/soc/amlogic/meson-clk-measure.c @@ -634,6 +634,159 @@ static const struct meson_msr_id clk_msr_c3[] = { }; +static const struct meson_msr_id clk_msr_s4[] = { + CLK_MSR_ID(0, "sys_clk"), + CLK_MSR_ID(1, "axi_clk"), + CLK_MSR_ID(2, "rtc_clk"), + CLK_MSR_ID(5, "mali"), + CLK_MSR_ID(6, "cpu_clk_div16"), + CLK_MSR_ID(7, "ceca_clk"), + CLK_MSR_ID(8, "cecb_clk"), + CLK_MSR_ID(10, "fclk_div5"), + CLK_MSR_ID(11, "mpll0"), + CLK_MSR_ID(12, "mpll1"), + CLK_MSR_ID(13, "mpll2"), + CLK_MSR_ID(14, "mpll3"), + CLK_MSR_ID(15, "fclk_50m"), + CLK_MSR_ID(16, "pcie_clk_inp"), + CLK_MSR_ID(17, "pcie_clk_inn"), + CLK_MSR_ID(18, "mpll_clk_test_out"), + CLK_MSR_ID(19, "hifi_pll"), + CLK_MSR_ID(20, "gp0_pll"), + CLK_MSR_ID(21, "gp1_pll"), + CLK_MSR_ID(22, "eth_mppll_50m_ckout"), + CLK_MSR_ID(23, "sys_pll_div16"), + CLK_MSR_ID(24, "ddr_dpll_pt_clk"), + CLK_MSR_ID(30, "mod_eth_phy_ref_clk"), + CLK_MSR_ID(31, "mod_eth_tx_clk"), + CLK_MSR_ID(32, "eth_125m"), + CLK_MSR_ID(33, "eth_rmii"), + CLK_MSR_ID(34, "co_clkin_to_mac"), + CLK_MSR_ID(35, "mod_eth_rx_clk_rmii"), + CLK_MSR_ID(36, "co_rx_clk"), + CLK_MSR_ID(37, "co_tx_clk"), + CLK_MSR_ID(38, "eth_phy_rxclk"), + CLK_MSR_ID(39, "eth_phy_plltxclk"), + CLK_MSR_ID(40, "ephy_test_clk"), + CLK_MSR_ID(50, "vid_pll_div_clk_out"), + CLK_MSR_ID(51, "enci"), + CLK_MSR_ID(52, "encp"), + CLK_MSR_ID(53, "encl"), + CLK_MSR_ID(54, "vdac"), + CLK_MSR_ID(55, "cdac_clk_c"), + CLK_MSR_ID(56, "mod_tcon_clko"), + CLK_MSR_ID(57, "lcd_an_clk_ph2"), + CLK_MSR_ID(58, "lcd_an_clk_ph3"), + CLK_MSR_ID(59, "hdmitx_pixel"), + CLK_MSR_ID(60, "vdin_meas"), + CLK_MSR_ID(61, "vpu"), + CLK_MSR_ID(62, "vpu_clkb"), + CLK_MSR_ID(63, "vpu_clkb_tmp"), + CLK_MSR_ID(64, "vpu_clkc"), + CLK_MSR_ID(65, "vid_lock"), + CLK_MSR_ID(66, "vapb"), + CLK_MSR_ID(67, "ge2d"), + CLK_MSR_ID(68, "cts_hdcp22_esmclk"), + CLK_MSR_ID(69, "cts_hdcp22_skpclk"), + CLK_MSR_ID(76, "hdmitx_tmds"), + CLK_MSR_ID(77, "hdmitx_sys_clk"), + CLK_MSR_ID(78, "hdmitx_fe_clk"), + CLK_MSR_ID(79, "rama"), + CLK_MSR_ID(93, "vdec"), + CLK_MSR_ID(99, "hevcf"), + CLK_MSR_ID(100, "demod_core"), + CLK_MSR_ID(101, "adc_extclk_in"), + CLK_MSR_ID(102, "cts_demod_core_t2_clk"), + CLK_MSR_ID(103, "adc_dpll_intclk"), + CLK_MSR_ID(104, "adc_dpll_clk_b3"), + CLK_MSR_ID(105, "s2_adc_clk"), + CLK_MSR_ID(106, "deskew_pll_clk_div32_out"), + CLK_MSR_ID(110, "sc"), + CLK_MSR_ID(111, "sar_adc"), + CLK_MSR_ID(113, "sd_emmc_c"), + CLK_MSR_ID(114, "sd_emmc_b"), + CLK_MSR_ID(115, "sd_emmc_a"), + CLK_MSR_ID(116, "gpio_msr_clk"), + CLK_MSR_ID(118, "spicc0"), + CLK_MSR_ID(121, "ts"), + CLK_MSR_ID(130, "audio_vad_clk"), + CLK_MSR_ID(131, "acodec_dac_clk_x128"), + CLK_MSR_ID(132, "audio_locker_in_clk"), + CLK_MSR_ID(133, "audio_locker_out_clk"), + CLK_MSR_ID(134, "audio_tdmout_c_sclk"), + CLK_MSR_ID(135, "audio_tdmout_b_sclk"), + CLK_MSR_ID(136, "audio_tdmout_a_sclk"), + CLK_MSR_ID(137, "audio_tdmin_lb_sclk"), + CLK_MSR_ID(138, "audio_tdmin_c_sclk"), + CLK_MSR_ID(139, "audio_tdmin_b_sclk"), + CLK_MSR_ID(140, "audio_tdmin_a_sclk"), + CLK_MSR_ID(141, "audio_resamplea_clk"), + CLK_MSR_ID(142, "audio_pdm_sysclk"), + CLK_MSR_ID(143, "audio_spdifout_b_mst_clk"), + CLK_MSR_ID(144, "audio_spdifout_mst_clk"), + CLK_MSR_ID(145, "audio_spdifin_mst_clk"), + CLK_MSR_ID(146, "audio_pdm_dclk"), + CLK_MSR_ID(147, "audio_resampleb_clk"), + CLK_MSR_ID(160, "pwm_j"), + CLK_MSR_ID(161, "pwm_i"), + CLK_MSR_ID(162, "pwm_h"), + CLK_MSR_ID(163, "pwm_g"), + CLK_MSR_ID(164, "pwm_f"), + CLK_MSR_ID(165, "pwm_e"), + CLK_MSR_ID(166, "pwm_d"), + CLK_MSR_ID(167, "pwm_c"), + CLK_MSR_ID(168, "pwm_b"), + CLK_MSR_ID(169, "pwm_a"), + CLK_MSR_ID(176, "rng_ring_0"), + CLK_MSR_ID(177, "rng_ring_1"), + CLK_MSR_ID(178, "rng_ring_2"), + CLK_MSR_ID(179, "rng_ring_3"), + CLK_MSR_ID(180, "dmc_osc_ring(LVT16)"), + CLK_MSR_ID(181, "gpu_osc_ring0(LVT16)"), + CLK_MSR_ID(182, "gpu_osc_ring1(ULVT16)"), + CLK_MSR_ID(183, "gpu_osc_ring2(SLVT16)"), + CLK_MSR_ID(184, "vpu_osc_ring0(SVT24)"), + CLK_MSR_ID(185, "vpu_osc_ring1(LVT20)"), + CLK_MSR_ID(186, "vpu_osc_ring2(LVT16)"), + CLK_MSR_ID(187, "dos_osc_ring0(SVT24)"), + CLK_MSR_ID(188, "dos_osc_ring1(SVT16)"), + CLK_MSR_ID(189, "dos_osc_ring2(LVT16)"), + CLK_MSR_ID(190, "dos_osc_ring3(ULVT20)"), + CLK_MSR_ID(192, "axi_sram_osc_ring(SVT16)"), + CLK_MSR_ID(193, "demod_osc_ring0"), + CLK_MSR_ID(194, "demod_osc_ring1"), + CLK_MSR_ID(195, "sar_osc_ring"), + CLK_MSR_ID(196, "sys_cpu_osc_ring0"), + CLK_MSR_ID(197, "sys_cpu_osc_ring1"), + CLK_MSR_ID(198, "sys_cpu_osc_ring2"), + CLK_MSR_ID(199, "sys_cpu_osc_ring3"), + CLK_MSR_ID(200, "sys_cpu_osc_ring4"), + CLK_MSR_ID(201, "sys_cpu_osc_ring5"), + CLK_MSR_ID(202, "sys_cpu_osc_ring6"), + CLK_MSR_ID(203, "sys_cpu_osc_ring7"), + CLK_MSR_ID(204, "sys_cpu_osc_ring8"), + CLK_MSR_ID(205, "sys_cpu_osc_ring9"), + CLK_MSR_ID(206, "sys_cpu_osc_ring10"), + CLK_MSR_ID(207, "sys_cpu_osc_ring11"), + CLK_MSR_ID(208, "sys_cpu_osc_ring12"), + CLK_MSR_ID(209, "sys_cpu_osc_ring13"), + CLK_MSR_ID(210, "sys_cpu_osc_ring14"), + CLK_MSR_ID(211, "sys_cpu_osc_ring15"), + CLK_MSR_ID(212, "sys_cpu_osc_ring16"), + CLK_MSR_ID(213, "sys_cpu_osc_ring17"), + CLK_MSR_ID(214, "sys_cpu_osc_ring18"), + CLK_MSR_ID(215, "sys_cpu_osc_ring19"), + CLK_MSR_ID(216, "sys_cpu_osc_ring20"), + CLK_MSR_ID(217, "sys_cpu_osc_ring21"), + CLK_MSR_ID(218, "sys_cpu_osc_ring22"), + CLK_MSR_ID(219, "sys_cpu_osc_ring23"), + CLK_MSR_ID(220, "sys_cpu_osc_ring24"), + CLK_MSR_ID(221, "sys_cpu_osc_ring25"), + CLK_MSR_ID(222, "sys_cpu_osc_ring26"), + CLK_MSR_ID(223, "sys_cpu_osc_ring27"), + +}; + static int meson_measure_id(struct meson_msr_id *clk_msr_id, unsigned int duration) { @@ -866,6 +1019,12 @@ static const struct meson_msr_data clk_msr_c3_data = { .reg = &msr_reg_offset_v2, }; +static const struct meson_msr_data clk_msr_s4_data = { + .msr_table = (void *)clk_msr_s4, + .msr_count = ARRAY_SIZE(clk_msr_s4), + .reg = &msr_reg_offset_v2, +}; + static const struct of_device_id meson_msr_match_table[] = { { .compatible = "amlogic,meson-gx-clk-measure", @@ -895,6 +1054,10 @@ static const struct of_device_id meson_msr_match_table[] = { .compatible = "amlogic,c3-clk-measure", .data = &clk_msr_c3_data, }, + { + .compatible = "amlogic,s4-clk-measure", + .data = &clk_msr_s4_data, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, meson_msr_match_table); From patchwork Mon Apr 14 10:12:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu X-Patchwork-Id: 14050121 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6E677C369B2 for ; Mon, 14 Apr 2025 10:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=I5Mj1pNRB/Jcmnkcnw1AaVmDZcbv1F2dQhqjQblRV04=; b=3ZrjphXM/7M73L9wPqwwzzgr1Q 9BYb+hZEInsBZgTD4NKiRaLqpSMX5l8k/iHl+x2fZPN+1Bx3pfhv3goP1r0RrAym/lXyzJW5d1C7/ EMOJdQi1RJg/4ibJDK1HY7AM45DAG/ta2Z4E1QDA2mXRvwUsTiwDo2CeIkQYQWIN2+6c6TpTskbKo TqFi4bpaRE45G44pwCXraHjXMWgSQbUtj1VI0SAvIQJONAiP1P4fFA83Lvoq+NJ3jCNsh8M/BHEPN dwLOeY8OciZX9z0rlE1C7Hv6XwcDF1X3ggo1nUu2POHxrAA/csfNDnWNjzzyA0wy9B/ZpaHwcCErG xd+dxRvA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4Gvz-00000001Uck-3IL8; Mon, 14 Apr 2025 10:20:59 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4GoC-00000001Rl3-3Pll; Mon, 14 Apr 2025 10:12:57 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 386FD4A57D; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 0BE96C4CEEF; Mon, 14 Apr 2025 10:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744625576; bh=h91kvtbHybCRq0mtV86D3bylhFUe+/Vc/2PFX8biaKk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=BfijaWJTU4q0BV4MwPkaPrZm82mtAYyUa7UyRcxO0p03GMJOMgnzEBJ67BB2+aXiN wJDo2di/IEL1InRahYszkLgeyin1GZV9p+7ZTe/vWF6mdRa2guIPtjxcpTCHKqmXOe K6iH5uSzqwjcJ9PAV6ysa3YSmQqs3WqyYzqpG/aWgRDFGW5PYY8oX1osQ1VPDTJFEw rN04Pr8aE3NcfqXWA497XLhpbwDjceE3kp9DFjED59BlOu1lZxpaapLDV1GmofWyLp HbiXohTwn0Io6a/nq+3+rFGEWTxFLkx0XnwaLxSgmuC5KsMeUB+MuU/RXED2+wLceU HMcTESji78Azg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC774C369B8; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) Date: Mon, 14 Apr 2025 18:12:33 +0800 Subject: [PATCH v2 6/7] arm64: dts: amlogic: C3: Add clk-measure controller node MIME-Version: 1.0 Message-Id: <20250414-clk-measure-v2-6-65077690053a@amlogic.com> References: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> In-Reply-To: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1744625573; l=777; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=RawVLe8oduTQK4vrDANIUMhpJtp0oGlCVlxkPVdHe1c=; b=3xweDT1QpTKyZLFyATVKjOvY8gWyeBw2Icep1hGvtVtfCGF6p50LPTNw3y7UlQbbexbA9u9GP ILoTEzuk94sAmzqn2xZU5w1seUpKGYz7UvEXkXOzYlpnZr968zz1ZXg X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250414_031256_881711_E82EC1B9 X-CRM114-Status: UNSURE ( 7.45 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: chuan.liu@amlogic.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chuan Liu From: Chuan Liu Add the clk-measure controller node for C3 SoC family. Signed-off-by: Chuan Liu Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi index fd0e557eba06..cb9ea3ca6ee0 100644 --- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi @@ -760,6 +760,11 @@ internal_ephy: ethernet_phy@8 { }; }; + clk_msr: clock-measure@48000 { + compatible = "amlogic,c3-clk-measure"; + reg = <0x0 0x48000 0x0 0x1c>; + }; + spicc0: spi@50000 { compatible = "amlogic,meson-g12a-spicc"; reg = <0x0 0x50000 0x0 0x44>; From patchwork Mon Apr 14 10:12:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuan Liu X-Patchwork-Id: 14050126 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C8DEBC369B5 for ; Mon, 14 Apr 2025 10:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=PEgZZxScHIMw9bh1r50TVrE8mKCke5KJ3t9Xky8pSrg=; b=a1vjwo6XhPj4yua82teveVUc1A fAk+/kwi2EJnSyj618XBv/zals1szHqnlN84TqyqbkDSKOVOhAQa8X93ZYV42Hz+icPmuWgsK9T1q u/r7KvS+0i1W8j75C7Ge2auT4/7RBZ37nFquDZxhu/clnnErQ+pmYX6WU3+QIJlKJNB5Nt+o2zhoj 3qN9aXdciY7UY3zhurF3iO2cdYa1KnPw2ZBBn7qvhuNqyTYNQwi7NTf6aDtJ61qnKnlSJehJsxHkJ htOYaXYm8U/xfUxDDztvGjKd22q46GGuDz8dljEakncY8VSt8TbBkg1Td8zaQcCsWBxbEOhmnxYnI flNPo0Gg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4Gzh-00000001Vu4-30lj; Mon, 14 Apr 2025 10:24:49 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4GoD-00000001Rl6-0E9W; Mon, 14 Apr 2025 10:13:00 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 458934A582; Mon, 14 Apr 2025 10:12:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 16DB3C4CEF1; Mon, 14 Apr 2025 10:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744625576; bh=HLUNHReE0cNLO6CqkVo6sXtk4KZJ2890NAAWXXyNoFk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=CLhY4Um1h3j2aFquJGFPvC38oqN+YOCoEPZdww7e9guZVqXFB2xazsCAGRitei6df SjgpylDfKlNfGRKTtzNHuie0We5swhdJHhbbdOVHZv/O5vZUIysOTrVGbo0C6aon6p F3hpkLtX4GG+ZWwR5xBIEPLmtiso+uAvGZ0FDklb+HKFvK46HxOZIvoy0njsOBaDuh VBEYOLU5N1nvb8StFWh5X8c3NZUPoGUFd3IxhMGwVv+LFVLo6U9P/jfDvq1Bd4pbDc ZhtkYqqgTN3OL1FppvbtLMxyN3RNVFK9aUR/OAhPKluijAO7jhS1LISN3oxGbz1L6u OlevZIWu+F0JA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BFB0C369B2; Mon, 14 Apr 2025 10:12:56 +0000 (UTC) Date: Mon, 14 Apr 2025 18:12:34 +0800 Subject: [PATCH v2 7/7] arm64: dts: amlogic: S4: Add clk-measure controller node MIME-Version: 1.0 Message-Id: <20250414-clk-measure-v2-7-65077690053a@amlogic.com> References: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> In-Reply-To: <20250414-clk-measure-v2-0-65077690053a@amlogic.com> To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Chuan Liu X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1744625573; l=767; i=chuan.liu@amlogic.com; s=20240902; h=from:subject:message-id; bh=itRtutR2PIVs/kAFr6Titwp0GUUTkodKKnworvlokhM=; b=JEJNCUO49wWdoCvxqJSItcfefAv5rWsX4x/UkgYRkHFA0qg8SFWeO9i1EIxsud5Y+obbjddCI 3/5z2wWBSNGC9HWTbopBDAUc3pYnQy0DWo/8Z9Z1FJklsqn/o1kSqlT X-Developer-Key: i=chuan.liu@amlogic.com; a=ed25519; pk=fnKDB+81SoWGKW2GJNFkKy/ULvsDmJZRGBE7pR5Xcpo= X-Endpoint-Received: by B4 Relay for chuan.liu@amlogic.com/20240902 with auth_id=203 X-Original-From: Chuan Liu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250414_031257_106200_53970CD8 X-CRM114-Status: UNSURE ( 7.34 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: chuan.liu@amlogic.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chuan Liu From: Chuan Liu Add the clk-measure controller node for S4 SoC family. Signed-off-by: Chuan Liu Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi index 957577d986c0..9d99ed2994df 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi @@ -629,6 +629,11 @@ internal_ephy: ethernet-phy@8 { }; }; + clk_msr: clock-measure@48000 { + compatible = "amlogic,s4-clk-measure"; + reg = <0x0 0x48000 0x0 0x1c>; + }; + spicc0: spi@50000 { compatible = "amlogic,meson-g12a-spicc"; reg = <0x0 0x50000 0x0 0x44>;