diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-03-09 16:45:26 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-26 09:57:14 -0400 |
commit | da2827a298f8a2159f31466759cbba2dd4f1b65f (patch) | |
tree | 1d937a68ed149e71100ca1872bca94ab943ecb99 | |
parent | a9762b704f5d5e167bbc261573621782b90efbc4 (diff) |
usb: isp1362: remove blackfin arch glue
The blackfin architecture is getting removed, and this is the last
remaining architecture specific setting, so the various hacks
can be removed now.
From all I can tell, there are no remaining in-tree users of the
driver, but it could be used by out-of-tree platform ports.
I've marked the driver as 'depends on COMPILE_TEST', short of
removing it outright.
It was originally written for some ARM PXA machines using the same
chip, but that platform never really worked and the code has been
removed a long time ago.
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Aaron Wu <aaron.wu@analog.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | drivers/usb/host/Kconfig | 1 | ||||
-rw-r--r-- | drivers/usb/host/isp1362.h | 46 |
2 files changed, 1 insertions, 46 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 4fcfb3084b36..b85822f0c874 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -360,6 +360,7 @@ config USB_ISP116X_HCD | |||
360 | config USB_ISP1362_HCD | 360 | config USB_ISP1362_HCD |
361 | tristate "ISP1362 HCD support" | 361 | tristate "ISP1362 HCD support" |
362 | depends on HAS_IOMEM | 362 | depends on HAS_IOMEM |
363 | depends on COMPILE_TEST # nothing uses this | ||
363 | ---help--- | 364 | ---help--- |
364 | Supports the Philips ISP1362 chip as a host controller | 365 | Supports the Philips ISP1362 chip as a host controller |
365 | 366 | ||
diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h index da79e36ced89..650240846ee2 100644 --- a/drivers/usb/host/isp1362.h +++ b/drivers/usb/host/isp1362.h | |||
@@ -6,49 +6,6 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | /* ------------------------------------------------------------------------- */ | 8 | /* ------------------------------------------------------------------------- */ |
9 | /* | ||
10 | * Platform specific compile time options | ||
11 | */ | ||
12 | #if defined(CONFIG_BLACKFIN) | ||
13 | |||
14 | #include <linux/io.h> | ||
15 | #define USE_32BIT 0 | ||
16 | #define MAX_ROOT_PORTS 2 | ||
17 | #define USE_PLATFORM_DELAY 0 | ||
18 | #define USE_NDELAY 1 | ||
19 | |||
20 | #define DUMMY_DELAY_ACCESS \ | ||
21 | do { \ | ||
22 | bfin_read16(ASYNC_BANK0_BASE); \ | ||
23 | bfin_read16(ASYNC_BANK0_BASE); \ | ||
24 | bfin_read16(ASYNC_BANK0_BASE); \ | ||
25 | } while (0) | ||
26 | |||
27 | #undef insw | ||
28 | #undef outsw | ||
29 | |||
30 | #define insw delayed_insw | ||
31 | #define outsw delayed_outsw | ||
32 | |||
33 | static inline void delayed_outsw(unsigned int addr, void *buf, int len) | ||
34 | { | ||
35 | unsigned short *bp = (unsigned short *)buf; | ||
36 | while (len--) { | ||
37 | DUMMY_DELAY_ACCESS; | ||
38 | outw(*bp++, addr); | ||
39 | } | ||
40 | } | ||
41 | |||
42 | static inline void delayed_insw(unsigned int addr, void *buf, int len) | ||
43 | { | ||
44 | unsigned short *bp = (unsigned short *)buf; | ||
45 | while (len--) { | ||
46 | DUMMY_DELAY_ACCESS; | ||
47 | *bp++ = inw(addr); | ||
48 | } | ||
49 | } | ||
50 | |||
51 | #else | ||
52 | 9 | ||
53 | #define MAX_ROOT_PORTS 2 | 10 | #define MAX_ROOT_PORTS 2 |
54 | 11 | ||
@@ -60,9 +17,6 @@ static inline void delayed_insw(unsigned int addr, void *buf, int len) | |||
60 | 17 | ||
61 | #define DUMMY_DELAY_ACCESS do {} while (0) | 18 | #define DUMMY_DELAY_ACCESS do {} while (0) |
62 | 19 | ||
63 | #endif | ||
64 | |||
65 | |||
66 | /* ------------------------------------------------------------------------- */ | 20 | /* ------------------------------------------------------------------------- */ |
67 | 21 | ||
68 | #define USB_RESET_WIDTH 50 | 22 | #define USB_RESET_WIDTH 50 |