forked from Minki/linux
046916de11
commit ea1418b5f1
(usb: chipidea: i.MX: use devm_usb_get_phy_by_phandle to get
phy) causes the USB host to miss the disconnect/connect events.
In order to reproduce this problem:
- Insert a USB thumb into the USB host port (connection is detected)
- Remove it (no disconnect event will be reported)
- Insert the USB thumb again (connection is not detected)
Fix this problem by accessing the usb_phy structure using the private data
instead of accessing a local structure.
Tested on a mx28evk board.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
254 lines
5.8 KiB
C
254 lines
5.8 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/of_platform.h>
|
|
#include <linux/of_gpio.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/pm_runtime.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/usb/chipidea.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/regulator/consumer.h>
|
|
|
|
#include "ci.h"
|
|
#include "ci_hdrc_imx.h"
|
|
|
|
#define pdev_to_phy(pdev) \
|
|
((struct usb_phy *)platform_get_drvdata(pdev))
|
|
|
|
struct ci_hdrc_imx_data {
|
|
struct usb_phy *phy;
|
|
struct platform_device *ci_pdev;
|
|
struct clk *clk;
|
|
struct regulator *reg_vbus;
|
|
};
|
|
|
|
static const struct usbmisc_ops *usbmisc_ops;
|
|
|
|
/* Common functions shared by usbmisc drivers */
|
|
|
|
int usbmisc_set_ops(const struct usbmisc_ops *ops)
|
|
{
|
|
if (usbmisc_ops)
|
|
return -EBUSY;
|
|
|
|
usbmisc_ops = ops;
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(usbmisc_set_ops);
|
|
|
|
void usbmisc_unset_ops(const struct usbmisc_ops *ops)
|
|
{
|
|
usbmisc_ops = NULL;
|
|
}
|
|
EXPORT_SYMBOL_GPL(usbmisc_unset_ops);
|
|
|
|
int usbmisc_get_init_data(struct device *dev, struct usbmisc_usb_device *usbdev)
|
|
{
|
|
struct device_node *np = dev->of_node;
|
|
struct of_phandle_args args;
|
|
int ret;
|
|
|
|
usbdev->dev = dev;
|
|
|
|
ret = of_parse_phandle_with_args(np, "fsl,usbmisc", "#index-cells",
|
|
0, &args);
|
|
if (ret) {
|
|
dev_err(dev, "Failed to parse property fsl,usbmisc, errno %d\n",
|
|
ret);
|
|
memset(usbdev, 0, sizeof(*usbdev));
|
|
return ret;
|
|
}
|
|
usbdev->index = args.args[0];
|
|
of_node_put(args.np);
|
|
|
|
if (of_find_property(np, "disable-over-current", NULL))
|
|
usbdev->disable_oc = 1;
|
|
|
|
if (of_find_property(np, "external-vbus-divider", NULL))
|
|
usbdev->evdo = 1;
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(usbmisc_get_init_data);
|
|
|
|
/* End of common functions shared by usbmisc drivers*/
|
|
|
|
static int ci_hdrc_imx_probe(struct platform_device *pdev)
|
|
{
|
|
struct ci_hdrc_imx_data *data;
|
|
struct ci_hdrc_platform_data pdata = {
|
|
.name = "ci_hdrc_imx",
|
|
.capoffset = DEF_CAPOFFSET,
|
|
.flags = CI_HDRC_REQUIRE_TRANSCEIVER |
|
|
CI_HDRC_PULLUP_ON_VBUS |
|
|
CI_HDRC_DISABLE_STREAMING,
|
|
};
|
|
struct resource *res;
|
|
int ret;
|
|
|
|
if (of_find_property(pdev->dev.of_node, "fsl,usbmisc", NULL)
|
|
&& !usbmisc_ops)
|
|
return -EPROBE_DEFER;
|
|
|
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
if (!data) {
|
|
dev_err(&pdev->dev, "Failed to allocate ci_hdrc-imx data!\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res) {
|
|
dev_err(&pdev->dev, "Can't get device resources!\n");
|
|
return -ENOENT;
|
|
}
|
|
|
|
data->clk = devm_clk_get(&pdev->dev, NULL);
|
|
if (IS_ERR(data->clk)) {
|
|
dev_err(&pdev->dev,
|
|
"Failed to get clock, err=%ld\n", PTR_ERR(data->clk));
|
|
return PTR_ERR(data->clk);
|
|
}
|
|
|
|
ret = clk_prepare_enable(data->clk);
|
|
if (ret) {
|
|
dev_err(&pdev->dev,
|
|
"Failed to prepare or enable clock, err=%d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
data->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "fsl,usbphy", 0);
|
|
if (!IS_ERR(data->phy)) {
|
|
ret = usb_phy_init(data->phy);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "unable to init phy: %d\n", ret);
|
|
goto err_clk;
|
|
}
|
|
} else if (PTR_ERR(data->phy) == -EPROBE_DEFER) {
|
|
ret = -EPROBE_DEFER;
|
|
goto err_clk;
|
|
}
|
|
|
|
/* we only support host now, so enable vbus here */
|
|
data->reg_vbus = devm_regulator_get(&pdev->dev, "vbus");
|
|
if (!IS_ERR(data->reg_vbus)) {
|
|
ret = regulator_enable(data->reg_vbus);
|
|
if (ret) {
|
|
dev_err(&pdev->dev,
|
|
"Failed to enable vbus regulator, err=%d\n",
|
|
ret);
|
|
goto err_clk;
|
|
}
|
|
} else {
|
|
data->reg_vbus = NULL;
|
|
}
|
|
|
|
pdata.phy = data->phy;
|
|
|
|
if (!pdev->dev.dma_mask)
|
|
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
|
|
if (!pdev->dev.coherent_dma_mask)
|
|
pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
|
|
|
|
if (usbmisc_ops && usbmisc_ops->init) {
|
|
ret = usbmisc_ops->init(&pdev->dev);
|
|
if (ret) {
|
|
dev_err(&pdev->dev,
|
|
"usbmisc init failed, ret=%d\n", ret);
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
data->ci_pdev = ci_hdrc_add_device(&pdev->dev,
|
|
pdev->resource, pdev->num_resources,
|
|
&pdata);
|
|
if (IS_ERR(data->ci_pdev)) {
|
|
ret = PTR_ERR(data->ci_pdev);
|
|
dev_err(&pdev->dev,
|
|
"Can't register ci_hdrc platform device, err=%d\n",
|
|
ret);
|
|
goto err;
|
|
}
|
|
|
|
if (usbmisc_ops && usbmisc_ops->post) {
|
|
ret = usbmisc_ops->post(&pdev->dev);
|
|
if (ret) {
|
|
dev_err(&pdev->dev,
|
|
"usbmisc post failed, ret=%d\n", ret);
|
|
goto disable_device;
|
|
}
|
|
}
|
|
|
|
platform_set_drvdata(pdev, data);
|
|
|
|
pm_runtime_no_callbacks(&pdev->dev);
|
|
pm_runtime_enable(&pdev->dev);
|
|
|
|
return 0;
|
|
|
|
disable_device:
|
|
ci_hdrc_remove_device(data->ci_pdev);
|
|
err:
|
|
if (data->reg_vbus)
|
|
regulator_disable(data->reg_vbus);
|
|
err_clk:
|
|
clk_disable_unprepare(data->clk);
|
|
return ret;
|
|
}
|
|
|
|
static int ci_hdrc_imx_remove(struct platform_device *pdev)
|
|
{
|
|
struct ci_hdrc_imx_data *data = platform_get_drvdata(pdev);
|
|
|
|
pm_runtime_disable(&pdev->dev);
|
|
ci_hdrc_remove_device(data->ci_pdev);
|
|
|
|
if (data->reg_vbus)
|
|
regulator_disable(data->reg_vbus);
|
|
|
|
if (data->phy) {
|
|
usb_phy_shutdown(data->phy);
|
|
module_put(data->phy->dev->driver->owner);
|
|
}
|
|
|
|
clk_disable_unprepare(data->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id ci_hdrc_imx_dt_ids[] = {
|
|
{ .compatible = "fsl,imx27-usb", },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, ci_hdrc_imx_dt_ids);
|
|
|
|
static struct platform_driver ci_hdrc_imx_driver = {
|
|
.probe = ci_hdrc_imx_probe,
|
|
.remove = ci_hdrc_imx_remove,
|
|
.driver = {
|
|
.name = "imx_usb",
|
|
.owner = THIS_MODULE,
|
|
.of_match_table = ci_hdrc_imx_dt_ids,
|
|
},
|
|
};
|
|
|
|
module_platform_driver(ci_hdrc_imx_driver);
|
|
|
|
MODULE_ALIAS("platform:imx-usb");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
|
|
MODULE_AUTHOR("Marek Vasut <marex@denx.de>");
|
|
MODULE_AUTHOR("Richard Zhao <richard.zhao@freescale.com>");
|