Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752208AbaJ1Q1u (ORCPT ); Tue, 28 Oct 2014 12:27:50 -0400 Received: from mail-qg0-f46.google.com ([209.85.192.46]:42078 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751415AbaJ1Q1s (ORCPT ); Tue, 28 Oct 2014 12:27:48 -0400 MIME-Version: 1.0 In-Reply-To: <1414497280-3126-14-git-send-email-ray.huang@amd.com> References: <1414497280-3126-1-git-send-email-ray.huang@amd.com> <1414497280-3126-14-git-send-email-ray.huang@amd.com> From: Bjorn Helgaas Date: Tue, 28 Oct 2014 10:27:27 -0600 Message-ID: Subject: Re: [PATCH v3 13/19] usb: dwc3: add tx demphasis quirk To: Huang Rui Cc: Felipe Balbi , Alan Stern , Greg Kroah-Hartman , Paul Zimmerman , Heikki Krogerus , Jason Chang , Vincent Wan , Tony Li , USB list , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Oct 28, 2014 at 5:54 AM, Huang Rui wrote: > This patch adds Tx demphasis quirk, and the Tx demphasis value is "demphasis" (above and in subject) should be "de-emphasis" as used in the code and comments below. > configurable according to PIPE3 specification. > > Value Description > 0 -6dB de-emphasis > 1 -3.5dB de-emphasis > 2 No de-emphasis > 3 Reserved > > It can be configured on DT or platform data. > > Signed-off-by: Huang Rui > --- > drivers/usb/dwc3/core.c | 17 +++++++++++++++++ > drivers/usb/dwc3/core.h | 11 +++++++++++ > drivers/usb/dwc3/platform_data.h | 3 +++ > 3 files changed, 31 insertions(+) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 19019dc..e36fcd0 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -392,6 +392,9 @@ static void dwc3_phy_setup(struct dwc3 *dwc) > if (dwc->rx_detect_poll_quirk) > reg |= DWC3_GUSB3PIPECTL_RX_DETOPOLL; > > + if (dwc->tx_deemph_quirk) > + reg |= DWC3_GUSB3PIPECTL_TX_DEEPH(dwc->tx_deemph); > + > dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); > > mdelay(100); > @@ -691,6 +694,7 @@ static int dwc3_probe(struct platform_device *pdev) > struct resource *res; > struct dwc3 *dwc; > u8 lpm_nyet_thres; > + u8 tx_deemph; > > int ret; > > @@ -749,6 +753,9 @@ static int dwc3_probe(struct platform_device *pdev) > /* default to highest possible threshold */ > lpm_nyet_thres = 0xff; > > + /* default to -3.5dB de-emphasis */ > + tx_deemph = 1; > + > if (node) { > dwc->maximum_speed = of_usb_get_maximum_speed(node); > dwc->has_lpm_erratum = of_property_read_bool(node, > @@ -776,6 +783,11 @@ static int dwc3_probe(struct platform_device *pdev) > "snps,lfps_filter_quirk"); > dwc->rx_detect_poll_quirk = of_property_read_bool(node, > "snps,rx_detect_poll_quirk"); > + > + dwc->tx_deemph_quirk = of_property_read_bool(node, > + "snps,tx_deemph_quirk"); > + of_property_read_u8(node, "snps,tx_deemph", > + &tx_deemph); > } else if (pdata) { > dwc->maximum_speed = pdata->maximum_speed; > dwc->has_lpm_erratum = pdata->has_lpm_erratum; > @@ -793,6 +805,10 @@ static int dwc3_probe(struct platform_device *pdev) > dwc->del_phy_power_chg_quirk = pdata->del_phy_power_chg_quirk; > dwc->lfps_filter_quirk = pdata->lfps_filter_quirk; > dwc->rx_detect_poll_quirk = pdata->rx_detect_poll_quirk; > + > + dwc->tx_deemph_quirk = pdata->tx_deemph_quirk; > + if (pdata->tx_deemph) > + tx_deemph = pdata->tx_deemph; > } > > /* default to superspeed if no maximum_speed passed */ > @@ -800,6 +816,7 @@ static int dwc3_probe(struct platform_device *pdev) > dwc->maximum_speed = USB_SPEED_SUPER; > > dwc->lpm_nyet_thres = lpm_nyet_thres; > + dwc->tx_deemph = tx_deemph; > > ret = dwc3_core_get_phy(dwc); > if (ret) > diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h > index 57a203a..1277dcf 100644 > --- a/drivers/usb/dwc3/core.h > +++ b/drivers/usb/dwc3/core.h > @@ -185,6 +185,8 @@ > #define DWC3_GUSB3PIPECTL_SUSPHY (1 << 17) > #define DWC3_GUSB3PIPECTL_LFPSFILT (1 << 9) > #define DWC3_GUSB3PIPECTL_RX_DETOPOLL (1 << 8) > +#define DWC3_GUSB3PIPECTL_TX_DEEPH_MASK DWC3_GUSB3PIPECTL_TX_DEEPH(3) > +#define DWC3_GUSB3PIPECTL_TX_DEEPH(n) ((n) << 1) > > /* Global TX Fifo Size Register */ > #define DWC3_GTXFIFOSIZ_TXFDEF(n) ((n) & 0xffff) > @@ -695,6 +697,12 @@ struct dwc3_scratchpad_array { > * @del_phy_power_chg_quirk: set if we enable delay phy power change quirk > * @lfps_filter_quirk: set if we enable LFPS filter quirk > * @rx_detect_poll_quirk: set if we enable rx_detect to polling lfps quirk > + * @tx_deemph_quirk: set if we enable Tx deemphasis quirk > + * @tx_deemph: Tx deemphasis value > + * 0 - -6dB de-emphasis > + * 1 - -3.5dB de-emphasis > + * 2 - No de-emphasis > + * 3 - Reserved > */ > struct dwc3 { > struct usb_ctrlrequest *ctrl_req; > @@ -810,6 +818,9 @@ struct dwc3 { > unsigned del_phy_power_chg_quirk:1; > unsigned lfps_filter_quirk:1; > unsigned rx_detect_poll_quirk:1; > + > + unsigned tx_deemph_quirk:1; > + unsigned tx_deemph:2; > }; > > /* -------------------------------------------------------------------------- */ > diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h > index 9776764..ea631dc 100644 > --- a/drivers/usb/dwc3/platform_data.h > +++ b/drivers/usb/dwc3/platform_data.h > @@ -35,4 +35,7 @@ struct dwc3_platform_data { > unsigned del_phy_power_chg_quirk:1; > unsigned lfps_filter_quirk:1; > unsigned rx_detect_poll_quirk:1; > + > + unsigned tx_deemph_quirk:1; > + unsigned tx_deemph:2; > }; > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/