From 08414762396f82e4c4d3c18d08b67235cb8ead2f Mon Sep 17 00:00:00 2001 From: Old-Ding <35417409+Old-Ding@users.noreply.github.com> Date: Mon, 6 Jul 2026 11:17:38 +0800 Subject: [PATCH] arch: imx9: allow last CCM root index CCM_CR_COUNT is defined as the last CCM root index in the non-SCMI tables, and CCM_CR_PALCAMESCAN also uses that value. Use a strict greater-than check so root 94 reaches the CCM register helpers. Generated-by: OpenAI Codex Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com> --- arch/arm/src/imx9/imx9_ccm.c | 4 ++-- arch/arm64/src/imx9/imx9_ccm.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/imx9/imx9_ccm.c b/arch/arm/src/imx9/imx9_ccm.c index 6adef244fae..341af3cec13 100644 --- a/arch/arm/src/imx9/imx9_ccm.c +++ b/arch/arm/src/imx9/imx9_ccm.c @@ -67,7 +67,7 @@ int imx9_ccm_configure_root_clock(int root, int mux, uint32_t div) { uint32_t value; - if (root >= CCM_CR_COUNT || div == 0 || div > 255 || mux >= ROOT_MUX_MAX) + if (root > CCM_CR_COUNT || div == 0 || div > 255 || mux >= ROOT_MUX_MAX) { return -EINVAL; } @@ -103,7 +103,7 @@ int imx9_ccm_configure_root_clock(int root, int mux, uint32_t div) int imx9_ccm_root_clock_on(int root, bool enabled) { - if (root >= CCM_CR_COUNT) + if (root > CCM_CR_COUNT) { return -EINVAL; } diff --git a/arch/arm64/src/imx9/imx9_ccm.c b/arch/arm64/src/imx9/imx9_ccm.c index 7cb1fef9629..b0e85b9fd8a 100644 --- a/arch/arm64/src/imx9/imx9_ccm.c +++ b/arch/arm64/src/imx9/imx9_ccm.c @@ -270,7 +270,7 @@ int imx9_ccm_configure_root_clock(int root, int src, uint32_t div) uint32_t value; int i; - if (root >= CCM_CR_COUNT || div == 0 || div > 255) + if (root > CCM_CR_COUNT || div == 0 || div > 255) { return -EINVAL; } @@ -321,7 +321,7 @@ int imx9_ccm_configure_root_clock(int root, int src, uint32_t div) int imx9_ccm_root_clock_on(int root, bool enabled) { - if (root >= CCM_CR_COUNT) + if (root > CCM_CR_COUNT) { return -EINVAL; }