From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 01:10:53 +0000 (+1000)
Subject: Merge remote-tracking branch 'mips/mips-for-linux-next'
X-Git-Tag: next-20121003~90
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=32d17f73f36c0928b942cecc56244e4d3cad410e;p=karo-tx-linux.git

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

Conflicts:
	drivers/net/ethernet/octeon/octeon_mgmt.c
	drivers/pinctrl/Makefile
---

32d17f73f36c0928b942cecc56244e4d3cad410e
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 1ef6e1e8c6c6,45d2158a5374..638f0e49690d
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -166,17 -156,13 +177,22 @@@ 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
 +
  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 698527dce29d,c0566c84d7f0..00eb628cfc09
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -33,7 -30,7 +34,9 @@@ 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_PLAT_SPEAR)	+= spear/