[PATCH 2/6] USB: add devicetree helpers for determining dr_mode and phy_type
Sascha Hauer
s.hauer at pengutronix.de
Thu Jan 31 04:26:59 EST 2013
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 at 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 at pengutronix.de>
> > Signed-off-by: Marc Kleine-Budde <mkl at pengutronix.de>
> > Signed-off-by: Sascha Hauer <s.hauer at 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
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the linux-arm-kernel
mailing list