commit 1d14de087dd1cab0436fb7c9d5e38d852f33df69
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon Jan 19 21:02:29 2009 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun Feb 08 17:50:19 2009 +0000
tree 6aebc10cd49bb223b60c059fb4dd17f10c818982
parent b820ce4e6736ddad7ccda528e10aaf37ad3f13f9

[ARM] omap: i2c: use short connection ids

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 ea21d55..81c7b70 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -186,12 +186,12 @@
 	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("i2c_omap.1", "i2c_ick",	&i2c1_ick,	CK_243X | CK_242X),
-	CLK("i2c_omap.1", "i2c_fck",	&i2c1_fck,	CK_242X),
-	CLK("i2c_omap.1", "i2c_fck",	&i2chs1_fck,	CK_243X),
-	CLK("i2c_omap.2", "i2c_ick",	&i2c2_ick,	CK_243X | CK_242X),
-	CLK("i2c_omap.2", "i2c_fck",	&i2c2_fck,	CK_242X),
-	CLK("i2c_omap.2", "i2c_fck",	&i2chs2_fck,	CK_243X),
+	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),
+	CLK("i2c_omap.2", "ick",	&i2c2_ick,	CK_243X | CK_242X),
+	CLK("i2c_omap.2", "fck",	&i2c2_fck,	CK_242X),
+	CLK("i2c_omap.2", "fck",	&i2chs2_fck,	CK_243X),
 	CLK(NULL,	"gpmc_fck",	&gpmc_fck,	CK_243X | CK_242X),
 	CLK(NULL,	"sdma_fck",	&sdma_fck,	CK_243X | CK_242X),
 	CLK(NULL,	"sdma_ick",	&sdma_ick,	CK_243X | CK_242X),