* [PATCH 1/4] arm/dts: omap: Add omap-usb2 dt data
2012-08-06 13:23 [PATCH 0/4] arm/dts: omap: add dt data for MUSB Kishon Vijay Abraham I
@ 2012-08-06 13:23 ` Kishon Vijay Abraham I
2012-08-06 13:23 ` [PATCH 2/4] arm/dts: Add twl6030-usb data Kishon Vijay Abraham I
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Kishon Vijay Abraham I @ 2012-08-06 13:23 UTC (permalink / raw)
To: linux, b-cousson, rob.herring, grant.likely, tony, rnayak,
hvaibhav, kishon, peter.ujfalusi, linux-arm-kernel, linux-kernel,
balbi
Add omap-usb2 data node in omap4 device tree file.
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 8a780b2..d774733 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -302,6 +302,11 @@
#size-cells = <1>;
ranges;
ti,hwmods = "ocp2scp_usb_phy";
+ usb2phy@4a0ad080 {
+ compatible = "ti,omap-usb2";
+ reg = <0x4a0ad080 0x58>,
+ <0x4a002300 0x1>;
+ };
};
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] arm/dts: Add twl6030-usb data
2012-08-06 13:23 [PATCH 0/4] arm/dts: omap: add dt data for MUSB Kishon Vijay Abraham I
2012-08-06 13:23 ` [PATCH 1/4] arm/dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
@ 2012-08-06 13:23 ` Kishon Vijay Abraham I
2012-08-06 13:23 ` [PATCH 3/4] arm/dts: Add twl4030-usb data Kishon Vijay Abraham I
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Kishon Vijay Abraham I @ 2012-08-06 13:23 UTC (permalink / raw)
To: linux, b-cousson, rob.herring, grant.likely, tony, rnayak,
hvaibhav, kishon, peter.ujfalusi, linux-arm-kernel, linux-kernel,
balbi
Add twl6030-usb data node in twl6030 device tree file
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 9880c12..2999eba 100644
--- a/arch/arm/boot/dts/omap4-panda.dts
+++ b/arch/arm/boot/dts/omap4-panda.dts
@@ -126,3 +126,7 @@
ti,non-removable;
bus-width = <4>;
};
+
+&twlusb {
+ usb-supply = <&vusb>;
+};
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 72216e9..d8290c0 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -226,3 +226,7 @@
bus-width = <4>;
ti,non-removable;
};
+
+&twlusb {
+ usb-supply = <&vusb>;
+};
diff --git a/arch/arm/boot/dts/twl6030.dtsi b/arch/arm/boot/dts/twl6030.dtsi
index 3b2f351..8e3aac9 100644
--- a/arch/arm/boot/dts/twl6030.dtsi
+++ b/arch/arm/boot/dts/twl6030.dtsi
@@ -83,4 +83,9 @@
clk32kg: regulator@12 {
compatible = "ti,twl6030-clk32kg";
};
+
+ twlusb: twl6030-usb {
+ compatible = "ti,twl6030-usb";
+ interrupts = < 4 10 >;
+ };
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] arm/dts: Add twl4030-usb data
2012-08-06 13:23 [PATCH 0/4] arm/dts: omap: add dt data for MUSB Kishon Vijay Abraham I
2012-08-06 13:23 ` [PATCH 1/4] arm/dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
2012-08-06 13:23 ` [PATCH 2/4] arm/dts: Add twl6030-usb data Kishon Vijay Abraham I
@ 2012-08-06 13:23 ` Kishon Vijay Abraham I
2012-08-06 13:23 ` [PATCH 4/4] arm/dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I
2012-09-06 13:22 ` [PATCH 0/4] arm/dts: omap: add dt data for MUSB Felipe Balbi
4 siblings, 0 replies; 6+ messages in thread
From: Kishon Vijay Abraham I @ 2012-08-06 13:23 UTC (permalink / raw)
To: linux, b-cousson, rob.herring, grant.likely, tony, rnayak,
hvaibhav, kishon, peter.ujfalusi, linux-arm-kernel, linux-kernel,
balbi
Add twl4030-usb data node in twl4030 device tree file.
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 22f4d13..761a5a5 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] 6+ messages in thread* [PATCH 4/4] arm/dts: omap: Add usb_otg and glue data
2012-08-06 13:23 [PATCH 0/4] arm/dts: omap: add dt data for MUSB Kishon Vijay Abraham I
` (2 preceding siblings ...)
2012-08-06 13:23 ` [PATCH 3/4] arm/dts: Add twl4030-usb data Kishon Vijay Abraham I
@ 2012-08-06 13:23 ` Kishon Vijay Abraham I
2012-09-06 13:22 ` [PATCH 0/4] arm/dts: omap: add dt data for MUSB Felipe Balbi
4 siblings, 0 replies; 6+ messages in thread
From: Kishon Vijay Abraham I @ 2012-08-06 13:23 UTC (permalink / raw)
To: linux, b-cousson, rob.herring, grant.likely, tony, rnayak,
hvaibhav, kishon, peter.ujfalusi, linux-arm-kernel, linux-kernel,
balbi
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 d774733..a855d13 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -308,5 +308,13 @@
<0x4a002300 0x1>;
};
};
+
+ usb_otg_hs: usb_otg_hs {
+ compatible = "ti,omap4-musb";
+ ti,hwmods = "usb_otg_hs";
+ multipoint = <1>;
+ num_eps = <16>;
+ ram_bits = <12>;
+ };
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/4] arm/dts: omap: add dt data for MUSB
2012-08-06 13:23 [PATCH 0/4] arm/dts: omap: add dt data for MUSB Kishon Vijay Abraham I
` (3 preceding siblings ...)
2012-08-06 13:23 ` [PATCH 4/4] arm/dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I
@ 2012-09-06 13:22 ` Felipe Balbi
4 siblings, 0 replies; 6+ messages in thread
From: Felipe Balbi @ 2012-09-06 13:22 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: linux, b-cousson, rob.herring, grant.likely, tony, rnayak,
hvaibhav, peter.ujfalusi, linux-arm-kernel, linux-kernel, balbi
[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]
Hi,
On Mon, Aug 06, 2012 at 06:53:11PM +0530, Kishon Vijay Abraham I wrote:
> This patch series adds dt data for MUSB and related modules to
> get MUSB working
>
> These patches were initially part of
> [PATCH v6 00/11] omap: musb: Add device tree support
>
> These patches can be tested by applying it over
> [PATCH v7 0/7] omap: musb: Add device tree support
>
> These patches were developed on
> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
>
> If it needs to be rebased on some other tree, pls let me
> know.
>
> Performed MUSB device mode testing on omap4 panda,
> omap4 sdp and omap3 beagle
Grant, we already lost two merge windows on this patchset. Is it
possible for you to take a look here so we don't loose another merge
window ? Can Benoit just take these patches on his tree, so it goes
upstream through the linux-omap tree ?
cheers
> Kishon Vijay Abraham I (4):
> arm/dts: omap: Add omap-usb2 dt data
> 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.dts | 6 ++++++
> arch/arm/boot/dts/omap3-evm.dts | 6 ++++++
> arch/arm/boot/dts/omap3.dtsi | 8 ++++++++
> arch/arm/boot/dts/omap4-panda.dts | 10 ++++++++++
> arch/arm/boot/dts/omap4-sdp.dts | 10 ++++++++++
> arch/arm/boot/dts/omap4.dtsi | 13 +++++++++++++
> arch/arm/boot/dts/twl4030.dtsi | 21 +++++++++++++++++++++
> arch/arm/boot/dts/twl6030.dtsi | 5 +++++
> 8 files changed, 79 insertions(+)
>
> --
> 1.7.9.5
>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread