[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-228-ge03b7e9

[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  e03b7e9bcbb643c2f5c62609e137e78c095b0bb1 (commit)
      from  035a4e5fb9b5450cfaa06066849141103925aa16 (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 e03b7e9bcbb643c2f5c62609e137e78c095b0bb1
Author: Sébastien Szymanski <ss...@us...>
Date:   Thu Apr 24 17:43:29 2014 +0200

    [LINUX] 3.15: apf6: dts: fix pinctrl of uart4

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

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

diff --git a/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 1b107ba..f9ba889 100644
--- a/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.15-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
 ===================================================================
 --- /dev/null
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.15-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
 @@ -0,0 +1,28 @@
 +/*
 + * Copyright 2014 Armadeus Systems
@@ -31,10 +31,10 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
 +&sata {
 +	status = "okay";
 +};
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 ===================================================================
 --- /dev/null
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 @@ -0,0 +1,129 @@
 +/*
 + * Copyright 2014 Armadeus Systems
@@ -165,10 +165,10 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 +	//non-removable;
 +	status = "okay";
 +};
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 ===================================================================
 --- /dev/null
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 @@ -0,0 +1,443 @@
 +/*
 + * Copyright 2014 Armadeus Systems
@@ -511,7 +511,7 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 +
 +		pinctrl_uart4: uart4grp {
 +			fsl,pins = <
-+				MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++				MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
 +				MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
 +			>;
 +		};
@@ -613,10 +613,10 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 +	fsl,mode = "i2s-slave";
 +	status = "okay";
 +};
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.15-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
 ===================================================================
 --- /dev/null
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.15-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
 @@ -0,0 +1,24 @@
 +/*
 + * Copyright 2014 Armadeus Systems


hooks/post-receive
-- 
armadeus