506cf51b53
sorry, forgot to make target/update before commiting the last patch Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 43374
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
Index: linux-3.14.18/arch/mips/ralink/reset.c
|
|
===================================================================
|
|
--- linux-3.14.18.orig/arch/mips/ralink/reset.c 2014-11-23 00:32:23.268612766 +0100
|
|
+++ linux-3.14.18/arch/mips/ralink/reset.c 2014-11-23 02:55:41.492326840 +0100
|
|
@@ -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 @@
|
|
|
|
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();
|