diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-14 14:50:36 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-14 14:50:36 -0800 |
| commit | 6515b0f75af68ad5e36f5297bb6b9a5ba3e710d2 (patch) | |
| tree | b269fe5e647107a75f677bb01dcec7fc6a41bb67 /include/linux | |
| parent | 2f4d91e37735de0a22993a06a500dabe332f315e (diff) | |
| parent | 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91 (diff) | |
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/pm-part2
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power/smartreflex.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h index 4a496ebc7d73..c0f44c2b006d 100644 --- a/include/linux/power/smartreflex.h +++ b/include/linux/power/smartreflex.h @@ -260,8 +260,13 @@ struct omap_sr_nvalue_table { * * @name: instance name * @ip_type: Smartreflex IP type. - * @senp_mod: SENPENABLE value for the sr - * @senn_mod: SENNENABLE value for sr + * @senp_mod: SENPENABLE value of the sr CONFIG register + * @senn_mod: SENNENABLE value for sr CONFIG register + * @err_weight ERRWEIGHT value of the sr ERRCONFIG register + * @err_maxlimit ERRMAXLIMIT value of the sr ERRCONFIG register + * @accum_data ACCUMDATA value of the sr CONFIG register + * @senn_avgweight SENNAVGWEIGHT value of the sr AVGWEIGHT register + * @senp_avgweight SENPAVGWEIGHT value of the sr AVGWEIGHT register * @nvalue_count: Number of distinct nvalues in the nvalue table * @enable_on_init: whether this sr module needs to enabled at * boot up or not. @@ -274,6 +279,11 @@ struct omap_sr_data { int ip_type; u32 senp_mod; u32 senn_mod; + u32 err_weight; + u32 err_maxlimit; + u32 accum_data; + u32 senn_avgweight; + u32 senp_avgweight; int nvalue_count; bool enable_on_init; struct omap_sr_nvalue_table *nvalue_table; |