Skip to content

Commit

Permalink
USB: host: Rename ehci-s5p to ehci-exynos
Browse files Browse the repository at this point in the history 
Currently, Samsung is using 'EXYNOS' as the name of Samsung SoCs.
Thus, ehci-exynos is preferred than ehci-s5p.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jingoo Han authored and Greg Kroah-Hartman committed Oct 11, 2013
1 parent 57ae160 commit 29824c1
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 70 deletions.
5 changes: 2 additions & 3 deletions drivers/usb/host/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,11 @@ config USB_EHCI_SH
Enables support for the on-chip EHCI controller on the SuperH.
If you use the PCI EHCI controller, this option is not necessary.

config USB_EHCI_S5P
config USB_EHCI_EXYNOS
tristate "EHCI support for Samsung S5P/EXYNOS SoC Series"
depends on PLAT_S5P || ARCH_EXYNOS
help
Enable support for the Samsung S5Pxxxx and Exynos3/4/5 SOC's
on-chip EHCI controller.
Enable support for the Samsung Exynos SOC's on-chip EHCI controller.

config USB_EHCI_MV
bool "EHCI support for Marvell PXA/MMP USB controller"
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o
obj-$(CONFIG_USB_EHCI_HCD_OMAP) += ehci-omap.o
obj-$(CONFIG_USB_EHCI_HCD_ORION) += ehci-orion.o
obj-$(CONFIG_USB_EHCI_HCD_SPEAR) += ehci-spear.o
obj-$(CONFIG_USB_EHCI_S5P) += ehci-s5p.o
obj-$(CONFIG_USB_EHCI_EXYNOS) += ehci-exynos.o
obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o
obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o
obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
Expand Down
132 changes: 66 additions & 66 deletions drivers/usb/host/ehci-s5p.c → drivers/usb/host/ehci-exynos.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SAMSUNG S5P USB HOST EHCI Controller
* SAMSUNG EXYNOS USB HOST EHCI Controller
*
* Copyright (C) 2011 Samsung Electronics Co.Ltd
* Author: Jingoo Han <jg1.han@samsung.com>
Expand Down Expand Up @@ -28,7 +28,7 @@

#include "ehci.h"

#define DRIVER_DESC "EHCI s5p driver"
#define DRIVER_DESC "EHCI EXYNOS driver"

#define EHCI_INSNREG00(base) (base + 0x90)
#define EHCI_INSNREG00_ENA_INCR16 (0x1 << 25)
Expand All @@ -39,18 +39,18 @@
(EHCI_INSNREG00_ENA_INCR16 | EHCI_INSNREG00_ENA_INCR8 | \
EHCI_INSNREG00_ENA_INCR4 | EHCI_INSNREG00_ENA_INCRX_ALIGN)

static const char hcd_name[] = "ehci-s5p";
static struct hc_driver __read_mostly s5p_ehci_hc_driver;
static const char hcd_name[] = "ehci-exynos";
static struct hc_driver __read_mostly exynos_ehci_hc_driver;

