[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-110-g5e82adf
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-110-g5e82adf
|
From: Sébastien S. <ss...@us...> - 2014-02-13 08:21:02
|
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 5e82adf82a96143984fa47010ed535f4038f77ef (commit)
from 92141dbb6c8dbcca2295da1eed25cbfeb23c7d1e (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 5e82adf82a96143984fa47010ed535f4038f77ef
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Feb 13 09:20:04 2014 +0100
[LINUX] 3.14: apf6: add WL_EN and BT_EN muxing to device tree
While at it, use IRQ_TYPE_LEVEL_HIGH macro instead of hardcode value.
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 24 +++++++++++--------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 0568d50..f76a657 100644
--- a/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,11 +31,11 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,76 @@
++++ linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -47,11 +47,13 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ *
+ */
+
++#include <dt-bindings/interrupt-controller/irq.h>
++
+/ {
+ wlan {
+ compatible = "ti,wilink6";
+ interrupt-parent = <&gpio2>;
-+ interrupts = <10 0x4>; /* gpio line 43, high level triggered */
++ interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; /* gpio line 42, high level triggered */
+ clocks = <&refclock>, <&tcxoclock>;
+ clock-names = "refclock", "tcxoclock";
+
@@ -76,7 +78,9 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
+ >;
+ };
+
@@ -112,10 +116,10 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -279,10 +283,10 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
-Index: linux-3.14-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.14-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.14-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.14-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
hooks/post-receive
--
armadeus
|
