diff mbox

[v2,1/3] arm: mvebu: Add support for USB host controllers in Armada 370/XP

Message ID 1358954792-16160-1-git-send-email-ezequiel.garcia@free-electrons.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ezequiel Garcia Jan. 23, 2013, 3:26 p.m. UTC
The Armada 370 and Armada XP SoC has an Orion EHCI USB controller.
This patch adds support for this controller in Armada 370
and Armada XP SoC common device tree files.

Cc: Lior Amsalem <alior@marvell.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Tested-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
Changes from v1:
 * Remove uneeded USB_ARCH_HAS_EHCI selection as noted by Florian.

 arch/arm/boot/dts/armada-370-xp.dtsi |   15 +++++++++++++++
 arch/arm/boot/dts/armada-370.dtsi    |    9 +++++++++
 arch/arm/boot/dts/armada-xp.dtsi     |   17 +++++++++++++++++
 3 files changed, 41 insertions(+), 0 deletions(-)

Comments

Ezequiel Garcia Jan. 23, 2013, 5:06 p.m. UTC | #1
Jason,

On Wed, Jan 23, 2013 at 12:26 PM, Ezequiel Garcia
<ezequiel.garcia@free-electrons.com> wrote:
> The Armada 370 and Armada XP SoC has an Orion EHCI USB controller.
> This patch adds support for this controller in Armada 370
> and Armada XP SoC common device tree files.
>
> Cc: Lior Amsalem <alior@marvell.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Tested-by: Florian Fainelli <florian@openwrt.org>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
> Changes from v1:
>  * Remove uneeded USB_ARCH_HAS_EHCI selection as noted by Florian.
>
>  arch/arm/boot/dts/armada-370-xp.dtsi |   15 +++++++++++++++
>  arch/arm/boot/dts/armada-370.dtsi    |    9 +++++++++
>  arch/arm/boot/dts/armada-xp.dtsi     |   17 +++++++++++++++++
>  3 files changed, 41 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
> index 28276fe..fa025c4 100644
> --- a/arch/arm/boot/dts/armada-370-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
> @@ -145,6 +145,21 @@
>                         clocks = <&gateclk 17>;
>                         status = "disabled";
>                 };
> +
> +               usb@d0050000 {
> +                       compatible = "marvell,orion-ehci";
> +                       reg = <0xd0050000 0x500>;
> +                       interrupts = <45>;
> +                       status = "disabled";
> +               };
> +
> +               usb@d0051000 {
> +                       compatible = "marvell,orion-ehci";
> +                       reg = <0xd0051000 0x500>;
> +                       interrupts = <46>;
> +                       status = "disabled";
> +               };
> +
>         };
>  };
>
> diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
> index 88f9bab..8188d13 100644
> --- a/arch/arm/boot/dts/armada-370.dtsi
> +++ b/arch/arm/boot/dts/armada-370.dtsi
> @@ -144,5 +144,14 @@
>                                 dmacap,memset;
>                         };
>                 };
> +
> +               usb@d0050000 {
> +                       clocks = <&coreclk 0>;
> +               };
> +
> +               usb@d0051000 {
> +                       clocks = <&coreclk 0>;
> +               };
> +
>         };
>  };
> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> index 2e37ef1..c22a0c8 100644
> --- a/arch/arm/boot/dts/armada-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-xp.dtsi
> @@ -134,5 +134,22 @@
>                                 dmacap,memset;
>                         };
>                 };
> +
> +               usb@d0050000 {
> +                       clocks = <&gateclk 18>;
> +               };
> +
> +               usb@d0051000 {
> +                       clocks = <&gateclk 19>;
> +               };
> +
> +               usb@d0052000 {
> +                       compatible = "marvell,orion-ehci";
> +                       reg = <0xd0052000 0x500>;
> +                       interrupts = <47>;
> +                       clocks = <&gateclk 20>;
> +                       status = "disabled";
> +               };
> +
>         };
>  };
> --
> 1.7.8.6
>

Do you think we're still in time to get this series into v3.9 (given
we decide soon on the OpenBlocks issue)?

Thanks,
Jason Cooper Jan. 23, 2013, 5:40 p.m. UTC | #2
On Wed, Jan 23, 2013 at 02:06:12PM -0300, Ezequiel Garcia wrote:
> Jason,
> 
> On Wed, Jan 23, 2013 at 12:26 PM, Ezequiel Garcia <ezequiel.garcia@free-electrons.com> wrote:
> > The Armada 370 and Armada XP SoC has an Orion EHCI USB controller.
> > This patch adds support for this controller in Armada 370
> > and Armada XP SoC common device tree files.
> >
> > Cc: Lior Amsalem <alior@marvell.com>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> > Tested-by: Florian Fainelli <florian@openwrt.org>
> > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> > ---
> > Changes from v1:
> >  * Remove uneeded USB_ARCH_HAS_EHCI selection as noted by Florian.
> >
> >  arch/arm/boot/dts/armada-370-xp.dtsi |   15 +++++++++++++++
> >  arch/arm/boot/dts/armada-370.dtsi    |    9 +++++++++
> >  arch/arm/boot/dts/armada-xp.dtsi     |   17 +++++++++++++++++
> >  3 files changed, 41 insertions(+), 0 deletions(-)
> 
> Do you think we're still in time to get this series into v3.9 (given
> we decide soon on the OpenBlocks issue)?

