sh: intc - add support for SH7785

[mv-sheeva.git] / arch / sh / mm / Kconfig

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 70da1c8d407e87c73ffe415a27ffa6206cc884da..99aebecc5701a4b24d88c8809a89b79a3c234fe9 100644 (file)
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -2,7 +2,6 @@
 # Processor families
 #
 config CPU_SH2
-       select SH_WRITETHROUGH if !CPU_SH2A
        bool
 
 config CPU_SH2A
@@ -27,6 +26,7 @@ config CPU_SH4A
 config CPU_SH4AL_DSP
        bool
        select CPU_SH4A
+       select CPU_HAS_DSP
 
 config CPU_SUBTYPE_ST40
        bool
@@ -62,33 +62,29 @@ config CPU_SUBTYPE_SH7206
 
 # SH-3 Processor Support
 
-config CPU_SUBTYPE_SH7300
-       bool "Support SH7300 processor"
-       select CPU_SH3
-
 config CPU_SUBTYPE_SH7705
        bool "Support SH7705 processor"
        select CPU_SH3
-       select CPU_HAS_IPR_IRQ
-       select CPU_HAS_PINT_IRQ
+       select CPU_HAS_INTC_IRQ
 
 config CPU_SUBTYPE_SH7706
        bool "Support SH7706 processor"
        select CPU_SH3
-       select CPU_HAS_IPR_IRQ
+       select CPU_HAS_INTC_IRQ
        help
          Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
 
 config CPU_SUBTYPE_SH7707
        bool "Support SH7707 processor"
        select CPU_SH3
-       select CPU_HAS_PINT_IRQ
+       select CPU_HAS_INTC_IRQ
        help
          Select SH7707 if you have a  60 Mhz SH-3 HD6417707 CPU.
 
 config CPU_SUBTYPE_SH7708
        bool "Support SH7708 processor"
        select CPU_SH3
+       select CPU_HAS_INTC_IRQ
        help
          Select SH7708 if you have a  60 Mhz SH-3 HD6417708S or
          if you have a 100 Mhz SH-3 HD6417708R CPU.
@@ -96,22 +92,23 @@ config CPU_SUBTYPE_SH7708
 config CPU_SUBTYPE_SH7709
        bool "Support SH7709 processor"
        select CPU_SH3
-       select CPU_HAS_IPR_IRQ
-       select CPU_HAS_PINT_IRQ
+       select CPU_HAS_INTC_IRQ
        help
          Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.
 
 config CPU_SUBTYPE_SH7710
        bool "Support SH7710 processor"
        select CPU_SH3
-       select CPU_HAS_IPR_IRQ
+       select CPU_HAS_INTC_IRQ
+       select CPU_HAS_DSP
        help
          Select SH7710 if you have a SH3-DSP SH7710 CPU.
 
 config CPU_SUBTYPE_SH7712
        bool "Support SH7712 processor"
        select CPU_SH3
-       select CPU_HAS_IPR_IRQ
+       select CPU_HAS_INTC_IRQ
+       select CPU_HAS_DSP
        help
          Select SH7712 if you have a SH3-DSP SH7712 CPU.
 
@@ -195,7 +192,7 @@ config CPU_SUBTYPE_SH7785
        bool "Support SH7785 processor"
        select CPU_SH4A
        select CPU_SHX2
-       select CPU_HAS_INTC2_IRQ
+       select CPU_HAS_INTC_IRQ
 
 config CPU_SUBTYPE_SHX3
        bool "Support SH-X3 processor"
@@ -205,10 +202,6 @@ config CPU_SUBTYPE_SHX3
 
 # SH4AL-DSP Processor Support
 
-config CPU_SUBTYPE_SH73180
-       bool "Support SH73180 processor"
-       select CPU_SH4AL_DSP
-
 config CPU_SUBTYPE_SH7343
        bool "Support SH7343 processor"
        select CPU_SH4AL_DSP
@@ -420,8 +413,17 @@ config SH_DIRECT_MAPPED
          Turn this option off for platforms that do not have a direct-mapped
          cache, and you have no need to run the caches in such a configuration.
 
-config SH_WRITETHROUGH
-       bool "Use write-through caching"
+choice
+       prompt "Cache mode"
+       default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4
+       default CACHE_WRITETHROUGH if (CPU_SH2 && !CPU_SH2A)
+
+config CACHE_WRITEBACK
+       bool "Write-back"
+       depends on CPU_SH2A || CPU_SH3 || CPU_SH4
+
+config CACHE_WRITETHROUGH
+       bool "Write-through"
        help
          Selecting this option will configure the caches in write-through
          mode, as opposed to the default write-back configuration.
@@ -432,4 +434,9 @@ config SH_WRITETHROUGH
 
          If unsure, say N.
 
+config CACHE_OFF
+       bool "Off"
+
+endchoice
+
 endmenu