Patchwork [U-Boot,v2,5/7] tegra: usb: various small cleanups

login
register
mail settings
Submitter Lucas Stach
Date Jan. 25, 2013, 2:41 p.m.
Message ID <1359124871-4434-6-git-send-email-dev@lynxeye.de>
Download mbox | patch
Permalink /patch/215757/
State Superseded
Delegated to: Tom Warren
Headers show

Comments

Lucas Stach - Jan. 25, 2013, 2:41 p.m.
Remove unneeded headers, function prototype and stale comment, that
doesn't match the actual codebase anymore.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
 arch/arm/cpu/armv7/tegra20/usb.c        | 13 +------------
 arch/arm/include/asm/arch-tegra20/usb.h |  3 ---
 2 files changed, 1 insertion(+), 15 deletions(-)
Simon Glass - Jan. 25, 2013, 9:23 p.m.
On Sat, Jan 26, 2013 at 3:41 AM, Lucas Stach <dev@lynxeye.de> wrote:
> Remove unneeded headers, function prototype and stale comment, that
> doesn't match the actual codebase anymore.
>
> Signed-off-by: Lucas Stach <dev@lynxeye.de>

Acked-by: Simon Glass <sjg@chromium.org>

> ---
>  arch/arm/cpu/armv7/tegra20/usb.c        | 13 +------------
>  arch/arm/include/asm/arch-tegra20/usb.h |  3 ---
>  2 files changed, 1 insertion(+), 15 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/tegra20/usb.c b/arch/arm/cpu/armv7/tegra20/usb.c
> index e4165e0..3fdd5df 100644
> --- a/arch/arm/cpu/armv7/tegra20/usb.c
> +++ b/arch/arm/cpu/armv7/tegra20/usb.c
> @@ -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 */
> diff --git a/arch/arm/include/asm/arch-tegra20/usb.h b/arch/arm/include/asm/arch-tegra20/usb.h
> index fdbd127..b18c850 100644
> --- a/arch/arm/include/asm/arch-tegra20/usb.h
> +++ b/arch/arm/include/asm/arch-tegra20/usb.h
> @@ -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
>

Patch

diff --git a/arch/arm/cpu/armv7/tegra20/usb.c b/arch/arm/cpu/armv7/tegra20/usb.c
index e4165e0..3fdd5df 100644
--- a/arch/arm/cpu/armv7/tegra20/usb.c
+++ b/arch/arm/cpu/armv7/tegra20/usb.c
@@ -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 */
diff --git a/arch/arm/include/asm/arch-tegra20/usb.h b/arch/arm/include/asm/arch-tegra20/usb.h
index fdbd127..b18c850 100644
--- a/arch/arm/include/asm/arch-tegra20/usb.h
+++ b/arch/arm/include/asm/arch-tegra20/usb.h
@@ -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);