| Message ID | 20210311060318.25418-1-shawn.guo@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | usb: dwc3: qcom: skip interconnect init for ACPI probe | expand |
Hello! On 11.03.2021 9:03, Shawn Guo wrote: > The ACPI probe starts failing since commit bea46b981515 ("usb: dwc3: > qcom: Add interconnect support in dwc3 driver"), because there is no > interconnect support for ACPI, and of_icc_get() call in > dwc3_qcom_interconnect_init() will just return -EINVAL. > > Fix the problem by skipping interconnect init for ACPI probe, and then > the NULL icc_path_ddr will simply just scheild all ICC calls. Scheild? > Fixes: bea46b981515 ("usb: dwc3: qcom: Add interconnect support in dwc3 driver") > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> [...] MBR, Sergei
On Thu, Mar 11, 2021 at 11:32:01AM +0300, Sergei Shtylyov wrote: > Hello! > > On 11.03.2021 9:03, Shawn Guo wrote: > > > The ACPI probe starts failing since commit bea46b981515 ("usb: dwc3: > > qcom: Add interconnect support in dwc3 driver"), because there is no > > interconnect support for ACPI, and of_icc_get() call in > > dwc3_qcom_interconnect_init() will just return -EINVAL. > > > > Fix the problem by skipping interconnect init for ACPI probe, and then > > the NULL icc_path_ddr will simply just scheild all ICC calls. > > Scheild? s/scheild/shield Shawn
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c index 175a609cd0af..7dc74885a635 100644 --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c @@ -244,6 +244,9 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom) struct device *dev = qcom->dev; int ret; + if (has_acpi_companion(dev)) + return 0; + qcom->icc_path_ddr = of_icc_get(dev, "usb-ddr"); if (IS_ERR(qcom->icc_path_ddr)) { dev_err(dev, "failed to get usb-ddr path: %ld\n",
The ACPI probe starts failing since commit bea46b981515 ("usb: dwc3: qcom: Add interconnect support in dwc3 driver"), because there is no interconnect support for ACPI, and of_icc_get() call in dwc3_qcom_interconnect_init() will just return -EINVAL. Fix the problem by skipping interconnect init for ACPI probe, and then the NULL icc_path_ddr will simply just scheild all ICC calls. Fixes: bea46b981515 ("usb: dwc3: qcom: Add interconnect support in dwc3 driver") Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- drivers/usb/dwc3/dwc3-qcom.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.17.1