That shouldn't be a problem.

thx,

Jason.
Ezequiel Garcia Jan. 29, 2013, 6:56 p.m. UTC | #3
Hi Jason,

On Wed, Jan 23, 2013 at 2:40 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Wed, Jan 23, 2013 at 02:06:12PM -0300, Ezequiel Garcia wrote:
>> Jason,
>>
>> On Wed, Jan 23, 2013 at 12:26 PM, Ezequiel Garcia <ezequiel.garcia@free-electrons.com> wrote:
>> > The Armada 370 and Armada XP SoC has an Orion EHCI USB controller.
>> > This patch adds support for this controller in Armada 370
>> > and Armada XP SoC common device tree files.
>> >
>> > Cc: Lior Amsalem <alior@marvell.com>
>> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> > Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>> > Tested-by: Florian Fainelli <florian@openwrt.org>
>> > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
>> > ---
>> > Changes from v1:
>> >  * Remove uneeded USB_ARCH_HAS_EHCI selection as noted by Florian.
>> >
>> >  arch/arm/boot/dts/armada-370-xp.dtsi |   15 +++++++++++++++
>> >  arch/arm/boot/dts/armada-370.dtsi    |    9 +++++++++
>> >  arch/arm/boot/dts/armada-xp.dtsi     |   17 +++++++++++++++++
>> >  3 files changed, 41 insertions(+), 0 deletions(-)
>>
>> Do you think we're still in time to get this series into v3.9 (given
>> we decide soon on the OpenBlocks issue)?
>
> That shouldn't be a problem.
>

Do you think we can take this series for v3.9 as it is?
I have no problems making any changes if they are needed
but I can't move forward with the OpenBlocks issue since
I don't have access to the hardware.

I think we can sanely merge this as it is, since it has been tested in
every platform.
If there's anything to change we can do it later, when I have more
information about the
OpenBlocks hardware.

Thanks,
Jason Cooper Jan. 29, 2013, 7:03 p.m. UTC | #4
On Tue, Jan 29, 2013 at 03:56:20PM -0300, Ezequiel Garcia wrote:
> Hi Jason,
> 
> On Wed, Jan 23, 2013 at 2:40 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> > On Wed, Jan 23, 2013 at 02:06:12PM -0300, Ezequiel Garcia wrote:
> >> Jason,
> >>
> >> On Wed, Jan 23, 2013 at 12:26 PM, Ezequiel Garcia <ezequiel.garcia@free-electrons.com> wrote:
> >> > The Armada 370 and Armada XP SoC has an Orion EHCI USB controller.
> >> > This patch adds support for this controller in Armada 370
> >> > and Armada XP SoC common device tree files.
> >> >
> >> > Cc: Lior Amsalem <alior@marvell.com>
> >> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> >> > Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> >> > Tested-by: Florian Fainelli <florian@openwrt.org>
> >> > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> >> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> >> > ---
> >> > Changes from v1:
> >> >  * Remove uneeded USB_ARCH_HAS_EHCI selection as noted by Florian.
> >> >
> >> >  arch/arm/boot/dts/armada-370-xp.dtsi |   15 +++++++++++++++
> >> >  arch/arm/boot/dts/armada-370.dtsi    |    9 +++++++++
> >> >  arch/arm/boot/dts/armada-xp.dtsi     |   17 +++++++++++++++++
> >> >  3 files changed, 41 insertions(+), 0 deletions(-)
> >>
> >> Do you think we're still in time to get this series into v3.9 (given
> >> we decide soon on the OpenBlocks issue)?
> >
> > That shouldn't be a problem.
> >
> 
> Do you think we can take this series for v3.9 as it is?

I'm working though a few other issues first.  I'll take a closer look
when I get up to this series.

> I have no problems making any changes if they are needed
> but I can't move forward with the OpenBlocks issue since
> I don't have access to the hardware.

understood.

> I think we can sanely merge this as it is, since it has been tested in
> every platform.
> If there's anything to change we can do it later, when I have more
> information about the
> OpenBlocks hardware.

As long that that will be clean, there shouldn't be a problem.

thx,

Jason.
Nobuhiro Iwamatsu Jan. 31, 2013, 1:19 a.m. UTC | #5
Hi, Ezequiel.

