-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'musb-hw' of git://gitorious.org/usb/usb into musb
* 'musb-hw' of git://gitorious.org/usb/usb: (43 commits) usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource arm: OMAP4430: musb: Configure musb to OTG mode usb: musb: Adding musb support for OMAP4430 usb: otg: TWL6030: Add twl6030_usb file for compilation mfd: TWL6030: OMAP4: Registering the TWL6030-usb device usb: musb: TWL6030: Selecting TWL6030_USB transceiver usb: otg: Kconfig: Add Kconfig option for TWL6030 transceiver. usb: otg: Adding twl6030-usb transceiver driver for OMAP4430 mfd: TWL6030: USBOTG VBUS event generation on usb: musb: add support for ux500 platform musb: am35x: fix compile error due to control apis arm: omap4: enable usb on 4430sdp usb: musb: drop board_set_vbus usb: musb: drop musb_platform_suspend/resume usb: musb: blackfin: usb dev_pm_ops structure usb: musb: am35x: usb dev_pm_ops structure usb: musb: omap2430: use dev_pm_ops structure usb: musb: omap2430: drop the nops usb: musb: mark musb_save/restore_context static ...
- Loading branch information
Showing
42 changed files
with
2,526 additions
and
629 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| /* | ||
| * This file configures the internal USB PHY in OMAP4430. Used | ||
| * with TWL6030 transceiver and MUSB on OMAP4430. | ||
| * | ||
| * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Author: Hema HK <hemahk@ti.com> | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| * | ||
| */ | ||
|
|
||
| #include <linux/types.h> | ||
| #include <linux/delay.h> | ||
| #include <linux/clk.h> | ||
| #include <linux/io.h> | ||
| #include <linux/err.h> | ||
| #include <linux/usb.h> | ||
|
|
||
| #include <plat/usb.h> | ||
|
|
||
| /* OMAP control module register for UTMI PHY */ | ||
| #define CONTROL_DEV_CONF 0x300 | ||
| #define PHY_PD 0x1 | ||
|
|
||
| #define USBOTGHS_CONTROL 0x33c | ||
| #define AVALID BIT(0) | ||
| #define BVALID BIT(1) | ||
| #define VBUSVALID BIT(2) | ||
| #define SESSEND BIT(3) | ||
| #define IDDIG BIT(4) | ||
|
|
||
| static struct clk *phyclk, *clk48m, *clk32k; | ||
| static void __iomem *ctrl_base; | ||
|
|
||
| int omap4430_phy_init(struct device *dev) | ||
| { | ||
| ctrl_base = ioremap(OMAP443X_SCM_BASE, SZ_1K); | ||
| if (!ctrl_base) { | ||
| dev_err(dev, "control module ioremap failed\n"); | ||
| return -ENOMEM; | ||
| } | ||
| /* Power down the phy */ | ||
| __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF); | ||
| phyclk = clk_get(dev, "ocp2scp_usb_phy_ick"); | ||
|
|
||
| if (IS_ERR(phyclk)) { | ||
| dev_err(dev, "cannot clk_get ocp2scp_usb_phy_ick\n"); | ||
| iounmap(ctrl_base); | ||
| return PTR_ERR(phyclk); | ||
| } | ||
|
|
||
| clk48m = clk_get(dev, "ocp2scp_usb_phy_phy_48m"); | ||
| if (IS_ERR(clk48m)) { | ||
| dev_err(dev, "cannot clk_get ocp2scp_usb_phy_phy_48m\n"); | ||
| clk_put(phyclk); | ||
| iounmap(ctrl_base); | ||
| return PTR_ERR(clk48m); | ||
| } | ||
|
|
||
| clk32k = clk_get(dev, "usb_phy_cm_clk32k"); | ||
| if (IS_ERR(clk32k)) { | ||
| dev_err(dev, "cannot clk_get usb_phy_cm_clk32k\n"); | ||
| clk_put(phyclk); | ||
| clk_put(clk48m); | ||
| iounmap(ctrl_base); | ||
| return PTR_ERR(clk32k); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| int omap4430_phy_set_clk(struct device *dev, int on) | ||
| { | ||
| static int state; | ||
|
|
||
| if (on && !state) { | ||
| /* Enable the phy clocks */ | ||
| clk_enable(phyclk); | ||
| clk_enable(clk48m); | ||
| clk_enable(clk32k); | ||
| state = 1; | ||
| } else if (state) { | ||
| /* Disable the phy clocks */ | ||
| clk_disable(phyclk); | ||
| clk_disable(clk48m); | ||
| clk_disable(clk32k); | ||
| state = 0; | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| int omap4430_phy_power(struct device *dev, int ID, int on) | ||
| { | ||
| if (on) { | ||
| /* enabled the clocks */ | ||
| omap4430_phy_set_clk(dev, 1); | ||
| /* power on the phy */ | ||
| if (__raw_readl(ctrl_base + CONTROL_DEV_CONF) & PHY_PD) { | ||
| __raw_writel(~PHY_PD, ctrl_base + CONTROL_DEV_CONF); | ||
| mdelay(200); | ||
| } | ||
| if (ID) | ||
| /* enable VBUS valid, IDDIG groung */ | ||
| __raw_writel(AVALID | VBUSVALID, ctrl_base + | ||
| USBOTGHS_CONTROL); | ||
| else | ||
| /* | ||
| * Enable VBUS Valid, AValid and IDDIG | ||
| * high impedence | ||
| */ | ||
| __raw_writel(IDDIG | AVALID | VBUSVALID, | ||
| ctrl_base + USBOTGHS_CONTROL); | ||
| } else { | ||
| /* Enable session END and IDIG to high impedence. */ | ||
| __raw_writel(SESSEND | IDDIG, ctrl_base + | ||
| USBOTGHS_CONTROL); | ||
| /* Disable the clocks */ | ||
| omap4430_phy_set_clk(dev, 0); | ||
| /* Power down the phy */ | ||
| __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF); | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| int omap4430_phy_exit(struct device *dev) | ||
| { | ||
| if (ctrl_base) | ||
| iounmap(ctrl_base); | ||
| if (phyclk) | ||
| clk_put(phyclk); | ||
| if (clk48m) | ||
| clk_put(clk48m); | ||
| if (clk32k) | ||
| clk_put(clk32k); | ||
|
|
||
| return 0; | ||
| } |
Oops, something went wrong.