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/clock34xx.c

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index a70aa2e..859ad1d 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -141,9 +141,9 @@
 	CLK("mmci-omap-hs.1",	"mmchs_fck",	&mmchs2_fck,	CK_343X),
 	CLK(NULL,	"mspro_fck",	&mspro_fck,	CK_343X),
 	CLK("mmci-omap-hs.0",	"mmchs_fck",	&mmchs1_fck,	CK_343X),
-	CLK("i2c_omap.3", "i2c_fck",	&i2c3_fck,	CK_343X),
-	CLK("i2c_omap.2", "i2c_fck",	&i2c2_fck,	CK_343X),
-	CLK("i2c_omap.1", "i2c_fck",	&i2c1_fck,	CK_343X),
+	CLK("i2c_omap.3", "fck",	&i2c3_fck,	CK_343X),
+	CLK("i2c_omap.2", "fck",	&i2c2_fck,	CK_343X),
+	CLK("i2c_omap.1", "fck",	&i2c1_fck,	CK_343X),
 	CLK("omap-mcbsp.5", "fck",	&mcbsp5_fck,	CK_343X),
 	CLK("omap-mcbsp.1", "fck",	&mcbsp1_fck,	CK_343X),
 	CLK(NULL,	"core_48m_fck",	&core_48m_fck,	CK_343X),
@@ -179,9 +179,9 @@
 	CLK("omap2_mcspi.3", "ick",	&mcspi3_ick,	CK_343X),
 	CLK("omap2_mcspi.2", "ick",	&mcspi2_ick,	CK_343X),
 	CLK("omap2_mcspi.1", "ick",	&mcspi1_ick,	CK_343X),
-	CLK("i2c_omap.3", "i2c_ick",	&i2c3_ick,	CK_343X),
-	CLK("i2c_omap.2", "i2c_ick",	&i2c2_ick,	CK_343X),
-	CLK("i2c_omap.1", "i2c_ick",	&i2c1_ick,	CK_343X),
+	CLK("i2c_omap.3", "ick",	&i2c3_ick,	CK_343X),
+	CLK("i2c_omap.2", "ick",	&i2c2_ick,	CK_343X),
+	CLK("i2c_omap.1", "ick",	&i2c1_ick,	CK_343X),
 	CLK(NULL,	"uart2_ick",	&uart2_ick,	CK_343X),
 	CLK(NULL,	"uart1_ick",	&uart1_ick,	CK_343X),
 	CLK(NULL,	"gpt11_ick",	&gpt11_ick,	CK_343X),