Commit 6d58f346 authored by John Youn's avatar John Youn Committed by Felipe Balbi

usb: dwc2: Rename dwc2_core_reset()

Renamed dwc2_core_reset() to dwc2_core_reset_and_force_dr_mode(). This
describes what it is doing more accurately. This is in preparation of
introducing a plain dwc2_core_reset() function that only performs the
reset and doesn't force the mode.
Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent b8ccc593
...@@ -481,7 +481,7 @@ static void dwc2_init_fs_ls_pclk_sel(struct dwc2_hsotg *hsotg) ...@@ -481,7 +481,7 @@ static void dwc2_init_fs_ls_pclk_sel(struct dwc2_hsotg *hsotg)
* Do core a soft reset of the core. Be careful with this because it * Do core a soft reset of the core. Be careful with this because it
* resets all the internal state machines of the core. * resets all the internal state machines of the core.
*/ */
int dwc2_core_reset(struct dwc2_hsotg *hsotg) int dwc2_core_reset_and_force_dr_mode(struct dwc2_hsotg *hsotg)
{ {
u32 greset; u32 greset;
int count = 0; int count = 0;
...@@ -561,7 +561,7 @@ static int dwc2_fs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy) ...@@ -561,7 +561,7 @@ static int dwc2_fs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
dwc2_writel(usbcfg, hsotg->regs + GUSBCFG); dwc2_writel(usbcfg, hsotg->regs + GUSBCFG);
/* Reset after a PHY select */ /* Reset after a PHY select */
retval = dwc2_core_reset(hsotg); retval = dwc2_core_reset_and_force_dr_mode(hsotg);
if (retval) { if (retval) {
dev_err(hsotg->dev, dev_err(hsotg->dev,
...@@ -640,7 +640,7 @@ static int dwc2_hs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy) ...@@ -640,7 +640,7 @@ static int dwc2_hs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
dwc2_writel(usbcfg, hsotg->regs + GUSBCFG); dwc2_writel(usbcfg, hsotg->regs + GUSBCFG);
/* Reset after setting the PHY parameters */ /* Reset after setting the PHY parameters */
retval = dwc2_core_reset(hsotg); retval = dwc2_core_reset_and_force_dr_mode(hsotg);
if (retval) { if (retval) {
dev_err(hsotg->dev, dev_err(hsotg->dev,
"%s: Reset failed, aborting", __func__); "%s: Reset failed, aborting", __func__);
...@@ -805,7 +805,7 @@ int dwc2_core_init(struct dwc2_hsotg *hsotg, bool initial_setup) ...@@ -805,7 +805,7 @@ int dwc2_core_init(struct dwc2_hsotg *hsotg, bool initial_setup)
* needed to in order to properly detect various parameters). * needed to in order to properly detect various parameters).
*/ */
if (!initial_setup) { if (!initial_setup) {
retval = dwc2_core_reset(hsotg); retval = dwc2_core_reset_and_force_dr_mode(hsotg);
if (retval) { if (retval) {
dev_err(hsotg->dev, "%s(): Reset failed, aborting\n", dev_err(hsotg->dev, "%s(): Reset failed, aborting\n",
__func__); __func__);
......
...@@ -880,7 +880,7 @@ enum dwc2_halt_status { ...@@ -880,7 +880,7 @@ enum dwc2_halt_status {
* The following functions support initialization of the core driver component * The following functions support initialization of the core driver component
* and the DWC_otg controller * and the DWC_otg controller
*/ */
extern int dwc2_core_reset(struct dwc2_hsotg *hsotg); extern int dwc2_core_reset_and_force_dr_mode(struct dwc2_hsotg *hsotg);
extern void dwc2_core_host_init(struct dwc2_hsotg *hsotg); extern void dwc2_core_host_init(struct dwc2_hsotg *hsotg);
extern int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg); extern int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg);
extern int dwc2_exit_hibernation(struct dwc2_hsotg *hsotg, bool restore); extern int dwc2_exit_hibernation(struct dwc2_hsotg *hsotg, bool restore);
......
...@@ -460,7 +460,7 @@ static int dwc2_driver_probe(struct platform_device *dev) ...@@ -460,7 +460,7 @@ static int dwc2_driver_probe(struct platform_device *dev)
* Reset before dwc2_get_hwparams() then it could get power-on real * Reset before dwc2_get_hwparams() then it could get power-on real
* reset value form registers. * reset value form registers.
*/ */
dwc2_core_reset(hsotg); dwc2_core_reset_and_force_dr_mode(hsotg);
/* Detect config values from hardware */ /* Detect config values from hardware */
retval = dwc2_get_hwparams(hsotg); retval = dwc2_get_hwparams(hsotg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment