![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 ...
383 lines
9.2 KiB
C
383 lines
9.2 KiB
C
/*
|
|
* Copyright 2012 Freescale Semiconductor, Inc.
|
|
*
|
|
* 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/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
#include <linux/delay.h>
|
|
|
|
#include "ci_hdrc_imx.h"
|
|
|
|
#define MX25_USB_PHY_CTRL_OFFSET 0x08
|
|
#define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
|
|
|
|
#define MX25_EHCI_INTERFACE_SINGLE_UNI (2 << 0)
|
|
#define MX25_EHCI_INTERFACE_DIFF_UNI (0 << 0)
|
|
#define MX25_EHCI_INTERFACE_MASK (0xf)
|
|
|
|
#define MX25_OTG_SIC_SHIFT 29
|
|
#define MX25_OTG_SIC_MASK (0x3 << MX25_OTG_SIC_SHIFT)
|
|
#define MX25_OTG_PM_BIT BIT(24)
|
|
#define MX25_OTG_PP_BIT BIT(11)
|
|
#define MX25_OTG_OCPOL_BIT BIT(3)
|
|
|
|
#define MX25_H1_SIC_SHIFT 21
|
|
#define MX25_H1_SIC_MASK (0x3 << MX25_H1_SIC_SHIFT)
|
|
#define MX25_H1_PP_BIT BIT(18)
|
|
#define MX25_H1_PM_BIT BIT(16)
|
|
#define MX25_H1_IPPUE_UP_BIT BIT(7)
|
|
#define MX25_H1_IPPUE_DOWN_BIT BIT(6)
|
|
#define MX25_H1_TLL_BIT BIT(5)
|
|
#define MX25_H1_USBTE_BIT BIT(4)
|
|
#define MX25_H1_OCPOL_BIT BIT(2)
|
|
|
|
#define MX27_H1_PM_BIT BIT(8)
|
|
#define MX27_H2_PM_BIT BIT(16)
|
|
#define MX27_OTG_PM_BIT BIT(24)
|
|
|
|
#define MX53_USB_OTG_PHY_CTRL_0_OFFSET 0x08
|
|
#define MX53_USB_OTG_PHY_CTRL_1_OFFSET 0x0c
|
|
#define MX53_USB_UH2_CTRL_OFFSET 0x14
|
|
#define MX53_USB_UH3_CTRL_OFFSET 0x18
|
|
#define MX53_BM_OVER_CUR_DIS_H1 BIT(5)
|
|
#define MX53_BM_OVER_CUR_DIS_OTG BIT(8)
|
|
#define MX53_BM_OVER_CUR_DIS_UHx BIT(30)
|
|
#define MX53_USB_PHYCTRL1_PLLDIV_MASK 0x3
|
|
#define MX53_USB_PLL_DIV_24_MHZ 0x01
|
|
|
|
#define MX6_BM_OVER_CUR_DIS BIT(7)
|
|
|
|
#define VF610_OVER_CUR_DIS BIT(7)
|
|
|
|
struct usbmisc_ops {
|
|
/* It's called once when probe a usb device */
|
|
int (*init)(struct imx_usbmisc_data *data);
|
|
/* It's called once after adding a usb device */
|
|
int (*post)(struct imx_usbmisc_data *data);
|
|
};
|
|
|
|
struct imx_usbmisc {
|
|
void __iomem *base;
|
|
spinlock_t lock;
|
|
struct clk *clk;
|
|
const struct usbmisc_ops *ops;
|
|
};
|
|
|
|
static int usbmisc_imx25_init(struct imx_usbmisc_data *data)
|
|
{
|
|
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
|
unsigned long flags;
|
|
u32 val = 0;
|
|
|
|
if (data->index > 1)
|
|
return -EINVAL;
|
|
|
|
spin_lock_irqsave(&usbmisc->lock, flags);
|
|
switch (data->index) {
|
|
case 0:
|
|
val = readl(usbmisc->base);
|
|
val &= ~(MX25_OTG_SIC_MASK | MX25_OTG_PP_BIT);
|
|
val |= (MX25_EHCI_INTERFACE_DIFF_UNI & MX25_EHCI_INTERFACE_MASK) << MX25_OTG_SIC_SHIFT;
|
|
val |= (MX25_OTG_PM_BIT | MX25_OTG_OCPOL_BIT);
|
|
writel(val, usbmisc->base);
|
|
break;
|
|
case 1:
|
|
val = readl(usbmisc->base);
|
|
val &= ~(MX25_H1_SIC_MASK | MX25_H1_PP_BIT | MX25_H1_IPPUE_UP_BIT);
|
|
val |= (MX25_EHCI_INTERFACE_SINGLE_UNI & MX25_EHCI_INTERFACE_MASK) << MX25_H1_SIC_SHIFT;
|
|
val |= (MX25_H1_PM_BIT | MX25_H1_OCPOL_BIT | MX25_H1_TLL_BIT |
|
|
MX25_H1_USBTE_BIT | MX25_H1_IPPUE_DOWN_BIT);
|
|
|
|
writel(val, usbmisc->base);
|
|
|
|
break;
|
|
}
|
|
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int usbmisc_imx25_post(struct imx_usbmisc_data *data)
|
|
{
|
|
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
|
void __iomem *reg;
|
|
unsigned long flags;
|
|
u32 val;
|
|
|
|
if (data->index > 2)
|
|
return -EINVAL;
|
|
|
|
if (data->evdo) {
|
|
spin_lock_irqsave(&usbmisc->lock, flags);
|
|
reg = usbmisc->base + MX25_USB_PHY_CTRL_OFFSET;
|
|
val = readl(reg);
|
|
writel(val | MX25_BM_EXTERNAL_VBUS_DIVIDER, reg);
|
|
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
|
usleep_range(5000, 10000); /* needed to stabilize voltage */
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
|
|
{
|
|
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
|
unsigned long flags;
|
|
u32 val;
|
|
|
|
switch (data->index) {
|
|
case 0:
|
|
val = MX27_OTG_PM_BIT;
|
|
break;
|
|
case 1:
|
|
val = MX27_H1_PM_BIT;
|
|
break;
|
|
case 2:
|
|
val = MX27_H2_PM_BIT;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
};
|
|
|
|
spin_lock_irqsave(&usbmisc->lock, flags);
|
|
if (data->disable_oc)
|
|
val = readl(usbmisc->base) | val;
|
|
else
|
|
val = readl(usbmisc->base) & ~val;
|
|
writel(val, usbmisc->base);
|
|
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
|
|
{
|
|
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
|
void __iomem *reg = NULL;
|
|
unsigned long flags;
|
|
u32 val = 0;
|
|
|
|
if (data->index > 3)
|
|
return -EINVAL;
|
|
|
|
/* Select a 24 MHz reference clock for the PHY */
|
|
val = readl(usbmisc->base + MX53_USB_OTG_PHY_CTRL_1_OFFSET);
|
|
val &= ~MX53_USB_PHYCTRL1_PLLDIV_MASK;
|
|
val |= MX53_USB_PLL_DIV_24_MHZ;
|
|
writel(val, usbmisc->base + MX53_USB_OTG_PHY_CTRL_1_OFFSET);
|
|
|
|
if (data->disable_oc) {
|
|
spin_lock_irqsave(&usbmisc->lock, flags);
|
|
switch (data->index) {
|
|
case 0:
|
|
reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
|
|
val = readl(reg) | MX53_BM_OVER_CUR_DIS_OTG;
|
|
break;
|
|
case 1:
|
|
reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
|
|
val = readl(reg) | MX53_BM_OVER_CUR_DIS_H1;
|
|
break;
|
|
case 2:
|
|
reg = usbmisc->base + MX53_USB_UH2_CTRL_OFFSET;
|
|
val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
|
|
break;
|
|
case 3:
|
|
reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET;
|
|
val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
|
|
break;
|
|
}
|
|
if (reg && val)
|
|
writel(val, reg);
|
|
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int usbmisc_imx6q_init(struct imx_usbmisc_data *data)
|
|
{
|
|
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
|
unsigned long flags;
|
|
u32 reg;
|
|
|
|
if (data->index > 3)
|
|
return -EINVAL;
|
|
|
|
if (data->disable_oc) {
|
|
spin_lock_irqsave(&usbmisc->lock, flags);
|
|
reg = readl(usbmisc->base + data->index * 4);
|
|
writel(reg | MX6_BM_OVER_CUR_DIS,
|
|
usbmisc->base + data->index * 4);
|
|
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int usbmisc_vf610_init(struct imx_usbmisc_data *data)
|
|
{
|
|
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
|
u32 reg;
|
|
|
|
/*
|
|
* Vybrid only has one misc register set, but in two different
|
|
* areas. These is reflected in two instances of this driver.
|
|
*/
|
|
if (data->index >= 1)
|
|
return -EINVAL;
|
|
|
|
if (data->disable_oc) {
|
|
reg = readl(usbmisc->base);
|
|
writel(reg | VF610_OVER_CUR_DIS, usbmisc->base);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct usbmisc_ops imx25_usbmisc_ops = {
|
|
.init = usbmisc_imx25_init,
|
|
.post = usbmisc_imx25_post,
|
|
};
|
|
|
|
static const struct usbmisc_ops imx27_usbmisc_ops = {
|
|
.init = usbmisc_imx27_init,
|
|
};
|
|
|
|
static const struct usbmisc_ops imx53_usbmisc_ops = {
|
|
.init = usbmisc_imx53_init,
|
|
};
|
|
|
|
static const struct usbmisc_ops imx6q_usbmisc_ops = {
|
|
.init = usbmisc_imx6q_init,
|
|
};
|
|
|
|
static const struct usbmisc_ops vf610_usbmisc_ops = {
|
|
.init = usbmisc_vf610_init,
|
|
};
|
|
|
|
int imx_usbmisc_init(struct imx_usbmisc_data *data)
|
|
{
|
|
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
|
|
|
if (!usbmisc->ops->init)
|
|
return 0;
|
|
return usbmisc->ops->init(data);
|
|
}
|
|
EXPORT_SYMBOL_GPL(imx_usbmisc_init);
|
|
|
|
int imx_usbmisc_init_post(struct imx_usbmisc_data *data)
|
|
{
|
|
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
|
|
|
if (!usbmisc->ops->post)
|
|
return 0;
|
|
return usbmisc->ops->post(data);
|
|
}
|
|
EXPORT_SYMBOL_GPL(imx_usbmisc_init_post);
|
|
|
|
static const struct of_device_id usbmisc_imx_dt_ids[] = {
|
|
{
|
|
.compatible = "fsl,imx25-usbmisc",
|
|
.data = &imx25_usbmisc_ops,
|
|
},
|
|
{
|
|
.compatible = "fsl,imx35-usbmisc",
|
|
.data = &imx25_usbmisc_ops,
|
|
},
|
|
{
|
|
.compatible = "fsl,imx27-usbmisc",
|
|
.data = &imx27_usbmisc_ops,
|
|
},
|
|
{
|
|
.compatible = "fsl,imx51-usbmisc",
|
|
.data = &imx53_usbmisc_ops,
|
|
},
|
|
{
|
|
.compatible = "fsl,imx53-usbmisc",
|
|
.data = &imx53_usbmisc_ops,
|
|
},
|
|
{
|
|
.compatible = "fsl,imx6q-usbmisc",
|
|
.data = &imx6q_usbmisc_ops,
|
|
},
|
|
{
|
|
.compatible = "fsl,vf610-usbmisc",
|
|
.data = &vf610_usbmisc_ops,
|
|
},
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, usbmisc_imx_dt_ids);
|
|
|
|
static int usbmisc_imx_probe(struct platform_device *pdev)
|
|
{
|
|
struct resource *res;
|
|
struct imx_usbmisc *data;
|
|
int ret;
|
|
struct of_device_id *tmp_dev;
|
|
|
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
if (!data)
|
|
return -ENOMEM;
|
|
|
|
spin_lock_init(&data->lock);
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
data->base = devm_ioremap_resource(&pdev->dev, res);
|
|
if (IS_ERR(data->base))
|
|
return PTR_ERR(data->base);
|
|
|
|
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,
|
|
"clk_prepare_enable failed, err=%d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
tmp_dev = (struct of_device_id *)
|
|
of_match_device(usbmisc_imx_dt_ids, &pdev->dev);
|
|
data->ops = (const struct usbmisc_ops *)tmp_dev->data;
|
|
platform_set_drvdata(pdev, data);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int usbmisc_imx_remove(struct platform_device *pdev)
|
|
{
|
|
struct imx_usbmisc *usbmisc = dev_get_drvdata(&pdev->dev);
|
|
clk_disable_unprepare(usbmisc->clk);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver usbmisc_imx_driver = {
|
|
.probe = usbmisc_imx_probe,
|
|
.remove = usbmisc_imx_remove,
|
|
.driver = {
|
|
.name = "usbmisc_imx",
|
|
.of_match_table = usbmisc_imx_dt_ids,
|
|
},
|
|
};
|
|
|
|
module_platform_driver(usbmisc_imx_driver);
|
|
|
|
MODULE_ALIAS("platform:usbmisc-imx");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_DESCRIPTION("driver for imx usb non-core registers");
|
|
MODULE_AUTHOR("Richard Zhao <richard.zhao@freescale.com>");
|