Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC driver specific changes from Arnd Bergmann:

 - Updates to the ux500 cpufreq code

 - Moving the u300 DMA controller driver to drivers/dma

 - Moving versatile express drivers out of arch/arm for sharing with arch/arm64

 - Device tree bindings for the OMAP General Purpose Memory Controller

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (27 commits)
  ARM: OMAP2+: gpmc: Add device tree documentation for elm handle
  ARM: OMAP2+: gpmc: add DT bindings for OneNAND
  ARM: OMAP2+: gpmc-onenand: drop __init annotation
  mtd: omap-onenand: pass device_node in platform data
  ARM: OMAP2+: Prevent potential crash if GPMC probe fails
  ARM: OMAP2+: gpmc: Remove unneeded of_node_put()
  arm: Move sp810.h to include/linux/amba/
  ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
  ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs
  ARM: OMAP: gpmc-nand: drop __init annotation
  mtd: omap-nand: pass device_node in platform data
  ARM: OMAP: gpmc: don't create devices from initcall on DT
  dma: coh901318: cut down on platform data abstraction
  dma: coh901318: merge header files
  dma: coh901318: push definitions into driver
  dma: coh901318: push header down into the DMA subsystem
  dma: coh901318: skip hard-coded addresses
  dma: coh901318: remove hardcoded target addresses
  dma: coh901318: push platform data into driver
  dma: coh901318: create a proper platform data file
  ...

2 files changed, 52 insertions, 51 deletions

diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 5399c45ac311..863fd1865d45 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -44,7 +44,7 @@ obj-$(CONFIG_X86_INTEL_PSTATE)		+= intel_pstate.o
 
 ##################################################################################
 # ARM SoC drivers
-obj-$(CONFIG_UX500_SOC_DB8500)          += db8500-cpufreq.o
+obj-$(CONFIG_UX500_SOC_DB8500)          += dbx500-cpufreq.o
 obj-$(CONFIG_ARM_S3C2416_CPUFREQ)       += s3c2416-cpufreq.o
 obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)       += s3c64xx-cpufreq.o
 obj-$(CONFIG_ARM_S5PV210_CPUFREQ)       += s5pv210-cpufreq.o
diff --git a/drivers/cpufreq/db8500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 48a1988149d8..72f0c3efa76e 100644
--- a/drivers/cpufreq/db8500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -1,13 +1,13 @@
 /*
  * Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
+ * Copyright (C) ST-Ericsson SA 2010-2012
  *
  * License Terms: GNU General Public License v2
  * Author: Sundar Iyer <sundar.iyer@stericsson.com>
  * Author: Martin Persson <martin.persson@stericsson.com>
  * Author: Jonas Aaberg <jonas.aberg@stericsson.com>
- *
  */
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/cpufreq.h>
@@ -19,22 +19,23 @@
 static struct cpufreq_frequency_table *freq_table;
 static struct clk *armss_clk;
 
-static struct freq_attr *db8500_cpufreq_attr[] = {
+static struct freq_attr *dbx500_cpufreq_attr[] = {
         &cpufreq_freq_attr_scaling_available_freqs,
         NULL,
 };
 
-static int db8500_cpufreq_verify_speed(struct cpufreq_policy *policy)
+static int dbx500_cpufreq_verify_speed(struct cpufreq_policy *policy)
 {
         return cpufreq_frequency_table_verify(policy, freq_table);
 }
 
-static int db8500_cpufreq_target(struct cpufreq_policy *policy,
+static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
                                 unsigned int target_freq,
                                 unsigned int relation)
 {
         struct cpufreq_freqs freqs;
         unsigned int idx;
+        int ret;
 
         /* scale the target frequency to one of the extremes supported */
         if (target_freq < policy->cpuinfo.min_freq)
@@ -43,10 +44,9 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy,
                 target_freq = policy->cpuinfo.max_freq;
 
         /* Lookup the next frequency */
-        if (cpufreq_frequency_table_target
-            (policy, freq_table, target_freq, relation, &idx)) {
+        if (cpufreq_frequency_table_target(policy, freq_table, target_freq,
+                                        relation, &idx))
                 return -EINVAL;
-        }
 
         freqs.old = policy->cur;
         freqs.new = freq_table[idx].frequency;
@@ -59,9 +59,12 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy,
                 cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
 
         /* update armss clk frequency */
-        if (clk_set_rate(armss_clk, freq_table[idx].frequency * 1000)) {
-                pr_err("db8500-cpufreq: Failed to update armss clk\n");
-                return -EINVAL;
+        ret = clk_set_rate(armss_clk, freqs.new * 1000);
+
+        if (ret) {
+                pr_err("dbx500-cpufreq: Failed to set armss_clk to %d Hz: error %d\n",
+                       freqs.new * 1000, ret);
+                return ret;
         }
 
         /* post change notification */
@@ -71,7 +74,7 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy,
         return 0;
 }
 
-static unsigned int db8500_cpufreq_getspeed(unsigned int cpu)
+static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
 {
         int i = 0;
         unsigned long freq = clk_get_rate(armss_clk) / 1000;
@@ -83,40 +86,26 @@ static unsigned int db8500_cpufreq_getspeed(unsigned int cpu)
         }
 
         /* We could not find a corresponding frequency. */
-        pr_err("db8500-cpufreq: Failed to find cpufreq speed\n");
+        pr_err("dbx500-cpufreq: Failed to find cpufreq speed\n");
         return 0;
 }
 
-static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)
+static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
 {
-        int i = 0;
         int res;
 
-        armss_clk = clk_get(NULL, "armss");
-        if (IS_ERR(armss_clk)) {
-                pr_err("db8500-cpufreq : Failed to get armss clk\n");
-                return PTR_ERR(armss_clk);
-        }
-
-        pr_info("db8500-cpufreq : Available frequencies:\n");
-        while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
-                pr_info("  %d Mhz\n", freq_table[i].frequency/1000);
-                i++;
-        }
-
         /* get policy fields based on the table */
         res = cpufreq_frequency_table_cpuinfo(policy, freq_table);
         if (!res)
                 cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
         else {
-                pr_err("db8500-cpufreq : Failed to read policy table\n");
-                clk_put(armss_clk);
+                pr_err("dbx500-cpufreq: Failed to read policy table\n");
                 return res;
         }
 
         policy->min = policy->cpuinfo.min_freq;
         policy->max = policy->cpuinfo.max_freq;
