[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-10-g33f3bc3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-10-g33f3bc3
|
From: Sébastien S. <ss...@us...> - 2014-01-08 11:24:34
|
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 33f3bc323d9dabd32542539e3799035b2f62f812 (commit)
via de8461ba6fa7b001f4adba592b2fa35f4c216901 (commit)
from fd007bebf32505772fe6785dd8f639ff6477c44b (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 33f3bc323d9dabd32542539e3799035b2f62f812
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jan 8 12:25:27 2014 +0100
[LINUX] 3.13: apf51: dts: add bluetooth support.
commit de8461ba6fa7b001f4adba592b2fa35f4c216901
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jan 8 12:24:54 2014 +0100
[LINUX] 3.12: apf51: dts: add bluetooth support.
-----------------------------------------------------------------------
Summary of changes:
.../0401-armadeus-add_apf51dev_baseboard.patch | 23 ++++++++++++++++---
.../0401-armadeus-add_apf51dev_baseboard.patch | 23 ++++++++++++++++---
2 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
index 21454bc..db4666a 100644
--- a/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
@@ -3,10 +3,10 @@ The APF51Dev is a docking board for an APF51 SOM
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Signed-off-by: Laurent Cans <lau...@gm...>
---
-Index: linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-3.12.6/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
---- linux-3.12.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
+--- linux-3.12.6.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.12.6/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -34,6 +34,40 @@
gpios = <&gpio1 2 0>;
linux,default-trigger = "heartbeat";
@@ -71,11 +71,26 @@ Index: linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
non-removable;
status = "okay";
};
-@@ -91,6 +134,7 @@
+@@ -75,6 +118,13 @@
+ status = "okay";
+ };
+
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_1>;
++ fsl,uart-has-rtscts;
++ status = "okay";
++};
++
+ &iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
+@@ -91,6 +141,8 @@
MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0C5
++ MX51_PAD_EIM_CS3__GPIO2_28 0x0C5
>;
};
};
diff --git a/patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch
index e70a161..72506dc 100644
--- a/patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch
@@ -3,10 +3,10 @@ The APF51Dev is a docking board for an APF51 SOM
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Signed-off-by: Laurent Cans <lau...@gm...>
---
-Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-3.13-rc7/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
---- linux-3.13-rc2.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
+--- linux-3.13-rc7.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.13-rc7/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -61,6 +61,12 @@
gpios = <&gpio1 2 0>;
linux,default-trigger = "heartbeat";
@@ -43,11 +43,26 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
status = "okay";
};
-@@ -118,6 +131,7 @@
+@@ -102,6 +115,13 @@
+ status = "okay";
+ };
+
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_1>;
++ fsl,uart-has-rtscts;
++ status = "okay";
++};
++
+ &iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
+@@ -118,6 +138,8 @@
MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0C5
++ MX51_PAD_EIM_CS3__GPIO2_28 0x0C5
>;
};
};
hooks/post-receive
--
armadeus
|
