[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-121-gd904df4

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  d904df43a4654c45275c26a57b263c438f43428c (commit)
      from  2a4ba83105c82a9d76397f1020ab6ec1b2b41b86 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d904df43a4654c45275c26a57b263c438f43428c
Author: Sébastien Szymanski <ss...@us...>
Date:   Mon Feb 17 15:10:28 2014 +0100

    [LINUX] 3.14-rc3: apf6: move fec node from apf6dev device tree to apf6
    device tree

-----------------------------------------------------------------------

Summary of changes:
 ...rmadeus-add-apf6q-and-apf6dl-device-trees.patch |   34 ++++++++++----------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index e197828..be62fc1 100644
--- a/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.14-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
 ===================================================================
 --- /dev/null
-+++ linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.14-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
 @@ -0,0 +1,28 @@
 +/*
 + * Copyright 2014 Armadeus Systems
@@ -31,11 +31,11 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
 +&sata {
 +	status = "okay";
 +};
-Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 ===================================================================
 --- /dev/null
-+++ linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,80 @@
++++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,87 @@
 +/*
 + * Copyright 2014 Armadeus Systems
 + *
@@ -95,6 +95,13 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 +	};
 +};
 +
++&fec {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_enet_1>;
++	phy-mode = "rgmii";
++	status = "okay";
++};
++
 +/* Bluetooth */
 +&uart2 {
 +	pinctrl-names = "default";
@@ -116,11 +123,11 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 +	//non-removable;
 +	status = "okay";
 +};
-Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 ===================================================================
 --- /dev/null
-+++ linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,162 @@
++++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,155 @@
 +/*
 + * Copyright 2014 Armadeus Systems
 + *
@@ -225,13 +232,6 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 +	};
 +};
 +
-+&fec {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_enet_1>;
-+	phy-mode = "rgmii";
-+	status = "okay";
-+};
-+
 +&pcie {
 +	reset-gpio = <&gpio6 2 0>;
 +	status = "okay";
@@ -283,10 +283,10 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 +	cd-gpios = <&gpio1 2 0>;
 +	status = "okay";
 +};
-Index: linux-3.14-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.14-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
 ===================================================================
 --- /dev/null
-+++ linux-3.14-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.14-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
 @@ -0,0 +1,24 @@
 +/*
 + * Copyright 2014 Armadeus Systems


hooks/post-receive
-- 
armadeus