[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-139-g064dce6
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-139-g064dce6
|
From: Sébastien S. <ss...@us...> - 2014-02-19 10:03:22
|
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 064dce6261d0204efe046bb05438c7703de572b0 (commit)
via 90cf41499ecc86098a999084b4410c0a0b807edf (commit)
via 06c7766c55eb5a46299b120be999324f55f9e681 (commit)
via 0dd8b821691b6a23001b0a9465480ed69d4db7fc (commit)
from db6d652fa48b9599a9f4a5678bfc6b0f92a3e0b2 (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 064dce6261d0204efe046bb05438c7703de572b0
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Feb 19 10:27:36 2014 +0100
[LINUX] 3.14: apf6 config: add AT803x PHYs support
commit 90cf41499ecc86098a999084b4410c0a0b807edf
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Feb 18 15:18:35 2014 +0100
[LINUX] 3.14-rc3: apf6: dts: enable CAN Bus
commit 06c7766c55eb5a46299b120be999324f55f9e681
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Feb 18 15:16:17 2014 +0100
[LINUX] 3.14-rc3: apf6 config: enable CAN Bus
commit 0dd8b821691b6a23001b0a9465480ed69d4db7fc
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Feb 18 13:34:39 2014 +0100
[LINUX] 3.14-rc3: apf6: add aliases for can interfaces
This patch comes from https://patchwork.kernel.org/patch/3332181/
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-linux-3.14.config | 8 +++--
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 8 ++++-
...ts-imx6qdl-add-aliases-for-can-interfaces.patch | 36 ++++++++++++++++++++
3 files changed, 48 insertions(+), 4 deletions(-)
create mode 100644 patches/linux/3.14-rc3/0503-1-4-ARM-dts-imx6qdl-add-aliases-for-can-interfaces.patch
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
index 10b243d..b2142ae 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
@@ -62,6 +62,10 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_LRO is not set
CONFIG_IPV6=y
CONFIG_NETFILTER=y
+CONFIG_CAN=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_FLEXCAN=m
CONFIG_BT=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
@@ -76,8 +80,6 @@ CONFIG_CFG80211=y
CONFIG_NL80211_TESTMODE=y
CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=y
-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
@@ -130,6 +132,7 @@ CONFIG_SMC91X=y
CONFIG_SMC911X=y
CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_AT803X_PHY=y
# CONFIG_RTL_CARDS is not set
CONFIG_WL_TI=y
CONFIG_WL12XX=m
@@ -300,4 +303,3 @@ CONFIG_LIBCRC32C=m
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
-
diff --git a/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index be62fc1..d322a53 100644
--- a/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -127,7 +127,7 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
+++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,161 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -182,6 +182,12 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+};
+
++&can2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_flexcan2_1>;
++ status = "okay";
++};
++
+&hdmi {
+ ddc = <&i2c1>;
+ status = "okay";
diff --git a/patches/linux/3.14-rc3/0503-1-4-ARM-dts-imx6qdl-add-aliases-for-can-interfaces.patch b/patches/linux/3.14-rc3/0503-1-4-ARM-dts-imx6qdl-add-aliases-for-can-interfaces.patch
new file mode 100644
index 0000000..d80adca
--- /dev/null
+++ b/patches/linux/3.14-rc3/0503-1-4-ARM-dts-imx6qdl-add-aliases-for-can-interfaces.patch
@@ -0,0 +1,36 @@
+From patchwork Thu Dec 12 13:27:57 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [1/4] ARM: dts: imx6qdl: add aliases for can interfaces
+From: Lothar Wassmann <LW...@KA...>
+X-Patchwork-Id: 3332181
+Message-Id: <138...@KA...>
+To: lin...@li...
+Cc: Mark Rutland <mar...@ar...>, dev...@vg...,
+ Pawel Moll <paw...@ar...>,
+ Ian Campbell <ijc...@he...>,
+ Rob Herring <ro...@ke...>, Kumar Gala <ga...@co...>,
+ Shawn Guo <sha...@li...>,
+ =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= <LW...@KA...>
+Date: Thu, 12 Dec 2013 14:27:57 +0100
+
+Signed-off-by: Lothar WaÃmann <LW...@KA...>
+
+---
+arch/arm/boot/dts/imx6qdl.dtsi | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl.dtsi
+===================================================================
+--- linux-3.14-rc3.orig/arch/arm/boot/dts/imx6qdl.dtsi
++++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl.dtsi
+@@ -14,6 +14,8 @@
+
+ / {
+ aliases {
++ can0 = &can1;
++ can1 = &can2;
+ gpio0 = &gpio1;
+ gpio1 = &gpio2;
+ gpio2 = &gpio3;
hooks/post-receive
--
armadeus
|
