[PATCH v2 0/6] ARM: dts: omap: add dt data for dwc3

[PATCH v2 0/6] ARM: dts: omap: add dt data for dwc3

[Kishon Vijay Abraham I]

This patch series adds dt data to get dwc3 working in omap5.

Changes from v1:
* rename "ctrl_module" to "ctrl-module" and "usb_phy" to "usb-phy"

This patch series is developed on
git://github.com/rrnayak/linux.git omap5-3.8-rc4-base-palmas

This is the last series of the series of patches.
I've kept everything in a single branch
git://gitorious.org/linux-usb/linux-usb.git omap5-with-palmas
(changes up to 23b4dfa2ab7052569cd88acc6383c4b1a8e8a482)

Did enumeration testing on omap5 evm.

Kishon Vijay Abraham I (6):
  ARM: dts: omap5: Add omap control usb data
  ARM: dts: omap5: Add ocp2scp data
  ARM: dts: omap5: Add omap-usb3 and omap-usb2 dt data
  ARM: dts: omap5: add dwc3 omap dt data
  ARM: dts: omap5: add dwc3 core dt data
  ARM: dts: palmas: update dt data for palmas-usb

 arch/arm/boot/dts/omap5.dtsi  |   48 +++++++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/palmas.dtsi |    4 ++--
 2 files changed, 50 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[PATCH v2 1/6] ARM: dts: omap5: Add omap control usb data

[Kishon Vijay Abraham I]

Add omap control usb data in omap5 device tree file. This will have the
register address of registers to power on the USB2 PHY and USB3 PHY. The
information for the node added here is available in
Documentation/devicetree/bindings/usb/omap-usb.txt

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm/boot/dts/omap5.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 7a78d1b..edc7464 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -504,5 +504,13 @@
 			hw-caps-ll-interface;
 			hw-caps-temp-alert;
 		};
+
+		omap_control_usb: omap-control-usb@4a002300 {
+			compatible = "ti,omap-control-usb";
+			reg = <0x4a002300 0x4>,
+			      <0x4a002370 0x4>;
+			reg-names = "control_dev_conf", "phy_power_usb";
+			ti,type = <2>;
+		};
 	};
 };
-- 
1.7.9.5

[PATCH v2 2/6] ARM: dts: omap5: Add ocp2scp data

[Kishon Vijay Abraham I]

Add ocp2scp data node in omap5 device tree file. The information for
the node added here can be found @
Documentation/devicetree/bindings/bus/omap-ocp2scp.txt

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm/boot/dts/omap5.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index edc7464..d149330 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -512,5 +512,13 @@
 			reg-names = "control_dev_conf", "phy_power_usb";
 			ti,type = <2>;
 		};
+
+		ocp2scp {
+			compatible = "ti,omap-ocp2scp";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+			ti,hwmods = "ocp2scp1";
+		};
 	};
 };
-- 
1.7.9.5

[PATCH v2 3/6] ARM: dts: omap5: Add omap-usb3 and omap-usb2 dt data

[Kishon Vijay Abraham I]

Add omap-usb3 and omap-usb2 data node in omap5 device tree file.
The information for the node added here is available @
Documentation/devicetree/bindings/usb/usb-phy.txt

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm/boot/dts/omap5.dtsi |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index d149330..5f59bf2 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -519,6 +519,20 @@
 			#size-cells = <1>;
 			ranges;
 			ti,hwmods = "ocp2scp1";
+			usb2_phy: usb2phy@4a084000 {
+				compatible = "ti,omap-usb2";
+				reg = <0x4a084000 0x7c>;
+				ctrl-module = <&omap_control_usb>;
+			};
+
+			usb3_phy: usb3phy@4a084400 {
+				compatible = "ti,omap-usb3";
+				reg = <0x4a084400 0x80>,
+				      <0x4a084800 0x64>,
+				      <0x4a084c00 0x40>;
+				reg-names = "phy_rx", "phy_tx", "pll_ctrl";
+				ctrl-module = <&omap_control_usb>;
+			};
 		};
 	};
 };
-- 
1.7.9.5

