| Message ID | 20221202185843.721673-6-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 49e4aa233c6c239f814e8872d6757455e49e8106 |
| Headers | show |
| Series | clk: qcom: rpm/rpmh: drop platform names | expand |
On 12/2/22 12:58 PM, Dmitry Baryshkov wrote: > Both ARC and VRM clocks have minor differences between platforms. > However using SoC names directly results in duplication, confusion and > ocassional errors. Next patches are going to drop the SoC names and s/ocassional/occasional/ > 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> Looks good. Thank you for rearranging this, it's easier to follow. Reviewed-by: Alex Elder <elder@linaro.org> > --- > drivers/clk/qcom/clk-rpmh.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c > index 2ab406c1dab5..34099bb6b899 100644 > --- 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) \
diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c index 2ab406c1dab5..34099bb6b899 100644 --- 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) \
Both ARC and VRM clocks have minor differences between platforms. However using SoC names directly results in duplication, confusion and ocassional 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> --- drivers/clk/qcom/clk-rpmh.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)