generic: 6.6: add backported bmips CBR patches
Move v6.11 backported bmips CBR patches from bmips target to generic. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
		@@ -1,14 +1,14 @@
 | 
			
		||||
--- a/arch/mips/bcm47xx/setup.c
 | 
			
		||||
+++ b/arch/mips/bcm47xx/setup.c
 | 
			
		||||
@@ -37,6 +37,7 @@
 | 
			
		||||
 #include <linux/ssb/ssb.h>
 | 
			
		||||
@@ -38,6 +38,7 @@
 | 
			
		||||
 #include <linux/ssb/ssb_embedded.h>
 | 
			
		||||
 #include <linux/bcma/bcma_soc.h>
 | 
			
		||||
 #include <asm/bmips.h>
 | 
			
		||||
+#include <linux/old_gpio_wdt.h>
 | 
			
		||||
 #include <asm/bootinfo.h>
 | 
			
		||||
 #include <asm/idle.h>
 | 
			
		||||
 #include <asm/prom.h>
 | 
			
		||||
@@ -254,6 +255,33 @@ static struct fixed_phy_status bcm47xx_f
 | 
			
		||||
@@ -262,6 +263,33 @@ static struct fixed_phy_status bcm47xx_f
 | 
			
		||||
 	.duplex	= DUPLEX_FULL,
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
@@ -42,7 +42,7 @@
 | 
			
		||||
 static int __init bcm47xx_register_bus_complete(void)
 | 
			
		||||
 {
 | 
			
		||||
 	switch (bcm47xx_bus_type) {
 | 
			
		||||
@@ -275,6 +303,7 @@ static int __init bcm47xx_register_bus_c
 | 
			
		||||
@@ -283,6 +311,7 @@ static int __init bcm47xx_register_bus_c
 | 
			
		||||
 	bcm47xx_workarounds();
 | 
			
		||||
 
 | 
			
		||||
 	fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user