Move Tegra EHCI drive to correct place

Both Tegra20 and Tegra30 have a max of 3 USB controllers.

Signed-off-by Lucas Stach <[email protected]>

---
 arch/arm/cpu/armv7/tegra20/usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/cpu/armv7/tegra20/usb.c +1 -2

index 1bccf2b..f151fb2 100644
@@ -44,7 +44,7 @@
 #endif
 
 enum {
-       USB_PORTS_MAX   = 4,                    /* Maximum ports we allow */
+       USB_PORTS_MAX   = 3,            /* Maximum ports we allow */
 };
 
 /* Parameters we need for USB */
--

1.8.0.2

There is no need to pass around all those parameters. The init functions are able to easily extract all the needed setup info on their own.

Signed-off-by Lucas Stach <[email protected]>

---
To clarify why this is a good thing an excerpt from the first round of review:
"The intent of this patch is not really to save up on parameters passed, but to make it possible to later move out the controller initialization into the ehci_hcd_init function without having to save away this global state for later use[,thus avoid bloating the file global state]."

---
 arch/arm/cpu/armv7/tegra20/usb.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

arch/arm/cpu/armv7/tegra20/usb.c +12 -13

index f151fb2..07c1ade 100644
@@ -198,11 +198,12 @@ void usbf_reset_controller(struct fdt_usb *config, struct usb_ctlr *usbctlr)
 }
 
 /* set up the UTMI USB controller with the parameters provided */