[PATCH v2 4/6] ARM: dts: omap5: add dwc3 omap dt data

[Kishon Vijay Abraham I]

Add dwc3 omap glue data to the omap5 dt data file. The information about
the dt node added here is available @
Documentation/devicetree/bindings/usb/omap-usb.txt

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm/boot/dts/omap5.dtsi |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 5f59bf2..1703a72 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -513,6 +513,17 @@
 			ti,type = <2>;
 		};
 
+		omap_dwc3@4a020000 {
+			compatible = "ti,dwc3";
+			ti,hwmods = "usb_otg_ss";
+			reg = <0x4a020000 0x1ff>;
+			interrupts = <0 93 4>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			utmi-mode = <2>;
+			ranges;
+		};
+
 		ocp2scp {
 			compatible = "ti,omap-ocp2scp";
 			#address-cells = <1>;
-- 
1.7.9.5

[PATCH v2 5/6] ARM: dts: omap5: add dwc3 core dt data

[Kishon Vijay Abraham I]

Add dwc3 core dt data as a subnode to dwc3 omap glue data in omap5 dt
data file. The information for the entered data node is available @
Documentation/devicetree/bindings/usb/dwc3.txt

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm/boot/dts/omap5.dtsi |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 1703a72..58118c4 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -522,6 +522,13 @@
 			#size-cells = <1>;
 			utmi-mode = <2>;
 			ranges;
+			dwc3@4a030000 {
+				compatible = "synopsys,dwc3";
+				reg = <0x4a030000 0xcfff>;
+				interrupts = <0 92 4>;
+				usb-phy = <&usb2_phy>, <&usb3_phy>;
+				tx-fifo-resize;
+			};
 		};
 
 		ocp2scp {
-- 
1.7.9.5

[PATCH v2 6/6] ARM: dts: palmas: update dt data for palmas-usb

[Kishon Vijay Abraham I]

Update palmas-usb data node in palmas device tree file

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm/boot/dts/palmas.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/palmas.dtsi b/arch/arm/boot/dts/palmas.dtsi
index d20adb4..0cf39da 100644
--- a/arch/arm/boot/dts/palmas.dtsi
+++ b/arch/arm/boot/dts/palmas.dtsi
@@ -318,8 +318,8 @@
 
 	palmas_usb {
 		compatible = "ti,palmas-usb";
-		ti,no_control_vbus = <0>;
-		ti,wakeup = <0>;
+		ti,wakeup;
+		vbus-supply = <&smps10_reg>;
 	};
 };
 
-- 
1.7.9.5

Re: [PATCH v2 0/6] ARM: dts: omap: add dt data for dwc3

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]

Hi,

On Fri, Jan 25, 2013 at 04:41:46PM +0530, Kishon Vijay Abraham I wrote:
> This patch series adds dt data to get dwc3 working in omap5.
> 
> Changes from v1:
> * rename "ctrl_module" to "ctrl-module" and "usb_phy" to "usb-phy"
> 
> This patch series is developed on
> git://github.com/rrnayak/linux.git omap5-3.8-rc4-base-palmas
> 
> This is the last series of the series of patches.
> I've kept everything in a single branch
> git://gitorious.org/linux-usb/linux-usb.git omap5-with-palmas
> (changes up to 23b4dfa2ab7052569cd88acc6383c4b1a8e8a482)
> 
> Did enumeration testing on omap5 evm.

I have gone quickly through this series and it looks already to me:

Reviewied-by: Felipe Balbi <balbi@ti.com>

> Kishon Vijay Abraham I (6):
>   ARM: dts: omap5: Add omap control usb data
>   ARM: dts: omap5: Add ocp2scp data
>   ARM: dts: omap5: Add omap-usb3 and omap-usb2 dt data
>   ARM: dts: omap5: add dwc3 omap dt data
>   ARM: dts: omap5: add dwc3 core dt data
>   ARM: dts: palmas: update dt data for palmas-usb
> 
>  arch/arm/boot/dts/omap5.dtsi  |   48 +++++++++++++++++++++++++++++++++++++++++
>  arch/arm/boot/dts/palmas.dtsi |    4 ++--
>  2 files changed, 50 insertions(+), 2 deletions(-)
> 
> -- 
> 1.7.9.5
> 

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2 4/6] ARM: dts: omap5: add dwc3 omap dt data

