Skip to content

Commit

Permalink
usb: dwc3: core: move fladj to dwc3 structure
Browse files Browse the repository at this point in the history
this patch is in preparation for some further
re-factoring in dwc3 initialization. No functional
changes.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
  • Loading branch information
Felipe Balbi committed Jun 20, 2016
1 parent 2eb8801 commit bcdb327
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 7 additions & 9 deletions drivers/usb/dwc3/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,25 +149,24 @@ static int dwc3_soft_reset(struct dwc3 *dwc)
/*
* dwc3_frame_length_adjustment - Adjusts frame length if required
* @dwc3: Pointer to our controller context structure
* @fladj: Value of GFLADJ_30MHZ to adjust frame length
*/
static void dwc3_frame_length_adjustment(struct dwc3 *dwc, u32 fladj)
static void dwc3_frame_length_adjustment(struct dwc3 *dwc)
{
u32 reg;
u32 dft;

if (dwc->revision < DWC3_REVISION_250A)
return;

if (fladj == 0)
if (dwc->fladj == 0)
return;

reg = dwc3_readl(dwc->regs, DWC3_GFLADJ);
dft = reg & DWC3_GFLADJ_30MHZ_MASK;
if (!dev_WARN_ONCE(dwc->dev, dft == fladj,
if (!dev_WARN_ONCE(dwc->dev, dft == dwc->fladj,
"request value same as default, ignoring\n")) {
reg &= ~DWC3_GFLADJ_30MHZ_MASK;
reg |= DWC3_GFLADJ_30MHZ_SDBND_SEL | fladj;
reg |= DWC3_GFLADJ_30MHZ_SDBND_SEL | dwc->fladj;
dwc3_writel(dwc->regs, DWC3_GFLADJ, reg);
}
}
Expand Down Expand Up @@ -799,7 +798,6 @@ static int dwc3_probe(struct platform_device *pdev)
u8 lpm_nyet_threshold;
u8 tx_de_emphasis;
u8 hird_threshold;
u32 fladj = 0;

int ret;

Expand Down Expand Up @@ -909,7 +907,7 @@ static int dwc3_probe(struct platform_device *pdev)
device_property_read_string(dev, "snps,hsphy_interface",
&dwc->hsphy_interface);
device_property_read_u32(dev, "snps,quirk-frame-length-adjustment",
&fladj);
&dwc->fladj);

if (pdata) {
dwc->maximum_speed = pdata->maximum_speed;
Expand Down Expand Up @@ -941,7 +939,7 @@ static int dwc3_probe(struct platform_device *pdev)
tx_de_emphasis = pdata->tx_de_emphasis;

dwc->hsphy_interface = pdata->hsphy_interface;
fladj = pdata->fladj_value;
dwc->fladj = pdata->fladj_value;
}

dwc->lpm_nyet_threshold = lpm_nyet_threshold;
Expand Down Expand Up @@ -1022,7 +1020,7 @@ static int dwc3_probe(struct platform_device *pdev)
}

/* Adjust Frame Length */
dwc3_frame_length_adjustment(dwc, fladj);
dwc3_frame_length_adjustment(dwc);

usb_phy_set_suspend(dwc->usb2_phy, 0);
usb_phy_set_suspend(dwc->usb3_phy, 0);
Expand Down
2 changes: 2 additions & 0 deletions drivers/usb/dwc3/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,7 @@ struct dwc3_scratchpad_array {
* @gadget_driver: pointer to the gadget driver
* @regs: base address for our registers
* @regs_size: address space size
* @fladj: frame length adjustment
* @nr_scratch: number of scratch buffers
* @u1u2: only used on revisions <1.83a for workaround
* @maximum_speed: maximum speed requested (mainly for testing purposes)
Expand Down Expand Up @@ -838,6 +839,7 @@ struct dwc3 {
/* used for suspend/resume */
u32 gctl;

u32 fladj;
u32 nr_scratch;
u32 u1u2;
u32 maximum_speed;
Expand Down

0 comments on commit bcdb327

Please sign in to comment.