Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS update from Ralf Baechle:
 "This is the MIPS update for 3.7.

  A fair chunk of them are platform updates to the Cavium Octeon SOC
  (which involves machine generated header files of considerable size),
  Atheros ATH79xx, RMI aka Netlogic aka Broadcom XLP, Broadcom BCM63xx
  platforms.

  Support for the commercial MIPS simulator MIPSsim has been removed as
  MIPS Technologies is shifting away from this product and Qemu is
  offering various more powerful platforms.  The generic MIPS code can
  now also probe for no-execute / write-only TLB features implemented
  without the full SmartMIPS extension as permitted by the latest MIPS
  processor architecture.  Lots of small changes to generic code."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (78 commits)
  MIPS: ath79: Fix CPU/DDR frequency calculation for SRIF PLLs
  MIPS: ath79: use correct fractional dividers for {CPU,DDR}_PLL on AR934x
  MIPS: BCM63XX: Properly handle mac address octet overflow
  MIPS: Kconfig: Avoid build errors by hiding USE_OF from the user.
  MIPS: Replace `-' in defconfig filename wth `_' for consistency.
  MIPS: Wire kcmp syscall.
  MIPS: MIPSsim: Remove the MIPSsim platform.
  MIPS: NOTIFY_RESUME is not needed in TIF masks
  MIPS: Merge the identical "return from syscall" per-ABI code
  MIPS: Unobfuscate _TIF..._MASK
  MIPS: Prevent hitting do_notify_resume() with !user_mode(regs).
  MIPS: Replace 'kernel_uses_smartmips_rixi' with 'cpu_has_rixi'.
  MIPS: Add base architecture support for RI and XI.
  MIPS: Optimise TLB handlers for MIPS32/64 R2 cores.
  MIPS: uasm: Add INS and EXT instructions.
  MIPS: Avoid pipeline stalls on some MIPS32R2 cores.
  MIPS: Make VPE count to be one-based.
  MIPS: Add new end of interrupt functionality for GIC.
  MIPS: Add EIC support for GIC.
  MIPS: Code clean-ups for the GIC.
  ...

diff --cc arch/mips/bcm63xx/boards/board_bcm963xx.c
Simple merge

diff --cc arch/mips/configs/nlm_xlp_defconfig
Simple merge

diff --cc arch/mips/include/asm/octeon/octeon-model.h
index 23b895cb260b35d71f788bd6b5ca73961bcf2c02,93398f66c88402f527a5318b1623967b248698e4..14dd11f4492afc1959b56643c539c8e3ff089b3f
--- 1/arch/mips/include/asm/octeon/octeon-model.h
--- 2/arch/mips/include/asm/octeon/octeon-model.h
+++ b/arch/mips/include/asm/octeon/octeon-model.h
@@@ -313,6 -323,14 +323,14 @@@ static inline int __octeon_is_model_run
  const char *octeon_model_get_string(uint32_t chip_id);
  const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);
  
 -#include "octeon-feature.h"
+ /*
+  * Return the octeon family, i.e., ProcessorID of the PrID register.
+  */
+ static inline uint32_t cvmx_get_octeon_family(void)
+ {
+       return cvmx_get_proc_id() & OCTEON_FAMILY_MASK;
+ }
+ 
 +#include <asm/octeon/octeon-feature.h>
  
  #endif /* __OCTEON_MODEL_H__ */

diff --cc arch/mips/include/asm/octeon/octeon.h
Simple merge

diff --cc arch/mips/kernel/Makefile
Simple merge

diff --cc drivers/net/ethernet/octeon/octeon_mgmt.c
index a688a2ddcfd612866edbce5f8ee08b7f92fbd8e0,5be431c25147d83fa03875dc5d7f47aca396bae2..f97719c48516a037db795c9ee0879c526a062037
--- 1/drivers/net/ethernet/octeon/octeon_mgmt.c
--- 2/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@@ -722,10 -973,8 +973,8 @@@ static int octeon_mgmt_init_phy(struct 
                                   octeon_mgmt_adjust_link, 0,
                                   PHY_INTERFACE_MODE_MII);
  
 -      if (p->phydev == NULL)
 +      if (!p->phydev)
-               return -1;
- 
-       phy_start_aneg(p->phydev);
+               return -ENODEV;
  
        return 0;
  }

