diff mbox

[3/8] ARM: dts: omap: Add usb_otg and glue data

Message ID 1360162604-14320-4-git-send-email-kishon@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kishon Vijay Abraham I Feb. 6, 2013, 2:56 p.m. UTC 
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.
The information about usb otg node is available @
Documentation/devicetree/bindings/usb/omap-usb.txt

Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 Documentation/devicetree/bindings/usb/omap-usb.txt |    1 +
 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, 57 insertions(+), 1 deletion(-)

Comments

Rajendra Nayak Feb. 7, 2013, 6:21 a.m. UTC | #1 
[]...

>
> diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
> index 29a043e..4688265 100644
> --- a/Documentation/devicetree/bindings/usb/omap-usb.txt
> +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
> @@ -15,6 +15,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
>
>   SOC specific device node entry
>   usb_otg_hs: usb_otg_hs@4a0ab000 {
> 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..b6472f7 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>;

Where are these bindings documented? The general convention is to use
a '-' for property names and not '_'

> +		};
>   	};
>   };
> 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 c829d7e..5171739 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -542,5 +542,18 @@
>   			reg-names = "control_dev_conf", "otghs_control";
>   			ti,type = <1>;
>   		};
> +
> +		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>;
>
Kishon Vijay Abraham I Feb. 7, 2013, 6:31 a.m. UTC | #2 
Hi,

On Thursday 07 February 2013 11:51 AM, Rajendra Nayak wrote:
> []...
>
>>
>> diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt
>> b/Documentation/devicetree/bindings/usb/omap-usb.txt
>> index 29a043e..4688265 100644
>> --- a/Documentation/devicetree/bindings/usb/omap-usb.txt
>> +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
>> @@ -15,6 +15,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
>>
>>   SOC specific device node entry
>>   usb_otg_hs: usb_otg_hs@4a0ab000 {
>> 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..b6472f7 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>;
>
> Where are these bindings documented? The general convention is to use
> a '-' for property names and not '_'

It's documented in Documentation/devicetree/bindings/usb/omap-usb.txt
Actually the documentation and the drivers got merged with this binding 
long back.

Thanks
Kishon
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
index 29a043e..4688265 100644
--- a/Documentation/devicetree/bindings/usb/omap-usb.txt
+++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
@@ -15,6 +15,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
 
 SOC specific device node entry
 usb_otg_hs: usb_otg_hs@4a0ab000 {
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..b6472f7 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 c829d7e..5171739 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -542,5 +542,18 @@ 
 			reg-names = "control_dev_conf", "otghs_control";
 			ti,type = <1>;
 		};
+
+		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>;