diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-08-19 16:07:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-08-20 09:08:52 +0200 |
| commit | 690166472dbd39facf31a5ac4b8a2844247e7066 (patch) | |
| tree | 7135f0166b6643d37d9a9423ee0a815ca0098db6 /drivers/clk/imx/clk.h | |
| parent | 1f7d9c023448365d1a51ffb378e657cf877229af (diff) | |
| download | barebox-690166472dbd39facf31a5ac4b8a2844247e7066.tar.gz barebox-690166472dbd39facf31a5ac4b8a2844247e7066.tar.xz | |
clk: imx. clk-composite-8m: Update from Linux Kernel
Update clk-composite-8m to Linux as of v5.9-rc2. This is a combination
of Linux commits:
0e40198dc28b6 ("clk: imx: add imx8m_clk_hw_composite_bus")
f90b68d6c8b00 ("clk: imx: add mux ops for i.MX8M composite clk")
62668b68dc8e7 ("clk: imx: composite-8m: add imx8m_clk_hw_composite_core")
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/clk/imx/clk.h')
| -rw-r--r-- | drivers/clk/imx/clk.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index 5d930eec57..32e7c5cbb7 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -259,13 +259,29 @@ struct clk *imx_clk_cpu(const char *name, const char *parent_name, struct clk *div, struct clk *mux, struct clk *pll, struct clk *step); +#define IMX_COMPOSITE_CORE BIT(0) +#define IMX_COMPOSITE_BUS BIT(1) + struct clk *imx8m_clk_composite_flags(const char *name, const char * const *parent_names, int num_parents, void __iomem *reg, + u32 composite_flags, unsigned long flags); +#define imx8m_clk_hw_composite_core(name, parent_names, reg) \ + imx8m_clk_hw_composite_flags(name, parent_names, \ + ARRAY_SIZE(parent_names), reg, \ + IMX_COMPOSITE_CORE, \ + CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE) + +#define imx8m_clk_hw_composite_bus(name, parent_names, reg) \ + imx8m_clk_hw_composite_flags(name, parent_names, \ + ARRAY_SIZE(parent_names), reg, \ + IMX_COMPOSITE_BUS, \ + CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE) + #define __imx8m_clk_composite(name, parent_names, reg, flags) \ imx8m_clk_composite_flags(name, parent_names, \ - ARRAY_SIZE(parent_names), reg, \ + ARRAY_SIZE(parent_names), reg, 0, \ flags | CLK_OPS_PARENT_ENABLE) #define imx8m_clk_composite(name, parent_names, reg) \ |