clk: qcom: smd-rpm_ Make __DEFINE_CLK_SMD_RPM_BRANCH_PREFIX accept flags

In preparation for supporting keepalive clocks which can never be shut off
(as the platform would fall apart otherwise), make the
__DEFINE_CLK_SMD_RPM_BRANCH_PREFIX macro accept clock flags for the
active-only clock.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Tested-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230501-topic-rpmcc_xo_a-v1-1-93f18e47b607@linaro.org

diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
index 7797499faf312dca273ee593d61e2d90e8e2bcbc..f75a7eae3cff55045e2d182086c5b7504b03a712 100644 (file)
--- a/drivers/clk/qcom/clk-smd-rpm.c
+++ b/drivers/clk/qcom/clk-smd-rpm.c
@@ -67,7 +67,7 @@
                                    type, r_id, key)
 
 #define __DEFINE_CLK_SMD_RPM_BRANCH_PREFIX(_prefix, _name, _active,\
-                                          type, r_id, r, key)                \
+                                          type, r_id, r, key, ao_flags)      \
        static struct clk_smd_rpm clk_smd_rpm_##_prefix##_active;             \
        static struct clk_smd_rpm clk_smd_rpm_##_prefix##_name = {            \
                .rpm_res_type = (type),                                       \
@@ -102,12 +102,13 @@
                                        .name = "xo_board",                   \
                        },                                                    \
                        .num_parents = 1,                                     \
+                       .flags = (ao_flags),                                  \
                },                                                            \
        }
 
 #define __DEFINE_CLK_SMD_RPM_BRANCH(_name, _active, type, r_id, r, key)              \
                __DEFINE_CLK_SMD_RPM_BRANCH_PREFIX(/* empty */,               \
-               _name, _active, type, r_id, r, key)
+               _name, _active, type, r_id, r, key, 0)
 
 #define DEFINE_CLK_SMD_RPM(_name, type, r_id)                                \
                __DEFINE_CLK_SMD_RPM(_name##_clk, _name##_a_clk,              \
@@ -126,12 +127,12 @@
 #define DEFINE_CLK_SMD_RPM_BRANCH(_name, type, r_id, r)                              \
                __DEFINE_CLK_SMD_RPM_BRANCH_PREFIX(branch_,                   \
                _name##_clk, _name##_a_clk,                                   \
-               type, r_id, r, QCOM_RPM_SMD_KEY_ENABLE)
+               type, r_id, r, QCOM_RPM_SMD_KEY_ENABLE, 0)
 
 #define DEFINE_CLK_SMD_RPM_BRANCH_A(_name, type, r_id, r)                    \
                __DEFINE_CLK_SMD_RPM_BRANCH_PREFIX(branch_,                   \
                _name, _name##_a, type,                                       \
-               r_id, r, QCOM_RPM_SMD_KEY_ENABLE)
+               r_id, r, QCOM_RPM_SMD_KEY_ENABLE, 0)
 
 #define DEFINE_CLK_SMD_RPM_QDSS(_name, type, r_id)                           \
                __DEFINE_CLK_SMD_RPM(_name##_clk, _name##_a_clk,              \
@@ -146,7 +147,7 @@
                __DEFINE_CLK_SMD_RPM_BRANCH_PREFIX(_prefix,                   \
                _name, _name##_a,                                             \
                QCOM_SMD_RPM_CLK_BUF_A, r_id, r,                              \
-               QCOM_RPM_KEY_SOFTWARE_ENABLE)
+               QCOM_RPM_KEY_SOFTWARE_ENABLE, 0)
 
 #define DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(_name, r_id, r)                 \
                DEFINE_CLK_SMD_RPM_XO_BUFFER(_name, r_id, r);                 \