From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Jul 2013 21:52:21 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v3.11-rc1~14
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d1447464789918db1e1a3d0aaf50d3d0f6487a4f;p=linux-2.6-block.git

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

Pull MIPS updates from Ralf Baechle:
 "MIPS updates:

   - All the things that didn't make 3.10.
   - Removes the Windriver PPMC platform.  Nobody will miss it.
   - Remove a workaround from kernel/irq/irqdomain.c which was there
     exclusivly for MIPS.  Patch by Grant Likely.
   - More small improvments for the SEAD 3 platform
   - Improvments on the BMIPS / SMP support for the BCM63xx series.
   - Various cleanups of dead leftovers.
   - Platform support for the Cavium Octeon-based EdgeRouter Lite.

  Two large KVM patchsets didn't make it for this pull request because
  their respective authors are vacationing"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (124 commits)
  MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER
  MIPS: BCM63xx: CLK: Add dummy clk_{set,round}_rate() functions
  MIPS: SEAD3: Disable L2 cache on SEAD-3.
  MIPS: BCM63xx: Enable second core SMP on BCM6328 if available
  MIPS: BCM63xx: Add SMP support to prom.c
  MIPS: define write{b,w,l,q}_relaxed
  MIPS: Expose missing pci_io{map,unmap} declarations
  MIPS: Malta: Update GCMP detection.
  Revert "MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET"
  MIPS: APSP: Remove <asm/kspd.h>
  SSB: Kconfig: Amend SSB_EMBEDDED dependencies
  MIPS: microMIPS: Fix improper definition of ISA exception bit.
  MIPS: Don't try to decode microMIPS branch instructions where they cannot exist.
  MIPS: Declare emulate_load_store_microMIPS as a static function.
  MIPS: Fix typos and cleanup comment
  MIPS: Cleanup indentation and whitespace
  MIPS: BMIPS: support booting from physical CPU other than 0
  MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS
  MIPS: GIC: Fix gic_set_affinity infinite loop
  MIPS: Don't save/restore OCTEON wide multiplier state on syscalls.
  ...
---

d1447464789918db1e1a3d0aaf50d3d0f6487a4f
diff --cc drivers/i2c/busses/Kconfig
index fdc2ab4af315,a8fff7700624..dc6dea614abd
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -727,19 -724,9 +727,19 @@@ config I2C_VERSATIL
  	  This driver can also be built as a module.  If so, the module
  	  will be called i2c-versatile.
  
 +config I2C_WMT
 +	tristate "Wondermedia WM8xxx SoC I2C bus support"
 +	depends on ARCH_VT8500
 +	help
 +	  Say yes if you want to support the I2C bus on Wondermedia 8xxx-series
 +	  SoCs.
 +
 +	  This driver can also be built as a module. If so, the module will be
 +	  called i2c-wmt.
 +
  config I2C_OCTEON
  	tristate "Cavium OCTEON I2C bus support"
- 	depends on CPU_CAVIUM_OCTEON
+ 	depends on CAVIUM_OCTEON_SOC
  	help
  	  Say yes if you want to support the I2C serial bus on Cavium
  	  OCTEON SOC.
diff --cc kernel/irq/irqdomain.c
index 2d7cd3428365,a341b3d433ad..706724e9835d
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@@ -475,20 -665,8 +475,8 @@@ unsigned int irq_create_of_mapping(stru
  
  	domain = controller ? irq_find_host(controller) : irq_default_domain;
  	if (!domain) {
- #ifdef CONFIG_MIPS
- 		/*
- 		 * Workaround to avoid breaking interrupt controller drivers
- 		 * that don't yet register an irq_domain.  This is temporary
- 		 * code. ~~~gcl, Feb 24, 2012
- 		 *
- 		 * Scheduled for removal in Linux v3.6.  That should be enough
- 		 * time.
- 		 */
- 		if (intsize > 0)
- 			return intspec[0];
- #endif
 -		pr_warning("no irq domain found for %s !\n",
 -			   of_node_full_name(controller));
 +		pr_warn("no irq domain found for %s !\n",
 +			of_node_full_name(controller));
  		return 0;
  	}