[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-40-g2aaf4e9
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-40-g2aaf4e9
|
From: Sébastien S. <ss...@us...> - 2014-01-15 10:31:47
|
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 2aaf4e9b02ee434b4d44f4cad82f30acc1432699 (commit)
via 05de65f9a05c88f9738cf303e0885d7dba9488a9 (commit)
from 5c838a79591a3bbb1f9e59878de2d9f3fd350964 (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 2aaf4e9b02ee434b4d44f4cad82f30acc1432699
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jan 15 11:12:38 2014 +0100
[LINUX] 3.12: dts: add GSM, GPS, User button and User led
commit 05de65f9a05c88f9738cf303e0885d7dba9488a9
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jan 15 11:07:39 2014 +0100
[BUILDROOT] mmc-utils: add largefile dependency
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/215-mmc-utils-add_package.patch | 6 ++-
.../3.12/0450-armadeus-add-apf6q-devicetree.patch | 59 ++++++++++++++++++--
2 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/patches/buildroot/2013.11/215-mmc-utils-add_package.patch b/patches/buildroot/2013.11/215-mmc-utils-add_package.patch
index 37d59f9..d7bec2a 100644
--- a/patches/buildroot/2013.11/215-mmc-utils-add_package.patch
+++ b/patches/buildroot/2013.11/215-mmc-utils-add_package.patch
@@ -2,13 +2,17 @@ Index: buildroot/package/mmc-utils/Config.in
===================================================================
--- /dev/null
+++ buildroot/package/mmc-utils/Config.in
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,10 @@
+config BR2_PACKAGE_MMC_UTILS
+ bool "mmc-utils"
++ depends on BR2_LARGEFILE
+ help
+ MMC utils
+
+ https://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git
++
++comment "mmc-utils needs a toolchain w/ largefile"
++ depends on !BR2_LARGEFILE
Index: buildroot/package/mmc-utils/mmc-utils.mk
===================================================================
--- /dev/null
diff --git a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
index 57ee991..13f3b65 100644
--- a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
@@ -1,8 +1,8 @@
-Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
===================================================================
--- /dev/null
-+++ linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,128 @@
++++ linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+@@ -0,0 +1,175 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -44,6 +44,27 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ regulator-always-on;
+ };
+ };
++
++ leds {
++ compatible = "gpio-leds";
++
++ user-led {
++ label = "User LED";
++ gpios = <&gpio7 12 0>;
++ linux,default-trigger = "heartbeat";
++ default-state = "on";
++ };
++ };
++
++ keys {
++ compatible = "gpio-keys";
++
++ user-button {
++ label = "User button";
++ gpios = <&gpio1 9 0>;
++ linux,code = <100>;
++ };
++ };
+};
+
+&sata {
@@ -86,6 +107,8 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
+ >;
+ };
+
@@ -95,6 +118,16 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+ >;
+ };
++
++ pinctrl_uart3_3: uart3grp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
++ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
++ >;
++ };
++
+ };
+};
+
@@ -105,6 +138,20 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
++/* GPS */
++&uart1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart1_1>;
++ status = "okay";
++};
++
++/* GSM */
++&uart3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart3_3>;
++ status = "okay";
++};
++
+/* console */
+&uart4 {
+ pinctrl-names = "default";
@@ -131,10 +178,10 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.12.6/arch/arm/boot/dts/Makefile
+Index: linux-3.12.7/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.12.6.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.12.6/arch/arm/boot/dts/Makefile
+--- linux-3.12.7.orig/arch/arm/boot/dts/Makefile
++++ linux-3.12.7/arch/arm/boot/dts/Makefile
@@ -136,6 +136,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6dl-sabreauto.dtb \
imx6dl-sabresd.dtb \
hooks/post-receive
--
armadeus
|
