[PATCHv5,2/4] omap: voltage: added mapping from voltagedomains to processor devices

Commit Message

Tero Kristo Aug. 31, 2011, 3:11 p.m. UTC

This is needed so that SMPS regulators can be properly mapped to corresponding
processor devices.

Signed-off-by: Tero Kristo <[e-mail]>
---
 arch/arm/mach-omap2/voltage.h                 |    2 ++
 arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 ++
 arch/arm/mach-omap2/voltagedomains44xx_data.c |    3 +++
 3 files changed, 7 insertions(+), 0 deletions(-)

Patch

diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h
index b4c6259..bcbf0c0 100644
--- a/arch/arm/mach-omap2/voltage.h
+++ b/arch/arm/mach-omap2/voltage.h
@@ -53,6 +53,7 @@  struct omap_vfsm_instance {
 /**
  * struct voltagedomain - omap voltage domain global structure.
  * @name: Name of the voltage domain which can be used as a unique identifier.
+ * @proc_dev: Name of the associated processor device / hwmod.
  * @scalable: Whether or not this voltage domain is scalable
  * @node: list_head linking all voltage domains
  * @pwrdm_node: list_head linking all powerdomains in this voltagedomain
@@ -63,6 +64,7 @@  struct omap_vfsm_instance {
  */
 struct voltagedomain {
 	char *name;
+	char *proc_dev;
 	bool scalable;
 	struct list_head node;
 	struct list_head pwrdm_list;
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
index b0d0ae1..28f1908 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -45,6 +45,7 @@  static const struct omap_vfsm_instance omap3_vdd2_vfsm = {
 
 static struct voltagedomain omap3_voltdm_mpu = {
 	.name = "mpu_iva",
+	.proc_dev = "mpu.0",
 	.scalable = true,
 	.read = omap3_prm_vcvp_read,
 	.write = omap3_prm_vcvp_write,
@@ -56,6 +57,7 @@  static struct voltagedomain omap3_voltdm_mpu = {
 
 static struct voltagedomain omap3_voltdm_core = {
 	.name = "core",
+	.proc_dev = "l3_main.0",
 	.scalable = true,
 	.read = omap3_prm_vcvp_read,
 	.write = omap3_prm_vcvp_write,
diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c
index c4584e9..10c1d66 100644
--- a/arch/arm/mach-omap2/voltagedomains44xx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c
@@ -46,6 +46,7 @@  static const struct omap_vfsm_instance omap4_vdd_core_vfsm = {
 
 static struct voltagedomain omap4_voltdm_mpu = {
 	.name = "mpu",
+	.proc_dev = "mpu.0",
 	.scalable = true,
 	.read = omap4_prm_vcvp_read,
 	.write = omap4_prm_vcvp_write,
@@ -57,6 +58,7 @@  static struct voltagedomain omap4_voltdm_mpu = {
 
 static struct voltagedomain omap4_voltdm_iva = {
 	.name = "iva",
+	.proc_dev = "iva.0",
 	.scalable = true,
 	.read = omap4_prm_vcvp_read,
 	.write = omap4_prm_vcvp_write,
@@ -68,6 +70,7 @@  static struct voltagedomain omap4_voltdm_iva = {
 
 static struct voltagedomain omap4_voltdm_core = {
 	.name = "core",
+	.proc_dev = "l3_main_1.0",
 	.scalable = true,
 	.read = omap4_prm_vcvp_read,
 	.write = omap4_prm_vcvp_write,