diff options
| author | Tom Rini <[email protected]> | 2025-03-25 08:57:38 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-03-25 08:57:38 -0600 |
| commit | 042c8f0cb1ea5f6988e8633799f7b550876f0ae6 (patch) | |
| tree | d520fb23901d04e5be00676b4c2cac5bd4bc5540 /include/linux | |
| parent | 0dd455e064953fe18a49c6cdebbf868705874631 (diff) | |
| parent | 6bd1b740dd09f852ed3f313bd05f31c2324a916a (diff) | |
Merge tag 'u-boot-imx-next-20250325' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/25324
- Imply the i.MX thermal driver by default on imx8, imx9, imx8m.
- Add clk_resolve_parent_clk() and fix up iMX clock drivers.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clk-provider.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 59f9c241b84..5ea2171492e 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -105,7 +105,7 @@ struct clk_gate { #define CLK_GATE_HIWORD_MASK BIT(1) extern const struct clk_ops clk_gate_ops; -struct clk *clk_register_gate(struct device *dev, const char *name, +struct clk *clk_register_gate(struct udevice *dev, const char *name, const char *parent_name, unsigned long flags, void __iomem *reg, u8 bit_idx, u8 clk_gate_flags, spinlock_t *lock); @@ -223,7 +223,7 @@ struct clk_composite { #define to_clk_composite(_clk) container_of(_clk, struct clk_composite, clk) -struct clk *clk_register_composite(struct device *dev, const char *name, +struct clk *clk_register_composite(struct udevice *dev, const char *name, const char * const *parent_names, int num_parents, struct clk *mux_clk, const struct clk_ops *mux_ops, struct clk *rate_clk, const struct clk_ops *rate_ops, @@ -233,16 +233,16 @@ struct clk *clk_register_composite(struct device *dev, const char *name, int clk_register(struct clk *clk, const char *drv_name, const char *name, const char *parent_name); -struct clk *clk_register_fixed_factor(struct device *dev, const char *name, +struct clk *clk_register_fixed_factor(struct udevice *dev, const char *name, const char *parent_name, unsigned long flags, unsigned int mult, unsigned int div); -struct clk *clk_register_divider(struct device *dev, const char *name, +struct clk *clk_register_divider(struct udevice *dev, const char *name, const char *parent_name, unsigned long flags, void __iomem *reg, u8 shift, u8 width, u8 clk_divider_flags); -struct clk *clk_register_mux(struct device *dev, const char *name, +struct clk *clk_register_mux(struct udevice *dev, const char *name, const char * const *parent_names, u8 num_parents, unsigned long flags, void __iomem *reg, u8 shift, u8 width, |