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 --- a/drivers/usb/mtu3/mtu3.h
  17 +++ b/drivers/usb/mtu3/mtu3.h
  18 @@ -214,8 +214,6 @@ struct otg_switch_mtk {
  19   *             disable u3port0, bit1==1 to disable u3port1,... etc
  20   * @dbgfs_root: only used when supports manual dual-role switch via debugfs
  21   * @wakeup_en: it's true when supports remote wakeup in host mode
  22 - * @wk_deb_p0: port0's wakeup debounce clock
  23 - * @wk_deb_p1: it's optional, and depends on port1 is supported or not
  24   */
  25  struct ssusb_mtk {
  26         struct device *dev;
  27 @@ -238,8 +236,6 @@ struct ssusb_mtk {
  28         struct dentry *dbgfs_root;
  29         /* usb wakeup for host mode */
  30         bool wakeup_en;
  31 -       struct clk *wk_deb_p0;
  32 -       struct clk *wk_deb_p1;
  33         struct regmap *pericfg;
  34  };
  35
  36 --- a/drivers/usb/mtu3/mtu3_host.c
  37 +++ b/drivers/usb/mtu3/mtu3_host.c
  38 @@ -79,20 +79,6 @@ int ssusb_wakeup_of_property_parse(struc
  39         if (!ssusb->wakeup_en)
  40                 return 0;
  41
  42 -       ssusb->wk_deb_p0 = devm_clk_get(dev, "wakeup_deb_p0");
  43 -       if (IS_ERR(ssusb->wk_deb_p0)) {
  44 -               dev_err(dev, "fail to get wakeup_deb_p0\n");
  45 -               return PTR_ERR(ssusb->wk_deb_p0);
  46 -       }
  47 -
  48 -       if (of_property_read_bool(dn, "wakeup_deb_p1")) {
  49 -               ssusb->wk_deb_p1 = devm_clk_get(dev, "wakeup_deb_p1");
  50 -               if (IS_ERR(ssusb->wk_deb_p1)) {
  51 -                       dev_err(dev, "fail to get wakeup_deb_p1\n");
  52 -                       return PTR_ERR(ssusb->wk_deb_p1);
  53 -               }
  54 -       }
  55 -
  56         ssusb->pericfg = syscon_regmap_lookup_by_phandle(dn,
  57                                                 "mediatek,syscon-wakeup");
  58         if (IS_ERR(ssusb->pericfg)) {
  59 @@ -103,36 +89,6 @@ int ssusb_wakeup_of_property_parse(struc
  60         return 0;
  61  }
  62
  63 -static int ssusb_wakeup_clks_enable(struct ssusb_mtk *ssusb)
  64 -{
  65 -       int ret;
  66 -
  67 -       ret = clk_prepare_enable(ssusb->wk_deb_p0);
  68 -       if (ret) {
  69 -               dev_err(ssusb->dev, "failed to enable wk_deb_p0\n");
  70 -               goto usb_p0_err;
  71 -       }
  72 -
  73 -       ret = clk_prepare_enable(ssusb->wk_deb_p1);
  74 -       if (ret) {
  75 -               dev_err(ssusb->dev, "failed to enable wk_deb_p1\n");
  76 -               goto usb_p1_err;
  77 -       }
  78 -
  79 -       return 0;
  80 -
  81 -usb_p1_err:
  82 -       clk_disable_unprepare(ssusb->wk_deb_p0);
  83 -usb_p0_err:
  84 -       return -EINVAL;
  85 -}
  86 -
  87 -static void ssusb_wakeup_clks_disable(struct ssusb_mtk *ssusb)
  88 -{
  89 -       clk_disable_unprepare(ssusb->wk_deb_p1);
  90 -       clk_disable_unprepare(ssusb->wk_deb_p0);
  91 -}
  92 -
  93  static void host_ports_num_get(struct ssusb_mtk *ssusb)
  94  {
  95         u32 xhci_cap;
  96 @@ -286,19 +242,14 @@ void ssusb_host_exit(struct ssusb_mtk *s
  97
  98  int ssusb_wakeup_enable(struct ssusb_mtk *ssusb)
  99  {
 100 -       int ret = 0;
 101 -
 102 -       if (ssusb->wakeup_en) {
 103 -               ret = ssusb_wakeup_clks_enable(ssusb);
 104 +       if (ssusb->wakeup_en)
 105                 ssusb_wakeup_ip_sleep_en(ssusb);
 106 -       }
 107 -       return ret;
 108 +
 109 +       return 0;
 110  }
 111
 112  void ssusb_wakeup_disable(struct ssusb_mtk *ssusb)
 113  {
 114 -       if (ssusb->wakeup_en) {
 115 +       if (ssusb->wakeup_en)
 116                 ssusb_wakeup_ip_sleep_dis(ssusb);
 117 -               ssusb_wakeup_clks_disable(ssusb);
 118 -       }
 119  }