Merge branch 'lantiq' of git://dev.phrozen.org/mips-next into mips-for-linux-next

diff --combined arch/mips/Kconfig
index 386ff651ecaf163e3f962500ced122b295d88e57,b0f74b89d6fadf3fc0316ac1f7198cd53c6b70ab..c0cbde6c177065b89474eaf25ce426633f45a4e5
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -89,7 -89,6 +89,7 @@@ config ATH7
        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT
 +      select HAVE_CLK
        select IRQ_CPU
        select MIPS_MACHINE
        select SYS_HAS_CPU_MIPS32_R2
@@@ -242,6 -241,8 +242,8 @@@ config LANTI
        select HAVE_MACH_CLKDEV
        select CLKDEV_LOOKUP
        select USE_OF
+       select PINCTRL
+       select PINCTRL_LANTIQ
  
  config LASAT
        bool "LASAT Networks platforms"
@@@ -320,6 -321,25 +322,6 @@@ config MIPS_MALT
          This enables support for the MIPS Technologies Malta evaluation
          board.
  
 -config MIPS_SIM
 -      bool 'MIPS simulator (MIPSsim)'
 -      select CEVT_R4K
 -      select CSRC_R4K
 -      select DMA_NONCOHERENT
 -      select SYS_HAS_EARLY_PRINTK
 -      select IRQ_CPU
 -      select BOOT_RAW
 -      select SYS_HAS_CPU_MIPS32_R1
 -      select SYS_HAS_CPU_MIPS32_R2
 -      select SYS_HAS_EARLY_PRINTK
 -      select SYS_SUPPORTS_32BIT_KERNEL
 -      select SYS_SUPPORTS_BIG_ENDIAN
 -      select SYS_SUPPORTS_MULTITHREADING
 -      select SYS_SUPPORTS_LITTLE_ENDIAN
 -      help
 -        This option enables support for MIPS Technologies MIPSsim software
 -        emulator.
 -
  config NEC_MARKEINS
        bool "NEC EMMA2RH Mark-eins board"
        select SOC_EMMA2RH