Startseite Erkunden Hilfe
Anmelden
jahway603
/
libreCMC
geforkt von libreCMC/libreCMC
1
0
Fork 0
Dateien
Struktur: c152c845b4
Branches Tags
libreCMC
/
target
/
linux
/
ar71xx
/
patches-4.14
/
930-chipidea-pullup.patch

930-chipidea-pullup.patch 2.0 KB
Verlauf Originalformat

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364 
  1. --- a/drivers/usb/chipidea/core.c
    2. 

  2. +++ b/drivers/usb/chipidea/core.c
    3. 

  3. @@ -827,7 +827,7 @@ static inline void ci_role_destroy(struc
    4. 

  4.  {
    5. 

  5.  	ci_hdrc_gadget_destroy(ci);
    6. 

  6.  	ci_hdrc_host_destroy(ci);
    7. 

  7. -	if (ci->is_otg && ci->roles[CI_ROLE_GADGET])
    8. 

  8. +	if (!ci->dp_always_pullup && ci->roles[CI_ROLE_GADGET])
    9. 

  9.  		ci_hdrc_otg_destroy(ci);
    10. 

  10.  }
    11. 

  11.  
    12. 

  12. @@ -941,6 +941,9 @@ static int ci_hdrc_probe(struct platform
    13. 

  13.  		CI_HDRC_SUPPORTS_RUNTIME_PM);
    14. 

  14.  	platform_set_drvdata(pdev, ci);
    15. 

  15.  
    16. 

  16. +	ci->dp_always_pullup = !!(ci->platdata->flags &
    17. 

  17. +					 CI_HDRC_DP_ALWAYS_PULLUP);
    18. 

  18. +
    19. 

  19.  	ret = hw_device_init(ci, base);
    20. 

  20.  	if (ret < 0) {
    21. 

  21.  		dev_err(dev, "can't initialize hardware\n");
    22. 

  22. @@ -1029,7 +1032,7 @@ static int ci_hdrc_probe(struct platform
    23. 

  23.  		goto deinit_gadget;
    24. 

  24.  	}
    25. 

  25.  
    26. 

  26. -	if (ci->is_otg && ci->roles[CI_ROLE_GADGET]) {
    27. 

  27. +	if (!ci->dp_always_pullup && ci->roles[CI_ROLE_GADGET]) {
    28. 

  28.  		ret = ci_hdrc_otg_init(ci);
    29. 

  29.  		if (ret) {
    30. 

  30.  			dev_err(dev, "init otg fails, ret = %d\n", ret);
    31. 

  31. --- a/drivers/usb/chipidea/otg.c
    32. 

  32. +++ b/drivers/usb/chipidea/otg.c
    33. 

  33. @@ -131,8 +131,10 @@ enum ci_role ci_otg_role(struct ci_hdrc
    34. 

  34.  
    35. 

  35.  void ci_handle_vbus_change(struct ci_hdrc *ci)
    36. 

  36.  {
    37. 

  37. -	if (!ci->is_otg)
    38. 

  38. +	if (ci->dp_always_pullup) {
    39. 

  39. +		usb_gadget_vbus_connect(&ci->gadget);
    40. 

  40.  		return;
    41. 

  41. +	}
    42. 

  42.  
    43. 

  43.  	if (hw_read_otgsc(ci, OTGSC_BSV) && !ci->vbus_active)
    44. 

  44.  		usb_gadget_vbus_connect(&ci->gadget);
    45. 

  45. --- a/include/linux/usb/chipidea.h
    46. 

  46. +++ b/include/linux/usb/chipidea.h
    47. 

  47. @@ -60,6 +60,7 @@ struct ci_hdrc_platform_data {
    48. 

  48.  #define CI_HDRC_OVERRIDE_RX_BURST	BIT(11)
    49. 

  49.  #define CI_HDRC_OVERRIDE_PHY_CONTROL	BIT(12) /* Glue layer manages phy */
    50. 

  50.  #define CI_HDRC_REQUIRES_ALIGNED_DMA	BIT(13)
    51. 

  51. +#define CI_HDRC_DP_ALWAYS_PULLUP	BIT(14)
    52. 

  52.  	enum usb_dr_mode	dr_mode;
    53. 

  53.  #define CI_HDRC_CONTROLLER_RESET_EVENT		0
    54. 

  54.  #define CI_HDRC_CONTROLLER_STOPPED_EVENT	1
    55. 

  55. --- a/drivers/usb/chipidea/ci.h
    56. 

  56. +++ b/drivers/usb/chipidea/ci.h
    57. 

  57. @@ -260,6 +260,7 @@ struct ci_hdrc {
    58. 

  58.  	bool				in_lpm;
    59. 

  59.  	bool				wakeup_int;
    60. 

  60.  	enum ci_revision		rev;
    61. 

  61. +	bool				dp_always_pullup;
    62. 

  62.  	struct mutex                    mutex;
    63. 

  63.  };
    64. 

  64.  
    65.