|
@@ -31,6 +31,14 @@
|
|
|
* VDD data
|
|
|
*/
|
|
|
|
|
|
+/* OMAP3-common voltagedomain data */
|
|
|
+
|
|
|
+static struct voltagedomain omap3_voltdm_wkup = {
|
|
|
+ .name = "wakeup",
|
|
|
+};
|
|
|
+
|
|
|
+/* 34xx/36xx voltagedomain data */
|
|
|
+
|
|
|
static const struct omap_vfsm_instance omap3_vdd1_vfsm = {
|
|
|
.voltsetup_reg = OMAP3_PRM_VOLTSETUP1_OFFSET,
|
|
|
.voltsetup_mask = OMAP3430_SETUP_TIME1_MASK,
|
|
@@ -63,10 +71,6 @@ static struct voltagedomain omap3_voltdm_core = {
|
|
|
.vp = &omap3_vp_core,
|
|
|
};
|
|
|
|
|
|
-static struct voltagedomain omap3_voltdm_wkup = {
|
|
|
- .name = "wakeup",
|
|
|
-};
|
|
|
-
|
|
|
static struct voltagedomain *voltagedomains_omap3[] __initdata = {
|
|
|
&omap3_voltdm_mpu,
|
|
|
&omap3_voltdm_core,
|
|
@@ -74,11 +78,30 @@ static struct voltagedomain *voltagedomains_omap3[] __initdata = {
|
|
|
NULL,
|
|
|
};
|
|
|
|
|
|
+/* AM35xx voltagedomain data */
|
|
|
+
|
|
|
+static struct voltagedomain am35xx_voltdm_mpu = {
|
|
|
+ .name = "mpu_iva",
|
|
|
+};
|
|
|
+
|
|
|
+static struct voltagedomain am35xx_voltdm_core = {
|
|
|
+ .name = "core",
|
|
|
+};
|
|
|
+
|
|
|
+static struct voltagedomain *voltagedomains_am35xx[] __initdata = {
|
|
|
+ &am35xx_voltdm_mpu,
|
|
|
+ &am35xx_voltdm_core,
|
|
|
+ &omap3_voltdm_wkup,
|
|
|
+ NULL,
|
|
|
+};
|
|
|
+
|
|
|
+
|
|
|
static const char *sys_clk_name __initdata = "sys_ck";
|
|
|
|
|
|
void __init omap3xxx_voltagedomains_init(void)
|
|
|
{
|
|
|
struct voltagedomain *voltdm;
|
|
|
+ struct voltagedomain **voltdms;
|
|
|
int i;
|
|
|
|
|
|
/*
|
|
@@ -93,8 +116,13 @@ void __init omap3xxx_voltagedomains_init(void)
|
|
|
omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;
|
|
|
}
|
|
|
|
|
|
- for (i = 0; voltdm = voltagedomains_omap3[i], voltdm; i++)
|
|
|
+ if (cpu_is_omap3517() || cpu_is_omap3505())
|
|
|
+ voltdms = voltagedomains_am35xx;
|
|
|
+ else
|
|
|
+ voltdms = voltagedomains_omap3;
|
|
|
+
|
|
|
+ for (i = 0; voltdm = voltdms[i], voltdm; i++)
|
|
|
voltdm->sys_clk.name = sys_clk_name;
|
|
|
|
|
|
- voltdm_init(voltagedomains_omap3);
|
|
|
+ voltdm_init(voltdms);
|
|
|
};
|