bmips: switch to accepted upstream patch

This patch has been accepted and is going to be in linux v5.12.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/bmips/patches-5.10/040-v5.12-mips-bmips-init-clocks-earlier.patch b/target/linux/bmips/patches-5.10/040-v5.12-mips-bmips-init-clocks-earlier.patch
new file mode 100644 (file)
index 0000000..7b9d926
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/040-v5.12-mips-bmips-init-clocks-earlier.patch
@@ -0,0 +1,25 @@
+From faf3c25e51a7e91b69ea26da72c74a8786af7968 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Mon, 22 Feb 2021 21:33:50 +0100
+Subject: [PATCH] mips: bmips: init clocks earlier
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+device_initcall() is too late for bcm63xx.
+We need to call of_clk_init() earlier in order to properly boot.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+---
+ arch/mips/bmips/setup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/bmips/setup.c
++++ b/arch/mips/bmips/setup.c
+@@ -201,4 +201,4 @@ static int __init plat_dev_init(void)
+       return 0;
+ }
+ 
+-device_initcall(plat_dev_init);
++arch_initcall(plat_dev_init);

diff --git a/target/linux/bmips/patches-5.10/200-mips-bmips-init-clocks-earlier.patch b/target/linux/bmips/patches-5.10/200-mips-bmips-init-clocks-earlier.patch
deleted file mode 100644 (file)
index ba58bff..0000000
--- a/target/linux/bmips/patches-5.10/200-mips-bmips-init-clocks-earlier.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/arch/mips/bmips/setup.c
-+++ b/arch/mips/bmips/setup.c
-@@ -201,4 +201,4 @@ static int __init plat_dev_init(void)
-       return 0;
- }
- 
--device_initcall(plat_dev_init);
-+arch_initcall(plat_dev_init);