2015-12-10 19:06:32 +00:00
|
|
|
From d3c1e72c755cf67427b5d410039a096520d6537f Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: John Crispin <blogic@openwrt.org>
|
|
|
|
|
Date: Mon, 7 Dec 2015 17:19:55 +0100
|
|
|
|
|
Subject: [PATCH 18/53] arch: mips: ralink: reset pci prior to reboot
|
|
|
|
|
|
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
|
|
|
---
|
|
|
|
|
arch/mips/ralink/reset.c | 12 ++++++++++--
|
|
|
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
|
|
2015-02-09 12:13:55 +00:00
|
|
|
--- a/arch/mips/ralink/reset.c
|
|
|
|
|
+++ b/arch/mips/ralink/reset.c
|
|
|
|
|
@@ -11,6 +11,7 @@
|
|
|
|
|
#include <linux/pm.h>
|
|
|
|
|
#include <linux/io.h>
|
|
|
|
|
#include <linux/of.h>
|
|
|
|
|
+#include <linux/delay.h>
|
|
|
|
|
#include <linux/reset-controller.h>
|
|
|
|
|
|
|
|
|
|
#include <asm/reboot.h>
|
|
|
|
|
@@ -18,8 +19,10 @@
|
|
|
|
|
#include <asm/mach-ralink/ralink_regs.h>
|
|
|
|
|
|
|
|
|
|
/* Reset Control */
|
|
|
|
|
-#define SYSC_REG_RESET_CTRL 0x034
|
|
|
|
|
-#define RSTCTL_RESET_SYSTEM BIT(0)
|
|
|
|
|
+#define SYSC_REG_RESET_CTRL 0x034
|
|
|
|
|
+
|
|
|
|
|
+#define RSTCTL_RESET_PCI BIT(26)
|
|
|
|
|
+#define RSTCTL_RESET_SYSTEM BIT(0)
|
|
|
|
|
|
|
|
|
|
static int ralink_assert_device(struct reset_controller_dev *rcdev,
|
|
|
|
|
unsigned long id)
|
|
|
|
|
@@ -83,6 +86,11 @@ void ralink_rst_init(void)
|
|
|
|
|
|
|
|
|
|
static void ralink_restart(char *command)
|
|
|
|
|
{
|
|
|
|
|
+ if (IS_ENABLED(CONFIG_PCI)) {
|
|
|
|
|
+ rt_sysc_m32(0, RSTCTL_RESET_PCI, SYSC_REG_RESET_CTRL);
|
|
|
|
|
+ mdelay(50);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
local_irq_disable();
|
|
|
|
|
rt_sysc_w32(RSTCTL_RESET_SYSTEM, SYSC_REG_RESET_CTRL);
|
|
|
|
|
unreachable();
|
