| Message ID | 1428943097-2768-1-git-send-email-rklein@nvidia.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Mon, Apr 13, 2015 at 12:38:17PM -0400, Rhyland Klein wrote: > Some fields moved from the tegra_clk_pll struct to > the tegra_pll_params struct. Update the struct comments > to reflect where the fields really are. > Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com> > Signed-off-by: Rhyland Klein <rklein@nvidia.com> > --- > drivers/clk/tegra/clk.h | 74 +++++++++++++++++++++++------------------------ > 1 file changed, 37 insertions(+), 37 deletions(-) > > diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h > index 751a97966354..4eae99a4f32e 100644 > --- a/drivers/clk/tegra/clk.h > +++ b/drivers/clk/tegra/clk.h > @@ -171,6 +171,30 @@ struct div_nmp { > * @lock_bit_idx: Bit index for PLL lock status > * @lock_enable_bit_idx: Bit index to enable PLL lock > * @lock_delay: Delay in us if PLL lock is not used > + * @freq_table: array of frequencies supported by PLL > + * @fixed_rate: PLL rate if it is fixed > + * @flags: PLL flags > + * > + * Flags: > + * TEGRA_PLL_USE_LOCK - This flag indicated to use lock bits for > + * PLL locking. If not set it will use lock_delay value to wait. > + * TEGRA_PLL_HAS_CPCON - This flag indicates that CPCON value needs > + * to be programmed to change output frequency of the PLL. > + * TEGRA_PLL_SET_LFCON - This flag indicates that LFCON value needs > + * to be programmed to change output frequency of the PLL. > + * TEGRA_PLL_SET_DCCON - This flag indicates that DCCON value needs > + * to be programmed to change output frequency of the PLL. > + * TEGRA_PLLU - PLLU has inverted post divider. This flags indicated > + * that it is PLLU and invert post divider value. > + * TEGRA_PLLM - PLLM has additional override settings in PMC. This > + * flag indicates that it is PLLM and use override settings. > + * TEGRA_PLL_FIXED - We are not supposed to change output frequency > + * of some plls. > + * TEGRA_PLLE_CONFIGURE - Configure PLLE when enabling. > + * TEGRA_PLL_LOCK_MISC - Lock bit is in the misc register instead of the > + * base register. > + * TEGRA_PLL_BYPASS - PLL has bypass bit > + * TEGRA_PLL_HAS_LOCK_ENABLE - PLL has bit to enable lock monitoring > */ > struct tegra_clk_pll_params { > unsigned long input_min; > @@ -203,38 +227,26 @@ struct tegra_clk_pll_params { > unsigned long fixed_rate; > }; > > +#define TEGRA_PLL_USE_LOCK BIT(0) > +#define TEGRA_PLL_HAS_CPCON BIT(1) > +#define TEGRA_PLL_SET_LFCON BIT(2) > +#define TEGRA_PLL_SET_DCCON BIT(3) > +#define TEGRA_PLLU BIT(4) > +#define TEGRA_PLLM BIT(5) > +#define TEGRA_PLL_FIXED BIT(6) > +#define TEGRA_PLLE_CONFIGURE BIT(7) > +#define TEGRA_PLL_LOCK_MISC BIT(8) > +#define TEGRA_PLL_BYPASS BIT(9) > +#define TEGRA_PLL_HAS_LOCK_ENABLE BIT(10) > + > /** > * struct tegra_clk_pll - Tegra PLL clock > * > * @hw: handle between common and hardware-specifix interfaces > * @clk_base: address of CAR controller > * @pmc: address of PMC, required to read override bits > - * @freq_table: array of frequencies supported by PLL > - * @params: PLL parameters > - * @flags: PLL flags > - * @fixed_rate: PLL rate if it is fixed > * @lock: register lock > - * > - * Flags: > - * TEGRA_PLL_USE_LOCK - This flag indicated to use lock bits for > - * PLL locking. If not set it will use lock_delay value to wait. > - * TEGRA_PLL_HAS_CPCON - This flag indicates that CPCON value needs > - * to be programmed to change output frequency of the PLL. > - * TEGRA_PLL_SET_LFCON - This flag indicates that LFCON value needs > - * to be programmed to change output frequency of the PLL. > - * TEGRA_PLL_SET_DCCON - This flag indicates that DCCON value needs > - * to be programmed to change output frequency of the PLL. > - * TEGRA_PLLU - PLLU has inverted post divider. This flags indicated > - * that it is PLLU and invert post divider value. > - * TEGRA_PLLM - PLLM has additional override settings in PMC. This > - * flag indicates that it is PLLM and use override settings. > - * TEGRA_PLL_FIXED - We are not supposed to change output frequency > - * of some plls. > - * TEGRA_PLLE_CONFIGURE - Configure PLLE when enabling. > - * TEGRA_PLL_LOCK_MISC - Lock bit is in the misc register instead of the > - * base register. > - * TEGRA_PLL_BYPASS - PLL has bypass bit > - * TEGRA_PLL_HAS_LOCK_ENABLE - PLL has bit to enable lock monitoring > + * @params: PLL parameters > */ > struct tegra_clk_pll { > struct clk_hw hw; > @@ -246,18 +258,6 @@ struct tegra_clk_pll { > > #define to_clk_pll(_hw) container_of(_hw, struct tegra_clk_pll, hw) > > -#define TEGRA_PLL_USE_LOCK BIT(0) > -#define TEGRA_PLL_HAS_CPCON BIT(1) > -#define TEGRA_PLL_SET_LFCON BIT(2) > -#define TEGRA_PLL_SET_DCCON BIT(3) > -#define TEGRA_PLLU BIT(4) > -#define TEGRA_PLLM BIT(5) > -#define TEGRA_PLL_FIXED BIT(6) > -#define TEGRA_PLLE_CONFIGURE BIT(7) > -#define TEGRA_PLL_LOCK_MISC BIT(8) > -#define TEGRA_PLL_BYPASS BIT(9) > -#define TEGRA_PLL_HAS_LOCK_ENABLE BIT(10) > - > extern const struct clk_ops tegra_clk_pll_ops; > extern const struct clk_ops tegra_clk_plle_ops; > struct clk *tegra_clk_register_pll(const char *name, const char *parent_name, > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Apr 13, 2015 at 9:38 AM, Rhyland Klein <rklein@nvidia.com> wrote: > Some fields moved from the tegra_clk_pll struct to > the tegra_pll_params struct. Update the struct comments > to reflect where the fields really are. > > Signed-off-by: Rhyland Klein <rklein@nvidia.com> Reviewed-by: Benson Leung <bleung@chromium.org>
On Mon, Apr 13, 2015 at 9:38 AM, Rhyland Klein <rklein@nvidia.com> wrote: > Some fields moved from the tegra_clk_pll struct to > the tegra_pll_params struct. Update the struct comments > to reflect where the fields really are. > > Signed-off-by: Rhyland Klein <rklein@nvidia.com> > --- > drivers/clk/tegra/clk.h | 74 +++++++++++++++++++++++------------------------ > 1 file changed, 37 insertions(+), 37 deletions(-) > > diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h > index 751a97966354..4eae99a4f32e 100644 > --- a/drivers/clk/tegra/clk.h > +++ b/drivers/clk/tegra/clk.h > @@ -171,6 +171,30 @@ struct div_nmp { > * @lock_bit_idx: Bit index for PLL lock status By the way, It looks like the kernel doc for this structure hasn't been updated for some of the fields added or modified since. lock_bit_idx is actually no longer here (now lock_mask), and the bunch added for 114 (including ext_misc_reg) aren't documented.
On Mon, Apr 13, 2015 at 12:38:17PM -0400, Rhyland Klein wrote: > Some fields moved from the tegra_clk_pll struct to > the tegra_pll_params struct. Update the struct comments > to reflect where the fields really are. > > Signed-off-by: Rhyland Klein <rklein@nvidia.com> > --- > drivers/clk/tegra/clk.h | 74 +++++++++++++++++++++++------------------------ > 1 file changed, 37 insertions(+), 37 deletions(-) Applied to the for-4.2/clk branch. Thanks, Thierry
diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h index 751a97966354..4eae99a4f32e 100644 --- a/drivers/clk/tegra/clk.h +++ b/drivers/clk/tegra/clk.h @@ -171,6 +171,30 @@ struct div_nmp { * @lock_bit_idx: Bit index for PLL lock status * @lock_enable_bit_idx: Bit index to enable PLL lock * @lock_delay: Delay in us if PLL lock is not used + * @freq_table: array of frequencies supported by PLL + * @fixed_rate: PLL rate if it is fixed + * @flags: PLL flags + * + * Flags: + * TEGRA_PLL_USE_LOCK - This flag indicated to use lock bits for + * PLL locking. If not set it will use lock_delay value to wait. + * TEGRA_PLL_HAS_CPCON - This flag indicates that CPCON value needs + * to be programmed to change output frequency of the PLL. + * TEGRA_PLL_SET_LFCON - This flag indicates that LFCON value needs + * to be programmed to change output frequency of the PLL. + * TEGRA_PLL_SET_DCCON - This flag indicates that DCCON value needs + * to be programmed to change output frequency of the PLL. + * TEGRA_PLLU - PLLU has inverted post divider. This flags indicated + * that it is PLLU and invert post divider value. + * TEGRA_PLLM - PLLM has additional override settings in PMC. This + * flag indicates that it is PLLM and use override settings. + * TEGRA_PLL_FIXED - We are not supposed to change output frequency + * of some plls. + * TEGRA_PLLE_CONFIGURE - Configure PLLE when enabling. + * TEGRA_PLL_LOCK_MISC - Lock bit is in the misc register instead of the + * base register. + * TEGRA_PLL_BYPASS - PLL has bypass bit + * TEGRA_PLL_HAS_LOCK_ENABLE - PLL has bit to enable lock monitoring */ struct tegra_clk_pll_params { unsigned long input_min; @@ -203,38 +227,26 @@ struct tegra_clk_pll_params { unsigned long fixed_rate; }; +#define TEGRA_PLL_USE_LOCK BIT(0) +#define TEGRA_PLL_HAS_CPCON BIT(1) +#define TEGRA_PLL_SET_LFCON BIT(2) +#define TEGRA_PLL_SET_DCCON BIT(3) +#define TEGRA_PLLU BIT(4) +#define TEGRA_PLLM BIT(5) +#define TEGRA_PLL_FIXED BIT(6) +#define TEGRA_PLLE_CONFIGURE BIT(7) +#define TEGRA_PLL_LOCK_MISC BIT(8) +#define TEGRA_PLL_BYPASS BIT(9) +#define TEGRA_PLL_HAS_LOCK_ENABLE BIT(10) + /** * struct tegra_clk_pll - Tegra PLL clock * * @hw: handle between common and hardware-specifix interfaces * @clk_base: address of CAR controller * @pmc: address of PMC, required to read override bits - * @freq_table: array of frequencies supported by PLL - * @params: PLL parameters - * @flags: PLL flags - * @fixed_rate: PLL rate if it is fixed * @lock: register lock - * - * Flags: - * TEGRA_PLL_USE_LOCK - This flag indicated to use lock bits for - * PLL locking. If not set it will use lock_delay value to wait. - * TEGRA_PLL_HAS_CPCON - This flag indicates that CPCON value needs - * to be programmed to change output frequency of the PLL. - * TEGRA_PLL_SET_LFCON - This flag indicates that LFCON value needs - * to be programmed to change output frequency of the PLL. - * TEGRA_PLL_SET_DCCON - This flag indicates that DCCON value needs - * to be programmed to change output frequency of the PLL. - * TEGRA_PLLU - PLLU has inverted post divider. This flags indicated - * that it is PLLU and invert post divider value. - * TEGRA_PLLM - PLLM has additional override settings in PMC. This - * flag indicates that it is PLLM and use override settings. - * TEGRA_PLL_FIXED - We are not supposed to change output frequency - * of some plls. - * TEGRA_PLLE_CONFIGURE - Configure PLLE when enabling. - * TEGRA_PLL_LOCK_MISC - Lock bit is in the misc register instead of the - * base register. - * TEGRA_PLL_BYPASS - PLL has bypass bit - * TEGRA_PLL_HAS_LOCK_ENABLE - PLL has bit to enable lock monitoring + * @params: PLL parameters */ struct tegra_clk_pll { struct clk_hw hw; @@ -246,18 +258,6 @@ struct tegra_clk_pll { #define to_clk_pll(_hw) container_of(_hw, struct tegra_clk_pll, hw) -#define TEGRA_PLL_USE_LOCK BIT(0) -#define TEGRA_PLL_HAS_CPCON BIT(1) -#define TEGRA_PLL_SET_LFCON BIT(2) -#define TEGRA_PLL_SET_DCCON BIT(3) -#define TEGRA_PLLU BIT(4) -#define TEGRA_PLLM BIT(5) -#define TEGRA_PLL_FIXED BIT(6) -#define TEGRA_PLLE_CONFIGURE BIT(7) -#define TEGRA_PLL_LOCK_MISC BIT(8) -#define TEGRA_PLL_BYPASS BIT(9) -#define TEGRA_PLL_HAS_LOCK_ENABLE BIT(10) - extern const struct clk_ops tegra_clk_pll_ops; extern const struct clk_ops tegra_clk_plle_ops; struct clk *tegra_clk_register_pll(const char *name, const char *parent_name,
Some fields moved from the tegra_clk_pll struct to the tegra_pll_params struct. Update the struct comments to reflect where the fields really are. Signed-off-by: Rhyland Klein <rklein@nvidia.com> --- drivers/clk/tegra/clk.h | 74 +++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 37 deletions(-)