Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AndroidKernelMSM
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Werner Sembach
AndroidKernelMSM
Commits
dc6ada2f
Commit
dc6ada2f
authored
Apr 19, 2013
by
Arve Hjønnevåg
Browse files
Options
Downloads
Patches
Plain Diff
usb: dwc3: HACK: Disable code requesting a usb-phy
The phy we are using is created later in the same probe function
parent
5bdddcf6
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
drivers/usb/dwc3/core.c
+12
-6
12 additions, 6 deletions
drivers/usb/dwc3/core.c
with
12 additions
and
6 deletions
drivers/usb/dwc3/core.c
+
12
−
6
View file @
dc6ada2f
...
...
@@ -99,8 +99,8 @@ static void dwc3_core_soft_reset(struct dwc3 *dwc)
reg
|=
DWC3_GUSB2PHYCFG_PHYSOFTRST
;
dwc3_writel
(
dwc
->
regs
,
DWC3_GUSB2PHYCFG
(
0
),
reg
);
usb_phy_init
(
dwc
->
usb2_phy
);
usb_phy_init
(
dwc
->
usb3_phy
);
//
usb_phy_init(dwc->usb2_phy);
//
usb_phy_init(dwc->usb3_phy);
mdelay
(
100
);
/* Clear USB3 PHY reset */
...
...
@@ -395,8 +395,8 @@ static void dwc3_core_exit(struct dwc3 *dwc)
{
dwc3_event_buffers_cleanup
(
dwc
);
usb_phy_shutdown
(
dwc
->
usb2_phy
);
usb_phy_shutdown
(
dwc
->
usb3_phy
);
//
usb_phy_shutdown(dwc->usb2_phy);
//
usb_phy_shutdown(dwc->usb3_phy);
}
/* XHCI reset, resets other CORE registers as well, re-init those */
...
...
@@ -422,6 +422,7 @@ static int dwc3_probe(struct platform_device *pdev)
u8
mode
;
dev_info
(
&
pdev
->
dev
,
"%s: enter
\n
"
,
__func__
);
mem
=
devm_kzalloc
(
dev
,
sizeof
(
*
dwc
)
+
DWC3_ALIGN_MASK
,
GFP_KERNEL
);
if
(
!
mem
)
{
dev_err
(
dev
,
"not enough memory
\n
"
);
...
...
@@ -469,6 +470,7 @@ static int dwc3_probe(struct platform_device *pdev)
return
-
ENOMEM
;
}
#if 0
if (node) {
dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0);
dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 1);
...
...
@@ -489,6 +491,7 @@ static int dwc3_probe(struct platform_device *pdev)
usb_phy_set_suspend(dwc->usb2_phy, 0);
usb_phy_set_suspend(dwc->usb3_phy, 0);
#endif
spin_lock_init
(
&
dwc
->
lock
);
platform_set_drvdata
(
pdev
,
dwc
);
...
...
@@ -532,6 +535,7 @@ static int dwc3_probe(struct platform_device *pdev)
}
mode
=
DWC3_MODE
(
dwc
->
hwparams
.
hwparams0
);
dev_info
(
&
pdev
->
dev
,
"%s: mode %d
\n
"
,
__func__
,
mode
);
switch
(
mode
)
{
case
DWC3_MODE_DEVICE
:
...
...
@@ -585,6 +589,7 @@ static int dwc3_probe(struct platform_device *pdev)
goto
err2
;
}
dev_info
(
&
pdev
->
dev
,
"%s: done
\n
"
,
__func__
);
return
0
;
err2:
...
...
@@ -611,6 +616,7 @@ err1:
err0:
dwc3_free_event_buffers
(
dwc
);
dev_info
(
&
pdev
->
dev
,
"%s: failed
\n
"
,
__func__
);
return
ret
;
}
...
...
@@ -618,8 +624,8 @@ static int dwc3_remove(struct platform_device *pdev)
{
struct
dwc3
*
dwc
=
platform_get_drvdata
(
pdev
);
usb_phy_set_suspend
(
dwc
->
usb2_phy
,
1
);
usb_phy_set_suspend
(
dwc
->
usb3_phy
,
1
);
//
usb_phy_set_suspend(dwc->usb2_phy, 1);
//
usb_phy_set_suspend(dwc->usb3_phy, 1);
pm_runtime_disable
(
&
pdev
->
dev
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment