commit cc51c9d444ae1532be6a600c65ac0d3d22472c53
author Russell King <rmk@dyn-67.arm.linux.org.uk> Thu Jan 22 10:12:04 2009 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun Feb 08 17:50:21 2009 +0000
tree 2c5864302666273b66f663fb6411836111dcdc8f
parent 5fe23380405d3a65ce6f46d270c4d3a31027430b

[ARM] omap: w1: convert omap HDQ clocks to match by devid and conid

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-omap2/clock24xx.c

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 81c7b70..f835880 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -184,8 +184,8 @@
 	CLK(NULL,	"fac_fck",	&fac_fck,	CK_243X | CK_242X),
 	CLK(NULL,	"eac_ick",	&eac_ick,	CK_242X),
 	CLK(NULL,	"eac_fck",	&eac_fck,	CK_242X),
-	CLK(NULL,	"hdq_ick",	&hdq_ick,	CK_243X | CK_242X),
-	CLK(NULL,	"hdq_fck",	&hdq_fck,	CK_243X | CK_242X),
+	CLK("omap_hdq.0", "ick",	&hdq_ick,	CK_243X | CK_242X),
+	CLK("omap_hdq.1", "fck",	&hdq_fck,	CK_243X | CK_242X),
 	CLK("i2c_omap.1", "ick",	&i2c1_ick,	CK_243X | CK_242X),
 	CLK("i2c_omap.1", "fck",	&i2c1_fck,	CK_242X),
 	CLK("i2c_omap.1", "fck",	&i2chs1_fck,	CK_243X),