From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 5 Aug 2012 12:39:15 +0000 (+0000)
Subject: brcm47xx: fix patch which moves the flash struct in wgt634u code
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1d40a652eef5f54bbdd52cbbd52b95b3b3fe37b9;p=openwrt%2Fstaging%2Fyousong.git

brcm47xx: fix patch which moves the flash struct in wgt634u code

SVN-Revision: 33000
---

diff --git a/target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch b/target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch
index 400de8988c..12055bff03 100644
--- a/target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch
+++ b/target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch
@@ -24,7 +24,24 @@
  #ifdef CONFIG_BCM47XX_BCMA
 --- a/arch/mips/bcm47xx/wgt634u.c
 +++ b/arch/mips/bcm47xx/wgt634u.c
-@@ -156,10 +156,10 @@ static int __init wgt634u_init(void)
+@@ -142,24 +142,24 @@ static int __init wgt634u_init(void)
+ 	if (et0mac[0] == 0x00 &&
+ 	    ((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
+ 	     (et0mac[1] == 0x0f && et0mac[2] == 0xb5))) {
+-		struct ssb_mipscore *mcore = &bcm47xx_bus.ssb.mipscore;
++		struct ssb_chipcommon *ccore = &bcm47xx_bus.ssb.chipco;
+ 
+ 		printk(KERN_INFO "WGT634U machine detected.\n");
+ 
+ 		if (!request_irq(gpio_to_irq(WGT634U_GPIO_RESET),
+ 				 gpio_interrupt, IRQF_SHARED,
+-				 "WGT634U GPIO", &bcm47xx_bus.ssb.chipco)) {
++				 "WGT634U GPIO", ccore)) {
+ 			gpio_direction_input(WGT634U_GPIO_RESET);
+ 			gpio_intmask(WGT634U_GPIO_RESET, 1);
+-			ssb_chipco_irq_mask(&bcm47xx_bus.ssb.chipco,
++			ssb_chipco_irq_mask(ccore,
+ 					    SSB_CHIPCO_IRQ_GPIO,
  					    SSB_CHIPCO_IRQ_GPIO);
  		}
  
@@ -32,10 +49,10 @@
 -		wgt634u_flash_resource.start = mcore->flash_window;
 -		wgt634u_flash_resource.end = mcore->flash_window
 -					   + mcore->flash_window_size
-+		wgt634u_flash_data.width = mcore->pflash.buswidth;
-+		wgt634u_flash_resource.start = mcore->pflash.window;
-+		wgt634u_flash_resource.end = mcore->pflash.window
-+					   + mcore->pflash.window_size
++		wgt634u_flash_data.width = ccore->pflash.buswidth;
++		wgt634u_flash_resource.start = ccore->pflash.window;
++		wgt634u_flash_resource.end = ccore->pflash.window
++					   + ccore->pflash.window_size
  					   - 1;
  		return platform_add_devices(wgt634u_devices,
  					    ARRAY_SIZE(wgt634u_devices));
diff --git a/target/linux/brcm47xx/patches-3.3/812-disable_wgt634u_crap.patch b/target/linux/brcm47xx/patches-3.3/812-disable_wgt634u_crap.patch
index 6b44254017..e675c5309e 100644
--- a/target/linux/brcm47xx/patches-3.3/812-disable_wgt634u_crap.patch
+++ b/target/linux/brcm47xx/patches-3.3/812-disable_wgt634u_crap.patch
@@ -153,7 +153,7 @@
 -	if (et0mac[0] == 0x00 &&
 -	    ((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
 -	     (et0mac[1] == 0x0f && et0mac[2] == 0xb5))) {
--		struct ssb_mipscore *mcore = &bcm47xx_bus.ssb.mipscore;
+-		struct ssb_chipcommon *ccore = &bcm47xx_bus.ssb.chipco;
 -
 -		printk(KERN_INFO "WGT634U machine detected.\n");
 -
@@ -165,18 +165,18 @@
 -
 -		if (!request_irq(gpio_to_irq(WGT634U_GPIO_RESET),
 -				 gpio_interrupt, IRQF_SHARED,
--				 "WGT634U GPIO", &bcm47xx_bus.ssb.chipco)) {
+-				 "WGT634U GPIO", ccore)) {
 -			gpio_direction_input(WGT634U_GPIO_RESET);
 -			gpio_intmask(WGT634U_GPIO_RESET, 1);
--			ssb_chipco_irq_mask(&bcm47xx_bus.ssb.chipco,
+-			ssb_chipco_irq_mask(ccore,
 -					    SSB_CHIPCO_IRQ_GPIO,
 -					    SSB_CHIPCO_IRQ_GPIO);
 -		}
 -
--		wgt634u_flash_data.width = mcore->pflash.buswidth;
--		wgt634u_flash_resource.start = mcore->pflash.window;
--		wgt634u_flash_resource.end = mcore->pflash.window
--					   + mcore->pflash.window_size
+-		wgt634u_flash_data.width = ccore->pflash.buswidth;
+-		wgt634u_flash_resource.start = ccore->pflash.window;
+-		wgt634u_flash_resource.end = ccore->pflash.window
+-					   + ccore->pflash.window_size
 -					   - 1;
 -		return platform_add_devices(wgt634u_devices,
 -					    ARRAY_SIZE(wgt634u_devices));