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

Commit 472fd540 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'cleanup-hwmod' into cleanup 

Conflicts:
	arch/arm/mach-omap2/dsp.c
parents 5f612967 19f3a98d

arch/arm/mach-omap2/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o 


# PRCM clockdomain control

clockdomain-common			+= clockdomain.o

clockdomain-common			+= clockdomains_common_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(clockdomain-common)

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomains2xxx_3xxx_data.o

arch/arm/mach-omap2/clock2420_data.c

+0 −4
Original line number Diff line number Diff line
@@ -1774,8 +1774,6 @@ static struct omap_clk omap2420_clks[] = { 
	CLK(NULL,	"osc_ck",	&osc_ck,	CK_242X),

	CLK(NULL,	"sys_ck",	&sys_ck,	CK_242X),

	CLK(NULL,	"alt_ck",	&alt_ck,	CK_242X),

	CLK("omap-mcbsp.1",	"pad_fck",	&mcbsp_clks,	CK_242X),

	CLK("omap-mcbsp.2",	"pad_fck",	&mcbsp_clks,	CK_242X),

	CLK(NULL,	"mcbsp_clks",	&mcbsp_clks,	CK_242X),

	/* internal analog sources */

	CLK(NULL,	"dpll_ck",	&dpll_ck,	CK_242X),
@@ -1784,8 +1782,6 @@ static struct omap_clk omap2420_clks[] = { 
	/* internal prcm root sources */

	CLK(NULL,	"func_54m_ck",	&func_54m_ck,	CK_242X),

	CLK(NULL,	"core_ck",	&core_ck,	CK_242X),

	CLK("omap-mcbsp.1",	"prcm_fck",	&func_96m_ck,	CK_242X),

	CLK("omap-mcbsp.2",	"prcm_fck",	&func_96m_ck,	CK_242X),

	CLK(NULL,	"func_96m_ck",	&func_96m_ck,	CK_242X),

	CLK(NULL,	"func_48m_ck",	&func_48m_ck,	CK_242X),

	CLK(NULL,	"func_12m_ck",	&func_12m_ck,	CK_242X),

arch/arm/mach-omap2/clock2430_data.c

+0 −10
Original line number Diff line number Diff line
@@ -1858,11 +1858,6 @@ static struct omap_clk omap2430_clks[] = { 
	CLK(NULL,	"osc_ck",	&osc_ck,	CK_243X),

	CLK(NULL,	"sys_ck",	&sys_ck,	CK_243X),

	CLK(NULL,	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap-mcbsp.1",	"pad_fck",	&mcbsp_clks,	CK_243X),

	CLK("omap-mcbsp.2",	"pad_fck",	&mcbsp_clks,	CK_243X),

	CLK("omap-mcbsp.3",	"pad_fck",	&mcbsp_clks,	CK_243X),

	CLK("omap-mcbsp.4",	"pad_fck",	&mcbsp_clks,	CK_243X),

	CLK("omap-mcbsp.5",	"pad_fck",	&mcbsp_clks,	CK_243X),

	CLK(NULL,	"mcbsp_clks",	&mcbsp_clks,	CK_243X),

	/* internal analog sources */

	CLK(NULL,	"dpll_ck",	&dpll_ck,	CK_243X),
@@ -1871,11 +1866,6 @@ static struct omap_clk omap2430_clks[] = { 
	/* internal prcm root sources */

	CLK(NULL,	"func_54m_ck",	&func_54m_ck,	CK_243X),

	CLK(NULL,	"core_ck",	&core_ck,	CK_243X),

	CLK("omap-mcbsp.1",	"prcm_fck",	&func_96m_ck,	CK_243X),

	CLK("omap-mcbsp.2",	"prcm_fck",	&func_96m_ck,	CK_243X),

	CLK("omap-mcbsp.3",	"prcm_fck",	&func_96m_ck,	CK_243X),

	CLK("omap-mcbsp.4",	"prcm_fck",	&func_96m_ck,	CK_243X),

	CLK("omap-mcbsp.5",	"prcm_fck",	&func_96m_ck,	CK_243X),

	CLK(NULL,	"func_96m_ck",	&func_96m_ck,	CK_243X),

	CLK(NULL,	"func_48m_ck",	&func_48m_ck,	CK_243X),

	CLK(NULL,	"func_12m_ck",	&func_12m_ck,	CK_243X),

arch/arm/mach-omap2/clock3xxx_data.c

+0 −10
Original line number Diff line number Diff line
@@ -3236,11 +3236,6 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"osc_sys_ck",	&osc_sys_ck,	CK_3XXX),

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

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

	CLK("omap-mcbsp.1",	"pad_fck",	&mcbsp_clks,	CK_3XXX),

	CLK("omap-mcbsp.2",	"pad_fck",	&mcbsp_clks,	CK_3XXX),

	CLK("omap-mcbsp.3",	"pad_fck",	&mcbsp_clks,	CK_3XXX),

	CLK("omap-mcbsp.4",	"pad_fck",	&mcbsp_clks,	CK_3XXX),

	CLK("omap-mcbsp.5",	"pad_fck",	&mcbsp_clks,	CK_3XXX),

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

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

	CLK(NULL,	"dpll1_ck",	&dpll1_ck,	CK_3XXX),
@@ -3307,8 +3302,6 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"ts_fck",	&ts_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),

	CLK(NULL,	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),

	CLK("usbhs_omap",	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),

	CLK("omap-mcbsp.1",	"prcm_fck",	&core_96m_fck,	CK_3XXX),

	CLK("omap-mcbsp.5",	"prcm_fck",	&core_96m_fck,	CK_3XXX),

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

	CLK(NULL,	"mmchs3_fck",	&mmchs3_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),

	CLK(NULL,	"mmchs2_fck",	&mmchs2_fck,	CK_3XXX),
@@ -3413,9 +3406,6 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"omap_32ksync_ick", &omap_32ksync_ick, CK_3XXX),

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

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

	CLK("omap-mcbsp.2",	"prcm_fck",	&per_96m_fck,	CK_3XXX),

	CLK("omap-mcbsp.3",	"prcm_fck",	&per_96m_fck,	CK_3XXX),

	CLK("omap-mcbsp.4",	"prcm_fck",	&per_96m_fck,	CK_3XXX),

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

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

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

arch/arm/mach-omap2/clockdomain.h

+0 −2
Original line number Diff line number Diff line
@@ -206,7 +206,5 @@ extern struct clkdm_ops omap4_clkdm_operations; 
extern struct clkdm_dep gfx_24xx_wkdeps[];

extern struct clkdm_dep dsp_24xx_wkdeps[];

extern struct clockdomain wkup_common_clkdm;

extern struct clockdomain prm_common_clkdm;

extern struct clockdomain cm_common_clkdm;



#endif