Hi, On Mon, Aug 6, 2012 at 6:37 PM, Kishon Vijay Abraham I <kishon@xxxxxx> wrote: > All phy related programming like enabling/disabling the clocks, powering > on/off the phy is taken care of by this driver. It is also used for OTG > related functionality like srp. > > This also includes device tree support for usb2 phy driver and > the documentation with device tree binding information is updated. > > Currently writing to control module register is taken care in this > driver which will be removed once the control module driver is in place. > > Cc: Felipe Balbi <balbi@xxxxxx> > Signed-off-by: Kishon Vijay Abraham I <kishon@xxxxxx> > --- > .../devicetree/bindings/bus/omap-ocp2scp.txt | 3 + > Documentation/devicetree/bindings/usb/omap-usb.txt | 17 ++ > drivers/usb/phy/Kconfig | 10 + > drivers/usb/phy/Makefile | 1 + > drivers/usb/phy/omap-usb2.c | 271 ++++++++++++++++++++ > include/linux/usb/omap_usb.h | 46 ++++ > include/linux/usb/phy_companion.h | 34 +++ > 7 files changed, 382 insertions(+) > create mode 100644 Documentation/devicetree/bindings/usb/omap-usb.txt > create mode 100644 drivers/usb/phy/omap-usb2.c > create mode 100644 include/linux/usb/omap_usb.h > create mode 100644 include/linux/usb/phy_companion.h > > diff --git a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt > index d2fe064..bb0c7f4 100644 > --- a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt > +++ b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt > @@ -8,3 +8,6 @@ properties: > > Sub-nodes: > All the devices connected to ocp2scp are described using sub-node to ocp2scp > +- usb2phy : > + The binding details of usb2phy can be found in: > + Documentation/devicetree/bindings/usb/omap-usb.txt The above two lines should be added in omap-ocp2scp.txt (this file was added as part of omap: add ocp2scp as a bus driver and is in linux-next). However this file is still not in Felipe's xceiv branch. So I'm not sure how I can get this patch merged in Felipe's tree without conflict. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html