mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Driver specific changes
Again, a lot of platforms have changes in here: pxa, samsung, omap, at91, imx, ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUATwtZUmCrR//JCVInAQL93hAAzBbSkswA4SD09UXHPSLGpbWd7JYuax9T sR17FvnQCV+0T8c7ORRbjoBrCrxKkxuPMkFrfIHuTaP+beYe13CwTf2mV+dtnuv2 hSjSjdgCq+yv+CvRZhRnmHqmEePN1dvRoC9Q/EVPEibJNJ4BjrTALMfkXbsTz861 BOmcD7VGi0YfPhwRQ3D00MjohCflRoV2EmceHCUvH4HLEgpWcWl16UZeuWGn6BiA GJK37O2ubKz0hkExAH6NHEaRxeFsapjh8kkR8/dOoNh/iIlmmR5SRPOxMPWFD0ui lUeSc6QjMipHCzkfE7jUx6MICDZfRx+WRWVTwa/OTLJjJtY+zcRnUvoLl84XJqgX EG5YhyL+Os4Z0ci92uSK3rwYQ2AJz/r4dS6VWnAVVJHSc8zHCuioJL4KcF81llcz 1dshlHkB1H1EeVrf08OM/1xX0X7SNzVJlQ801OZj31DYYtMqvrev72vn+tvJh6kL o9gZsOSl3cIlFi8cAK0WmZmwGHw4wfUDZb1ojN6GDctdrp/Vmwe3exHleWvfSDtN QBw4WyHl46JGw4bFVQ4hRH3vJZNuiso+ZNZvG3qGaEMfpNY5aMTy7lrxI/GFbFkA tEnhkDgjutEZ/B6nEF1h8cCrcLND7u4n209kJh6UR1Qx3a6xD/M/ycE4tisNuPE3 wSSYuM1ZGTU= =vPhu -----END PGP SIGNATURE----- Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Driver specific changes Again, a lot of platforms have changes in here: pxa, samsung, omap, at91, imx, ... * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits) ARM: sa1100: clean up of the clock support ARM: pxa: add dummy clock for sa1100-rtc RTC: sa1100: support sa1100, pxa and mmp soc families RTC: sa1100: remove redundant code of setting alarm RTC: sa1100: Clean out ost register Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq() pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq() ARM: EXYNOS: Modified files for SPI consolidation work ARM: S5P64X0: Enable SDHCI support ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names ARM: S5P64X0: Add HSMMC setup for host Controller ARM: EXYNOS: Add USB OHCI support to ORIGEN board USB: Add Samsung Exynos OHCI diver ARM: EXYNOS: Add USB OHCI support to SMDKV310 board ARM: EXYNOS: Add USB OHCI device net: macb: fix build break with !CONFIG_OF i2c: tegra: Support DVC controller in device tree i2c: tegra: Add __devinit/exit to probe/remove net/at91_ether: use gpio_is_valid for phy IRQ line ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT ...
This commit is contained in:
Linus Torvalds
commit
2ac9d7aacc
169 changed files with 3010 additions and 1631 deletions
|
|
@ -48,6 +48,7 @@ config USB_ARCH_HAS_OHCI
|
|||
default y if ARCH_DAVINCI_DA8XX
|
||||
default y if ARCH_CNS3XXX
|
||||
default y if PLAT_SPEAR
|
||||
default y if ARCH_EXYNOS
|
||||
# PPC:
|
||||
default y if STB03xxx
|
||||
default y if PPC_MPC52xx
|
||||
|
|
|
|||
|
|
@ -380,6 +380,12 @@ config USB_OHCI_SH
|
|||
Enables support for the on-chip OHCI controller on the SuperH.
|
||||
If you use the PCI OHCI controller, this option is not necessary.
|
||||
|
||||
config USB_OHCI_EXYNOS
|
||||
boolean "OHCI support for Samsung EXYNOS SoC Series"
|
||||
depends on USB_OHCI_HCD && ARCH_EXYNOS
|
||||
help
|
||||
Enable support for the Samsung Exynos SOC's on-chip OHCI controller.
|
||||
|
||||
config USB_CNS3XXX_OHCI
|
||||
bool "Cavium CNS3XXX OHCI Module"
|
||||
depends on USB_OHCI_HCD && ARCH_CNS3XXX
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
#include <linux/usb/ulpi.h>
|
||||
#include <plat/usb.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
|
||||
/* EHCI Register Set */
|
||||
#define EHCI_INSNREG04 (0xA0)
|
||||
|
|
@ -190,11 +191,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
|
|||
}
|
||||
}
|
||||
|
||||
ret = omap_usbhs_enable(dev);
|
||||
if (ret) {
|
||||
dev_err(dev, "failed to start usbhs with err %d\n", ret);
|
||||
goto err_enable;
|
||||
}
|
||||
pm_runtime_enable(dev);
|
||||
pm_runtime_get_sync(dev);
|
||||
|
||||
/*
|
||||
* An undocumented "feature" in the OMAP3 EHCI controller,
|
||||
|
|
@ -242,11 +240,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
|
||||
err_add_hcd:
|
||||
omap_usbhs_disable(dev);
|
||||
|
||||
err_enable:
|
||||
disable_put_regulator(pdata);
|
||||
usb_put_hcd(hcd);
|
||||
pm_runtime_put_sync(dev);
|
||||
|
||||
err_io:
|
||||
iounmap(regs);
|
||||
|
|
@ -268,10 +263,12 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
|
|||
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
||||
|
||||
usb_remove_hcd(hcd);
|
||||
omap_usbhs_disable(dev);
|
||||
disable_put_regulator(dev->platform_data);
|
||||
iounmap(hcd->regs);
|
||||
usb_put_hcd(hcd);
|
||||
pm_runtime_put_sync(dev);
|
||||
pm_runtime_disable(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
274
drivers/usb/host/ohci-exynos.c
Normal file
274
drivers/usb/host/ohci-exynos.c
Normal file
|
|
@ -0,0 +1,274 @@
|
|||
/*
|
||||
* SAMSUNG EXYNOS USB HOST OHCI Controller
|
||||
*
|
||||
* Copyright (C) 2011 Samsung Electronics Co.Ltd
|
||||
* Author: Jingoo Han <jg1.han@samsung.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; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <mach/ohci.h>
|
||||
#include <plat/usb-phy.h>
|
||||
|
||||
struct exynos_ohci_hcd {
|
||||
struct device *dev;
|
||||
struct usb_hcd *hcd;
|
||||
struct clk *clk;
|
||||
};
|
||||
|
||||
static int ohci_exynos_start(struct usb_hcd *hcd)
|
||||
{
|
||||
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
|
||||
int ret;
|
||||
|
||||
ohci_dbg(ohci, "ohci_exynos_start, ohci:%p", ohci);
|
||||
|
||||
ret = ohci_init(ohci);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = ohci_run(ohci);
|
||||
if (ret < 0) {
|
||||
err("can't start %s", hcd->self.bus_name);
|
||||
ohci_stop(hcd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct hc_driver exynos_ohci_hc_driver = {
|
||||
.description = hcd_name,
|
||||
.product_desc = "EXYNOS OHCI Host Controller",
|
||||
.hcd_priv_size = sizeof(struct ohci_hcd),
|
||||
|
||||
.irq = ohci_irq,
|
||||
.flags = HCD_MEMORY|HCD_USB11,
|
||||
|
||||
.start = ohci_exynos_start,
|
||||
.stop = ohci_stop,
|
||||
.shutdown = ohci_shutdown,
|
||||
|
||||
.get_frame_number = ohci_get_frame,
|
||||
|
||||
.urb_enqueue = ohci_urb_enqueue,
|
||||
.urb_dequeue = ohci_urb_dequeue,
|
||||
.endpoint_disable = ohci_endpoint_disable,
|
||||
|
||||
.hub_status_data = ohci_hub_status_data,
|
||||
.hub_control = ohci_hub_control,
|
||||
#ifdef CONFIG_PM
|
||||
.bus_suspend = ohci_bus_suspend,
|
||||
.bus_resume = ohci_bus_resume,
|
||||
#endif
|
||||
.start_port_reset = ohci_start_port_reset,
|
||||
};
|
||||
|
||||
static int __devinit exynos_ohci_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct exynos4_ohci_platdata *pdata;
|
||||
struct exynos_ohci_hcd *exynos_ohci;
|
||||
struct usb_hcd *hcd;
|
||||
struct ohci_hcd *ohci;
|
||||
struct resource *res;
|
||||
int irq;
|
||||
int err;
|
||||
|
||||
pdata = pdev->dev.platform_data;
|
||||
if (!pdata) {
|
||||
dev_err(&pdev->dev, "No platform data defined\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
exynos_ohci = kzalloc(sizeof(struct exynos_ohci_hcd), GFP_KERNEL);
|
||||
if (!exynos_ohci)
|
||||
return -ENOMEM;
|
||||
|
||||
exynos_ohci->dev = &pdev->dev;
|
||||
|
||||
hcd = usb_create_hcd(&exynos_ohci_hc_driver, &pdev->dev,
|
||||
dev_name(&pdev->dev));
|
||||
if (!hcd) {
|
||||
dev_err(&pdev->dev, "Unable to create HCD\n");
|
||||
err = -ENOMEM;
|
||||
goto fail_hcd;
|
||||
}
|
||||
|
||||
exynos_ohci->hcd = hcd;
|
||||
exynos_ohci->clk = clk_get(&pdev->dev, "usbhost");
|
||||
|
||||
if (IS_ERR(exynos_ohci->clk)) {
|
||||
dev_err(&pdev->dev, "Failed to get usbhost clock\n");
|
||||
err = PTR_ERR(exynos_ohci->clk);
|
||||
goto fail_clk;
|
||||
}
|
||||
|
||||
err = clk_enable(exynos_ohci->clk);
|
||||
if (err)
|
||||
goto fail_clken;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
dev_err(&pdev->dev, "Failed to get I/O memory\n");
|
||||
err = -ENXIO;
|
||||
goto fail_io;
|
||||
}
|
||||
|
||||
hcd->rsrc_start = res->start;
|
||||
hcd->rsrc_len = resource_size(res);
|
||||
hcd->regs = ioremap(res->start, resource_size(res));
|
||||
if (!hcd->regs) {
|
||||
dev_err(&pdev->dev, "Failed to remap I/O memory\n");
|
||||
err = -ENOMEM;
|
||||
goto fail_io;
|
||||
}
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (!irq) {
|
||||
dev_err(&pdev->dev, "Failed to get IRQ\n");
|
||||
err = -ENODEV;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (pdata->phy_init)
|
||||
pdata->phy_init(pdev, S5P_USB_PHY_HOST);
|
||||
|
||||
ohci = hcd_to_ohci(hcd);
|
||||
ohci_hcd_init(ohci);
|
||||
|
||||
err = usb_add_hcd(hcd, irq, IRQF_SHARED);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "Failed to add USB HCD\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, exynos_ohci);
|
||||
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
iounmap(hcd->regs);
|
||||
fail_io:
|
||||
clk_disable(exynos_ohci->clk);
|
||||
fail_clken:
|
||||
clk_put(exynos_ohci->clk);
|
||||
fail_clk:
|
||||
usb_put_hcd(hcd);
|
||||
fail_hcd:
|
||||
kfree(exynos_ohci);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit exynos_ohci_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
|
||||
struct exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev);
|
||||
struct usb_hcd *hcd = exynos_ohci->hcd;
|
||||
|
||||
usb_remove_hcd(hcd);
|
||||
|
||||
if (pdata && pdata->phy_exit)
|
||||
pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
|
||||
|
||||
iounmap(hcd->regs);
|
||||
|
||||
clk_disable(exynos_ohci->clk);
|
||||
clk_put(exynos_ohci->clk);
|
||||
|
||||
usb_put_hcd(hcd);
|
||||
kfree(exynos_ohci);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void exynos_ohci_shutdown(struct platform_device *pdev)
|
||||
{
|
||||
struct exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev);
|
||||
struct usb_hcd *hcd = exynos_ohci->hcd;
|
||||
|
||||
if (hcd->driver->shutdown)
|
||||
hcd->driver->shutdown(hcd);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int exynos_ohci_suspend(struct device *dev)
|
||||
{
|
||||
struct exynos_ohci_hcd *exynos_ohci = dev_get_drvdata(dev);
|
||||
struct usb_hcd *hcd = exynos_ohci->hcd;
|
||||
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
|
||||
unsigned long flags;
|
||||
int rc = 0;
|
||||
|
||||
/*
|
||||
* Root hub was already suspended. Disable irq emission and
|
||||
* mark HW unaccessible, bail out if RH has been resumed. Use
|
||||
* the spinlock to properly synchronize with possible pending
|
||||
* RH suspend or resume activity.
|
||||
*
|
||||
* This is still racy as hcd->state is manipulated outside of
|
||||
* any locks =P But that will be a different fix.
|
||||
*/
|
||||
spin_lock_irqsave(&ohci->lock, flags);
|
||||
if (hcd->state != HC_STATE_SUSPENDED && hcd->state != HC_STATE_HALT) {
|
||||
rc = -EINVAL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
|
||||
|
||||
if (pdata && pdata->phy_exit)
|
||||
pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
|
||||
fail:
|
||||
spin_unlock_irqrestore(&ohci->lock, flags);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int exynos_ohci_resume(struct device *dev)
|
||||
{
|
||||
struct exynos_ohci_hcd *exynos_ohci = dev_get_drvdata(dev);
|
||||
struct usb_hcd *hcd = exynos_ohci->hcd;
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
|
||||
|
||||
if (pdata && pdata->phy_init)
|
||||
pdata->phy_init(pdev, S5P_USB_PHY_HOST);
|
||||
|
||||
/* Mark hardware accessible again as we are out of D3 state by now */
|
||||
set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
|
||||
|
||||
ohci_finish_controller_resume(hcd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
#define exynos_ohci_suspend NULL
|
||||
#define exynos_ohci_resume NULL
|
||||
#endif
|
||||
|
||||
static const struct dev_pm_ops exynos_ohci_pm_ops = {
|
||||
.suspend = exynos_ohci_suspend,
|
||||
.resume = exynos_ohci_resume,
|
||||
};
|
||||
|
||||
static struct platform_driver exynos_ohci_driver = {
|
||||
.probe = exynos_ohci_probe,
|
||||
.remove = __devexit_p(exynos_ohci_remove),
|
||||
.shutdown = exynos_ohci_shutdown,
|
||||
.driver = {
|
||||
.name = "exynos-ohci",
|
||||
.owner = THIS_MODULE,
|
||||
.pm = &exynos_ohci_pm_ops,
|
||||
}
|
||||
};
|
||||
|
||||
MODULE_ALIAS("platform:exynos-ohci");
|
||||
MODULE_AUTHOR("Jingoo Han <[email protected]>");
|
||||
|
|
@ -1005,6 +1005,11 @@ MODULE_LICENSE ("GPL");
|
|||
#define PLATFORM_DRIVER ohci_hcd_s3c2410_driver
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_OHCI_EXYNOS
|
||||
#include "ohci-exynos.c"
|
||||
#define PLATFORM_DRIVER exynos_ohci_driver
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_OHCI_HCD_OMAP1
|
||||
#include "ohci-omap.c"
|
||||
#define OMAP1_PLATFORM_DRIVER ohci_hcd_omap_driver
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
|
||||
#include <linux/platform_device.h>
|
||||
#include <plat/usb.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
|
|
@ -134,7 +135,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
|
|||
int irq;
|
||||
|
||||
if (usb_disabled())
|
||||
goto err_end;
|
||||
return -ENODEV;
|
||||
|
||||
if (!dev->parent) {
|
||||
dev_err(dev, "Missing parent device\n");
|
||||
|
|
@ -172,11 +173,8 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
|
|||
hcd->rsrc_len = resource_size(res);
|
||||
hcd->regs = regs;
|
||||
|
||||
ret = omap_usbhs_enable(dev);
|
||||
if (ret) {
|
||||
dev_dbg(dev, "failed to start ohci\n");
|
||||
goto err_end;
|
||||
}
|
||||
pm_runtime_enable(dev);
|
||||
pm_runtime_get_sync(dev);
|
||||
|
||||
ohci_hcd_init(hcd_to_ohci(hcd));
|
||||
|
||||
|
|
@ -189,9 +187,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
|
||||
err_add_hcd:
|
||||
omap_usbhs_disable(dev);
|
||||
|
||||
err_end:
|
||||
pm_runtime_put_sync(dev);
|
||||
usb_put_hcd(hcd);
|
||||
|
||||
err_io:
|
||||
|
|
@ -220,9 +216,9 @@ static int __devexit ohci_hcd_omap3_remove(struct platform_device *pdev)
|
|||
|
||||
iounmap(hcd->regs);
|
||||
usb_remove_hcd(hcd);
|
||||
omap_usbhs_disable(dev);
|
||||
pm_runtime_put_sync(dev);
|
||||
pm_runtime_disable(dev);
|
||||
usb_put_hcd(hcd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue