From 7e9467d1d28b40126a1304141eab2f4f733395dc 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 ed3ce5eb78c6..20a7bc7d3169 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1099,8 +1099,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 (dwc->maximum_speed == USB_SPEED_HIGH || dwc->maximum_speed == USB_SPEED_FULL) @@ -1421,8 +1423,10 @@ static void dwc3_get_properties(struct dwc3 *dwc) "snps,dis-tx-ipgap-linecheck-quirk"); 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->tx_de_emphasis_quirk = device_property_read_bool(dev, "snps,tx_de_emphasis_quirk"); diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index a6e1c8157036..11ac1e0fe65f 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1313,7 +1313,9 @@ struct dwc3 { unsigned dis_del_phy_power_chg_quirk:1; unsigned dis_tx_ipgap_linecheck_quirk:1; unsigned parkmode_disable_ss_quirk:1; +#ifdef CONFIG_NO_GKI unsigned parkmode_disable_hs_quirk:1; +#endif unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2;