Quoting Peter De Schrijver (2013-03-12 11:42:23)
> diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
> index 9c7f580..53d39c2 100644
> --- a/include/linux/clk-private.h
> +++ b/include/linux/clk-private.h
> @@ -144,12 +144,13 @@ struct clk {
>
> #define DEFINE_CLK_MUX(_name, _parent_names, _parents, _flags, \
> _reg, _shift, _width, \
> - _mux_flags, _lock) \
> + _mux_flags, _table, _lock) \
> static struct clk _name; \
> static struct clk_mux _name##_hw = { \
> .hw = { \
> .clk = &_name, \
> }, \
> + .table = _table, \
> .reg = _reg, \
> .shift = _shift, \
> .width = _width, \
This breaks OMAP horribly since OMAP already uses this macro. There are
two options:
1) stop using statically initialized data and no longer use
clk-private.h macros. I was under the impression that the tegra clock
data no longer required this?
2) if you must continue to use the clk-private.h macros (temporarily!)
then create a new one, DEFINE_CLK_MUX_TABLE.
Regards,
Mike
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
