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

Commit 16e5e2c4 authored by Mark A. Greer's avatar Mark A. Greer Committed by Paul Walmsley
Browse files

ARM: OMAP AM35x: clockdomain data: Fix clockdomain dependencies 



The am35x family of SoCs do not have an IVA so
a parallel set of clockdomain dependencies are
required that are simililar to OMAP3 but without
any IVA dependencies.

Signed-off-by: default avatarMark A. Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 6b16351a

arch/arm/mach-omap2/clockdomains3xxx_data.c

+144 −13
Original line number Diff line number Diff line
@@ -59,6 +59,12 @@ static struct clkdm_dep gfx_sgx_3xxx_wkdeps[] = { 
	{ NULL },

};



static struct clkdm_dep gfx_sgx_am35x_wkdeps[] = {

	{ .clkdm_name = "mpu_clkdm" },

	{ .clkdm_name = "wkup_clkdm" },

	{ NULL },

};



/* 3430: PM_WKDEP_PER: CORE, IVA2, MPU, WKUP */

static struct clkdm_dep per_wkdeps[] = {

	{ .clkdm_name = "core_l3_clkdm" },
@@ -69,6 +75,14 @@ static struct clkdm_dep per_wkdeps[] = { 
	{ NULL },

};



static struct clkdm_dep per_am35x_wkdeps[] = {

	{ .clkdm_name = "core_l3_clkdm" },

	{ .clkdm_name = "core_l4_clkdm" },

	{ .clkdm_name = "mpu_clkdm" },

	{ .clkdm_name = "wkup_clkdm" },

	{ NULL },

};



/* 3430ES2: PM_WKDEP_USBHOST: CORE, IVA2, MPU, WKUP */

static struct clkdm_dep usbhost_wkdeps[] = {

	{ .clkdm_name = "core_l3_clkdm" },
@@ -79,6 +93,14 @@ static struct clkdm_dep usbhost_wkdeps[] = { 
	{ NULL },

};



static struct clkdm_dep usbhost_am35x_wkdeps[] = {

	{ .clkdm_name = "core_l3_clkdm" },

	{ .clkdm_name = "core_l4_clkdm" },

	{ .clkdm_name = "mpu_clkdm" },

	{ .clkdm_name = "wkup_clkdm" },

	{ NULL },

};



/* 3430 PM_WKDEP_MPU: CORE, IVA2, DSS, PER */

static struct clkdm_dep mpu_3xxx_wkdeps[] = {

	{ .clkdm_name = "core_l3_clkdm" },
@@ -89,6 +111,14 @@ static struct clkdm_dep mpu_3xxx_wkdeps[] = { 
	{ NULL },

};



static struct clkdm_dep mpu_am35x_wkdeps[] = {

	{ .clkdm_name = "core_l3_clkdm" },

	{ .clkdm_name = "core_l4_clkdm" },

	{ .clkdm_name = "dss_clkdm" },

	{ .clkdm_name = "per_clkdm" },

	{ NULL },

};



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

static struct clkdm_dep iva2_wkdeps[] = {

	{ .clkdm_name = "core_l3_clkdm" },
@@ -116,6 +146,12 @@ static struct clkdm_dep dss_wkdeps[] = { 
	{ NULL },

};



static struct clkdm_dep dss_am35x_wkdeps[] = {

	{ .clkdm_name = "mpu_clkdm" },

	{ .clkdm_name = "wkup_clkdm" },

	{ NULL },

};



/* 3430: PM_WKDEP_NEON: MPU */

static struct clkdm_dep neon_wkdeps[] = {

	{ .clkdm_name = "mpu_clkdm" },
@@ -131,6 +167,11 @@ static struct clkdm_dep dss_sleepdeps[] = { 
	{ NULL },

};



static struct clkdm_dep dss_am35x_sleepdeps[] = {

	{ .clkdm_name = "mpu_clkdm" },

	{ NULL },

};



/* 3430: CM_SLEEPDEP_PER: MPU, IVA */

static struct clkdm_dep per_sleepdeps[] = {

