Halaman utama Jelajahi Bantuan
Masuk
RISCI_ATOM
/
libreCMC-next
ter-fork dari libreCMC/libreCMC
1
0
Fork 0
Berkas
Pohon: aaeecaa038
Ranting Tag
libreCMC-next
/
target
/
linux
/
ar7
/
patches-4.9
/
950-cpmac_titan.patch

950-cpmac_titan.patch 1.4 KB
Riwayat Mentahan

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 
  1. --- a/drivers/net/ethernet/ti/cpmac.c
    2. 

  2. +++ b/drivers/net/ethernet/ti/cpmac.c
    3. 

  3. @@ -1124,6 +1124,8 @@ static int cpmac_probe(struct platform_d
    4. 

  4.  		goto fail;
    5. 

  5.  	}
    6. 

  6.  
    7. 

  7. +	ar7_device_reset(pdata->reset_bit);
    8. 

  8. +
    9. 

  9.  	dev->irq = platform_get_irq_byname(pdev, "irq");
    10. 

  10.  
    11. 

  11.  	dev->netdev_ops = &cpmac_netdev_ops;
    12. 

  12. @@ -1203,7 +1205,7 @@ int cpmac_init(void)
    13. 

  13.  	cpmac_mii->write = cpmac_mdio_write;
    14. 

  14.  	cpmac_mii->reset = cpmac_mdio_reset;
    15. 

  15.  
    16. 

  16. -	cpmac_mii->priv = ioremap(AR7_REGS_MDIO, 256);
    17. 

  17. +	cpmac_mii->priv = ioremap(ar7_is_titan() ? TITAN_REGS_MDIO : AR7_REGS_MDIO, 256);
    18. 

  18.  
    19. 

  19.  	if (!cpmac_mii->priv) {
    20. 

  20.  		pr_err("Can't ioremap mdio registers\n");
    21. 

  21. @@ -1214,10 +1216,16 @@ int cpmac_init(void)
    22. 

  22.  	/* FIXME: unhardcode gpio&reset bits */
    23. 

  23.  	ar7_gpio_disable(26);
    24. 

  24.  	ar7_gpio_disable(27);
    25. 

  25. -	ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
    26. 

  26. -	ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
    27. 

  27. +
    28. 

  28. +	if (!ar7_is_titan()) {
    29. 

  29. +		ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
    30. 

  30. +		ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
    31. 

  31. +	}
    32. 

  32.  	ar7_device_reset(AR7_RESET_BIT_EPHY);
    33. 

  33.  
    34. 

  34. +	if (ar7_is_titan())
    35. 

  35. +		ar7_device_reset(TITAN_RESET_BIT_EPHY1);
    36. 

  36. +
    37. 

  37.  	cpmac_mii->reset(cpmac_mii);
    38. 

  38.  
    39. 

  39.  	for (i = 0; i < 300; i++) {
    40. 

  40. @@ -1234,7 +1242,11 @@ int cpmac_init(void)
    41. 

  41.  		mask = 0;
    42. 

  42.  	}
    43. 

  43.  
    44. 

  44. -	cpmac_mii->phy_mask = ~(mask | 0x80000000);
    45. 

  45. +	if (ar7_is_titan())
    46. 

  46. +		cpmac_mii->phy_mask = ~(mask | 0x80000000 | 0x40000000);
    47. 

  47. +	else
    48. 

  48. +		cpmac_mii->phy_mask = ~(mask | 0x80000000);
    49. 

  49. +
    50. 

  50.  	snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "cpmac-1");
    51. 

  51.  
    52. 

  52.  	res = mdiobus_register(cpmac_mii);
    53.