Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
0d42836c
Commit
0d42836c
authored
Dec 16, 2011
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'usbhost_runtime_pm_14_devel_3.3' of
git://git.pwsan.com/linux-2.6
into ehci
parents
986b0c25
1e7fe1a9
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
369 additions
and
560 deletions
+369
-560
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock3xxx_data.c
+12
-14
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/clock44xx_data.c
+5
-5
arch/arm/mach-omap2/usb-host.c
arch/arm/mach-omap2/usb-host.c
+34
-66
arch/arm/plat-omap/include/plat/usb.h
arch/arm/plat-omap/include/plat/usb.h
+0
-3
drivers/mfd/omap-usb-host.c
drivers/mfd/omap-usb-host.c
+304
-451
drivers/usb/host/ehci-omap.c
drivers/usb/host/ehci-omap.c
+7
-10
drivers/usb/host/ohci-omap3.c
drivers/usb/host/ohci-omap3.c
+7
-11
No files found.
arch/arm/mach-omap2/clock3xxx_data.c
View file @
0d42836c
...
...
@@ -3297,7 +3297,7 @@ static struct omap_clk omap3xxx_clks[] = {
CLK
(
NULL
,
"cpefuse_fck"
,
&
cpefuse_fck
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
NULL
,
"ts_fck"
,
&
ts_fck
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
NULL
,
"usbtll_fck"
,
&
usbtll_fck
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"usbhs
-omap.0
"
,
"usbtll_fck"
,
&
usbtll_fck
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"usbhs
_omap
"
,
"usbtll_fck"
,
&
usbtll_fck
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"omap-mcbsp.1"
,
"prcm_fck"
,
&
core_96m_fck
,
CK_3XXX
),
CLK
(
"omap-mcbsp.5"
,
"prcm_fck"
,
&
core_96m_fck
,
CK_3XXX
),
CLK
(
NULL
,
"core_96m_fck"
,
&
core_96m_fck
,
CK_3XXX
),
...
...
@@ -3333,7 +3333,7 @@ static struct omap_clk omap3xxx_clks[] = {
CLK
(
NULL
,
"pka_ick"
,
&
pka_ick
,
CK_34XX
|
CK_36XX
),
CLK
(
NULL
,
"core_l4_ick"
,
&
core_l4_ick
,
CK_3XXX
),
CLK
(
NULL
,
"usbtll_ick"
,
&
usbtll_ick
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"usbhs
-omap.0
"
,
"usbtll_ick"
,
&
usbtll_ick
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"usbhs
_omap
"
,
"usbtll_ick"
,
&
usbtll_ick
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"omap_hsmmc.2"
,
"ick"
,
&
mmchs3_ick
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
NULL
,
"icr_ick"
,
&
icr_ick
,
CK_34XX
|
CK_36XX
),
CLK
(
"omap-aes"
,
"ick"
,
&
aes2_ick
,
CK_34XX
|
CK_36XX
),
...
...
@@ -3379,20 +3379,18 @@ static struct omap_clk omap3xxx_clks[] = {
CLK
(
NULL
,
"cam_ick"
,
&
cam_ick
,
CK_34XX
|
CK_36XX
),
CLK
(
NULL
,
"csi2_96m_fck"
,
&
csi2_96m_fck
,
CK_34XX
|
CK_36XX
),
CLK
(
NULL
,
"usbhost_120m_fck"
,
&
usbhost_120m_fck
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"usbhs-omap.0"
,
"hs_fck"
,
&
usbhost_120m_fck
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
NULL
,
"usbhost_48m_fck"
,
&
usbhost_48m_fck
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"usbhs-omap.0"
,
"fs_fck"
,
&
usbhost_48m_fck
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
NULL
,
"usbhost_ick"
,
&
usbhost_ick
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"usbhs
-omap.0
"
,
"usbhost_ick"
,
&
usbhost_ick
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"usbhs
-omap.0
"
,
"utmi_p1_gfclk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
-omap.0
"
,
"utmi_p2_gfclk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
-omap.0
"
,
"xclk60mhsp1_ck"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
-omap.0
"
,
"xclk60mhsp2_ck"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
-omap.0
"
,
"usb_host_hs_utmi_p1_clk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
-omap.0
"
,
"usb_host_hs_utmi_p2_clk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
-omap.0
"
,
"usb_tll_hs_usb_ch0_clk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
-omap.0
"
,
"usb_tll_hs_usb_ch1_clk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
-omap.0
"
,
"init_60m_fclk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
_omap
"
,
"usbhost_ick"
,
&
usbhost_ick
,
CK_3430ES2PLUS
|
CK_AM35XX
|
CK_36XX
),
CLK
(
"usbhs
_omap
"
,
"utmi_p1_gfclk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
_omap
"
,
"utmi_p2_gfclk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
_omap
"
,
"xclk60mhsp1_ck"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
_omap
"
,
"xclk60mhsp2_ck"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
_omap
"
,
"usb_host_hs_utmi_p1_clk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
_omap
"
,
"usb_host_hs_utmi_p2_clk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
_omap
"
,
"usb_tll_hs_usb_ch0_clk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
_omap
"
,
"usb_tll_hs_usb_ch1_clk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
"usbhs
_omap
"
,
"init_60m_fclk"
,
&
dummy_ck
,
CK_3XXX
),
CLK
(
NULL
,
"usim_fck"
,
&
usim_fck
,
CK_3430ES2PLUS
|
CK_36XX
),
CLK
(
NULL
,
"gpt1_fck"
,
&
gpt1_fck
,
CK_3XXX
),
CLK
(
NULL
,
"wkup_32k_fck"
,
&
wkup_32k_fck
,
CK_3XXX
),
...
...
arch/arm/mach-omap2/clock44xx_data.c
View file @
0d42836c
...
...
@@ -3295,7 +3295,7 @@ static struct omap_clk omap44xx_clks[] = {
CLK
(
NULL
,
"uart2_fck"
,
&
uart2_fck
,
CK_443X
),
CLK
(
NULL
,
"uart3_fck"
,
&
uart3_fck
,
CK_443X
),
CLK
(
NULL
,
"uart4_fck"
,
&
uart4_fck
,
CK_443X
),
CLK
(
"usbhs
-omap.0
"
,
"fs_fck"
,
&
usb_host_fs_fck
,
CK_443X
),
CLK
(
"usbhs
_omap
"
,
"fs_fck"
,
&
usb_host_fs_fck
,
CK_443X
),
CLK
(
NULL
,
"utmi_p1_gfclk"
,
&
utmi_p1_gfclk
,
CK_443X
),
CLK
(
NULL
,
"usb_host_hs_utmi_p1_clk"
,
&
usb_host_hs_utmi_p1_clk
,
CK_443X
),
CLK
(
NULL
,
"utmi_p2_gfclk"
,
&
utmi_p2_gfclk
,
CK_443X
),
...
...
@@ -3306,7 +3306,7 @@ static struct omap_clk omap44xx_clks[] = {
CLK
(
NULL
,
"usb_host_hs_hsic60m_p2_clk"
,
&
usb_host_hs_hsic60m_p2_clk
,
CK_443X
),
CLK
(
NULL
,
"usb_host_hs_hsic480m_p2_clk"
,
&
usb_host_hs_hsic480m_p2_clk
,
CK_443X
),
CLK
(
NULL
,
"usb_host_hs_func48mclk"
,
&
usb_host_hs_func48mclk
,
CK_443X
),
CLK
(
"usbhs
-omap.0
"
,
"hs_fck"
,
&
usb_host_hs_fck
,
CK_443X
),
CLK
(
"usbhs
_omap
"
,
"hs_fck"
,
&
usb_host_hs_fck
,
CK_443X
),
CLK
(
NULL
,
"otg_60m_gfclk"
,
&
otg_60m_gfclk
,
CK_443X
),
CLK
(
NULL
,
"usb_otg_hs_xclk"
,
&
usb_otg_hs_xclk
,
CK_443X
),
CLK
(
"musb-omap2430"
,
"ick"
,
&
usb_otg_hs_ick
,
CK_443X
),
...
...
@@ -3314,7 +3314,7 @@ static struct omap_clk omap44xx_clks[] = {
CLK
(
NULL
,
"usb_tll_hs_usb_ch2_clk"
,
&
usb_tll_hs_usb_ch2_clk
,
CK_443X
),
CLK
(
NULL
,
"usb_tll_hs_usb_ch0_clk"
,
&
usb_tll_hs_usb_ch0_clk
,
CK_443X
),
CLK
(
NULL
,
"usb_tll_hs_usb_ch1_clk"
,
&
usb_tll_hs_usb_ch1_clk
,
CK_443X
),
CLK
(
"usbhs
-omap.0
"
,
"usbtll_ick"
,
&
usb_tll_hs_ick
,
CK_443X
),
CLK
(
"usbhs
_omap
"
,
"usbtll_ick"
,
&
usb_tll_hs_ick
,
CK_443X
),
CLK
(
NULL
,
"usim_ck"
,
&
usim_ck
,
CK_443X
),
CLK
(
NULL
,
"usim_fclk"
,
&
usim_fclk
,
CK_443X
),
CLK
(
NULL
,
"usim_fck"
,
&
usim_fck
,
CK_443X
),
...
...
@@ -3374,8 +3374,8 @@ static struct omap_clk omap44xx_clks[] = {
CLK
(
NULL
,
"uart2_ick"
,
&
dummy_ck
,
CK_443X
),
CLK
(
NULL
,
"uart3_ick"
,
&
dummy_ck
,
CK_443X
),
CLK
(
NULL
,
"uart4_ick"
,
&
dummy_ck
,
CK_443X
),
CLK
(
"usbhs
-omap.0
"
,
"usbhost_ick"
,
&
dummy_ck
,
CK_443X
),
CLK
(
"usbhs
-omap.0
"
,
"usbtll_fck"
,
&
dummy_ck
,
CK_443X
),
CLK
(
"usbhs
_omap
"
,
"usbhost_ick"
,
&
dummy_ck
,
CK_443X
),
CLK
(
"usbhs
_omap
"
,
"usbtll_fck"
,
&
dummy_ck
,
CK_443X
),
CLK
(
"omap_wdt"
,
"ick"
,
&
dummy_ck
,
CK_443X
),
CLK
(
"omap_timer.1"
,
"32k_ck"
,
&
sys_32k_ck
,
CK_443X
),
CLK
(
"omap_timer.2"
,
"32k_ck"
,
&
sys_32k_ck
,
CK_443X
),
...
...
arch/arm/mach-omap2/usb-host.c
View file @
0d42836c
...
...
@@ -28,51 +28,28 @@
#include <mach/hardware.h>
#include <mach/irqs.h>
#include <plat/usb.h>
#include <plat/omap_device.h>
#include "mux.h"
#ifdef CONFIG_MFD_OMAP_USB_HOST
#define OMAP_USBHS_DEVICE "usbhs-omap"
static
struct
resource
usbhs_resources
[]
=
{
{
.
name
=
"uhh"
,
.
flags
=
IORESOURCE_MEM
,
},
{
.
name
=
"tll"
,
.
flags
=
IORESOURCE_MEM
,
},
{
.
name
=
"ehci"
,
.
flags
=
IORESOURCE_MEM
,
},
{
.
name
=
"ehci-irq"
,
.
flags
=
IORESOURCE_IRQ
,
},
{
.
name
=
"ohci"
,
.
flags
=
IORESOURCE_MEM
,
},
{
.
name
=
"ohci-irq"
,
.
flags
=
IORESOURCE_IRQ
,
}
};
static
struct
platform_device
usbhs_device
=
{
.
name
=
OMAP_USBHS_DEVICE
,
.
id
=
0
,
.
num_resources
=
ARRAY_SIZE
(
usbhs_resources
),
.
resource
=
usbhs_resources
,
};
#define OMAP_USBHS_DEVICE "usbhs_omap"
#define USBHS_UHH_HWMODNAME "usb_host_hs"
#define USBHS_TLL_HWMODNAME "usb_tll_hs"
static
struct
usbhs_omap_platform_data
usbhs_data
;
static
struct
ehci_hcd_omap_platform_data
ehci_data
;
static
struct
ohci_hcd_omap_platform_data
ohci_data
;
static
struct
omap_device_pm_latency
omap_uhhtll_latency
[]
=
{
{
.
deactivate_func
=
omap_device_idle_hwmods
,
.
activate_func
=
omap_device_enable_hwmods
,
.
flags
=
OMAP_DEVICE_LATENCY_AUTO_ADJUST
,
},
};
/* MUX settings for EHCI pins */
/*
* setup_ehci_io_mux - initialize IO pad mux for USBHOST
...
...
@@ -508,6 +485,9 @@ static void setup_4430ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)
void
__init
usbhs_init
(
const
struct
usbhs_omap_board_data
*
pdata
)
{
struct
omap_hwmod
*
oh
[
2
];
struct
omap_device
*
od
;
int
bus_id
=
-
1
;
int
i
;
for
(
i
=
0
;
i
<
OMAP3_HS_USB_PORTS
;
i
++
)
{
...
...
@@ -523,44 +503,34 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
usbhs_data
.
ohci_data
=
&
ohci_data
;
if
(
cpu_is_omap34xx
())
{
usbhs_resources
[
0
].
start
=
OMAP34XX_UHH_CONFIG_BASE
;
usbhs_resources
[
0
].
end
=
OMAP34XX_UHH_CONFIG_BASE
+
SZ_1K
-
1
;
usbhs_resources
[
1
].
start
=
OMAP34XX_USBTLL_BASE
;
usbhs_resources
[
1
].
end
=
OMAP34XX_USBTLL_BASE
+
SZ_4K
-
1
;
usbhs_resources
[
2
].
start
=
OMAP34XX_EHCI_BASE
;
usbhs_resources
[
2
].
end
=
OMAP34XX_EHCI_BASE
+
SZ_1K
-
1
;
usbhs_resources
[
3
].
start
=
INT_34XX_EHCI_IRQ
;
usbhs_resources
[
4
].
start
=
OMAP34XX_OHCI_BASE
;
usbhs_resources
[
4
].
end
=
OMAP34XX_OHCI_BASE
+
SZ_1K
-
1
;
usbhs_resources
[
5
].
start
=
INT_34XX_OHCI_IRQ
;
setup_ehci_io_mux
(
pdata
->
port_mode
);
setup_ohci_io_mux
(
pdata
->
port_mode
);
}
else
if
(
cpu_is_omap44xx
())
{
usbhs_resources
[
0
].
start
=
OMAP44XX_UHH_CONFIG_BASE
;
usbhs_resources
[
0
].
end
=
OMAP44XX_UHH_CONFIG_BASE
+
SZ_1K
-
1
;
usbhs_resources
[
1
].
start
=
OMAP44XX_USBTLL_BASE
;
usbhs_resources
[
1
].
end
=
OMAP44XX_USBTLL_BASE
+
SZ_4K
-
1
;
usbhs_resources
[
2
].
start
=
OMAP44XX_HSUSB_EHCI_BASE
;
usbhs_resources
[
2
].
end
=
OMAP44XX_HSUSB_EHCI_BASE
+
SZ_1K
-
1
;
usbhs_resources
[
3
].
start
=
OMAP44XX_IRQ_EHCI
;
usbhs_resources
[
4
].
start
=
OMAP44XX_HSUSB_OHCI_BASE
;
usbhs_resources
[
4
].
end
=
OMAP44XX_HSUSB_OHCI_BASE
+
SZ_1K
-
1
;
usbhs_resources
[
5
].
start
=
OMAP44XX_IRQ_OHCI
;
setup_4430ehci_io_mux
(
pdata
->
port_mode
);
setup_4430ohci_io_mux
(
pdata
->
port_mode
);
}
if
(
platform_device_add_data
(
&
usbhs_device
,
&
usbhs_data
,
sizeof
(
usbhs_data
))
<
0
)
{
pr
intk
(
KERN_ERR
"USBHS platform_device_add_data failed
\n
"
);
goto
init_end
;
oh
[
0
]
=
omap_hwmod_lookup
(
USBHS_UHH_HWMODNAME
);
if
(
!
oh
[
0
]
)
{
pr
_err
(
"Could not look up %s
\n
"
,
USBHS_UHH_HWMODNAME
);
return
;
}
if
(
platform_device_register
(
&
usbhs_device
)
<
0
)
printk
(
KERN_ERR
"USBHS platform_device_register failed
\n
"
);
oh
[
1
]
=
omap_hwmod_lookup
(
USBHS_TLL_HWMODNAME
);
if
(
!
oh
[
1
])
{
pr_err
(
"Could not look up %s
\n
"
,
USBHS_TLL_HWMODNAME
);
return
;
}
init_end:
od
=
omap_device_build_ss
(
OMAP_USBHS_DEVICE
,
bus_id
,
oh
,
2
,
(
void
*
)
&
usbhs_data
,
sizeof
(
usbhs_data
),
omap_uhhtll_latency
,
ARRAY_SIZE
(
omap_uhhtll_latency
),
false
);
if
(
IS_ERR
(
od
))
{
pr_err
(
"Could not build hwmod devices %s,%s
\n
"
,
USBHS_UHH_HWMODNAME
,
USBHS_TLL_HWMODNAME
);
return
;
}
}
#else
...
...
@@ -570,5 +540,3 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
}
#endif
arch/arm/plat-omap/include/plat/usb.h
View file @
0d42836c
...
...
@@ -100,9 +100,6 @@ extern void usb_musb_init(struct omap_musb_board_data *board_data);
extern
void
usbhs_init
(
const
struct
usbhs_omap_board_data
*
pdata
);
extern
int
omap_usbhs_enable
(
struct
device
*
dev
);
extern
void
omap_usbhs_disable
(
struct
device
*
dev
);
extern
int
omap4430_phy_power
(
struct
device
*
dev
,
int
ID
,
int
on
);
extern
int
omap4430_phy_set_clk
(
struct
device
*
dev
,
int
on
);
extern
int
omap4430_phy_init
(
struct
device
*
dev
);
...
...
drivers/mfd/omap-usb-host.c
View file @
0d42836c
This diff is collapsed.
Click to expand it.
drivers/usb/host/ehci-omap.c
View file @
0d42836c
...
...
@@ -41,6 +41,7 @@
#include <linux/usb/ulpi.h>
#include <plat/usb.h>
#include <linux/regulator/consumer.h>
#include <linux/pm_runtime.h>
/* EHCI Register Set */
#define EHCI_INSNREG04 (0xA0)
...
...
@@ -190,11 +191,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
}
}
ret
=
omap_usbhs_enable
(
dev
);
if
(
ret
)
{
dev_err
(
dev
,
"failed to start usbhs with err %d
\n
"
,
ret
);
goto
err_enable
;
}
pm_runtime_enable
(
dev
);
pm_runtime_get_sync
(
dev
);
/*
* An undocumented "feature" in the OMAP3 EHCI controller,
...
...
@@ -240,11 +238,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
return
0
;
err_add_hcd:
omap_usbhs_disable
(
dev
);
err_enable:
disable_put_regulator
(
pdata
);
usb_put_hcd
(
hcd
);
pm_runtime_put_sync
(
dev
);
err_io:
iounmap
(
regs
);
...
...
@@ -266,10 +261,12 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
struct
usb_hcd
*
hcd
=
dev_get_drvdata
(
dev
);
usb_remove_hcd
(
hcd
);
omap_usbhs_disable
(
dev
);
disable_put_regulator
(
dev
->
platform_data
);
iounmap
(
hcd
->
regs
);
usb_put_hcd
(
hcd
);
pm_runtime_put_sync
(
dev
);
pm_runtime_disable
(
dev
);
return
0
;
}
...
...
drivers/usb/host/ohci-omap3.c
View file @
0d42836c
...
...
@@ -31,6 +31,7 @@
#include <linux/platform_device.h>
#include <plat/usb.h>
#include <linux/pm_runtime.h>
/*-------------------------------------------------------------------------*/
...
...
@@ -134,7 +135,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
int
irq
;
if
(
usb_disabled
())
goto
err_end
;
return
-
ENODEV
;
if
(
!
dev
->
parent
)
{
dev_err
(
dev
,
"Missing parent device
\n
"
);
...
...
@@ -172,11 +173,8 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
hcd
->
rsrc_len
=
resource_size
(
res
);
hcd
->
regs
=
regs
;
ret
=
omap_usbhs_enable
(
dev
);
if
(
ret
)
{
dev_dbg
(
dev
,
"failed to start ohci
\n
"
);
goto
err_end
;
}
pm_runtime_enable
(
dev
);
pm_runtime_get_sync
(
dev
);
ohci_hcd_init
(
hcd_to_ohci
(
hcd
));
...
...
@@ -189,9 +187,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
return
0
;
err_add_hcd:
omap_usbhs_disable
(
dev
);
err_end:
pm_runtime_put_sync
(
dev
);
usb_put_hcd
(
hcd
);
err_io:
...
...
@@ -220,9 +216,9 @@ static int __devexit ohci_hcd_omap3_remove(struct platform_device *pdev)
iounmap
(
hcd
->
regs
);
usb_remove_hcd
(
hcd
);
omap_usbhs_disable
(
dev
);
pm_runtime_put_sync
(
dev
);
pm_runtime_disable
(
dev
);
usb_put_hcd
(
hcd
);
return
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment