Accueil Explorer Aide
S'inscrire Connexion
wareck
/
openwrt-archive
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Branche: master
Branches Tags
openwrt-archive
/
target
/
linux
/
ixp4xx
/
patches-4.1
/
132-wrt300nv2_mac_fix.patch

132-wrt300nv2_mac_fix.patch 2.0 KB
Lien permanent Historique Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172 
  1. --- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
    2. 

  2. +++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
    3. 

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

  4.   *
    5. 

  5.   * Board setup for the Linksys WRT300N v2
    6. 

  6.   *
    7. 

  7. + * Copyright (C) 2010 Alexandros C. Couloumbis <alex@ozo.com>
    8. 

  8.   * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
    9. 

  9.   *
    10. 

  10.   * based on coyote-setup.c:
    11. 

  11. @@ -18,6 +19,7 @@
    12. 

  12.  #include <linux/tty.h>
    13. 

  13.  #include <linux/serial_8250.h>
    14. 

  14.  #include <linux/slab.h>
    15. 

  15. +#include <linux/etherdevice.h>
    16. 

  16.  
    17. 

  17.  #include <asm/types.h>
    18. 

  18.  #include <asm/setup.h>
    19. 

  19. @@ -79,7 +81,8 @@ static struct platform_device wrt300nv2_
    20. 

  20.  /* Built-in 10/100 Ethernet MAC interfaces */
    21. 

  21.  static struct eth_plat_info wrt300nv2_plat_eth[] = {
    22. 

  22.  	{
    23. 

  23. -		.phy		= -1,
    24. 

  24. +		.phy		= IXP4XX_ETH_PHY_MAX_ADDR,
    25. 

  25. +		.phy_mask	= 0x0F0000,
    26. 

  26.  		.rxq		= 3,
    27. 

  27.  		.txreadyq	= 20,
    28. 

  28.  	}, {
    29. 

  29. @@ -112,6 +115,10 @@ static struct platform_device *wrt300nv2
    30. 

  30.  
    31. 

  31.  static void __init wrt300nv2_init(void)
    32. 

  32.  {
    33. 

  33. +	uint8_t __iomem *f;
    34. 

  34. +	int offset = 0;
    35. 

  35. +	int i;
    36. 

  36. +
    37. 

  37.  	ixp4xx_sys_init();
    38. 

  38.  
    39. 

  39.  	wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
    40. 

  40. @@ -121,6 +128,32 @@ static void __init wrt300nv2_init(void)
    41. 

  41.  	*IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
    42. 

  42.  
    43. 

  43.  	platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices));
    44. 

  44. +
    45. 

  45. +	f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x60000);
    46. 

  46. +
    47. 

  47. +	if (f) {
    48. 

  48. +		for (i = 0; i < 6; i++) {
    49. 

  49. +#ifdef __ARMEB__
    50. 

  50. +			wrt300nv2_plat_eth[0].hwaddr[i] = readb(f + 0x5FFA0 + i);
    51. 

  51. +			if (i == 5)
    52. 

  52. +				offset = 1;
    53. 

  53. +			wrt300nv2_plat_eth[1].hwaddr[i] = (wrt300nv2_plat_eth[0].hwaddr[i] + offset);
    54. 

  54. +#else
    55. 

  55. +			wrt300nv2_plat_eth[0].hwaddr[i] = readb(f + 0x5FFA0 + (i^3));
    56. 

  56. +			if (i == 5)
    57. 

  57. +				offset = 1;
    58. 

  58. +			wrt300nv2_plat_eth[1].hwaddr[i] = (wrt300nv2_plat_eth[0].hwaddr[i] + offset);
    59. 

  59. +#endif
    60. 

  60. +		}
    61. 

  61. +		iounmap(f);
    62. 

  62. +	}
    63. 

  63. +
    64. 

  64. +	if (!(is_valid_ether_addr(wrt300nv2_plat_eth[0].hwaddr)))
    65. 

  65. +		random_ether_addr(wrt300nv2_plat_eth[0].hwaddr);
    66. 

  66. +	if (!(is_valid_ether_addr(wrt300nv2_plat_eth[1].hwaddr))) {
    67. 

  67. +		memcpy(wrt300nv2_plat_eth[1].hwaddr, wrt300nv2_plat_eth[0].hwaddr, ETH_ALEN);
    68. 

  68. +		wrt300nv2_plat_eth[1].hwaddr[5] = (wrt300nv2_plat_eth[0].hwaddr[5] + 1);
    69. 

  69. +	}
    70. 

  70.  }
    71. 

  71.  
    72. 

  72.  #ifdef CONFIG_MACH_WRT300NV2
    73.