[PATCH] soc: amlogic: clk-measure: Fix AXG HIFI PLL name

[PATCH] soc: amlogic: clk-measure: Fix AXG HIFI PLL name

[Jian Hu via B4 Relay]

From: Jian Hu <jian.hu@amlogic.com>

AXG does not have a GP1 PLL. Clock measurement ID 5 corresponds
to the HIFI PLL, but it is incorrectly named "gp1_pll".

Rename it to "hifi_pll" to match the actual hardware.

Fixes: 19e0bde7bf6a ("soc: amlogic: clk-measure: add axg and g12a support")
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
---
 drivers/soc/amlogic/meson-clk-measure.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c
index 33767f0bc67c..c1ffa2537464 100644
--- a/drivers/soc/amlogic/meson-clk-measure.c
+++ b/drivers/soc/amlogic/meson-clk-measure.c
@@ -182,7 +182,7 @@ static const struct meson_msr_id clk_msr_axg[] = {
 	CLK_MSR_ID(2, "ring_osc_out_ee_2"),
 	CLK_MSR_ID(3, "a53_ring_osc"),
 	CLK_MSR_ID(4, "gp0_pll"),
-	CLK_MSR_ID(5, "gp1_pll"),
+	CLK_MSR_ID(5, "hifi_pll"),
 	CLK_MSR_ID(7, "clk81"),
 	CLK_MSR_ID(9, "encl"),
 	CLK_MSR_ID(17, "sys_pll_div16"),

---
base-commit: a848d72aab71e19ea78180f2502ad7d12818723f
change-id: 20261027-fix_axg-9a1226dd4f1d

Best regards,
-- 
Jian Hu <jian.hu@amlogic.com>

Re: [PATCH] soc: amlogic: clk-measure: Fix AXG HIFI PLL name

[Neil Armstrong]

On 10/27/26 09:43, Jian Hu via B4 Relay wrote:
> From: Jian Hu <jian.hu@amlogic.com>
> 
> AXG does not have a GP1 PLL. Clock measurement ID 5 corresponds
> to the HIFI PLL, but it is incorrectly named "gp1_pll".
> 
> Rename it to "hifi_pll" to match the actual hardware.
> 
> Fixes: 19e0bde7bf6a ("soc: amlogic: clk-measure: add axg and g12a support")
> Signed-off-by: Jian Hu <jian.hu@amlogic.com>
> ---
>   drivers/soc/amlogic/meson-clk-measure.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c
> index 33767f0bc67c..c1ffa2537464 100644
> --- a/drivers/soc/amlogic/meson-clk-measure.c
> +++ b/drivers/soc/amlogic/meson-clk-measure.c
> @@ -182,7 +182,7 @@ static const struct meson_msr_id clk_msr_axg[] = {
>   	CLK_MSR_ID(2, "ring_osc_out_ee_2"),
>   	CLK_MSR_ID(3, "a53_ring_osc"),
>   	CLK_MSR_ID(4, "gp0_pll"),
> -	CLK_MSR_ID(5, "gp1_pll"),
> +	CLK_MSR_ID(5, "hifi_pll"),
>   	CLK_MSR_ID(7, "clk81"),
>   	CLK_MSR_ID(9, "encl"),
>   	CLK_MSR_ID(17, "sys_pll_div16"),
> 
> ---
> base-commit: a848d72aab71e19ea78180f2502ad7d12818723f
> change-id: 20261027-fix_axg-9a1226dd4f1d
> 
> Best regards,

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

Thanks,
Neil

Re: [PATCH] soc: amlogic: clk-measure: Fix AXG HIFI PLL name

[Neil Armstrong]

Hi,

On Tue, 27 Oct 2026 16:43:39 +0800, Jian Hu wrote:
> AXG does not have a GP1 PLL. Clock measurement ID 5 corresponds
> to the HIFI PLL, but it is incorrectly named "gp1_pll".
> 
> Rename it to "hifi_pll" to match the actual hardware.

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v7.4/fixes)

[1/1] soc: amlogic: clk-measure: Fix AXG HIFI PLL name
      https://git.kernel.org/amlogic/c/81e66c8204c98b2c71798f241cd43f694c5cfb3f

These changes has been applied on the intermediate git tree [1].

The v7.4/fixes branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.

In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].

The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.

If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

-- 
Neil