* [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB
@ 2012-09-19 9:32 Kishon Vijay Abraham I
2012-09-19 9:32 ` [PATCH v3 1/3] ARM: dts: Add twl6030-usb data Kishon Vijay Abraham I
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Kishon Vijay Abraham I @ 2012-09-19 9:32 UTC (permalink / raw)
To: linux-arm-kernel
This patch series adds dt data to get MUSB working in omap4 and omap3
Changes from v2:
* Changes the subject of all the patches to include "ARM: dts:"
* Added reg property and interrupt property for "usb_otg_hs". Previously these
were obtained from ti,hwmods property.
* Rebased on
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git devel-dt
Changes from v1:
Just removed the omap-usb2 dt data and sent that as a separate patch.
Kishon Vijay Abraham I (3):
ARM: dts: Add twl6030-usb data
ARM: dts: Add twl4030-usb data
ARM: dts: omap: Add usb_otg and glue data
arch/arm/boot/dts/omap3-beagle-xm.dts | 6 ++++++
arch/arm/boot/dts/omap3-evm.dts | 6 ++++++
arch/arm/boot/dts/omap3-overo.dtsi | 6 ++++++
arch/arm/boot/dts/omap3.dtsi | 11 +++++++++++
arch/arm/boot/dts/omap4-panda.dts | 10 ++++++++++
arch/arm/boot/dts/omap4-sdp.dts | 10 ++++++++++
arch/arm/boot/dts/omap4.dtsi | 12 ++++++++++++
arch/arm/boot/dts/twl4030.dtsi | 21 +++++++++++++++++++++
arch/arm/boot/dts/twl6030.dtsi | 5 +++++
9 files changed, 87 insertions(+)
--
1.7.9.5
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v3 1/3] ARM: dts: Add twl6030-usb data 2012-09-19 9:32 [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I @ 2012-09-19 9:32 ` Kishon Vijay Abraham I 2012-09-19 9:32 ` [PATCH v3 2/3] ARM: dts: Add twl4030-usb data Kishon Vijay Abraham I ` (2 subsequent siblings) 3 siblings, 0 replies; 10+ messages in thread From: Kishon Vijay Abraham I @ 2012-09-19 9:32 UTC (permalink / raw) To: linux-arm-kernel Add twl6030-usb data node in twl6030 device tree file. twl6030-usb is the comparator driver for USB that detects VBUS and ID events. The dt data is comprised of two interrupts, one for ID and one for VBUS and a phandle to the regulator. Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/boot/dts/omap4-panda.dts | 4 ++++ arch/arm/boot/dts/omap4-sdp.dts | 4 ++++ arch/arm/boot/dts/twl6030.dtsi | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index 20b966e..6640fd9 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -137,3 +137,7 @@ cs1-used; device-handle = <&elpida_ECB240ABACN>; }; + +&twl_usb_comparator { + usb-supply = <&vusb>; +}; diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 94a23b3..406dab1 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -349,3 +349,7 @@ pinctrl-names = "default"; pinctrl-0 = <&uart4_pins>; }; + +&twl_usb_comparator { + usb-supply = <&vusb>; +}; diff --git a/arch/arm/boot/dts/twl6030.dtsi b/arch/arm/boot/dts/twl6030.dtsi index 123e2c4..9996cfc 100644 --- a/arch/arm/boot/dts/twl6030.dtsi +++ b/arch/arm/boot/dts/twl6030.dtsi @@ -86,4 +86,9 @@ clk32kg: regulator-clk32kg { compatible = "ti,twl6030-clk32kg"; }; + + twl_usb_comparator: usb-comparator { + compatible = "ti,twl6030-usb"; + interrupts = <4>, <10>; + }; }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 2/3] ARM: dts: Add twl4030-usb data 2012-09-19 9:32 [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I 2012-09-19 9:32 ` [PATCH v3 1/3] ARM: dts: Add twl6030-usb data Kishon Vijay Abraham I @ 2012-09-19 9:32 ` Kishon Vijay Abraham I 2012-09-19 9:32 ` [PATCH v3 3/3] ARM: dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I 2012-09-20 3:21 ` [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Benoit Cousson 3 siblings, 0 replies; 10+ messages in thread From: Kishon Vijay Abraham I @ 2012-09-19 9:32 UTC (permalink / raw) To: linux-arm-kernel Add twl4030-usb data node in twl4030 device tree file. twl4030-usb is the phy driver for MUSB used in omap3 chipsets. The dt data is comprised of two interrupts, one for ID and one for VBUS and three phandles to regulator. Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/boot/dts/twl4030.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index ff00017..18fa7a4 100644 --- a/arch/arm/boot/dts/twl4030.dtsi +++ b/arch/arm/boot/dts/twl4030.dtsi @@ -37,6 +37,18 @@ regulator-max-microvolt = <3150000>; }; + vusb1v5: regulator-vusb1v5 { + compatible = "ti,twl4030-vusb1v5"; + }; + + vusb1v8: regulator-vusb1v8 { + compatible = "ti,twl4030-vusb1v8"; + }; + + vusb3v1: regulator-vusb3v1 { + compatible = "ti,twl4030-vusb3v1"; + }; + twl_gpio: gpio { compatible = "ti,twl4030-gpio"; gpio-controller; @@ -44,4 +56,13 @@ interrupt-controller; #interrupt-cells = <1>; }; + + twl4030-usb { + compatible = "ti,twl4030-usb"; + interrupts = <10>, <4>; + usb1v5-supply = <&vusb1v5>; + usb1v8-supply = <&vusb1v8>; + usb3v1-supply = <&vusb3v1>; + usb_mode = <1>; + }; }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 3/3] ARM: dts: omap: Add usb_otg and glue data 2012-09-19 9:32 [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I 2012-09-19 9:32 ` [PATCH v3 1/3] ARM: dts: Add twl6030-usb data Kishon Vijay Abraham I 2012-09-19 9:32 ` [PATCH v3 2/3] ARM: dts: Add twl4030-usb data Kishon Vijay Abraham I @ 2012-09-19 9:32 ` Kishon Vijay Abraham I 2012-09-20 3:21 ` [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Benoit Cousson 3 siblings, 0 replies; 10+ messages in thread From: Kishon Vijay Abraham I @ 2012-09-19 9:32 UTC (permalink / raw) To: linux-arm-kernel Add usb otg data node in omap4/omap3 device tree file. Also update the node with board specific setting in omapx-<board>.dts file. The dt data specifies among others the interface type (ULPI or UTMI), mode which is mostly OTG, power that specifies the amount of power this can supply when in host mode. Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/boot/dts/omap3-beagle-xm.dts | 6 ++++++ arch/arm/boot/dts/omap3-evm.dts | 6 ++++++ arch/arm/boot/dts/omap3-overo.dtsi | 6 ++++++ arch/arm/boot/dts/omap3.dtsi | 11 +++++++++++ arch/arm/boot/dts/omap4-panda.dts | 6 ++++++ arch/arm/boot/dts/omap4-sdp.dts | 6 ++++++ arch/arm/boot/dts/omap4.dtsi | 12 ++++++++++++ 7 files changed, 53 insertions(+) diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index c38cf76..ca37f19 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -113,3 +113,9 @@ */ ti,pulldowns = <0x03a1c4>; }; + +&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 e8ba1c2..afb9ba9 100644 --- a/arch/arm/boot/dts/omap3-evm.dts +++ b/arch/arm/boot/dts/omap3-evm.dts @@ -59,3 +59,9 @@ &twl_gpio { ti,use-leds; }; + +&usb_otg_hs { + interface_type = <0>; + mode = <3>; + power = <50>; +}; diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi index 89808ce..4b3d157 100644 --- a/arch/arm/boot/dts/omap3-overo.dtsi +++ b/arch/arm/boot/dts/omap3-overo.dtsi @@ -55,3 +55,9 @@ &twl_gpio { ti,use-leds; }; + +&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 f38ea87..5c7324b 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -300,5 +300,16 @@ ti,buffer-size = <128>; ti,hwmods = "mcbsp5"; }; + + usb_otg_hs: usb_otg_hs at 480ab000 { + compatible = "ti,omap3-musb"; + reg = <0x480ab000 0x1000>; + interrupts = <0 92 0x4>, <0 93 0x4>; + interrupt-names = "mc", "dma"; + 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 6640fd9..c3ff134 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -141,3 +141,9 @@ &twl_usb_comparator { 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 406dab1..22f7ec1 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -353,3 +353,9 @@ &twl_usb_comparator { 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 5d1c484..79611b4 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -430,5 +430,17 @@ hw-caps-ll-interface; hw-caps-temp-alert; }; + + usb_otg_hs: usb_otg_hs at 4a0ab000 { + compatible = "ti,omap4-musb"; + reg = <0x4a0ab000 0x7ff>, + <0x4a00233c 0x4>; /* TO BE REMOVED:SCM Register */ + interrupts = <0 92 0x4>, <0 93 0x4>; + interrupt-names = "mc", "dma"; + ti,hwmods = "usb_otg_hs"; + multipoint = <1>; + num_eps = <16>; + ram_bits = <12>; + }; }; }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB 2012-09-19 9:32 [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I ` (2 preceding siblings ...) 2012-09-19 9:32 ` [PATCH v3 3/3] ARM: dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I @ 2012-09-20 3:21 ` Benoit Cousson 2012-12-27 18:35 ` Aaro Koskinen 3 siblings, 1 reply; 10+ messages in thread From: Benoit Cousson @ 2012-09-20 3:21 UTC (permalink / raw) To: linux-arm-kernel Hi Kishon, On 09/19/2012 11:32 AM, Kishon Vijay Abraham I wrote: > This patch series adds dt data to get MUSB working in omap4 and omap3 > > Changes from v2: > * Changes the subject of all the patches to include "ARM: dts:" > * Added reg property and interrupt property for "usb_otg_hs". Previously these > were obtained from ti,hwmods property. > * Rebased on > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git devel-dt > > Changes from v1: > Just removed the omap-usb2 dt data and sent that as a separate patch. > > Kishon Vijay Abraham I (3): > ARM: dts: Add twl6030-usb data > ARM: dts: Add twl4030-usb data > ARM: dts: omap: Add usb_otg and glue data Thanks for the update. I've just pulled the series for 3.7. Regards, Benoit ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB 2012-09-20 3:21 ` [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Benoit Cousson @ 2012-12-27 18:35 ` Aaro Koskinen 2013-01-10 6:19 ` kishon 0 siblings, 1 reply; 10+ messages in thread From: Aaro Koskinen @ 2012-12-27 18:35 UTC (permalink / raw) To: linux-arm-kernel Hi, On Thu, Sep 20, 2012 at 05:21:15AM +0200, Benoit Cousson wrote: > On 09/19/2012 11:32 AM, Kishon Vijay Abraham I wrote: > > This patch series adds dt data to get MUSB working in omap4 and omap3 > > > > Changes from v2: > > * Changes the subject of all the patches to include "ARM: dts:" > > * Added reg property and interrupt property for "usb_otg_hs". Previously these > > were obtained from ti,hwmods property. > > * Rebased on > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git devel-dt > > > > Changes from v1: > > Just removed the omap-usb2 dt data and sent that as a separate patch. > > > > Kishon Vijay Abraham I (3): > > ARM: dts: Add twl6030-usb data > > ARM: dts: Add twl4030-usb data > > ARM: dts: omap: Add usb_otg and glue data > > Thanks for the update. I've just pulled the series for 3.7. I wonder what happened to the patch #3 (Add usb_otg and glue data) of this series? Why was it dropped? I cannot see it in 3.7 or 3.8-rc1. A. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB 2012-12-27 18:35 ` Aaro Koskinen @ 2013-01-10 6:19 ` kishon 2013-01-10 9:58 ` Benoit Cousson 0 siblings, 1 reply; 10+ messages in thread From: kishon @ 2013-01-10 6:19 UTC (permalink / raw) To: linux-arm-kernel On Friday 28 December 2012 12:05 AM, Aaro Koskinen wrote: > Hi, > > On Thu, Sep 20, 2012 at 05:21:15AM +0200, Benoit Cousson wrote: >> On 09/19/2012 11:32 AM, Kishon Vijay Abraham I wrote: >>> This patch series adds dt data to get MUSB working in omap4 and omap3 >>> >>> Changes from v2: >>> * Changes the subject of all the patches to include "ARM: dts:" >>> * Added reg property and interrupt property for "usb_otg_hs". Previously these >>> were obtained from ti,hwmods property. >>> * Rebased on >>> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git devel-dt >>> >>> Changes from v1: >>> Just removed the omap-usb2 dt data and sent that as a separate patch. >>> >>> Kishon Vijay Abraham I (3): >>> ARM: dts: Add twl6030-usb data >>> ARM: dts: Add twl4030-usb data >>> ARM: dts: omap: Add usb_otg and glue data >> >> Thanks for the update. I've just pulled the series for 3.7. > > I wonder what happened to the patch #3 (Add usb_otg and glue data) > of this series? Why was it dropped? I cannot see it in 3.7 or 3.8-rc1. Benoit? -Kishon ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB 2013-01-10 6:19 ` kishon @ 2013-01-10 9:58 ` Benoit Cousson 2013-01-10 10:53 ` kishon 0 siblings, 1 reply; 10+ messages in thread From: Benoit Cousson @ 2013-01-10 9:58 UTC (permalink / raw) To: linux-arm-kernel Hi Kishon, On 01/10/2013 07:19 AM, kishon wrote: > On Friday 28 December 2012 12:05 AM, Aaro Koskinen wrote: >> Hi, >> >> On Thu, Sep 20, 2012 at 05:21:15AM +0200, Benoit Cousson wrote: >>> On 09/19/2012 11:32 AM, Kishon Vijay Abraham I wrote: >>>> This patch series adds dt data to get MUSB working in omap4 and omap3 >>>> >>>> Changes from v2: >>>> * Changes the subject of all the patches to include "ARM: dts:" >>>> * Added reg property and interrupt property for "usb_otg_hs". >>>> Previously these >>>> were obtained from ti,hwmods property. >>>> * Rebased on >>>> >>>> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git >>>> devel-dt >>>> >>>> Changes from v1: >>>> Just removed the omap-usb2 dt data and sent that as a separate patch. >>>> >>>> Kishon Vijay Abraham I (3): >>>> ARM: dts: Add twl6030-usb data >>>> ARM: dts: Add twl4030-usb data >>>> ARM: dts: omap: Add usb_otg and glue data >>> >>> Thanks for the update. I've just pulled the series for 3.7. >> >> I wonder what happened to the patch #3 (Add usb_otg and glue data) >> of this series? Why was it dropped? I cannot see it in 3.7 or 3.8-rc1. I don't remember the context, can you repost it rebased on 3.8-rc2? Did it generate some discussion at that time? Benoit ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB 2013-01-10 9:58 ` Benoit Cousson @ 2013-01-10 10:53 ` kishon 0 siblings, 0 replies; 10+ messages in thread From: kishon @ 2013-01-10 10:53 UTC (permalink / raw) To: linux-arm-kernel Hi, On Thursday 10 January 2013 03:28 PM, Benoit Cousson wrote: > Hi Kishon, > > On 01/10/2013 07:19 AM, kishon wrote: >> On Friday 28 December 2012 12:05 AM, Aaro Koskinen wrote: >>> Hi, >>> >>> On Thu, Sep 20, 2012 at 05:21:15AM +0200, Benoit Cousson wrote: >>>> On 09/19/2012 11:32 AM, Kishon Vijay Abraham I wrote: >>>>> This patch series adds dt data to get MUSB working in omap4 and omap3 >>>>> >>>>> Changes from v2: >>>>> * Changes the subject of all the patches to include "ARM: dts:" >>>>> * Added reg property and interrupt property for "usb_otg_hs". >>>>> Previously these >>>>> were obtained from ti,hwmods property. >>>>> * Rebased on >>>>> >>>>> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git >>>>> devel-dt >>>>> >>>>> Changes from v1: >>>>> Just removed the omap-usb2 dt data and sent that as a separate patch. >>>>> >>>>> Kishon Vijay Abraham I (3): >>>>> ARM: dts: Add twl6030-usb data >>>>> ARM: dts: Add twl4030-usb data >>>>> ARM: dts: omap: Add usb_otg and glue data >>>> >>>> Thanks for the update. I've just pulled the series for 3.7. >>> >>> I wonder what happened to the patch #3 (Add usb_otg and glue data) >>> of this series? Why was it dropped? I cannot see it in 3.7 or 3.8-rc1. > > I don't remember the context, can you repost it rebased on 3.8-rc2? Did > it generate some discussion at that time? That patch also has SCM register. It might be rejected because of that. Will work on the that. Thanks Kishon ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB @ 2013-01-25 10:26 Kishon Vijay Abraham I 2013-01-25 10:26 ` [PATCH v3 3/3] ARM: dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I 0 siblings, 1 reply; 10+ messages in thread From: Kishon Vijay Abraham I @ 2013-01-25 10:26 UTC (permalink / raw) To: linux-arm-kernel This patch series adds dt data to get MUSB working in omap4 and omap3. Long time back a patch series with the same title was sent but only a part of it got merged. The rest of it wasn't merged because of adding omap control usb data to glue and usb phy. Now there exists a separate driver for control usb and hence added a separate dt node for control usb. Changes from v2: * Changed property names from "ti,has_mailbox" to "ti,has-mailbox", "ctrl_module" to "ctrl-module", "usb_phy" to "usb-phy" Changes from v1: * "ti,has_mailbox" property is removed and "ti,type" property is added and filled with value "1" to specify it has a mailbox This series was developed on git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git xceiv + "usb: musb: add driver for control module" patch series Did basic enumeration testing in omap4 panda, omap4 sdp and omap3 beagle. Kishon Vijay Abraham I (3): ARM: dts: omap: Add omap control usb data ARM: dts: omap: Add omap-usb2 dt data ARM: dts: omap: Add usb_otg and glue data Documentation/devicetree/bindings/usb/omap-usb.txt | 2 ++ arch/arm/boot/dts/omap3-beagle-xm.dts | 6 +++++ arch/arm/boot/dts/omap3-evm.dts | 6 +++++ arch/arm/boot/dts/omap3-overo.dtsi | 6 +++++ arch/arm/boot/dts/omap3.dtsi | 12 +++++++++ arch/arm/boot/dts/omap4-panda.dts | 6 +++++ arch/arm/boot/dts/omap4-sdp.dts | 6 +++++ arch/arm/boot/dts/omap4.dtsi | 26 ++++++++++++++++++++ arch/arm/boot/dts/twl4030.dtsi | 2 +- 9 files changed, 71 insertions(+), 1 deletion(-) -- 1.7.9.5 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 3/3] ARM: dts: omap: Add usb_otg and glue data 2013-01-25 10:26 Kishon Vijay Abraham I @ 2013-01-25 10:26 ` Kishon Vijay Abraham I 0 siblings, 0 replies; 10+ messages in thread From: Kishon Vijay Abraham I @ 2013-01-25 10:26 UTC (permalink / raw) To: linux-arm-kernel Add usb otg data node in omap4/omap3 device tree file. Also update the node with board specific setting in omapx-<board>.dts file. The dt data specifies among others the interface type (ULPI or UTMI), mode which is mostly OTG, power that specifies the amount of power this can supply when in host mode. The information about usb otg node is available @ Documentation/devicetree/bindings/usb/omap-usb.txt Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- Documentation/devicetree/bindings/usb/omap-usb.txt | 2 ++ arch/arm/boot/dts/omap3-beagle-xm.dts | 6 ++++++ arch/arm/boot/dts/omap3-evm.dts | 6 ++++++ arch/arm/boot/dts/omap3-overo.dtsi | 6 ++++++ arch/arm/boot/dts/omap3.dtsi | 12 ++++++++++++ arch/arm/boot/dts/omap4-panda.dts | 6 ++++++ arch/arm/boot/dts/omap4-sdp.dts | 6 ++++++ arch/arm/boot/dts/omap4.dtsi | 13 +++++++++++++ arch/arm/boot/dts/twl4030.dtsi | 2 +- 9 files changed, 58 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt index b36df59..b892f58 100644 --- a/Documentation/devicetree/bindings/usb/omap-usb.txt +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt @@ -18,6 +18,7 @@ OMAP MUSB GLUE represents PERIPHERAL. - power : Should be "50". This signifies the controller can supply upto 100mA when operating in host mode. + - usb-phy : the phandle for the PHY device Optional properties: - ctrl-module : phandle of the control module this glue uses to write to @@ -32,6 +33,7 @@ usb_otg_hs: usb_otg_hs at 4a0ab000 { num_eps = <16>; ram_bits = <12>; ctrl-module = <&omap_control_usb>; + usb-phy = <&usb2_phy>; }; Board specific device node entry diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index 3705a81..cb07583 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -107,3 +107,9 @@ */ ti,pulldowns = <0x03a1c4>; }; + +&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 e8ba1c2..afb9ba9 100644 --- a/arch/arm/boot/dts/omap3-evm.dts +++ b/arch/arm/boot/dts/omap3-evm.dts @@ -59,3 +59,9 @@ &twl_gpio { ti,use-leds; }; + +&usb_otg_hs { + interface_type = <0>; + mode = <3>; + power = <50>; +}; diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi index 89808ce..4b3d157 100644 --- a/arch/arm/boot/dts/omap3-overo.dtsi +++ b/arch/arm/boot/dts/omap3-overo.dtsi @@ -55,3 +55,9 @@ &twl_gpio { ti,use-leds; }; + +&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 1acc261..176561b 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -397,5 +397,17 @@ ti,timer-alwon; ti,timer-secure; }; + + usb_otg_hs: usb_otg_hs at 480ab000 { + compatible = "ti,omap3-musb"; + reg = <0x480ab000 0x1000>; + interrupts = <0 92 0x4>, <0 93 0x4>; + interrupt-names = "mc", "dma"; + ti,hwmods = "usb_otg_hs"; + usb-phy = <&usb2_phy>; + 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 4122efe..612c9bb 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -206,3 +206,9 @@ &twl_usb_comparator { 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 43e5258..582d7ee 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -428,3 +428,9 @@ &twl_usb_comparator { 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 c829d7e..ab817a2 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -542,5 +542,18 @@ reg-names = "control_dev_conf", "otghs_control"; ti,type = <1>; }; + + usb_otg_hs: usb_otg_hs at 4a0ab000 { + compatible = "ti,omap4-musb"; + reg = <0x4a0ab000 0x7ff>; + interrupts = <0 92 0x4>, <0 93 0x4>; + interrupt-names = "mc", "dma"; + ti,hwmods = "usb_otg_hs"; + usb-phy = <&usb2_phy>; + multipoint = <1>; + num_eps = <16>; + ram_bits = <12>; + ti,has-mailbox; + }; }; }; diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index ed0bc95..398d2c3 100644 --- a/arch/arm/boot/dts/twl4030.dtsi +++ b/arch/arm/boot/dts/twl4030.dtsi @@ -67,7 +67,7 @@ #interrupt-cells = <1>; }; - twl4030-usb { + usb2_phy: twl4030-usb { compatible = "ti,twl4030-usb"; interrupts = <10>, <4>; usb1v5-supply = <&vusb1v5>; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-01-25 10:26 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-19 9:32 [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I 2012-09-19 9:32 ` [PATCH v3 1/3] ARM: dts: Add twl6030-usb data Kishon Vijay Abraham I 2012-09-19 9:32 ` [PATCH v3 2/3] ARM: dts: Add twl4030-usb data Kishon Vijay Abraham I 2012-09-19 9:32 ` [PATCH v3 3/3] ARM: dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I 2012-09-20 3:21 ` [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Benoit Cousson 2012-12-27 18:35 ` Aaro Koskinen 2013-01-10 6:19 ` kishon 2013-01-10 9:58 ` Benoit Cousson 2013-01-10 10:53 ` kishon -- strict thread matches above, loose matches on Subject: below -- 2013-01-25 10:26 Kishon Vijay Abraham I 2013-01-25 10:26 ` [PATCH v3 3/3] ARM: dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).