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

Commit ecb24aa1 authored by Paul Walmsley's avatar Paul Walmsley Committed by Tony Lindgren
Browse files

ARM: OMAP: Powerdomain: Add OMAP3 powerdomains 



Add OMAP3-specific powerdomains.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent fe6a58f8

arch/arm/mach-omap2/powerdomains.h

+28 −2
Original line number Diff line number Diff line
@@ -98,16 +98,28 @@ static struct pwrdm_dep gfx_sgx_wkdeps[] = { 
	{ NULL },

};



/*

 * 3430: CM_SLEEPDEP_CAM: MPU

 * 3430ES1: CM_SLEEPDEP_GFX: MPU

 * 3430ES2: CM_SLEEPDEP_SGX: MPU

 */

static struct pwrdm_dep cam_gfx_sleepdeps[] = {

	{

		.pwrdm_name = "mpu_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{ NULL },

};





#include "powerdomains24xx.h"

#include "powerdomains34xx.h"





/*

 * OMAP2/3 common powerdomains

 */



/* XXX add sleepdeps for this powerdomain : 3430 */



/*

 * The GFX powerdomain is not present on 3430ES2, but currently we do not

 * have a macro to filter it out at compile-time.
@@ -118,6 +130,7 @@ static struct powerdomain gfx_pwrdm = { 
	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX |

					   CHIP_IS_OMAP3430ES1),

	.wkdep_srcs	  = gfx_sgx_wkdeps,

	.sleepdep_srcs	  = cam_gfx_sleepdeps,

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRDM_POWER_RET,

	.banks		  = 1,
@@ -154,6 +167,19 @@ static struct powerdomain *powerdomains_omap[] __initdata = { 
	&mdm_pwrdm,

#endif



#ifdef CONFIG_ARCH_OMAP34XX

	&iva2_pwrdm,

	&mpu_34xx_pwrdm,

	&neon_pwrdm,

	&core_34xx_pwrdm,

	&cam_pwrdm,

	&dss_pwrdm,

	&per_pwrdm,

	&emu_pwrdm,

	&sgx_pwrdm,

	&usbhost_pwrdm,

#endif



	NULL

};

arch/arm/mach-omap2/powerdomains34xx.h

0 → 100644
+327 −0
Original line number Diff line number Diff line 
/*

 * OMAP34XX powerdomain definitions

 *

 * Copyright (C) 2007-2008 Texas Instruments, Inc.

 * Copyright (C) 2007-2008 Nokia Corporation

 *

 * Written by Paul Walmsley

 * Debugging and integration fixes by Jouni Högander

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef ARCH_ARM_MACH_OMAP2_POWERDOMAINS34XX

#define ARCH_ARM_MACH_OMAP2_POWERDOMAINS34XX



/*

 * N.B. If powerdomains are added or removed from this file, update

 * the array in mach-omap2/powerdomains.h.

 */



#include <mach/powerdomain.h>



#include "prcm-common.h"

#include "prm.h"

#include "prm-regbits-34xx.h"

#include "cm.h"

#include "cm-regbits-34xx.h"



/*

 * 34XX-specific powerdomains, dependencies

 */



#ifdef CONFIG_ARCH_OMAP34XX



/*

 * 3430: PM_WKDEP_{PER,USBHOST}: CORE, IVA2, MPU, WKUP

 * (USBHOST is ES2 only)

 */

static struct pwrdm_dep per_usbhost_wkdeps[] = {

	{

		.pwrdm_name = "core_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "iva2_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "mpu_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "wkup_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{ NULL },

};



/*

 * 3430 PM_WKDEP_MPU: CORE, IVA2, DSS, PER

 */

static struct pwrdm_dep mpu_34xx_wkdeps[] = {

	{

		.pwrdm_name = "core_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "iva2_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "dss_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "per_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{ NULL },

};



/*

 * 3430 PM_WKDEP_IVA2: CORE, MPU, WKUP, DSS, PER

 */

static struct pwrdm_dep iva2_wkdeps[] = {

	{

		.pwrdm_name = "core_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "mpu_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "wkup_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "dss_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "per_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{ NULL },

};





/* 3430 PM_WKDEP_{CAM,DSS}: IVA2, MPU, WKUP */

static struct pwrdm_dep cam_dss_wkdeps[] = {

	{

