Hi, On Thu, Jul 19, 2012 at 6:51 PM, Gupta, Ajay Kumar <ajay.gupta@xxxxxx> wrote: > Hi, >> Signed-off-by: Kishon Vijay Abraham I <kishon@xxxxxx> >> --- >> Documentation/devicetree/bindings/usb/omap-usb.txt | 34 ++++++++++++- >> drivers/usb/musb/omap2430.c | 55 >> ++++++++++++++++++++ >> 2 files changed, 88 insertions(+), 1 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt >> b/Documentation/devicetree/bindings/usb/omap-usb.txt >> index 80a28c9..39cdffb 100644 >> --- a/Documentation/devicetree/bindings/usb/omap-usb.txt >> +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt >> @@ -1,4 +1,4 @@ >> -OMAP USB PHY >> +OMAP USB PHY AND GLUE >> >> OMAP USB2 PHY >> >> @@ -14,3 +14,35 @@ usb2phy@0x4a0ad080 { >> compatible = "ti,omap-usb2"; >> reg = <0x4a0ad080 0x58>; >> }; >> + >> +OMAP MUSB GLUE >> + - compatible : Should be "ti,musb-omap2430" >> + - ti,hwmods : must be "usb_otg_hs" >> + - multipoint : Should be "1" indicating the musb controller supports >> + multipoint. This is a MUSB configuration-specific setting. >> + - num_eps : Specifies the number of endpoints. This is also a >> + MUSB configuration-specific setting. Should be set to "16" >> + - ram_bits : Specifies the ram address size. Should be set to "12" >> + - interface_type : This is a board specific setting to describe the type >> of >> + interface between the controller and the phy. It should be "0" or "1" >> + specifying ULPI and UTMI respectively. >> + - mode : Should be "3" to represent OTG. "1" signifies HOST and "2" >> + represents PERIPHERAL. >> + - power : Should be "50". This signifies the controller can supply upto >> + 100mA when operating in host mode. >> + >> +SOC specific device node entry >> +usb_otg_hs: usb_otg_hs@4a0ab000 { >> + compatible = "ti,musb-omap2430"; >> + ti,hwmods = "usb_otg_hs"; >> + multipoint = <1>; >> + num_eps = <16>; >> + ram_bits = <12>; >> +}; >> + >> +Board specific device node entry >> +&usb_otg_hs { >> + interface_type = <1>; >> + mode = <3>; >> + power = <50>; >> +}; >> diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c >> index addbebf..331e477 100644 >> --- a/drivers/usb/musb/omap2430.c >> +++ b/drivers/usb/musb/omap2430.c >> @@ -30,6 +30,7 @@ >> #include <linux/init.h> >> #include <linux/list.h> >> #include <linux/io.h> >> +#include <linux/of.h> >> #include <linux/platform_device.h> >> #include <linux/dma-mapping.h> >> #include <linux/pm_runtime.h> >> @@ -469,8 +470,11 @@ static u64 omap2430_dmamask = DMA_BIT_MASK(32); >> static int __devinit omap2430_probe(struct platform_device *pdev) >> { >> struct musb_hdrc_platform_data *pdata = pdev->dev.platform_data; >> + struct omap_musb_board_data *data; >> struct platform_device *musb; >> struct omap2430_glue *glue; >> + struct device_node *np = pdev->dev.of_node; >> + struct musb_hdrc_config *config; >> struct resource *res; >> int ret = -ENOMEM; >> >> @@ -500,6 +504,43 @@ static int __devinit omap2430_probe(struct >> platform_device *pdev) >> if (glue->control_otghs == NULL) >> dev_dbg(&pdev->dev, "Failed to obtain control memory\n"); >> >> + if (np) { >> + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); >> + if (!pdata) { >> + dev_err(&pdev->dev, >> + "failed to allocate musb platfrom data\n"); >> + ret = -ENOMEM; >> + goto err1; >> + } >> + >> + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); >> + if (!data) { >> + dev_err(&pdev->dev, >> + "failed to allocate musb board data\n"); >> + ret = -ENOMEM; >> + goto err1; >> + } >> + >> + config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL); >> + if (!data) { >> + dev_err(&pdev->dev, >> + "failed to allocate musb hdrc config\n"); >> + goto err1; >> + } >> + >> + of_property_read_u32(np, "mode", (u32 *)&pdata->mode); >> + of_property_read_u32(np, "interface_type", >> + (u32 *)&data->interface_type); >> + of_property_read_u32(np, "num_eps", (u32 *)&config->num_eps); >> + of_property_read_u32(np, "ram_bits", (u32 *)&config->ram_bits); >> + of_property_read_u32(np, "mode", (u32 *)&pdata->mode); > > pdata->mode is already read so above should be removed. Ok. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html