-        policy->cur = db8500_cpufreq_getspeed(policy->cpu);
+        policy->cur = dbx500_cpufreq_getspeed(policy->cpu);
         policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
 
         /*
@@ -132,42 +121,54 @@ static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)
         return 0;
 }
 
-static struct cpufreq_driver db8500_cpufreq_driver = {
-        .flags  = CPUFREQ_STICKY,
-        .verify = db8500_cpufreq_verify_speed,
-        .target = db8500_cpufreq_target,
-        .get    = db8500_cpufreq_getspeed,
-        .init   = db8500_cpufreq_init,
-        .name   = "DB8500",
-        .attr   = db8500_cpufreq_attr,
+static struct cpufreq_driver dbx500_cpufreq_driver = {
+        .flags  = CPUFREQ_STICKY | CPUFREQ_CONST_LOOPS,
+        .verify = dbx500_cpufreq_verify_speed,
+        .target = dbx500_cpufreq_target,
+        .get    = dbx500_cpufreq_getspeed,
+        .init   = dbx500_cpufreq_init,
+        .name   = "DBX500",
+        .attr   = dbx500_cpufreq_attr,
 };
 
-static int db8500_cpufreq_probe(struct platform_device *pdev)
+static int dbx500_cpufreq_probe(struct platform_device *pdev)
 {
-        freq_table = dev_get_platdata(&pdev->dev);
+        int i = 0;
 
+        freq_table = dev_get_platdata(&pdev->dev);
         if (!freq_table) {
-                pr_err("db8500-cpufreq: Failed to fetch cpufreq table\n");
+                pr_err("dbx500-cpufreq: Failed to fetch cpufreq table\n");
                 return -ENODEV;
         }
 
-        return cpufreq_register_driver(&db8500_cpufreq_driver);
+        armss_clk = clk_get(&pdev->dev, "armss");
+        if (IS_ERR(armss_clk)) {
+                pr_err("dbx500-cpufreq: Failed to get armss clk\n");
+                return PTR_ERR(armss_clk);
+        }
+
+        pr_info("dbx500-cpufreq: Available frequencies:\n");
+        while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
+                pr_info("  %d Mhz\n", freq_table[i].frequency/1000);
+                i++;
+        }
+
+        return cpufreq_register_driver(&dbx500_cpufreq_driver);
 }
 
-static struct platform_driver db8500_cpufreq_plat_driver = {
+static struct platform_driver dbx500_cpufreq_plat_driver = {
         .driver = {
-                .name = "cpufreq-u8500",
+                .name = "cpufreq-ux500",
                 .owner = THIS_MODULE,
         },
-        .probe = db8500_cpufreq_probe,
+        .probe = dbx500_cpufreq_probe,
 };
 
-static int __init db8500_cpufreq_register(void)
+static int __init dbx500_cpufreq_register(void)
 {
-        pr_info("cpufreq for DB8500 started\n");
-        return platform_driver_register(&db8500_cpufreq_plat_driver);
+        return platform_driver_register(&dbx500_cpufreq_plat_driver);
 }
-device_initcall(db8500_cpufreq_register);
+device_initcall(dbx500_cpufreq_register);
 
 MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("cpufreq driver for DB8500");
+MODULE_DESCRIPTION("cpufreq driver for DBX500");