struct s5p_ehci_hcd {
struct exynos_ehci_hcd {
struct clk *clk;
struct usb_phy *phy;
struct usb_otg *otg;
};

#define to_s5p_ehci(hcd) (struct s5p_ehci_hcd *)(hcd_to_ehci(hcd)->priv)
#define to_exynos_ehci(hcd) (struct exynos_ehci_hcd *)(hcd_to_ehci(hcd)->priv)

static void s5p_setup_vbus_gpio(struct platform_device *pdev)
static void exynos_setup_vbus_gpio(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
int err;
Expand All @@ -69,9 +69,9 @@ static void s5p_setup_vbus_gpio(struct platform_device *pdev)
dev_err(dev, "can't request ehci vbus gpio %d", gpio);
}

static int s5p_ehci_probe(struct platform_device *pdev)
static int exynos_ehci_probe(struct platform_device *pdev)
{
struct s5p_ehci_hcd *s5p_ehci;
struct exynos_ehci_hcd *exynos_ehci;
struct usb_hcd *hcd;
struct ehci_hcd *ehci;
struct resource *res;
Expand All @@ -89,15 +89,15 @@ static int s5p_ehci_probe(struct platform_device *pdev)
if (!pdev->dev.coherent_dma_mask)
pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

s5p_setup_vbus_gpio(pdev);
exynos_setup_vbus_gpio(pdev);

hcd = usb_create_hcd(&s5p_ehci_hc_driver,
hcd = usb_create_hcd(&exynos_ehci_hc_driver,
&pdev->dev, dev_name(&pdev->dev));
if (!hcd) {
dev_err(&pdev->dev, "Unable to create HCD\n");
return -ENOMEM;
}
s5p_ehci = to_s5p_ehci(hcd);
exynos_ehci = to_exynos_ehci(hcd);

if (of_device_is_compatible(pdev->dev.of_node,
"samsung,exynos5440-ehci"))
Expand All @@ -109,21 +109,21 @@ static int s5p_ehci_probe(struct platform_device *pdev)
dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
return -EPROBE_DEFER;
} else {
s5p_ehci->phy = phy;
s5p_ehci->otg = phy->otg;
exynos_ehci->phy = phy;
exynos_ehci->otg = phy->otg;
}

skip_phy:

s5p_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");
exynos_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");

if (IS_ERR(s5p_ehci->clk)) {
if (IS_ERR(exynos_ehci->clk)) {
dev_err(&pdev->dev, "Failed to get usbhost clock\n");
err = PTR_ERR(s5p_ehci->clk);
err = PTR_ERR(exynos_ehci->clk);
goto fail_clk;
}

err = clk_prepare_enable(s5p_ehci->clk);
err = clk_prepare_enable(exynos_ehci->clk);
if (err)
goto fail_clk;

Expand All @@ -150,11 +150,11 @@ static int s5p_ehci_probe(struct platform_device *pdev)
goto fail_io;
}

if (s5p_ehci->otg)
s5p_ehci->otg->set_host(s5p_ehci->otg, &hcd->self);
if (exynos_ehci->otg)
exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self);

if (s5p_ehci->phy)
usb_phy_init(s5p_ehci->phy);
if (exynos_ehci->phy)
usb_phy_init(exynos_ehci->phy);

ehci = hcd_to_ehci(hcd);
ehci->caps = hcd->regs;
Expand All @@ -173,69 +173,69 @@ static int s5p_ehci_probe(struct platform_device *pdev)
return 0;

fail_add_hcd:
if (s5p_ehci->phy)
usb_phy_shutdown(s5p_ehci->phy);
if (exynos_ehci->phy)
usb_phy_shutdown(exynos_ehci->phy);
fail_io:
clk_disable_unprepare(s5p_ehci->clk);
clk_disable_unprepare(exynos_ehci->clk);
fail_clk:
usb_put_hcd(hcd);
return err;
}

static int s5p_ehci_remove(struct platform_device *pdev)
static int exynos_ehci_remove(struct platform_device *pdev)
{
struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct s5p_ehci_hcd *s5p_ehci = to_s5p_ehci(hcd);
struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);

usb_remove_hcd(hcd);

if (s5p_ehci->otg)
s5p_ehci->otg->set_host(s5p_ehci->otg, &hcd->self);
if (exynos_ehci->otg)
exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self);

if (s5p_ehci->phy)
usb_phy_shutdown(s5p_ehci->phy);
if (exynos_ehci->phy)
usb_phy_shutdown(exynos_ehci->phy);

clk_disable_unprepare(s5p_ehci->clk);
clk_disable_unprepare(exynos_ehci->clk);

usb_put_hcd(hcd);

return 0;
}

#ifdef CONFIG_PM
static int s5p_ehci_suspend(struct device *dev)
static int exynos_ehci_suspend(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct s5p_ehci_hcd *s5p_ehci = to_s5p_ehci(hcd);
struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);

bool do_wakeup = device_may_wakeup(dev);
int rc;

rc = ehci_suspend(hcd, do_wakeup);

if (s5p_ehci->otg)
s5p_ehci->otg->set_host(s5p_ehci->otg, &hcd->self);
if (exynos_ehci->otg)
exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self);

