diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 16:42:07 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 16:42:07 +0200 |
commit | 64685273186b71b75734771ca21823cec2d994c3 (patch) | |
tree | 7639c3e38c374b7d0fa5d8322213afb5ea53c32e /drivers/infiniband/ulp/iser/iser_memory.c | |
parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
parent | 8b98d74780ab70147d40400c36059c16c1aea4da (diff) | |
download | blackbird-op-linux-64685273186b71b75734771ca21823cec2d994c3.tar.gz blackbird-op-linux-64685273186b71b75734771ca21823cec2d994c3.zip |
Merge tag 'renesas-soc-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Renesas ARM Based SoC Updates for v4.4" from Simon Horman:
* ARM: shmobile: R-Mobile: Use CPG/MSTP Clock Domain attach/detach helpers
This part of a multi-stage effort by Geert Uytterhoeven to add:
"Clock Domain support to the Clock Pulse Generator (CPG) Module Stop
(MSTP) Clocks driver using the generic PM Domain, to be used on shmobile
SoCs without device power domains (R-Car Gen1 and Gen2, RZ). This allows
to power-manage the module clocks of SoC devices that are part of the
CPG/MSTP Clock Domain using Runtime PM, or for system suspend/resume,
similar to SoCs with device power domains (SH-Mobile and R-Mobile)."
* tag 'renesas-soc-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: R-Mobile: Use CPG/MSTP Clock Domain attach/detach helpers
clk: shmobile: mstp: Consider "zb_clk" suitable for power management
Diffstat (limited to 'drivers/infiniband/ulp/iser/iser_memory.c')
0 files changed, 0 insertions, 0 deletions