Commit 406f0577 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson

clk: qcom: smd-rpm: drop the rpm_status_id field

The rpm_status_id field is a leftover from the non-SMD clocks. It is of
no use for the SMD-RPM clock driver and is always equal to zero. Drop it
completely.
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221209164855.128798-11-dmitry.baryshkov@linaro.org
parent 3ab58304
...@@ -25,13 +25,11 @@ ...@@ -25,13 +25,11 @@
#define QCOM_RPM_SMD_KEY_STATE 0x54415453 #define QCOM_RPM_SMD_KEY_STATE 0x54415453
#define QCOM_RPM_SCALING_ENABLE_ID 0x2 #define QCOM_RPM_SCALING_ENABLE_ID 0x2
#define __DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id, stat_id, \ #define __DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id, key) \
key) \
static struct clk_smd_rpm _platform##_##_active; \ static struct clk_smd_rpm _platform##_##_active; \
static struct clk_smd_rpm _platform##_##_name = { \ static struct clk_smd_rpm _platform##_##_name = { \
.rpm_res_type = (type), \ .rpm_res_type = (type), \
.rpm_clk_id = (r_id), \ .rpm_clk_id = (r_id), \
.rpm_status_id = (stat_id), \
.rpm_key = (key), \ .rpm_key = (key), \
.peer = &_platform##_##_active, \ .peer = &_platform##_##_active, \
.rate = INT_MAX, \ .rate = INT_MAX, \
...@@ -48,7 +46,6 @@ ...@@ -48,7 +46,6 @@
static struct clk_smd_rpm _platform##_##_active = { \ static struct clk_smd_rpm _platform##_##_active = { \
.rpm_res_type = (type), \ .rpm_res_type = (type), \
.rpm_clk_id = (r_id), \ .rpm_clk_id = (r_id), \
.rpm_status_id = (stat_id), \
.active_only = true, \ .active_only = true, \
.rpm_key = (key), \ .rpm_key = (key), \
.peer = &_platform##_##_name, \ .peer = &_platform##_##_name, \
...@@ -65,12 +62,11 @@ ...@@ -65,12 +62,11 @@
} }
#define __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id, \ #define __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id, \
stat_id, r, key) \ r, key) \
static struct clk_smd_rpm _platform##_##_active; \ static struct clk_smd_rpm _platform##_##_active; \
static struct clk_smd_rpm _platform##_##_name = { \ static struct clk_smd_rpm _platform##_##_name = { \
.rpm_res_type = (type), \ .rpm_res_type = (type), \
.rpm_clk_id = (r_id), \ .rpm_clk_id = (r_id), \
.rpm_status_id = (stat_id), \
.rpm_key = (key), \ .rpm_key = (key), \
.branch = true, \ .branch = true, \
.peer = &_platform##_##_active, \ .peer = &_platform##_##_active, \
...@@ -88,7 +84,6 @@ ...@@ -88,7 +84,6 @@
static struct clk_smd_rpm _platform##_##_active = { \ static struct clk_smd_rpm _platform##_##_active = { \
.rpm_res_type = (type), \ .rpm_res_type = (type), \
.rpm_clk_id = (r_id), \ .rpm_clk_id = (r_id), \
.rpm_status_id = (stat_id), \
.active_only = true, \ .active_only = true, \
.rpm_key = (key), \ .rpm_key = (key), \
.branch = true, \ .branch = true, \
...@@ -107,19 +102,19 @@ ...@@ -107,19 +102,19 @@
#define DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id) \ #define DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id) \
__DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id, \ __DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id, \
0, QCOM_RPM_SMD_KEY_RATE) QCOM_RPM_SMD_KEY_RATE)
#define DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id, r) \ #define DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id, r) \
__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, \ __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, \
r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE) r_id, r, QCOM_RPM_SMD_KEY_ENABLE)
#define DEFINE_CLK_SMD_RPM_QDSS(_platform, _name, _active, type, r_id) \ #define DEFINE_CLK_SMD_RPM_QDSS(_platform, _name, _active, type, r_id) \
__DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id, \ __DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id, \
0, QCOM_RPM_SMD_KEY_STATE) QCOM_RPM_SMD_KEY_STATE)
#define DEFINE_CLK_SMD_RPM_XO_BUFFER(_platform, _name, _active, r_id, r) \ #define DEFINE_CLK_SMD_RPM_XO_BUFFER(_platform, _name, _active, r_id, r) \
__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, \ __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, \
QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, r, \ QCOM_SMD_RPM_CLK_BUF_A, r_id, r, \
QCOM_RPM_KEY_SOFTWARE_ENABLE) QCOM_RPM_KEY_SOFTWARE_ENABLE)
#define DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(_platform, _name, _active, \ #define DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(_platform, _name, _active, \
...@@ -128,7 +123,7 @@ ...@@ -128,7 +123,7 @@
r_id, r); \ r_id, r); \
__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name##_pin, \ __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name##_pin, \
_active##_pin, \ _active##_pin, \
QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, r, \ QCOM_SMD_RPM_CLK_BUF_A, r_id, r, \
QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY) QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY)
#define to_clk_smd_rpm(_hw) container_of(_hw, struct clk_smd_rpm, hw) #define to_clk_smd_rpm(_hw) container_of(_hw, struct clk_smd_rpm, hw)
...@@ -137,7 +132,6 @@ struct clk_smd_rpm { ...@@ -137,7 +132,6 @@ struct clk_smd_rpm {
const int rpm_res_type; const int rpm_res_type;
const int rpm_key; const int rpm_key;
const int rpm_clk_id; const int rpm_clk_id;
const int rpm_status_id;
const bool active_only; const bool active_only;
bool enabled; bool enabled;
bool branch; bool branch;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment