Hi, Heikki Krogerus <[email protected]> writes: > This should allow the core driver to drop handling of > platform data and expect the platform specific details to > always come from properties. > > The ACPI companion needs to be set before any build-in > properties are applied as setting it would otherwise > override the build-in properties. Therefore setting the > companion before dwc3_pci_quirks() is called. > > Signed-off-by: Heikki Krogerus <[email protected]> > Cc: Huang Rui <[email protected]> > CC: John Youn <[email protected]> > --- > drivers/usb/dwc3/dwc3-pci.c | 85 > +++++++++++++++++++++------------------------ > 1 file changed, 39 insertions(+), 46 deletions(-) > > diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c > index adc1e8a..d7e77b0 100644 > --- a/drivers/usb/dwc3/dwc3-pci.c > +++ b/drivers/usb/dwc3/dwc3-pci.c > @@ -23,8 +23,7 @@ > #include <linux/platform_device.h> > #include <linux/gpio/consumer.h> > #include <linux/acpi.h> > - > -#include "platform_data.h" > +#include <linux/delay.h> > > #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd > #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3_AXI 0xabce > @@ -47,38 +46,33 @@ static const struct acpi_gpio_mapping > acpi_dwc3_byt_gpios[] = { > { }, > }; > > -static int dwc3_pci_quirks(struct pci_dev *pdev) > +static int dwc3_pci_quirks(struct pci_dev *pdev, struct platform_device > *dwc3) > { > if (pdev->vendor == PCI_VENDOR_ID_AMD && > pdev->device == PCI_DEVICE_ID_AMD_NL_USB) { > - struct dwc3_platform_data pdata; > - > - memset(&pdata, 0, sizeof(pdata)); > - > - pdata.has_lpm_erratum = true; > - pdata.lpm_nyet_threshold = 0xf; > - > - pdata.u2exit_lfps_quirk = true; > - pdata.u2ss_inp3_quirk = true; > - pdata.req_p1p2p3_quirk = true; > - pdata.del_p1p2p3_quirk = true; > - pdata.del_phy_power_chg_quirk = true; > - pdata.lfps_filter_quirk = true; > - pdata.rx_detect_poll_quirk = true; > - > - pdata.tx_de_emphasis_quirk = true; > - pdata.tx_de_emphasis = 1; > - > - /* > - * FIXME these quirks should be removed when AMD NL > - * taps out > - */ > - pdata.disable_scramble_quirk = true; > - pdata.dis_u3_susphy_quirk = true; > - pdata.dis_u2_susphy_quirk = true; > - > - return platform_device_add_data(pci_get_drvdata(pdev), &pdata, > - sizeof(pdata)); > + struct property_entry properties[] = { > + PROPERTY_ENTRY_BOOL("snps,has-lpm-erratum"), > + PROPERTY_ENTRY_U8("snps,lpm-nyet-threshold", 0xf), > + PROPERTY_ENTRY_BOOL("snps,u2exit_lfps_quirk"), > + PROPERTY_ENTRY_BOOL("snps,u2ss_inp3_quirk"), > + PROPERTY_ENTRY_BOOL("snps,req_p1p2p3_quirk"), > + PROPERTY_ENTRY_BOOL("snps,del_p1p2p3_quirk"), > + PROPERTY_ENTRY_BOOL("snps,del_phy_power_chg_quirk"), > + PROPERTY_ENTRY_BOOL("snps,lfps_filter_quirk"), > + PROPERTY_ENTRY_BOOL("snps,rx_detect_poll_quirk"), > + PROPERTY_ENTRY_BOOL("snps,tx_de_emphasis_quirk"), > + PROPERTY_ENTRY_U8("snps,tx_de_emphasis", 1), > + /* > + * FIXME these quirks should be removed when AMD NL > + * tapes out > + */ > + PROPERTY_ENTRY_BOOL("snps,disable_scramble_quirk"), > + PROPERTY_ENTRY_BOOL("snps,dis_u3_susphy_quirk"), > + PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"), > + { }, > + }; > + > + return platform_device_add_properties(dwc3, properties); > } > > if (pdev->vendor == PCI_VENDOR_ID_INTEL && > @@ -115,16 +109,14 @@ static int dwc3_pci_quirks(struct pci_dev *pdev) > (pdev->device == PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 || > pdev->device == PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3_AXI || > pdev->device == PCI_DEVICE_ID_SYNOPSYS_HAPSUSB31)) { > - > - struct dwc3_platform_data pdata; > - > - memset(&pdata, 0, sizeof(pdata)); > - pdata.usb3_lpm_capable = true; > - pdata.has_lpm_erratum = true; > - pdata.dis_enblslpm_quirk = true; > - > - return platform_device_add_data(pci_get_drvdata(pdev), &pdata, > - sizeof(pdata)); > + struct property_entry properties[] = { > + PROPERTY_ENTRY_BOOL("snps,usb3_lpm_capable"), > + PROPERTY_ENTRY_BOOL("snps,has-lpm-erratum"), > + PROPERTY_ENTRY_BOOL("snps,dis_enblslpm_quirk"), > + { }, > + }; > + > + return platform_device_add_properties(dwc3, properties); > } > > return 0; > @@ -169,20 +161,21 @@ static int dwc3_pci_probe(struct pci_dev *pci, > return ret; > } > > - pci_set_drvdata(pci, dwc3); > - ret = dwc3_pci_quirks(pci); > - if (ret) > - goto err; > - > dwc3->dev.parent = dev; > ACPI_COMPANION_SET(&dwc3->dev, ACPI_COMPANION(dev)); > > + ret = dwc3_pci_quirks(pci, dwc3); > + if (ret) > + goto err; > +
do you mind moving this hunk ...
> ret = platform_device_add(dwc3);
> if (ret) {
> dev_err(dev, "failed to register dwc3 device\n");
> goto err;
> }
>
> + pci_set_drvdata(pci, dwc3);
and this hunk to a separate patch ? They look like extra noise here
which takes away from the actual work of $subject
--
balbi
signature.asc
Description: PGP signature
