From c1ef02fcb8e8315f0e97147815146a96aca95b2e Mon Sep 17 00:00:00 2001
From: J Keerthy <j-keerthy@ti.com>
Date: Wed, 25 Apr 2012 11:14:31 +0530
Subject: [PATCH] --- yaml --- r: 313543 b: refs/heads/master c:
 fa60be6e3f9362bd841e26b9366f0db7b761a042 h: refs/heads/master i:   313541:
 fd348fc2782b013c961bdd5ad92cdbf1a61d02bc   313539:
 eb6806c77087b920bf465dd820eda3911e6e1af9   313535:
 bc0685548084ccc092ff4a4d527d9162bfcfae4a v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-omap2/voltage.h           | 21 ++-----------------
 .../arch/arm/plat-omap/include/plat/voltage.h | 21 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 6d9ff4bb86d0..8f43c99674d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50e4a7d0b26c86628300edf4625cc5ff16a7a227
+refs/heads/master: fa60be6e3f9362bd841e26b9366f0db7b761a042
diff --git a/trunk/arch/arm/mach-omap2/voltage.h b/trunk/arch/arm/mach-omap2/voltage.h
index 16a1b092cf36..34ef504adafd 100644
--- a/trunk/arch/arm/mach-omap2/voltage.h
+++ b/trunk/arch/arm/mach-omap2/voltage.h
@@ -16,6 +16,8 @@
 
 #include <linux/err.h>
 
+#include <plat/voltage.h>
+
 #include "vc.h"
 #include "vp.h"
 
@@ -90,25 +92,6 @@ struct voltagedomain {
 	struct omap_volt_data *volt_data;
 };
 
-/**
- * struct omap_volt_data - Omap voltage specific data.
- * @voltage_nominal:	The possible voltage value in uV
- * @sr_efuse_offs:	The offset of the efuse register(from system
- *			control module base address) from where to read
- *			the n-target value for the smartreflex module.
- * @sr_errminlimit:	Error min limit value for smartreflex. This value
- *			differs at differnet opp and thus is linked
- *			with voltage.
- * @vp_errorgain:	Error gain value for the voltage processor. This
- *			field also differs according to the voltage/opp.
- */
-struct omap_volt_data {
-	u32	volt_nominal;
-	u32	sr_efuse_offs;
-	u8	sr_errminlimit;
-	u8	vp_errgain;
-};
-
 /**
  * struct omap_voltdm_pmic - PMIC specific data required by voltage driver.
  * @slew_rate:	PMIC slew rate (in uv/us)
diff --git a/trunk/arch/arm/plat-omap/include/plat/voltage.h b/trunk/arch/arm/plat-omap/include/plat/voltage.h
index 0a6a482ec014..5be4d5def427 100644
--- a/trunk/arch/arm/plat-omap/include/plat/voltage.h
+++ b/trunk/arch/arm/plat-omap/include/plat/voltage.h
@@ -11,10 +11,29 @@
 #ifndef __ARCH_ARM_OMAP_VOLTAGE_H
 #define __ARCH_ARM_OMAP_VOLTAGE_H
 
+/**
+ * struct omap_volt_data - Omap voltage specific data.
+ * @voltage_nominal:	The possible voltage value in uV
+ * @sr_efuse_offs:	The offset of the efuse register(from system
+ *			control module base address) from where to read
+ *			the n-target value for the smartreflex module.
+ * @sr_errminlimit:	Error min limit value for smartreflex. This value
+ *			differs at differnet opp and thus is linked
+ *			with voltage.
+ * @vp_errorgain:	Error gain value for the voltage processor. This
+ *			field also differs according to the voltage/opp.
+ */
+struct omap_volt_data {
+	u32	volt_nominal;
+	u32	sr_efuse_offs;
+	u8	sr_errminlimit;
+	u8	vp_errgain;
+};
 struct voltagedomain;
 
 struct voltagedomain *voltdm_lookup(const char *name);
 int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt);
 unsigned long voltdm_get_voltage(struct voltagedomain *voltdm);
-
+struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,
+		unsigned long volt);
 #endif