diff options
author | J Keerthy <j-keerthy@ti.com> | 2012-04-25 01:44:31 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2012-05-31 19:03:44 -0400 |
commit | fa60be6e3f9362bd841e26b9366f0db7b761a042 (patch) | |
tree | 037b8a6ceb9a37cfd49b52ca35fe87a3e93ec275 | |
parent | 50e4a7d0b26c86628300edf4625cc5ff16a7a227 (diff) |
ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat
Move the omap_volt_data structure from mach-omap2/ directory
to arch/arm/plat-omap/include/plat/ so that it is accessible
from both mach-omap2 and drivers directories.
Signed-off-by: J Keerthy <j-keerthy@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
-rw-r--r-- | arch/arm/mach-omap2/voltage.h | 21 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/voltage.h | 21 |
2 files changed, 22 insertions, 20 deletions
diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h index 16a1b092cf36..34ef504adafd 100644 --- a/arch/arm/mach-omap2/voltage.h +++ b/arch/arm/mach-omap2/voltage.h | |||
@@ -16,6 +16,8 @@ | |||
16 | 16 | ||
17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
18 | 18 | ||
19 | #include <plat/voltage.h> | ||
20 | |||
19 | #include "vc.h" | 21 | #include "vc.h" |
20 | #include "vp.h" | 22 | #include "vp.h" |
21 | 23 | ||
@@ -91,25 +93,6 @@ struct voltagedomain { | |||
91 | }; | 93 | }; |
92 | 94 | ||
93 | /** | 95 | /** |
94 | * struct omap_volt_data - Omap voltage specific data. | ||
95 | * @voltage_nominal: The possible voltage value in uV | ||
96 | * @sr_efuse_offs: The offset of the efuse register(from system | ||
97 | * control module base address) from where to read | ||
98 | * the n-target value for the smartreflex module. | ||
99 | * @sr_errminlimit: Error min limit value for smartreflex. This value | ||
100 | * differs at differnet opp and thus is linked | ||
101 | * with voltage. | ||
102 | * @vp_errorgain: Error gain value for the voltage processor. This | ||
103 | * field also differs according to the voltage/opp. | ||
104 | */ | ||
105 | struct omap_volt_data { | ||
106 | u32 volt_nominal; | ||
107 | u32 sr_efuse_offs; | ||
108 | u8 sr_errminlimit; | ||
109 | u8 vp_errgain; | ||
110 | }; | ||
111 | |||
112 | /** | ||
113 | * struct omap_voltdm_pmic - PMIC specific data required by voltage driver. | 96 | * struct omap_voltdm_pmic - PMIC specific data required by voltage driver. |
114 | * @slew_rate: PMIC slew rate (in uv/us) | 97 | * @slew_rate: PMIC slew rate (in uv/us) |
115 | * @step_size: PMIC voltage step size (in uv) | 98 | * @step_size: PMIC voltage step size (in uv) |
diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h index 0a6a482ec014..5be4d5def427 100644 --- a/arch/arm/plat-omap/include/plat/voltage.h +++ b/arch/arm/plat-omap/include/plat/voltage.h | |||
@@ -11,10 +11,29 @@ | |||
11 | #ifndef __ARCH_ARM_OMAP_VOLTAGE_H | 11 | #ifndef __ARCH_ARM_OMAP_VOLTAGE_H |
12 | #define __ARCH_ARM_OMAP_VOLTAGE_H | 12 | #define __ARCH_ARM_OMAP_VOLTAGE_H |
13 | 13 | ||
14 | /** | ||
15 | * struct omap_volt_data - Omap voltage specific data. | ||
16 | * @voltage_nominal: The possible voltage value in uV | ||
17 | * @sr_efuse_offs: The offset of the efuse register(from system | ||
18 | * control module base address) from where to read | ||
19 | * the n-target value for the smartreflex module. | ||
20 | * @sr_errminlimit: Error min limit value for smartreflex. This value | ||
21 | * differs at differnet opp and thus is linked | ||
22 | * with voltage. | ||
23 | * @vp_errorgain: Error gain value for the voltage processor. This | ||
24 | * field also differs according to the voltage/opp. | ||
25 | */ | ||
26 | struct omap_volt_data { | ||
27 | u32 volt_nominal; | ||
28 | u32 sr_efuse_offs; | ||
29 | u8 sr_errminlimit; | ||
30 | u8 vp_errgain; | ||
31 | }; | ||
14 | struct voltagedomain; | 32 | struct voltagedomain; |
15 | 33 | ||
16 | struct voltagedomain *voltdm_lookup(const char *name); | 34 | struct voltagedomain *voltdm_lookup(const char *name); |
17 | int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt); | 35 | int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt); |
18 | unsigned long voltdm_get_voltage(struct voltagedomain *voltdm); | 36 | unsigned long voltdm_get_voltage(struct voltagedomain *voltdm); |
19 | 37 | struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm, | |
38 | unsigned long volt); | ||
20 | #endif | 39 | #endif |