From 34d90e4a42cd09d02fe5de56d17cb424b4fe729e Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Thu, 17 Aug 2023 16:23:45 +0800 Subject: [PATCH] usb: dwc3: core: parkmode_disable_hs_quirk depends on CONFIG_NO_GKI Fixes: 35db5a9e9461 ("UPSTREAM: usb: dwc3: core: add support for disabling High-speed park mode") Signed-off-by: Tao Huang Change-Id: Ife342a9339c731828d9677d110494fdd7862fe49 --- drivers/usb/dwc3/core.c | 4 ++++ drivers/usb/dwc3/core.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index b11e3073ebb9..39c5ecf7b470 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1265,8 +1265,10 @@ static int dwc3_core_init(struct dwc3 *dwc) if (dwc->parkmode_disable_ss_quirk) reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS; +#ifdef CONFIG_NO_GKI if (dwc->parkmode_disable_hs_quirk) reg |= DWC3_GUCTL1_PARKMODE_DISABLE_HS; +#endif if (DWC3_VER_IS_WITHIN(DWC3, 290A, ANY) && (dwc->maximum_speed == USB_SPEED_HIGH || @@ -1590,8 +1592,10 @@ static void dwc3_get_properties(struct dwc3 *dwc) "snps,resume-hs-terminations"); dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev, "snps,parkmode-disable-ss-quirk"); +#ifdef CONFIG_NO_GKI dwc->parkmode_disable_hs_quirk = device_property_read_bool(dev, "snps,parkmode-disable-hs-quirk"); +#endif dwc->gfladj_refclk_lpm_sel = device_property_read_bool(dev, "snps,gfladj-refclk-lpm-sel-quirk"); diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 7ed900d59909..e958fc923fee 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1345,7 +1345,9 @@ struct dwc3 { unsigned dis_tx_ipgap_linecheck_quirk:1; unsigned resume_hs_terminations:1; unsigned parkmode_disable_ss_quirk:1; +#ifdef CONFIG_NO_GKI unsigned parkmode_disable_hs_quirk:1; +#endif unsigned gfladj_refclk_lpm_sel:1; unsigned tx_de_emphasis_quirk:1;