DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: otg: Add usb_hs_system_clk to OTG driver for MSM9615

Browse Source 
This change add usb system clock support to OTG Driver.
System clock is a 60MHZ input clock to the USB ChipIdea core.
This clock is required starting from MDM9615.

This change also removes the enforcement for using a phy_reset_clk
for reseting the PHY. Starting from MDM9615, PHY reset is not implemented.
The core is reset together with the PHY using "usb_hs_clk" signal.

Signed-off-by: Amit Blay <ablay@codeaurora.org>
This commit is contained in:
Amit Blay
2011-09-21 16:46:24 +03:00
committed by Bryan Huntsman
parent d98328ef47
commit 02eff13c45
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/usb/otg/msm_otg.c
View File

@@ -382,6 +382,9 @@ static int msm_otg_phy_clk_reset(struct msm_otg *motg)
{
int ret;
if (IS_ERR(motg->phy_reset_clk))
return 0;
ret = clk_reset(motg->phy_reset_clk, CLK_RESET_ASSERT);
if (ret) {
dev_err(motg->otg.dev, "usb phy clk assert failed\n");
@@ -1813,12 +1816,10 @@ static int __init msm_otg_probe(struct platform_device *pdev)
otg = &motg->otg;
otg->dev = &pdev->dev;
/* Some targets don't support PHY clock. */
motg->phy_reset_clk = clk_get(&pdev->dev, "usb_phy_clk");
if (IS_ERR(motg->phy_reset_clk)) {
if (IS_ERR(motg->phy_reset_clk))
dev_err(&pdev->dev, "failed to get usb_phy_clk\n");
ret = PTR_ERR(motg->phy_reset_clk);
goto free_motg;
}
motg->clk = clk_get(&pdev->dev, "usb_hs_clk");
if (IS_ERR(motg->clk)) {
@@ -1845,7 +1846,6 @@ static int __init msm_otg_probe(struct platform_device *pdev)
} else
motg->pclk_src = ERR_PTR(-ENOENT);
motg->pclk = clk_get(&pdev->dev, "usb_hs_pclk");
if (IS_ERR(motg->pclk)) {
dev_err(&pdev->dev, "failed to get usb_hs_pclk\n");
@@ -1853,6 +1853,10 @@ static int __init msm_otg_probe(struct platform_device *pdev)
goto put_pclk_src;
}
motg->system_clk = clk_get(&pdev->dev, "usb_hs_system_clk");
if (!IS_ERR(motg->system_clk))
clk_enable(motg->system_clk);
/*
* USB core clock is not present on all MSM chips. This
* clock is introduced to remove the dependency on AXI
@@ -2001,6 +2005,11 @@ free_regs:
put_core_clk:
if (motg->core_clk)
clk_put(motg->core_clk);
if (!IS_ERR(motg->system_clk)) {
clk_disable(motg->system_clk);
clk_put(motg->system_clk);
}
put_pclk_src:
if (!IS_ERR(motg->pclk_src)) {
clk_disable(motg->pclk_src);
@@ -2009,8 +2018,9 @@ put_pclk_src:
put_clk:
clk_put(motg->clk);
put_phy_reset_clk:
clk_put(motg->phy_reset_clk);
free_motg:
if (!IS_ERR(motg->phy_reset_clk))
clk_put(motg->phy_reset_clk);
kfree(motg);
return ret;
}
@@ -2071,11 +2081,14 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)
iounmap(motg->regs);
pm_runtime_set_suspended(&pdev->dev);
clk_put(motg->phy_reset_clk);
if (!IS_ERR(motg->phy_reset_clk))
clk_put(motg->phy_reset_clk);
clk_put(motg->pclk);
clk_put(motg->clk);
if (motg->core_clk)
clk_put(motg->core_clk);
if (!IS_ERR(motg->system_clk))
clk_put(motg->system_clk);
kfree(motg);

2
include/linux/usb/msm_hsusb.h
View File

@@ -165,6 +165,7 @@ struct msm_otg_platform_data {
* @pclk_src: pclk source for voting.
* @phy_reset_clk: clock struct of usb_phy_clk.
* @core_clk: clock struct of usb_hs_core_clk.
* @system_clk: clock struct of usb_system_clk.
* @regs: ioremapped register base address.
* @inputs: OTG state machine inputs(Id, SessValid etc).
* @sm_work: OTG state machine work.
@@ -192,6 +193,7 @@ struct msm_otg {
struct clk *pclk_src;
struct clk *phy_reset_clk;
struct clk *core_clk;
struct clk *system_clk;
void __iomem *regs;
#define ID 0
#define B_SESS_VLD 1