From: Chuan Liu via B4 Relay <devnull+chuan.liu.amlogic.com@kernel.org>
To: Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Neil Armstrong <neil.armstrong@linaro.org>,
Kevin Hilman <khilman@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org,
Chuan Liu <chuan.liu@amlogic.com>
Subject: [PATCH v2 04/12] soc: amlogic: clk-measure: Align compatible entries with DT bindings
Date: Sun, 20 Sep 2026 18:25:06 +0800 [thread overview]
Message-ID: <20260920-more-socs-to-support-clk_measure-v2-4-224382a429e8@amlogic.com> (raw)
In-Reply-To: <20260920-more-socs-to-support-clk_measure-v2-0-224382a429e8@amlogic.com>
From: Chuan Liu <chuan.liu@amlogic.com>
Reorder the meson_msr_match_table entries to match the order of the
compatible strings in the DT binding.
Move the newly added clk_msr_a1_data entry accordingly, while keeping
the existing SoC-specific data order unchanged.
Signed-off-by: Chuan Liu <chuan.liu@amlogic.com>
---
drivers/soc/amlogic/meson-clk-measure.c | 40 ++++++++++++++++-----------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c
index 0d4ba2555d17..d58c8d9629ea 100644
--- a/drivers/soc/amlogic/meson-clk-measure.c
+++ b/drivers/soc/amlogic/meson-clk-measure.c
@@ -1279,6 +1279,12 @@ static const struct msr_reg_offset msr_reg_offset_v2 = {
.duty_val = 0x18,
};
+static const struct meson_msr_data clk_msr_a1_data = {
+ .msr_table = (void *)clk_msr_a1,
+ .msr_count = ARRAY_SIZE(clk_msr_a1),
+ .reg = &msr_reg_offset_v2,
+};
+
static const struct meson_msr_data clk_msr_c3_data = {
.msr_table = (void *)clk_msr_c3,
.msr_count = ARRAY_SIZE(clk_msr_c3),
@@ -1291,12 +1297,6 @@ static const struct meson_msr_data clk_msr_s4_data = {
.reg = &msr_reg_offset_v2,
};
-static const struct meson_msr_data clk_msr_a1_data = {
- .msr_table = (void *)clk_msr_a1,
- .msr_count = ARRAY_SIZE(clk_msr_a1),
- .reg = &msr_reg_offset_v2,
-};
-
static const struct meson_msr_data clk_msr_t7_data = {
.msr_table = (void *)clk_msr_t7,
.msr_count = ARRAY_SIZE(clk_msr_t7),
@@ -1305,16 +1305,12 @@ static const struct meson_msr_data clk_msr_t7_data = {
static const struct of_device_id meson_msr_match_table[] = {
{
- .compatible = "amlogic,meson-gx-clk-measure",
- .data = &clk_msr_gx_data,
- },
- {
- .compatible = "amlogic,meson8-clk-measure",
- .data = &clk_msr_m8_data,
+ .compatible = "amlogic,a1-clk-measure",
+ .data = &clk_msr_a1_data,
},
{
- .compatible = "amlogic,meson8b-clk-measure",
- .data = &clk_msr_m8_data,
+ .compatible = "amlogic,c3-clk-measure",
+ .data = &clk_msr_c3_data,
},
{
.compatible = "amlogic,meson-axg-clk-measure",
@@ -1324,21 +1320,25 @@ static const struct of_device_id meson_msr_match_table[] = {
.compatible = "amlogic,meson-g12a-clk-measure",
.data = &clk_msr_g12a_data,
},
+ {
+ .compatible = "amlogic,meson-gx-clk-measure",
+ .data = &clk_msr_gx_data,
+ },
{
.compatible = "amlogic,meson-sm1-clk-measure",
.data = &clk_msr_sm1_data,
},
{
- .compatible = "amlogic,c3-clk-measure",
- .data = &clk_msr_c3_data,
+ .compatible = "amlogic,meson8-clk-measure",
+ .data = &clk_msr_m8_data,
},
{
- .compatible = "amlogic,s4-clk-measure",
- .data = &clk_msr_s4_data,
+ .compatible = "amlogic,meson8b-clk-measure",
+ .data = &clk_msr_m8_data,
},
{
- .compatible = "amlogic,a1-clk-measure",
- .data = &clk_msr_a1_data,
+ .compatible = "amlogic,s4-clk-measure",
+ .data = &clk_msr_s4_data,
},
{
.compatible = "amlogic,t7-clk-measure",
--
2.42.0
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2026-09-20 10:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-20 10:25 [PATCH v2 00/12] soc: amlogic: clk-measure: Add support for more SoCs Chuan Liu via B4 Relay
2026-09-20 10:25 ` [PATCH v2 01/12] dt-bindings: soc: amlogic: Reordering compatible of clk-measure Chuan Liu via B4 Relay
2026-09-24 12:56 ` Krzysztof Kozlowski
2026-09-20 10:25 ` [PATCH v2 02/12] dt-bindings: soc: amlogic: Add clk-measure compatible to support more SoCs Chuan Liu via B4 Relay
2026-09-24 12:57 ` Krzysztof Kozlowski
2026-09-20 10:25 ` [PATCH v2 03/12] soc: amlogic: clk-measure: Support more measurement channels Chuan Liu via B4 Relay
2026-09-20 10:25 ` Chuan Liu via B4 Relay [this message]
2026-09-20 10:25 ` [PATCH v2 05/12] soc: amlogic: clk-measure: Add support for more SoCs Chuan Liu via B4 Relay
2026-09-20 10:25 ` [PATCH v2 06/12] soc: amlogic: clk-measure: Optimize CLK_MSR_ID to reduce memory usage Chuan Liu via B4 Relay
2026-09-20 10:25 ` [PATCH v2 07/12] arm64: dts: amlogic: a5: Add clk-measure controller node Chuan Liu via B4 Relay
2026-09-20 10:25 ` [PATCH v2 08/12] arm64: dts: amlogic: a4: " Chuan Liu via B4 Relay
2026-09-20 10:25 ` [PATCH v2 09/12] arm64: dts: amlogic: s7: " Chuan Liu via B4 Relay
2026-09-20 10:25 ` [PATCH v2 10/12] arm64: dts: amlogic: s7d: " Chuan Liu via B4 Relay
2026-09-20 10:25 ` [PATCH v2 11/12] arm64: dts: amlogic: s6: " Chuan Liu via B4 Relay
2026-09-20 10:25 ` [PATCH v2 12/12] arm64: dts: amlogic: a9: " Chuan Liu via B4 Relay
2026-09-30 13:22 ` [PATCH v2 00/12] soc: amlogic: clk-measure: Add support for more SoCs Neil Armstrong
2026-10-02 9:27 ` (subset) " Neil Armstrong
2026-10-02 9:28 ` Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260920-more-socs-to-support-clk_measure-v2-4-224382a429e8@amlogic.com \
--to=devnull+chuan.liu.amlogic.com@kernel.org \
--cc=chuan.liu@amlogic.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=krzk+dt@kernel.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=neil.armstrong@linaro.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®