target/linux/mediatek/patches-4.14/0105-usb-mtu3-remove-dummy-wakeup-debounce-clocks.patch

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