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

Commit 4751227d authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap3/4: Fix compile for multi-omap for clkops_noncore_dpll_ops 



Rename clkops_noncore_dpll_ops for omap3 and omap4.

Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 61a07c80

arch/arm/mach-omap2/clock34xx.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ const struct clkops clkops_omap3430es2_hsotgusb_wait = { 
	.find_companion = omap2_clk_dflt_find_companion,

};



const struct clkops clkops_noncore_dpll_ops = {

const struct clkops omap3_clkops_noncore_dpll_ops = {

	.enable		= omap3_noncore_dpll_enable,

	.disable	= omap3_noncore_dpll_disable,

};

arch/arm/mach-omap2/clock34xx.h

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ extern struct clk *arm_fck_p; 
extern const struct clkops clkops_omap3430es2_ssi_wait;

extern const struct clkops clkops_omap3430es2_hsotgusb_wait;

extern const struct clkops clkops_omap3430es2_dss_usbhost_wait;

extern const struct clkops clkops_noncore_dpll_ops;

extern const struct clkops omap3_clkops_noncore_dpll_ops;



#endif

arch/arm/mach-omap2/clock34xx_data.c

+3 −3
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static struct dpll_data dpll2_dd = { 


static struct clk dpll2_ck = {

	.name		= "dpll2_ck",

	.ops		= &clkops_noncore_dpll_ops,

	.ops		= &omap3_clkops_noncore_dpll_ops,

	.parent		= &sys_ck,

	.dpll_data	= &dpll2_dd,

	.round_rate	= &omap2_dpll_round_rate,
@@ -554,7 +554,7 @@ static struct dpll_data dpll4_dd = { 


static struct clk dpll4_ck = {

	.name		= "dpll4_ck",

	.ops		= &clkops_noncore_dpll_ops,

	.ops		= &omap3_clkops_noncore_dpll_ops,

	.parent		= &sys_ck,

	.dpll_data	= &dpll4_dd,

	.round_rate	= &omap2_dpll_round_rate,
@@ -854,7 +854,7 @@ static struct dpll_data dpll5_dd = { 


static struct clk dpll5_ck = {

	.name		= "dpll5_ck",

	.ops		= &clkops_noncore_dpll_ops,

	.ops		= &omap3_clkops_noncore_dpll_ops,

	.parent		= &sys_ck,

	.dpll_data	= &dpll5_dd,

	.round_rate	= &omap2_dpll_round_rate,

arch/arm/mach-omap2/clock44xx.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/errno.h>

#include "clock.h"



const struct clkops clkops_noncore_dpll_ops = {

const struct clkops omap4_clkops_noncore_dpll_ops = {

	.enable		= &omap3_noncore_dpll_enable,

	.disable	= &omap3_noncore_dpll_disable,

};

arch/arm/mach-omap2/clock44xx.h

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ 


int omap4xxx_clk_init(void);



extern const struct clkops clkops_noncore_dpll_ops;

extern const struct clkops omap4_clkops_noncore_dpll_ops;



#endif