From a4da08bddcc82ee6b8c99355b58f710b14ddfbb7 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 30 Jan 2024 10:49:06 +0800 Subject: [PATCH] Revert "usb: dwc3: core: parkmode_disable_hs_quirk depends on CONFIG_NO_GKI" This reverts commit 34d90e4a42cd09d02fe5de56d17cb424b4fe729e. Signed-off-by: Tao Huang --- drivers/usb/dwc3/core.c | 4 ---- drivers/usb/dwc3/core.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index f8253d874ae2..a4da4b474ea9 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1265,10 +1265,8 @@ 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 || @@ -1576,10 +1574,8 @@ 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 d7c421045caf..9964ddd07192 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1342,9 +1342,7 @@ 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;