From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2013 15:56:16 +0000 (+0100)
Subject: Merge branch 'next/drivers' into for-next
X-Git-Tag: next-20130220~18^2~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3bf9c6bda4da7c48ea932115bf481b6db6191c52;p=karo-tx-linux.git

Merge branch 'next/drivers' into for-next

* next/drivers: (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
  ...

Conflicts:
	drivers/cpufreq/dbx500-cpufreq.c
---

3bf9c6bda4da7c48ea932115bf481b6db6191c52
diff --cc drivers/cpufreq/dbx500-cpufreq.c
index 87130e219505,9a623753dee2..75a8afef79b2
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@@ -153,23 -144,37 +143,34 @@@ static int dbx500_cpufreq_probe(struct 
  		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);
 -	if (!cpu_is_u8500_family())
 -		return -ENODEV;
 -
+ 	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");