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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shawn Guo <shawn.guo@linaro.org>, Olof Johansson <olof@lixom.net>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: Fabio Estevam <fabio.estevam@freescale.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alexander Shiyan <shc_work@mail.ru>
Subject: linux-next: manual merge of the imx-mxs tree with the arm-soc tree
Date: Mon, 6 Jan 2014 10:38:50 +1100	[thread overview]
Message-ID: <20140106103850.3c60fa973ae9355c0a3c2449@canb.auug.org.au> (raw)

[-- Attachment #1.1: Type: text/plain, Size: 1062 bytes --]

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi between commit
8f568b496dd9 ("ARM: imx: Explicitly pass the active level of the PHY
reset") from the arm-soc tree and commit 208d5b9c2c71 ("ARM: dts: i.MX27
boards: Switch to use standard GPIO and IRQ flags definitions") from the
imx-mxs tree.

I fixed it up (I randomly chose to go with the latter - please get
together and decide which is right) and can carry the fix as necessary
(no action is required).

At the time of those commits, the file was called
arch/arm/boot/dts/imx27-phytec-phycore-som.dts (it is renamed by commit
c7914d9b5565 ("ARM: dts: imx27-phytec-phycore-som: Rename file to .dtsi"
from the imx-mxs tree) and we we ended up with (cut and paste damaged):

&fec {
	phy-mode = "mii";
	phy-reset-gpios = <&gpio3 30 GPIO_ACTIVE_HIGH>;
	phy-supply = <&reg_3v3>;
	pinctrl-names = "default";
	pinctrl-0 = <&pinctrl_fec1>;
	status = "okay";
};

-- 
Cheers,
Stephen Rothwell <sfr@canb.auug.org.au>

[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel