From: Huang Rui <ray.huang@amd.com>
To: Felipe Balbi <balbi@ti.com>,
Alan Stern <stern@rowland.harvard.edu>,
"Bjorn Helgaas" <bhelgaas@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Paul Zimmerman <Paul.Zimmerman@synopsys.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Jason Chang <jason.chang@amd.com>,
"Vincent Wan" <vincent.wan@amd.com>, Tony Li <tony.li@amd.com>,
<linux-usb@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Huang Rui <ray.huang@amd.com>
Subject: [PATCH v3 19/19] usb: dwc3: add support for AMD NL platform
Date: Tue, 28 Oct 2014 19:54:40 +0800 [thread overview]
Message-ID: <1414497280-3126-20-git-send-email-ray.huang@amd.com> (raw)
In-Reply-To: <1414497280-3126-1-git-send-email-ray.huang@amd.com>
This patch adds support for AMD Nolan (NL) FPGA and SoC platform.
Cc: Jason Chang <jason.chang@amd.com>
Signed-off-by: Huang Rui <ray.huang@amd.com>
---
drivers/usb/dwc3/core.c | 9 +++++++++
drivers/usb/dwc3/core.h | 2 ++
drivers/usb/dwc3/dwc3-pci.c | 19 +++++++++++++++++++
drivers/usb/dwc3/platform_data.h | 1 +
4 files changed, 31 insertions(+)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 33a8f3c..7ab867b 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -526,6 +526,12 @@ static int dwc3_core_init(struct dwc3 *dwc)
dwc->is_fpga = true;
}
+ if (dwc->amd_nl_plat && dwc->is_fpga) {
+ dwc->disable_scramble_quirk = true;
+ dwc->dis_u3_susphy_quirk = true;
+ dwc->dis_u2_susphy_quirk = true;
+ }
+
WARN_ONCE(dwc->disable_scramble_quirk && !dwc->is_fpga,
"disable_scramble cannot be used on non-FPGA builds\n");
@@ -817,6 +823,8 @@ static int dwc3_probe(struct platform_device *pdev)
"snps,dis_u3_susphy_quirk");
dwc->dis_u2_susphy_quirk = of_property_read_bool(node,
"snps,dis_u2_susphy_quirk");
+ dwc->amd_nl_plat = of_property_read_bool(node,
+ "snps,amd_nl_plat");
dwc->tx_deemph_quirk = of_property_read_bool(node,
"snps,tx_deemph_quirk");
@@ -841,6 +849,7 @@ static int dwc3_probe(struct platform_device *pdev)
dwc->rx_detect_poll_quirk = pdata->rx_detect_poll_quirk;
dwc->dis_u3_susphy_quirk = pdata->dis_u3_susphy_quirk;
dwc->dis_u2_susphy_quirk = pdata->dis_u2_susphy_quirk;
+ dwc->amd_nl_plat = pdata->amd_nl_plat;
dwc->tx_deemph_quirk = pdata->tx_deemph_quirk;
if (pdata->tx_deemph)
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 8b94ad5..b08a2f9 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -699,6 +699,7 @@ struct dwc3_scratchpad_array {
* @rx_detect_poll_quirk: set if we enable rx_detect to polling lfps quirk
* @dis_u3_susphy_quirk: set if we disable usb3 suspend phy
* @dis_u2_susphy_quirk: set if we disable usb2 suspend phy
+ * @amd_nl_plat: set if we use AMD NL platform
* @tx_deemph_quirk: set if we enable Tx deemphasis quirk
* @tx_deemph: Tx deemphasis value
* 0 - -6dB de-emphasis
@@ -822,6 +823,7 @@ struct dwc3 {
unsigned rx_detect_poll_quirk:1;
unsigned dis_u3_susphy_quirk:1;
unsigned dis_u2_susphy_quirk:1;
+ unsigned amd_nl_plat:1;
unsigned tx_deemph_quirk:1;
unsigned tx_deemph:2;
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index ada975f..3af9b47 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -145,6 +145,24 @@ static int dwc3_pci_probe(struct pci_dev *pci,
res[1].name = "dwc_usb3";
res[1].flags = IORESOURCE_IRQ;
+ if (pci->vendor == PCI_VENDOR_ID_AMD &&
+ pci->device == PCI_DEVICE_ID_AMD_NL_USB) {
+ dwc3_pdata.has_lpm_erratum = true;
+ dwc3_pdata.lpm_nyet_thres = 0xf;
+
+ dwc3_pdata.u2exit_lfps_quirk = true;
+ dwc3_pdata.u2ss_inp3_quirk = true;
+ dwc3_pdata.req_p1p2p3_quirk = true;
+ dwc3_pdata.del_p1p2p3_quirk = true;
+ dwc3_pdata.del_phy_power_chg_quirk = true;
+ dwc3_pdata.lfps_filter_quirk = true;
+ dwc3_pdata.rx_detect_poll_quirk = true;
+ dwc3_pdata.amd_nl_plat = true;
+
+ dwc3_pdata.tx_deemph_quirk = true;
+ dwc3_pdata.tx_deemph = 1;
+ }
+
ret = platform_device_add_resources(dwc3, res, ARRAY_SIZE(res));
if (ret) {
dev_err(dev, "couldn't add resources to dwc3 device\n");
@@ -194,6 +212,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BSW), },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT), },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MRFLD), },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), },
{ } /* Terminating Entry */
};
MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table);
diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h
index 1cfd384..c2c3511 100644
--- a/drivers/usb/dwc3/platform_data.h
+++ b/drivers/usb/dwc3/platform_data.h
@@ -37,6 +37,7 @@ struct dwc3_platform_data {
unsigned rx_detect_poll_quirk:1;
unsigned dis_u3_susphy_quirk:1;
unsigned dis_u2_susphy_quirk:1;
+ unsigned amd_nl_plat:1;
unsigned tx_deemph_quirk:1;
unsigned tx_deemph:2;
--
1.9.1
next prev parent reply other threads:[~2014-10-28 11:57 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 11:54 [PATCH v3 00/19] usb: dwc3: add support for AMD Nolan SoC Huang Rui
2014-10-28 11:54 ` [PATCH v3 01/19] usb: dwc3: enable hibernation if to be supported Huang Rui
2014-10-28 18:47 ` Paul Zimmerman
2014-10-28 18:50 ` Felipe Balbi
2014-10-28 18:55 ` Paul Zimmerman
2014-10-28 19:01 ` Felipe Balbi
2014-10-28 19:15 ` Paul Zimmerman
2014-10-28 19:18 ` Felipe Balbi
2014-10-29 6:53 ` Huang Rui
2014-10-28 11:54 ` [PATCH v3 02/19] usb: dwc3: add a flag to check if it is fpga board Huang Rui
2014-10-28 11:54 ` [PATCH v3 03/19] usb: dwc3: initialize platform data at pci glue layer Huang Rui
2014-10-28 11:54 ` [PATCH v3 04/19] usb: dwc3: add disscramble quirk Huang Rui
2014-10-28 16:39 ` Bjorn Helgaas
2014-10-28 18:42 ` Felipe Balbi
2014-10-29 6:50 ` Huang Rui
2014-10-28 11:54 ` [PATCH v3 05/19] usb: dwc3: add lpm erratum support Huang Rui
2014-10-28 16:30 ` Bjorn Helgaas
2014-10-29 7:44 ` Huang Rui
2014-10-28 11:54 ` [PATCH v3 06/19] usb: dwc3: add u2exit lfps quirk Huang Rui
2014-10-28 11:54 ` [PATCH v3 07/19] usb: dwc3: add P3 in U2 SS inactive quirk Huang Rui
2014-10-28 11:54 ` [PATCH v3 08/19] usb: dwc3: add request p1p2p3 quirk Huang Rui
2014-10-28 11:54 ` [PATCH v3 09/19] usb: dwc3: add delay " Huang Rui
2014-10-28 11:54 ` [PATCH v3 10/19] usb: dwc3: add delay phy power change quirk Huang Rui
2014-10-28 11:54 ` [PATCH v3 11/19] usb: dwc3: add lfps filter quirk Huang Rui
2014-10-28 11:54 ` [PATCH v3 12/19] usb: dwc3: add rx_detect to polling lfps quirk Huang Rui
2014-10-28 11:54 ` [PATCH v3 13/19] usb: dwc3: add tx demphasis quirk Huang Rui
2014-10-28 16:27 ` Bjorn Helgaas
2014-10-28 18:43 ` Felipe Balbi
2014-10-29 8:08 ` Huang Rui
2014-10-28 11:54 ` [PATCH v3 14/19] usb: dwc3: set SUSPHY bit for all cores Huang Rui
2014-10-28 11:54 ` [PATCH v3 15/19] usb: dwc3: add disable usb3 suspend phy quirk Huang Rui
2014-10-28 11:54 ` [PATCH v3 16/19] usb: dwc3: add disable usb2 " Huang Rui
2014-10-28 11:54 ` [PATCH v3 17/19] PCI: Add support for AMD Nolan USB3 DRD Huang Rui
2014-10-28 13:30 ` Bjorn Helgaas
2014-10-28 11:54 ` [PATCH v3 18/19] PCI: Add quirk to prevent AMD NL USB3 DRD to bind with xHCI driver Huang Rui
2014-10-28 12:06 ` Sergei Shtylyov
2014-10-28 12:15 ` Huang Rui
2014-10-28 13:29 ` Bjorn Helgaas
2014-10-28 11:54 ` Huang Rui [this message]
2014-10-28 13:38 ` [PATCH v3 19/19] usb: dwc3: add support for AMD NL platform Felipe Balbi
2014-10-28 14:35 ` Huang Rui
2014-10-29 9:13 ` Huang Rui
2014-10-29 14:11 ` Felipe Balbi
2014-10-29 14:33 ` Huang Rui
2014-10-29 14:48 ` Felipe Balbi
2014-10-28 14:41 ` [PATCH v3 00/19] usb: dwc3: add support for AMD Nolan SoC Felipe Balbi
2014-10-28 15:17 ` Huang Rui
2014-10-28 15:23 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414497280-3126-20-git-send-email-ray.huang@amd.com \
--to=ray.huang@amd.com \
--cc=Paul.Zimmerman@synopsys.com \
--cc=balbi@ti.com \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=jason.chang@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
--cc=tony.li@amd.com \
--cc=vincent.wan@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).