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

Commit bea8e86c authored by John Youn's avatar John Youn Committed by Felipe Balbi
Browse files

usb: dwc2: Declare the core params struct statically 



This makes it consistent with the hw_params struct and simplifies the
memory management for future refactoring. Fix up usage in all files.

Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 323230ef

drivers/usb/dwc2/core.c

+6 −6
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int dwc2_exit_hibernation(struct dwc2_hsotg *hsotg, bool restore) 
	u32 pcgcctl;

	int ret = 0;



	if (!hsotg->core_params->hibernation)

	if (!hsotg->params.hibernation)

		return -ENOTSUPP;



	pcgcctl = dwc2_readl(hsotg->regs + PCGCTL);
@@ -188,7 +188,7 @@ int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg) 
	u32 pcgcctl;

	int ret = 0;



	if (!hsotg->core_params->hibernation)

	if (!hsotg->params.hibernation)

		return -ENOTSUPP;



	/* Backup all registers */
@@ -541,7 +541,7 @@ void dwc2_dump_host_registers(struct dwc2_hsotg *hsotg) 
	addr = hsotg->regs + HAINTMSK;

	dev_dbg(hsotg->dev, "HAINTMSK	 @0x%08lX : 0x%08X\n",

		(unsigned long)addr, dwc2_readl(addr));

	if (hsotg->core_params->dma_desc_enable > 0) {

	if (hsotg->params.dma_desc_enable > 0) {

		addr = hsotg->regs + HFLBADDR;

		dev_dbg(hsotg->dev, "HFLBADDR @0x%08lX : 0x%08X\n",

			(unsigned long)addr, dwc2_readl(addr));
@@ -551,7 +551,7 @@ void dwc2_dump_host_registers(struct dwc2_hsotg *hsotg) 
	dev_dbg(hsotg->dev, "HPRT0	 @0x%08lX : 0x%08X\n",

		(unsigned long)addr, dwc2_readl(addr));



	for (i = 0; i < hsotg->core_params->host_channels; i++) {

	for (i = 0; i < hsotg->params.host_channels; i++) {

		dev_dbg(hsotg->dev, "Host Channel %d Specific Registers\n", i);

		addr = hsotg->regs + HCCHAR(i);

		dev_dbg(hsotg->dev, "HCCHAR	 @0x%08lX : 0x%08X\n",
@@ -571,7 +571,7 @@ void dwc2_dump_host_registers(struct dwc2_hsotg *hsotg) 
		addr = hsotg->regs + HCDMA(i);

		dev_dbg(hsotg->dev, "HCDMA	 @0x%08lX : 0x%08X\n",

			(unsigned long)addr, dwc2_readl(addr));

		if (hsotg->core_params->dma_desc_enable > 0) {

		if (hsotg->params.dma_desc_enable > 0) {

			addr = hsotg->regs + HCDMAB(i);

			dev_dbg(hsotg->dev, "HCDMAB	 @0x%08lX : 0x%08X\n",

				(unsigned long)addr, dwc2_readl(addr));
@@ -753,7 +753,7 @@ bool dwc2_force_mode_if_needed(struct dwc2_hsotg *hsotg, bool host) 


u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg)

{

	return hsotg->core_params->otg_ver == 1 ? 0x0200 : 0x0103;

	return hsotg->params.otg_ver == 1 ? 0x0200 : 0x0103;

}



bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg)

drivers/usb/dwc2/core.h

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ struct dwc2_hsotg { 
	/** Params detected from hardware */

	struct dwc2_hw_params hw_params;

	/** Params to actually use */

	struct dwc2_core_params *core_params;

	struct dwc2_core_params params;

	enum usb_otg_state op_state;

	enum usb_dr_mode dr_mode;

	unsigned int hcd_enabled:1;

drivers/usb/dwc2/core_intr.c

+3 −3
Original line number Diff line number Diff line
@@ -159,9 +159,9 @@ static void dwc2_handle_otg_intr(struct dwc2_hsotg *hsotg) 
			" ++OTG Interrupt: Session Request Success Status Change++\n");

		gotgctl = dwc2_readl(hsotg->regs + GOTGCTL);

		if (gotgctl & GOTGCTL_SESREQSCS) {

			if (hsotg->core_params->phy_type ==

			if (hsotg->params.phy_type ==

					DWC2_PHY_TYPE_PARAM_FS

			    && hsotg->core_params->i2c_enable > 0) {

			    && hsotg->params.i2c_enable > 0) {

				hsotg->srp_success = 1;

			} else {

				/* Clear Session Request */
@@ -370,7 +370,7 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) 
		/* Change to L0 state */

		hsotg->lx_state = DWC2_L0;

	} else {

		if (hsotg->core_params->hibernation)

		if (hsotg->params.hibernation)

			return;



		if (hsotg->lx_state != DWC2_L1) {

drivers/usb/dwc2/gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -2557,7 +2557,7 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, 
		GINTSTS_USBSUSP | GINTSTS_WKUPINT |

		GINTSTS_INCOMPL_SOIN | GINTSTS_INCOMPL_SOOUT;



	if (hsotg->core_params->external_id_pin_ctl <= 0)

	if (hsotg->params.external_id_pin_ctl <= 0)

		intmsk |= GINTSTS_CONIDSTSCHNG;



	dwc2_writel(intmsk, hsotg->regs + GINTMSK);

drivers/usb/dwc2/hcd.c

+95 −95

File changed.

Preview size limit exceeded, changes collapsed.