Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latest

diff --combined arch/sh/Kconfig
index 3b572fe1c04059779eb2f80bda461a611ad9e3d7,32cd5f131e42eb7ac6a21ac5517890b630acae80,7f217b3a50a806b7347f991b588397011aa3388e..1e905a632971981c8f7fbab2731ecc765652b668
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
--- 3/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@@ -161,7 -161,8 -161,7 +161,8 @@@@ config ARCH_HAS_CPU_IDLE_WAI
        def_bool y
   
   config NO_IOPORT
- -     bool
+ +     def_bool !PCI
+ +     depends on !SH_CAYMAN && !SH_SH4202_MICRODEV
   
   config IO_TRAPPED
        bool
@@@@ -193,7 -194,6 -193,7 +194,7 @@@@ config CPU_SH
   config CPU_SH2A
        bool
        select CPU_SH2
 +      select UNCACHED_MAPPING
   
   config CPU_SH3
        bool
@@@@ -274,7 -274,6 -274,6 +275,7 @@@@ config CPU_SUBTYPE_SH720
        select CPU_HAS_FPU
        select SYS_SUPPORTS_CMT
        select SYS_SUPPORTS_MTU2
 ++     select ARCH_WANT_OPTIONAL_GPIOLIB
   
   config CPU_SUBTYPE_SH7206
        bool "Support SH7206 processor"
@@@@ -346,7 -345,6 -345,6 +347,7 @@@@ config CPU_SUBTYPE_SH772
        select CPU_SH3
        select CPU_HAS_DSP
        select SYS_SUPPORTS_CMT
 ++     select ARCH_WANT_OPTIONAL_GPIOLIB
        help
          Select SH7720 if you have a SH3-DSP SH7720 CPU.
   
@@@@ -409,7 -407,6 -407,6 +410,7 @@@@ config CPU_SUBTYPE_SH772
        select ARCH_SHMOBILE
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_CMT
 ++     select ARCH_WANT_OPTIONAL_GPIOLIB
        help
          Select SH7723 if you have an SH-MobileR2 CPU.
   
@@@@ -420,7 -417,6 -417,6 +421,7 @@@@ config CPU_SUBTYPE_SH772
        select ARCH_SHMOBILE
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_CMT
 ++     select ARCH_WANT_OPTIONAL_GPIOLIB
        help
          Select SH7724 if you have an SH-MobileR2R CPU.
   
@@@@ -428,7 -424,6 -424,6 +429,7 @@@@ config CPU_SUBTYPE_SH775
        bool "Support SH7757 processor"
        select CPU_SH4A
        select CPU_SHX2
 ++     select ARCH_WANT_OPTIONAL_GPIOLIB
        help
          Select SH7757 if you have a SH4A SH7757 CPU.
   
@@@@ -452,7 -447,6 -447,6 +453,7 @@@@ config CPU_SUBTYPE_SH778
        select CPU_SHX2
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_NUMA
 ++     select ARCH_WANT_OPTIONAL_GPIOLIB
   
   config CPU_SUBTYPE_SH7786
        bool "Support SH7786 processor"
@@@@ -460,7 -454,6 -454,6 +461,7 @@@@
        select CPU_SHX3
        select CPU_HAS_PTEAEX
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
 ++     select ARCH_WANT_OPTIONAL_GPIOLIB
   
   config CPU_SUBTYPE_SHX3
        bool "Support SH-X3 processor"
@@@@ -485,7 -478,6 -478,6 +486,7 @@@@ config CPU_SUBTYPE_SH772
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_NUMA
        select SYS_SUPPORTS_CMT
 ++     select ARCH_WANT_OPTIONAL_GPIOLIB
   
   config CPU_SUBTYPE_SH7366
        bool "Support SH7366 processor"
@@@@ -575,6 -567,15 -567,15 +576,6 @@@@ config SH_CLK_CPG_LEGAC
        def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
                      !CPU_SHX3 && !CPU_SUBTYPE_SH7757
   
 --config SH_CLK_MD
 --     int "CPU Mode Pin Setting"
 --     depends on CPU_SH2
 --     default 6 if CPU_SUBTYPE_SH7206
 --     default 5 if CPU_SUBTYPE_SH7619
 --     default 0
 --     help
 --       MD2 - MD0 pin setting.
 --
   source "kernel/time/Kconfig"
   
   endmenu