0105-usb-mtu3-remove-dummy-wakeup-debounce-clocks.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119
  1. From 50005796f146351dc9c34bbf8898b305c562e964 Mon Sep 17 00:00:00 2001
  2. From: Chunfeng Yun <[email protected]>
  3. Date: Fri, 13 Oct 2017 17:10:39 +0800
  4. Subject: [PATCH 105/224] usb: mtu3: remove dummy wakeup debounce clocks
  5. The wakeup debounce clocks for each ports in fact are not
  6. needed, so remove them.
  7. Signed-off-by: Chunfeng Yun <[email protected]>
  8. Signed-off-by: Felipe Balbi <[email protected]>
  9. ---
  10. drivers/usb/mtu3/mtu3.h | 4 ----
  11. drivers/usb/mtu3/mtu3_host.c | 57 ++++----------------------------------------
  12. 2 files changed, 4 insertions(+), 57 deletions(-)
  13. --- a/drivers/usb/mtu3/mtu3.h
  14. +++ b/drivers/usb/mtu3/mtu3.h
  15. @@ -214,8 +214,6 @@ struct otg_switch_mtk {
  16. * disable u3port0, bit1==1 to disable u3port1,... etc
  17. * @dbgfs_root: only used when supports manual dual-role switch via debugfs
  18. * @wakeup_en: it's true when supports remote wakeup in host mode
  19. - * @wk_deb_p0: port0's wakeup debounce clock
  20. - * @wk_deb_p1: it's optional, and depends on port1 is supported or not
  21. */
  22. struct ssusb_mtk {
  23. struct device *dev;
  24. @@ -238,8 +236,6 @@ struct ssusb_mtk {
  25. struct dentry *dbgfs_root;
  26. /* usb wakeup for host mode */
  27. bool wakeup_en;
  28. - struct clk *wk_deb_p0;
  29. - struct clk *wk_deb_p1;
  30. struct regmap *pericfg;
  31. };
  32. --- a/drivers/usb/mtu3/mtu3_host.c
  33. +++ b/drivers/usb/mtu3/mtu3_host.c
  34. @@ -79,20 +79,6 @@ int ssusb_wakeup_of_property_parse(struc
  35. if (!ssusb->wakeup_en)
  36. return 0;
  37. - ssusb->wk_deb_p0 = devm_clk_get(dev, "wakeup_deb_p0");
  38. - if (IS_ERR(ssusb->wk_deb_p0)) {
  39. - dev_err(dev, "fail to get wakeup_deb_p0\n");
  40. - return PTR_ERR(ssusb->wk_deb_p0);
  41. - }
  42. -
  43. - if (of_property_read_bool(dn, "wakeup_deb_p1")) {
  44. - ssusb->wk_deb_p1 = devm_clk_get(dev, "wakeup_deb_p1");
  45. - if (IS_ERR(ssusb->wk_deb_p1)) {
  46. - dev_err(dev, "fail to get wakeup_deb_p1\n");
  47. - return PTR_ERR(ssusb->wk_deb_p1);
  48. - }
  49. - }
  50. -
  51. ssusb->pericfg = syscon_regmap_lookup_by_phandle(dn,
  52. "mediatek,syscon-wakeup");
  53. if (IS_ERR(ssusb->pericfg)) {
  54. @@ -103,36 +89,6 @@ int ssusb_wakeup_of_property_parse(struc
  55. return 0;
  56. }
  57. -static int ssusb_wakeup_clks_enable(struct ssusb_mtk *ssusb)
  58. -{
  59. - int ret;
  60. -
  61. - ret = clk_prepare_enable(ssusb->wk_deb_p0);
  62. - if (ret) {
  63. - dev_err(ssusb->dev, "failed to enable wk_deb_p0\n");
  64. - goto usb_p0_err;
  65. - }
  66. -
  67. - ret = clk_prepare_enable(ssusb->wk_deb_p1);
  68. - if (ret) {
  69. - dev_err(ssusb->dev, "failed to enable wk_deb_p1\n");
  70. - goto usb_p1_err;
  71. - }
  72. -
  73. - return 0;
  74. -
  75. -usb_p1_err:
  76. - clk_disable_unprepare(ssusb->wk_deb_p0);
  77. -usb_p0_err:
  78. - return -EINVAL;
  79. -}
  80. -
  81. -static void ssusb_wakeup_clks_disable(struct ssusb_mtk *ssusb)
  82. -{
  83. - clk_disable_unprepare(ssusb->wk_deb_p1);
  84. - clk_disable_unprepare(ssusb->wk_deb_p0);
  85. -}
  86. -
  87. static void host_ports_num_get(struct ssusb_mtk *ssusb)
  88. {
  89. u32 xhci_cap;
  90. @@ -286,19 +242,14 @@ void ssusb_host_exit(struct ssusb_mtk *s
  91. int ssusb_wakeup_enable(struct ssusb_mtk *ssusb)
  92. {
  93. - int ret = 0;
  94. -
  95. - if (ssusb->wakeup_en) {
  96. - ret = ssusb_wakeup_clks_enable(ssusb);
  97. + if (ssusb->wakeup_en)
  98. ssusb_wakeup_ip_sleep_en(ssusb);
  99. - }
  100. - return ret;
  101. +
  102. + return 0;
  103. }
  104. void ssusb_wakeup_disable(struct ssusb_mtk *ssusb)
  105. {
  106. - if (ssusb->wakeup_en) {
  107. + if (ssusb->wakeup_en)
  108. ssusb_wakeup_ip_sleep_dis(ssusb);
  109. - ssusb_wakeup_clks_disable(ssusb);
  110. - }
  111. }