Commit d5138930 authored by Vivek Gautam's avatar Vivek Gautam Committed by Greg Kroah-Hartman

USB: ohci-exynos: Add support for device tree

This patch adds support to parse probe data for
ohci driver for exynos using device tree.
Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarAbhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: default avatarVivek Gautam <gautam.vivek@samsung.com>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba5952e0
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <mach/ohci.h> #include <mach/ohci.h>
#include <plat/usb-phy.h> #include <plat/usb-phy.h>
...@@ -71,6 +72,8 @@ static const struct hc_driver exynos_ohci_hc_driver = { ...@@ -71,6 +72,8 @@ static const struct hc_driver exynos_ohci_hc_driver = {
.start_port_reset = ohci_start_port_reset, .start_port_reset = ohci_start_port_reset,
}; };
static u64 ohci_exynos_dma_mask = DMA_BIT_MASK(32);
static int __devinit exynos_ohci_probe(struct platform_device *pdev) static int __devinit exynos_ohci_probe(struct platform_device *pdev)
{ {
struct exynos4_ohci_platdata *pdata; struct exynos4_ohci_platdata *pdata;
...@@ -87,6 +90,16 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev) ...@@ -87,6 +90,16 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
/*
* Right now device-tree probed devices don't get dma_mask set.
* Since shared usb code relies on it, set it here for now.
* Once we move to full device tree support this will vanish off.
*/
if (!pdev->dev.dma_mask)
pdev->dev.dma_mask = &ohci_exynos_dma_mask;
if (!pdev->dev.coherent_dma_mask)
pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
exynos_ohci = devm_kzalloc(&pdev->dev, sizeof(struct exynos_ohci_hcd), exynos_ohci = devm_kzalloc(&pdev->dev, sizeof(struct exynos_ohci_hcd),
GFP_KERNEL); GFP_KERNEL);
if (!exynos_ohci) if (!exynos_ohci)
...@@ -256,6 +269,14 @@ static const struct dev_pm_ops exynos_ohci_pm_ops = { ...@@ -256,6 +269,14 @@ static const struct dev_pm_ops exynos_ohci_pm_ops = {
.resume = exynos_ohci_resume, .resume = exynos_ohci_resume,
}; };
#ifdef CONFIG_OF
static const struct of_device_id exynos_ohci_match[] = {
{ .compatible = "samsung,exynos-ohci" },
{},
};
MODULE_DEVICE_TABLE(of, exynos_ohci_match);
#endif
static struct platform_driver exynos_ohci_driver = { static struct platform_driver exynos_ohci_driver = {
.probe = exynos_ohci_probe, .probe = exynos_ohci_probe,
.remove = __devexit_p(exynos_ohci_remove), .remove = __devexit_p(exynos_ohci_remove),
...@@ -264,6 +285,7 @@ static struct platform_driver exynos_ohci_driver = { ...@@ -264,6 +285,7 @@ static struct platform_driver exynos_ohci_driver = {
.name = "exynos-ohci", .name = "exynos-ohci",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &exynos_ohci_pm_ops, .pm = &exynos_ohci_pm_ops,
.of_match_table = of_match_ptr(exynos_ohci_match),
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment