Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f7d4121 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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

* 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

Conflicts:
	arch/arm/mach-shmobile/clock-r8a7740.c
parents d7de938f 8f45b112

arch/arm/mach-shmobile/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ obj-$(CONFIG_ARCH_R8A7740) += entry-intc.o 
# PM objects

# PM objects

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

obj-$(CONFIG_ARCH_SHMOBILE)	+= pm-rmobile.o

obj-$(CONFIG_ARCH_SH7372)	+= pm-sh7372.o sleep-sh7372.o

obj-$(CONFIG_ARCH_SH7372)	+= pm-sh7372.o sleep-sh7372.o

obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o

obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -636,7 +636,7 @@ void __init r8a7740_clock_init(u8 md_ck) 
						    DIV6_REPARENT_NR);

						    DIV6_REPARENT_NR);





	if (!ret)

	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++)

	for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)

		ret = clk_register(late_main_clks[k]);

		ret = clk_register(late_main_clks[k]);

arch/arm/mach-shmobile/clock-r8a7779.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -162,7 +162,7 @@ void __init r8a7779_clock_init(void) 
		ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);

		ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);





	if (!ret)

	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++)

	for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)

		ret = clk_register(late_main_clks[k]);

		ret = clk_register(late_main_clks[k]);

arch/arm/mach-shmobile/clock-sh7367.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -344,7 +344,7 @@ void __init sh7367_clock_init(void) 
		ret = sh_clk_div6_register(div6_clks, DIV6_NR);

		ret = sh_clk_div6_register(div6_clks, DIV6_NR);





	if (!ret)

	if (!ret)

		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);

		ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);





	clkdev_add_table(lookups, ARRAY_SIZE(lookups));

	clkdev_add_table(lookups, ARRAY_SIZE(lookups));

arch/arm/mach-shmobile/clock-sh7372.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -704,7 +704,7 @@ void __init sh7372_clock_init(void) 
		ret = sh_clk_div6_reparent_register(div6_reparent_clks, DIV6_REPARENT_NR);

		ret = sh_clk_div6_reparent_register(div6_reparent_clks, DIV6_REPARENT_NR);





	if (!ret)

	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++)

	for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)

		ret = clk_register(late_main_clks[k]);

		ret = clk_register(late_main_clks[k]);