Merge branch 'omap-clks3' into devel

Conflicts:

	arch/arm/mach-omap2/clock.c

1 files changed, 22 insertions, 72 deletions

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);