		.pwrdm_name = "iva2_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "mpu_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "wkup_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{ NULL },

};



/* 3430: PM_WKDEP_NEON: MPU */

static struct pwrdm_dep neon_wkdeps[] = {

	{

		.pwrdm_name = "mpu_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{ NULL },

};





/* Sleep dependency source arrays for 34xx-specific pwrdms - 34XX only */



/*

 * 3430: CM_SLEEPDEP_{DSS,PER}: MPU, IVA

 * 3430ES2: CM_SLEEPDEP_USBHOST: MPU, IVA

 */

static struct pwrdm_dep dss_per_usbhost_sleepdeps[] = {

	{

		.pwrdm_name = "mpu_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{

		.pwrdm_name = "iva2_pwrdm",

		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)

	},

	{ NULL },

};





/*

 * Powerdomains

 */



static struct powerdomain iva2_pwrdm = {

	.name		  = "iva2_pwrdm",

	.prcm_offs	  = OMAP3430_IVA2_MOD,

	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

	.dep_bit	  = OMAP3430_PM_WKDEP_MPU_EN_IVA2_SHIFT,

	.wkdep_srcs	  = iva2_wkdeps,

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRSTS_OFF_RET,

	.banks		  = 4,

	.pwrsts_mem_ret	  = {

		[0] = PWRSTS_OFF_RET,

		[1] = PWRSTS_OFF_RET,

		[2] = PWRSTS_OFF_RET,

		[3] = PWRSTS_OFF_RET,

	},

	.pwrsts_mem_on	  = {

		[0] = PWRDM_POWER_ON,

		[1] = PWRDM_POWER_ON,

		[2] = PWRSTS_OFF_ON,

		[3] = PWRDM_POWER_ON,

	},

};



static struct powerdomain mpu_34xx_pwrdm = {

	.name		  = "mpu_pwrdm",

	.prcm_offs	  = MPU_MOD,

	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

	.dep_bit	  = OMAP3430_EN_MPU_SHIFT,

	.wkdep_srcs	  = mpu_34xx_wkdeps,

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRSTS_OFF_RET,

	.banks		  = 1,

	.pwrsts_mem_ret	  = {

		[0] = PWRSTS_OFF_RET,

	},

	.pwrsts_mem_on	  = {

		[0] = PWRSTS_OFF_ON,

	},

};



/* No wkdeps or sleepdeps for 34xx core apparently */

static struct powerdomain core_34xx_pwrdm = {

	.name		  = "core_pwrdm",

	.prcm_offs	  = CORE_MOD,

	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.dep_bit	  = OMAP3430_EN_CORE_SHIFT,

	.banks		  = 2,

	.pwrsts_mem_ret	  = {

		[0] = PWRSTS_OFF_RET,	 /* MEM1RETSTATE */

		[1] = PWRSTS_OFF_RET,	 /* MEM2RETSTATE */

	},

	.pwrsts_mem_on	  = {

		[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */

		[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */

	},

};



/* Another case of bit name collisions between several registers: EN_DSS */

static struct powerdomain dss_pwrdm = {

	.name		  = "dss_pwrdm",

	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

	.prcm_offs	  = OMAP3430_DSS_MOD,

	.dep_bit	  = OMAP3430_PM_WKDEP_MPU_EN_DSS_SHIFT,

	.wkdep_srcs	  = cam_dss_wkdeps,

	.sleepdep_srcs	  = dss_per_usbhost_sleepdeps,

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRDM_POWER_RET,

	.banks		  = 1,

	.pwrsts_mem_ret	  = {

		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */

	},

	.pwrsts_mem_on	  = {

		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */

	},

};



static struct powerdomain sgx_pwrdm = {

	.name		  = "sgx_pwrdm",

	.prcm_offs	  = OMAP3430ES2_SGX_MOD,

	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),

	.wkdep_srcs	  = gfx_sgx_wkdeps,

	.sleepdep_srcs	  = cam_gfx_sleepdeps,

	/* XXX This is accurate for 3430 SGX, but what about GFX? */

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRDM_POWER_RET,

	.banks		  = 1,

	.pwrsts_mem_ret	  = {

		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */

	},

	.pwrsts_mem_on	  = {

		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */

	},

};



static struct powerdomain cam_pwrdm = {

	.name		  = "cam_pwrdm",

	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

