![Linus Torvalds](/assets/img/avatar_default.png)
Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlSOD20ACgkQMUfUDdst+ylLPACg2QrW1oHhdTMT9WI8jihlHVRM 53kAoLeteByQ3iVwWurwwseRPiWa8+MI =OVRS -----END PGP SIGNATURE----- Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
262 lines
6.2 KiB
C
262 lines
6.2 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 "ci.h"
|
|
#include "ci_hdrc_imx.h"
|
|
|
|
#define CI_HDRC_IMX_IMX28_WRITE_FIX BIT(0)
|
|
|
|
struct ci_hdrc_imx_platform_flag {
|
|
unsigned int flags;
|
|
};
|
|
|
|
static const struct ci_hdrc_imx_platform_flag imx27_usb_data = {
|
|
};
|
|
|
|
static const struct ci_hdrc_imx_platform_flag imx28_usb_data = {
|
|
.flags = CI_HDRC_IMX_IMX28_WRITE_FIX,
|
|
};
|
|
|
|
static const struct of_device_id ci_hdrc_imx_dt_ids[] = {
|
|
{ .compatible = "fsl,imx28-usb", .data = &imx28_usb_data},
|
|
{ .compatible = "fsl,imx27-usb", .data = &imx27_usb_data},
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, ci_hdrc_imx_dt_ids);
|
|
|
|
struct ci_hdrc_imx_data {
|
|
struct usb_phy *phy;
|
|
struct platform_device *ci_pdev;
|
|
struct clk *clk;
|
|
struct imx_usbmisc_data *usbmisc_data;
|
|
};
|
|
|
|
/* Common functions shared by usbmisc drivers */
|
|
|
|
static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev)
|
|
{
|
|
struct platform_device *misc_pdev;
|
|
struct device_node *np = dev->of_node;
|
|
struct of_phandle_args args;
|
|
struct imx_usbmisc_data *data;
|
|
int ret;
|
|
|
|
/*
|
|
* In case the fsl,usbmisc property is not present this device doesn't
|
|
* need usbmisc. Return NULL (which is no error here)
|
|
*/
|
|
if (!of_get_property(np, "fsl,usbmisc", NULL))
|
|
return NULL;
|
|
|
|
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
|
|
if (!data)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
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);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
data->index = args.args[0];
|
|
|
|
misc_pdev = of_find_device_by_node(args.np);
|
|
of_node_put(args.np);
|
|
|
|
if (!misc_pdev)
|
|
return ERR_PTR(-EPROBE_DEFER);
|
|
|
|
data->dev = &misc_pdev->dev;
|
|
|
|
if (of_find_property(np, "disable-over-current", NULL))
|
|
data->disable_oc = 1;
|
|
|
|
if (of_find_property(np, "external-vbus-divider", NULL))
|
|
data->evdo = 1;
|
|
|
|
return 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 = dev_name(&pdev->dev),
|
|
.capoffset = DEF_CAPOFFSET,
|
|
.flags = CI_HDRC_DISABLE_STREAMING,
|
|
};
|
|
int ret;
|
|
const struct of_device_id *of_id =
|
|
of_match_device(ci_hdrc_imx_dt_ids, &pdev->dev);
|
|
const struct ci_hdrc_imx_platform_flag *imx_platform_flag = of_id->data;
|
|
|
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
if (!data)
|
|
return -ENOMEM;
|
|
|
|
data->usbmisc_data = usbmisc_get_init_data(&pdev->dev);
|
|
if (IS_ERR(data->usbmisc_data))
|
|
return PTR_ERR(data->usbmisc_data);
|
|
|
|
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 = PTR_ERR(data->phy);
|
|
/* Return -EINVAL if no usbphy is available */
|
|
if (ret == -ENODEV)
|
|
ret = -EINVAL;
|
|
goto err_clk;
|
|
}
|
|
|
|
pdata.usb_phy = data->phy;
|
|
|
|
if (imx_platform_flag->flags & CI_HDRC_IMX_IMX28_WRITE_FIX)
|
|
pdata.flags |= CI_HDRC_IMX28_WRITE_FIX;
|
|
|
|
ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
if (ret)
|
|
goto err_clk;
|
|
|
|
if (data->usbmisc_data) {
|
|
ret = imx_usbmisc_init(data->usbmisc_data);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n",
|
|
ret);
|
|
goto err_clk;
|
|
}
|
|
}
|
|
|
|
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_clk;
|
|
}
|
|
|
|
if (data->usbmisc_data) {
|
|
ret = imx_usbmisc_init_post(data->usbmisc_data);
|
|
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_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);
|
|
clk_disable_unprepare(data->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static int imx_controller_suspend(struct device *dev)
|
|
{
|
|
struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
|
|
|
|
dev_dbg(dev, "at %s\n", __func__);
|
|
|
|
clk_disable_unprepare(data->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int imx_controller_resume(struct device *dev)
|
|
{
|
|
struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
|
|
|
|
dev_dbg(dev, "at %s\n", __func__);
|
|
|
|
return clk_prepare_enable(data->clk);
|
|
}
|
|
|
|
static int ci_hdrc_imx_suspend(struct device *dev)
|
|
{
|
|
return imx_controller_suspend(dev);
|
|
}
|
|
|
|
static int ci_hdrc_imx_resume(struct device *dev)
|
|
{
|
|
return imx_controller_resume(dev);
|
|
}
|
|
#endif /* CONFIG_PM_SLEEP */
|
|
|
|
static const struct dev_pm_ops ci_hdrc_imx_pm_ops = {
|
|
SET_SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume)
|
|
};
|
|
static struct platform_driver ci_hdrc_imx_driver = {
|
|
.probe = ci_hdrc_imx_probe,
|
|
.remove = ci_hdrc_imx_remove,
|
|
.driver = {
|
|
.name = "imx_usb",
|
|
.of_match_table = ci_hdrc_imx_dt_ids,
|
|
.pm = &ci_hdrc_imx_pm_ops,
|
|
},
|
|
};
|
|
|
|
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>");
|