aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-19 15:49:37 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 12:50:18 -0500
commit1b5715ec471d1def9722e22b6cb1d24841b5e290 (patch)
tree15bb3b78d4fe8c72b0f911a7e5404a6c7288dc1a
parentd4a36645a1a76e5294c1b00682fb849fc53ccd80 (diff)
[ARM] omap: mcspi: new short connection id names
... rather than the clock names themselves. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-omap2/clock24xx.c12
-rw-r--r--arch/arm/mach-omap2/clock34xx.c16
-rw-r--r--drivers/spi/omap2_mcspi.c4
3 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index aca4ca42bf48..ac038035c1c9 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -149,12 +149,12 @@ static struct omap_clk omap24xx_clks[] = {
149 CLK("omap-mcbsp.4", "mcbsp_fck", &mcbsp4_fck, CK_243X), 149 CLK("omap-mcbsp.4", "mcbsp_fck", &mcbsp4_fck, CK_243X),
150 CLK("omap-mcbsp.5", "mcbsp_ick", &mcbsp5_ick, CK_243X), 150 CLK("omap-mcbsp.5", "mcbsp_ick", &mcbsp5_ick, CK_243X),
151 CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck, CK_243X), 151 CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck, CK_243X),
152 CLK("omap2_mcspi.1", "mcspi_ick", &mcspi1_ick, CK_243X | CK_242X), 152 CLK("omap2_mcspi.1", "ick", &mcspi1_ick, CK_243X | CK_242X),
153 CLK("omap2_mcspi.1", "mcspi_fck", &mcspi1_fck, CK_243X | CK_242X), 153 CLK("omap2_mcspi.1", "fck", &mcspi1_fck, CK_243X | CK_242X),
154 CLK("omap2_mcspi.2", "mcspi_ick", &mcspi2_ick, CK_243X | CK_242X), 154 CLK("omap2_mcspi.2", "ick", &mcspi2_ick, CK_243X | CK_242X),
155 CLK("omap2_mcspi.2", "mcspi_fck", &mcspi2_fck, CK_243X | CK_242X), 155 CLK("omap2_mcspi.2", "fck", &mcspi2_fck, CK_243X | CK_242X),
156 CLK("omap2_mcspi.3", "mcspi_ick", &mcspi3_ick, CK_243X), 156 CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_243X),
157 CLK("omap2_mcspi.3", "mcspi_fck", &mcspi3_fck, CK_243X), 157 CLK("omap2_mcspi.3", "fck", &mcspi3_fck, CK_243X),
158 CLK(NULL, "uart1_ick", &uart1_ick, CK_243X | CK_242X), 158 CLK(NULL, "uart1_ick", &uart1_ick, CK_243X | CK_242X),
159 CLK(NULL, "uart1_fck", &uart1_fck, CK_243X | CK_242X), 159 CLK(NULL, "uart1_fck", &uart1_fck, CK_243X | CK_242X),
160 CLK(NULL, "uart2_ick", &uart2_ick, CK_243X | CK_242X), 160 CLK(NULL, "uart2_ick", &uart2_ick, CK_243X | CK_242X),
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index b3334b355cb1..d0bfae5a2f41 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -147,10 +147,10 @@ static struct omap_clk omap34xx_clks[] = {
147 CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck, CK_343X), 147 CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck, CK_343X),
148 CLK("omap-mcbsp.1", "mcbsp_fck", &mcbsp1_fck, CK_343X), 148 CLK("omap-mcbsp.1", "mcbsp_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),
150 CLK("omap2_mcspi.4", "mcspi_fck", &mcspi4_fck, CK_343X), 150 CLK("omap2_mcspi.4", "fck", &mcspi4_fck, CK_343X),
151 CLK("omap2_mcspi.3", "mcspi_fck", &mcspi3_fck, CK_343X), 151 CLK("omap2_mcspi.3", "fck", &mcspi3_fck, CK_343X),
152 CLK("omap2_mcspi.2", "mcspi_fck", &mcspi2_fck, CK_343X), 152 CLK("omap2_mcspi.2", "fck", &mcspi2_fck, CK_343X),
153 CLK("omap2_mcspi.1", "mcspi_fck", &mcspi1_fck, CK_343X), 153 CLK("omap2_mcspi.1", "fck", &mcspi1_fck, CK_343X),
154 CLK(NULL, "uart2_fck", &uart2_fck, CK_343X), 154 CLK(NULL, "uart2_fck", &uart2_fck, CK_343X),
155 CLK(NULL, "uart1_fck", &uart1_fck, CK_343X), 155 CLK(NULL, "uart1_fck", &uart1_fck, CK_343X),
156 CLK(NULL, "fshostusb_fck", &fshostusb_fck, CK_3430ES1), 156 CLK(NULL, "fshostusb_fck", &fshostusb_fck, CK_3430ES1),
@@ -175,10 +175,10 @@ static struct omap_clk omap34xx_clks[] = {
175 CLK("mmci-omap-hs.0", "mmchs_ick", &mmchs1_ick, CK_343X), 175 CLK("mmci-omap-hs.0", "mmchs_ick", &mmchs1_ick, CK_343X),
176 CLK(NULL, "mspro_ick", &mspro_ick, CK_343X), 176 CLK(NULL, "mspro_ick", &mspro_ick, CK_343X),
177 CLK(NULL, "hdq_ick", &hdq_ick, CK_343X), 177 CLK(NULL, "hdq_ick", &hdq_ick, CK_343X),
178 CLK("omap2_mcspi.4", "mcspi_ick", &mcspi4_ick, CK_343X), 178 CLK("omap2_mcspi.4", "ick", &mcspi4_ick, CK_343X),
179 CLK("omap2_mcspi.3", "mcspi_ick", &mcspi3_ick, CK_343X), 179 CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_343X),
180 CLK("omap2_mcspi.2", "mcspi_ick", &mcspi2_ick, CK_343X), 180 CLK("omap2_mcspi.2", "ick", &mcspi2_ick, CK_343X),
181 CLK("omap2_mcspi.1", "mcspi_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", "i2c_ick", &i2c3_ick, CK_343X),
183 CLK("i2c_omap.2", "i2c_ick", &i2c2_ick, CK_343X), 183 CLK("i2c_omap.2", "i2c_ick", &i2c2_ick, CK_343X),
184 CLK("i2c_omap.1", "i2c_ick", &i2c1_ick, CK_343X), 184 CLK("i2c_omap.1", "i2c_ick", &i2c1_ick, CK_343X),
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 454a2712e629..b91ee1ae975d 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -1021,13 +1021,13 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
1021 spin_lock_init(&mcspi->lock); 1021 spin_lock_init(&mcspi->lock);
1022 INIT_LIST_HEAD(&mcspi->msg_queue); 1022 INIT_LIST_HEAD(&mcspi->msg_queue);
1023 1023
1024 mcspi->ick = clk_get(&pdev->dev, "mcspi_ick"); 1024 mcspi->ick = clk_get(&pdev->dev, "ick");
1025 if (IS_ERR(mcspi->ick)) { 1025 if (IS_ERR(mcspi->ick)) {
1026 dev_dbg(&pdev->dev, "can't get mcspi_ick\n"); 1026 dev_dbg(&pdev->dev, "can't get mcspi_ick\n");
1027 status = PTR_ERR(mcspi->ick); 1027 status = PTR_ERR(mcspi->ick);
1028 goto err1a; 1028 goto err1a;
1029 } 1029 }
1030 mcspi->fck = clk_get(&pdev->dev, "mcspi_fck"); 1030 mcspi->fck = clk_get(&pdev->dev, "fck");
1031 if (IS_ERR(mcspi->fck)) { 1031 if (IS_ERR(mcspi->fck)) {
1032 dev_dbg(&pdev->dev, "can't get mcspi_fck\n"); 1032 dev_dbg(&pdev->dev, "can't get mcspi_fck\n");
1033 status = PTR_ERR(mcspi->fck); 1033 status = PTR_ERR(mcspi->fck);