From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter De Schrijver Subject: Re: [PATCH] clk: add table lookup to mux Date: Wed, 20 Mar 2013 11:49:57 +0200 Message-ID: <20130320094957.GG18519@tbergstrom-lnx.Nvidia.com> References: <1363113747-6572-1-git-send-email-pdeschrijver@nvidia.com> <20130319235110.8663.67548@quantum> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: Content-Disposition: inline In-Reply-To: <20130319235110.8663.67548@quantum> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Mike Turquette Cc: "linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Stephen Warren , Prashant Gaikwad , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" List-Id: linux-tegra@vger.kernel.org On Wed, Mar 20, 2013 at 12:51:10AM +0100, Mike Turquette wrote: > 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? Ok. We don't do that anymore. Maybe I just modified it out of habbit... > > 2) if you must continue to use the clk-private.h macros (temporarily!) > then create a new one, DEFINE_CLK_MUX_TABLE. Hopefully not needed. Cheers, Peter.