Message ID | 1342676499-32507-8-git-send-email-ajay.gupta@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, On Thu, Jul 19, 2012 at 11:11 AM, Ajay Kumar Gupta <ajay.gupta@ti.com> wrote: > Added device tree support for nop transceiver driver and updated the > Documentation with device tree binding information for am33xx platform. > > Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> > --- > .../devicetree/bindings/usb/am33xx-usb.txt | 3 +++ > drivers/usb/otg/nop-usb-xceiv.c | 12 ++++++++++++ > 2 files changed, 15 insertions(+), 0 deletions(-) > > diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt > index ca8fa56..9782585 100644 > --- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt > +++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt > @@ -12,3 +12,6 @@ AM33XX MUSB GLUE > represents PERIPHERAL. > - power : Should be "250". This signifies the controller can supply upto > 500mA when operating in host mode. > + > +NOP USB PHY > + - compatible : Should be "nop-xceiv-usb" > diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb-xceiv.c > index 2e5e889..102e7d8 100644 > --- a/drivers/usb/otg/nop-usb-xceiv.c > +++ b/drivers/usb/otg/nop-usb-xceiv.c > @@ -27,6 +27,7 @@ > */ > > #include <linux/module.h> > +#include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/dma-mapping.h> > #include <linux/usb/otg.h> > @@ -152,12 +153,23 @@ static int __devexit nop_usb_xceiv_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_OF > +static const struct of_device_id nop_xceiv_id_table[] = { > + { .compatible = "nop-xceiv-usb" }, > + {} > +}; > +MODULE_DEVICE_TABLE(of, nop_xceiv_id_table); > +#else > +#define nop_xceiv_id_table NULL > +#endif The *#else* part is not needed as your *of_match_ptr* will take care of it. > + > static struct platform_driver nop_usb_xceiv_driver = { > .probe = nop_usb_xceiv_probe, > .remove = __devexit_p(nop_usb_xceiv_remove), > .driver = { > .name = "nop_usb_xceiv", > .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(nop_xceiv_id_table), > }, > }; Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, > > Added device tree support for nop transceiver driver and updated the > > Documentation with device tree binding information for am33xx platform. > > > > Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> > > --- > > .../devicetree/bindings/usb/am33xx-usb.txt | 3 +++ > > drivers/usb/otg/nop-usb-xceiv.c | 12 ++++++++++++ > > 2 files changed, 15 insertions(+), 0 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt > b/Documentation/devicetree/bindings/usb/am33xx-usb.txt > > index ca8fa56..9782585 100644 > > --- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt > > +++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt > > @@ -12,3 +12,6 @@ AM33XX MUSB GLUE > > represents PERIPHERAL. > > - power : Should be "250". This signifies the controller can supply upto > > 500mA when operating in host mode. > > + > > +NOP USB PHY > > + - compatible : Should be "nop-xceiv-usb" > > diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb- > xceiv.c > > index 2e5e889..102e7d8 100644 > > --- a/drivers/usb/otg/nop-usb-xceiv.c > > +++ b/drivers/usb/otg/nop-usb-xceiv.c > > @@ -27,6 +27,7 @@ > > */ > > > > #include <linux/module.h> > > +#include <linux/of.h> > > #include <linux/platform_device.h> > > #include <linux/dma-mapping.h> > > #include <linux/usb/otg.h> > > @@ -152,12 +153,23 @@ static int __devexit nop_usb_xceiv_remove(struct > platform_device *pdev) > > return 0; > > } > > > > +#ifdef CONFIG_OF > > +static const struct of_device_id nop_xceiv_id_table[] = { > > + { .compatible = "nop-xceiv-usb" }, > > + {} > > +}; > > +MODULE_DEVICE_TABLE(of, nop_xceiv_id_table); > > +#else > > +#define nop_xceiv_id_table NULL > > +#endif > > The *#else* part is not needed as your *of_match_ptr* will take care of it. Ok, I will update this. Ajay > > > + > > static struct platform_driver nop_usb_xceiv_driver = { > > .probe = nop_usb_xceiv_probe, > > .remove = __devexit_p(nop_usb_xceiv_remove), > > .driver = { > > .name = "nop_usb_xceiv", > > .owner = THIS_MODULE, > > + .of_match_table = of_match_ptr(nop_xceiv_id_table), > > }, > > }; > > Thanks > Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt index ca8fa56..9782585 100644 --- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt +++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt @@ -12,3 +12,6 @@ AM33XX MUSB GLUE represents PERIPHERAL. - power : Should be "250". This signifies the controller can supply upto 500mA when operating in host mode. + +NOP USB PHY + - compatible : Should be "nop-xceiv-usb" diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb-xceiv.c index 2e5e889..102e7d8 100644 --- a/drivers/usb/otg/nop-usb-xceiv.c +++ b/drivers/usb/otg/nop-usb-xceiv.c @@ -27,6 +27,7 @@ */ #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/usb/otg.h> @@ -152,12 +153,23 @@ static int __devexit nop_usb_xceiv_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id nop_xceiv_id_table[] = { + { .compatible = "nop-xceiv-usb" }, + {} +}; +MODULE_DEVICE_TABLE(of, nop_xceiv_id_table); +#else +#define nop_xceiv_id_table NULL +#endif + static struct platform_driver nop_usb_xceiv_driver = { .probe = nop_usb_xceiv_probe, .remove = __devexit_p(nop_usb_xceiv_remove), .driver = { .name = "nop_usb_xceiv", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(nop_xceiv_id_table), }, };
Added device tree support for nop transceiver driver and updated the Documentation with device tree binding information for am33xx platform. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> --- .../devicetree/bindings/usb/am33xx-usb.txt | 3 +++ drivers/usb/otg/nop-usb-xceiv.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-)