diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-19 15:49:37 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 12:50:18 -0500 |
commit | 1b5715ec471d1def9722e22b6cb1d24841b5e290 (patch) | |
tree | 15bb3b78d4fe8c72b0f911a7e5404a6c7288dc1a /drivers/spi | |
parent | d4a36645a1a76e5294c1b00682fb849fc53ccd80 (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>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/omap2_mcspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |