clk: sunxi-ng: mp: provide wrappers for setting feature flags

So far our sunxi clock instantiation macros set the required clock
features depending on the clock type, but the new "dual divider MP
clock" requires us to pass that piece of information in by the user.

Add new wrapper macros that allow to specify a "features" field, to
allow marking those dual-divider clocks accordingly. Also add two
convenience macros that deal with the most common cases.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Link: https://patch.msgid.link/20250307002628.10684-3-andre.przywara@arm.com
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/drivers/clk/sunxi-ng/ccu_mp.h b/drivers/clk/sunxi-ng/ccu_mp.h
index 6e50f3728fb5f1ed31329d3fb961c2442a71ea37..b35aeec70484d6864c85d93f2052eaed3f3afe5d 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_mp.h
+++ b/drivers/clk/sunxi-ng/ccu_mp.h
@@ -82,11 +82,35 @@ struct ccu_mp {
                                   _muxshift, _muxwidth,                \
                                   0, _flags)
 
-#define SUNXI_CCU_MP_DATA_WITH_MUX_GATE(_struct, _name, _parents, _reg,        \
-                                       _mshift, _mwidth,               \
-                                       _pshift, _pwidth,               \
-                                       _muxshift, _muxwidth,           \
-                                       _gate, _flags)                  \
+#define SUNXI_CCU_MP_MUX_GATE_POSTDIV_DUALDIV(_struct, _name, _parents, _reg, \
+                                             _mshift, _mwidth,         \
+                                             _pshift, _pwidth,         \
+                                             _muxshift, _muxwidth,     \
+                                             _gate, _postdiv,          \
+                                             _flags)                   \
+       struct ccu_mp _struct = {                                       \
+               .enable = _gate,                                        \
+               .m      = _SUNXI_CCU_DIV(_mshift, _mwidth),             \
+               .p      = _SUNXI_CCU_DIV(_pshift, _pwidth),             \
+               .mux    = _SUNXI_CCU_MUX(_muxshift, _muxwidth),         \
+               .fixed_post_div = _postdiv,                             \
+               .common = {                                             \
+                       .reg            = _reg,                         \
+                       .features       = CCU_FEATURE_FIXED_POSTDIV |   \
+                                               CCU_FEATURE_DUAL_DIV,   \
+                       .hw.init        = CLK_HW_INIT_PARENTS_DATA(_name, \
+                                                                  _parents, \
+                                                                  &ccu_mp_ops, \
+                                                                  _flags), \
+               }                                                       \
+       }
+
+#define SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT(_struct, _name, _parents, _reg, \
+                                            _mshift, _mwidth,          \
+                                            _pshift, _pwidth,          \
+                                            _muxshift, _muxwidth,      \
+                                            _gate, _features,          \
+                                            _flags)                    \
        struct ccu_mp _struct = {                                       \
                .enable = _gate,                                        \
                .m      = _SUNXI_CCU_DIV(_mshift, _mwidth),             \
@@ -94,6 +118,7 @@ struct ccu_mp {
                .mux    = _SUNXI_CCU_MUX(_muxshift, _muxwidth),         \
                .common = {                                             \
                        .reg            = _reg,                         \
+                       .features       = _features,                    \
                        .hw.init        = CLK_HW_INIT_PARENTS_DATA(_name, \
                                                                   _parents, \
                                                                   &ccu_mp_ops, \
@@ -101,6 +126,29 @@ struct ccu_mp {
                }                                                       \
        }
 
+#define SUNXI_CCU_MP_DATA_WITH_MUX_GATE(_struct, _name, _parents, _reg,        \
+                                       _mshift, _mwidth,               \
+                                       _pshift, _pwidth,               \
+                                       _muxshift, _muxwidth,           \
+                                       _gate, _flags)                  \
+       SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT(_struct, _name, _parents,  \
+                                            _reg, _mshift, _mwidth,    \
+                                            _pshift, _pwidth,          \
+                                            _muxshift, _muxwidth,      \
+                                            _gate, _flags, 0)
+
+#define SUNXI_CCU_DUALDIV_MUX_GATE(_struct, _name, _parents, _reg,     \
+                                  _mshift, _mwidth,                    \
+                                  _pshift, _pwidth,                    \
+                                  _muxshift, _muxwidth,                \
+                                  _gate, _flags)                       \
+       SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT(_struct, _name, _parents,  \
+                                            _reg, _mshift, _mwidth,    \
+                                            _pshift, _pwidth,          \
+                                            _muxshift, _muxwidth,      \
+                                            _gate, _flags,             \
+                                            CCU_FEATURE_DUAL_DIV)
+
 #define SUNXI_CCU_MP_DATA_WITH_MUX(_struct, _name, _parents, _reg,     \
                                   _mshift, _mwidth,                    \
                                   _pshift, _pwidth,                    \