From c72a0f978042b0f4cea95fa6a5895754885d6342 Mon Sep 17 00:00:00 2001 From: Wu Liang feng Date: Wed, 10 Aug 2016 11:17:40 +0800 Subject: [PATCH] Revert "usb: dwc3: add dis_del_phy_power_chg_quirk" This reverts commit ffee25e68d518aed3a505543355bff1d961159ff. --- Documentation/devicetree/bindings/usb/dwc3.txt | 2 -- drivers/usb/dwc3/core.c | 7 ------- drivers/usb/dwc3/core.h | 3 --- drivers/usb/dwc3/platform_data.h | 1 - 4 files changed, 13 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt index 8de381a44708..f1806c4f21e8 100644 --- a/Documentation/devicetree/bindings/usb/dwc3.txt +++ b/Documentation/devicetree/bindings/usb/dwc3.txt @@ -43,8 +43,6 @@ Optional properties: - snps,dis_u2_freeclk_exists_quirk: when set, clear the u2_freeclk_exists in GUSB2PHYCFG, specify that USB2 PHY doesn't provide a free-running PHY clock. - - snps,dis_del_phy_power_chg_quirk: when set core will change PHY power - from P0 to P1/P2/P3 without delay. - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal utmi_l1_suspend_n, false when asserts utmi_sleep_n - snps,hird-threshold: HIRD threshold diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 8362558acb5f..a12117a04be6 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -456,9 +456,6 @@ static int dwc3_phy_setup(struct dwc3 *dwc) if (dwc->dis_u3_susphy_quirk) reg &= ~DWC3_GUSB3PIPECTL_SUSPHY; - if (dwc->dis_del_phy_power_chg_quirk) - reg &= ~DWC3_GUSB3PIPECTL_DEPOCHANGE; - dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); @@ -940,8 +937,6 @@ static int dwc3_probe(struct platform_device *pdev) "snps,dis_enblslpm_quirk"); dwc->dis_u2_freeclk_exists_quirk = device_property_read_bool(dev, "snps,dis_u2_freeclk_exists_quirk"); - dwc->dis_del_phy_power_chg_quirk = device_property_read_bool(dev, - "snps,dis_del_phy_power_chg_quirk"); dwc->phyif_utmi_16_bits = device_property_read_bool(dev, "snps,phyif_utmi_16_bits"); @@ -980,8 +975,6 @@ static int dwc3_probe(struct platform_device *pdev) dwc->dis_enblslpm_quirk = pdata->dis_enblslpm_quirk; dwc->dis_u2_freeclk_exists_quirk = pdata->dis_u2_freeclk_exists_quirk; - dwc->dis_del_phy_power_chg_quirk = - pdata->dis_del_phy_power_chg_quirk; dwc->phyif_utmi_16_bits = pdata->phyif_utmi_16_bits; dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk; diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index c5d7a5e79962..32ac0dd5a97e 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -737,8 +737,6 @@ struct dwc3_scratchpad_array { * @dis_u2_freeclk_exists_quirk : set if we clear u2_freeclk_exists * in GUSB2PHYCFG, specify that USB2 PHY doesn't * provide a free-running PHY clock. - * @dis_del_phy_power_chg_quirk: set if we disable delay phy power - * change quirk. * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk * @tx_de_emphasis: Tx de-emphasis value * 0 - -6dB de-emphasis @@ -886,7 +884,6 @@ struct dwc3 { unsigned dis_u2_susphy_quirk:1; unsigned dis_enblslpm_quirk:1; unsigned dis_u2_freeclk_exists_quirk:1; - unsigned dis_del_phy_power_chg_quirk:1; unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2; diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h index b44e818c062e..aa5739a58c86 100644 --- a/drivers/usb/dwc3/platform_data.h +++ b/drivers/usb/dwc3/platform_data.h @@ -45,7 +45,6 @@ struct dwc3_platform_data { unsigned dis_u2_susphy_quirk:1; unsigned dis_enblslpm_quirk:1; unsigned dis_u2_freeclk_exists_quirk:1; - unsigned dis_del_phy_power_chg_quirk:1; unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2; -- 2.34.1