[PATCH 1/2] clk: samsung: exynos5440: move restart code into clock driver

Pankaj Dubey pankaj.dubey at samsung.com
Tue Sep 30 22:48:59 PDT 2014


Let's register reboot_notifier for Exynos5440 from it's clock driver
for reboot functionality. So that we can cleanup restart hooks from
machine specific file.

CC: Sylwester Nawrocki <s.nawrocki at samsung.com>
CC: Mike Turquette <mturquette at linaro.org>
Signed-off-by: Pankaj Dubey <pankaj.dubey at samsung.com>
---
 arch/arm/mach-exynos/exynos.c        |   13 ------------
 drivers/clk/samsung/clk-exynos5440.c |   37 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 2f2f7b2..d56134a 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -143,19 +143,6 @@ static void exynos_restart(enum reboot_mode mode, const char *cmd)
 	u32 val = 0x1;
 	void __iomem *addr = pmu_base_addr + EXYNOS_SWRESET;
 
-	if (of_machine_is_compatible("samsung,exynos5440")) {
-		u32 status;
-		np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock");
-
-		addr = of_iomap(np, 0) + 0xbc;
-		status = __raw_readl(addr);
-
-		addr = of_iomap(np, 0) + 0xcc;
-		val = __raw_readl(addr);
-
-		val = (val & 0xffff0000) | (status & 0xffff);
-	}
-
 	__raw_writel(val, addr);
 }
 
diff --git a/drivers/clk/samsung/clk-exynos5440.c b/drivers/clk/samsung/clk-exynos5440.c
index 00d1d00..171d3af 100644
--- a/drivers/clk/samsung/clk-exynos5440.c
+++ b/drivers/clk/samsung/clk-exynos5440.c
@@ -15,6 +15,8 @@
 #include <linux/clk-provider.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
 
 #include "clk.h"
 #include "clk-pll.h"
@@ -89,6 +91,38 @@ static const struct of_device_id ext_clk_match[] __initconst = {
 	{},
 };
 
+static int exynos5440_clk_reboot_notify_handler(struct notifier_block *this,
+		unsigned long code, void *unused)
+{
+	if (code == SYS_RESTART) {
+		struct device_node *np;
+		void __iomem *addr;
+		u32 val, status;
+
+		np = of_find_compatible_node(NULL, NULL,
+				"samsung,exynos5440-clock");
+
+		addr = of_iomap(np, 0) + 0xbc;
+		status = readl_relaxed(addr);
+
+		addr = of_iomap(np, 0) + 0xcc;
+		val = readl_relaxed(addr);
+
+		val = (val & 0xffff0000) | (status & 0xffff);
+
+		writel_relaxed(val, addr);
+	}
+	return NOTIFY_DONE;
+}
+
+/*
+ * Exynos5440 Clock reboot notifier, handles reboot functionality
+ */
+static struct notifier_block exynos5440_clk_reboot_notifier = {
+	.notifier_call = exynos5440_clk_reboot_notify_handler,
+	.priority = 128,
+};
+
 /* register exynos5440 clocks */
 static void __init exynos5440_clk_init(struct device_node *np)
 {
@@ -125,6 +159,9 @@ static void __init exynos5440_clk_init(struct device_node *np)
 
 	samsung_clk_of_add_provider(np, ctx);
 
+	if (register_reboot_notifier(&exynos5440_clk_reboot_notifier))
+		pr_err("exynos5440 clock can't register reboot notifier\n");
+
 	pr_info("Exynos5440: arm_clk = %ldHz\n", _get_rate("arm_clk"));
 	pr_info("exynos5440 clock initialization complete\n");
 }
-- 
1.7.9.5




More information about the linux-arm-kernel mailing list