diff mbox

[v2,2/3] arm: mvebu: Enable USB controllers on Armada 370/XP boards

Message ID 1358954792-16160-2-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
This patch activates every USB port provided by each SoC.
Except for Armada XP Openblocks AX3-4 board,
where we enable only the first two USB ports
until we have more information on the third one usage.

Cc: Lior Amsalem <alior@marvell.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Tested-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
Changes from v1:
 * Squashed separate per-board patches into this one,
   as suggested by Arnd.
 * Remove usb@d0052000 activation in OpenBlocks AX3-4
   until we have more information about it.

 arch/arm/boot/dts/armada-370-db.dts              |    8 ++++++++
 arch/arm/boot/dts/armada-370-mirabox.dts         |    8 ++++++++
 arch/arm/boot/dts/armada-xp-db.dts               |   12 ++++++++++++
 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts |    6 ++++++
 4 files changed, 34 insertions(+), 0 deletions(-)

Comments

Ezequiel Garcia Jan. 23, 2013, 5:04 p.m. UTC | #1
Hi Nobuhiro,

On Wed, Jan 23, 2013 at 12:26 PM, Ezequiel Garcia
<ezequiel.garcia@free-electrons.com> wrote:
> This patch activates every USB port provided by each SoC.
> Except for Armada XP Openblocks AX3-4 board,
> where we enable only the first two USB ports
> until we have more information on the third one usage.
>
> Cc: Lior Amsalem <alior@marvell.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Tested-by: Florian Fainelli <florian@openwrt.org>
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
> Changes from v1:
>  * Squashed separate per-board patches into this one,
>    as suggested by Arnd.
>  * Remove usb@d0052000 activation in OpenBlocks AX3-4
>    until we have more information about it.
>
>  arch/arm/boot/dts/armada-370-db.dts              |    8 ++++++++
>  arch/arm/boot/dts/armada-370-mirabox.dts         |    8 ++++++++
>  arch/arm/boot/dts/armada-xp-db.dts               |   12 ++++++++++++
>  arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts |    6 ++++++
>  4 files changed, 34 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
> index 8e66a7c..3d93902 100644
> --- a/arch/arm/boot/dts/armada-370-db.dts
> +++ b/arch/arm/boot/dts/armada-370-db.dts
> @@ -74,5 +74,13 @@
>                         status = "disabled";
>                         /* No CD or WP GPIOs */
>                 };
> +
> +               usb@d0050000 {
> +                       status = "okay";
> +               };
> +
> +               usb@d0051000 {
> +                       status = "okay";
> +               };
>         };
>  };
> diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
> index 1864820..dd0c57d 100644
> --- a/arch/arm/boot/dts/armada-370-mirabox.dts
> +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
> @@ -62,5 +62,13 @@
>                          * Wifi/Bluetooth chip
>                          */
>                 };
> +
> +               usb@d0050000 {
> +                       status = "okay";
> +               };
> +
> +               usb@d0051000 {
> +                       status = "okay";
> +               };
>         };
>  };
> diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
> index c7035c5..c84e1fe 100644
> --- a/arch/arm/boot/dts/armada-xp-db.dts
> +++ b/arch/arm/boot/dts/armada-xp-db.dts
> @@ -97,5 +97,17 @@
>                         status = "okay";
>                         /* No CD or WP GPIOs */
>                 };
> +
> +               usb@d0050000 {
> +                       status = "okay";
> +               };
> +
> +               usb@d0051000 {
> +                       status = "okay";
> +               };
> +
> +               usb@d0052000 {
> +                       status = "okay";
> +               };
>         };
>  };
> diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> index ec36864..3818a82 100644
> --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> @@ -133,5 +133,11 @@
>                         nr-ports = <2>;
>                         status = "okay";
>                 };
> +               usb@d0050000 {
> +                       status = "okay";
> +               };
> +               usb@d0051000 {
> +                       status = "okay";
> +               };
>         };
>  };
> --
> 1.7.8.6
>

I'd like to bring this patch to your attention.
As you can see, I've removed the

               usb@d0052000 {
                       status = "okay";
               };

from the OpenBlocks AX3-4 board dts file, since you mentioned this
board uses that USB
port for a PCIe connector -- if I understood correctly.

It's interesting to note that Mirabox board doesn't provide direct
access to its USB ports either,
but instead they are used to connect a GL827L MMC card reader.
However, we activate USB ports anyway, since it's needed for that to work fine.

So, IMHO, if OpenBlocks uses third USB port to connect some PCIe controller,
we should activate it in the dts file.

What do you think?
Thomas Petazzoni Jan. 23, 2013, 6:03 p.m. UTC | #2
Dear Ezequiel Garcia,

On Wed, 23 Jan 2013 14:04:42 -0300, Ezequiel Garcia wrote:

