Message ID | 1351588973-20699-6-git-send-email-dev@lynxeye.de |
---|---|
State | Superseded |
Delegated to: | Marek Vasut |
Headers | show |
Hi Lucas, On Tue, Oct 30, 2012 at 2:22 AM, Lucas Stach <dev@lynxeye.de> wrote: > Remove unneeded headers, function prototype and stale comment. > > 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 Dateien geändert, 1 Zeile hinzugefügt(+), 15 Zeilen entfernt(-) > > diff --git a/arch/arm/cpu/armv7/tegra20/usb.c b/arch/arm/cpu/armv7/tegra20/usb.c > index e372b8b..2cc95d2 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 > > @@ -188,11 +182,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. > - */ How did this get resolved? > } > > /* 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); > - Everything else looks good. > /* Setup USB on the board */ > int board_usb_init(const void *blob); > > -- > 1.7.11.7 > Regards, Simon
diff --git a/arch/arm/cpu/armv7/tegra20/usb.c b/arch/arm/cpu/armv7/tegra20/usb.c index e372b8b..2cc95d2 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 @@ -188,11 +182,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);
Remove unneeded headers, function prototype and stale comment. 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 Dateien geändert, 1 Zeile hinzugefügt(+), 15 Zeilen entfernt(-)