redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Second Round of Renesas ARM Based SoC Updates for v3.16

Browse source 
Power management code which is only used by
 sh7372 (SH-Mobile AP4) based Mackerl board
 * Ignore callbacks for subsys generic_pm_domain_data
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTXwsLAAoJENfPZGlqN0++FyoQAK05Ixdop/tfpaAPzWcF5TdS
 1ZrzrrmF8b9x55+/YwX7AgTkRzyqQqDbBFTDUFRmrLMwSevB1l2EEe3yIZwckQka
 qqWOyO5vOBK6SAM0unjeXKln/4G3krUAjhJY0sY1aQQgZL7jPnLfZv746blL8+Fg
 5a3KRR2wwBDY0exjfDEaB4s2+7H70HwUezDeEC1ylqxF2f6xKFbdwdotaSMNEqVM
 cKQD3sF4IMEkrn113p75vSe+l+MO7uhWtP/sDSP1btN+W51D9GoNgzZUQlAdqVQl
 x3lXMsxLh0KYFflcEzbAVtPSPUo5lBohoPhULxzjUkfUIogvHBDfHBPRI+8tiuyd
 IA/WbItw3FXrhP7DyXYyjw+iU8f5YuFsmAxZQw9g0k6jCEjXcvHVVIB9IGwrLgUf
 NUzjSu8BogJ3SIkgY2ia3Ahg9pgXrTcXHLpdcdmZjPH04Pp49CEnGsojr1WnIpxw
 XuqU6dsPR/YUUSH2Ev6wSsdgpFvTvlvdGCwdYXD1lNQ5PNtJ+VotzW6pja/vtW+G
 T1V2Vy2nVc+d9UyP5P6Ev/Ail52sAVkdql3HaCeFaZpPs8Je9vW/XNEQ12WRQO/a
 iWqS2ZLWVMW5KjVmjzA831PR/zVk9A5hGVAW27Q27oRZ2NudLTJ7dsglcWfREhRa
 RHmpy9KgUUJJAMIe+nlP
 =HscU
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Merge "Second Round of Renesas ARM Based SoC Updates for v3.16" from Simon
Horman:

Power management code which is only used by
sh7372 (SH-Mobile AP4) based Mackerl board
* Ignore callbacks for subsys generic_pm_domain_data

* tag 'renesas-soc2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-05-05 18:45:10 -07:00
parent 814789e2f1 ab496b9d25
commit 0db543faec
1 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
arch/arm/mach-shmobile/pm-rmobile.c
View file

@ -99,39 +99,7 @@ static int rmobile_pd_power_up(struct generic_pm_domain *genpd)
static bool rmobile_pd_active_wakeup(struct device *dev)
{
bool (*active_wakeup)(struct device *dev);
active_wakeup = dev_gpd_data(dev)->ops.active_wakeup;
return active_wakeup ? active_wakeup(dev) : true;
}
static int rmobile_pd_stop_dev(struct device *dev)
{
int (*stop)(struct device *dev);
stop = dev_gpd_data(dev)->ops.stop;
if (stop) {
int ret = stop(dev);
if (ret)
return ret;
}
return pm_clk_suspend(dev);
}
static int rmobile_pd_start_dev(struct device *dev)
{
int (*start)(struct device *dev);
int ret;
ret = pm_clk_resume(dev);
if (ret)
return ret;
start = dev_gpd_data(dev)->ops.start;
if (start)
ret = start(dev);
return ret;
return true;
}
static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
@ -140,8 +108,8 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
struct dev_power_governor *gov = rmobile_pd->gov;
pm_genpd_init(genpd, gov ? : &simple_qos_governor, false);
genpd->dev_ops.stop = rmobile_pd_stop_dev;
genpd->dev_ops.start = rmobile_pd_start_dev;
genpd->dev_ops.stop = pm_clk_suspend;
genpd->dev_ops.start = pm_clk_resume;
genpd->dev_ops.active_wakeup = rmobile_pd_active_wakeup;
genpd->dev_irq_safe = true;
genpd->power_off = rmobile_pd_power_down;