> from the OpenBlocks AX3-4 board dts file, since you mentioned this
> board uses that USB
> port for a PCIe connector -- if I understood correctly.

No. The OpenBlocks has a different USB controller that sits on the PCIe
bus. There is nothing like a PCIe port that uses a USB port, that
doesn't make sense.

> So, IMHO, if OpenBlocks uses third USB port to connect some PCIe
> controller, we should activate it in the dts file.
> 
> What do you think?

No, see above.

Thomas
Ezequiel Garcia Jan. 23, 2013, 6:08 p.m. UTC | #3
Hi Thomas,

On Wed, Jan 23, 2013 at 3:03 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> On Wed, 23 Jan 2013 14:04:42 -0300, Ezequiel Garcia wrote:
>
>> from the OpenBlocks AX3-4 board dts file, since you mentioned this
>> board uses that USB
>> port for a PCIe connector -- if I understood correctly.
>
> No. The OpenBlocks has a different USB controller that sits on the PCIe
> bus. There is nothing like a PCIe port that uses a USB port, that
> doesn't make sense.
>

Mmm... indeed, I got it completely wrong.

>> So, IMHO, if OpenBlocks uses third USB port to connect some PCIe
>> controller, we should activate it in the dts file.
>>
>> What do you think?
>
> No, see above.
>

So, what do you think about the patch series to be pushed as it is?
Eric Bénard Jan. 23, 2013, 9:14 p.m. UTC | #4
Hi Thomas,

Le Wed, 23 Jan 2013 19:03:52 +0100,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> a écrit :
> On Wed, 23 Jan 2013 14:04:42 -0300, Ezequiel Garcia wrote:
> 
> > from the OpenBlocks AX3-4 board dts file, since you mentioned this
> > board uses that USB
> > port for a PCIe connector -- if I understood correctly.
> 
> No. The OpenBlocks has a different USB controller that sits on the PCIe
> bus. There is nothing like a PCIe port that uses a USB port, that
> doesn't make sense.
> 
I don't have a AX3-4 but it seems to have a MiniPCIe socket and
not a PCIe one.
MiniPCIe specification includes both PCIe _and_ USB2.0 signals (on pins
36&38) (and also SMBus, SIM and LEDs drivers check the following table
for details http://pinoutsguide.com/Slots/mini_pcie_pinout.shtml ) so
the possibility to have a USB port connected to the MiniPCIe on the
AX3-4 makes sense.

For example most 3G MiniPCIe boards are using the USB2.0 signals and
not the PCIe ones.

Eric
Jason Cooper Feb. 15, 2013, 9:28 p.m. UTC | #5
On Wed, Jan 23, 2013 at 12:26:31PM -0300, Ezequiel Garcia wrote:
> This patch activates every USB port provided by each SoC.
> Except for Armada XP Openblocks AX3-4 board,
> where we enable only the first two USB ports
> until we have more information on the third one usage.
> 
> Cc: Lior Amsalem <alior@marvell.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Tested-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Tested-by: Florian Fainelli <florian@openwrt.org>
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
> Changes from v1:
>  * Squashed separate per-board patches into this one,
>    as suggested by Arnd.
>  * Remove usb@d0052000 activation in OpenBlocks AX3-4
>    until we have more information about it.
> 
>  arch/arm/boot/dts/armada-370-db.dts              |    8 ++++++++
>  arch/arm/boot/dts/armada-370-mirabox.dts         |    8 ++++++++
>  arch/arm/boot/dts/armada-xp-db.dts               |   12 ++++++++++++
>  arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts |    6 ++++++
>  4 files changed, 34 insertions(+), 0 deletions(-)

Applied to mvebu/dt

thx,

Jason.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 8e66a7c..3d93902 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -74,5 +74,13 @@ 
 			status = "disabled";
 			/* No CD or WP GPIOs */
 		};
+
+		usb@d0050000 {
+			status = "okay";
+		};
+
+		usb@d0051000 {
+			status = "okay";
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 1864820..dd0c57d 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -62,5 +62,13 @@ 
 			 * Wifi/Bluetooth chip
 			 */
 		};
+
+		usb@d0050000 {
+			status = "okay";
+		};
+
+		usb@d0051000 {
+			status = "okay";
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index c7035c5..c84e1fe 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -97,5 +97,17 @@ 
 			status = "okay";
 			/* No CD or WP GPIOs */
 		};
+
+		usb@d0050000 {
+			status = "okay";
+		};
+
+		usb@d0051000 {
+			status = "okay";
+		};
+
+		usb@d0052000 {
+			status = "okay";
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index ec36864..3818a82 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -133,5 +133,11 @@ 
 			nr-ports = <2>;
 			status = "okay";
 		};
+		usb@d0050000 {
+			status = "okay";
+		};
+		usb@d0051000 {
+			status = "okay";
+		};
 	};
 };