-static int init_utmi_usb_controller(struct fdt_usb *config,
-                               struct usb_ctlr *usbctlr, const u32 timing[])
+static int init_utmi_usb_controller(struct fdt_usb *config)
 {
        u32 val;
        int loop_count;
+       const unsigned *timing;
+       struct usb_ctlr *usbctlr = config->reg;
 
        clock_enable(config->periph_id);
 

@@ -229,6 +230,8 @@ static int init_utmi_usb_controller(struct fdt_usb *config,
         * PLL Delay CONFIGURATION settings. The following parameters control
         * the bring up of the plls.
         */
+       timing = usb_pll[clock_get_osc_freq()];
+
        val = readl(&usbctlr->utmip_misc_cfg1);
        clrsetbits_le32(&val, UTMIP_PLLU_STABLE_COUNT_MASK,
                timing[PARAM_STABLE_COUNT] << UTMIP_PLLU_STABLE_COUNT_SHIFT);

@@ -331,12 +334,12 @@ static int init_utmi_usb_controller(struct fdt_usb *config,
 #endif
 
 /* set up the ULPI USB controller with the parameters provided */
-static int init_ulpi_usb_controller(struct fdt_usb *config,
-                               struct usb_ctlr *usbctlr)
+static int init_ulpi_usb_controller(struct fdt_usb *config)
 {
        u32 val;
        int loop_count;
        struct ulpi_viewport ulpi_vp;
+       struct usb_ctlr *usbctlr = config->reg;
 
        /* set up ULPI reference clock on pllp_out4 */
        clock_enable(PERIPH_ID_DEV2_OUT);

@@ -408,8 +411,7 @@ static int init_ulpi_usb_controller(struct fdt_usb *config,
        return 0;
 }
 #else
-static int init_ulpi_usb_controller(struct fdt_usb *config,
-                               struct usb_ctlr *usbctlr)
+static int init_ulpi_usb_controller(struct fdt_usb *config)
 {
        printf("No code to set up ULPI controller, please enable"
                        "CONFIG_USB_ULPI and CONFIG_USB_ULPI_VIEWPORT");

@@ -430,22 +432,20 @@ static void config_clock(const u32 timing[])
  * @param config       USB port configuration
  * @return 0 if ok, -1 if error (too many ports)
  */
-static int add_port(struct fdt_usb *config, const u32 timing[])
+static int add_port(struct fdt_usb *config)
 {
-       struct usb_ctlr *usbctlr = config->reg;
-
        if (port_count == USB_PORTS_MAX) {
                printf("tegrausb: Cannot register more than %d ports\n",
                      USB_PORTS_MAX);
                return -1;
        }
 
-       if (config->utmi && init_utmi_usb_controller(config, usbctlr, timing)) {
+       if (config->utmi && init_utmi_usb_controller(config)) {
                printf("tegrausb: Cannot init port\n");
                return -1;
        }
 
-       if (config->ulpi && init_ulpi_usb_controller(config, usbctlr)) {
+       if (config->ulpi && init_ulpi_usb_controller(config)) {
                printf("tegrausb: Cannot init port\n");
                return -1;
        }

@@ -558,7 +558,7 @@ int board_usb_init(const void *blob)
                        return -1;
                }
 
-               if (add_port(&config, usb_pll[freq]))
+               if (add_port(&config))
                        return -1;
                set_host_mode(&config);
        }
--

1.8.0.2

There is no need to init a USB controller before the upper layers indicate that they are actually going to use it.

board_usb_init now only parses the device tree and sets up the common pll.

Signed-off-by Lucas Stach <[email protected]>

Remove unneeded headers, function prototype and stale comment, that doesn't match the actual codebase anymore.

Signed-off-by Lucas Stach <[email protected]>

---
 arch/arm/cpu/armv7/tegra20/usb.c        | 13 +------------
 arch/arm/include/asm/arch-tegra20/usb.h |  3 ---
 2 files changed, 1 insertion(+), 15 deletions(-)

arch/arm/cpu/armv7/tegra20/usb.c +1 -12

index e4165e0..3fdd5df 100644
@@ -25,21 +25,15 @@
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/pinmux.h>
-#include <asm/arch/tegra.h>
 #include <asm/arch/usb.h>
 #include <usb/ulpi.h>
-#include <asm/arch-tegra/clk_rst.h>
-#include <asm/arch-tegra/sys_proto.h>
-#include <asm/arch-tegra/uart.h>
 #include <libfdt.h>
 #include <fdtdec.h>
 
 #ifdef CONFIG_USB_ULPI
        #ifndef CONFIG_USB_ULPI_VIEWPORT
        #error  "To use CONFIG_USB_ULPI on Tegra Boards you have to also \
-                       define CONFIG_USB_ULPI_VIEWPORT"
+               define CONFIG_USB_ULPI_VIEWPORT"
        #endif
 #endif
 

@@ -191,11 +185,6 @@ void usbf_reset_controller(struct fdt_usb *config, struct usb_ctlr *usbctlr)
        /* Enable the UTMIP PHY */
        if (config->utmi)
                setbits_le32(&usbctlr->susp_ctrl, UTMIP_PHY_ENB);
-
-       /*
-        * TODO: where do we take the USB1 out of reset? The old code would
-        * take USB3 out of reset, but not USB1. This code doesn't do either.
-        */
 }
 
 /* set up the UTMI USB controller with the parameters provided */

arch/arm/include/asm/arch-tegra20/usb.h +0 -4

index fdbd127..b18c850 100644
@@ -243,9 +243,6 @@ struct usb_ctlr {
 #define VBUS_VLD_STS                   (1 << 26)
 
 
-/* Change the USB host port into host mode */
-void usb_set_host_mode(void);
-
 /* Setup USB on the board */
 int board_usb_init(const void *blob);
 
--

1.8.0.2

This moves the Tegra USB implementation into the drivers/usb/host directory. Note that this merges the old /arch/arm/cpu/armv7/tegra20/usb.c file into ehci-tegra.c. No code changes, just moving stuff around.

v2: While at it also move some defines and the usb.h header file to make usb driver usable for Tegra30.
NOTE: A lot more work is required to properly init the PHYs and PLL_U on Tegra30, this is just to make porting easier and it does no harm here.

Signed-off-by Lucas Stach <[email protected]>

---
 arch/arm/cpu/armv7/tegra20/Makefile                |   1 -
 arch/arm/cpu/armv7/tegra20/usb.c                   | 555 ---------------------
 .../include/asm/{arch-tegra20 => arch-tegra}/usb.h |   0
 arch/arm/include/asm/arch-tegra20/tegra.h          |   1 -
 arch/arm/include/asm/arch-tegra30/tegra.h          |   2 +
 board/nvidia/common/board.c                        |   2 +-
 drivers/usb/host/ehci-tegra.c                      | 535 +++++++++++++++++++-
 7 files changed, 536 insertions(+), 560 deletions(-)
 delete mode 100644 arch/arm/cpu/armv7/tegra20/usb.c
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/usb.h (100%)

The ehci_hcd entry points were just calling into the Tegra USB functions. Now that they are in the same file we can just move over the implementation.

Signed-off-by Lucas Stach <[email protected]>

---
 arch/arm/include/asm/arch-tegra/usb.h |  19 ------
 drivers/usb/host/ehci-tegra.c         | 119 +++++++++++++++-------------------
 2 files changed, 51 insertions(+), 87 deletions(-)

I tried to apply this to u-boot-tegra/next and it needed some massaging to get it to apply cleanly. Minor stuff, but you'll need to rebase it on top of current u-boot-tegra/next (I just pushed a new version with my 'Move common clock code' patch and Allen's fix for the DTS sort patch. Sorry, but the Tegra repo is going to be fairly dynamic for the next few weeks.

Also, when I did get it applied and tried to ./MAKEALL -s tegra20 -s tegra30, I got the following warning on all T20 builds:

ehci-tegra.c: In function 'ehci_hcd_init':
ehci-tegra.c:565: warning: assignment makes pointer from integer without a cast ehci-tegra.c:566: warning: assignment makes pointer from integer without a cast

Also, it appears that arch-tegra20/usb.h is still hanging around (in my edited patch series, at any rate). Shouldn't the moved arch-tegra/usb.h be used exclusively? Removing arch-tegra20/usb.h causes fatal errors in nvidia/common/board.c. If it does need to exist, then it needs to live in arch-tegra30, also, so it'll be available when T30 gets USB turned on.

This moves out the Tegra EHCI driver from a platform specific directory to the standard driver/usb/host dir.

This is a preparation needed to share this driver between Tegra20 and Tegra30. No functional change in here, so Tegra30 is still not working.

Patch 6 could be a lot smaller if it were generated with -B, as GIT would detect that most of it is moving stuff over, but last time I did this it prevented git apply to work. So sorry for the big diff.

I think I incorporated all changes needed to reflect the review feedback I got on this last time.

I expect this series to go in through the Tegra tree.

Dear Lucas Stach,

Quoted 10 lines

This moves out the Tegra EHCI driver from a platform specific directory to the standard driver/usb/host dir.

This is a preparation needed to share this driver between Tegra20 and Tegra30. No functional change in here, so Tegra30 is still not working.

Patch 6 could be a lot smaller if it were generated with -B, as GIT would detect that most of it is moving stuff over, but last time I did this it prevented git apply to work. So sorry for the big diff.

Quoted 4 lines

I think I incorporated all changes needed to reflect the review feedback I got on this last time.

I expect this series to go in through the Tegra tree.

Last two don't apply, I applied first five and pushed.

Quoted 15 lines

Dear Lucas Stach,

Quoted 13 lines

This moves out the Tegra EHCI driver from a platform specific directory to the standard driver/usb/host dir.

This is a preparation needed to share this driver between Tegra20 and Tegra30. No functional change in here, so Tegra30 is still not working.

Patch 6 could be a lot smaller if it were generated with -B, as GIT would detect that most of it is moving stuff over, but last time I did this it prevented git apply to work. So sorry for the big diff.

I think I incorporated all changes needed to reflect the review feedback I got on this last time.

Quoted 3 lines

Quoted 1 line

I expect this series to go in through the Tegra tree.

Last two don't apply, I applied first five and pushed.

Marek, what about any conflicts this will cause with other patches in the Tegra tree? Especially since Lucas *explicitly* stated that he expected the series to go through the Tegra tree, I expect that some co-ordination is required here

Dear Stephen Warren,

Quoted 20 lines · Marek Vasut

Quoted 18 lines

Dear Lucas Stach,

Quoted 6 lines

This moves out the Tegra EHCI driver from a platform specific directory to the standard driver/usb/host dir.

This is a preparation needed to share this driver between Tegra20 and Tegra30. No functional change in here, so Tegra30 is still not working.

Quoted 8 lines

Patch 6 could be a lot smaller if it were generated with -B, as GIT would detect that most of it is moving stuff over, but last time I did this it prevented git apply to work. So sorry for the big diff.

I think I incorporated all changes needed to reflect the review feedback I got on this last time.

I expect this series to go in through the Tegra tree.

Last two don't apply, I applied first five and pushed.

Quoted 4 lines

Marek, what about any conflicts this will cause with other patches in the Tegra tree? Especially since Lucas *explicitly* stated that he expected the series to go through the Tegra tree, I expect that some co-ordination is required here

Ok, I can drop them from -USB, will you pick them ? I must have missed that part.

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Sunday, January 27, 2013 4:49 PM
To: Stephen Warren
Cc: Lucas Stach; u-boot at lists.denx.de; Tom Warren; Simon Glass
Subject: Re: [PATCH v2 0/7] Move Tegra EHCI drive to correct place

Dear Stephen Warren,

Quoted 8 lines · Marek Vasut

Quoted 7 lines

Dear Lucas Stach,

Quoted 5 lines

This moves out the Tegra EHCI driver from a platform specific directory to the standard driver/usb/host dir.

This is a preparation needed to share this driver between Tegra20 and Tegra30. No functional change in here, so Tegra30 is still not

working.

Quoted 12 lines

Quoted 11 lines

Quoted 9 lines

Patch 6 could be a lot smaller if it were generated with -B, as GIT would detect that most of it is moving stuff over, but last time I did this it prevented git apply to work. So sorry for the big diff.

I think I incorporated all changes needed to reflect the review feedback I got on this last time.

I expect this series to go in through the Tegra tree.

Last two don't apply, I applied first five and pushed.

Quoted 4 lines

Marek, what about any conflicts this will cause with other patches in the Tegra tree? Especially since Lucas *explicitly* stated that he expected the series to go through the Tegra tree, I expect that some co-ordination is required here

Ok, I can drop them from -USB, will you pick them ? I must have missed that part.

If nothing else, 01-05 build-test cleanly ;-)

Best regards,
Marek Vasut