Skip to content

Commit

Permalink
USB: ohci-pxa27x: add DT bindings
Browse files Browse the repository at this point in the history
Add DT bindings to the ohci-pxa27x driver and some documentation.

Successfully tested on a PXA3xx board.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Daniel Mack authored and Greg Kroah-Hartman committed Aug 10, 2012
1 parent 0d7614f commit 1139b45
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 0 deletions.
31 changes: 31 additions & 0 deletions Documentation/devicetree/bindings/usb/pxa-usb.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
PXA USB controllers

OHCI

Required properties:
- compatible: Should be "marvell,pxa-ohci" for USB controllers
used in host mode.

Optional properties:
- "marvell,enable-port1", "marvell,enable-port2", "marvell,enable-port3"
If present, enables the appropriate USB port of the controller.
- "marvell,port-mode" selects the mode of the ports:
1 = PMM_NPS_MODE
2 = PMM_GLOBAL_MODE
3 = PMM_PERPORT_MODE
- "marvell,power-sense-low" - power sense pin is low-active.
- "marvell,power-control-low" - power control pin is low-active.
- "marvell,no-oc-protection" - disable over-current protection.
- "marvell,oc-mode-perport" - enable per-port over-current protection.
- "marvell,power_on_delay" Power On to Power Good time - in ms.

Example:

usb0: ohci@4c000000 {
compatible = "marvell,pxa-ohci", "usb-ohci";
reg = <0x4c000000 0x100000>;
interrupts = <18>;
marvell,enable-port1;
marvell,port-mode = <2>; /* PMM_GLOBAL_MODE */
};

68 changes: 68 additions & 0 deletions drivers/usb/host/ohci-pxa27x.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include <linux/signal.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/of_platform.h>
#include <linux/of_gpio.h>
#include <mach/hardware.h>
#include <mach/ohci.h>
#include <mach/pxa3xx-u2d.h>
Expand Down Expand Up @@ -272,6 +274,67 @@ static void pxa27x_stop_hc(struct pxa27x_ohci *ohci, struct device *dev)
clk_disable_unprepare(ohci->clk);
}

#ifdef CONFIG_OF
static const struct of_device_id pxa_ohci_dt_ids[] = {
{ .compatible = "marvell,pxa-ohci" },
{ }
};

MODULE_DEVICE_TABLE(of, pxa_ohci_dt_ids);

static u64 pxa_ohci_dma_mask = DMA_BIT_MASK(32);

static int __devinit ohci_pxa_of_init(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct pxaohci_platform_data *pdata;
u32 tmp;

if (!np)
return 0;

/* 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 have dma capability bindings this can go away.
*/
if (!pdev->dev.dma_mask)
pdev->dev.dma_mask = &pxa_ohci_dma_mask;

pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata)
return -ENOMEM;

if (of_get_property(np, "marvell,enable-port1", NULL))
pdata->flags |= ENABLE_PORT1;
if (of_get_property(np, "marvell,enable-port2", NULL))
pdata->flags |= ENABLE_PORT2;
if (of_get_property(np, "marvell,enable-port3", NULL))
pdata->flags |= ENABLE_PORT3;
if (of_get_property(np, "marvell,port-sense-low", NULL))
pdata->flags |= POWER_SENSE_LOW;
if (of_get_property(np, "marvell,power-control-low", NULL))
pdata->flags |= POWER_CONTROL_LOW;
if (of_get_property(np, "marvell,no-oc-protection", NULL))
pdata->flags |= NO_OC_PROTECTION;
if (of_get_property(np, "marvell,oc-mode-perport", NULL))
pdata->flags |= OC_MODE_PERPORT;
if (!of_property_read_u32(np, "marvell,power-on-delay", &tmp))
pdata->power_on_delay = tmp;
if (!of_property_read_u32(np, "marvell,port-mode", &tmp))
pdata->port_mode = tmp;
if (!of_property_read_u32(np, "marvell,power-budget", &tmp))
pdata->power_budget = tmp;

pdev->dev.platform_data = pdata;

return 0;
}
#else
static int __devinit ohci_pxa_of_init(struct platform_device *pdev)
{
return 0;
}
#endif

/*-------------------------------------------------------------------------*/

Expand All @@ -297,6 +360,10 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
struct resource *r;
struct clk *usb_clk;

retval = ohci_pxa_of_init(pdev);
if (retval)
return retval;

inf = pdev->dev.platform_data;

if (!inf)
Expand Down Expand Up @@ -544,6 +611,7 @@ static struct platform_driver ohci_hcd_pxa27x_driver = {
.driver = {
.name = "pxa27x-ohci",
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(pxa_ohci_dt_ids),
#ifdef CONFIG_PM
.pm = &ohci_hcd_pxa27x_pm_ops,
#endif
Expand Down

0 comments on commit 1139b45

Please sign in to comment.