if (s5p_ehci->phy)
usb_phy_shutdown(s5p_ehci->phy);
if (exynos_ehci->phy)
usb_phy_shutdown(exynos_ehci->phy);

clk_disable_unprepare(s5p_ehci->clk);
clk_disable_unprepare(exynos_ehci->clk);

return rc;
}

static int s5p_ehci_resume(struct device *dev)
static int exynos_ehci_resume(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct s5p_ehci_hcd *s5p_ehci = to_s5p_ehci(hcd);
struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);

clk_prepare_enable(s5p_ehci->clk);
clk_prepare_enable(exynos_ehci->clk);

if (s5p_ehci->otg)
s5p_ehci->otg->set_host(s5p_ehci->otg, &hcd->self);
if (exynos_ehci->otg)
exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self);

if (s5p_ehci->phy)
usb_phy_init(s5p_ehci->phy);
if (exynos_ehci->phy)
usb_phy_init(exynos_ehci->phy);

/* DMA burst Enable */
writel(EHCI_INSNREG00_ENABLE_DMA_BURST, EHCI_INSNREG00(hcd->regs));
Expand All @@ -244,13 +244,13 @@ static int s5p_ehci_resume(struct device *dev)
return 0;
}
#else
#define s5p_ehci_suspend NULL
#define s5p_ehci_resume NULL
#define exynos_ehci_suspend NULL
#define exynos_ehci_resume NULL
#endif

static const struct dev_pm_ops s5p_ehci_pm_ops = {
.suspend = s5p_ehci_suspend,
.resume = s5p_ehci_resume,
static const struct dev_pm_ops exynos_ehci_pm_ops = {
.suspend = exynos_ehci_suspend,
.resume = exynos_ehci_resume,
};

#ifdef CONFIG_OF
Expand All @@ -262,40 +262,40 @@ static const struct of_device_id exynos_ehci_match[] = {
MODULE_DEVICE_TABLE(of, exynos_ehci_match);
#endif

static struct platform_driver s5p_ehci_driver = {
.probe = s5p_ehci_probe,
.remove = s5p_ehci_remove,
static struct platform_driver exynos_ehci_driver = {
.probe = exynos_ehci_probe,
.remove = exynos_ehci_remove,
.shutdown = usb_hcd_platform_shutdown,
.driver = {
.name = "s5p-ehci",
.name = "exynos-ehci",
.owner = THIS_MODULE,
.pm = &s5p_ehci_pm_ops,
.pm = &exynos_ehci_pm_ops,
.of_match_table = of_match_ptr(exynos_ehci_match),
}
};
static const struct ehci_driver_overrides s5p_overrides __initdata = {
.extra_priv_size = sizeof(struct s5p_ehci_hcd),
static const struct ehci_driver_overrides exynos_overrides __initdata = {
.extra_priv_size = sizeof(struct exynos_ehci_hcd),
};

static int __init ehci_s5p_init(void)
static int __init ehci_exynos_init(void)
{
if (usb_disabled())
return -ENODEV;

pr_info("%s: " DRIVER_DESC "\n", hcd_name);
ehci_init_driver(&s5p_ehci_hc_driver, &s5p_overrides);
return platform_driver_register(&s5p_ehci_driver);
ehci_init_driver(&exynos_ehci_hc_driver, &exynos_overrides);
return platform_driver_register(&exynos_ehci_driver);
}
module_init(ehci_s5p_init);
module_init(ehci_exynos_init);

static void __exit ehci_s5p_cleanup(void)
static void __exit ehci_exynos_cleanup(void)
{
platform_driver_unregister(&s5p_ehci_driver);
platform_driver_unregister(&exynos_ehci_driver);
}
module_exit(ehci_s5p_cleanup);
module_exit(ehci_exynos_cleanup);

MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_ALIAS("platform:s5p-ehci");
MODULE_ALIAS("platform:exynos-ehci");
MODULE_AUTHOR("Jingoo Han");
MODULE_AUTHOR("Joonyoung Shim");
MODULE_LICENSE("GPL v2");

0 comments on commit 29824c1

Please sign in to comment.