From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 11 Jul 2012 21:01:33 +0000 (+0200)
Subject: Merge branch 'renesas-soc-core' into renesas-soc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=992c91eeca5fc7249de6afbba49064640f620d4a;p=linux-beck.git

Merge branch 'renesas-soc-core' into renesas-soc

* renesas-soc-core:
  ARM: shmobile: soc-core: add R-mobile PM domain common APIs
  ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register
  ARM: shmobile: add common DMAEngine definitions
  ARM: shmobile: add common extra gpio functions

Conflicts:
	arch/arm/mach-shmobile/clock-r8a7740.c
---

992c91eeca5fc7249de6afbba49064640f620d4a
diff --cc arch/arm/mach-shmobile/clock-r8a7740.c
index 7b9e4ab34fa2,29c397a9f20b..09b38d140e09
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@@ -623,16 -494,9 +623,16 @@@ void __init r8a7740_clock_init(u8 md_ck
  	if (!ret)
  		ret = sh_clk_div6_register(div6_clks, DIV6_NR);
  
 +	if (!ret)
 +		ret = sh_clk_div6_reparent_register(div6_reparent_clks,
 +						    DIV6_REPARENT_NR);
 +
  	if (!ret)
- 		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
+ 		ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
  
 +	for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)
 +		ret = clk_register(late_main_clks[k]);
 +
  	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
  
  	if (!ret)