[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-75-gd766221

[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  d766221b51a1769038ec8eb8dee026550c263f9f (commit)
      from  35349ba33819c2c6eb06567fbeab79cfce341ad2 (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 d766221b51a1769038ec8eb8dee026550c263f9f
Author: Sébastien Szymanski <ss...@us...>
Date:   Mon Jan 27 14:03:32 2014 +0100

    [LINUX] imx6q: apf6: move pwm3 node from apf6 device tree to apf6dev device tree.

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

Summary of changes:
 .../3.13/0450-armadeus-add-apf6q-devicetree.patch  |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
index fedaa5a..28db349 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
@@ -14,7 +14,7 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
 ===================================================================
 --- /dev/null
 +++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,66 @@
 +/*
 + * Copyright 2014 Armadeus Systems
 + *
@@ -81,17 +81,11 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
 +	//non-removable;
 +	status = "okay";
 +};
-+
-+&pwm3 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_pwm3_1>;
-+	status = "okay";
-+};
 Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
 ===================================================================
 --- /dev/null
 +++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
-@@ -0,0 +1,165 @@
+@@ -0,0 +1,171 @@
 +/*
 + * Copyright 2014 Armadeus Systems
 + *
@@ -217,6 +211,12 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
 +	status = "okay";
 +};
 +
++&pwm3 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_pwm3_1>;
++	status = "okay";
++};
++
 +/* GPS */
 +&uart1 {
 +	pinctrl-names = "default";


hooks/post-receive
-- 
armadeus