Skip to contentSkip to conversation

Add missing clocks for OMAP 7xx

PATCH In review Cory Maccarrone 2 participants 3 messages Dec 20, 2009 – Dec 21, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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).

---
 arch/arm/mach-omap1/clock_data.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap1/clock_data.c +2 -2
index ab995a9..31fba07 100644
@@ -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),
Signature · 1 line
1.6.3.3
maintainer
#1 lore raw

Hi Cory,

Quoted 5 lines · Cory Maccarrone

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).

Thanks, queued for .33-rcX. -- although I don't think this had anything to do with the clock_data.c conversion. At least,

git diff 6f62b58dd4e697a23a308f5b77781394949d333e.. arch/arm/mach-omap1/clock.c

doesn't show a CK_7XX for either ck_dpll1 or api_ck in the original file.

- Paul

#2 lore raw
Quoted 10 lines · Paul Walmsley

Hi Cory,

Thanks, queued for .33-rcX.  -- although I don't think this had anything to do with the clock_data.c conversion.  At least,

git diff 6f62b58dd4e697a23a308f5b77781394949d333e.. arch/arm/mach-omap1/clock.c

doesn't show a CK_7XX for either ck_dpll1 or api_ck in the original file.

Part of the purpose of that patch was to use the two clocks like every other clock. Prior to that, it was just assumed that that clock existed for all devices, and it was used directly instead of calling it out with a clock_get call or similar. So, when the fix was made, not having the CK_7XX meant those clocks weren't being used anymore for omap 7xx devices, which broke things badly.

Thanks for queuing the change. :)

- Cory
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html