	{ .clkdm_name = "mpu_clkdm" },
@@ -138,6 +179,11 @@ static struct clkdm_dep per_sleepdeps[] = { 
	{ NULL },

};



static struct clkdm_dep per_am35x_sleepdeps[] = {

	{ .clkdm_name = "mpu_clkdm" },

	{ NULL },

};



/* 3430ES2: CM_SLEEPDEP_USBHOST: MPU, IVA */

static struct clkdm_dep usbhost_sleepdeps[] = {

	{ .clkdm_name = "mpu_clkdm" },
@@ -145,6 +191,11 @@ static struct clkdm_dep usbhost_sleepdeps[] = { 
	{ NULL },

};



static struct clkdm_dep usbhost_am35x_sleepdeps[] = {

	{ .clkdm_name = "mpu_clkdm" },

	{ NULL },

};



/* 3430: CM_SLEEPDEP_CAM: MPU */

static struct clkdm_dep cam_sleepdeps[] = {

	{ .clkdm_name = "mpu_clkdm" },
@@ -175,6 +226,15 @@ static struct clockdomain mpu_3xxx_clkdm = { 
	.clktrctrl_mask = OMAP3430_CLKTRCTRL_MPU_MASK,

};



static struct clockdomain mpu_am35x_clkdm = {

	.name		= "mpu_clkdm",

	.pwrdm		= { .name = "mpu_pwrdm" },

	.flags		= CLKDM_CAN_HWSUP | CLKDM_CAN_FORCE_WAKEUP,

	.dep_bit	= OMAP3430_EN_MPU_SHIFT,

	.wkdep_srcs	= mpu_am35x_wkdeps,

	.clktrctrl_mask = OMAP3430_CLKTRCTRL_MPU_MASK,

};



static struct clockdomain neon_clkdm = {

	.name		= "neon_clkdm",

	.pwrdm		= { .name = "neon_pwrdm" },
@@ -210,6 +270,15 @@ static struct clockdomain sgx_clkdm = { 
	.clktrctrl_mask = OMAP3430ES2_CLKTRCTRL_SGX_MASK,

};



static struct clockdomain sgx_am35x_clkdm = {

	.name		= "sgx_clkdm",

	.pwrdm		= { .name = "sgx_pwrdm" },

	.flags		= CLKDM_CAN_HWSUP_SWSUP,

	.wkdep_srcs	= gfx_sgx_am35x_wkdeps,

	.sleepdep_srcs	= gfx_sgx_sleepdeps,

	.clktrctrl_mask = OMAP3430ES2_CLKTRCTRL_SGX_MASK,

};



/*

 * The die-to-die clockdomain was documented in the 34xx ES1 TRM, but

 * then that information was removed from the 34xx ES2+ TRM.  It is
@@ -261,6 +330,16 @@ static struct clockdomain dss_3xxx_clkdm = { 
	.clktrctrl_mask = OMAP3430_CLKTRCTRL_DSS_MASK,

};



static struct clockdomain dss_am35x_clkdm = {

	.name		= "dss_clkdm",

	.pwrdm		= { .name = "dss_pwrdm" },

	.flags		= CLKDM_CAN_HWSUP_SWSUP,

	.dep_bit	= OMAP3430_PM_WKDEP_MPU_EN_DSS_SHIFT,

	.wkdep_srcs	= dss_am35x_wkdeps,

	.sleepdep_srcs	= dss_am35x_sleepdeps,

	.clktrctrl_mask = OMAP3430_CLKTRCTRL_DSS_MASK,

};



static struct clockdomain cam_clkdm = {

	.name		= "cam_clkdm",

	.pwrdm		= { .name = "cam_pwrdm" },
@@ -279,6 +358,15 @@ static struct clockdomain usbhost_clkdm = { 
	.clktrctrl_mask = OMAP3430ES2_CLKTRCTRL_USBHOST_MASK,

};



static struct clockdomain usbhost_am35x_clkdm = {

	.name		= "usbhost_clkdm",

	.pwrdm		= { .name = "core_pwrdm" },

	.flags		= CLKDM_CAN_HWSUP_SWSUP,

	.wkdep_srcs	= usbhost_am35x_wkdeps,

	.sleepdep_srcs	= usbhost_am35x_sleepdeps,

	.clktrctrl_mask = OMAP3430ES2_CLKTRCTRL_USBHOST_MASK,

};



static struct clockdomain per_clkdm = {

	.name		= "per_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },
@@ -289,6 +377,16 @@ static struct clockdomain per_clkdm = { 
	.clktrctrl_mask = OMAP3430_CLKTRCTRL_PER_MASK,

};



static struct clockdomain per_am35x_clkdm = {

	.name		= "per_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.flags		= CLKDM_CAN_HWSUP_SWSUP,

	.dep_bit	= OMAP3430_EN_PER_SHIFT,

	.wkdep_srcs	= per_am35x_wkdeps,

	.sleepdep_srcs	= per_am35x_sleepdeps,

	.clktrctrl_mask = OMAP3430_CLKTRCTRL_PER_MASK,

};



/*

 * Disable hw supervised mode for emu_clkdm, because emu_pwrdm is

 * switched of even if sdti is in use
@@ -341,31 +439,44 @@ static struct clkdm_autodep clkdm_autodeps[] = { 
	}

};



static struct clkdm_autodep clkdm_am35x_autodeps[] = {

	{

		.clkdm = { .name = "mpu_clkdm" },

	},

	{

		.clkdm = { .name = NULL },

	}

};



/*

 *

 */



static struct clockdomain *clockdomains_omap3430_common[] __initdata = {

static struct clockdomain *clockdomains_common[] __initdata = {