diff --cc drivers/pinctrl/Kconfig
index 33e3df9e39cadf6929e64b9438972a1f84a9fa94,45d2158a537492cd946aa9d2ee348b7490fad726..7bf914df6e91a6129d23f5d12828b8228a8c2775
--- 1/drivers/pinctrl/Kconfig
--- 2/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -166,39 -156,13 +177,44 @@@ config PINCTRL_COH90
          COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
          ports of 8 GPIO pins each.
  
 +config PINCTRL_SAMSUNG
 +      bool "Samsung pinctrl driver"
 +      select PINMUX
 +      select PINCONF
 +
 +config PINCTRL_EXYNOS4
 +      bool "Pinctrl driver data for Exynos4 SoC"
 +      select PINCTRL_SAMSUNG
 +
 +config PINCTRL_MVEBU
 +      bool
 +      depends on ARCH_MVEBU
 +      select PINMUX
 +      select PINCONF
 +
 +config PINCTRL_DOVE
 +      bool
 +      select PINCTRL_MVEBU
 +
 +config PINCTRL_KIRKWOOD
 +      bool
 +      select PINCTRL_MVEBU
 +
 +config PINCTRL_ARMADA_370
 +      bool
 +      select PINCTRL_MVEBU
 +
 +config PINCTRL_ARMADA_XP
 +      bool
 +      select PINCTRL_MVEBU
 +
  source "drivers/pinctrl/spear/Kconfig"
  
+ config PINCTRL_XWAY
+       bool
+       depends on SOC_TYPE_XWAY
+       depends on PINCTRL_LANTIQ
+ 
  endmenu
  
  endif

diff --cc drivers/pinctrl/Makefile
index f162e01963006ff6f33070844f50644cf2eaf09e,c0566c84d7f030da70bdcf8d0fcd6d9de404dc5c..f395ba5cec2579c4ab1372db251beaacf0f31491
--- 1/drivers/pinctrl/Makefile
--- 2/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -33,12 -30,7 +34,14 @@@ obj-$(CONFIG_PINCTRL_TEGRA20)       += pinctr
  obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o
  obj-$(CONFIG_PINCTRL_U300)    += pinctrl-u300.o
  obj-$(CONFIG_PINCTRL_COH901)  += pinctrl-coh901.o
 +obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o
 +obj-$(CONFIG_PINCTRL_EXYNOS4) += pinctrl-exynos.o
 +obj-$(CONFIG_PINCTRL_MVEBU)   += pinctrl-mvebu.o
 +obj-$(CONFIG_PINCTRL_DOVE)    += pinctrl-dove.o
 +obj-$(CONFIG_PINCTRL_KIRKWOOD)        += pinctrl-kirkwood.o
 +obj-$(CONFIG_PINCTRL_ARMADA_370) += pinctrl-armada-370.o
 +obj-$(CONFIG_PINCTRL_ARMADA_XP)  += pinctrl-armada-xp.o
+ obj-$(CONFIG_PINCTRL_XWAY)    += pinctrl-xway.o
+ obj-$(CONFIG_PINCTRL_LANTIQ)  += pinctrl-lantiq.o
  
  obj-$(CONFIG_PLAT_SPEAR)      += spear/

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
index 22fd3a7251bcbd5833ea80506fb9eeaa6f38b104,93d87bcdf3f5c625d865e2ca7e1c17ffbe690d78..c48df47e4b0f03fd7d7f53a142c3a08bb42de54d
--- 1/drivers/spi/Makefile
--- 2/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -36,9 -36,9 +36,10 @@@ obj-$(CONFIG_SPI_LM70_LLP)           += spi-lm70
  obj-$(CONFIG_SPI_MPC512x_PSC)         += spi-mpc512x-psc.o
  obj-$(CONFIG_SPI_MPC52xx_PSC)         += spi-mpc52xx-psc.o
  obj-$(CONFIG_SPI_MPC52xx)             += spi-mpc52xx.o
 +obj-$(CONFIG_SPI_MXS)                 += spi-mxs.o
  obj-$(CONFIG_SPI_NUC900)              += spi-nuc900.o
  obj-$(CONFIG_SPI_OC_TINY)             += spi-oc-tiny.o
+ obj-$(CONFIG_SPI_OCTEON)              += spi-octeon.o
  obj-$(CONFIG_SPI_OMAP_UWIRE)          += spi-omap-uwire.o
  obj-$(CONFIG_SPI_OMAP_100K)           += spi-omap-100k.o
  obj-$(CONFIG_SPI_OMAP24XX)            += spi-omap2-mcspi.o