diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 18:42:44 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 18:42:44 (GMT) |
| commit | 93bcfdc56522a88b440cf6c4fee09e9ecf6605da (patch) | |
| tree | 0dc1088d755b6efd3d663e4ff4eb9b05d3ff7861 /arch/arm/mach-shmobile/clock-r8a7740.c | |
| parent | f65ad7e36cbae24f05ea2314ad63e9dd23294c60 (diff) | |
| parent | a330ce3cdaba5202051edf8ae69482e15fdc9db5 (diff) | |
| download | linux-93bcfdc56522a88b440cf6c4fee09e9ecf6605da.tar.xz | |
Merge branch 'renesas-r8a7740' into renesas-armadillo
* renesas-r8a7740:
ARM: shmobile: r8a7740: add A4LC pm domain support
ARM: shmobile: r8a7740: add A3SP pm domain support
ARM: shmobile: r8a7740: add A4S pm domain support
ARM: shmobile: r8a7740: fixup: MSEL1CR 7bit control
ARM: shmobile: soc-core: add R-mobile PM domain common APIs
ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r8a7740.c')
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7740.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c index daf3eac..ad5fccc 100644 --- a/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/arch/arm/mach-shmobile/clock-r8a7740.c @@ -636,7 +636,7 @@ void __init r8a7740_clock_init(u8 md_ck) 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]); |