Hi Benoit,
Here are the dt data patches to get usb device functional in OMAP platforms.
All the patches deal with modifying arch/arm/boot except one which modifies
Documentation/../usb/omap-usb.txt
Changes from v2:
* squashed the dt data for dwc3-omap with dwc3 core into a single patch.
Changes from v1:
Patch *ARM: dts: omap: Add usb_otg and glue data* has some properties with
names that has "_". It's replaced with a "-" here.
This patch is developed on Linux 3.9-rc1.
Kishon Vijay Abraham I (7):
ARM: dts: omap: Add omap control usb data
ARM: dts: omap: Add omap-usb2 dt data
ARM: dts: omap: Add usb_otg and glue data
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 and dwc3 core dt data
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 | 26 +++++++++++
arch/arm/boot/dts/omap5.dtsi | 48 ++++++++++++++++++++
arch/arm/boot/dts/twl4030.dtsi | 2 +-
10 files changed, 118 insertions(+), 1 deletion(-)
--
1.7.10.4
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 <[email protected]>
---
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 c937500..230b779 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -504,5 +504,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.10.4
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.
Also added 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 <[email protected]>
---
arch/arm/boot/dts/omap5.dtsi | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index bd73257..24dd69f 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -505,6 +505,24 @@
ti,type = <2>;
};
+ omap_dwc3@4a020000 {
+ compatible = "ti,dwc3";
+ ti,hwmods = "usb_otg_ss";
+ reg = <0x4a020000 0x1000>;
+ interrupts = <0 93 4>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ utmi-mode = <2>;
+ ranges;
+ dwc3@4a030000 {
+ compatible = "synopsys,dwc3";
+ reg = <0x4a030000 0x1000>;
+ interrupts = <0 92 4>;
+ usb-phy = <&usb2_phy>, <&usb3_phy>;
+ tx-fifo-resize;
+ };
+ };
+
ocp2scp {
compatible = "ti,omap-ocp2scp";
#address-cells = <1>;
--
1.7.10.4
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 <[email protected]>
---
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 790bb2a..c937500 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -496,5 +496,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.10.4
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 <[email protected]>
Signed-off-by: Kishon Vijay Abraham I <[email protected]>
---
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(-)
diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
index 1ef0ce7..abce256 100644
--- a/Documentation/devicetree/bindings/usb/omap-usb.txt
+++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
@@ -18,6 +18,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
Optional properties:
- ctrl-module : phandle of the control module this glue uses to write to
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 3705a81..5f8226a 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..6e6f80d 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..e3979b1 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..1e21565 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..6531f75 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..f3adbf51 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..06d044e 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>;
--
1.7.10.4
Add omap-usb2 data node in omap4 device tree file. Since omap-usb2 is
connected to ocp2scp, omap-usb2 dt data is added as a child node
of ocp2scp. The information about this data node is availabe @
Documentation/devicetree/bindings/usb/usb-phy.txt
Acked-by: Felipe Balbi <[email protected]>
Signed-off-by: Kishon Vijay Abraham I <[email protected]>
---
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 ffc7352..c829d7e 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -438,6 +438,11 @@
#size-cells = <1>;
ranges;
ti,hwmods = "ocp2scp_usb_phy";
+ usb2_phy: usb2phy@4a0ad080 {
+ compatible = "ti,omap-usb2";
+ reg = <0x4a0ad080 0x58>;
+ ctrl-module = <&omap_control_usb>;
+ };
};
timer1: timer@4a318000 {
--
1.7.10.4
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 <[email protected]>
---
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 230b779..bd73257 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -511,6 +511,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.10.4
Add omap control usb data in omap4 device tree file. This will have the
register address of registers to power on the PHY and to write to
mailbox. The information about this data node is available @
Documentation/devicetree/bindings/usb/omap-usb.txt
Signed-off-by: Kishon Vijay Abraham I <[email protected]>
---
arch/arm/boot/dts/omap4.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 739bb79..ffc7352 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -529,5 +529,13 @@
ti,hwmods = "timer11";
ti,timer-pwm;
};
+
+ omap_control_usb: omap-control-usb@4a002300 {
+ compatible = "ti,omap-control-usb";
+ reg = <0x4a002300 0x4>,
+ <0x4a00233c 0x4>;
+ reg-names = "control_dev_conf", "otghs_control";
+ ti,type = <1>;
+ };
};
};
--
1.7.10.4
Benoit,
Will you be queuing this patch series?
Thanks
Kishon
On Thursday 07 March 2013 07:05 PM, Kishon Vijay Abraham I wrote:
> Hi Benoit,
>
> Here are the dt data patches to get usb device functional in OMAP platforms.
>
> All the patches deal with modifying arch/arm/boot except one which modifies
> Documentation/../usb/omap-usb.txt
>
> Changes from v2:
> * squashed the dt data for dwc3-omap with dwc3 core into a single patch.
>
> Changes from v1:
> Patch *ARM: dts: omap: Add usb_otg and glue data* has some properties with
> names that has "_". It's replaced with a "-" here.
>
> This patch is developed on Linux 3.9-rc1.
>
> Kishon Vijay Abraham I (7):
> ARM: dts: omap: Add omap control usb data
> ARM: dts: omap: Add omap-usb2 dt data
> ARM: dts: omap: Add usb_otg and glue data
> 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 and dwc3 core dt data
>
> 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 | 26 +++++++++++
> arch/arm/boot/dts/omap5.dtsi | 48 ++++++++++++++++++++
> arch/arm/boot/dts/twl4030.dtsi | 2 +-
> 10 files changed, 118 insertions(+), 1 deletion(-)
>
Hi Kishon,
On 03/13/2013 10:11 AM, kishon wrote:
> Benoit,
>
> Will you be queuing this patch series?
I'm reviewing them right now.
Regards,
Benoit
>
> Thanks
> Kishon
>
> On Thursday 07 March 2013 07:05 PM, Kishon Vijay Abraham I wrote:
>> Hi Benoit,
>>
>> Here are the dt data patches to get usb device functional in OMAP
>> platforms.
>>
>> All the patches deal with modifying arch/arm/boot except one which
>> modifies
>> Documentation/../usb/omap-usb.txt
>>
>> Changes from v2:
>> * squashed the dt data for dwc3-omap with dwc3 core into a single patch.
>>
>> Changes from v1:
>> Patch *ARM: dts: omap: Add usb_otg and glue data* has some properties
>> with
>> names that has "_". It's replaced with a "-" here.
>>
>> This patch is developed on Linux 3.9-rc1.
>>
>> Kishon Vijay Abraham I (7):
>> ARM: dts: omap: Add omap control usb data
>> ARM: dts: omap: Add omap-usb2 dt data
>> ARM: dts: omap: Add usb_otg and glue data
>> 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 and dwc3 core dt data
>>
>> 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 | 26 +++++++++++
>> arch/arm/boot/dts/omap5.dtsi | 48
>> ++++++++++++++++++++
>> arch/arm/boot/dts/twl4030.dtsi | 2 +-
>> 10 files changed, 118 insertions(+), 1 deletion(-)
>>
>
+ Jon
Hi Kishon,
On 03/07/2013 02:35 PM, Kishon Vijay Abraham I wrote:
> Hi Benoit,
>
> Here are the dt data patches to get usb device functional in OMAP platforms.
>
> All the patches deal with modifying arch/arm/boot except one which modifies
> Documentation/../usb/omap-usb.txt
>
> Changes from v2:
> * squashed the dt data for dwc3-omap with dwc3 core into a single patch.
>
> Changes from v1:
> Patch *ARM: dts: omap: Add usb_otg and glue data* has some properties with
> names that has "_". It's replaced with a "-" here.
>
> This patch is developed on Linux 3.9-rc1.
The patches looks really good. I've just had to rebase on top of my HEAD due to some conflict with GPMC patch already applied.
I cleaned as well some subject and changelog for consistency.
The patches are available here:
git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.10/dts
Jon,
You might have to rebase your series on top of the new HEAD before reposting.
Thanks,
Benoit
> Kishon Vijay Abraham I (7):
> ARM: dts: omap: Add omap control usb data
> ARM: dts: omap: Add omap-usb2 dt data
> ARM: dts: omap: Add usb_otg and glue data
> 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 and dwc3 core dt data
>
> 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 | 26 +++++++++++
> arch/arm/boot/dts/omap5.dtsi | 48 ++++++++++++++++++++
> arch/arm/boot/dts/twl4030.dtsi | 2 +-
> 10 files changed, 118 insertions(+), 1 deletion(-)
>
On Friday 15 March 2013 06:11 PM, Benoit Cousson wrote:
> + Jon
>
> Hi Kishon,
>
> On 03/07/2013 02:35 PM, Kishon Vijay Abraham I wrote:
>> Hi Benoit,
>>
>> Here are the dt data patches to get usb device functional in OMAP platforms.
>>
>> All the patches deal with modifying arch/arm/boot except one which modifies
>> Documentation/../usb/omap-usb.txt
>>
>> Changes from v2:
>> * squashed the dt data for dwc3-omap with dwc3 core into a single patch.
>>
>> Changes from v1:
>> Patch *ARM: dts: omap: Add usb_otg and glue data* has some properties with
>> names that has "_". It's replaced with a "-" here.
>>
>> This patch is developed on Linux 3.9-rc1.
>
> The patches looks really good. I've just had to rebase on top of my HEAD due to some conflict with GPMC patch already applied.
>
> I cleaned as well some subject and changelog for consistency.
Ok. Thanks :-)
Regards
Kishon