X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.10%2F418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch;h=6f913dd073cb5fe0bd5e539e7c71a30bbdeaeed8;hb=77e6583816bd5f52d58ee1b91a815784a6722648;hp=6f5b0cedc00695802e8883da8d89780f73ec0773;hpb=17ac1d523441c9d0c5cfbc612463db7a36e0c114;p=15.05%2Fopenwrt.git

diff --git a/target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch b/target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
index 6f5b0cedc0..6f913dd073 100644
--- a/target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
+++ b/target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
@@ -11,7 +11,7 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1018,7 +1018,7 @@ int __init board_register_devices(void)
+@@ -1036,7 +1036,7 @@ int __init board_register_devices(void)
  	if (board.num_spis)
  		spi_register_board_info(board.spis, board.num_spis);
  
@@ -46,8 +46,8 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
  };
  
  static struct spi_board_info bcm63xx_spi_flash_info[] = {
-@@ -154,10 +158,13 @@ static int __init bcm63xx_detect_flash_t
- 	return 0;
+@@ -189,9 +193,13 @@ void __init bcm63xx_flash_detect(void)
+ 	}
  }
  
 -int __init bcm63xx_flash_register(void)
@@ -55,12 +55,12 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
  {
  	u32 val;
 +	unsigned int i;
- 
++
 +	for (i = 0; i < num_caldata; i++)
 +		bcm63xx_parser_data.caldata[i] = caldata[i].caldata_offset;
  
- 	bcm63xx_detect_flash_type();
- 
+ 	switch (flash_type) {
+ 	case BCM63XX_FLASH_TYPE_PARALLEL:
 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
 @@ -1,6 +1,8 @@
@@ -72,11 +72,12 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
  enum {
  	BCM63XX_FLASH_TYPE_PARALLEL,
  	BCM63XX_FLASH_TYPE_SERIAL,
-@@ -9,6 +11,6 @@ enum {
+@@ -9,7 +11,7 @@ enum {
  
- extern int bcm63xx_attached_flash;
+ void bcm63xx_flash_detect(void);
  
 -int __init bcm63xx_flash_register(void);
 +int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata);
  
- #endif /* __BCM63XX_FLASH_H */
+ int bcm63xx_flash_get_type(void);
+