* [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: grant.likely, rob.herring, rob, b-cousson, tony, linux, balbi,
gregkh, kishon, devicetree-discuss, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
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: grant.likely, rob.herring, rob, b-cousson, tony, linux, balbi,
gregkh, kishon, devicetree-discuss, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
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: grant.likely, rob.herring, rob, b-cousson, tony, linux, balbi,
gregkh, kishon, devicetree-discuss, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
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@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@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* Re: [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: Kishon Vijay Abraham I
Cc: grant.likely, rob.herring, rob, tony, linux, balbi, gregkh,
devicetree-discuss, linux-kernel, linux-omap, linux-arm-kernel,
linux-usb
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* Re: [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: Benoit Cousson
Cc: Kishon Vijay Abraham I, grant.likely, rob.herring, rob, tony,
linux, balbi, gregkh, devicetree-discuss, linux-kernel,
linux-omap, linux-arm-kernel, linux-usb
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
* Re: [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: Aaro Koskinen
Cc: Benoit Cousson, grant.likely, rob.herring, rob, tony, linux,
balbi, gregkh, devicetree-discuss, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
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
* Re: [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: kishon
Cc: Aaro Koskinen, grant.likely, rob.herring, rob, tony, linux,
balbi, gregkh, devicetree-discuss, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
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
* Re: [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: Benoit Cousson
Cc: Aaro Koskinen, grant.likely, rob.herring, rob, tony, linux,
balbi, gregkh, devicetree-discuss, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
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