diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/Kconfig | 7 | ||||
-rw-r--r-- | arch/mips/ath79/Kconfig | 8 | ||||
-rw-r--r-- | arch/mips/ralink/Kconfig | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/Kconfig | 2 | ||||
-rw-r--r-- | arch/sh/Kconfig | 9 |
11 files changed, 0 insertions, 44 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e25419817791..e607f08b30f7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -534,7 +534,6 @@ config ARCH_DOVE | |||
534 | select PINCTRL | 534 | select PINCTRL |
535 | select PINCTRL_DOVE | 535 | select PINCTRL_DOVE |
536 | select PLAT_ORION_LEGACY | 536 | select PLAT_ORION_LEGACY |
537 | select USB_ARCH_HAS_EHCI | ||
538 | help | 537 | help |
539 | Support for the Marvell Dove SoC 88AP510 | 538 | Support for the Marvell Dove SoC 88AP510 |
540 | 539 | ||
@@ -633,7 +632,6 @@ config ARCH_LPC32XX | |||
633 | select GENERIC_CLOCKEVENTS | 632 | select GENERIC_CLOCKEVENTS |
634 | select HAVE_IDE | 633 | select HAVE_IDE |
635 | select HAVE_PWM | 634 | select HAVE_PWM |
636 | select USB_ARCH_HAS_OHCI | ||
637 | select USE_OF | 635 | select USE_OF |
638 | help | 636 | help |
639 | Support for the NXP LPC32XX family of processors | 637 | Support for the NXP LPC32XX family of processors |
@@ -770,7 +768,6 @@ config ARCH_S3C64XX | |||
770 | select SAMSUNG_ATAGS | 768 | select SAMSUNG_ATAGS |
771 | select SAMSUNG_WAKEMASK | 769 | select SAMSUNG_WAKEMASK |
772 | select SAMSUNG_WDT_RESET | 770 | select SAMSUNG_WDT_RESET |
773 | select USB_ARCH_HAS_OHCI | ||
774 | help | 771 | help |
775 | Samsung S3C64XX series based systems | 772 | Samsung S3C64XX series based systems |
776 | 773 | ||
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 4c414af75ef0..8d197dcdd2c0 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -36,7 +36,6 @@ config ARCH_EXYNOS5 | |||
36 | select HAVE_ARM_SCU if SMP | 36 | select HAVE_ARM_SCU if SMP |
37 | select HAVE_SMP | 37 | select HAVE_SMP |
38 | select PINCTRL | 38 | select PINCTRL |
39 | select USB_ARCH_HAS_XHCI | ||
40 | help | 39 | help |
41 | Samsung EXYNOS5 (Cortex-A15) SoC based systems | 40 | Samsung EXYNOS5 (Cortex-A15) SoC based systems |
42 | 41 | ||
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index e2ce4f8366a7..5463b2521dac 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -21,7 +21,6 @@ config ARCH_OMAP3 | |||
21 | select PM_OPP if PM | 21 | select PM_OPP if PM |
22 | select PM_RUNTIME if CPU_IDLE | 22 | select PM_RUNTIME if CPU_IDLE |
23 | select SOC_HAS_OMAP2_SDRC | 23 | select SOC_HAS_OMAP2_SDRC |
24 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
25 | 24 | ||
26 | config ARCH_OMAP4 | 25 | config ARCH_OMAP4 |
27 | bool "TI OMAP4" | 26 | bool "TI OMAP4" |
@@ -42,7 +41,6 @@ config ARCH_OMAP4 | |||
42 | select PL310_ERRATA_727915 | 41 | select PL310_ERRATA_727915 |
43 | select PM_OPP if PM | 42 | select PM_OPP if PM |
44 | select PM_RUNTIME if CPU_IDLE | 43 | select PM_RUNTIME if CPU_IDLE |
45 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
46 | select ARM_ERRATA_754322 | 44 | select ARM_ERRATA_754322 |
47 | select ARM_ERRATA_775420 | 45 | select ARM_ERRATA_775420 |
48 | 46 | ||
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 05fa505df585..a06590237209 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -102,8 +102,6 @@ config ARCH_R8A7778 | |||
102 | select CPU_V7 | 102 | select CPU_V7 |
103 | select SH_CLK_CPG | 103 | select SH_CLK_CPG |
104 | select ARM_GIC | 104 | select ARM_GIC |
105 | select USB_ARCH_HAS_EHCI | ||
106 | select USB_ARCH_HAS_OHCI | ||
107 | 105 | ||
108 | config ARCH_R8A7779 | 106 | config ARCH_R8A7779 |
109 | bool "R-Car H1 (R8A77790)" | 107 | bool "R-Car H1 (R8A77790)" |
@@ -111,8 +109,6 @@ config ARCH_R8A7779 | |||
111 | select ARM_GIC | 109 | select ARM_GIC |
112 | select CPU_V7 | 110 | select CPU_V7 |
113 | select SH_CLK_CPG | 111 | select SH_CLK_CPG |
114 | select USB_ARCH_HAS_EHCI | ||
115 | select USB_ARCH_HAS_OHCI | ||
116 | select RENESAS_INTC_IRQPIN | 112 | select RENESAS_INTC_IRQPIN |
117 | 113 | ||
118 | config ARCH_R8A7790 | 114 | config ARCH_R8A7790 |
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index b1232d8be6f5..4926bd11f190 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
@@ -19,7 +19,6 @@ config ARCH_TEGRA | |||
19 | select RESET_CONTROLLER | 19 | select RESET_CONTROLLER |
20 | select SOC_BUS | 20 | select SOC_BUS |
21 | select SPARSE_IRQ | 21 | select SPARSE_IRQ |
22 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
23 | select USB_ULPI if USB_PHY | 22 | select USB_ULPI if USB_PHY |
24 | select USB_ULPI_VIEWPORT if USB_PHY | 23 | select USB_ULPI_VIEWPORT if USB_PHY |
25 | select USE_OF | 24 | select USE_OF |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index dcae3a7035db..ba7fe4003653 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -67,8 +67,6 @@ config MIPS_ALCHEMY | |||
67 | select SYS_SUPPORTS_APM_EMULATION | 67 | select SYS_SUPPORTS_APM_EMULATION |
68 | select ARCH_REQUIRE_GPIOLIB | 68 | select ARCH_REQUIRE_GPIOLIB |
69 | select SYS_SUPPORTS_ZBOOT | 69 | select SYS_SUPPORTS_ZBOOT |
70 | select USB_ARCH_HAS_OHCI | ||
71 | select USB_ARCH_HAS_EHCI | ||
72 | 70 | ||
73 | config AR7 | 71 | config AR7 |
74 | bool "Texas Instruments AR7" | 72 | bool "Texas Instruments AR7" |
@@ -360,7 +358,6 @@ config MIPS_SEAD3 | |||
360 | select SYS_SUPPORTS_LITTLE_ENDIAN | 358 | select SYS_SUPPORTS_LITTLE_ENDIAN |
361 | select SYS_SUPPORTS_SMARTMIPS | 359 | select SYS_SUPPORTS_SMARTMIPS |
362 | select SYS_SUPPORTS_MICROMIPS | 360 | select SYS_SUPPORTS_MICROMIPS |
363 | select USB_ARCH_HAS_EHCI | ||
364 | select USB_EHCI_BIG_ENDIAN_DESC | 361 | select USB_EHCI_BIG_ENDIAN_DESC |
365 | select USB_EHCI_BIG_ENDIAN_MMIO | 362 | select USB_EHCI_BIG_ENDIAN_MMIO |
366 | select USE_OF | 363 | select USE_OF |
@@ -718,8 +715,6 @@ config CAVIUM_OCTEON_SOC | |||
718 | select SWAP_IO_SPACE | 715 | select SWAP_IO_SPACE |
719 | select HW_HAS_PCI | 716 | select HW_HAS_PCI |
720 | select ZONE_DMA32 | 717 | select ZONE_DMA32 |
721 | select USB_ARCH_HAS_OHCI | ||
722 | select USB_ARCH_HAS_EHCI | ||
723 | select HOLES_IN_ZONE | 718 | select HOLES_IN_ZONE |
724 | select ARCH_REQUIRE_GPIOLIB | 719 | select ARCH_REQUIRE_GPIOLIB |
725 | help | 720 | help |
@@ -756,8 +751,6 @@ config NLM_XLR_BOARD | |||
756 | select ZONE_DMA32 if 64BIT | 751 | select ZONE_DMA32 if 64BIT |
757 | select SYNC_R4K | 752 | select SYNC_R4K |
758 | select SYS_HAS_EARLY_PRINTK | 753 | select SYS_HAS_EARLY_PRINTK |
759 | select USB_ARCH_HAS_OHCI if USB_SUPPORT | ||
760 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
761 | select SYS_SUPPORTS_ZBOOT | 754 | select SYS_SUPPORTS_ZBOOT |
762 | select SYS_SUPPORTS_ZBOOT_UART16550 | 755 | select SYS_SUPPORTS_ZBOOT_UART16550 |
763 | help | 756 | help |
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig index 3995e31a73e2..dfc60209dc63 100644 --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig | |||
@@ -74,34 +74,26 @@ config ATH79_MACH_UBNT_XM | |||
74 | endmenu | 74 | endmenu |
75 | 75 | ||
76 | config SOC_AR71XX | 76 | config SOC_AR71XX |
77 | select USB_ARCH_HAS_EHCI | ||
78 | select USB_ARCH_HAS_OHCI | ||
79 | select HW_HAS_PCI | 77 | select HW_HAS_PCI |
80 | def_bool n | 78 | def_bool n |
81 | 79 | ||
82 | config SOC_AR724X | 80 | config SOC_AR724X |
83 | select USB_ARCH_HAS_EHCI | ||
84 | select USB_ARCH_HAS_OHCI | ||
85 | select HW_HAS_PCI | 81 | select HW_HAS_PCI |
86 | select PCI_AR724X if PCI | 82 | select PCI_AR724X if PCI |
87 | def_bool n | 83 | def_bool n |
88 | 84 | ||
89 | config SOC_AR913X | 85 | config SOC_AR913X |
90 | select USB_ARCH_HAS_EHCI | ||
91 | def_bool n | 86 | def_bool n |
92 | 87 | ||
93 | config SOC_AR933X | 88 | config SOC_AR933X |
94 | select USB_ARCH_HAS_EHCI | ||
95 | def_bool n | 89 | def_bool n |
96 | 90 | ||
97 | config SOC_AR934X | 91 | config SOC_AR934X |
98 | select USB_ARCH_HAS_EHCI | ||
99 | select HW_HAS_PCI | 92 | select HW_HAS_PCI |
100 | select PCI_AR724X if PCI | 93 | select PCI_AR724X if PCI |
101 | def_bool n | 94 | def_bool n |
102 | 95 | ||
103 | config SOC_QCA955X | 96 | config SOC_QCA955X |
104 | select USB_ARCH_HAS_EHCI | ||
105 | select HW_HAS_PCI | 97 | select HW_HAS_PCI |
106 | select PCI_AR724X if PCI | 98 | select PCI_AR724X if PCI |
107 | def_bool n | 99 | def_bool n |
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig index 1bfd1c17b3c2..4a296655f446 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig | |||
@@ -20,19 +20,13 @@ choice | |||
20 | config SOC_RT305X | 20 | config SOC_RT305X |
21 | bool "RT305x" | 21 | bool "RT305x" |
22 | select USB_ARCH_HAS_HCD | 22 | select USB_ARCH_HAS_HCD |
23 | select USB_ARCH_HAS_OHCI | ||
24 | select USB_ARCH_HAS_EHCI | ||
25 | 23 | ||
26 | config SOC_RT3883 | 24 | config SOC_RT3883 |
27 | bool "RT3883" | 25 | bool "RT3883" |
28 | select USB_ARCH_HAS_OHCI | ||
29 | select USB_ARCH_HAS_EHCI | ||
30 | select HW_HAS_PCI | 26 | select HW_HAS_PCI |
31 | 27 | ||
32 | config SOC_MT7620 | 28 | config SOC_MT7620 |
33 | bool "MT7620" | 29 | bool "MT7620" |
34 | select USB_ARCH_HAS_OHCI | ||
35 | select USB_ARCH_HAS_EHCI | ||
36 | 30 | ||
37 | endchoice | 31 | endchoice |
38 | 32 | ||
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index d6c7506ec7d9..dc1a264ec6e6 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig | |||
@@ -265,7 +265,6 @@ config 440EP | |||
265 | select PPC_FPU | 265 | select PPC_FPU |
266 | select IBM440EP_ERR42 | 266 | select IBM440EP_ERR42 |
267 | select IBM_EMAC_ZMII | 267 | select IBM_EMAC_ZMII |
268 | select USB_ARCH_HAS_OHCI | ||
269 | 268 | ||
270 | config 440EPX | 269 | config 440EPX |
271 | bool | 270 | bool |
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig index e87c19473973..56f274064d6c 100644 --- a/arch/powerpc/platforms/ps3/Kconfig +++ b/arch/powerpc/platforms/ps3/Kconfig | |||
@@ -2,10 +2,8 @@ config PPC_PS3 | |||
2 | bool "Sony PS3" | 2 | bool "Sony PS3" |
3 | depends on PPC64 && PPC_BOOK3S | 3 | depends on PPC64 && PPC_BOOK3S |
4 | select PPC_CELL | 4 | select PPC_CELL |
5 | select USB_ARCH_HAS_OHCI | ||
6 | select USB_OHCI_LITTLE_ENDIAN | 5 | select USB_OHCI_LITTLE_ENDIAN |
7 | select USB_OHCI_BIG_ENDIAN_MMIO | 6 | select USB_OHCI_BIG_ENDIAN_MMIO |
8 | select USB_ARCH_HAS_EHCI | ||
9 | select USB_EHCI_BIG_ENDIAN_MMIO | 7 | select USB_EHCI_BIG_ENDIAN_MMIO |
10 | select PPC_PCI_CHOICE | 8 | select PPC_PCI_CHOICE |
11 | help | 9 | help |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 6357710753d5..64455daa63a1 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -356,7 +356,6 @@ config CPU_SUBTYPE_SH7720 | |||
356 | select CPU_HAS_DSP | 356 | select CPU_HAS_DSP |
357 | select SYS_SUPPORTS_CMT | 357 | select SYS_SUPPORTS_CMT |
358 | select ARCH_WANT_OPTIONAL_GPIOLIB | 358 | select ARCH_WANT_OPTIONAL_GPIOLIB |
359 | select USB_ARCH_HAS_OHCI | ||
360 | select USB_OHCI_SH if USB_OHCI_HCD | 359 | select USB_OHCI_SH if USB_OHCI_HCD |
361 | select PINCTRL | 360 | select PINCTRL |
362 | help | 361 | help |
@@ -367,7 +366,6 @@ config CPU_SUBTYPE_SH7721 | |||
367 | select CPU_SH3 | 366 | select CPU_SH3 |
368 | select CPU_HAS_DSP | 367 | select CPU_HAS_DSP |
369 | select SYS_SUPPORTS_CMT | 368 | select SYS_SUPPORTS_CMT |
370 | select USB_ARCH_HAS_OHCI | ||
371 | select USB_OHCI_SH if USB_OHCI_HCD | 369 | select USB_OHCI_SH if USB_OHCI_HCD |
372 | help | 370 | help |
373 | Select SH7721 if you have a SH3-DSP SH7721 CPU. | 371 | Select SH7721 if you have a SH3-DSP SH7721 CPU. |
@@ -445,8 +443,6 @@ config CPU_SUBTYPE_SH7734 | |||
445 | select CPU_SH4A | 443 | select CPU_SH4A |
446 | select CPU_SHX2 | 444 | select CPU_SHX2 |
447 | select ARCH_WANT_OPTIONAL_GPIOLIB | 445 | select ARCH_WANT_OPTIONAL_GPIOLIB |
448 | select USB_ARCH_HAS_OHCI | ||
449 | select USB_ARCH_HAS_EHCI | ||
450 | select PINCTRL | 446 | select PINCTRL |
451 | help | 447 | help |
452 | Select SH7734 if you have a SH4A SH7734 CPU. | 448 | Select SH7734 if you have a SH4A SH7734 CPU. |
@@ -456,8 +452,6 @@ config CPU_SUBTYPE_SH7757 | |||
456 | select CPU_SH4A | 452 | select CPU_SH4A |
457 | select CPU_SHX2 | 453 | select CPU_SHX2 |
458 | select ARCH_WANT_OPTIONAL_GPIOLIB | 454 | select ARCH_WANT_OPTIONAL_GPIOLIB |
459 | select USB_ARCH_HAS_OHCI | ||
460 | select USB_ARCH_HAS_EHCI | ||
461 | select PINCTRL | 455 | select PINCTRL |
462 | help | 456 | help |
463 | Select SH7757 if you have a SH4A SH7757 CPU. | 457 | Select SH7757 if you have a SH4A SH7757 CPU. |
@@ -465,7 +459,6 @@ config CPU_SUBTYPE_SH7757 | |||
465 | config CPU_SUBTYPE_SH7763 | 459 | config CPU_SUBTYPE_SH7763 |
466 | bool "Support SH7763 processor" | 460 | bool "Support SH7763 processor" |
467 | select CPU_SH4A | 461 | select CPU_SH4A |
468 | select USB_ARCH_HAS_OHCI | ||
469 | select USB_OHCI_SH if USB_OHCI_HCD | 462 | select USB_OHCI_SH if USB_OHCI_HCD |
470 | help | 463 | help |
471 | Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. | 464 | Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. |
@@ -494,9 +487,7 @@ config CPU_SUBTYPE_SH7786 | |||
494 | select CPU_HAS_PTEAEX | 487 | select CPU_HAS_PTEAEX |
495 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP | 488 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP |
496 | select ARCH_WANT_OPTIONAL_GPIOLIB | 489 | select ARCH_WANT_OPTIONAL_GPIOLIB |
497 | select USB_ARCH_HAS_OHCI | ||
498 | select USB_OHCI_SH if USB_OHCI_HCD | 490 | select USB_OHCI_SH if USB_OHCI_HCD |
499 | select USB_ARCH_HAS_EHCI | ||
500 | select USB_EHCI_SH if USB_EHCI_HCD | 491 | select USB_EHCI_SH if USB_EHCI_HCD |
501 | select PINCTRL | 492 | select PINCTRL |
502 | 493 | ||