diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-19 16:02:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 12:50:19 -0500 |
| commit | 1d14de087dd1cab0436fb7c9d5e38d852f33df69 (patch) | |
| tree | 6aebc10cd49bb223b60c059fb4dd17f10c818982 /arch | |
| parent | b820ce4e6736ddad7ccda528e10aaf37ad3f13f9 (diff) | |
[ARM] omap: i2c: use short connection ids
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap1/clock.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/clock24xx.c | 12 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/clock34xx.c | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index b62da4c95630..382e09a1ceca 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
| @@ -130,8 +130,8 @@ static struct omap_clk omap_clks[] = { | |||
| 130 | CLK("mmci-omap.1", "ick", &armper_ck.clk, CK_16XX), | 130 | CLK("mmci-omap.1", "ick", &armper_ck.clk, CK_16XX), |
| 131 | /* Virtual clocks */ | 131 | /* Virtual clocks */ |
| 132 | CLK(NULL, "mpu", &virtual_ck_mpu, CK_16XX | CK_1510 | CK_310), | 132 | CLK(NULL, "mpu", &virtual_ck_mpu, CK_16XX | CK_1510 | CK_310), |
| 133 | CLK("i2c_omap.1", "i2c_fck", &i2c_fck, CK_16XX | CK_1510 | CK_310), | 133 | CLK("i2c_omap.1", "fck", &i2c_fck, CK_16XX | CK_1510 | CK_310), |
| 134 | CLK("i2c_omap.1", "i2c_ick", &i2c_ick, CK_16XX), | 134 | CLK("i2c_omap.1", "ick", &i2c_ick, CK_16XX), |
| 135 | CLK("omap-mcbsp.1", "ick", &dspper_ck, CK_16XX), | 135 | CLK("omap-mcbsp.1", "ick", &dspper_ck, CK_16XX), |
| 136 | CLK("omap-mcbsp.1", "ick", &dummy_ck, CK_1510 | CK_310), | 136 | CLK("omap-mcbsp.1", "ick", &dummy_ck, CK_1510 | CK_310), |
| 137 | CLK("omap-mcbsp.2", "ick", &armper_ck.clk, CK_16XX), | 137 | CLK("omap-mcbsp.2", "ick", &armper_ck.clk, CK_16XX), |
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index ea21d55a2075..81c7b705114d 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
| @@ -186,12 +186,12 @@ static struct omap_clk omap24xx_clks[] = { | |||
| 186 | CLK(NULL, "eac_fck", &eac_fck, CK_242X), | 186 | CLK(NULL, "eac_fck", &eac_fck, CK_242X), |
| 187 | CLK(NULL, "hdq_ick", &hdq_ick, CK_243X | CK_242X), | 187 | CLK(NULL, "hdq_ick", &hdq_ick, CK_243X | CK_242X), |
| 188 | CLK(NULL, "hdq_fck", &hdq_fck, CK_243X | CK_242X), | 188 | CLK(NULL, "hdq_fck", &hdq_fck, CK_243X | CK_242X), |
| 189 | CLK("i2c_omap.1", "i2c_ick", &i2c1_ick, CK_243X | CK_242X), | 189 | CLK("i2c_omap.1", "ick", &i2c1_ick, CK_243X | CK_242X), |
| 190 | CLK("i2c_omap.1", "i2c_fck", &i2c1_fck, CK_242X), | 190 | CLK("i2c_omap.1", "fck", &i2c1_fck, CK_242X), |
| 191 | CLK("i2c_omap.1", "i2c_fck", &i2chs1_fck, CK_243X), | 191 | CLK("i2c_omap.1", "fck", &i2chs1_fck, CK_243X), |
| 192 | CLK("i2c_omap.2", "i2c_ick", &i2c2_ick, CK_243X | CK_242X), | 192 | CLK("i2c_omap.2", "ick", &i2c2_ick, CK_243X | CK_242X), |
| 193 | CLK("i2c_omap.2", "i2c_fck", &i2c2_fck, CK_242X), | 193 | CLK("i2c_omap.2", "fck", &i2c2_fck, CK_242X), |
| 194 | CLK("i2c_omap.2", "i2c_fck", &i2chs2_fck, CK_243X), | 194 | CLK("i2c_omap.2", "fck", &i2chs2_fck, CK_243X), |
| 195 | CLK(NULL, "gpmc_fck", &gpmc_fck, CK_243X | CK_242X), | 195 | CLK(NULL, "gpmc_fck", &gpmc_fck, CK_243X | CK_242X), |
| 196 | CLK(NULL, "sdma_fck", &sdma_fck, CK_243X | CK_242X), | 196 | CLK(NULL, "sdma_fck", &sdma_fck, CK_243X | CK_242X), |
| 197 | CLK(NULL, "sdma_ick", &sdma_ick, CK_243X | CK_242X), | 197 | CLK(NULL, "sdma_ick", &sdma_ick, CK_243X | CK_242X), |
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index a70aa2eaf053..859ad1d4062a 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c | |||
| @@ -141,9 +141,9 @@ static struct omap_clk omap34xx_clks[] = { | |||
| 141 | CLK("mmci-omap-hs.1", "mmchs_fck", &mmchs2_fck, CK_343X), | 141 | CLK("mmci-omap-hs.1", "mmchs_fck", &mmchs2_fck, CK_343X), |
| 142 | CLK(NULL, "mspro_fck", &mspro_fck, CK_343X), | 142 | CLK(NULL, "mspro_fck", &mspro_fck, CK_343X), |
| 143 | CLK("mmci-omap-hs.0", "mmchs_fck", &mmchs1_fck, CK_343X), | 143 | CLK("mmci-omap-hs.0", "mmchs_fck", &mmchs1_fck, CK_343X), |
| 144 | CLK("i2c_omap.3", "i2c_fck", &i2c3_fck, CK_343X), | 144 | CLK("i2c_omap.3", "fck", &i2c3_fck, CK_343X), |
| 145 | CLK("i2c_omap.2", "i2c_fck", &i2c2_fck, CK_343X), | 145 | CLK("i2c_omap.2", "fck", &i2c2_fck, CK_343X), |
| 146 | CLK("i2c_omap.1", "i2c_fck", &i2c1_fck, CK_343X), | 146 | CLK("i2c_omap.1", "fck", &i2c1_fck, CK_343X), |
| 147 | CLK("omap-mcbsp.5", "fck", &mcbsp5_fck, CK_343X), | 147 | CLK("omap-mcbsp.5", "fck", &mcbsp5_fck, CK_343X), |
| 148 | CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_343X), | 148 | CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_343X), |
| 149 | CLK(NULL, "core_48m_fck", &core_48m_fck, CK_343X), | 149 | CLK(NULL, "core_48m_fck", &core_48m_fck, CK_343X), |
| @@ -179,9 +179,9 @@ static struct omap_clk omap34xx_clks[] = { | |||
| 179 | CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_343X), | 179 | CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_343X), |
| 180 | CLK("omap2_mcspi.2", "ick", &mcspi2_ick, CK_343X), | 180 | CLK("omap2_mcspi.2", "ick", &mcspi2_ick, CK_343X), |
| 181 | CLK("omap2_mcspi.1", "ick", &mcspi1_ick, CK_343X), | 181 | CLK("omap2_mcspi.1", "ick", &mcspi1_ick, CK_343X), |
| 182 | CLK("i2c_omap.3", "i2c_ick", &i2c3_ick, CK_343X), | 182 | CLK("i2c_omap.3", "ick", &i2c3_ick, CK_343X), |
| 183 | CLK("i2c_omap.2", "i2c_ick", &i2c2_ick, CK_343X), | 183 | CLK("i2c_omap.2", "ick", &i2c2_ick, CK_343X), |
| 184 | CLK("i2c_omap.1", "i2c_ick", &i2c1_ick, CK_343X), | 184 | CLK("i2c_omap.1", "ick", &i2c1_ick, CK_343X), |
| 185 | CLK(NULL, "uart2_ick", &uart2_ick, CK_343X), | 185 | CLK(NULL, "uart2_ick", &uart2_ick, CK_343X), |
| 186 | CLK(NULL, "uart1_ick", &uart1_ick, CK_343X), | 186 | CLK(NULL, "uart1_ick", &uart1_ick, CK_343X), |
| 187 | CLK(NULL, "gpt11_ick", &gpt11_ick, CK_343X), | 187 | CLK(NULL, "gpt11_ick", &gpt11_ick, CK_343X), |