Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16fe4f30 authored by Thinh Nguyen's avatar Thinh Nguyen Committed by Felipe Balbi
Browse files

usb: dwc3: Separate field holding multiple properties 



dwc->hird_threshold field should store "snps,hird_threshold" property
only and not a combination of multiple properties. Remove the value of
"snps,is-utmi-l1-suspend" property from the field dwc->hird_threshold.

Signed-off-by: default avatarThinh Nguyen <thinhn@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 05f0b20b

drivers/usb/dwc3/core.c

+1 −2
Original line number Diff line number Diff line
@@ -1321,8 +1321,7 @@ static void dwc3_get_properties(struct dwc3 *dwc) 
	dwc->lpm_nyet_threshold = lpm_nyet_threshold;

	dwc->tx_de_emphasis = tx_de_emphasis;



	dwc->hird_threshold = hird_threshold

		| (dwc->is_utmi_l1_suspend << 4);

	dwc->hird_threshold = hird_threshold;



	dwc->rx_thr_num_pkt_prd = rx_thr_num_pkt_prd;

	dwc->rx_max_burst_prd = rx_max_burst_prd;

drivers/usb/dwc3/gadget.c

+2 −1
Original line number Diff line number Diff line
@@ -2868,7 +2868,8 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) 
		reg = dwc3_readl(dwc->regs, DWC3_DCTL);

		reg &= ~(DWC3_DCTL_HIRD_THRES_MASK | DWC3_DCTL_L1_HIBER_EN);



		reg |= DWC3_DCTL_HIRD_THRES(dwc->hird_threshold);

		reg |= DWC3_DCTL_HIRD_THRES(dwc->hird_threshold |

					    (dwc->is_utmi_l1_suspend << 4));



		/*

		 * When dwc3 revisions >= 2.40a, LPM Erratum is enabled and