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

Commit 65cb771f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.12/prcm-signed' of... 

Merge tag 'omap-for-v3.12/prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/all

From Tony Lindgren:
OMAP PRCM and hwmod fixes and improvments via Paul Walmsley <paul@pwsan.com>:

Various OMAP PRCM & hwmod fixes and improvements.  Notable changes
include:

- a fix for OMAP4 PLL locking to avoid a bootloader dependency that
  causes nasty log spew on startup

- AM33xx DEBUGSS support fixes in hwmod data

- OMAP5 mailbox support in hwmod data

Basic test logs are here:

http://www.pwsan.com/omap/testlogs/prcm_a_for_v3.12/20130823125002/

Note that the 3530 failure is due to the mysterious transient serial
issue affecting 3530 for several releases now, which causes a log
parsing failure.  PM still seems to work.

* tag 'omap-for-v3.12/prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP: AM33xx: clock: Add RNG clock data
  ARM: OMAP: TI81XX: add always-on powerdomain for TI81XX
  ARM: OMAP4: clock: Lock PLLs in the right sequence
  ARM: OMAP: AM33XX: hwmod: Add hwmod data for debugSS
  ARM: OMAP2+: Only write the sysconfig on idle when necessary
  ARM: OMAP5: hwmod data: Add mailbox data

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3616257f eb8460e0

arch/arm/mach-omap2/cclock33xx_data.c

+5 −0
Original line number Diff line number Diff line
@@ -421,6 +421,10 @@ static struct clk aes0_fck; 
DEFINE_STRUCT_CLK_HW_OMAP(aes0_fck, NULL);

DEFINE_STRUCT_CLK(aes0_fck, dpll_core_ck_parents, clk_ops_null);



static struct clk rng_fck;

DEFINE_STRUCT_CLK_HW_OMAP(rng_fck, NULL);

DEFINE_STRUCT_CLK(rng_fck, dpll_core_ck_parents, clk_ops_null);



/*

 * Modules clock nodes

 *
@@ -966,6 +970,7 @@ static struct omap_clk am33xx_clks[] = { 
	CLK(NULL,	"smartreflex1_fck",	&smartreflex1_fck),

	CLK(NULL,	"sha0_fck",		&sha0_fck),

	CLK(NULL,	"aes0_fck",		&aes0_fck),

	CLK(NULL,	"rng_fck",		&rng_fck),

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

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

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

arch/arm/mach-omap2/cclock44xx_data.c

+12 −8
Original line number Diff line number Diff line
@@ -1706,6 +1706,18 @@ int __init omap4xxx_clk_init(void) 


	omap2_clk_disable_autoidle_all();



	/*

	 * A set rate of ABE DPLL inturn triggers a set rate of USB DPLL

	 * when its in bypass. So always lock USB before ABE DPLL.

	 */

	/*

	 * Lock USB DPLL on OMAP4 devices so that the L3INIT power

	 * domain can transition to retention state when not in use.

	 */

	rc = clk_set_rate(&dpll_usb_ck, OMAP4_DPLL_USB_DEFFREQ);

	if (rc)

		pr_err("%s: failed to configure USB DPLL!\n", __func__);



	/*

	 * On OMAP4460 the ABE DPLL fails to turn on if in idle low-power

	 * state when turning the ABE clock domain. Workaround this by
@@ -1718,13 +1730,5 @@ int __init omap4xxx_clk_init(void) 
	if (rc)

		pr_err("%s: failed to configure ABE DPLL!\n", __func__);



	/*

	 * Lock USB DPLL on OMAP4 devices so that the L3INIT power

	 * domain can transition to retention state when not in use.

	 */

	rc = clk_set_rate(&dpll_usb_ck, OMAP4_DPLL_USB_DEFFREQ);

	if (rc)

		pr_err("%s: failed to configure USB DPLL!\n", __func__);



	return 0;

}

arch/arm/mach-omap2/omap_hwmod.c

+3 −1
Original line number Diff line number Diff line
@@ -1405,6 +1405,8 @@ static void _enable_sysc(struct omap_hwmod *oh) 
	    (sf & SYSC_HAS_CLOCKACTIVITY))

		_set_clockactivity(oh, oh->class->sysc->clockact, &v);



	/* If the cached value is the same as the new value, skip the write */

	if (oh->_sysc_cache != v)

		_write_sysconfig(v, oh);



	/*

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

+47 −22
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ static struct omap_hwmod am33xx_adc_tsc_hwmod = { 
 *

 *    - cEFUSE (doesn't fall under any ocp_if)

 *    - clkdiv32k

 *    - debugss

 *    - ocp watch point

 */

#if 0
@@ -369,27 +368,6 @@ static struct omap_hwmod am33xx_clkdiv32k_hwmod = { 
	},

};



/*

 * 'debugss' class

 * debug sub system

 */

static struct omap_hwmod_class am33xx_debugss_hwmod_class = {

	.name		= "debugss",

};



static struct omap_hwmod am33xx_debugss_hwmod = {

	.name		= "debugss",

	.class		= &am33xx_debugss_hwmod_class,

	.clkdm_name	= "l3_aon_clkdm",

	.main_clk	= "debugss_ick",

