| Message ID | 1359622873-23345-3-git-send-email-s.hauer@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Thursday 31 January 2013 02:31 PM, Sascha Hauer wrote: > From: Michael Grzeschik <m.grzeschik@pengutronix.de> > > This adds two little devicetree helper functions for determining the > dr_mode (host, peripheral, otg) and phy_type (utmi, ulpi,...) from > the devicetree. > > Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > drivers/usb/phy/Makefile | 1 + > drivers/usb/phy/phy.c | 10 ++++++++++ > drivers/usb/usb-common.c | 36 ++++++++++++++++++++++++++++++++++++ > include/linux/usb/of.h | 27 +++++++++++++++++++++++++++ > include/linux/usb/otg.h | 7 +++++++ > include/linux/usb/phy.h | 9 +++++++++ > 6 files changed, 90 insertions(+) > create mode 100644 include/linux/usb/of.h > > diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile > index 9fa6327..e1be1e8 100644 > --- a/drivers/usb/phy/Makefile > +++ b/drivers/usb/phy/Makefile > @@ -5,6 +5,7 @@ > ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG > > obj-$(CONFIG_USB_OTG_UTILS) += phy.o > +obj-$(CONFIG_OF) += of.o You've missed doing "git add ..usb/phy/of.c". > obj-$(CONFIG_OMAP_USB2) += omap-usb2.o > obj-$(CONFIG_OMAP_USB3) += omap-usb3.o > obj-$(CONFIG_OMAP_CONTROL_USB) += omap-control-usb.o > diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c > index ef35eb0..3ad4b5c 100644 > --- a/drivers/usb/phy/phy.c > +++ b/drivers/usb/phy/phy.c > @@ -1,3 +1,13 @@ > +/* > + * phy.c -- USB phy handling > + * > + * Copyright (C) 2004 Texas Instruments it's 2013 already :-P > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. But your *MODULE_LICENSE("GPL")* below tells it's only GPL. > + */ . . <snip> . . > MODULE_LICENSE("GPL"); Thanks Kishon
On Thu, Jan 31, 2013 at 10:01:09AM +0100, Sascha Hauer wrote: > From: Michael Grzeschik <m.grzeschik@pengutronix.de> > > This adds two little devicetree helper functions for determining the > dr_mode (host, peripheral, otg) and phy_type (utmi, ulpi,...) from > the devicetree. > > Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > drivers/usb/phy/Makefile | 1 + > drivers/usb/phy/phy.c | 10 ++++++++++ > drivers/usb/usb-common.c | 36 ++++++++++++++++++++++++++++++++++++ > include/linux/usb/of.h | 27 +++++++++++++++++++++++++++ > include/linux/usb/otg.h | 7 +++++++ > include/linux/usb/phy.h | 9 +++++++++ > 6 files changed, 90 insertions(+) > create mode 100644 include/linux/usb/of.h > > diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile > index 9fa6327..e1be1e8 100644 > --- a/drivers/usb/phy/Makefile > +++ b/drivers/usb/phy/Makefile > @@ -5,6 +5,7 @@ > ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG > > obj-$(CONFIG_USB_OTG_UTILS) += phy.o > +obj-$(CONFIG_OF) += of.o > obj-$(CONFIG_OMAP_USB2) += omap-usb2.o > obj-$(CONFIG_OMAP_USB3) += omap-usb3.o > obj-$(CONFIG_OMAP_CONTROL_USB) += omap-control-usb.o > diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c > index ef35eb0..3ad4b5c 100644 > --- a/drivers/usb/phy/phy.c > +++ b/drivers/usb/phy/phy.c > @@ -1,3 +1,13 @@ > +/* > + * phy.c -- USB phy handling > + * > + * Copyright (C) 2004 Texas Instruments > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ Do you really mean to change the license of the file from GPLv2 to GPLv2+? Did TI agree to that licening change? I need some documentation from some TI people before I can ever accept something like this. thanks, greg k-h
On Thu, Jan 31, 2013 at 10:20:59AM +0100, Greg KH wrote: > On Thu, Jan 31, 2013 at 10:01:09AM +0100, Sascha Hauer wrote: > > From: Michael Grzeschik <m.grzeschik@pengutronix.de> > > > > This adds two little devicetree helper functions for determining the > > dr_mode (host, peripheral, otg) and phy_type (utmi, ulpi,...) from > > the devicetree. > > > > Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> > > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > > --- > > drivers/usb/phy/Makefile | 1 + > > drivers/usb/phy/phy.c | 10 ++++++++++ > > drivers/usb/usb-common.c | 36 ++++++++++++++++++++++++++++++++++++ > > include/linux/usb/of.h | 27 +++++++++++++++++++++++++++ > > include/linux/usb/otg.h | 7 +++++++ > > include/linux/usb/phy.h | 9 +++++++++ > > 6 files changed, 90 insertions(+) > > create mode 100644 include/linux/usb/of.h > > > > diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile > > index 9fa6327..e1be1e8 100644 > > --- a/drivers/usb/phy/Makefile > > +++ b/drivers/usb/phy/Makefile > > @@ -5,6 +5,7 @@ > > ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG > > > > obj-$(CONFIG_USB_OTG_UTILS) += phy.o > > +obj-$(CONFIG_OF) += of.o > > obj-$(CONFIG_OMAP_USB2) += omap-usb2.o > > obj-$(CONFIG_OMAP_USB3) += omap-usb3.o > > obj-$(CONFIG_OMAP_CONTROL_USB) += omap-control-usb.o > > diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c > > index ef35eb0..3ad4b5c 100644 > > --- a/drivers/usb/phy/phy.c > > +++ b/drivers/usb/phy/phy.c > > @@ -1,3 +1,13 @@ > > +/* > > + * phy.c -- USB phy handling > > + * > > + * Copyright (C) 2004 Texas Instruments > > + * > > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License as published by > > + * the Free Software Foundation; either version 2 of the License, or > > + * (at your option) any later version. > > + */ > > Do you really mean to change the license of the file from GPLv2 to > GPLv2+? Did TI agree to that licening change? I need some > documentation from some TI people before I can ever accept something > like this. Sorry, the hunk above belongs to patch 1/6. I did not change the license, the header is a copy from drivers/usb/otg/otg.c which was GPLv2+ already. Sascha
On Thu, Jan 31, 2013 at 02:42:48PM +0530, kishon wrote: > Hi, > > On Thursday 31 January 2013 02:31 PM, Sascha Hauer wrote: > >From: Michael Grzeschik <m.grzeschik@pengutronix.de> > > > >This adds two little devicetree helper functions for determining the > >dr_mode (host, peripheral, otg) and phy_type (utmi, ulpi,...) from > >the devicetree. > > > >Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> > >Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > >Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > >--- > > drivers/usb/phy/Makefile | 1 + > > drivers/usb/phy/phy.c | 10 ++++++++++ > > drivers/usb/usb-common.c | 36 ++++++++++++++++++++++++++++++++++++ > > include/linux/usb/of.h | 27 +++++++++++++++++++++++++++ > > include/linux/usb/otg.h | 7 +++++++ > > include/linux/usb/phy.h | 9 +++++++++ > > 6 files changed, 90 insertions(+) > > create mode 100644 include/linux/usb/of.h > > > >diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile > >index 9fa6327..e1be1e8 100644 > >--- a/drivers/usb/phy/Makefile > >+++ b/drivers/usb/phy/Makefile > >@@ -5,6 +5,7 @@ > > ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG > > > > obj-$(CONFIG_USB_OTG_UTILS) += phy.o > >+obj-$(CONFIG_OF) += of.o > > You've missed doing "git add ..usb/phy/of.c". > > > obj-$(CONFIG_OMAP_USB2) += omap-usb2.o > > obj-$(CONFIG_OMAP_USB3) += omap-usb3.o > > obj-$(CONFIG_OMAP_CONTROL_USB) += omap-control-usb.o > >diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c > >index ef35eb0..3ad4b5c 100644 > >--- a/drivers/usb/phy/phy.c > >+++ b/drivers/usb/phy/phy.c > >@@ -1,3 +1,13 @@ > >+/* > >+ * phy.c -- USB phy handling > >+ * > >+ * Copyright (C) 2004 Texas Instruments > > it's 2013 already :-P > >+ * > >+ * This program is free software; you can redistribute it and/or modify > >+ * it under the terms of the GNU General Public License as published by > >+ * the Free Software Foundation; either version 2 of the License, or > >+ * (at your option) any later version. > > But your *MODULE_LICENSE("GPL")* below tells it's only GPL. The MODULE_LICENSE("GPL") is in usb-common.c, not in the file I added. Sascha > . > <snip> > . > . > > > MODULE_LICENSE("GPL"); >
On Thursday 31 January 2013 02:58 PM, Sascha Hauer wrote: > On Thu, Jan 31, 2013 at 02:42:48PM +0530, kishon wrote: >> Hi, >> >> On Thursday 31 January 2013 02:31 PM, Sascha Hauer wrote: >>> From: Michael Grzeschik <m.grzeschik@pengutronix.de> >>> >>> This adds two little devicetree helper functions for determining the >>> dr_mode (host, peripheral, otg) and phy_type (utmi, ulpi,...) from >>> the devicetree. >>> >>> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> >>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> >>> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> >>> --- >>> drivers/usb/phy/Makefile | 1 + >>> drivers/usb/phy/phy.c | 10 ++++++++++ >>> drivers/usb/usb-common.c | 36 ++++++++++++++++++++++++++++++++++++ >>> include/linux/usb/of.h | 27 +++++++++++++++++++++++++++ >>> include/linux/usb/otg.h | 7 +++++++ >>> include/linux/usb/phy.h | 9 +++++++++ >>> 6 files changed, 90 insertions(+) >>> create mode 100644 include/linux/usb/of.h >>> >>> diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile >>> index 9fa6327..e1be1e8 100644 >>> --- a/drivers/usb/phy/Makefile >>> +++ b/drivers/usb/phy/Makefile >>> @@ -5,6 +5,7 @@ >>> ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG >>> >>> obj-$(CONFIG_USB_OTG_UTILS) += phy.o >>> +obj-$(CONFIG_OF) += of.o >> >> You've missed doing "git add ..usb/phy/of.c". >> >>> obj-$(CONFIG_OMAP_USB2) += omap-usb2.o >>> obj-$(CONFIG_OMAP_USB3) += omap-usb3.o >>> obj-$(CONFIG_OMAP_CONTROL_USB) += omap-control-usb.o >>> diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c >>> index ef35eb0..3ad4b5c 100644 >>> --- a/drivers/usb/phy/phy.c >>> +++ b/drivers/usb/phy/phy.c >>> @@ -1,3 +1,13 @@ >>> +/* >>> + * phy.c -- USB phy handling >>> + * >>> + * Copyright (C) 2004 Texas Instruments >> >> it's 2013 already :-P >>> + * >>> + * This program is free software; you can redistribute it and/or modify >>> + * it under the terms of the GNU General Public License as published by >>> + * the Free Software Foundation; either version 2 of the License, or >>> + * (at your option) any later version. >> >> But your *MODULE_LICENSE("GPL")* below tells it's only GPL. > > The MODULE_LICENSE("GPL") is in usb-common.c, not in the file I added. huh.. just noticed. sorry for the noise. Thanks Kishon
On Thu, Jan 31, 2013 at 10:01:09AM +0100, Sascha Hauer wrote: > From: Michael Grzeschik <m.grzeschik@pengutronix.de> > > > + for (i = 0; i < ARRAY_SIZE(usb_dr_modes); i++) > + if (!strcmp(dr_mode, usb_dr_modes[i])) > + return i; if (strcmp(dr_mode, usb_dr_modes[i]) == 0) may be more friendly. > + > +#ifndef __LINUX_USB_OF_H > +#define __LINUX_USB_OF_H > + > +#include <linux/usb/phy.h> > + > +#ifdef CONFIG_OF > +enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np); Will you put definition to phy.c, I can't find it at this version > index e8a5fe8..4e8bfbb 100644 > --- a/include/linux/usb/otg.h > +++ b/include/linux/usb/otg.h > @@ -99,4 +99,11 @@ otg_start_srp(struct usb_otg *otg) > /* for OTG controller drivers (and maybe other stuff) */ > extern int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num); > > +enum usb_dr_mode { > + USB_DR_MODE_UNKNOWN, > + USB_DR_MODE_HOST, > + USB_DR_MODE_PERIPHERAL, > + USB_DR_MODE_OTG, > +}; > + I am not sure if otg.h is a good place to put this, in fact, we need a common header file for it.
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile index 9fa6327..e1be1e8 100644 --- a/drivers/usb/phy/Makefile +++ b/drivers/usb/phy/Makefile @@ -5,6 +5,7 @@ ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG obj-$(CONFIG_USB_OTG_UTILS) += phy.o +obj-$(CONFIG_OF) += of.o obj-$(CONFIG_OMAP_USB2) += omap-usb2.o obj-$(CONFIG_OMAP_USB3) += omap-usb3.o obj-$(CONFIG_OMAP_CONTROL_USB) += omap-control-usb.o diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index ef35eb0..3ad4b5c 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -1,3 +1,13 @@ +/* + * phy.c -- USB phy handling + * + * Copyright (C) 2004 Texas Instruments + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ #include <linux/kernel.h> #include <linux/export.h> #include <linux/err.h> diff --git a/drivers/usb/usb-common.c b/drivers/usb/usb-common.c index d29503e..ad4d87d 100644 --- a/drivers/usb/usb-common.c +++ b/drivers/usb/usb-common.c @@ -14,6 +14,9 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/usb/ch9.h> +#include <linux/of.h> +#include <linux/usb/of.h> +#include <linux/usb/otg.h> const char *usb_speed_string(enum usb_device_speed speed) { @@ -32,4 +35,37 @@ const char *usb_speed_string(enum usb_device_speed speed) } EXPORT_SYMBOL_GPL(usb_speed_string); +#ifdef CONFIG_OF +static const char *usb_dr_modes[] = { + [USB_DR_MODE_UNKNOWN] = "", + [USB_DR_MODE_HOST] = "host", + [USB_DR_MODE_PERIPHERAL] = "peripheral", + [USB_DR_MODE_OTG] = "otg", +}; + +/** + * of_usb_get_dr_mode - Get dual role mode for given device_node + * @np: Pointer to the given device_node + * + * The function gets phy interface string from property 'dr_mode', + * and returns the correspondig enum usb_dr_mode + */ +enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np) +{ + const char *dr_mode; + int err, i; + + err = of_property_read_string(np, "dr_mode", &dr_mode); + if (err < 0) + return USB_DR_MODE_UNKNOWN; + + for (i = 0; i < ARRAY_SIZE(usb_dr_modes); i++) + if (!strcmp(dr_mode, usb_dr_modes[i])) + return i; + + return USB_DR_MODE_UNKNOWN; +} +EXPORT_SYMBOL_GPL(of_usb_get_dr_mode); +#endif + MODULE_LICENSE("GPL"); diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h new file mode 100644 index 0000000..4681a20 --- /dev/null +++ b/include/linux/usb/of.h @@ -0,0 +1,27 @@ +/* + * OF helpers for usb devices. + * + * This file is released under the GPLv2 + */ + +#ifndef __LINUX_USB_OF_H +#define __LINUX_USB_OF_H + +#include <linux/usb/phy.h> + +#ifdef CONFIG_OF +enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np); +enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np); +#else +static inline enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np) +{ + return USBPHY_INTERFACE_MODE_UNKNOWN; +} + +static inline enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np) +{ + return USB_DR_MODE_UNKNOWN; +} +#endif + +#endif /* __LINUX_USB_OF_H */ diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index e8a5fe8..4e8bfbb 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -99,4 +99,11 @@ otg_start_srp(struct usb_otg *otg) /* for OTG controller drivers (and maybe other stuff) */ extern int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num); +enum usb_dr_mode { + USB_DR_MODE_UNKNOWN, + USB_DR_MODE_HOST, + USB_DR_MODE_PERIPHERAL, + USB_DR_MODE_OTG, +}; + #endif /* __LINUX_USB_OTG_H */ diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 15847cb..5edddb1 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -12,6 +12,15 @@ #include <linux/notifier.h> #include <linux/usb.h> +enum usb_phy_interface { + USBPHY_INTERFACE_MODE_UNKNOWN, + USBPHY_INTERFACE_MODE_UTMI, + USBPHY_INTERFACE_MODE_UTMIW, + USBPHY_INTERFACE_MODE_ULPI, + USBPHY_INTERFACE_MODE_SERIAL, + USBPHY_INTERFACE_MODE_HSIC, +}; + enum usb_phy_events { USB_EVENT_NONE, /* no events or cable disconnected */ USB_EVENT_VBUS, /* vbus valid event */