brcm63xx: rename switch core reset patch to 0xx as it has been accepted

The core reset fix was accepted upstream, so move it to its right place.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

diff --git a/target/linux/brcm63xx/patches-4.14/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch b/target/linux/brcm63xx/patches-4.14/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch
new file mode 100644 (file)
index 0000000..3914865
--- /dev/null
+++ b/target/linux/brcm63xx/patches-4.14/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch
@@ -0,0 +1,26 @@
+From f1af8bb8e0879a3c2d9679a7274c2774335e9876 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Wed, 14 Nov 2018 12:06:41 +0100
+Subject: [PATCH] MIPS: BCM63XX: fix switch core reset on BCM6368
+
+The Ethernet Switch core mask was set to 0, causing the switch core to
+be not reset on BCM6368 on boot. Provide the proper mask so the switch
+core gets reset to a known good state.
+
+Fixes: 799faa626c71 ("MIPS: BCM63XX: add core reset helper")
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/reset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/bcm63xx/reset.c
++++ b/arch/mips/bcm63xx/reset.c
+@@ -120,7 +120,7 @@
+ #define BCM6368_RESET_DSL     0
+ #define BCM6368_RESET_SAR     SOFTRESET_6368_SAR_MASK
+ #define BCM6368_RESET_EPHY    SOFTRESET_6368_EPHY_MASK
+-#define BCM6368_RESET_ENETSW  0
++#define BCM6368_RESET_ENETSW  SOFTRESET_6368_ENETSW_MASK
+ #define BCM6368_RESET_PCM     SOFTRESET_6368_PCM_MASK
+ #define BCM6368_RESET_MPI     SOFTRESET_6368_MPI_MASK
+ #define BCM6368_RESET_PCIE    0

diff --git a/target/linux/brcm63xx/patches-4.14/150-MIPS-BCM63XX-fix-switch-core-reset-on-BCM6368.patch b/target/linux/brcm63xx/patches-4.14/150-MIPS-BCM63XX-fix-switch-core-reset-on-BCM6368.patch
deleted file mode 100644 (file)
index 3914865..0000000
--- a/target/linux/brcm63xx/patches-4.14/150-MIPS-BCM63XX-fix-switch-core-reset-on-BCM6368.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f1af8bb8e0879a3c2d9679a7274c2774335e9876 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Wed, 14 Nov 2018 12:06:41 +0100
-Subject: [PATCH] MIPS: BCM63XX: fix switch core reset on BCM6368
-
-The Ethernet Switch core mask was set to 0, causing the switch core to
-be not reset on BCM6368 on boot. Provide the proper mask so the switch
-core gets reset to a known good state.
-
-Fixes: 799faa626c71 ("MIPS: BCM63XX: add core reset helper")
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- arch/mips/bcm63xx/reset.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/bcm63xx/reset.c
-+++ b/arch/mips/bcm63xx/reset.c
-@@ -120,7 +120,7 @@
- #define BCM6368_RESET_DSL     0
- #define BCM6368_RESET_SAR     SOFTRESET_6368_SAR_MASK
- #define BCM6368_RESET_EPHY    SOFTRESET_6368_EPHY_MASK
--#define BCM6368_RESET_ENETSW  0
-+#define BCM6368_RESET_ENETSW  SOFTRESET_6368_ENETSW_MASK
- #define BCM6368_RESET_PCM     SOFTRESET_6368_PCM_MASK
- #define BCM6368_RESET_MPI     SOFTRESET_6368_MPI_MASK
- #define BCM6368_RESET_PCIE    0

diff --git a/target/linux/brcm63xx/patches-4.9/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch b/target/linux/brcm63xx/patches-4.9/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch
new file mode 100644 (file)
index 0000000..307ac7b
--- /dev/null
+++ b/target/linux/brcm63xx/patches-4.9/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch
@@ -0,0 +1,26 @@
+From f1af8bb8e0879a3c2d9679a7274c2774335e9876 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Wed, 14 Nov 2018 12:06:41 +0100
+Subject: [PATCH] MIPS: BCM63XX: fix switch core reset on BCM6368
+
+The Ethernet Switch core mask was set to 0, causing the switch core to
+be not reset on BCM6368 on boot. Provide the proper mask so the switch
+core gets reset to a known good state.
+
+Fixes: 799faa626c71 ("MIPS: BCM63XX: add core reset helper")
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/reset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/bcm63xx/reset.c
++++ b/arch/mips/bcm63xx/reset.c
+@@ -119,7 +119,7 @@
+ #define BCM6368_RESET_DSL     0
+ #define BCM6368_RESET_SAR     SOFTRESET_6368_SAR_MASK
+ #define BCM6368_RESET_EPHY    SOFTRESET_6368_EPHY_MASK
+-#define BCM6368_RESET_ENETSW  0
++#define BCM6368_RESET_ENETSW  SOFTRESET_6368_ENETSW_MASK
+ #define BCM6368_RESET_PCM     SOFTRESET_6368_PCM_MASK
+ #define BCM6368_RESET_MPI     SOFTRESET_6368_MPI_MASK
+ #define BCM6368_RESET_PCIE    0

diff --git a/target/linux/brcm63xx/patches-4.9/150-MIPS-BCM63XX-fix-switch-core-reset-on-BCM6368.patch b/target/linux/brcm63xx/patches-4.9/150-MIPS-BCM63XX-fix-switch-core-reset-on-BCM6368.patch
deleted file mode 100644 (file)
index 307ac7b..0000000
--- a/target/linux/brcm63xx/patches-4.9/150-MIPS-BCM63XX-fix-switch-core-reset-on-BCM6368.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f1af8bb8e0879a3c2d9679a7274c2774335e9876 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Wed, 14 Nov 2018 12:06:41 +0100
-Subject: [PATCH] MIPS: BCM63XX: fix switch core reset on BCM6368
-
-The Ethernet Switch core mask was set to 0, causing the switch core to
-be not reset on BCM6368 on boot. Provide the proper mask so the switch
-core gets reset to a known good state.
-
-Fixes: 799faa626c71 ("MIPS: BCM63XX: add core reset helper")
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- arch/mips/bcm63xx/reset.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/bcm63xx/reset.c
-+++ b/arch/mips/bcm63xx/reset.c
-@@ -119,7 +119,7 @@
- #define BCM6368_RESET_DSL     0
- #define BCM6368_RESET_SAR     SOFTRESET_6368_SAR_MASK
- #define BCM6368_RESET_EPHY    SOFTRESET_6368_EPHY_MASK
--#define BCM6368_RESET_ENETSW  0
-+#define BCM6368_RESET_ENETSW  SOFTRESET_6368_ENETSW_MASK
- #define BCM6368_RESET_PCM     SOFTRESET_6368_PCM_MASK
- #define BCM6368_RESET_MPI     SOFTRESET_6368_MPI_MASK
- #define BCM6368_RESET_PCIE    0