Home Explore Help
Sign In
ldpinney
/
GnuBee-libreCMC
forked from libreCMC/libreCMC
2
0
Fork 2
Files
Tree: 59c0bfa820
Branches Tags
GnuBee-libreCMC
/
target
/
linux
/
ar71xx
/
patches-4.4
/
501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch

501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch 2.1 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970 
  1. --- a/arch/mips/ath79/dev-wmac.c
    2. 

  2. +++ b/arch/mips/ath79/dev-wmac.c
    3. 

  3. @@ -15,6 +15,7 @@
    4. 

  4.  #include <linux/init.h>
    5. 

  5.  #include <linux/delay.h>
    6. 

  6.  #include <linux/irq.h>
    7. 

  7. +#include <linux/etherdevice.h>
    8. 

  8.  #include <linux/platform_device.h>
    9. 

  9.  #include <linux/ath9k_platform.h>
    10. 

  10.  
    11. 

  11. @@ -22,6 +23,7 @@
    12. 

  12.  #include <asm/mach-ath79/ar71xx_regs.h>
    13. 

  13.  #include "dev-wmac.h"
    14. 

  14.  
    15. 

  15. +static u8 ath79_wmac_mac[ETH_ALEN];
    16. 

  16.  static struct ath9k_platform_data ath79_wmac_data;
    17. 

  17.  
    18. 

  18.  static struct resource ath79_wmac_resources[] = {
    19. 

  19. @@ -162,7 +164,7 @@ static void qca955x_wmac_setup(void)
    20. 

  20.  		ath79_wmac_data.is_clk_25mhz = true;
    21. 

  21.  }
    22. 

  22.  
    23. 

  23. -void __init ath79_register_wmac(u8 *cal_data)
    24. 

  24. +void __init ath79_register_wmac(u8 *cal_data, u8 *mac_addr)
    25. 

  25.  {
    26. 

  26.  	if (soc_is_ar913x())
    27. 

  27.  		ar913x_wmac_setup();
    28. 

  28. @@ -179,5 +181,10 @@ void __init ath79_register_wmac(u8 *cal_
    29. 

  29.  		memcpy(ath79_wmac_data.eeprom_data, cal_data,
    30. 

  30.  		       sizeof(ath79_wmac_data.eeprom_data));
    31. 

  31.  
    32. 

  32. +	if (mac_addr) {
    33. 

  33. +		memcpy(ath79_wmac_mac, mac_addr, sizeof(ath79_wmac_mac));
    34. 

  34. +		ath79_wmac_data.macaddr = ath79_wmac_mac;
    35. 

  35. +	}
    36. 

  36. +
    37. 

  37.  	platform_device_register(&ath79_wmac_device);
    38. 

  38.  }
    39. 

  39. --- a/arch/mips/ath79/dev-wmac.h
    40. 

  40. +++ b/arch/mips/ath79/dev-wmac.h
    41. 

  41. @@ -12,6 +12,6 @@
    42. 

  42.  #ifndef _ATH79_DEV_WMAC_H
    43. 

  43.  #define _ATH79_DEV_WMAC_H
    44. 

  44.  
    45. 

  45. -void ath79_register_wmac(u8 *cal_data);
    46. 

  46. +void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
    47. 

  47.  
    48. 

  48.  #endif /* _ATH79_DEV_WMAC_H */
    49. 

  49. --- a/arch/mips/ath79/mach-db120.c
    50. 

  50. +++ b/arch/mips/ath79/mach-db120.c
    51. 

  51. @@ -128,7 +128,7 @@ static void __init db120_setup(void)
    52. 

  52.  	ath79_register_spi(&db120_spi_data, db120_spi_info,
    53. 

  53.  			   ARRAY_SIZE(db120_spi_info));
    54. 

  54.  	ath79_register_usb();
    55. 

  55. -	ath79_register_wmac(art + DB120_WMAC_CALDATA_OFFSET);
    56. 

  56. +	ath79_register_wmac(art + DB120_WMAC_CALDATA_OFFSET, NULL);
    57. 

  57.  	db120_pci_init(art + DB120_PCIE_CALDATA_OFFSET);
    58. 

  58.  }
    59. 

  59.  
    60. 

  60. --- a/arch/mips/ath79/mach-ap121.c
    61. 

  61. +++ b/arch/mips/ath79/mach-ap121.c
    62. 

  62. @@ -85,7 +85,7 @@ static void __init ap121_setup(void)
    63. 

  63.  	ath79_register_spi(&ap121_spi_data, ap121_spi_info,
    64. 

  64.  			   ARRAY_SIZE(ap121_spi_info));
    65. 

  65.  	ath79_register_usb();
    66. 

  66. -	ath79_register_wmac(cal_data);
    67. 

  67. +	ath79_register_wmac(cal_data, NULL);
    68. 

  68.  }
    69. 

  69.  
    70. 

  70.  MIPS_MACHINE(ATH79_MACH_AP121, "AP121", "Atheros AP121 reference board",
    71.