usb: musb: omap: Add device tree support for omap musb glue

Added device tree support for omap musb driver and updated the
Documentation with device tree binding information.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
new file mode 100644 (file)
index 0000000..29a043e
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
@@ -0,0 +1,33 @@
+OMAP GLUE
+
+OMAP MUSB GLUE
+ - compatible : Should be "ti,omap4-musb" or "ti,omap3-musb"
+ - 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,omap4-musb";
+       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 f4d95037db5d352a1c6381a55cc0c9f07ddccff4..d96873ba97c751ffe5fd92ab1c6a535c74275000 100644 (file)
--- 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>
@@ -470,8 +471,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;
 
@@ -501,6 +505,42 @@ 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, "power", (u32 *)&pdata->power);
+               config->multipoint = of_property_read_bool(np, "multipoint");
+
+               pdata->board_data       = data;
+               pdata->config           = config;
+       }
+
        pdata->platform_ops             = &omap2430_ops;
 
        platform_set_drvdata(pdev, glue);
@@ -597,12 +637,26 @@ static struct dev_pm_ops omap2430_pm_ops = {
 #define DEV_PM_OPS     NULL
 #endif
 
+#ifdef CONFIG_OF
+static const struct of_device_id omap2430_id_table[] = {
+       {
+               .compatible = "ti,omap4-musb"
+       },
+       {
+               .compatible = "ti,omap3-musb"
+       },
+       {},
+};
+MODULE_DEVICE_TABLE(of, omap2430_id_table);
+#endif
+
 static struct platform_driver omap2430_driver = {
        .probe          = omap2430_probe,
        .remove         = __devexit_p(omap2430_remove),
        .driver         = {
                .name   = "musb-omap2430",
                .pm     = DEV_PM_OPS,
+               .of_match_table = of_match_ptr(omap2430_id_table),
        },
 };