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

Commit 3126c7bc authored by Russell King's avatar Russell King
Browse files

ARM: AMBA: Add pclk definition for platforms using primecells 



Add a dummy clk definition for the APB pclk signal on all platforms
using the AMBA bus infrastructure.  This ensures that these platforms
continue to work when the core amba bus code controls the APB pclk.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2f7989ef

arch/arm/mach-bcmring/core.c

+16 −7
Original line number Diff line number Diff line
@@ -91,8 +91,17 @@ static struct clk uart_clk = { 
	.parent = &pll1_clk,

};



static struct clk dummy_apb_pclk = {

	.name = "BUSCLK",

	.type = CLK_TYPE_PRIMARY,

	.mode = CLK_MODE_XTAL,

};



static struct clk_lookup lookups[] = {

	{			/* UART0 */

	{			/* Bus clock */

		.con_id = "apb_pclk",

		.clk = &dummy_apb_pclk,

	}, {			/* UART0 */

		.dev_id = "uarta",

		.clk = &uart_clk,

	}, {			/* UART1 */

arch/arm/mach-ep93xx/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static struct clk_lookup clocks[] = { 
	INIT_CK(NULL,			"pll1",		&clk_pll1),

	INIT_CK(NULL,			"fclk",		&clk_f),

	INIT_CK(NULL,			"hclk",		&clk_h),

	INIT_CK(NULL,			"pclk",		&clk_p),

	INIT_CK(NULL,			"apb_pclk",	&clk_p),

	INIT_CK(NULL,			"pll2",		&clk_pll2),

	INIT_CK("ep93xx-ohci",		NULL,		&clk_usb_host),

	INIT_CK("ep93xx-keypad",	NULL,		&clk_keypad),

arch/arm/mach-integrator/core.c

+6 −1
Original line number Diff line number Diff line
@@ -119,8 +119,13 @@ static struct clk uartclk = { 
	.rate	= 14745600,

};



static struct clk dummy_apb_pclk;



static struct clk_lookup lookups[] = {

	{	/* UART0 */

	{	/* Bus clock */

		.con_id		= "apb_pclk",

		.clk		= &dummy_apb_pclk,

	}, {	/* UART0 */

		.dev_id		= "mb:16",

		.clk		= &uartclk,

	}, {	/* UART1 */

arch/arm/mach-nomadik/clock.c

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ static struct clk clk_default; 
	}



static struct clk_lookup lookups[] = {

	{

		.con_id		= "apb_pclk",

		.clk		= &clk_default,

	},

	CLK(&clk_24, "mtu0"),

	CLK(&clk_24, "mtu1"),

	CLK(&clk_48, "uart0"),

arch/arm/mach-omap2/clock3xxx_data.c

+5 −0
Original line number Diff line number Diff line
@@ -3166,6 +3166,10 @@ static struct clk uart4_ick_am35xx = { 
	.recalc		= &followparent_recalc,

};



static struct clk dummy_apb_pclk = {

	.name		= "apb_pclk",

	.ops		= &clkops_null,

};



/*

 * clkdev
@@ -3173,6 +3177,7 @@ static struct clk uart4_ick_am35xx = { 


/* XXX At some point we should rename this file to clock3xxx_data.c */

static struct omap_clk omap3xxx_clks[] = {

	CLK(NULL,	"apb_pclk",	&dummy_apb_pclk,	CK_3XXX),

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

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

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