Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758622Ab3GRHFW (ORCPT ); Thu, 18 Jul 2013 03:05:22 -0400 Received: from mho-03-ewr.mailhop.org ([204.13.248.66]:31005 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758264Ab3GRHFU (ORCPT ); Thu, 18 Jul 2013 03:05:20 -0400 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 50.131.214.131 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19Nn5NwT6RCwHPMzFucWbv8 Date: Thu, 18 Jul 2013 00:05:09 -0700 From: Tony Lindgren To: Kishon Vijay Abraham I Cc: gregkh@linuxfoundation.org, kyungmin.park@samsung.com, balbi@ti.com, jg1.han@samsung.com, s.nawrocki@samsung.com, kgene.kim@samsung.com, grant.likely@linaro.org, arnd@arndb.de, swarren@nvidia.com, devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-omap@vger.kernel.org, linux-usb@vger.kernel.org, linux-media@vger.kernel.org, linux-fbdev@vger.kernel.org, akpm@linux-foundation.org, balajitk@ti.com, george.cherian@ti.com, nsekhar@ti.com Subject: Re: [PATCH 05/15] ARM: dts: omap: update usb_otg_hs data Message-ID: <20130718070508.GN7656@atomide.com> References: <1374129984-765-1-git-send-email-kishon@ti.com> <1374129984-765-6-git-send-email-kishon@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1374129984-765-6-git-send-email-kishon@ti.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6075 Lines: 167 * Kishon Vijay Abraham I [130717 23:53]: > Updated the usb_otg_hs dt data to include the *phy* and *phy-names* > binding in order for the driver to use the new generic PHY framework. > Also updated the Documentation to include the binding information. > The PHY binding information can be found at > Documentation/devicetree/bindings/phy/phy-bindings.txt > > Signed-off-by: Kishon Vijay Abraham I > Acked-by: Felipe Balbi > Reviewed-by: Sylwester Nawrocki In general the .dts changes should be separate to avoid pointless merge conflicts. But sounds like things will stop working for USB unless we do it like this so: Acked-by: Tony Lindgren > --- > Documentation/devicetree/bindings/usb/omap-usb.txt | 5 +++++ > Documentation/devicetree/bindings/usb/usb-phy.txt | 6 ++++++ > arch/arm/boot/dts/omap3-beagle-xm.dts | 2 ++ > arch/arm/boot/dts/omap3-evm.dts | 2 ++ > arch/arm/boot/dts/omap3-overo.dtsi | 2 ++ > arch/arm/boot/dts/omap4.dtsi | 3 +++ > arch/arm/boot/dts/twl4030.dtsi | 1 + > 7 files changed, 21 insertions(+) > > diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt > index 57e71f6..825790d 100644 > --- a/Documentation/devicetree/bindings/usb/omap-usb.txt > +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt > @@ -19,6 +19,9 @@ OMAP MUSB GLUE > - power : Should be "50". This signifies the controller can supply up to > 100mA when operating in host mode. > - usb-phy : the phandle for the PHY device > + - phys : the phandle for the PHY device (used by generic PHY framework) > + - phy-names : the names of the PHY corresponding to the PHYs present in the > + *phy* phandle. > > Optional properties: > - ctrl-module : phandle of the control module this glue uses to write to > @@ -33,6 +36,8 @@ usb_otg_hs: usb_otg_hs@4a0ab000 { > num-eps = <16>; > ram-bits = <12>; > ctrl-module = <&omap_control_usb>; > + phys = <&usb2_phy>; > + phy-names = "usb2-phy"; > }; > > Board specific device node entry > diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt b/Documentation/devicetree/bindings/usb/usb-phy.txt > index 61496f5..c0245c8 100644 > --- a/Documentation/devicetree/bindings/usb/usb-phy.txt > +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt > @@ -5,6 +5,8 @@ OMAP USB2 PHY > Required properties: > - compatible: Should be "ti,omap-usb2" > - reg : Address and length of the register set for the device. > + - #phy-cells: determine the number of cells that should be given in the > + phandle while referencing this phy. > > Optional properties: > - ctrl-module : phandle of the control module used by PHY driver to power on > @@ -16,6 +18,7 @@ usb2phy@4a0ad080 { > compatible = "ti,omap-usb2"; > reg = <0x4a0ad080 0x58>; > ctrl-module = <&omap_control_usb>; > + #phy-cells = <0>; > }; > > OMAP USB3 PHY > @@ -25,6 +28,8 @@ Required properties: > - reg : Address and length of the register set for the device. > - reg-names: The names of the register addresses corresponding to the registers > filled in "reg". > + - #phy-cells: determine the number of cells that should be given in the > + phandle while referencing this phy. > > Optional properties: > - ctrl-module : phandle of the control module used by PHY driver to power on > @@ -39,4 +44,5 @@ usb3phy@4a084400 { > <0x4a084c00 0x40>; > reg-names = "phy_rx", "phy_tx", "pll_ctrl"; > ctrl-module = <&omap_control_usb>; > + #phy-cells = <0>; > }; > diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts > index afdb164..533b2da 100644 > --- a/arch/arm/boot/dts/omap3-beagle-xm.dts > +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts > @@ -144,6 +144,8 @@ > &usb_otg_hs { > interface-type = <0>; > usb-phy = <&usb2_phy>; > + phys = <&usb2_phy>; > + phy-names = "usb2-phy"; > mode = <3>; > power = <50>; > }; > diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts > index 7d4329d..4134dd0 100644 > --- a/arch/arm/boot/dts/omap3-evm.dts > +++ b/arch/arm/boot/dts/omap3-evm.dts > @@ -70,6 +70,8 @@ > &usb_otg_hs { > interface-type = <0>; > usb-phy = <&usb2_phy>; > + phys = <&usb2_phy>; > + phy-names = "usb2-phy"; > mode = <3>; > power = <50>; > }; > diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi > index 8f1abec..a461d2f 100644 > --- a/arch/arm/boot/dts/omap3-overo.dtsi > +++ b/arch/arm/boot/dts/omap3-overo.dtsi > @@ -76,6 +76,8 @@ > &usb_otg_hs { > interface-type = <0>; > usb-phy = <&usb2_phy>; > + phys = <&usb2_phy>; > + phy-names = "usb2-phy"; > mode = <3>; > power = <50>; > }; > diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi > index 22d9f2b..1e8e2fe 100644 > --- a/arch/arm/boot/dts/omap4.dtsi > +++ b/arch/arm/boot/dts/omap4.dtsi > @@ -520,6 +520,7 @@ > compatible = "ti,omap-usb2"; > reg = <0x4a0ad080 0x58>; > ctrl-module = <&omap_control_usb>; > + #phy-cells = <0>; > }; > }; > > @@ -658,6 +659,8 @@ > interrupt-names = "mc", "dma"; > ti,hwmods = "usb_otg_hs"; > usb-phy = <&usb2_phy>; > + phys = <&usb2_phy>; > + phy-names = "usb2-phy"; > multipoint = <1>; > num-eps = <16>; > ram-bits = <12>; > diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi > index b3034da..ce4cd6f 100644 > --- a/arch/arm/boot/dts/twl4030.dtsi > +++ b/arch/arm/boot/dts/twl4030.dtsi > @@ -80,6 +80,7 @@ > usb1v8-supply = <&vusb1v8>; > usb3v1-supply = <&vusb3v1>; > usb_mode = <1>; > + #phy-cells = <0>; > }; > > twl_pwm: pwm { > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/