From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 23:12:47 +0000 (+1100)
Subject: Merge remote-tracking branch 'mips/mips-for-linux-next'
X-Git-Tag: next-20121008~73
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=29c011b9fe0721d3321575a7e72a76670b6dcc0e;p=karo-tx-linux.git

Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
	arch/mips/include/asm/octeon/octeon-model.h
	drivers/net/ethernet/octeon/octeon_mgmt.c
	drivers/pinctrl/Makefile
---

29c011b9fe0721d3321575a7e72a76670b6dcc0e
diff --cc arch/mips/include/asm/octeon/octeon-model.h
index 23b895cb260b,93398f66c884..14dd11f4492a
--- a/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);
  
+ /*
+  * 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 "octeon-feature.h"
 +#include <asm/octeon/octeon-feature.h>
  
  #endif /* __OCTEON_MODEL_H__ */
diff --cc drivers/net/ethernet/octeon/octeon_mgmt.c
index a688a2ddcfd6,5be431c25147..f97719c48516
--- a/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 33e3df9e39ca,45d2158a5374..7bf914df6e91
--- a/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 f162e0196300,c0566c84d7f0..c9f44565c4a3
--- a/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_XWAY)	+= pinctrl-xway.o
+ obj-$(CONFIG_PINCTRL_LANTIQ)	+= pinctrl-lantiq.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_PLAT_SPEAR)	+= spear/
diff --cc drivers/spi/Makefile
index 22fd3a7251bc,93d87bcdf3f5..c48df47e4b0f
--- a/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