X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fmach-uniphier%2Freset.c;h=31685d00094015ae14db436be0ec7590acd58108;hb=62d620c243ead4e34de5ab8c0c2ea215f9972109;hp=005fbcf0b8ef8bfd264ad751f0c5231f725c0447;hpb=a86ac9540e20c8e1d84342306b7dc1126222bae7;p=oweals%2Fu-boot.git

diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c
index 005fbcf0b8..31685d0009 100644
--- a/arch/arm/mach-uniphier/reset.c
+++ b/arch/arm/mach-uniphier/reset.c
@@ -1,26 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
 #include <common.h>
-#include <asm/io.h>
-#include <mach/sc-regs.h>
+#include <linux/io.h>
+#include <asm/secure.h>
 
-void reset_cpu(unsigned long ignored)
+#include "sc-regs.h"
+
+/* If PSCI is enabled, this is used for SYSTEM_RESET function */
+#ifdef CONFIG_ARMV7_PSCI
+#define __SECURE	__secure
+#else
+#define __SECURE
+#endif
+
+void __SECURE reset_cpu(unsigned long ignored)
 {
 	u32 tmp;
 
-	writel(5, SC_IRQTIMSET); /* default value */
+	writel(5, sc_base + SC_IRQTIMSET); /* default value */
 
-	tmp  = readl(SC_SLFRSTSEL);
+	tmp  = readl(sc_base + SC_SLFRSTSEL);
 	tmp &= ~0x3; /* mask [1:0] */
 	tmp |= 0x0;  /* XRST reboot */
-	writel(tmp, SC_SLFRSTSEL);
+	writel(tmp, sc_base + SC_SLFRSTSEL);
 
-	tmp = readl(SC_SLFRSTCTL);
+	tmp = readl(sc_base + SC_SLFRSTCTL);
 	tmp |= 0x1;
-	writel(tmp, SC_SLFRSTCTL);
+	writel(tmp, sc_base + SC_SLFRSTCTL);
 }