Hi,
On Fri, Mar 06, 2015 at 11:08:53AM +0100, Robert Baldyga wrote:
> LPM capability is hardware property, so now it's moved to DT.
you need a better commit log here.
> Signed-off-by: Robert Baldyga <r.baldyga@xxxxxxxxxxx>
> ---
> Documentation/devicetree/bindings/usb/dwc3.txt | 1 +
> drivers/usb/dwc3/Kconfig | 7 -------
> drivers/usb/dwc3/core.c | 3 +++
> drivers/usb/dwc3/core.h | 1 +
> drivers/usb/dwc3/host.c | 5 ++---
> drivers/usb/dwc3/platform_data.h | 1 +
> 6 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
> index cd7f045..36b9148 100644
> --- a/Documentation/devicetree/bindings/usb/dwc3.txt
> +++ b/Documentation/devicetree/bindings/usb/dwc3.txt
> @@ -14,6 +14,7 @@ Optional properties:
> - phys: from the *Generic PHY* bindings
> - phy-names: from the *Generic PHY* bindings
> - tx-fifo-resize: determines if the FIFO *has* to be reallocated.
> + - usb3_lpm_capable: determines if platform is USB3 LPM capable
needs a snps, prefix
> @@ -848,6 +850,7 @@ static int dwc3_probe(struct platform_device *pdev)
> hird_threshold = pdata->hird_threshold;
>
> dwc->needs_fifo_resize = pdata->tx_fifo_resize;
> + dwc->usb3_lpm_capable = pdata->usb3_lpm_capable;
> dwc->dr_mode = pdata->dr_mode;
>
> dwc->disable_scramble_quirk = pdata->disable_scramble_quirk;
> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
> index d201910..622f65f 100644
> --- a/drivers/usb/dwc3/core.h
> +++ b/drivers/usb/dwc3/core.h
> @@ -812,6 +812,7 @@ struct dwc3 {
> unsigned setup_packet_pending:1;
> unsigned start_config_issued:1;
> unsigned three_stage_setup:1;
> + unsigned usb3_lpm_capable:1;
missing kdoc for this new field.
>
> unsigned disable_scramble_quirk:1;
> unsigned u2exit_lfps_quirk:1;
> diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
> index 12bfd3c..507eddf 100644
> --- a/drivers/usb/dwc3/host.c
> +++ b/drivers/usb/dwc3/host.c
> @@ -49,9 +49,8 @@ int dwc3_host_init(struct dwc3 *dwc)
>
> memset(&pdata, 0, sizeof(pdata));
>
> -#ifdef CONFIG_DWC3_HOST_USB3_LPM_ENABLE
> - pdata.usb3_lpm_capable = 1;
> -#endif
> + if (dwc->usb3_lpm_capable)
> + pdata.usb3_lpm_capable = 1;
pdata.usb3_lpm_capable = dwc->usb3_lpm_capable; ??
drop the branch altogether
> diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h
> index a3a3b6d5..a2bd464 100644
> --- a/drivers/usb/dwc3/platform_data.h
> +++ b/drivers/usb/dwc3/platform_data.h
> @@ -24,6 +24,7 @@ struct dwc3_platform_data {
> enum usb_device_speed maximum_speed;
> enum usb_dr_mode dr_mode;
> bool tx_fifo_resize;
> + bool usb3_lpm_capable;
add kdoc for this too.
--
balbi
Attachment:
signature.asc
Description: Digital signature
