Message ID | 1347345381-4390-4-git-send-email-kishon@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote: > Add usb otg data node in omap4/omap3 device tree file. Also update > the node with board specific setting in omapx-<board>.dts file. > Acked-by: Felipe Balbi <balbi@ti.com> > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > arch/arm/boot/dts/omap3-beagle.dts | 6 ++++++ > arch/arm/boot/dts/omap3-evm.dts | 6 ++++++ > arch/arm/boot/dts/omap3.dtsi | 8 ++++++++ > arch/arm/boot/dts/omap4-panda.dts | 6 ++++++ > arch/arm/boot/dts/omap4-sdp.dts | 6 ++++++ > arch/arm/boot/dts/omap4.dtsi | 8 ++++++++ > 6 files changed, 40 insertions(+) > > diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts > index cdcb98c..6d6a7a4 100644 > --- a/arch/arm/boot/dts/omap3-beagle.dts > +++ b/arch/arm/boot/dts/omap3-beagle.dts > @@ -67,3 +67,9 @@ > &mmc3 { > status = "disabled"; > }; > + > +&usb_otg_hs { > + interface_type = <0>; > + mode = <3>; > + power = <50>; > +}; > diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts > index f349ee9..c4ac75e 100644 > --- a/arch/arm/boot/dts/omap3-evm.dts > +++ b/arch/arm/boot/dts/omap3-evm.dts > @@ -46,3 +46,9 @@ > reg = <0x5c>; > }; > }; > + > +&usb_otg_hs { > + interface_type = <0>; > + mode = <3>; > + power = <50>; > +}; > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi > index 8109471..2501416 100644 > --- a/arch/arm/boot/dts/omap3.dtsi > +++ b/arch/arm/boot/dts/omap3.dtsi > @@ -220,5 +220,13 @@ > compatible = "ti,omap3-wdt"; > ti,hwmods = "wd_timer2"; > }; > + > + usb_otg_hs: usb_otg_hs { > + compatible = "ti,omap3-musb"; > + ti,hwmods = "usb_otg_hs"; > + multipoint = <1>; > + num_eps = <16>; > + ram_bits = <12>; > + }; > }; > }; > diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts > index 2999eba..8cded95 100644 > --- a/arch/arm/boot/dts/omap4-panda.dts > +++ b/arch/arm/boot/dts/omap4-panda.dts > @@ -130,3 +130,9 @@ > &twlusb { > usb-supply = <&vusb>; > }; > + > +&usb_otg_hs { > + interface_type = <1>; > + mode = <3>; > + power = <50>; > +}; > diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts > index d8290c0..24f4bfd 100644 > --- a/arch/arm/boot/dts/omap4-sdp.dts > +++ b/arch/arm/boot/dts/omap4-sdp.dts > @@ -230,3 +230,9 @@ > &twlusb { > usb-supply = <&vusb>; > }; > + > +&usb_otg_hs { > + interface_type = <1>; > + mode = <3>; > + power = <50>; > +}; > diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi > index 04cbbcb..5db3d6a 100644 > --- a/arch/arm/boot/dts/omap4.dtsi > +++ b/arch/arm/boot/dts/omap4.dtsi > @@ -295,5 +295,13 @@ > interrupt-parent = <&gic>; > ti,hwmods = "dmic"; > }; > + > + usb_otg_hs: usb_otg_hs { After rebasing your series on top of devel-dt, you should as well add the missing reg/irq entries that are now supported thanks to Vaibhav. Regards, Benoit > + compatible = "ti,omap4-musb"; > + ti,hwmods = "usb_otg_hs"; > + multipoint = <1>; > + num_eps = <16>; > + ram_bits = <12>; > + }; > }; > }; >
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index cdcb98c..6d6a7a4 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts @@ -67,3 +67,9 @@ &mmc3 { status = "disabled"; }; + +&usb_otg_hs { + interface_type = <0>; + mode = <3>; + power = <50>; +}; diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts index f349ee9..c4ac75e 100644 --- a/arch/arm/boot/dts/omap3-evm.dts +++ b/arch/arm/boot/dts/omap3-evm.dts @@ -46,3 +46,9 @@ reg = <0x5c>; }; }; + +&usb_otg_hs { + interface_type = <0>; + mode = <3>; + power = <50>; +}; diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 8109471..2501416 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -220,5 +220,13 @@ compatible = "ti,omap3-wdt"; ti,hwmods = "wd_timer2"; }; + + usb_otg_hs: usb_otg_hs { + compatible = "ti,omap3-musb"; + ti,hwmods = "usb_otg_hs"; + multipoint = <1>; + num_eps = <16>; + ram_bits = <12>; + }; }; }; diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index 2999eba..8cded95 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -130,3 +130,9 @@ &twlusb { usb-supply = <&vusb>; }; + +&usb_otg_hs { + interface_type = <1>; + mode = <3>; + power = <50>; +}; diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index d8290c0..24f4bfd 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -230,3 +230,9 @@ &twlusb { usb-supply = <&vusb>; }; + +&usb_otg_hs { + interface_type = <1>; + mode = <3>; + power = <50>; +}; diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 04cbbcb..5db3d6a 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -295,5 +295,13 @@ interrupt-parent = <&gic>; ti,hwmods = "dmic"; }; + + usb_otg_hs: usb_otg_hs { + compatible = "ti,omap4-musb"; + ti,hwmods = "usb_otg_hs"; + multipoint = <1>; + num_eps = <16>; + ram_bits = <12>; + }; }; };