drivers: sh: Restore legacy clock domain on SuperH platforms

geertu · horms · commit 0378ba4899d5 · 2016-02-25T09:05:19.000+09:00
CONFIG_ARCH_SHMOBILE is not only enabled for Renesas ARM platforms (which are DT based and multi-platform), but also on a select set of Renesas SuperH platforms (SH7722/SH7723/SH7724/SH7343/SH7366). Hence since commit 0ba58de ("drivers: sh: Get rid of CONFIG_ARCH_SHMOBILE_MULTI"), the legacy clock domain is no longer installed on these SuperH platforms, and module clocks may not be enabled when needed, leading to driver failures. To fix this, add an additional check for CONFIG_OF. Fixes: 0ba58de ("drivers: sh: Get rid of CONFIG_ARCH_SHMOBILE_MULTI"). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
@@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
 
 static int __init sh_pm_runtime_init(void)
 {
-	if (IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {
+	if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {
 		if (!of_find_compatible_node(NULL, NULL,
 					     "renesas,cpg-mstp-clocks"))
 			return 0;

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = {`
`34`	`34`
`35`	`35`	`static int __init sh_pm_runtime_init(void)`
`36`	`36`	`{`
`37`		`- if (IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {`
	`37`	`+ if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {`
`38`	`38`	`if (!of_find_compatible_node(NULL, NULL,`
`39`	`39`	`"renesas,cpg-mstp-clocks"))`
`40`	`40`	`return 0;`