diff options
Diffstat (limited to 'drivers/usb/dwc2/params.c')
| -rw-r--r-- | drivers/usb/dwc2/params.c | 24 | 
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c index af075d4da895..bf7052e037d6 100644 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c @@ -47,7 +47,6 @@ static void dwc2_set_bcm_params(struct dwc2_hsotg *hsotg)  	p->max_transfer_size = 65535;  	p->max_packet_count = 511;  	p->ahbcfg = 0x10; -	p->uframe_sched = false;  }  static void dwc2_set_his_params(struct dwc2_hsotg *hsotg) @@ -68,7 +67,6 @@ static void dwc2_set_his_params(struct dwc2_hsotg *hsotg)  	p->reload_ctl = false;  	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<  		GAHBCFG_HBSTLEN_SHIFT; -	p->uframe_sched = false;  	p->change_speed_quirk = true;  	p->power_down = false;  } @@ -112,7 +110,6 @@ static void dwc2_set_amlogic_params(struct dwc2_hsotg *hsotg)  	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;  	p->ahbcfg = GAHBCFG_HBSTLEN_INCR8 <<  		GAHBCFG_HBSTLEN_SHIFT; -	p->uframe_sched = false;  }  static void dwc2_set_amcc_params(struct dwc2_hsotg *hsotg) @@ -134,7 +131,6 @@ static void dwc2_set_stm32f4x9_fsotg_params(struct dwc2_hsotg *hsotg)  	p->max_packet_count = 256;  	p->phy_type = DWC2_PHY_TYPE_PARAM_FS;  	p->i2c_enable = false; -	p->uframe_sched = false;  	p->activate_stm_fs_transceiver = true;  } @@ -654,8 +650,8 @@ static void dwc2_get_host_hwparams(struct dwc2_hsotg *hsotg)  	dwc2_force_mode(hsotg, true); -	gnptxfsiz = dwc2_readl(hsotg->regs + GNPTXFSIZ); -	hptxfsiz = dwc2_readl(hsotg->regs + HPTXFSIZ); +	gnptxfsiz = dwc2_readl(hsotg, GNPTXFSIZ); +	hptxfsiz = dwc2_readl(hsotg, HPTXFSIZ);  	hw->host_nperio_tx_fifo_size = (gnptxfsiz & FIFOSIZE_DEPTH_MASK) >>  				       FIFOSIZE_DEPTH_SHIFT; @@ -679,13 +675,13 @@ static void dwc2_get_dev_hwparams(struct dwc2_hsotg *hsotg)  	dwc2_force_mode(hsotg, false); -	gnptxfsiz = dwc2_readl(hsotg->regs + GNPTXFSIZ); +	gnptxfsiz = dwc2_readl(hsotg, GNPTXFSIZ);  	fifo_count = dwc2_hsotg_tx_fifo_count(hsotg);  	for (fifo = 1; fifo <= fifo_count; fifo++) {  		hw->g_tx_fifo_size[fifo] = -			(dwc2_readl(hsotg->regs + DPTXFSIZN(fifo)) & +			(dwc2_readl(hsotg, DPTXFSIZN(fifo)) &  			 FIFOSIZE_DEPTH_MASK) >> FIFOSIZE_DEPTH_SHIFT;  	} @@ -713,7 +709,7 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)  	 * 0x45f4xxxx, 0x5531xxxx or 0x5532xxxx  	 */ -	hw->snpsid = dwc2_readl(hsotg->regs + GSNPSID); +	hw->snpsid = dwc2_readl(hsotg, GSNPSID);  	if ((hw->snpsid & GSNPSID_ID_MASK) != DWC2_OTG_ID &&  	    (hw->snpsid & GSNPSID_ID_MASK) != DWC2_FS_IOT_ID &&  	    (hw->snpsid & GSNPSID_ID_MASK) != DWC2_HS_IOT_ID) { @@ -726,11 +722,11 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)  		hw->snpsid >> 12 & 0xf, hw->snpsid >> 8 & 0xf,  		hw->snpsid >> 4 & 0xf, hw->snpsid & 0xf, hw->snpsid); -	hwcfg1 = dwc2_readl(hsotg->regs + GHWCFG1); -	hwcfg2 = dwc2_readl(hsotg->regs + GHWCFG2); -	hwcfg3 = dwc2_readl(hsotg->regs + GHWCFG3); -	hwcfg4 = dwc2_readl(hsotg->regs + GHWCFG4); -	grxfsiz = dwc2_readl(hsotg->regs + GRXFSIZ); +	hwcfg1 = dwc2_readl(hsotg, GHWCFG1); +	hwcfg2 = dwc2_readl(hsotg, GHWCFG2); +	hwcfg3 = dwc2_readl(hsotg, GHWCFG3); +	hwcfg4 = dwc2_readl(hsotg, GHWCFG4); +	grxfsiz = dwc2_readl(hsotg, GRXFSIZ);  	/* hwcfg1 */  	hw->dev_ep_dirs = hwcfg1;  |