mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 08:31:55 +00:00
74e1a2a393
Here's the big USB merge for 3.9-rc1 Nothing major, lots of gadget fixes, and of course, xhci stuff. All of this has been in linux-next for a while, with the exception of the last 3 patches, which were reverts of patches in the tree that caused problems, they went in yesterday. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlEmZ/kACgkQMUfUDdst+ylEhwCgyM0JEOgLuW7M8D+oNcitZn51 g7oAniD0IkLG8RCB8plLj+82AvthalCo =bHSs -----END PGP SIGNATURE----- Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB patches from Greg Kroah-Hartman: "Here's the big USB merge for 3.9-rc1 Nothing major, lots of gadget fixes, and of course, xhci stuff. All of this has been in linux-next for a while, with the exception of the last 3 patches, which were reverts of patches in the tree that caused problems, they went in yesterday." * tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (190 commits) Revert "USB: EHCI: make ehci-vt8500 a separate driver" Revert "USB: EHCI: make ehci-orion a separate driver" Revert "USB: update host controller Kconfig entries" USB: update host controller Kconfig entries USB: EHCI: make ehci-orion a separate driver USB: EHCI: make ehci-vt8500 a separate driver USB: usb-storage: unusual_devs update for Super TOP SATA bridge USB: ehci-omap: Fix autoloading of module USB: ehci-omap: Don't free gpios that we didn't request USB: option: add Huawei "ACM" devices using protocol = vendor USB: serial: fix null-pointer dereferences on disconnect USB: option: add Yota / Megafon M100-1 4g modem drivers/usb: add missing GENERIC_HARDIRQS dependencies USB: storage: properly handle the endian issues of idProduct testusb: remove all mentions of 'usbfs' usb: gadget: imx_udc: make it depend on BROKEN usb: omap_control_usb: fix compile warning ARM: OMAP: USB: Add phy binding information ARM: OMAP2: MUSB: Specify omap4 has mailbox ARM: OMAP: devices: create device for usb part of control module ...
212 lines
5.1 KiB
C
212 lines
5.1 KiB
C
/*
|
|
* Copyright 2012 Freescale Semiconductor, Inc.
|
|
* Copyright (C) 2012 Marek Vasut <marex@denx.de>
|
|
* on behalf of DENX Software Engineering GmbH
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/usb/otg.h>
|
|
#include <linux/stmp_device.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
|
|
#define DRIVER_NAME "mxs_phy"
|
|
|
|
#define HW_USBPHY_PWD 0x00
|
|
#define HW_USBPHY_CTRL 0x30
|
|
#define HW_USBPHY_CTRL_SET 0x34
|
|
#define HW_USBPHY_CTRL_CLR 0x38
|
|
|
|
#define BM_USBPHY_CTRL_SFTRST BIT(31)
|
|
#define BM_USBPHY_CTRL_CLKGATE BIT(30)
|
|
#define BM_USBPHY_CTRL_ENUTMILEVEL3 BIT(15)
|
|
#define BM_USBPHY_CTRL_ENUTMILEVEL2 BIT(14)
|
|
#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT BIT(1)
|
|
|
|
struct mxs_phy {
|
|
struct usb_phy phy;
|
|
struct clk *clk;
|
|
};
|
|
|
|
#define to_mxs_phy(p) container_of((p), struct mxs_phy, phy)
|
|
|
|
static void mxs_phy_hw_init(struct mxs_phy *mxs_phy)
|
|
{
|
|
void __iomem *base = mxs_phy->phy.io_priv;
|
|
|
|
stmp_reset_block(base + HW_USBPHY_CTRL);
|
|
|
|
/* Power up the PHY */
|
|
writel_relaxed(0, base + HW_USBPHY_PWD);
|
|
|
|
/* enable FS/LS device */
|
|
writel_relaxed(BM_USBPHY_CTRL_ENUTMILEVEL2 |
|
|
BM_USBPHY_CTRL_ENUTMILEVEL3,
|
|
base + HW_USBPHY_CTRL_SET);
|
|
}
|
|
|
|
static int mxs_phy_init(struct usb_phy *phy)
|
|
{
|
|
struct mxs_phy *mxs_phy = to_mxs_phy(phy);
|
|
|
|
clk_prepare_enable(mxs_phy->clk);
|
|
mxs_phy_hw_init(mxs_phy);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void mxs_phy_shutdown(struct usb_phy *phy)
|
|
{
|
|
struct mxs_phy *mxs_phy = to_mxs_phy(phy);
|
|
|
|
writel_relaxed(BM_USBPHY_CTRL_CLKGATE,
|
|
phy->io_priv + HW_USBPHY_CTRL_SET);
|
|
|
|
clk_disable_unprepare(mxs_phy->clk);
|
|
}
|
|
|
|
static int mxs_phy_suspend(struct usb_phy *x, int suspend)
|
|
{
|
|
struct mxs_phy *mxs_phy = to_mxs_phy(x);
|
|
|
|
if (suspend) {
|
|
writel_relaxed(0xffffffff, x->io_priv + HW_USBPHY_PWD);
|
|
writel_relaxed(BM_USBPHY_CTRL_CLKGATE,
|
|
x->io_priv + HW_USBPHY_CTRL_SET);
|
|
clk_disable_unprepare(mxs_phy->clk);
|
|
} else {
|
|
clk_prepare_enable(mxs_phy->clk);
|
|
writel_relaxed(BM_USBPHY_CTRL_CLKGATE,
|
|
x->io_priv + HW_USBPHY_CTRL_CLR);
|
|
writel_relaxed(0, x->io_priv + HW_USBPHY_PWD);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mxs_phy_on_connect(struct usb_phy *phy,
|
|
enum usb_device_speed speed)
|
|
{
|
|
dev_dbg(phy->dev, "%s speed device has connected\n",
|
|
(speed == USB_SPEED_HIGH) ? "high" : "non-high");
|
|
|
|
if (speed == USB_SPEED_HIGH)
|
|
writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
|
|
phy->io_priv + HW_USBPHY_CTRL_SET);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mxs_phy_on_disconnect(struct usb_phy *phy,
|
|
enum usb_device_speed speed)
|
|
{
|
|
dev_dbg(phy->dev, "%s speed device has disconnected\n",
|
|
(speed == USB_SPEED_HIGH) ? "high" : "non-high");
|
|
|
|
if (speed == USB_SPEED_HIGH)
|
|
writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
|
|
phy->io_priv + HW_USBPHY_CTRL_CLR);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mxs_phy_probe(struct platform_device *pdev)
|
|
{
|
|
struct resource *res;
|
|
void __iomem *base;
|
|
struct clk *clk;
|
|
struct mxs_phy *mxs_phy;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res) {
|
|
dev_err(&pdev->dev, "can't get device resources\n");
|
|
return -ENOENT;
|
|
}
|
|
|
|
base = devm_ioremap_resource(&pdev->dev, res);
|
|
if (IS_ERR(base))
|
|
return PTR_ERR(base);
|
|
|
|
clk = devm_clk_get(&pdev->dev, NULL);
|
|
if (IS_ERR(clk)) {
|
|
dev_err(&pdev->dev,
|
|
"can't get the clock, err=%ld", PTR_ERR(clk));
|
|
return PTR_ERR(clk);
|
|
}
|
|
|
|
mxs_phy = devm_kzalloc(&pdev->dev, sizeof(*mxs_phy), GFP_KERNEL);
|
|
if (!mxs_phy) {
|
|
dev_err(&pdev->dev, "Failed to allocate USB PHY structure!\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
mxs_phy->phy.io_priv = base;
|
|
mxs_phy->phy.dev = &pdev->dev;
|
|
mxs_phy->phy.label = DRIVER_NAME;
|
|
mxs_phy->phy.init = mxs_phy_init;
|
|
mxs_phy->phy.shutdown = mxs_phy_shutdown;
|
|
mxs_phy->phy.set_suspend = mxs_phy_suspend;
|
|
mxs_phy->phy.notify_connect = mxs_phy_on_connect;
|
|
mxs_phy->phy.notify_disconnect = mxs_phy_on_disconnect;
|
|
|
|
ATOMIC_INIT_NOTIFIER_HEAD(&mxs_phy->phy.notifier);
|
|
|
|
mxs_phy->clk = clk;
|
|
|
|
platform_set_drvdata(pdev, &mxs_phy->phy);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mxs_phy_remove(struct platform_device *pdev)
|
|
{
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id mxs_phy_dt_ids[] = {
|
|
{ .compatible = "fsl,imx23-usbphy", },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, mxs_phy_dt_ids);
|
|
|
|
static struct platform_driver mxs_phy_driver = {
|
|
.probe = mxs_phy_probe,
|
|
.remove = mxs_phy_remove,
|
|
.driver = {
|
|
.name = DRIVER_NAME,
|
|
.owner = THIS_MODULE,
|
|
.of_match_table = mxs_phy_dt_ids,
|
|
},
|
|
};
|
|
|
|
static int __init mxs_phy_module_init(void)
|
|
{
|
|
return platform_driver_register(&mxs_phy_driver);
|
|
}
|
|
postcore_initcall(mxs_phy_module_init);
|
|
|
|
static void __exit mxs_phy_module_exit(void)
|
|
{
|
|
platform_driver_unregister(&mxs_phy_driver);
|
|
}
|
|
module_exit(mxs_phy_module_exit);
|
|
|
|
MODULE_ALIAS("platform:mxs-usb-phy");
|
|
MODULE_AUTHOR("Marek Vasut <marex@denx.de>");
|
|
MODULE_AUTHOR("Richard Zhao <richard.zhao@freescale.com>");
|
|
MODULE_DESCRIPTION("Freescale MXS USB PHY driver");
|
|
MODULE_LICENSE("GPL");
|