[GIT PULL] SH Drivers Updates for v4.3

[GIT PULL] SH Drivers Updates for v4.3

[Simon Horman]

Hi Linus,

Please consider these SH drivers updates for v4.3.

I am sending this change after v4.3-rc1 has been released
as it depends on SoC changes which are present in that rc release.


The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:

  Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-drivers-for-v4.3

for you to fetch changes up to cbc41d0a761bffb3166a413a3c77100a737c0cd7:

  drivers: sh: Disable PM runtime for multi-platform ARM with genpd (2015-09-14 10:20:23 +0900)

----------------------------------------------------------------
SH Drivers Updates for v4.3

* Disable PM runtime for multi-platform ARM with genpd
* Disable legacy default PM Domain on emev2

----------------------------------------------------------------
Geert Uytterhoeven (2):
      drivers: sh: Disable legacy default PM Domain on emev2
      drivers: sh: Disable PM runtime for multi-platform ARM with genpd

 drivers/sh/pm_runtime.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

[PATCH 1/2] drivers: sh: Disable legacy default PM Domain on emev2

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

EMMA Mobile EV2 doesn't have MSTP clocks. All its device drivers manage
clocks explicitly, without relying on Runtime PM, so it doesn't need the
legacy default PM Domain.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 drivers/sh/pm_runtime.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
index d3d1891cda3c..ad9188138ed5 100644
--- a/drivers/sh/pm_runtime.c
+++ b/drivers/sh/pm_runtime.c
@@ -35,8 +35,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
 static int __init sh_pm_runtime_init(void)
 {
 	if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) {
-		if (!of_machine_is_compatible("renesas,emev2") &&
-		    !of_machine_is_compatible("renesas,r7s72100") &&
+		if (!of_machine_is_compatible("renesas,r7s72100") &&
 #ifndef CONFIG_PM_GENERIC_DOMAINS_OF
 		    !of_machine_is_compatible("renesas,r8a73a4") &&
 		    !of_machine_is_compatible("renesas,r8a7740") &&
-- 
2.1.4

[PATCH 2/2] drivers: sh: Disable PM runtime for multi-platform ARM with genpd

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

If the default PM Domain using PM_CLK is used for PM runtime, the real
Clock Domain cannot be registered from DT later.

Hence do not enable it when running a multi-platform kernel with genpd
support on R-Car or RZ.  The CPG/MSTP Clock Domain driver will take care
of PM runtime management of the module clocks.

Now most multi-platform ARM shmobile platforms (SH-Mobile, R-Mobile,
R-Car, RZ) use DT-based PM Domains to take care of PM runtime management
of the module clocks, simplify the platform logic by replacing the
explicit SoC checks by a single check for the presence of MSTP clocks in
DT.

Backwards-compatiblity with old DTs (mainly for R-Car Gen2) is provided
by checking for the presence of a "#power-domain-cells" property in DT.

The default PM Domain is still needed for:
  - backwards-compatibility with old DTs that lack PM Domain properties,
  - the CONFIG_PM=n case,
  - legacy (non-DT) ARM/shmobile platforms without genpd support
    (r8a7778, r8a7779),
  - legacy SuperH.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 drivers/sh/pm_runtime.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
index ad9188138ed5..25abd4eb7d10 100644
--- a/drivers/sh/pm_runtime.c
+++ b/drivers/sh/pm_runtime.c
@@ -35,19 +35,11 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
 static int __init sh_pm_runtime_init(void)
 {
 	if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) {
-		if (!of_machine_is_compatible("renesas,r7s72100") &&
-#ifndef CONFIG_PM_GENERIC_DOMAINS_OF
-		    !of_machine_is_compatible("renesas,r8a73a4") &&
-		    !of_machine_is_compatible("renesas,r8a7740") &&
-		    !of_machine_is_compatible("renesas,sh73a0") &&
-#endif
-		    !of_machine_is_compatible("renesas,r8a7778") &&
-		    !of_machine_is_compatible("renesas,r8a7779") &&
-		    !of_machine_is_compatible("renesas,r8a7790") &&
-		    !of_machine_is_compatible("renesas,r8a7791") &&
-		    !of_machine_is_compatible("renesas,r8a7792") &&
-		    !of_machine_is_compatible("renesas,r8a7793") &&
-		    !of_machine_is_compatible("renesas,r8a7794"))
+		if (!of_find_compatible_node(NULL, NULL,
+					     "renesas,cpg-mstp-clocks"))
+			return 0;
+		if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS_OF) &&
+		    of_find_node_with_property(NULL, "#power-domain-cells"))
 			return 0;
 	}
 
-- 
2.1.4

Re: [GIT PULL] SH Drivers Updates for v4.3

[Linus Torvalds]

On Thu, Sep 17, 2015 at 2:00 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
>
> Please consider these SH drivers updates for v4.3.

Hmm. This was caught as spam by google, along with the two patches you
sent separately.

I'm not quite sure why. There's nothing obviously bad in the headers,
which makes me suspect it's that your ISP is known as a spam source,
so the IP range it comes in from looks bad. Or something similar.

It might help to do SPF records or similar.

                       Linus

Re: [GIT PULL] SH Drivers Updates for v4.3

[Simon Horman]

On Mon, Sep 21, 2015 at 12:19:03PM -0700, Linus Torvalds wrote:
> On Thu, Sep 17, 2015 at 2:00 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> >
> > Please consider these SH drivers updates for v4.3.
> 
> Hmm. This was caught as spam by google, along with the two patches you
> sent separately.
> 
> I'm not quite sure why. There's nothing obviously bad in the headers,
> which makes me suspect it's that your ISP is known as a spam source,
> so the IP range it comes in from looks bad. Or something similar.
> 
> It might help to do SPF records or similar.

Thanks, I will investigate.