openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: OMAP1: USB: delete redundant CPU class checks 

Delete redundant CPU class checks. This code is only used
on OMAP1 nowadays.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Aaro Koskinen 2017-01-02 22:57:05 +02:00 committed by Tony Lindgren
parent bde49e5928
commit 4d94b4a239
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/arm/mach-omap1/usb.c
View File

@ -1,5 +1,5 @@
/* /*
* Platform level USB initialization for FS USB OTG controller on omap1 and 24xx * Platform level USB initialization for FS USB OTG controller on omap1
* *
* Copyright (C) 2004 Texas Instruments, Inc. * Copyright (C) 2004 Texas Instruments, Inc.
* *
@ -63,6 +63,7 @@ omap_otg_init(struct omap_usb_config *config)
{ {
u32 syscon; u32 syscon;
int alt_pingroup = 0; int alt_pingroup = 0;
u16 w;
/* NOTE: no bus or clock setup (yet?) */ /* NOTE: no bus or clock setup (yet?) */
@ -87,9 +88,8 @@ omap_otg_init(struct omap_usb_config *config)
if (config->otg) if (config->otg)
syscon |= OTG_EN; syscon |= OTG_EN;
#endif #endif
if (cpu_class_is_omap1()) pr_debug("USB_TRANSCEIVER_CTRL = %03x\n",
pr_debug("USB_TRANSCEIVER_CTRL = %03x\n", omap_readl(USB_TRANSCEIVER_CTRL));
omap_readl(USB_TRANSCEIVER_CTRL));
pr_debug("OTG_SYSCON_2 = %08x\n", omap_readl(OTG_SYSCON_2)); pr_debug("OTG_SYSCON_2 = %08x\n", omap_readl(OTG_SYSCON_2));
omap_writel(syscon, OTG_SYSCON_2); omap_writel(syscon, OTG_SYSCON_2);
@ -107,19 +107,16 @@ omap_otg_init(struct omap_usb_config *config)
pr_cont(", Mini-AB on usb%d", config->otg - 1); pr_cont(", Mini-AB on usb%d", config->otg - 1);
pr_cont("\n"); pr_cont("\n");
if (cpu_class_is_omap1()) { /* leave USB clocks/controllers off until needed */
u16 w; w = omap_readw(ULPD_SOFT_REQ);
w &= ~SOFT_USB_CLK_REQ;
omap_writew(w, ULPD_SOFT_REQ);
/* leave USB clocks/controllers off until needed */ w = omap_readw(ULPD_CLOCK_CTRL);
w = omap_readw(ULPD_SOFT_REQ); w &= ~USB_MCLK_EN;
w &= ~SOFT_USB_CLK_REQ; w |= DIS_USB_PVCI_CLK;
omap_writew(w, ULPD_SOFT_REQ); omap_writew(w, ULPD_CLOCK_CTRL);
w = omap_readw(ULPD_CLOCK_CTRL);
w &= ~USB_MCLK_EN;
w |= DIS_USB_PVCI_CLK;
omap_writew(w, ULPD_CLOCK_CTRL);
}
syscon = omap_readl(OTG_SYSCON_1); syscon = omap_readl(OTG_SYSCON_1);
syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN; syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN;