OMAP3+: PM: voltagedomain: introduce dependent voltage domain support

There could be dependencies between various voltage domains for
maintaining system performance or hardware limitation reasons
like VDD<X> should be at voltage v1 when VDD<Y> is at voltage v2.
This patch introduce dependent vdd information structures in the
voltage layer which can be used to populate these dependencies
for a voltage domain.

Based on original patch from Thara.

NOTE: OMAP4460 dependency table is not frozen yet, hence not added.

[nm@ti.com: cleanups and squash for OMAP3,4 data]
Signed-off-by: Vishwanath BS <vishwanath.bs@ti.com>
Cc: Thara Gopinath <thara@ti.com>

5 files changed, 113 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/omap_opp_data.h b/arch/arm/mach-omap2/omap_opp_data.h
index b215eef2b20..8b037f99ba9 100644
--- a/arch/arm/mach-omap2/omap_opp_data.h
+++ b/arch/arm/mach-omap2/omap_opp_data.h
@@ -86,8 +86,10 @@ extern int __init omap_init_opp_table(struct omap_opp_def *opp_def,
 
 extern struct omap_volt_data omap34xx_vddmpu_volt_data[];
 extern struct omap_volt_data omap34xx_vddcore_volt_data[];
+extern struct omap_vdd_dep_info omap34xx_vddmpu_dep_info[];
 extern struct omap_volt_data omap36xx_vddmpu_volt_data[];
 extern struct omap_volt_data omap36xx_vddcore_volt_data[];
+extern struct omap_vdd_dep_info omap36xx_vddmpu_dep_info[];
 
 extern struct omap_volt_data omap443x_vdd_mpu_volt_data[];
 extern struct omap_volt_data omap443x_vdd_iva_volt_data[];
diff --git a/arch/arm/mach-omap2/opp3xxx_data.c b/arch/arm/mach-omap2/opp3xxx_data.c
index d95f3f945d4..cd602e3e9ca 100644
--- a/arch/arm/mach-omap2/opp3xxx_data.c
+++ b/arch/arm/mach-omap2/opp3xxx_data.c
@@ -57,6 +57,24 @@ struct omap_volt_data omap34xx_vddcore_volt_data[] = {
         VOLT_DATA_DEFINE(0, 0, 0, 0),
 };
 
+/* OMAP 3430 MPU Core VDD dependency table */
+static struct omap_vdd_dep_volt omap34xx_vdd_mpu_core_dep_data[] = {
+        {.main_vdd_volt = OMAP3430_VDD_MPU_OPP1_UV, .dep_vdd_volt = OMAP3430_VDD_CORE_OPP2_UV},
+        {.main_vdd_volt = OMAP3430_VDD_MPU_OPP2_UV, .dep_vdd_volt = OMAP3430_VDD_CORE_OPP2_UV},
+        {.main_vdd_volt = OMAP3430_VDD_MPU_OPP3_UV, .dep_vdd_volt = OMAP3430_VDD_CORE_OPP3_UV},
+        {.main_vdd_volt = OMAP3430_VDD_MPU_OPP4_UV, .dep_vdd_volt = OMAP3430_VDD_CORE_OPP3_UV},
+        {.main_vdd_volt = OMAP3430_VDD_MPU_OPP5_UV, .dep_vdd_volt = OMAP3430_VDD_CORE_OPP3_UV},
+};
+
+struct omap_vdd_dep_info omap34xx_vddmpu_dep_info[] = {
+        {
+                .name   = "core",
+                .dep_table = omap34xx_vdd_mpu_core_dep_data,
+                .nr_dep_entries = ARRAY_SIZE(omap34xx_vdd_mpu_core_dep_data),
+        },
+        {.name = NULL, .dep_table = NULL, .nr_dep_entries = 0},
+};
+
 /* 36xx */
 
 /* VDD1 */
@@ -150,6 +168,23 @@ static struct omap_opp_def __initdata omap36xx_opp_def_list[] = {
         OPP_INITIALIZER("iva", false, 800000000, OMAP3630_VDD_MPU_OPP1G_UV),
 };
 
+/* OMAP 3630 MPU Core VDD dependency table */
+static struct omap_vdd_dep_volt omap36xx_vdd_mpu_core_dep_data[] = {
+        {.main_vdd_volt = OMAP3630_VDD_MPU_OPP50_UV, .dep_vdd_volt = OMAP3630_VDD_CORE_OPP50_UV},
+        {.main_vdd_volt = OMAP3630_VDD_MPU_OPP100_UV, .dep_vdd_volt = OMAP3630_VDD_CORE_OPP100_UV},
+        {.main_vdd_volt = OMAP3630_VDD_MPU_OPP120_UV, .dep_vdd_volt = OMAP3630_VDD_CORE_OPP100_UV},
+        {.main_vdd_volt = OMAP3630_VDD_MPU_OPP1G_UV, .dep_vdd_volt = OMAP3630_VDD_CORE_OPP100_UV},
+};
+
+struct omap_vdd_dep_info omap36xx_vddmpu_dep_info[] = {
+        {
+                .name   = "core",
+                .dep_table = omap36xx_vdd_mpu_core_dep_data,
+                .nr_dep_entries = ARRAY_SIZE(omap36xx_vdd_mpu_core_dep_data),
+        },
+        {.name = NULL, .dep_table = NULL, .nr_dep_entries = 0},
+};
+
 /**
  * omap3_opp_init() - initialize omap3 opp table
  */
diff --git a/arch/arm/mach-omap2/opp4xxx_data.c b/arch/arm/mach-omap2/opp4xxx_data.c
index 85229547c92..fa176a88d29 100644
--- a/arch/arm/mach-omap2/opp4xxx_data.c
+++ b/arch/arm/mach-omap2/opp4xxx_data.c
@@ -64,6 +64,47 @@ struct omap_volt_data omap443x_vdd_core_volt_data[] = {
         VOLT_DATA_DEFINE(0, 0, 0, 0),
 };
 
+/* Dependency of domains are as follows for OMAP4430 (OPP based):
+ *
+ *      MPU     IVA     CORE
+ *      50      50      50+
+ *      50      100+    100
+ *      100+    50      100
+ *      100+    100+    100
+ */
+
+/* OMAP 4430 MPU Core VDD dependency table */
+static struct omap_vdd_dep_volt omap443x_vdd_mpu_core_dep_data[] = {
+        {.main_vdd_volt = OMAP4430_VDD_MPU_OPP50_UV, .dep_vdd_volt = OMAP4430_VDD_MPU_OPP50_UV},
+        {.main_vdd_volt = OMAP4430_VDD_MPU_OPP100_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV},
+        {.main_vdd_volt = OMAP4430_VDD_MPU_OPPTURBO_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV},
+        {.main_vdd_volt = OMAP4430_VDD_MPU_OPPNITRO_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV},
+};
+
+struct omap_vdd_dep_info omap443x_vddmpu_dep_info[] = {
+        {
+                .name   = "core",
+                .dep_table = omap443x_vdd_mpu_core_dep_data,
+                .nr_dep_entries = ARRAY_SIZE(omap443x_vdd_mpu_core_dep_data),
+        },
+        {.name = NULL, .dep_table = NULL, .nr_dep_entries = 0},
+};
+
+/* OMAP 4430 MPU IVA VDD dependency table */
+static struct omap_vdd_dep_volt omap443x_vdd_iva_core_dep_data[] = {
+        {.main_vdd_volt = OMAP4430_VDD_IVA_OPP50_UV, .dep_vdd_volt = OMAP4430_VDD_MPU_OPP50_UV},
+        {.main_vdd_volt = OMAP4430_VDD_IVA_OPP100_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV},
+        {.main_vdd_volt = OMAP4430_VDD_IVA_OPPTURBO_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV},
+};
+
+struct omap_vdd_dep_info omap443x_vddiva_dep_info[] = {
+        {
+                .name   = "core",
+                .dep_table = omap443x_vdd_iva_core_dep_data,
+                .nr_dep_entries = ARRAY_SIZE(omap443x_vdd_iva_core_dep_data),
+        },
+        {.name = NULL, .dep_table = NULL, .nr_dep_entries = 0},
+};
 
 static struct omap_opp_def __initdata omap443x_opp_def_list[] = {
         /* MPU OPP1 - OPP50 */
diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h
index e9f5408244e..8de4ce6f87e 100644
--- a/arch/arm/mach-omap2/voltage.h
+++ b/arch/arm/mach-omap2/voltage.h
@@ -104,6 +104,35 @@ struct omap_volt_pmic_info {
 };
 
 /**
+ * struct omap_vdd_dep_volt - Map table for voltage dependencies
+ * @main_vdd_volt       : The main vdd voltage
+ * @dep_vdd_volt        : The voltage at which the dependent vdd should be
+ *                        when the main vdd is at <main_vdd_volt> voltage
+ *
+ * Table containing the parent vdd voltage and the dependent vdd voltage
+ * corresponding to it.
+ */
+struct omap_vdd_dep_volt {
+        u32 main_vdd_volt;
+        u32 dep_vdd_volt;
+};
+
+/**
+ * struct omap_vdd_dep_info -  Dependent vdd info
+ * @name                : Dependent vdd name
+ * @_dep_voltdm         : internal structure meant to prevent multiple lookups
+ * @dep_table           : Table containing the dependent vdd voltage
+ *                        corresponding to every main vdd voltage.
+ * @nr_dep_entries      : number of dependency voltage entries
+ */
+struct omap_vdd_dep_info {
+        char *name;
+        struct voltagedomain *_dep_voltdm;
+        struct omap_vdd_dep_volt *dep_table;
+        int nr_dep_entries;
+};
+
+/**
  * omap_vdd_info - Per Voltage Domain info
  *
  * @volt_data           : voltage table having the distinct voltages supported
@@ -121,6 +150,8 @@ struct omap_volt_pmic_info {
  * @curr_volt           : current voltage for this vdd.
  * @vp_enabled          : flag to keep track of whether vp is enabled or not
  * @volt_scale          : API to scale the voltage of the vdd.
+ * @dep_vdd_info        : Array ending with a 0 terminator for dependency
+ *                        voltage information.
  */
 struct omap_vdd_info {
         struct omap_volt_data *volt_data;
@@ -137,6 +168,7 @@ struct omap_vdd_info {
         void (*write_reg) (u32 val, u16 mod, u8 offset);
         int (*volt_scale) (struct omap_vdd_info *vdd,
                 unsigned long target_volt);
+        struct omap_vdd_dep_info *dep_vdd_info;
 };
 
 unsigned long omap_vp_get_curr_volt(struct voltagedomain *voltdm);
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
index def230fd2fd..dd5fff4af9b 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -83,9 +83,12 @@ static int __init omap3xxx_voltage_early_init(void)
         if (cpu_is_omap3630()) {
                 omap3_vdd1_info.volt_data = omap36xx_vddmpu_volt_data;
                 omap3_vdd2_info.volt_data = omap36xx_vddcore_volt_data;
+                omap3_vdd1_info.dep_vdd_info = omap36xx_vddmpu_dep_info;
+
         } else {
                 omap3_vdd1_info.volt_data = omap34xx_vddmpu_volt_data;
                 omap3_vdd2_info.volt_data = omap34xx_vddcore_volt_data;
+                omap3_vdd1_info.dep_vdd_info = omap34xx_vddmpu_dep_info;
         }
 
         return omap_voltage_early_init(prm_mod, prm_irqst_ocp_mod,