diff options
author | John Crispin <john@openwrt.org> | 2015-12-10 19:06:32 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2015-12-10 19:06:32 +0000 |
commit | 6df4426245be87148d6aa75859951cb6351eb24c (patch) | |
tree | 57a361566f8a505f89b685125d9ab36bba289e19 /target/linux/ramips/patches-3.18/0070-pci-reset.patch | |
parent | f2b0ae86983705c98a50ae845403e67c9c412f4d (diff) | |
download | upstream-6df4426245be87148d6aa75859951cb6351eb24c.tar.gz upstream-6df4426245be87148d6aa75859951cb6351eb24c.tar.bz2 upstream-6df4426245be87148d6aa75859951cb6351eb24c.zip |
ralink: bump to the target to v4.3
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 47831
Diffstat (limited to 'target/linux/ramips/patches-3.18/0070-pci-reset.patch')
-rw-r--r-- | target/linux/ramips/patches-3.18/0070-pci-reset.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/target/linux/ramips/patches-3.18/0070-pci-reset.patch b/target/linux/ramips/patches-3.18/0070-pci-reset.patch deleted file mode 100644 index 6055731822..0000000000 --- a/target/linux/ramips/patches-3.18/0070-pci-reset.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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(); |