diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-19 20:49:37 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 17:50:18 +0000 |
| commit | 1b5715ec471d1def9722e22b6cb1d24841b5e290 (patch) | |
| tree | 15bb3b78d4fe8c72b0f911a7e5404a6c7288dc1a /drivers/spi | |
| parent | d4a36645a1a76e5294c1b00682fb849fc53ccd80 (diff) | |
| download | linux-3.10-1b5715ec471d1def9722e22b6cb1d24841b5e290.tar.gz linux-3.10-1b5715ec471d1def9722e22b6cb1d24841b5e290.tar.bz2 linux-3.10-1b5715ec471d1def9722e22b6cb1d24841b5e290.zip | |
[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 454a2712e62..b91ee1ae975 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) spin_lock_init(&mcspi->lock); INIT_LIST_HEAD(&mcspi->msg_queue); - mcspi->ick = clk_get(&pdev->dev, "mcspi_ick"); + mcspi->ick = clk_get(&pdev->dev, "ick"); if (IS_ERR(mcspi->ick)) { dev_dbg(&pdev->dev, "can't get mcspi_ick\n"); status = PTR_ERR(mcspi->ick); goto err1a; } - mcspi->fck = clk_get(&pdev->dev, "mcspi_fck"); + mcspi->fck = clk_get(&pdev->dev, "fck"); if (IS_ERR(mcspi->fck)) { dev_dbg(&pdev->dev, "can't get mcspi_fck\n"); status = PTR_ERR(mcspi->fck); |