[GIT PULL] Second Round of Renesas ARM Based SoC Updates for v3.16

[GIT PULL] Second Round of Renesas ARM Based SoC Updates for v3.16

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these second round of Renesas ARM based SoC updates for v3.16.

This pull request is based on the previous round of
such requests, tagged as renesas-soc-for-v3.16,
which I have already sent a pull-request for.


The following changes since commit e35db38d66d1e4007cfc1bb90a05e11b4aaee2a8:

  ARM: shmobile: r8a7778/bockw: Move "select RENESAS_INTC_IRQPIN" under SoC (2014-04-14 11:28:43 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.16

for you to fetch changes up to ab496b9d259e754f5d646219e4f032b274b9fffe:

  ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data (2014-04-25 10:01:43 +0900)

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

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

----------------------------------------------------------------
Ulf Hansson (1):
      ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data

 arch/arm/mach-shmobile/pm-rmobile.c | 38 +++----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

[PATCH] ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data

[Simon Horman]

From: Ulf Hansson <ulf.hansson@linaro.org>

There are no active users of these callbacks, thus there are no benefit
of trying to invoke them.

Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/pm-rmobile.c | 38 +++----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index 1fc05d9..f710235 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -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;
-- 
1.8.5.2

[GIT PULL] Second Round of Renesas ARM Based SoC Updates for v3.16

[Olof Johansson]

On Tue, Apr 29, 2014 at 11:15:38AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these second round of Renesas ARM based SoC updates for v3.16.
> 
> This pull request is based on the previous round of
> such requests, tagged as renesas-soc-for-v3.16,
> which I have already sent a pull-request for.
> 
> 
> The following changes since commit e35db38d66d1e4007cfc1bb90a05e11b4aaee2a8:
> 
>   ARM: shmobile: r8a7778/bockw: Move "select RENESAS_INTC_IRQPIN" under SoC (2014-04-14 11:28:43 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.16
> 
> for you to fetch changes up to ab496b9d259e754f5d646219e4f032b274b9fffe:
> 
>   ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data (2014-04-25 10:01:43 +0900)

Merged into next/soc. It's OK to keep it here, but pure removals like
these usually go in the cleanup branch. It can be tricky when there's
dependencies on new code though, which you might have had in this
case. Either way, no need to respin, etc.


-Olof

[GIT PULL] Second Round of Renesas ARM Based SoC Updates for v3.16

[Simon Horman]

On Mon, May 05, 2014 at 06:46:23PM -0700, Olof Johansson wrote:
> On Tue, Apr 29, 2014 at 11:15:38AM +0900, Simon Horman wrote:
> > Hi Olof, Hi Kevin, Hi Arnd,
> > 
> > Please consider these second round of Renesas ARM based SoC updates for v3.16.
> > 
> > This pull request is based on the previous round of
> > such requests, tagged as renesas-soc-for-v3.16,
> > which I have already sent a pull-request for.
> > 
> > 
> > The following changes since commit e35db38d66d1e4007cfc1bb90a05e11b4aaee2a8:
> > 
> >   ARM: shmobile: r8a7778/bockw: Move "select RENESAS_INTC_IRQPIN" under SoC (2014-04-14 11:28:43 +0900)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.16
> > 
> > for you to fetch changes up to ab496b9d259e754f5d646219e4f032b274b9fffe:
> > 
> >   ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data (2014-04-25 10:01:43 +0900)
> 
> Merged into next/soc. It's OK to keep it here, but pure removals like
> these usually go in the cleanup branch. It can be tricky when there's
> dependencies on new code though, which you might have had in this
> case. Either way, no need to respin, etc.

Thanks, noted.

In this case I think that there aren't any awkward dependencies.