Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da03ce65 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

OMAP3: powerdomain data: add voltage domains 



Add voltage domain name to indicate which voltagedomain each
powerdomain is in.

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent aae030fa

arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c

+2 −0
Original line number Diff line number Diff line
@@ -54,10 +54,12 @@ struct powerdomain gfx_omap2_pwrdm = { 
	.pwrsts_mem_on	  = {

		[0] = PWRSTS_ON,  /* MEMONSTATE */

	},

	.voltdm           = { .name = "core" },

};



struct powerdomain wkup_omap2_pwrdm = {

	.name		= "wkup_pwrdm",

	.prcm_offs	= WKUP_MOD,

	.pwrsts		= PWRSTS_ON,

	.voltdm         = { .name = "wakeup" },

};

arch/arm/mach-omap2/powerdomains3xxx_data.c

+16 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static struct powerdomain iva2_pwrdm = { 
		[2] = PWRSTS_OFF_ON,

		[3] = PWRSTS_ON,

	},

	.voltdm           = { .name = "mpu_iva" },

};



static struct powerdomain mpu_3xxx_pwrdm = {
@@ -66,6 +67,7 @@ static struct powerdomain mpu_3xxx_pwrdm = { 
	.pwrsts_mem_on	  = {

		[0] = PWRSTS_OFF_ON,

	},

	.voltdm           = { .name = "mpu_iva" },

};



/*
@@ -92,6 +94,7 @@ static struct powerdomain core_3xxx_pre_es3_1_pwrdm = { 
		[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */

		[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */

	},

	.voltdm           = { .name = "core" },

};



static struct powerdomain core_3xxx_es3_1_pwrdm = {
@@ -113,6 +116,7 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = { 
		[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */

		[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */

	},

	.voltdm           = { .name = "core" },

};



static struct powerdomain dss_pwrdm = {
@@ -127,6 +131,7 @@ static struct powerdomain dss_pwrdm = { 
	.pwrsts_mem_on	  = {

		[0] = PWRSTS_ON,  /* MEMONSTATE */

	},

	.voltdm           = { .name = "core" },

};



/*
@@ -147,6 +152,7 @@ static struct powerdomain sgx_pwrdm = { 
	.pwrsts_mem_on	  = {

		[0] = PWRSTS_ON,  /* MEMONSTATE */

	},

	.voltdm           = { .name = "core" },

};



static struct powerdomain cam_pwrdm = {
@@ -161,6 +167,7 @@ static struct powerdomain cam_pwrdm = { 
	.pwrsts_mem_on	  = {

		[0] = PWRSTS_ON,  /* MEMONSTATE */

	},

	.voltdm           = { .name = "core" },

};



static struct powerdomain per_pwrdm = {
@@ -175,11 +182,13 @@ static struct powerdomain per_pwrdm = { 
	.pwrsts_mem_on	  = {

		[0] = PWRSTS_ON,  /* MEMONSTATE */

	},

	.voltdm           = { .name = "core" },

};



static struct powerdomain emu_pwrdm = {

	.name		= "emu_pwrdm",

	.prcm_offs	= OMAP3430_EMU_MOD,

	.voltdm           = { .name = "core" },

};



static struct powerdomain neon_pwrdm = {
@@ -187,6 +196,7 @@ static struct powerdomain neon_pwrdm = { 
	.prcm_offs	  = OMAP3430_NEON_MOD,

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRSTS_RET,

	.voltdm           = { .name = "mpu_iva" },

};



static struct powerdomain usbhost_pwrdm = {
@@ -208,31 +218,37 @@ static struct powerdomain usbhost_pwrdm = { 
	.pwrsts_mem_on	  = {

		[0] = PWRSTS_ON,  /* MEMONSTATE */

	},

	.voltdm           = { .name = "core" },

};



static struct powerdomain dpll1_pwrdm = {

	.name		= "dpll1_pwrdm",

	.prcm_offs	= MPU_MOD,

	.voltdm           = { .name = "mpu_iva" },

};



static struct powerdomain dpll2_pwrdm = {

	.name		= "dpll2_pwrdm",

	.prcm_offs	= OMAP3430_IVA2_MOD,

	.voltdm           = { .name = "mpu_iva" },

};



static struct powerdomain dpll3_pwrdm = {

	.name		= "dpll3_pwrdm",

	.prcm_offs	= PLL_MOD,

	.voltdm           = { .name = "core" },

};



static struct powerdomain dpll4_pwrdm = {

	.name		= "dpll4_pwrdm",

	.prcm_offs	= PLL_MOD,

	.voltdm           = { .name = "core" },

};



static struct powerdomain dpll5_pwrdm = {

	.name		= "dpll5_pwrdm",

	.prcm_offs	= PLL_MOD,

	.voltdm           = { .name = "core" },

};



/* As powerdomains are added or removed above, this list must also be changed */