ARM: OMAP2+: SmartReflex: Use per-OPP data structure

The SmartReflex driver incorrectly treats some per-OPP data as data
common to all OPPs (e.g., ERRMINLIMIT).  Move this data into a per-OPP
data structure.

Furthermore, in order to make the SmartReflex implementation ready for
the move to drivers/, remove the dependency from the SR driver code
to the voltage layer by querying the data tables only from the SR device
init code.

Based on Paul's original code for the SmartReflex driver conversion.

Signed-off-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: J Keerthy <j-keerthy@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

1 files changed, 30 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c
index e081174f28af..e107e3915a8a 100644
--- a/arch/arm/mach-omap2/sr_device.c
+++ b/arch/arm/mach-omap2/sr_device.c
@@ -36,7 +36,10 @@ static void __init sr_set_nvalues(struct omap_volt_data *volt_data,
                                 struct omap_sr_data *sr_data)
 {
         struct omap_sr_nvalue_table *nvalue_table;
-        int i, count = 0;
+        int i, j, count = 0;
+
+        sr_data->nvalue_count = 0;
+        sr_data->nvalue_table = NULL;
 
         while (volt_data[count].volt_nominal)
                 count++;
@@ -44,8 +47,14 @@ static void __init sr_set_nvalues(struct omap_volt_data *volt_data,
         nvalue_table = kzalloc(sizeof(struct omap_sr_nvalue_table)*count,
                         GFP_KERNEL);
 
-        for (i = 0; i < count; i++) {
+        if (!nvalue_table) {
+                pr_err("OMAP: SmartReflex: cannot allocate memory for n-value table\n");
+                return;
+        }
+
+        for (i = 0, j = 0; i < count; i++) {
                 u32 v;
+
                 /*
                  * In OMAP4 the efuse registers are 24 bit aligned.
                  * A __raw_readl will fail for non-32 bit aligned address
@@ -58,15 +67,30 @@ static void __init sr_set_nvalues(struct omap_volt_data *volt_data,
                                 omap_ctrl_readb(offset + 1) << 8 |
                                 omap_ctrl_readb(offset + 2) << 16;
                 } else {
-                         v = omap_ctrl_readl(volt_data[i].sr_efuse_offs);
+                        v = omap_ctrl_readl(volt_data[i].sr_efuse_offs);
                 }
 
-                nvalue_table[i].efuse_offs = volt_data[i].sr_efuse_offs;
-                nvalue_table[i].nvalue = v;
+                /*
+                 * Many OMAP SoCs don't have the eFuse values set.
+                 * For example, pretty much all OMAP3xxx before
+                 * ES3.something.
+                 *
+                 * XXX There needs to be some way for board files or
+                 * userspace to add these in.
+                 */
+                if (v == 0)
+                        continue;
+
+                nvalue_table[j].nvalue = v;
+                nvalue_table[j].efuse_offs = volt_data[i].sr_efuse_offs;
+                nvalue_table[j].errminlimit = volt_data[i].sr_errminlimit;
+                nvalue_table[j].volt_nominal = volt_data[i].volt_nominal;
+
+                j++;
         }
 
         sr_data->nvalue_table = nvalue_table;
-        sr_data->nvalue_count = count;
+        sr_data->nvalue_count = j;
 }
 
 static int __init sr_dev_init(struct omap_hwmod *oh, void *user)