Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm: (27 commits)
  [ARM] 3433/1: ARM: OMAP: 8/8 Update board files
  [ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2
  [ARM] 3454/1: ARM: OMAP: 6/8 Update framebuffer low-level init code, take 2
  [ARM] 3430/1: ARM: OMAP: 5/8 Update PM
  [ARM] 3429/1: ARM: OMAP: 4/8 Update GPIO
  [ARM] 3428/1: ARM: OMAP: 3/8 Update pin multiplexing
  [ARM] 3427/1: ARM: OMAP: 2/8 Update timers
  [ARM] 3426/1: ARM: OMAP: 1/8 Update clock framework
  [ARM] 3396/2: AT91RM9200 Platform devices update
  [ARM] 3395/2: AT91RM9200 Dataflash Card vs MMC selection
  [ARM] 3393/2: AT91RM9200 LED support
  [ARM] 3453/1: Poodle: Correctly set the memory size
  [ARM] 3446/1: i.MX: MMC/SD SDHC controller registration for i.MX/MX1 MX1ADS board
  [ARM] 3444/1: i.MX: Scatter-gather DMA emulation for i.MX/MX1
  [ARM] 3451/1: ep93xx: use the m48t86 rtc driver on the ts72xx platform
  [ARM] 3450/1: ep93xx: use the ep93xx rtc driver
  [ARM] 3452/1: [S3C2410] RX3715 - add nand information
  [ARM] 3449/1: [S3C2410] Anubis - fix NAND timings
  [ARM] 3448/1: [S3C2410] Settle delay when _enabling_ USB PLL
  [ARM] 3442/1: [S3C2410] SMDK: NAND device setup
  ...

1 files changed, 65 insertions, 2 deletions

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 3c2bfc0efdaf..06485c193ee3 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -21,6 +21,7 @@
 #include <linux/string.h>
 #include <linux/clk.h>
 #include <linux/mutex.h>
+#include <linux/platform_device.h>
 
 #include <asm/io.h>
 #include <asm/semaphore.h>
@@ -37,17 +38,37 @@ static struct clk_functions *arch_clock;
  * Standard clock functions defined in include/linux/clk.h
  *-------------------------------------------------------------------------*/
 
+/*
+ * Returns a clock. Note that we first try to use device id on the bus
+ * and clock name. If this fails, we try to use clock name only.
+ */
 struct clk * clk_get(struct device *dev, const char *id)
 {
         struct clk *p, *clk = ERR_PTR(-ENOENT);
+        int idno;
+
+        if (dev == NULL || dev->bus != &platform_bus_type)
+                idno = -1;
+        else
+                idno = to_platform_device(dev)->id;
 
         mutex_lock(&clocks_mutex);
+
+        list_for_each_entry(p, &clocks, node) {
+                if (p->id == idno &&
+                    strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
+                        clk = p;
+                        break;
+                }
+        }
+
         list_for_each_entry(p, &clocks, node) {
                 if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
                         clk = p;
                         break;
                 }
         }
+
         mutex_unlock(&clocks_mutex);
 
         return clk;
@@ -59,6 +80,9 @@ int clk_enable(struct clk *clk)
         unsigned long flags;
         int ret = 0;
 
+        if (clk == NULL || IS_ERR(clk))
+                return -EINVAL;
+
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_enable)
                 ret = arch_clock->clk_enable(clk);
@@ -72,6 +96,9 @@ void clk_disable(struct clk *clk)
 {
         unsigned long flags;
 
+        if (clk == NULL || IS_ERR(clk))
+                return;
+
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_disable)
                 arch_clock->clk_disable(clk);
@@ -84,6 +111,9 @@ int clk_get_usecount(struct clk *clk)
         unsigned long flags;
         int ret = 0;
 
+        if (clk == NULL || IS_ERR(clk))
+                return 0;
+
         spin_lock_irqsave(&clockfw_lock, flags);
         ret = clk->usecount;
         spin_unlock_irqrestore(&clockfw_lock, flags);
@@ -97,6 +127,9 @@ unsigned long clk_get_rate(struct clk *clk)
         unsigned long flags;
         unsigned long ret = 0;
 
+        if (clk == NULL || IS_ERR(clk))
+                return 0;
+
         spin_lock_irqsave(&clockfw_lock, flags);
         ret = clk->rate;
         spin_unlock_irqrestore(&clockfw_lock, flags);
@@ -121,6 +154,9 @@ long clk_round_rate(struct clk *clk, unsigned long rate)
         unsigned long flags;
         long ret = 0;
 
+        if (clk == NULL || IS_ERR(clk))
+                return ret;
+
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_round_rate)
                 ret = arch_clock->clk_round_rate(clk, rate);
@@ -133,7 +169,10 @@ EXPORT_SYMBOL(clk_round_rate);
 int clk_set_rate(struct clk *clk, unsigned long rate)
 {
         unsigned long flags;
-        int ret = 0;
+        int ret = -EINVAL;
+
+        if (clk == NULL || IS_ERR(clk))
+                return ret;
 
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_set_rate)
@@ -147,7 +186,10 @@ EXPORT_SYMBOL(clk_set_rate);
 int clk_set_parent(struct clk *clk, struct clk *parent)
 {
         unsigned long flags;
-        int ret = 0;
+        int ret = -EINVAL;
+
+        if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent))
+                return ret;
 
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_set_parent)
@@ -163,6 +205,9 @@ struct clk *clk_get_parent(struct clk *clk)
         unsigned long flags;
         struct clk * ret = NULL;
 
+        if (clk == NULL || IS_ERR(clk))
+                return ret;
+
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_get_parent)
                 ret = arch_clock->clk_get_parent(clk);
@@ -199,6 +244,9 @@ __setup("mpurate=", omap_clk_setup);
 /* Used for clocks that always have same value as the parent clock */
 void followparent_recalc(struct clk *clk)
 {
+        if (clk == NULL || IS_ERR(clk))
+                return;
+
         clk->rate = clk->parent->rate;
 }
 
@@ -207,6 +255,9 @@ void propagate_rate(struct clk * tclk)
 {
         struct clk *clkp;
 
+        if (tclk == NULL || IS_ERR(tclk))
+                return;
+
         list_for_each_entry(clkp, &clocks, node) {
                 if (likely(clkp->parent != tclk))
                         continue;
@@ -217,6 +268,9 @@ void propagate_rate(struct clk * tclk)
 
 int clk_register(struct clk *clk)
 {
+        if (clk == NULL || IS_ERR(clk))
+                return -EINVAL;
+
         mutex_lock(&clocks_mutex);
         list_add(&clk->node, &clocks);
         if (clk->init)
@@ -229,6 +283,9 @@ EXPORT_SYMBOL(clk_register);
 
 void clk_unregister(struct clk *clk)
 {
+        if (clk == NULL || IS_ERR(clk))
+                return;
+
         mutex_lock(&clocks_mutex);
         list_del(&clk->node);
         mutex_unlock(&clocks_mutex);
@@ -239,6 +296,9 @@ void clk_deny_idle(struct clk *clk)
 {
         unsigned long flags;
 
+        if (clk == NULL || IS_ERR(clk))
+                return;
+
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_deny_idle)
                 arch_clock->clk_deny_idle(clk);
@@ -250,6 +310,9 @@ void clk_allow_idle(struct clk *clk)
 {
         unsigned long flags;
 
+        if (clk == NULL || IS_ERR(clk))
+                return;
+
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_allow_idle)
                 arch_clock->clk_allow_idle(clk);