* [PATCH 0/3] ARM: dts: omap: add dt data for MUSB
@ 2013-01-18 9:51 Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 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-18 9:51 UTC (permalink / raw)
To: rob.herring-bsGFqQB8/DxBDgjK7y7TUQ, rob-VoJi6FS/r0vR7s880joybQ,
tony-4v6yS6AI5VpBDgjK7y7TUQ, balbi-l0cyMroinI0,
b-cousson-l0cyMroinI0, rnayak-l0cyMroinI0,
linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-doc-u79uwXL29TY76Z2rM5mHXA,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ
Cc: grant.likely-s3s/WqlpOiPyB63q8FvJNQ, linux-lFZ/pmaqli7XmaaqVzeoHQ,
kishon-l0cyMroinI0
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.
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 | 25 ++++++++++++++++++++
arch/arm/boot/dts/twl4030.dtsi | 2 +-
9 files changed, 70 insertions(+), 1 deletion(-)
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] ARM: dts: omap: Add omap control usb data
2013-01-18 9:51 [PATCH 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I
@ 2013-01-18 9:51 ` Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 2/3] ARM: dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 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-18 9:51 UTC (permalink / raw)
To: rob.herring, rob, tony, balbi, b-cousson, rnayak, linux-usb,
linux-arm-kernel, linux-omap, linux-kernel, linux-doc,
devicetree-discuss
Cc: grant.likely, linux, kishon
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.
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..ad837e6 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@4a002300 {
+ compatible = "ti,omap-control-usb";
+ reg = <0x4a002300 0x4>,
+ <0x4a00233c 0x4>;
+ reg-names = "control_dev_conf", "otghs_control";
+ ti,has_mailbox;
+ };
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] ARM: dts: omap: Add omap-usb2 dt data
2013-01-18 9:51 [PATCH 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 1/3] ARM: dts: omap: Add omap control usb data Kishon Vijay Abraham I
@ 2013-01-18 9:51 ` Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 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-18 9:51 UTC (permalink / raw)
To: rob.herring, rob, tony, balbi, b-cousson, rnayak, linux-usb,
linux-arm-kernel, linux-omap, linux-kernel, linux-doc,
devicetree-discuss
Cc: grant.likely, linux, kishon
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.
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index ad837e6..d69d6f2 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -438,6 +438,10 @@
#size-cells = <1>;
ranges;
ti,hwmods = "ocp2scp_usb_phy";
+ usb2_phy: usb2phy@4a0ad080 {
+ compatible = "ti,omap-usb2";
+ reg = <0x4a0ad080 0x58>;
+ };
};
timer1: timer@4a318000 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] ARM: dts: omap: Add usb_otg and glue data
2013-01-18 9:51 [PATCH 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 1/3] ARM: dts: omap: Add omap control usb data Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 2/3] ARM: dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
@ 2013-01-18 9:51 ` Kishon Vijay Abraham I
2 siblings, 0 replies; 4+ messages in thread
From: Kishon Vijay Abraham I @ 2013-01-18 9:51 UTC (permalink / raw)
To: rob.herring, rob, tony, balbi, b-cousson, rnayak, linux-usb,
linux-arm-kernel, linux-omap, linux-kernel, linux-doc,
devicetree-discuss
Cc: grant.likely, linux, kishon
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>
---
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 8bedbba..985b093 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@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@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 d69d6f2..7501c04 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -541,5 +541,18 @@
reg-names = "control_dev_conf", "otghs_control";
ti,has_mailbox;
};
+
+ usb_otg_hs: usb_otg_hs@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-18 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-18 9:51 [PATCH 0/3] ARM: dts: omap: add dt data for MUSB Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 1/3] ARM: dts: omap: Add omap control usb data Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 2/3] ARM: dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
2013-01-18 9:51 ` [PATCH 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).