linux-next: manual merge of the arm-soc tree with the net-next tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am335x-evmsk.dts between commit f6655d697b85 ("ARM:
dts: AM33XX: Add CPSW phy_id device tree data to am335x-evmsk") from the
net-next tree and commit 94a924ca61f0 ("ARM: dts: AM33XX: Add pinmux
configuration for CPSW to EVMsk") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/boot/dts/am335x-evmsk.dts
index 4297899,9e00eef..0000000
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@@ -249,12 -381,14 +381,24 @@@
  	};
  };
  
 +&cpsw_emac0 {
 +	phy_id = <&davinci_mdio>, <0>;
 +	phy-mode = "rgmii-txid";
 +};
 +
 +&cpsw_emac1 {
 +	phy_id = <&davinci_mdio>, <1>;
 +	phy-mode = "rgmii-txid";
 +};
++
+ &mac {
+ 	pinctrl-names = "default", "sleep";
+ 	pinctrl-0 = <&cpsw_default>;
+ 	pinctrl-1 = <&cpsw_sleep>;
+ };
+ 
+ &davinci_mdio {
+ 	pinctrl-names = "default", "sleep";
+ 	pinctrl-0 = <&davinci_mdio_default>;
+ 	pinctrl-1 = <&davinci_mdio_sleep>;
+ };

Attachment: pgp00000.pgp
Description: PGP signature