* [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 1/3] ARM: dts: omap: Add omap control usb data Kishon Vijay Abraham I
` (2 more replies)
0 siblings, 3 replies; 4+ 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] 4+ messages in thread* [PATCH v3 1/3] ARM: dts: omap: Add omap control usb data 2013-01-25 10:26 [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I @ 2013-01-25 10:26 ` Kishon Vijay Abraham I 2013-01-25 10:26 ` [PATCH v3 2/3] ARM: dts: omap: Add omap-usb2 dt data 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 2 siblings, 0 replies; 4+ messages in thread From: Kishon Vijay Abraham I @ 2013-01-25 10:26 UTC (permalink / raw) To: linux-arm-kernel Add omap control usb data in omap4 device tree file. This will have the register address of registers to power on the PHY and to write to mailbox. The information about this data node is available @ Documentation/devicetree/bindings/usb/omap-usb.txt Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/boot/dts/omap4.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 739bb79..ffc7352 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -529,5 +529,13 @@ ti,hwmods = "timer11"; ti,timer-pwm; }; + + omap_control_usb: omap-control-usb at 4a002300 { + compatible = "ti,omap-control-usb"; + reg = <0x4a002300 0x4>, + <0x4a00233c 0x4>; + reg-names = "control_dev_conf", "otghs_control"; + ti,type = <1>; + }; }; }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 2/3] ARM: dts: omap: Add omap-usb2 dt data 2013-01-25 10:26 [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I 2013-01-25 10:26 ` [PATCH v3 1/3] ARM: dts: omap: Add omap control usb data Kishon Vijay Abraham I @ 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 2 siblings, 0 replies; 4+ messages in thread From: Kishon Vijay Abraham I @ 2013-01-25 10:26 UTC (permalink / raw) To: linux-arm-kernel Add omap-usb2 data node in omap4 device tree file. Since omap-usb2 is connected to ocp2scp, omap-usb2 dt data is added as a child node of ocp2scp. The information about this data node is availabe @ Documentation/devicetree/bindings/usb/usb-phy.txt Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/boot/dts/omap4.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index ffc7352..c829d7e 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -438,6 +438,11 @@ #size-cells = <1>; ranges; ti,hwmods = "ocp2scp_usb_phy"; + usb2_phy: usb2phy at 4a0ad080 { + compatible = "ti,omap-usb2"; + reg = <0x4a0ad080 0x58>; + ctrl-module = <&omap_control_usb>; + }; }; timer1: timer at 4a318000 { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 3/3] ARM: dts: omap: Add usb_otg and glue data 2013-01-25 10:26 [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I 2013-01-25 10:26 ` [PATCH v3 1/3] ARM: dts: omap: Add omap control usb data Kishon Vijay Abraham I 2013-01-25 10:26 ` [PATCH v3 2/3] ARM: dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I @ 2013-01-25 10:26 ` Kishon Vijay Abraham I 2 siblings, 0 replies; 4+ 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] 4+ messages in thread
end of thread, other threads:[~2013-01-25 10:26 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-01-25 10:26 [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I 2013-01-25 10:26 ` [PATCH v3 1/3] ARM: dts: omap: Add omap control usb data Kishon Vijay Abraham I 2013-01-25 10:26 ` [PATCH v3 2/3] ARM: dts: omap: Add omap-usb2 dt data 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).