[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAAe_U6KBNZpT03xATmPTNTgxm5hj+wJdsShdnm08EmF4Q=hTCw@mail.gmail.com>
Date: Thu, 6 Sep 2012 17:45:33 +0530
From: "ABRAHAM, KISHON VIJAY" <kishon@...com>
To: Greg KH <gregkh@...uxfoundation.org>,
Arnd Bergmann <arnd@...db.de>, Felipe Balbi <balbi@...com>
Cc: Kishon Vijay Abraham I <kishon@...com>, grant.likely@...retlab.ca,
rob.herring@...xeda.com, rob@...dley.net, linux@....linux.org.uk,
b-cousson@...com, rnayak@...com, tony@...mide.com,
devicetree-discuss@...ts.ozlabs.org, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-omap@...r.kernel.org, linux-usb@...r.kernel.org
Subject: Re: [PATCH v7 1/7] drivers: usb: phy: add a new driver for omap usb2 phy
Hi,
On Mon, Aug 6, 2012 at 6:37 PM, Kishon Vijay Abraham I <kishon@...com> 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@...com>
> Signed-off-by: Kishon Vijay Abraham I <kishon@...com>
> ---
> .../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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists