Merge branch 'omap-clks3' into devel

Conflicts:

	arch/arm/mach-omap2/clock.c

2 files changed, 7 insertions, 6 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)
         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);
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index bab6ff061e91..394b616eafe3 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -506,11 +506,12 @@ static int __init uwire_probe(struct platform_device *pdev)
 
         dev_set_drvdata(&pdev->dev, uwire);
 
-        uwire->ck = clk_get(&pdev->dev, "armxor_ck");
-        if (!uwire->ck || IS_ERR(uwire->ck)) {
-                dev_dbg(&pdev->dev, "no mpu_xor_clk ?\n");
+        uwire->ck = clk_get(&pdev->dev, "fck");
+        if (IS_ERR(uwire->ck)) {
+                status = PTR_ERR(uwire->ck);
+                dev_dbg(&pdev->dev, "no functional clock?\n");
                 spi_master_put(master);
-                return -ENODEV;
+                return status;
         }
         clk_enable(uwire->ck);