clk: qcom: smd-rpm: Move some RPM resources to the common header

In preparation for handling the bus clocks in the icc driver, carve out
some defines and a struct definition to the common rpm header.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Acked-by: Georgi Djakov <djakov@kernel.org>
Link: https://lore.kernel.org/r/20230526-topic-smd_icc-v7-4-09c78c175546@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
index e4de74b687974b63876ed882e85294270d31e407..937cb15159689ee043996f9ce4acc1f2fa7753ad 100644 (file)
--- a/drivers/clk/qcom/clk-smd-rpm.c
+++ b/drivers/clk/qcom/clk-smd-rpm.c
@@ -18,13 +18,6 @@
 
 #include <dt-bindings/clock/qcom,rpmcc.h>
 
-#define QCOM_RPM_KEY_SOFTWARE_ENABLE                   0x6e657773
-#define QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY    0x62636370
-#define QCOM_RPM_SMD_KEY_RATE                          0x007a484b
-#define QCOM_RPM_SMD_KEY_ENABLE                                0x62616e45
-#define QCOM_RPM_SMD_KEY_STATE                         0x54415453
-#define QCOM_RPM_SCALING_ENABLE_ID                     0x2
-
 #define __DEFINE_CLK_SMD_RPM_PREFIX(_prefix, _name, _active,                 \
                                    type, r_id, key)                          \
        static struct clk_smd_rpm clk_smd_rpm_##_prefix##_active;             \
@@ -171,12 +164,6 @@ struct clk_smd_rpm {
        unsigned long rate;
 };
 
-struct clk_smd_rpm_req {
-       __le32 key;
-       __le32 nbytes;
-       __le32 value;
-};
-
 struct rpm_smd_clk_desc {
        struct clk_smd_rpm **clks;
        size_t num_clks;

diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h
index 99499e4b080e5645f08de69e184cba54fefb4306..8190878645f9756c98a13100d72b9bb34ad392b4 100644 (file)
--- a/include/linux/soc/qcom/smd-rpm.h
+++ b/include/linux/soc/qcom/smd-rpm.h
@@ -2,6 +2,8 @@
 #ifndef __QCOM_SMD_RPM_H__
 #define __QCOM_SMD_RPM_H__
 
+#include <linux/types.h>
+
 struct qcom_smd_rpm;
 
 #define QCOM_SMD_RPM_ACTIVE_STATE      0
@@ -45,6 +47,19 @@ struct qcom_smd_rpm;
 #define QCOM_SMD_RPM_PKA_CLK   0x616b70
 #define QCOM_SMD_RPM_MCFG_CLK  0x6766636d
 
+#define QCOM_RPM_KEY_SOFTWARE_ENABLE                   0x6e657773
+#define QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY    0x62636370
+#define QCOM_RPM_SMD_KEY_RATE                          0x007a484b
+#define QCOM_RPM_SMD_KEY_ENABLE                                0x62616e45
+#define QCOM_RPM_SMD_KEY_STATE                         0x54415453
+#define QCOM_RPM_SCALING_ENABLE_ID                     0x2
+
+struct clk_smd_rpm_req {
+       __le32 key;
+       __le32 nbytes;
+       __le32 value;
+};
+
 int qcom_rpm_smd_write(struct qcom_smd_rpm *rpm,
                       int state,
                       u32 resource_type, u32 resource_id,