I checked with your first patch, that is no ploblem.
you dont need to change patch.
sorry for my noise.

best regards,
  Nobuhiro

On Wed, Jan 30, 2013 at 3:56 AM, Ezequiel Garcia <elezegarcia@gmail.com> wrote:
> Hi Jason,
>
> On Wed, Jan 23, 2013 at 2:40 PM, Jason Cooper <jason@lakedaemon.net> wrote:
>> On Wed, Jan 23, 2013 at 02:06:12PM -0300, Ezequiel Garcia wrote:
>>> Jason,
>>>
>>> On Wed, Jan 23, 2013 at 12:26 PM, Ezequiel Garcia <ezequiel.garcia@free-electrons.com> wrote:
>>> > The Armada 370 and Armada XP SoC has an Orion EHCI USB controller.
>>> > This patch adds support for this controller in Armada 370
>>> > and Armada XP SoC common device tree files.
>>> >
>>> > Cc: Lior Amsalem <alior@marvell.com>
>>> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>>> > Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>>> > Tested-by: Florian Fainelli <florian@openwrt.org>
>>> > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>>> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
>>> > ---
>>> > Changes from v1:
>>> >  * Remove uneeded USB_ARCH_HAS_EHCI selection as noted by Florian.
>>> >
>>> >  arch/arm/boot/dts/armada-370-xp.dtsi |   15 +++++++++++++++
>>> >  arch/arm/boot/dts/armada-370.dtsi    |    9 +++++++++
>>> >  arch/arm/boot/dts/armada-xp.dtsi     |   17 +++++++++++++++++
>>> >  3 files changed, 41 insertions(+), 0 deletions(-)
>>>
>>> Do you think we're still in time to get this series into v3.9 (given
>>> we decide soon on the OpenBlocks issue)?
>>
>> That shouldn't be a problem.
>>
>
> Do you think we can take this series for v3.9 as it is?
> I have no problems making any changes if they are needed
> but I can't move forward with the OpenBlocks issue since
> I don't have access to the hardware.
>
> I think we can sanely merge this as it is, since it has been tested in
> every platform.
> If there's anything to change we can do it later, when I have more
> information about the
> OpenBlocks hardware.
>
> Thanks,
>
> --
>     Ezequiel
Jason Cooper Feb. 15, 2013, 9:28 p.m. UTC | #6
On Wed, Jan 23, 2013 at 12:26:30PM -0300, Ezequiel Garcia wrote:
> The Armada 370 and Armada XP SoC has an Orion EHCI USB controller.
> This patch adds support for this controller in Armada 370
> and Armada XP SoC common device tree files.
> 
> Cc: Lior Amsalem <alior@marvell.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Tested-by: Florian Fainelli <florian@openwrt.org>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
> Changes from v1:
>  * Remove uneeded USB_ARCH_HAS_EHCI selection as noted by Florian.
> 
>  arch/arm/boot/dts/armada-370-xp.dtsi |   15 +++++++++++++++
>  arch/arm/boot/dts/armada-370.dtsi    |    9 +++++++++
>  arch/arm/boot/dts/armada-xp.dtsi     |   17 +++++++++++++++++
>  3 files changed, 41 insertions(+), 0 deletions(-)

Applied to mvebu/dt

thx,

Jason.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 28276fe..fa025c4 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -145,6 +145,21 @@ 
 			clocks = <&gateclk 17>;
 			status = "disabled";
 		};
+
+		usb@d0050000 {
+			compatible = "marvell,orion-ehci";
+			reg = <0xd0050000 0x500>;
+			interrupts = <45>;
+			status = "disabled";
+		};
+
+		usb@d0051000 {
+			compatible = "marvell,orion-ehci";
+			reg = <0xd0051000 0x500>;
+			interrupts = <46>;
+			status = "disabled";
+		};
+
 	};
 };
 
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 88f9bab..8188d13 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -144,5 +144,14 @@ 
 				dmacap,memset;
 			};
 		};
+
+		usb@d0050000 {
+			clocks = <&coreclk 0>;
+		};
+
+		usb@d0051000 {
+			clocks = <&coreclk 0>;
+		};
+
 	};
 };
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 2e37ef1..c22a0c8 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -134,5 +134,22 @@ 
 				dmacap,memset;
 			};
 		};
+
+		usb@d0050000 {
+			clocks = <&gateclk 18>;
+		};
+
+		usb@d0051000 {
+			clocks = <&gateclk 19>;
+		};
+
+		usb@d0052000 {
+			compatible = "marvell,orion-ehci";
+			reg = <0xd0052000 0x500>;
+			interrupts = <47>;
+			clocks = <&gateclk 20>;
+			status = "disabled";
+		};
+
 	};
 };