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

diff --cc arch/arm/mach-shmobile/clock-r8a7740.c
index 7b9e4ab,29c397a..09b38d1
--- 1/arch/arm/mach-shmobile/clock-r8a7740.c
--- 2/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@@ -624,15 -495,8 +624,15 @@@ void __init r8a7740_clock_init(u8 md_ck
                ret = sh_clk_div6_register(div6_clks, DIV6_NR);
  
        if (!ret)
-               ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
 +              ret = sh_clk_div6_reparent_register(div6_reparent_clks,
 +                                                  DIV6_REPARENT_NR);
 +
 +      if (!ret)
+               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)

diff --cc arch/arm/mach-shmobile/clock-sh73a0.c
Simple merge