Accueil Explorer Aide
S'inscrire Connexion
wareck
/
openwrt_chaos_calmer
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Aborescence: c3df3ea581
Branches Tags
openwrt_chaos_c...
/
target
/
linux
/
brcm63xx
/
patches-3.18
/
346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch

346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch 1.7 KB
Historique Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 
  1. --- a/arch/mips/bcm63xx/clk.c
    2. 

  2. +++ b/arch/mips/bcm63xx/clk.c
    3. 

  3. @@ -136,7 +136,11 @@ static struct clk clk_ephy = {
    4. 

  4.   */
    5. 

  5.  static void enetsw_set(struct clk *clk, int enable)
    6. 

  6.  {
    7. 

  7. -	if (BCMCPU_IS_6328())
    8. 

  8. +	if (BCMCPU_IS_6318()) {
    9. 

  9. +		bcm_hwclock_set(CKCTL_6318_ROBOSW250_EN |
    10. 

  10. +				CKCTL_6318_ROBOSW025_EN, enable);
    11. 

  11. +		bcm_ub_hwclock_set(UB_CKCTL_6318_ROBOSW_EN, enable);
    12. 

  12. +	} else if (BCMCPU_IS_6328())
    13. 

  13.  		bcm_hwclock_set(CKCTL_6328_ROBOSW_EN, enable);
    14. 

  14.  	else if (BCMCPU_IS_6362())
    15. 

  15.  		bcm_hwclock_set(CKCTL_6362_ROBOSW_EN, enable);
    16. 

  16. @@ -183,18 +187,22 @@ static struct clk clk_pcm = {
    17. 

  17.   */
    18. 

  18.  static void usbh_set(struct clk *clk, int enable)
    19. 

  19.  {
    20. 

  20. -	if (BCMCPU_IS_6328())
    21. 

  21. +	if (BCMCPU_IS_6318()) {
    22. 

  22. +		bcm_hwclock_set(CKCTL_6318_USB_EN, enable);
    23. 

  23. +		bcm_ub_hwclock_set(UB_CKCTL_6318_USB_EN, enable);
    24. 

  24. +	} else if (BCMCPU_IS_6328()) {
    25. 

  25.  		bcm_hwclock_set(CKCTL_6328_USBH_EN, enable);
    26. 

  26. -	else if (BCMCPU_IS_6348())
    27. 

  27. +	} else if (BCMCPU_IS_6348()) {
    28. 

  28.  		bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);
    29. 

  29. -	else if (BCMCPU_IS_6362())
    30. 

  30. +	} else if (BCMCPU_IS_6362()) {
    31. 

  31.  		bcm_hwclock_set(CKCTL_6362_USBH_EN, enable);
    32. 

  32. -	else if (BCMCPU_IS_6368())
    33. 

  33. +	} else if (BCMCPU_IS_6368()) {
    34. 

  34.  		bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
    35. 

  35. -	else if (BCMCPU_IS_63268())
    36. 

  36. +	} else if (BCMCPU_IS_63268()) {
    37. 

  37.  		bcm_hwclock_set(CKCTL_63268_USBH_EN, enable);
    38. 

  38. -	else
    39. 

  39. +	} else {
    40. 

  40.  		return;
    41. 

  41. +	}
    42. 

  42.  
    43. 

  43.  	if (enable)
    44. 

  44.  		msleep(100);
    45. 

  45. @@ -405,9 +413,9 @@ struct clk *clk_get(struct device *dev,
    46. 

  46.  		return &clk_enetsw;
    47. 

  47.  	if (!strcmp(id, "ephy"))
    48. 

  48.  		return &clk_ephy;
    49. 

  49. -	if (!strcmp(id, "usbh"))
    50. 

  50. +	if (!strcmp(id, "usbh") || (BCMCPU_IS_6318() && !strcmp(id, "usbd")))
    51. 

  51.  		return &clk_usbh;
    52. 

  52. -	if (!strcmp(id, "usbd"))
    53. 

  53. +	if (!strcmp(id, "usbd") && !BCMCPU_IS_6318())
    54. 

  54.  		return &clk_usbd;
    55. 

  55.  	if (!strcmp(id, "spi"))
    56. 

  56.  		return &clk_spi;
    57.