Merge branch 'omap-clks3' into devel

Conflicts:

	arch/arm/mach-omap2/clock.c

9 files changed, 69 insertions, 127 deletions

diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index ba68a4671cb5..538313f9e7ac 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -102,7 +102,7 @@ static int __init omap_rng_probe(struct platform_device *pdev)
                 return -EBUSY;
 
         if (cpu_is_omap24xx()) {
-                rng_ick = clk_get(&pdev->dev, "rng_ick");
+                rng_ick = clk_get(&pdev->dev, "ick");
                 if (IS_ERR(rng_ick)) {
                         dev_err(&pdev->dev, "Could not get rng_ick\n");
                         ret = PTR_ERR(rng_ick);
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index be8ee2cac8bb..ece0125a1ee5 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -193,22 +193,24 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
 
 static int __init omap_i2c_get_clocks(struct omap_i2c_dev *dev)
 {
-        if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
-                dev->iclk = clk_get(dev->dev, "i2c_ick");
-                if (IS_ERR(dev->iclk)) {
-                        dev->iclk = NULL;
-                        return -ENODEV;
-                }
+        int ret;
+
+        dev->iclk = clk_get(dev->dev, "ick");
+        if (IS_ERR(dev->iclk)) {
+                ret = PTR_ERR(dev->iclk);
+                dev->iclk = NULL;
+                return ret;
         }
 
-        dev->fclk = clk_get(dev->dev, "i2c_fck");
+        dev->fclk = clk_get(dev->dev, "fck");
         if (IS_ERR(dev->fclk)) {
+                ret = PTR_ERR(dev->fclk);
                 if (dev->iclk != NULL) {
                         clk_put(dev->iclk);
                         dev->iclk = NULL;
                 }
                 dev->fclk = NULL;
-                return -ENODEV;
+                return ret;
         }
 
         return 0;
@@ -218,18 +220,15 @@ static void omap_i2c_put_clocks(struct omap_i2c_dev *dev)
 {
         clk_put(dev->fclk);
         dev->fclk = NULL;
-        if (dev->iclk != NULL) {
-                clk_put(dev->iclk);
-                dev->iclk = NULL;
-        }
+        clk_put(dev->iclk);
+        dev->iclk = NULL;
 }
 
 static void omap_i2c_unidle(struct omap_i2c_dev *dev)
 {
         WARN_ON(!dev->idle);
 
-        if (dev->iclk != NULL)
-                clk_enable(dev->iclk);
+        clk_enable(dev->iclk);
         clk_enable(dev->fclk);
         dev->idle = 0;
         if (dev->iestate)
@@ -254,8 +253,7 @@ static void omap_i2c_idle(struct omap_i2c_dev *dev)
         }
         dev->idle = 1;
         clk_disable(dev->fclk);
-        if (dev->iclk != NULL)
-                clk_disable(dev->iclk);
+        clk_disable(dev->iclk);
 }
 
 static int omap_i2c_init(struct omap_i2c_dev *dev)
@@ -312,15 +310,14 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
 
         if (cpu_class_is_omap1()) {
-                struct clk *armxor_ck;
-
-                armxor_ck = clk_get(NULL, "armxor_ck");
-                if (IS_ERR(armxor_ck))
-                        dev_warn(dev->dev, "Could not get armxor_ck\n");
-                else {
-                        fclk_rate = clk_get_rate(armxor_ck);
-                        clk_put(armxor_ck);
-                }
+                /*
+                 * The I2C functional clock is the armxor_ck, so there's
+                 * no need to get "armxor_ck" separately.  Now, if OMAP2420
+                 * always returns 12MHz for the functional clock, we can
+                 * do this bit unconditionally.
+                 */
+                fclk_rate = clk_get_rate(dev->fclk);
+
                 /* TRM for 5912 says the I2C clock must be prescaled to be
                  * between 7 - 12 MHz. The XOR input clock is typically
                  * 12, 13 or 19.2 MHz. So we should have code that produces:
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 73eb656acfe3..805faaea6449 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -80,17 +80,17 @@ static int omap24xxcam_clock_get(struct omap24xxcam_device *cam)
 {
         int rval = 0;
 
-        cam->fck = clk_get(cam->dev, "cam_fck");
+        cam->fck = clk_get(cam->dev, "fck");
         if (IS_ERR(cam->fck)) {
-                dev_err(cam->dev, "can't get cam_fck");
+                dev_err(cam->dev, "can't get camera fck");
                 rval = PTR_ERR(cam->fck);
                 omap24xxcam_clock_put(cam);
                 return rval;
         }
 
-        cam->ick = clk_get(cam->dev, "cam_ick");
+        cam->ick = clk_get(cam->dev, "ick");
         if (IS_ERR(cam->ick)) {
-                dev_err(cam->dev, "can't get cam_ick");
+                dev_err(cam->dev, "can't get camera ick");
                 rval = PTR_ERR(cam->ick);
                 omap24xxcam_clock_put(cam);
         }
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 67d7b7fef084..5570849188cc 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1460,18 +1460,12 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
         if (!host->virt_base)
                 goto err_ioremap;
 
-        if (cpu_is_omap24xx()) {
-                host->iclk = clk_get(&pdev->dev, "mmc_ick");
-                if (IS_ERR(host->iclk))
-                        goto err_free_mmc_host;
-                clk_enable(host->iclk);
-        }
-
-        if (!cpu_is_omap24xx())
-                host->fclk = clk_get(&pdev->dev, "mmc_ck");
-        else
-                host->fclk = clk_get(&pdev->dev, "mmc_fck");
+        host->iclk = clk_get(&pdev->dev, "ick");
+        if (IS_ERR(host->iclk))
+                goto err_free_mmc_host;
+        clk_enable(host->iclk);
 
+        host->fclk = clk_get(&pdev->dev, "fck");
         if (IS_ERR(host->fclk)) {
                 ret = PTR_ERR(host->fclk);
                 goto err_free_iclk;
@@ -1536,10 +1530,10 @@ static int mmc_omap_remove(struct platform_device *pdev)
         if (host->pdata->cleanup)
                 host->pdata->cleanup(&pdev->dev);
 
-        if (host->iclk && !IS_ERR(host->iclk))
-                clk_put(host->iclk);
-        if (host->fclk && !IS_ERR(host->fclk))
-                clk_put(host->fclk);
+        mmc_omap_fclk_enable(host, 0);
+        clk_put(host->fclk);
+        clk_disable(host->iclk);
+        clk_put(host->iclk);
 
         iounmap(host->virt_base);
         release_mem_region(pdev->resource[0].start,
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index a631c81dce12..3916a5618e28 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -956,13 +956,13 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 
         sema_init(&host->sem, 1);
 
-        host->iclk = clk_get(&pdev->dev, "mmchs_ick");
+        host->iclk = clk_get(&pdev->dev, "ick");
         if (IS_ERR(host->iclk)) {
                 ret = PTR_ERR(host->iclk);
                 host->iclk = NULL;
                 goto err1;
         }
-        host->fclk = clk_get(&pdev->dev, "mmchs_fck");
+        host->fclk = clk_get(&pdev->dev, "fck");
         if (IS_ERR(host->fclk)) {
                 ret = PTR_ERR(host->fclk);
                 host->fclk = NULL;
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);
 
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index c973889110c8..a7e3b706b9d3 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -590,8 +590,8 @@ static int __init omap_hdq_probe(struct platform_device *pdev)
         }
 
         /* get interface & functional clock objects */
-        hdq_data->hdq_ick = clk_get(&pdev->dev, "hdq_ick");
-        hdq_data->hdq_fck = clk_get(&pdev->dev, "hdq_fck");
+        hdq_data->hdq_ick = clk_get(&pdev->dev, "ick");
+        hdq_data->hdq_fck = clk_get(&pdev->dev, "fck");
 
         if (IS_ERR(hdq_data->hdq_ick) || IS_ERR(hdq_data->hdq_fck)) {
                 dev_dbg(&pdev->dev, "Can't get HDQ clock objects\n");
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 2f2ce7429f5b..aa5ad6e33f02 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -60,9 +60,8 @@ struct omap_wdt_dev {
         void __iomem    *base;          /* physical */
         struct device   *dev;
         int             omap_wdt_users;
-        struct clk      *armwdt_ck;
-        struct clk      *mpu_wdt_ick;
-        struct clk      *mpu_wdt_fck;
+        struct clk      *ick;
+        struct clk      *fck;
         struct resource *mem;
         struct miscdevice omap_wdt_miscdev;
 };
@@ -146,13 +145,8 @@ static int omap_wdt_open(struct inode *inode, struct file *file)
         if (test_and_set_bit(1, (unsigned long *)&(wdev->omap_wdt_users)))
                 return -EBUSY;
 
-        if (cpu_is_omap16xx())
-                clk_enable(wdev->armwdt_ck);    /* Enable the clock */
-
-        if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
-                clk_enable(wdev->mpu_wdt_ick);    /* Enable the interface clock */
-                clk_enable(wdev->mpu_wdt_fck);    /* Enable the functional clock */
-        }
+        clk_enable(wdev->ick);    /* Enable the interface clock */
+        clk_enable(wdev->fck);    /* Enable the functional clock */
 
         /* initialize prescaler */
         while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
@@ -181,13 +175,8 @@ static int omap_wdt_release(struct inode *inode, struct file *file)
 
         omap_wdt_disable(wdev);
 
-        if (cpu_is_omap16xx())
-                clk_disable(wdev->armwdt_ck);   /* Disable the clock */
-
-        if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
-                clk_disable(wdev->mpu_wdt_ick); /* Disable the clock */
-                clk_disable(wdev->mpu_wdt_fck); /* Disable the clock */
-        }
+        clk_disable(wdev->ick);
+        clk_disable(wdev->fck);
 #else
         printk(KERN_CRIT "omap_wdt: Unexpected close, not stopping!\n");
 #endif
@@ -303,44 +292,19 @@ static int __init omap_wdt_probe(struct platform_device *pdev)
         wdev->omap_wdt_users = 0;
         wdev->mem = mem;
 
-        if (cpu_is_omap16xx()) {
-                wdev->armwdt_ck = clk_get(&pdev->dev, "armwdt_ck");
-                if (IS_ERR(wdev->armwdt_ck)) {
-                        ret = PTR_ERR(wdev->armwdt_ck);
-                        wdev->armwdt_ck = NULL;
-                        goto err_clk;
-                }
+        wdev->ick = clk_get(&pdev->dev, "ick");
+        if (IS_ERR(wdev->ick)) {
+                ret = PTR_ERR(wdev->ick);
+                wdev->ick = NULL;
+                goto err_clk;
         }
-
-        if (cpu_is_omap24xx()) {
-                wdev->mpu_wdt_ick = clk_get(&pdev->dev, "mpu_wdt_ick");
-                if (IS_ERR(wdev->mpu_wdt_ick)) {
-                        ret = PTR_ERR(wdev->mpu_wdt_ick);
-                        wdev->mpu_wdt_ick = NULL;
-                        goto err_clk;
-                }
-                wdev->mpu_wdt_fck = clk_get(&pdev->dev, "mpu_wdt_fck");
-                if (IS_ERR(wdev->mpu_wdt_fck)) {
-                        ret = PTR_ERR(wdev->mpu_wdt_fck);
-                        wdev->mpu_wdt_fck = NULL;
-                        goto err_clk;
-                }
+        wdev->fck = clk_get(&pdev->dev, "fck");
+        if (IS_ERR(wdev->fck)) {
+                ret = PTR_ERR(wdev->fck);
+                wdev->fck = NULL;
+                goto err_clk;
         }
 
-        if (cpu_is_omap34xx()) {
-                wdev->mpu_wdt_ick = clk_get(&pdev->dev, "wdt2_ick");
-                if (IS_ERR(wdev->mpu_wdt_ick)) {
-                        ret = PTR_ERR(wdev->mpu_wdt_ick);
-                        wdev->mpu_wdt_ick = NULL;
-                        goto err_clk;
-                }
-                wdev->mpu_wdt_fck = clk_get(&pdev->dev, "wdt2_fck");
-                if (IS_ERR(wdev->mpu_wdt_fck)) {
-                        ret = PTR_ERR(wdev->mpu_wdt_fck);
-                        wdev->mpu_wdt_fck = NULL;
-                        goto err_clk;
-                }
-        }
         wdev->base = ioremap(res->start, res->end - res->start + 1);
         if (!wdev->base) {
                 ret = -ENOMEM;
@@ -380,12 +344,10 @@ err_ioremap:
         wdev->base = NULL;
 
 err_clk:
-        if (wdev->armwdt_ck)
-                clk_put(wdev->armwdt_ck);
-        if (wdev->mpu_wdt_ick)
-                clk_put(wdev->mpu_wdt_ick);
-        if (wdev->mpu_wdt_fck)
-                clk_put(wdev->mpu_wdt_fck);
+        if (wdev->ick)
+                clk_put(wdev->ick);
+        if (wdev->fck)
+                clk_put(wdev->fck);
         kfree(wdev);
 
 err_kzalloc:
@@ -417,20 +379,8 @@ static int omap_wdt_remove(struct platform_device *pdev)
         release_mem_region(res->start, res->end - res->start + 1);
         platform_set_drvdata(pdev, NULL);
 
-        if (wdev->armwdt_ck) {
-                clk_put(wdev->armwdt_ck);
-                wdev->armwdt_ck = NULL;
-        }
-
-        if (wdev->mpu_wdt_ick) {
-                clk_put(wdev->mpu_wdt_ick);
-                wdev->mpu_wdt_ick = NULL;
-        }
-
-        if (wdev->mpu_wdt_fck) {
-                clk_put(wdev->mpu_wdt_fck);
-                wdev->mpu_wdt_fck = NULL;
-        }
+        clk_put(wdev->ick);
+        clk_put(wdev->fck);
         iounmap(wdev->base);
 
         kfree(wdev);