[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-384-ge107b3d

[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  e107b3d8a7e782eeeffc123608d60af6d8abe0cd (commit)
      from  1e59df0260079d3bfb8daef42452c7cdf01ddb9f (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 e107b3d8a7e782eeeffc123608d60af6d8abe0cd
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Aug 12 20:15:06 2014 +0200

    [LINUX] 3.16: apf51: dts: rename imx51-apf51dev-v1.dts to imx51-apf51dev.dts

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

Summary of changes:
 ...us-apf51-add_apf51_v1-and_v2_device_trees.patch |   62 ++++++-------------
 1 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
index ec76f97..f122428 100644
--- a/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
+++ b/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
@@ -286,30 +286,6 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
 +		};
 +	};
 +};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v1.dts
-===================================================================
---- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v1.dts
-@@ -0,0 +1,19 @@
-+/*
-+ * Copyright 2014 Armadeus Systems - <su...@ar...>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx51-apf51-v1.dtsi"
-+#include "imx51-apf51dev.dtsi"
-+
-+/ {
-+	model = "Armadeus Systems APF51Dev docking/development board with APF51 V1 SOM";
-+	compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
-+};
 Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v2.dts
 ===================================================================
 --- /dev/null
@@ -586,8 +562,7 @@ Index: linux-3.16/arch/arm/boot/dts/Makefile
  	imx35-pdk.dtb \
  	imx50-evk.dtb \
 -	imx51-apf51.dtb \
--	imx51-apf51dev.dtb \
-+	imx51-apf51dev-v1.dtb \
+	imx51-apf51dev.dtb \
 +	imx51-apf51dev-v2.dtb \
  	imx51-babbage.dtb \
  	imx51-digi-connectcore-jsk.dtb \
@@ -689,25 +664,28 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dts
 Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
 ===================================================================
 --- linux-3.16.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ /dev/null
-@@ -1,211 +0,0 @@
--/*
++++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
+@@ -1,5 +1,5 @@
+ /*
 - * Copyright 2013 Armadeus Systems - <su...@ar...>
-- *
-- * The code contained herein is licensed under the GNU General Public
-- * License. You may obtain a copy of the GNU General Public License
-- * Version 2 or later at the following locations:
-- *
-- * http://www.opensource.org/licenses/gpl-license.html
-- * http://www.gnu.org/copyleft/gpl.html
-- */
--
++ * Copyright 2014 Armadeus Systems - <su...@ar...>
+  *
+  * The code contained herein is licensed under the GNU General Public
+  * License. You may obtain a copy of the GNU General Public License
+@@ -9,203 +9,11 @@
+  * http://www.gnu.org/copyleft/gpl.html
+  */
+
 -/* APF51Dev is a docking board for the APF51 SOM */
 -#include "imx51-apf51.dts"
--
--/ {
++/dts-v1/;
++#include "imx51-apf51-v1.dtsi"
++#include "imx51-apf51dev.dtsi"
+
+ / {
 -	model = "Armadeus Systems APF51Dev docking/development board";
--	compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
++	model = "Armadeus Systems APF51Dev docking/development board with APF51 V1 SOM";
+	compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
 -
 -	display@di1 {
 -		compatible = "fsl,imx-parallel-display";
@@ -901,4 +879,4 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
 -
 -&ipu_di0_disp0 {
 -	remote-endpoint = <&display_in>;
--};
+ };


hooks/post-receive
-- 
armadeus