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

Commit 6515b0f7 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/pm-part2

parents 2f4d91e3 46bf4a56

arch/arm/mach-omap2/clock33xx_data.c

+6 −6
Original line number Diff line number Diff line
@@ -548,16 +548,16 @@ static struct clk mcasp1_fck = { 
	.recalc		= &followparent_recalc,

};



static struct clk smartreflex0_fck = {

	.name		= "smartreflex0_fck",

static struct clk smartreflex_mpu_fck = {

	.name		= "smartreflex_mpu_fck",

	.clkdm_name	= "l4_wkup_clkdm",

	.parent		= &sys_clkin_ck,

	.ops		= &clkops_null,

	.recalc		= &followparent_recalc,

};



static struct clk smartreflex1_fck = {

	.name		= "smartreflex1_fck",

static struct clk smartreflex_core_fck = {

	.name		= "smartreflex_core_fck",

	.clkdm_name	= "l4_wkup_clkdm",

	.parent		= &sys_clkin_ck,

	.ops		= &clkops_null,
@@ -1039,8 +1039,8 @@ static struct omap_clk am33xx_clks[] = { 
	CLK(NULL,	"mcasp1_fck",		&mcasp1_fck,	CK_AM33XX),

	CLK("NULL",	"mmc2_fck",		&mmc2_fck,	CK_AM33XX),

	CLK(NULL,	"mmu_fck",		&mmu_fck,	CK_AM33XX),

	CLK(NULL,	"smartreflex0_fck",	&smartreflex0_fck,	CK_AM33XX),

	CLK(NULL,	"smartreflex1_fck",	&smartreflex1_fck,	CK_AM33XX),

	CLK(NULL,	"smartreflex_mpu_fck",	&smartreflex_mpu_fck,	CK_AM33XX),

	CLK(NULL,	"smartreflex_core_fck",	&smartreflex_core_fck,	CK_AM33XX),

	CLK(NULL,	"timer1_fck",		&timer1_fck,	CK_AM33XX),

	CLK(NULL,	"timer2_fck",		&timer2_fck,	CK_AM33XX),

	CLK(NULL,	"timer3_fck",		&timer3_fck,	CK_AM33XX),

arch/arm/mach-omap2/clock3xxx_data.c

+6 −6
Original line number Diff line number Diff line
@@ -3050,8 +3050,8 @@ static struct clk traceclk_fck = { 
/* SR clocks */



/* SmartReflex fclk (VDD1) */

static struct clk sr1_fck = {

	.name		= "sr1_fck",

static struct clk smartreflex_mpu_iva_fck = {

	.name		= "smartreflex_mpu_iva_fck",

	.ops		= &clkops_omap2_dflt_wait,

	.parent		= &sys_ck,

	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
@@ -3061,8 +3061,8 @@ static struct clk sr1_fck = { 
};



/* SmartReflex fclk (VDD2) */

static struct clk sr2_fck = {

	.name		= "sr2_fck",

static struct clk smartreflex_core_fck = {

	.name		= "smartreflex_core_fck",

	.ops		= &clkops_omap2_dflt_wait,

	.parent		= &sys_ck,

	.enable_reg	= OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
@@ -3478,8 +3478,8 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"atclk_fck",	&atclk_fck,	CK_3XXX),

	CLK(NULL,	"traceclk_src_fck", &traceclk_src_fck, CK_3XXX),

	CLK(NULL,	"traceclk_fck",	&traceclk_fck,	CK_3XXX),

	CLK(NULL,	"sr1_fck",	&sr1_fck,	CK_34XX | CK_36XX),

	CLK(NULL,	"sr2_fck",	&sr2_fck,	CK_34XX | CK_36XX),

	CLK(NULL,	"smartreflex_mpu_iva_fck",	&smartreflex_mpu_iva_fck,	CK_34XX | CK_36XX),

	CLK(NULL,	"smartreflex_core_fck",	&smartreflex_core_fck,	CK_34XX | CK_36XX),

	CLK(NULL,	"sr_l4_ick",	&sr_l4_ick,	CK_34XX | CK_36XX),

	CLK(NULL,	"secure_32k_fck", &secure_32k_fck, CK_3XXX),

	CLK(NULL,	"gpt12_fck",	&gpt12_fck,	CK_3XXX),

arch/arm/mach-omap2/control.h

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ 
#define OMAP44XX_CONTROL_FUSE_MPU_OPPNITRO	0x249

#define OMAP44XX_CONTROL_FUSE_CORE_OPP50	0x254

#define OMAP44XX_CONTROL_FUSE_CORE_OPP100	0x257

#define OMAP44XX_CONTROL_FUSE_CORE_OPP100OV	0x25A



/* AM35XX only CONTROL_GENERAL register offsets */

#define AM35XX_CONTROL_MSUSPENDMUX_6    (OMAP2_CONTROL_GENERAL + 0x0038)

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+4 −4
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_mpu_irqs[] = { 
static struct omap_hwmod omap34xx_sr1_hwmod = {

	.name		= "smartreflex_mpu_iva",

	.class		= &omap34xx_smartreflex_hwmod_class,

	.main_clk	= "sr1_fck",

	.main_clk	= "smartreflex_mpu_iva_fck",

	.prcm		= {

		.omap2 = {

			.prcm_reg_id = 1,
@@ -1424,7 +1424,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = { 
static struct omap_hwmod omap36xx_sr1_hwmod = {

	.name		= "smartreflex_mpu_iva",

	.class		= &omap36xx_smartreflex_hwmod_class,

	.main_clk	= "sr1_fck",

	.main_clk	= "smartreflex_mpu_iva_fck",

	.prcm		= {

		.omap2 = {

			.prcm_reg_id = 1,
@@ -1451,7 +1451,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_core_irqs[] = { 
static struct omap_hwmod omap34xx_sr2_hwmod = {

	.name		= "smartreflex_core",

	.class		= &omap34xx_smartreflex_hwmod_class,

	.main_clk	= "sr2_fck",

	.main_clk	= "smartreflex_core_fck",

	.prcm		= {

		.omap2 = {

			.prcm_reg_id = 1,
@@ -1469,7 +1469,7 @@ static struct omap_hwmod omap34xx_sr2_hwmod = { 
static struct omap_hwmod omap36xx_sr2_hwmod = {

	.name		= "smartreflex_core",

	.class		= &omap36xx_smartreflex_hwmod_class,

	.main_clk	= "sr2_fck",

	.main_clk	= "smartreflex_core_fck",

	.prcm		= {

		.omap2 = {

			.prcm_reg_id = 1,

arch/arm/mach-omap2/omap_opp_data.h

+6 −3
Original line number Diff line number Diff line
@@ -89,8 +89,11 @@ extern struct omap_volt_data omap34xx_vddcore_volt_data[]; 
extern struct omap_volt_data omap36xx_vddmpu_volt_data[];

extern struct omap_volt_data omap36xx_vddcore_volt_data[];



extern struct omap_volt_data omap44xx_vdd_mpu_volt_data[];

extern struct omap_volt_data omap44xx_vdd_iva_volt_data[];

extern struct omap_volt_data omap44xx_vdd_core_volt_data[];

extern struct omap_volt_data omap443x_vdd_mpu_volt_data[];

extern struct omap_volt_data omap443x_vdd_iva_volt_data[];

extern struct omap_volt_data omap443x_vdd_core_volt_data[];

extern struct omap_volt_data omap446x_vdd_mpu_volt_data[];

extern struct omap_volt_data omap446x_vdd_iva_volt_data[];

extern struct omap_volt_data omap446x_vdd_core_volt_data[];



#endif		/* __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H */