[Sergei Shtylyov]

Hello.

On 25-01-2013 15:11, Kishon Vijay Abraham I wrote:

> Add dwc3 omap glue data to the omap5 dt data file. The information about
> the dt node added here is available @
> Documentation/devicetree/bindings/usb/omap-usb.txt

> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
>   arch/arm/boot/dts/omap5.dtsi |   11 +++++++++++
>   1 file changed, 11 insertions(+)

> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
> index 5f59bf2..1703a72 100644
> --- a/arch/arm/boot/dts/omap5.dtsi
> +++ b/arch/arm/boot/dts/omap5.dtsi
> @@ -513,6 +513,17 @@
>   			ti,type = <2>;
>   		};
>
> +		omap_dwc3@4a020000 {
> +			compatible = "ti,dwc3";
> +			ti,hwmods = "usb_otg_ss";
> +			reg = <0x4a020000 0x1ff>;

    Shoudn't the "reg" length be 0x200 here? It's length, not limit.

WBR, Sergei

Re: [PATCH v2 5/6] ARM: dts: omap5: add dwc3 core dt data

[Sergei Shtylyov]

On 25-01-2013 15:11, Kishon Vijay Abraham I wrote:

> Add dwc3 core dt data as a subnode to dwc3 omap glue data in omap5 dt
> data file. The information for the entered data node is available @
> Documentation/devicetree/bindings/usb/dwc3.txt

> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
>   arch/arm/boot/dts/omap5.dtsi |    7 +++++++
>   1 file changed, 7 insertions(+)

> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
> index 1703a72..58118c4 100644
> --- a/arch/arm/boot/dts/omap5.dtsi
> +++ b/arch/arm/boot/dts/omap5.dtsi
> @@ -522,6 +522,13 @@
>   			#size-cells = <1>;
>   			utmi-mode = <2>;
>   			ranges;
> +			dwc3@4a030000 {
> +				compatible = "synopsys,dwc3";
> +				reg = <0x4a030000 0xcfff>;

    Same question here.

WBR, Sergei

Re: [PATCH v2 4/6] ARM: dts: omap5: add dwc3 omap dt data

[kishon]

On Sunday 27 January 2013 01:17 AM, Sergei Shtylyov wrote:
> Hello.
>
> On 25-01-2013 15:11, Kishon Vijay Abraham I wrote:
>
>> Add dwc3 omap glue data to the omap5 dt data file. The information about
>> the dt node added here is available @
>> Documentation/devicetree/bindings/usb/omap-usb.txt
>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>> ---
>>   arch/arm/boot/dts/omap5.dtsi |   11 +++++++++++
>>   1 file changed, 11 insertions(+)
>
>> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
>> index 5f59bf2..1703a72 100644
>> --- a/arch/arm/boot/dts/omap5.dtsi
>> +++ b/arch/arm/boot/dts/omap5.dtsi
>> @@ -513,6 +513,17 @@
>>               ti,type = <2>;
>>           };
>>
>> +        omap_dwc3@4a020000 {
>> +            compatible = "ti,dwc3";
>> +            ti,hwmods = "usb_otg_ss";
>> +            reg = <0x4a020000 0x1ff>;
>
>     Shoudn't the "reg" length be 0x200 here? It's length, not limit.

I think 0x1ff is correct. I got the data from hwmod data.

Thanks
Kishon

Re: [PATCH v2 4/6] ARM: dts: omap5: add dwc3 omap dt data

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1334 bytes --]

On Tue, Feb 05, 2013 at 01:59:26PM +0530, kishon wrote:
> On Sunday 27 January 2013 01:17 AM, Sergei Shtylyov wrote:
> >Hello.
> >
> >On 25-01-2013 15:11, Kishon Vijay Abraham I wrote:
> >
> >>Add dwc3 omap glue data to the omap5 dt data file. The information about
> >>the dt node added here is available @
> >>Documentation/devicetree/bindings/usb/omap-usb.txt
> >
> >>Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> >>---
> >>  arch/arm/boot/dts/omap5.dtsi |   11 +++++++++++
> >>  1 file changed, 11 insertions(+)
> >
> >>diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
> >>index 5f59bf2..1703a72 100644
> >>--- a/arch/arm/boot/dts/omap5.dtsi
> >>+++ b/arch/arm/boot/dts/omap5.dtsi
> >>@@ -513,6 +513,17 @@
> >>              ti,type = <2>;
> >>          };
> >>
> >>+        omap_dwc3@4a020000 {
> >>+            compatible = "ti,dwc3";
> >>+            ti,hwmods = "usb_otg_ss";
> >>+            reg = <0x4a020000 0x1ff>;
> >
> >    Shoudn't the "reg" length be 0x200 here? It's length, not limit.
> 
> I think 0x1ff is correct. I got the data from hwmod data.

hwmod is utterly wrong. Looking at TRM, it says the size here is 64KiB
(0x10000), so is the size for dwc3 itself. Please don't blindly trust
hwmod, make sure you read data from TRM ;-)

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2 4/6] ARM: dts: omap5: add dwc3 omap dt data

