Merge tag 'for_3.8-pm-sr' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.8/pm

OMAP: SmartReflex: pass device-independent data via platform_data

1 files changed, 12 insertions, 2 deletions

diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
index 4a496ebc7d7..c0f44c2b006 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;