diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:15:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:15:06 +0100 |
| commit | 6b2aa055488af2048d4e991c0e1754c24b1b30f5 (patch) | |
| tree | 6e70f3db0a742f705e9952b5c854ecbc1dcdbf7a /include/linux | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91 (diff) | |
Merge tag 'omap-for-v3.8/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm
From Tony Lindgren <tony@atomide.com>:
PM updates for omaps via Kevin Hilman <khilman@deeprootsystems.com>:
- Minor pr_warn() cleanup for OMAP2+ Voltage Processor (VP)
- OMAP: SmartReflex: pass device-independent data via platform_data
- OMAP voltage layer updates towards supporting auto-retention/auto-off
* tag 'omap-for-v3.8/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4: OPP: add OMAP4460 definitions
ARM: OMAP4: TWL: enable high speed mode for PMIC communication
ARM: OMAP4: VC: setup I2C parameters based on board data
ARM: OMAP4: vc: fix channel configuration
ARM: OMAP3+: voltage: remove unused volt_setup_time parameter
ARM: OMAP: TWL: change the vddmin / vddmax voltages to spec
ARM: OMAP3+: voltage: use oscillator data to calculate setup times
ARM: OMAP3+: vp: use new vp_params for calculating vddmin and vddmax
ARM: OMAP: add support for oscillator setup
ARM: OMAP4: VC: calculate ramp times
ARM: OMAP4: voltage: add support for VOLTSETUP_x_OFF register
ARM: OMAP3: VC: calculate ramp times
ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains
ARM: OMAP: voltage: renamed vp_vddmin and vp_vddmax fields
ARM: OMAP3+: PM: VP: use uV for max and min voltage limits
ARM: OMAP2+: PM: VP: minor pr_warn updates
ARM: OMAP: SmartReflex: pass device dependent data via platform data
ARM: OMAP: hwmod: align the SmartReflex fck names
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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; |