[kishon]

Hi,

On Tuesday 05 February 2013 02:08 PM, Felipe Balbi wrote:
> On Tue, Feb 05, 2013 at 01:59:26PM +0530, kishon wrote:
>> On Sunday 27 January 2013 01:17 AM, Sergei Shtylyov wrote:
>>> Hello.
>>>
>>> On 25-01-2013 15:11, Kishon Vijay Abraham I wrote:
>>>
>>>> Add dwc3 omap glue data to the omap5 dt data file. The information about
>>>> the dt node added here is available @
>>>> Documentation/devicetree/bindings/usb/omap-usb.txt
>>>
>>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>>> ---
>>>>   arch/arm/boot/dts/omap5.dtsi |   11 +++++++++++
>>>>   1 file changed, 11 insertions(+)
>>>
>>>> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
>>>> index 5f59bf2..1703a72 100644
>>>> --- a/arch/arm/boot/dts/omap5.dtsi
>>>> +++ b/arch/arm/boot/dts/omap5.dtsi
>>>> @@ -513,6 +513,17 @@
>>>>               ti,type = <2>;
>>>>           };
>>>>
>>>> +        omap_dwc3@4a020000 {
>>>> +            compatible = "ti,dwc3";
>>>> +            ti,hwmods = "usb_otg_ss";
>>>> +            reg = <0x4a020000 0x1ff>;
>>>
>>>     Shoudn't the "reg" length be 0x200 here? It's length, not limit.
>>
>> I think 0x1ff is correct. I got the data from hwmod data.
>
> hwmod is utterly wrong. Looking at TRM, it says the size here is 64KiB
> (0x10000), so is the size for dwc3 itself. Please don't blindly trust
> hwmod, make sure you read data from TRM ;-)

hmm..ok. But it has only 17 registers :-D

Thanks
Kishon

Re: [PATCH v2 4/6] ARM: dts: omap5: add dwc3 omap dt data

[Santosh Shilimkar]

