ARM: shmobile: marzen: add USB EHCI driver support

[cascardo/linux.git] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 4cacc2d..4eae11c 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -2,72 +2,50 @@ if ARCH_SHMOBILE
 
 comment "SH-Mobile System Type"
 
-config ARCH_SH7367
-       bool "SH-Mobile G3 (SH7367)"
-       select CPU_V6
-       select SH_CLK_CPG
-       select ARCH_WANT_OPTIONAL_GPIOLIB
-
-config ARCH_SH7377
-       bool "SH-Mobile G4 (SH7377)"
-       select CPU_V7
-       select SH_CLK_CPG
-       select ARCH_WANT_OPTIONAL_GPIOLIB
-
 config ARCH_SH7372
        bool "SH-Mobile AP4 (SH7372)"
-       select CPU_V7
-       select SH_CLK_CPG
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_CPU_SUSPEND if PM || CPU_IDLE
+       select CPU_V7
+       select SH_CLK_CPG
 
 config ARCH_SH73A0
        bool "SH-Mobile AG5 (R8A73A00)"
-       select CPU_V7
-       select SH_CLK_CPG
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
+       select CPU_V7
        select I2C
+       select SH_CLK_CPG
 
 config ARCH_R8A7740
        bool "R-Mobile A1 (R8A77400)"
+       select ARCH_WANT_OPTIONAL_GPIOLIB
        select CPU_V7
        select SH_CLK_CPG
-       select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_R8A7779
        bool "R-Car H1 (R8A77790)"
+       select ARCH_WANT_OPTIONAL_GPIOLIB
+       select ARM_GIC
        select CPU_V7
        select SH_CLK_CPG
-       select ARM_GIC
-       select ARCH_WANT_OPTIONAL_GPIOLIB
+       select USB_ARCH_HAS_EHCI
 
 config ARCH_EMEV2
        bool "Emma Mobile EV2"
-       select CPU_V7
-       select ARM_GIC
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select ARM_GIC
+       select CPU_V7
 
 comment "SH-Mobile Board Type"
 
-config MACH_G3EVM
-       bool "G3EVM board"
-       depends on ARCH_SH7367
-       select ARCH_REQUIRE_GPIOLIB
-
-config MACH_G4EVM
-       bool "G4EVM board"
-       depends on ARCH_SH7377
-       select ARCH_REQUIRE_GPIOLIB
-       select REGULATOR_FIXED_VOLTAGE if REGULATOR
-
 config MACH_AP4EVB
        bool "AP4EVB board"
        depends on ARCH_SH7372
        select ARCH_REQUIRE_GPIOLIB
+       select REGULATOR_FIXED_VOLTAGE if REGULATOR
        select SH_LCD_MIPI_DSI
        select SND_SOC_AK4642 if SND_SIMPLE_CARD
-       select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 choice
        prompt "AP4EVB LCD panel selection"
@@ -84,37 +62,38 @@ endchoice
 
 config MACH_AG5EVM
        bool "AG5EVM board"
+       depends on ARCH_SH73A0
        select ARCH_REQUIRE_GPIOLIB
-       select SH_LCD_MIPI_DSI
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-       depends on ARCH_SH73A0
+       select SH_LCD_MIPI_DSI
 
 config MACH_MACKEREL
        bool "mackerel board"
        depends on ARCH_SH7372
        select ARCH_REQUIRE_GPIOLIB
-       select SND_SOC_AK4642 if SND_SIMPLE_CARD
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+       select SND_SOC_AK4642 if SND_SIMPLE_CARD
+       select USE_OF
 
 config MACH_KOTA2
        bool "KOTA2 board"
+       depends on ARCH_SH73A0
        select ARCH_REQUIRE_GPIOLIB
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-       depends on ARCH_SH73A0
 
 config MACH_BONITO
        bool "bonito board"
+       depends on ARCH_R8A7740
        select ARCH_REQUIRE_GPIOLIB
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-       depends on ARCH_R8A7740
 
 config MACH_ARMADILLO800EVA
        bool "Armadillo-800 EVA board"
        depends on ARCH_R8A7740
        select ARCH_REQUIRE_GPIOLIB
-       select USE_OF
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
        select SND_SOC_WM8978 if SND_SIMPLE_CARD
+       select USE_OF
 
 config MACH_MARZEN
        bool "MARZEN board"
@@ -125,16 +104,16 @@ config MACH_MARZEN
 config MACH_KZM9D
        bool "KZM9D board"
        depends on ARCH_EMEV2
-       select USE_OF
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+       select USE_OF
 
 config MACH_KZM9G
        bool "KZM-A9-GT board"
        depends on ARCH_SH73A0
        select ARCH_REQUIRE_GPIOLIB
-       select USE_OF
-       select SND_SOC_AK4642 if SND_SIMPLE_CARD
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+       select SND_SOC_AK4642 if SND_SIMPLE_CARD
+       select USE_OF
 
 comment "SH-Mobile System Configuration"
 
@@ -146,8 +125,7 @@ menu "Memory configuration"
 
 config MEMORY_START
        hex "Physical memory start address"
-       default "0x50000000" if MACH_G3EVM
-       default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \
+       default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \
                                MACH_MACKEREL || MACH_BONITO || \
                                MACH_ARMADILLO800EVA
        default "0x41000000" if MACH_KOTA2
@@ -159,8 +137,6 @@ config MEMORY_START
 
 config MEMORY_SIZE
        hex "Physical memory size"
-       default "0x08000000" if MACH_G3EVM
-       default "0x08000000" if MACH_G4EVM
        default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \
                                MACH_ARMADILLO800EVA
        default "0x1e000000" if MACH_KOTA2