[PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

[PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

[Kishon Vijay Abraham I]

No major change from the previous version. Just removed the
omap-usb2 dt data and sent that as a separate patch.

Rebased on
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git musb

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.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       |    8 ++++++++
 arch/arm/boot/dts/twl4030.dtsi     |   21 +++++++++++++++++++++
 arch/arm/boot/dts/twl6030.dtsi     |    5 +++++
 8 files changed, 74 insertions(+)

-- 
1.7.9.5

[PATCH v2 1/3] arm/dts: Add twl6030-usb data

[Kishon Vijay Abraham I]

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

Re: [PATCH v2 1/3] arm/dts: Add twl6030-usb data

[Benoit Cousson]

On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
> 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 {

That name should be a generic device class name is possible.
What is twl6030-usb exactly? an USB PHY?

> +		compatible = "ti,twl6030-usb";
> +		interrupts = < 4 10 >;

If this is for two interrupts, you'd better split them to avoid
confusion with irq specifiers that requires several attributes like for
the GIC.

+		interrupts = <4>, <10>; /* IRQ1 blabla, IRQ2 blabla*/

The comments are not mandatory assuming the binding is documented.

Regards,
Benoit

Re: [PATCH v2 1/3] arm/dts: Add twl6030-usb data

[ABRAHAM, KISHON VIJAY]

Hi,

On Tue, Sep 11, 2012 at 2:56 PM, Benoit Cousson <b-cousson@ti.com> wrote:
> On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
>> 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 {
>
> That name should be a generic device class name is possible.
> What is twl6030-usb exactly? an USB PHY?

Of late we are calling it the comparator as it's used only to detect
VBUS/ID events.
Should it be like usb-comparator? What should be the label?
>
>> +             compatible = "ti,twl6030-usb";
>> +             interrupts = < 4 10 >;
>
> If this is for two interrupts, you'd better split them to avoid
> confusion with irq specifiers that requires several attributes like for
> the GIC.

yeah. Thats for 2 interrupts.
>
> +               interrupts = <4>, <10>; /* IRQ1 blabla, IRQ2 blabla*/
>
> The comments are not mandatory assuming the binding is documented.

It's documented *usb: twl6030: Add dt support for twl6030 usb*

Thanks
Kishon

Re: [PATCH v2 1/3] arm/dts: Add twl6030-usb data

[Benoit Cousson]

On 09/11/2012 11:39 AM, ABRAHAM, KISHON VIJAY wrote:
> Hi,
> 
> On Tue, Sep 11, 2012 at 2:56 PM, Benoit Cousson <b-cousson@ti.com> wrote:
>> On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
>>> 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 {
>>
>> That name should be a generic device class name is possible.
>> What is twl6030-usb exactly? an USB PHY?
> 
> Of late we are calling it the comparator as it's used only to detect
> VBUS/ID events.
> Should it be like usb-comparator? What should be the label?

usb-comparator looks good and generic enough.

The label is useless until you reference it somewhere else. But in the
case of the label, it can be more specific.
But you can just use "twl-usb-comparator" for example.

>>
>>> +             compatible = "ti,twl6030-usb";
>>> +             interrupts = < 4 10 >;
>>
>> If this is for two interrupts, you'd better split them to avoid
>> confusion with irq specifiers that requires several attributes like for
>> the GIC.
> 
> yeah. Thats for 2 interrupts.
>>
>> +               interrupts = <4>, <10>; /* IRQ1 blabla, IRQ2 blabla*/
>>
>> The comments are not mandatory assuming the binding is documented.
> 
> It's documented *usb: twl6030: Add dt support for twl6030 usb*

Yeah, sorry for that, but it is indeed very confusing to review the DTS
without having the binding documentation already merged :-(

Regards,
Benoit

[PATCH v2 2/3] arm/dts: Add twl4030-usb data

[Kishon Vijay Abraham I]

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

Re: [PATCH v2 2/3] arm/dts: Add twl4030-usb data

[Benoit Cousson]

On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
> Add twl4030-usb data node in twl4030 device tree file.

IIRC, the usb part on twl4030 was doing more than it does on twl6030.

Could you describe what part of the USB is really done by the TWL in
that case?

> 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 {

Same comment than before about the name. Is it the usb-comparator as well?

> +		compatible = "ti,twl4030-usb";
> +		interrupts = < 10 4 >;
> +		usb1v5-supply = <&vusb1v5>;
> +		usb1v8-supply = <&vusb1v8>;
> +		usb3v1-supply = <&vusb3v1>;
> +		usb_mode = <1>;

Is this a TI only attribute or something generic?

If this is TI only, it should be prefix with "ti," otherwise, it is fine.

Regards,
Benoit

Re: [PATCH v2 2/3] arm/dts: Add twl4030-usb data

[ABRAHAM, KISHON VIJAY]

Hi,

On Tue, Sep 11, 2012 at 3:39 PM, Benoit Cousson <b-cousson@ti.com> wrote:
> On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
>> Add twl4030-usb data node in twl4030 device tree file.
>
> IIRC, the usb part on twl4030 was doing more than it does on twl6030.

Indeed. twl4030 is the usb phy as well (unlike twl6030 which is only a
comparator). But there is not much difference in dt data.
>
> Could you describe what part of the USB is really done by the TWL in
> that case?
>
>> 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 {
>
> Same comment than before about the name. Is it the usb-comparator as well?
No. Here it's the phy as well.
>
>> +             compatible = "ti,twl4030-usb";
>> +             interrupts = < 10 4 >;
>> +             usb1v5-supply = <&vusb1v5>;
>> +             usb1v8-supply = <&vusb1v8>;
>> +             usb3v1-supply = <&vusb3v1>;
>> +             usb_mode = <1>;
>
> Is this a TI only attribute or something generic?

It's describes the way twl4030 is connected is connected to omap. So I
think it should be prefixed with "ti".

Thanks
Kishon

[PATCH v2 3/3] arm/dts: omap: Add usb_otg and glue data

[Kishon Vijay Abraham I]

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 04cbbcb..5db3d6a 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -295,5 +295,13 @@
 			interrupt-parent = <&gic>;
 			ti,hwmods = "dmic";
 		};
+
+		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

Re: [PATCH v2 3/3] arm/dts: omap: Add usb_otg and glue data

[Benoit Cousson]

On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
> 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 04cbbcb..5db3d6a 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -295,5 +295,13 @@
>  			interrupt-parent = <&gic>;
>  			ti,hwmods = "dmic";
>  		};
> +
> +		usb_otg_hs: usb_otg_hs {

After rebasing your series on top of devel-dt, you should as well add
the missing reg/irq entries that are now supported thanks to Vaibhav.

Regards,
Benoit

> +			compatible = "ti,omap4-musb";
> +			ti,hwmods = "usb_otg_hs";
> +			multipoint = <1>;
> +			num_eps = <16>;
> +			ram_bits = <12>;
> +		};
>  	};
>  };
> 

Re: [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

[Benoit Cousson]

On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
> No major change from the previous version. Just removed the
> omap-usb2 dt data and sent that as a separate patch.

Well, I think you'd better keep them in the same series :-)

> Rebased on
> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git musb

Since it is DTS stuf, you should rebase that on top of the latest
lo/devel-dt branch. All the latest DTS patches an in there for 3.7.

While you are there, could you please rename the patches with "ARM: dts"
prefix. It seems that this is the new convention :-)

Regards,
Benoit

> 
> 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.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       |    8 ++++++++
>  arch/arm/boot/dts/twl4030.dtsi     |   21 +++++++++++++++++++++
>  arch/arm/boot/dts/twl6030.dtsi     |    5 +++++
>  8 files changed, 74 insertions(+)
> 

Re: [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

[ABRAHAM, KISHON VIJAY]

Hi Benoit,

On Tue, Sep 11, 2012 at 1:55 PM, Benoit Cousson <b-cousson@ti.com> wrote:
> On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
>> No major change from the previous version. Just removed the
>> omap-usb2 dt data and sent that as a separate patch.
>
> Well, I think you'd better keep them in the same series :-)
>
>> Rebased on
>> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git musb
>
> Since it is DTS stuf, you should rebase that on top of the latest
> lo/devel-dt branch. All the latest DTS patches an in there for 3.7.

The ocp2scp data is not in linux-omap :-( And omap-usb2 has to be a
child of ocp2scp. So I used arm-soc tree to which ocp2scp stuff was
pulled into.
>
> While you are there, could you please rename the patches with "ARM: dts"
> prefix. It seems that this is the new convention :-)

Sure.

Thanks
Kishon

Re: [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

[Benoit Cousson]

On 09/11/2012 10:44 AM, ABRAHAM, KISHON VIJAY wrote:
> Hi Benoit,
> 
> On Tue, Sep 11, 2012 at 1:55 PM, Benoit Cousson <b-cousson@ti.com> wrote:
>> On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
>>> No major change from the previous version. Just removed the
>>> omap-usb2 dt data and sent that as a separate patch.
>>
>> Well, I think you'd better keep them in the same series :-)
>>
>>> Rebased on
>>> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git musb
>>
>> Since it is DTS stuf, you should rebase that on top of the latest
>> lo/devel-dt branch. All the latest DTS patches an in there for 3.7.
> 
> The ocp2scp data is not in linux-omap :-( And omap-usb2 has to be a
> child of ocp2scp. So I used arm-soc tree to which ocp2scp stuff was
> pulled into.

Mmm, but from what tree? It did not go through Tony?
What arm-soc branch exactly?

In that case we need to merge Tony's devel-dt into arm-soc to have a
common base or ask Tony to rebase on top of arm-soc.

I added a bunch of change inside OMAP4.dtsi, so we can expect some nice
conflicts.
That's why it is better to push DTS patches using a single channel.


Tony,
What will make more sense to avoid merge conflict later?


Regards,
Benoit

Re: [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

[ABRAHAM, KISHON VIJAY]

Hi,

On Tue, Sep 11, 2012 at 2:41 PM, Benoit Cousson <b-cousson@ti.com> wrote:
> On 09/11/2012 10:44 AM, ABRAHAM, KISHON VIJAY wrote:
>> Hi Benoit,
>>
>> On Tue, Sep 11, 2012 at 1:55 PM, Benoit Cousson <b-cousson@ti.com> wrote:
>>> On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
>>>> No major change from the previous version. Just removed the
>>>> omap-usb2 dt data and sent that as a separate patch.
>>>
>>> Well, I think you'd better keep them in the same series :-)
>>>
>>>> Rebased on
>>>> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git musb
>>>
>>> Since it is DTS stuf, you should rebase that on top of the latest
>>> lo/devel-dt branch. All the latest DTS patches an in there for 3.7.
>>
>> The ocp2scp data is not in linux-omap :-( And omap-usb2 has to be a
>> child of ocp2scp. So I used arm-soc tree to which ocp2scp stuff was
>> pulled into.
>
> Mmm, but from what tree? It did not go through Tony?
> What arm-soc branch exactly?

git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git for-next
(or) ocp2scp

Thanks
Kishon
>
> In that case we need to merge Tony's devel-dt into arm-soc to have a
> common base or ask Tony to rebase on top of arm-soc.
>
> I added a bunch of change inside OMAP4.dtsi, so we can expect some nice
> conflicts.
> That's why it is better to push DTS patches using a single channel.
>
>
> Tony,
> What will make more sense to avoid merge conflict later?
>
>
> Regards,
> Benoit
>
>

Re: [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

[Benoit Cousson]

On 09/11/2012 11:16 AM, ABRAHAM, KISHON VIJAY wrote:
> Hi,
> 
> On Tue, Sep 11, 2012 at 2:41 PM, Benoit Cousson <b-cousson@ti.com> wrote:
>> On 09/11/2012 10:44 AM, ABRAHAM, KISHON VIJAY wrote:
>>> Hi Benoit,
>>>
>>> On Tue, Sep 11, 2012 at 1:55 PM, Benoit Cousson <b-cousson@ti.com> wrote:
>>>> On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
>>>>> No major change from the previous version. Just removed the
>>>>> omap-usb2 dt data and sent that as a separate patch.
>>>>
>>>> Well, I think you'd better keep them in the same series :-)
>>>>
>>>>> Rebased on
>>>>> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git musb
>>>>
>>>> Since it is DTS stuf, you should rebase that on top of the latest
>>>> lo/devel-dt branch. All the latest DTS patches an in there for 3.7.
>>>
>>> The ocp2scp data is not in linux-omap :-( And omap-usb2 has to be a
>>> child of ocp2scp. So I used arm-soc tree to which ocp2scp stuff was
>>> pulled into.
>>
>> Mmm, but from what tree? It did not go through Tony?
>> What arm-soc branch exactly?
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git for-next
> (or) ocp2scp


OK, here it is:

+
+               ocp2scp {
+                       compatible = "ti,omap-ocp2scp";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+                       ti,hwmods = "ocp2scp_usb_phy";
+               };


In order to be consistent with the OMAP4 data now, you should update it
to add the reg, and IRQ if applicable.

But for that we do need a proper base with ocp2scp + devel-dt.

Regards,
Benoit

Re: [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

[Benoit Cousson]

Hi Kishon,

Beside minor comments and the lack of explicit changelog to explain what
part of the HW you are addressing, this series looks good.

I guess that series should be rebased on top of lo/devel-dt without much
trouble.

On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
> No major change from the previous version. Just removed the
> omap-usb2 dt data and sent that as a separate patch.

Indeed that one will be trickier to merge properly, so my second thought
is it is better to have it separated.

Regards,
Benoit

> 
> Rebased on
> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git musb
> 
> 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.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       |    8 ++++++++
>  arch/arm/boot/dts/twl4030.dtsi     |   21 +++++++++++++++++++++
>  arch/arm/boot/dts/twl6030.dtsi     |    5 +++++
>  8 files changed, 74 insertions(+)
>