	&wkup_common_clkdm,

	&cm_common_clkdm,

	&prm_common_clkdm,

	&mpu_3xxx_clkdm,

	&neon_clkdm,

	&iva2_clkdm,

	&d2d_clkdm,

	&core_l3_3xxx_clkdm,

	&core_l4_3xxx_clkdm,

	&dss_3xxx_clkdm,

	&cam_clkdm,

	&per_clkdm,

	&emu_clkdm,

	&dpll1_clkdm,

	&dpll2_clkdm,

	&dpll3_clkdm,

	&dpll4_clkdm,

	NULL

};



static struct clockdomain *clockdomains_omap3430[] __initdata = {

	&mpu_3xxx_clkdm,

	&iva2_clkdm,

	&d2d_clkdm,

	&dss_3xxx_clkdm,

	&cam_clkdm,

	&per_clkdm,

	&dpll2_clkdm,

	NULL

};



static struct clockdomain *clockdomains_omap3430es1[] __initdata = {

	&gfx_3430es1_clkdm,

	NULL,
@@ -378,21 +489,41 @@ static struct clockdomain *clockdomains_omap3430es2plus[] __initdata = { 
	NULL,

};



static struct clockdomain *clockdomains_am35x[] __initdata = {

	&mpu_am35x_clkdm,

	&sgx_am35x_clkdm,

	&dss_am35x_clkdm,

	&per_am35x_clkdm,

	&usbhost_am35x_clkdm,

	&dpll5_clkdm,

	NULL

};



void __init omap3xxx_clockdomains_init(void)

{

	struct clockdomain **sc;

	unsigned int rev;



	if (!cpu_is_omap34xx())

		return;



	clkdm_register_platform_funcs(&omap3_clkdm_operations);

	clkdm_register_clkdms(clockdomains_omap3430_common);

	clkdm_register_clkdms(clockdomains_common);



	sc = (omap_rev() == OMAP3430_REV_ES1_0) ? clockdomains_omap3430es1 :

		clockdomains_omap3430es2plus;

	rev = omap_rev();



	clkdm_register_clkdms(sc);

	if (rev == AM35XX_REV_ES1_0 || rev == AM35XX_REV_ES1_1) {

		clkdm_register_clkdms(clockdomains_am35x);

		clkdm_register_autodeps(clkdm_am35x_autodeps);

	} else {

		clkdm_register_clkdms(clockdomains_omap3430);



		sc = (rev == OMAP3430_REV_ES1_0) ?

			clockdomains_omap3430es1 : clockdomains_omap3430es2plus;



		clkdm_register_clkdms(sc);

		clkdm_register_autodeps(clkdm_autodeps);

	}



	clkdm_complete_init();

}