	.prcm_offs	  = OMAP3430_CAM_MOD,

	.wkdep_srcs	  = cam_dss_wkdeps,

	.sleepdep_srcs	  = cam_gfx_sleepdeps,

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRDM_POWER_RET,

	.banks		  = 1,

	.pwrsts_mem_ret	  = {

		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */

	},

	.pwrsts_mem_on	  = {

		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */

	},

};



static struct powerdomain per_pwrdm = {

	.name		  = "per_pwrdm",

	.prcm_offs	  = OMAP3430_PER_MOD,

	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

	.dep_bit	  = OMAP3430_EN_PER_SHIFT,

	.wkdep_srcs	  = per_usbhost_wkdeps,

	.sleepdep_srcs	  = dss_per_usbhost_sleepdeps,

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRSTS_OFF_RET,

	.banks		  = 1,

	.pwrsts_mem_ret	  = {

		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */

	},

	.pwrsts_mem_on	  = {

		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */

	},

};



static struct powerdomain emu_pwrdm = {

	.name		= "emu_pwrdm",

	.prcm_offs	= OMAP3430_EMU_MOD,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

};



static struct powerdomain neon_pwrdm = {

	.name		  = "neon_pwrdm",

	.prcm_offs	  = OMAP3430_NEON_MOD,

	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

	.wkdep_srcs	  = neon_wkdeps,

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRDM_POWER_RET,

};



static struct powerdomain usbhost_pwrdm = {

	.name		  = "usbhost_pwrdm",

	.prcm_offs	  = OMAP3430ES2_USBHOST_MOD,

	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),

	.wkdep_srcs	  = per_usbhost_wkdeps,

	.sleepdep_srcs	  = dss_per_usbhost_sleepdeps,

	.pwrsts		  = PWRSTS_OFF_RET_ON,

	.pwrsts_logic_ret = PWRDM_POWER_RET,

	.banks		  = 1,

	.pwrsts_mem_ret	  = {

		[0] = PWRDM_POWER_RET, /* MEMRETSTATE */

	},

	.pwrsts_mem_on	  = {

		[0] = PWRDM_POWER_ON,  /* MEMONSTATE */

	},

};



#endif    /* CONFIG_ARCH_OMAP34XX */





#endif

arch/arm/mach-omap2/prcm-common.h

+2 −1
Original line number Diff line number Diff line
@@ -312,7 +312,8 @@ 
#define OMAP3430_ST_GPT2				(1 << 3)



/* CM_SLEEPDEP_PER, PM_WKDEP_IVA2, PM_WKDEP_MPU, PM_WKDEP_PER shared bits */

#define OMAP3430_EN_CORE				(1 << 0)

#define OMAP3430_EN_CORE_SHIFT				0

#define OMAP3430_EN_CORE_MASK				(1 << 0)



#endif

arch/arm/mach-omap2/prm-regbits-34xx.h

+7 −4
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ 
#define OMAP3430_VPINIDLE				(1 << 0)



/* PM_WKDEP_IVA2, PM_WKDEP_MPU shared bits */

#define OMAP3430_EN_PER					(1 << 7)

#define OMAP3430_EN_PER_SHIFT				7

#define OMAP3430_EN_PER_MASK				(1 << 7)



/* PM_PWSTCTRL_IVA2, PM_PWSTCTRL_MPU, PM_PWSTCTRL_CORE shared bits */

#define OMAP3430_MEMORYCHANGE				(1 << 3)
@@ -278,8 +279,10 @@ 
#define OMAP3430_EMULATION_MPU_RST			(1 << 11)



/* PM_WKDEP_MPU specific bits */

#define OMAP3430_PM_WKDEP_MPU_EN_DSS			(1 << 5)

#define OMAP3430_PM_WKDEP_MPU_EN_IVA2			(1 << 2)

#define OMAP3430_PM_WKDEP_MPU_EN_DSS_SHIFT		5

#define OMAP3430_PM_WKDEP_MPU_EN_DSS_MASK		(1 << 5)

#define OMAP3430_PM_WKDEP_MPU_EN_IVA2_SHIFT		2

#define OMAP3430_PM_WKDEP_MPU_EN_IVA2_MASK		(1 << 2)



/* PM_EVGENCTRL_MPU */

#define OMAP3430_OFFLOADMODE_SHIFT			3