On Tuesday 05 February 2013 02:16 PM, kishon wrote:
> Hi,
>
> On Tuesday 05 February 2013 02:08 PM, Felipe Balbi wrote:
>> On Tue, Feb 05, 2013 at 01:59:26PM +0530, kishon wrote:
>>> On Sunday 27 January 2013 01:17 AM, Sergei Shtylyov wrote:
>>>> Hello.
>>>>
>>>> On 25-01-2013 15:11, Kishon Vijay Abraham I wrote:
>>>>
>>>>> Add dwc3 omap glue data to the omap5 dt data file. The information
>>>>> about
>>>>> the dt node added here is available @
>>>>> Documentation/devicetree/bindings/usb/omap-usb.txt
>>>>
>>>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>>>> ---
>>>>>   arch/arm/boot/dts/omap5.dtsi |   11 +++++++++++
>>>>>   1 file changed, 11 insertions(+)
>>>>
>>>>> diff --git a/arch/arm/boot/dts/omap5.dtsi
>>>>> b/arch/arm/boot/dts/omap5.dtsi
>>>>> index 5f59bf2..1703a72 100644
>>>>> --- a/arch/arm/boot/dts/omap5.dtsi
>>>>> +++ b/arch/arm/boot/dts/omap5.dtsi
>>>>> @@ -513,6 +513,17 @@
>>>>>               ti,type = <2>;
>>>>>           };
>>>>>
>>>>> +        omap_dwc3@4a020000 {
>>>>> +            compatible = "ti,dwc3";
>>>>> +            ti,hwmods = "usb_otg_ss";
>>>>> +            reg = <0x4a020000 0x1ff>;
>>>>
>>>>     Shoudn't the "reg" length be 0x200 here? It's length, not limit.
>>>
>>> I think 0x1ff is correct. I got the data from hwmod data.
>>
>> hwmod is utterly wrong. Looking at TRM, it says the size here is 64KiB
>> (0x10000), so is the size for dwc3 itself. Please don't blindly trust
>> hwmod, make sure you read data from TRM ;-)
>
> hmm..ok. But it has only 17 registers :-D
>
As Felipe said, it should be 0x200. And if you are
interested in lesser space, there is no need to map entire 64 KB
address space if it isn't being used.

Regards,
Santosh

Re: [PATCH v2 4/6] ARM: dts: omap5: add dwc3 omap dt data

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 2140 bytes --]

On Tue, Feb 05, 2013 at 02:37:05PM +0530, Santosh Shilimkar wrote:
> On Tuesday 05 February 2013 02:16 PM, kishon wrote:
> >Hi,
> >
> >On Tuesday 05 February 2013 02:08 PM, Felipe Balbi wrote:
> >>On Tue, Feb 05, 2013 at 01:59:26PM +0530, kishon wrote:
> >>>On Sunday 27 January 2013 01:17 AM, Sergei Shtylyov wrote:
> >>>>Hello.
> >>>>
> >>>>On 25-01-2013 15:11, Kishon Vijay Abraham I wrote:
> >>>>
> >>>>>Add dwc3 omap glue data to the omap5 dt data file. The information
> >>>>>about
> >>>>>the dt node added here is available @
> >>>>>Documentation/devicetree/bindings/usb/omap-usb.txt
> >>>>
> >>>>>Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> >>>>>---
> >>>>>  arch/arm/boot/dts/omap5.dtsi |   11 +++++++++++
> >>>>>  1 file changed, 11 insertions(+)
> >>>>
> >>>>>diff --git a/arch/arm/boot/dts/omap5.dtsi
> >>>>>b/arch/arm/boot/dts/omap5.dtsi
> >>>>>index 5f59bf2..1703a72 100644
> >>>>>--- a/arch/arm/boot/dts/omap5.dtsi
> >>>>>+++ b/arch/arm/boot/dts/omap5.dtsi
> >>>>>@@ -513,6 +513,17 @@
> >>>>>              ti,type = <2>;
> >>>>>          };
> >>>>>
> >>>>>+        omap_dwc3@4a020000 {
> >>>>>+            compatible = "ti,dwc3";
> >>>>>+            ti,hwmods = "usb_otg_ss";
> >>>>>+            reg = <0x4a020000 0x1ff>;
> >>>>
> >>>>    Shoudn't the "reg" length be 0x200 here? It's length, not limit.
> >>>
> >>>I think 0x1ff is correct. I got the data from hwmod data.
> >>
> >>hwmod is utterly wrong. Looking at TRM, it says the size here is 64KiB
> >>(0x10000), so is the size for dwc3 itself. Please don't blindly trust
> >>hwmod, make sure you read data from TRM ;-)
> >
> >hmm..ok. But it has only 17 registers :-D
> >
> As Felipe said, it should be 0x200. And if you are
> interested in lesser space, there is no need to map entire 64 KB
> address space if it isn't being used.

We get really close to using all of it. For DWC3, the last address is at
0xcc10 (a 32-bit register).

For dwc3-wrapper, then it's correct, we don't use it, I would still map
the whole thing to make it future proof.

Any draw-backs from mapping all 64K ?

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]