From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752004Ab2GSOsc (ORCPT ); Thu, 19 Jul 2012 10:48:32 -0400 Received: from na3sys009aog101.obsmtp.com ([74.125.149.67]:56919 "EHLO na3sys009aog101.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751239Ab2GSOs3 (ORCPT ); Thu, 19 Jul 2012 10:48:29 -0400 MIME-Version: 1.0 In-Reply-To: <47CEF8C4B26E8C44B22B028A650E0EA93EADE11A@DBDE01.ent.ti.com> References: <1342607922-11554-1-git-send-email-kishon@ti.com> <1342607922-11554-10-git-send-email-kishon@ti.com> <47CEF8C4B26E8C44B22B028A650E0EA93EADE11A@DBDE01.ent.ti.com> Date: Thu, 19 Jul 2012 20:18:27 +0530 Message-ID: Subject: Re: [PATCH v4 09/11] drivers: usb: musb: Add device tree support for omap musb glue From: "ABRAHAM, KISHON VIJAY" To: "Gupta, Ajay Kumar" Cc: "grant.likely@secretlab.ca" , "rob.herring@calxeda.com" , "rob@landley.net" , "linux@arm.linux.org.uk" , "gregkh@linuxfoundation.org" , "Cousson, Benoit" , "Nayak, Rajendra" , "tony@atomide.com" , "devicetree-discuss@lists.ozlabs.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "Balbi, Felipe" , "linux-omap@vger.kernel.org" , "linux-usb@vger.kernel.org" Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Thu, Jul 19, 2012 at 6:51 PM, Gupta, Ajay Kumar wrote: > Hi, >> Signed-off-by: Kishon Vijay Abraham I >> --- >> 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 >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: "ABRAHAM, KISHON VIJAY" Subject: Re: [PATCH v4 09/11] drivers: usb: musb: Add device tree support for omap musb glue Date: Thu, 19 Jul 2012 20:18:27 +0530 Message-ID: References: <1342607922-11554-1-git-send-email-kishon@ti.com> <1342607922-11554-10-git-send-email-kishon@ti.com> <47CEF8C4B26E8C44B22B028A650E0EA93EADE11A@DBDE01.ent.ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: In-Reply-To: <47CEF8C4B26E8C44B22B028A650E0EA93EADE11A@DBDE01.ent.ti.com> Sender: linux-doc-owner@vger.kernel.org To: "Gupta, Ajay Kumar" Cc: "grant.likely@secretlab.ca" , "rob.herring@calxeda.com" , "rob@landley.net" , "linux@arm.linux.org.uk" , "gregkh@linuxfoundation.org" , "Cousson, Benoit" , "Nayak, Rajendra" , "tony@atomide.com" , "devicetree-discuss@lists.ozlabs.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "Balbi, Felipe" , "linux-omap@vger.kernel.org" , "linux-usb@vger.kernel.org" List-Id: devicetree@vger.kernel.org Hi, On Thu, Jul 19, 2012 at 6:51 PM, Gupta, Ajay Kumar wrote: > Hi, >> Signed-off-by: Kishon Vijay Abraham I >> --- >> 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 >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: kishon@ti.com (ABRAHAM, KISHON VIJAY) Date: Thu, 19 Jul 2012 20:18:27 +0530 Subject: [PATCH v4 09/11] drivers: usb: musb: Add device tree support for omap musb glue In-Reply-To: <47CEF8C4B26E8C44B22B028A650E0EA93EADE11A@DBDE01.ent.ti.com> References: <1342607922-11554-1-git-send-email-kishon@ti.com> <1342607922-11554-10-git-send-email-kishon@ti.com> <47CEF8C4B26E8C44B22B028A650E0EA93EADE11A@DBDE01.ent.ti.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, On Thu, Jul 19, 2012 at 6:51 PM, Gupta, Ajay Kumar wrote: > Hi, >> Signed-off-by: Kishon Vijay Abraham I >> --- >> 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 at 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 at 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 >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -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