	.prcm		= {

		.omap4	= {

			.clkctrl_offs	= AM33XX_CM_WKUP_DEBUGSS_CLKCTRL_OFFSET,

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



/* ocpwp */

static struct omap_hwmod_class am33xx_ocpwp_hwmod_class = {

	.name		= "ocpwp",
@@ -482,6 +460,34 @@ static struct omap_hwmod am33xx_ocmcram_hwmod = { 
	},

};



/*

 * 'debugss' class

 * debug sub system

 */

static struct omap_hwmod_opt_clk debugss_opt_clks[] = {

	{ .role = "dbg_sysclk", .clk = "dbg_sysclk_ck" },

	{ .role = "dbg_clka", .clk = "dbg_clka_ck" },

};



static struct omap_hwmod_class am33xx_debugss_hwmod_class = {

	.name		= "debugss",

};



static struct omap_hwmod am33xx_debugss_hwmod = {

	.name		= "debugss",

	.class		= &am33xx_debugss_hwmod_class,

	.clkdm_name	= "l3_aon_clkdm",

	.main_clk	= "trace_clk_div_ck",

	.prcm		= {

		.omap4	= {

			.clkctrl_offs	= AM33XX_CM_WKUP_DEBUGSS_CLKCTRL_OFFSET,

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

	.opt_clks	= debugss_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(debugss_opt_clks),

};



/* 'smartreflex' class */

static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = {

	.name		= "smartreflex",
@@ -1796,6 +1802,24 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__gfx = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l3_main -> debugss */

static struct omap_hwmod_addr_space am33xx_debugss_addrs[] = {

	{

		.pa_start	= 0x4b000000,

		.pa_end		= 0x4b000000 + SZ_16M - 1,

		.flags		= ADDR_TYPE_RT

	},

	{ }

};



static struct omap_hwmod_ocp_if am33xx_l3_main__debugss = {

	.master		= &am33xx_l3_main_hwmod,

	.slave		= &am33xx_debugss_hwmod,

	.clk		= "dpll_core_m4_ck",

	.addr		= am33xx_debugss_addrs,

	.user		= OCP_USER_MPU,

};



/* l4 wkup -> smartreflex0 */

static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex0 = {

	.master		= &am33xx_l4_wkup_hwmod,
@@ -2470,6 +2494,7 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { 
	&am33xx_pruss__l3_main,

	&am33xx_wkup_m3__l4_wkup,

	&am33xx_gfx__l3_main,

	&am33xx_l3_main__debugss,

	&am33xx_l4_wkup__wkup_m3,

	&am33xx_l4_wkup__control,

	&am33xx_l4_wkup__smartreflex0,

arch/arm/mach-omap2/omap_hwmod_54xx_data.c

+42 −0
Original line number Diff line number Diff line
@@ -740,6 +740,39 @@ static struct omap_hwmod omap54xx_kbd_hwmod = { 
	},

};



/*

 * 'mailbox' class

 * mailbox module allowing communication between the on-chip processors using a

 * queued mailbox-interrupt mechanism.

 */



static struct omap_hwmod_class_sysconfig omap54xx_mailbox_sysc = {

	.rev_offs	= 0x0000,

	.sysc_offs	= 0x0010,

	.sysc_flags	= (SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |

			   SYSC_HAS_SOFTRESET),

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),

	.sysc_fields	= &omap_hwmod_sysc_type2,

};



static struct omap_hwmod_class omap54xx_mailbox_hwmod_class = {

	.name	= "mailbox",

	.sysc	= &omap54xx_mailbox_sysc,

};



/* mailbox */

static struct omap_hwmod omap54xx_mailbox_hwmod = {

	.name		= "mailbox",

	.class		= &omap54xx_mailbox_hwmod_class,

	.clkdm_name	= "l4cfg_clkdm",

	.prcm = {

		.omap4 = {

			.clkctrl_offs = OMAP54XX_CM_L4CFG_MAILBOX_CLKCTRL_OFFSET,

			.context_offs = OMAP54XX_RM_L4CFG_MAILBOX_CONTEXT_OFFSET,

		},

	},

};



/*

 * 'mcbsp' class

 * multi channel buffered serial port controller
@@ -1808,6 +1841,14 @@ static struct omap_hwmod_ocp_if omap54xx_l4_wkup__kbd = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l4_cfg -> mailbox */

static struct omap_hwmod_ocp_if omap54xx_l4_cfg__mailbox = {

	.master		= &omap54xx_l4_cfg_hwmod,

	.slave		= &omap54xx_mailbox_hwmod,

	.clk		= "l4_root_clk_div",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l4_abe -> mcbsp1 */

static struct omap_hwmod_ocp_if omap54xx_l4_abe__mcbsp1 = {

	.master		= &omap54xx_l4_abe_hwmod,
@@ -2108,6 +2149,7 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { 
	&omap54xx_l4_per__i2c4,

	&omap54xx_l4_per__i2c5,

	&omap54xx_l4_wkup__kbd,

	&omap54xx_l4_cfg__mailbox,

	&omap54xx_l4_abe__mcbsp1,

	&omap54xx_l4_abe__mcbsp2,

	&omap54xx_l4_abe__mcbsp3,