Message ID | 1578448417-17760-1-git-send-email-Anson.Huang@nxp.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [V3,1/4] clk: imx: gate4: Switch imx_clk_gate4_flags() to clk_hw based API | expand |
On 20-01-08 09:53:34, Anson Huang wrote: > Switch the imx_clk_gate4_flags() function to clk_hw based API, rename > accordingly and add a macro for clk based legacy. This allows us to > move closer to a clear split between consumer and provider clk APIs. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> For the entire patchset: Reviewed-by: Abel Vesa <abel.vesa@nxp.com> > --- > Changes since V2: > - Switch to latest i.MX clock driver base to redo the patch. > --- > drivers/clk/imx/clk.h | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h > index 65d80c6..b05213b 100644 > --- a/drivers/clk/imx/clk.h > +++ b/drivers/clk/imx/clk.h > @@ -390,15 +390,18 @@ static inline struct clk_hw *imx_clk_hw_gate4(const char *name, const char *pare > reg, shift, 0x3, 0, &imx_ccm_lock, NULL); > } > > -static inline struct clk *imx_clk_gate4_flags(const char *name, > +static inline struct clk_hw *imx_clk_hw_gate4_flags(const char *name, > const char *parent, void __iomem *reg, u8 shift, > unsigned long flags) > { > - return clk_register_gate2(NULL, name, parent, > + return clk_hw_register_gate2(NULL, name, parent, > flags | CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, > reg, shift, 0x3, 0, &imx_ccm_lock, NULL); > } > > +#define imx_clk_gate4_flags(name, parent, reg, shift, flags) \ > + to_clk(imx_clk_hw_gate4_flags(name, parent, reg, shift, flags)) > + > static inline struct clk_hw *imx_clk_hw_mux(const char *name, void __iomem *reg, > u8 shift, u8 width, const char * const *parents, > int num_parents) > -- > 2.7.4 >
On Wed, Jan 08, 2020 at 09:53:34AM +0800, Anson Huang wrote: > Switch the imx_clk_gate4_flags() function to clk_hw based API, rename > accordingly and add a macro for clk based legacy. This allows us to > move closer to a clear split between consumer and provider clk APIs. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Applied all, thanks.
diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index 65d80c6..b05213b 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -390,15 +390,18 @@ static inline struct clk_hw *imx_clk_hw_gate4(const char *name, const char *pare reg, shift, 0x3, 0, &imx_ccm_lock, NULL); } -static inline struct clk *imx_clk_gate4_flags(const char *name, +static inline struct clk_hw *imx_clk_hw_gate4_flags(const char *name, const char *parent, void __iomem *reg, u8 shift, unsigned long flags) { - return clk_register_gate2(NULL, name, parent, + return clk_hw_register_gate2(NULL, name, parent, flags | CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, reg, shift, 0x3, 0, &imx_ccm_lock, NULL); } +#define imx_clk_gate4_flags(name, parent, reg, shift, flags) \ + to_clk(imx_clk_hw_gate4_flags(name, parent, reg, shift, flags)) + static inline struct clk_hw *imx_clk_hw_mux(const char *name, void __iomem *reg, u8 shift, u8 width, const char * const *parents, int num_parents)
Switch the imx_clk_gate4_flags() function to clk_hw based API, rename accordingly and add a macro for clk based legacy. This allows us to move closer to a clear split between consumer and provider clk APIs. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> --- Changes since V2: - Switch to latest i.MX clock driver base to redo the patch. --- drivers/clk/imx/clk.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)