[PATCH v2] USB: ohci-pxa27x: add DT bindings
Add DT bindings to the ohci-pxa27x driver and some documentation. Successfully tested on a PXA3xx board. Signed-off-by: Daniel Mack --- Changes from v1: - renamed "mrvl" to "marvell" Greg, I think that would best go through your usb tree. Is that ok? Documentation/devicetree/bindings/usb/pxa-usb.txt | 31 +++ drivers/usb/host/ohci-pxa27x.c| 68 +++ 2 files changed, 99 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/pxa-usb.txt diff --git a/Documentation/devicetree/bindings/usb/pxa-usb.txt b/Documentation/devicetree/bindings/usb/pxa-usb.txt new file mode 100644 index 000..79729a9 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/pxa-usb.txt @@ -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@4c00 { + compatible = "marvell,pxa-ohci", "usb-ohci"; + reg = <0x4c00 0x10>; + interrupts = <18>; + marvell,enable-port1; + marvell,port-mode = <2>; /* PMM_GLOBAL_MODE */ + }; + diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index e1a3cc6..77f4402 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include #include #include @@ -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 /*-*/ @@ -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) @@ -544,6 +611,7 @@ static struct platform_driver ohci_hcd_pxa27x_driver = { .driver = { .name = "
Re: [PATCH v2] USB: ohci-pxa27x: add DT bindings
(Cc Greg) On 30.07.2012 09:29, Daniel Mack wrote: > Add DT bindings to the ohci-pxa27x driver and some documentation. > > Successfully tested on a PXA3xx board. > > Signed-off-by: Daniel Mack > --- > Changes from v1: > - renamed "mrvl" to "marvell" > > Greg, I think that would best go through your usb tree. Is that ok? > > > Documentation/devicetree/bindings/usb/pxa-usb.txt | 31 +++ > drivers/usb/host/ohci-pxa27x.c| 68 > +++ > 2 files changed, 99 insertions(+) > create mode 100644 Documentation/devicetree/bindings/usb/pxa-usb.txt > > diff --git a/Documentation/devicetree/bindings/usb/pxa-usb.txt > b/Documentation/devicetree/bindings/usb/pxa-usb.txt > new file mode 100644 > index 000..79729a9 > --- /dev/null > +++ b/Documentation/devicetree/bindings/usb/pxa-usb.txt > @@ -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@4c00 { > + compatible = "marvell,pxa-ohci", "usb-ohci"; > + reg = <0x4c00 0x10>; > + interrupts = <18>; > + marvell,enable-port1; > + marvell,port-mode = <2>; /* PMM_GLOBAL_MODE */ > + }; > + > diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c > index e1a3cc6..77f4402 100644 > --- a/drivers/usb/host/ohci-pxa27x.c > +++ b/drivers/usb/host/ohci-pxa27x.c > @@ -23,6 +23,8 @@ > #include > #include > #include > +#include > +#include > #include > #include > #include > @@ -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 > > /*-*/ > > @@ -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
Re: [PATCH v2] USB: ohci-pxa27x: add DT bindings
On Mon, Jul 30, 2012 at 09:29:12AM +0200, Daniel Mack wrote: > Add DT bindings to the ohci-pxa27x driver and some documentation. > > Successfully tested on a PXA3xx board. > > Signed-off-by: Daniel Mack > --- > Changes from v1: > - renamed "mrvl" to "marvell" > > Greg, I think that would best go through your usb tree. Is that ok? Ok, but it will have to wait until after 3.6-rc1 is out. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] USB: ohci-pxa27x: add DT bindings
On 30.07.2012 19:05, Greg KH wrote: > On Mon, Jul 30, 2012 at 09:29:12AM +0200, Daniel Mack wrote: >> Add DT bindings to the ohci-pxa27x driver and some documentation. >> >> Successfully tested on a PXA3xx board. >> >> Signed-off-by: Daniel Mack >> --- >> Changes from v1: >> - renamed "mrvl" to "marvell" >> >> Greg, I think that would best go through your usb tree. Is that ok? > > Ok, but it will have to wait until after 3.6-rc1 is out. Sure, no hurries at all. The rest of the releated patches won't make it to mainline before 3.7 anyway. Thanks, Daniel -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html