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

Commit e8ae6b6e authored by Cory Maccarrone's avatar Cory Maccarrone Committed by Paul Walmsley
Browse files

OMAP1 clock: Add missing clocks for OMAP 7xx 



This change adds in some missing clocks that were needed as a result
of 526505... (OMAP1 clock: convert mach-omap1/clock.h to
mach-omap1/clock_data.c).  Prior to this, it was just assumed that
these clocks existed for all devices, and it was used directly instead
of calling it out with a clock_get call or similar.  So, not having
the CK_7XX meant these clocks weren't being used anymore for omap 7xx
devices, which broke things badly.

Signed-off-by: default avatarCory Maccarrone <darkstar6262@gmail.com>
[paul@pwsan.com: commit message edited]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent d1e62498

arch/arm/mach-omap1/clock_data.c

+2 −2
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static struct clk i2c_ick = { 
static struct omap_clk omap_clks[] = {

	/* non-ULPD clocks */

	CLK(NULL,	"ck_ref",	&ck_ref,	CK_16XX | CK_1510 | CK_310 | CK_7XX),

	CLK(NULL,	"ck_dpll1",	&ck_dpll1,	CK_16XX | CK_1510 | CK_310),

	CLK(NULL,	"ck_dpll1",	&ck_dpll1,	CK_16XX | CK_1510 | CK_310 | CK_7XX),

	/* CK_GEN1 clocks */

	CLK(NULL,	"ck_dpll1out",	&ck_dpll1out.clk, CK_16XX),

	CLK(NULL,	"ck_sossi",	&sossi_ck,	CK_16XX),
@@ -627,7 +627,7 @@ static struct omap_clk omap_clks[] = { 
	CLK(NULL,	"tc2_ck",	&tc2_ck,	CK_16XX),

	CLK(NULL,	"dma_ck",	&dma_ck,	CK_16XX | CK_1510 | CK_310),

	CLK(NULL,	"dma_lcdfree_ck", &dma_lcdfree_ck, CK_16XX),

	CLK(NULL,	"api_ck",	&api_ck.clk,	CK_16XX | CK_1510 | CK_310),

	CLK(NULL,	"api_ck",	&api_ck.clk,	CK_16XX | CK_1510 | CK_310 | CK_7XX),

	CLK(NULL,	"lb_ck",	&lb_ck.clk,	CK_1510 | CK_310),

	CLK(NULL,	"rhea1_ck",	&rhea1_ck,	CK_16XX),

	CLK(NULL,	"rhea2_ck",	&rhea2_ck,	CK_16XX),