clk: qcom: rpmh: support separate symbol name for the RPMH clocks

Both ARC and VRM clocks have minor differences between platforms.
However using SoC names directly results in duplication, confusion and
occasional errors. Next patches are going to drop the SoC names and
encode these differences into the clock names.
To keep the system clock names (visible to userspace) intact, add
separate symbol names that are used in the code.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Reviewed-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221202185843.721673-6-dmitry.baryshkov@linaro.org

diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
index 2ab406c..34099bb 100644 (file)
--- a/drivers/clk/qcom/clk-rpmh.c
+++ b/drivers/clk/qcom/clk-rpmh.c
@@ -70,15 +70,15 @@ struct clk_rpmh_desc {
 
 static DEFINE_MUTEX(rpmh_clk_lock);
 
-#define __DEFINE_CLK_RPMH(_platform, _name, _res_name,                 \
+#define __DEFINE_CLK_RPMH(_platform, _name, _clk_name, _res_name,      \
                          _res_en_offset, _res_on, _div)                \
-       static struct clk_rpmh _platform##_##_name##_ao;                \
-       static struct clk_rpmh _platform##_##_name = {                  \
+       static struct clk_rpmh _platform##_##_clk_name##_ao;            \
+       static struct clk_rpmh _platform##_##_clk_name = {              \
                .res_name = _res_name,                                  \
                .res_addr = _res_en_offset,                             \
                .res_on_val = _res_on,                                  \
                .div = _div,                                            \
-               .peer = &_platform##_##_name##_ao,                      \
+               .peer = &_platform##_##_clk_name##_ao,                  \
                .valid_state_mask = (BIT(RPMH_WAKE_ONLY_STATE) |        \
                                      BIT(RPMH_ACTIVE_ONLY_STATE) |     \
                                      BIT(RPMH_SLEEP_STATE)),           \
@@ -92,12 +92,12 @@ static DEFINE_MUTEX(rpmh_clk_lock);
                        .num_parents = 1,                               \
                },                                                      \
        };                                                              \
-       static struct clk_rpmh _platform##_##_name##_ao= {              \
+       static struct clk_rpmh _platform##_##_clk_name##_ao= {          \
                .res_name = _res_name,                                  \
                .res_addr = _res_en_offset,                             \
                .res_on_val = _res_on,                                  \
                .div = _div,                                            \
-               .peer = &_platform##_##_name,                           \
+               .peer = &_platform##_##_clk_name,                       \
                .valid_state_mask = (BIT(RPMH_WAKE_ONLY_STATE) |        \
                                        BIT(RPMH_ACTIVE_ONLY_STATE)),   \
                .hw.init = &(struct clk_init_data){                     \
@@ -112,11 +112,11 @@ static DEFINE_MUTEX(rpmh_clk_lock);
        }
 
 #define DEFINE_CLK_RPMH_ARC(_platform, _name, _res_name, _res_on, _div)        \
-       __DEFINE_CLK_RPMH(_platform, _name, _res_name,                  \
+       __DEFINE_CLK_RPMH(_platform, _name, _name, _res_name,           \
                          CLK_RPMH_ARC_EN_OFFSET, _res_on, _div)
 
 #define DEFINE_CLK_RPMH_VRM(_platform, _name, _res_name, _div)         \
-       __DEFINE_CLK_RPMH(_platform, _name, _res_name,                  \
+       __DEFINE_CLK_RPMH(_platform, _name, _name, _res_name,           \
                          CLK_RPMH_VRM_EN_OFFSET, 1, _div)
 
 #define DEFINE_CLK_RPMH_BCM(_name, _res_name)                          \