[PATCH] clk: nomadik: fix multiplatform problem

* [PATCH] clk: nomadik: fix multiplatform problem
@ 2014-01-21  8:06 Linus Walleij
  2014-01-21 10:52 ` Andrew Lunn
  2014-01-29  8:07 ` Linus Walleij
  0 siblings, 2 replies; 5+ messages in thread
From: Linus Walleij @ 2014-01-21  8:06 UTC (permalink / raw)
  To: linux-arm-kernel

The Nomadik debugfs screws up multiplatform boots if debugfs
is enabled on the multiplatform image, since it's a simple
initcall that is unconditionally executed and reads from certain
memory locations.

Fix this by checking that the driver has been properly
initialized, so a base offset to the Nomadik SRC controller
exists, before proceeding to register debugfs files.

Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/clk/clk-nomadik.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c
index 6a934a5296bd..05e04ce0f148 100644
--- a/drivers/clk/clk-nomadik.c
+++ b/drivers/clk/clk-nomadik.c
@@ -494,6 +494,9 @@ static const struct file_operations nomadik_src_clk_debugfs_ops = {
 
 static int __init nomadik_src_clk_init_debugfs(void)
 {
+	/* Vital for multiplatform */
+	if (!src_base)
+		return -ENODEV;
 	src_pcksr0_boot = readl(src_base + SRC_PCKSR0);
 	src_pcksr1_boot = readl(src_base + SRC_PCKSR1);
 	debugfs_create_file("nomadik-src-clk", S_IFREG | S_IRUGO,
-- 
1.8.4.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread