mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +00:00
e6b5be2be4
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 ...
149 lines
3.3 KiB
C
149 lines
3.3 KiB
C
/*
|
|
* linux/driver/usb/host/ehci-w90x900.c
|
|
*
|
|
* Copyright (c) 2008 Nuvoton technology corporation.
|
|
*
|
|
* Wan ZongShun <mcuos.com@gmail.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;version 2 of the License.
|
|
*
|
|
*/
|
|
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/io.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/hcd.h>
|
|
|
|
#include "ehci.h"
|
|
|
|
/* enable phy0 and phy1 for w90p910 */
|
|
#define ENPHY (0x01<<8)
|
|
#define PHY0_CTR (0xA4)
|
|
#define PHY1_CTR (0xA8)
|
|
|
|
#define DRIVER_DESC "EHCI w90x900 driver"
|
|
|
|
static const char hcd_name[] = "ehci-w90x900 ";
|
|
|
|
static struct hc_driver __read_mostly ehci_w90x900_hc_driver;
|
|
|
|
static int usb_w90x900_probe(const struct hc_driver *driver,
|
|
struct platform_device *pdev)
|
|
{
|
|
struct usb_hcd *hcd;
|
|
struct ehci_hcd *ehci;
|
|
struct resource *res;
|
|
int retval = 0, irq;
|
|
unsigned long val;
|
|
|
|
hcd = usb_create_hcd(driver, &pdev->dev, "w90x900 EHCI");
|
|
if (!hcd) {
|
|
retval = -ENOMEM;
|
|
goto err1;
|
|
}
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
hcd->regs = devm_ioremap_resource(&pdev->dev, res);
|
|
if (IS_ERR(hcd->regs)) {
|
|
retval = PTR_ERR(hcd->regs);
|
|
goto err2;
|
|
}
|
|
hcd->rsrc_start = res->start;
|
|
hcd->rsrc_len = resource_size(res);
|
|
|
|
ehci = hcd_to_ehci(hcd);
|
|
ehci->caps = hcd->regs;
|
|
ehci->regs = hcd->regs +
|
|
HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
|
|
|
|
/* enable PHY 0,1,the regs only apply to w90p910
|
|
* 0xA4,0xA8 were offsets of PHY0 and PHY1 controller of
|
|
* w90p910 IC relative to ehci->regs.
|
|
*/
|
|
val = __raw_readl(ehci->regs+PHY0_CTR);
|
|
val |= ENPHY;
|
|
__raw_writel(val, ehci->regs+PHY0_CTR);
|
|
|
|
val = __raw_readl(ehci->regs+PHY1_CTR);
|
|
val |= ENPHY;
|
|
__raw_writel(val, ehci->regs+PHY1_CTR);
|
|
|
|
irq = platform_get_irq(pdev, 0);
|
|
if (irq < 0) {
|
|
retval = irq;
|
|
goto err2;
|
|
}
|
|
|
|
retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
|
|
if (retval != 0)
|
|
goto err2;
|
|
|
|
device_wakeup_enable(hcd->self.controller);
|
|
return retval;
|
|
err2:
|
|
usb_put_hcd(hcd);
|
|
err1:
|
|
return retval;
|
|
}
|
|
|
|
static void usb_w90x900_remove(struct usb_hcd *hcd,
|
|
struct platform_device *pdev)
|
|
{
|
|
usb_remove_hcd(hcd);
|
|
usb_put_hcd(hcd);
|
|
}
|
|
|
|
static int ehci_w90x900_probe(struct platform_device *pdev)
|
|
{
|
|
if (usb_disabled())
|
|
return -ENODEV;
|
|
|
|
return usb_w90x900_probe(&ehci_w90x900_hc_driver, pdev);
|
|
}
|
|
|
|
static int ehci_w90x900_remove(struct platform_device *pdev)
|
|
{
|
|
struct usb_hcd *hcd = platform_get_drvdata(pdev);
|
|
|
|
usb_w90x900_remove(hcd, pdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver ehci_hcd_w90x900_driver = {
|
|
.probe = ehci_w90x900_probe,
|
|
.remove = ehci_w90x900_remove,
|
|
.driver = {
|
|
.name = "w90x900-ehci",
|
|
},
|
|
};
|
|
|
|
static int __init ehci_w90X900_init(void)
|
|
{
|
|
if (usb_disabled())
|
|
return -ENODEV;
|
|
|
|
pr_info("%s: " DRIVER_DESC "\n", hcd_name);
|
|
|
|
ehci_init_driver(&ehci_w90x900_hc_driver, NULL);
|
|
return platform_driver_register(&ehci_hcd_w90x900_driver);
|
|
}
|
|
module_init(ehci_w90X900_init);
|
|
|
|
static void __exit ehci_w90X900_cleanup(void)
|
|
{
|
|
platform_driver_unregister(&ehci_hcd_w90x900_driver);
|
|
}
|
|
module_exit(ehci_w90X900_cleanup);
|
|
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
|
|
MODULE_ALIAS("platform:w90p910-ehci");
|
|
MODULE_LICENSE("GPL v2");
|