[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-141-gdac6206
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-141-gdac6206
|
From: Sébastien S. <ss...@us...> - 2014-02-19 10:40:56
|
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 dac62062b051331a8d5776fbb073319d0f27bea0 (commit)
via d03d006d57d52353e79fff9afbc2d69b890479c1 (commit)
from 064dce6261d0204efe046bb05438c7703de572b0 (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 dac62062b051331a8d5776fbb073319d0f27bea0
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Feb 19 11:26:07 2014 +0100
[LINUX] 3.14-rc3: apf6: dts: add reset gpio to fec node
commit d03d006d57d52353e79fff9afbc2d69b890479c1
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Feb 19 11:21:01 2014 +0100
[LINUX] 3.14-rc3: apf6: dts: enable SPI
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 38 +++++++++++++------
1 files changed, 26 insertions(+), 12 deletions(-)
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 d322a53..1d0d4da 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
@@ -35,7 +35,7 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
+++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,90 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -71,6 +71,15 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+};
+
++&fec {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet_1>;
++ phy-mode = "rgmii-txid";
++ phy-reset-duration = <2>;
++ phy-reset-gpios = <&gpio1 24 0>;
++ status = "okay";
++};
++
+&iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
@@ -78,9 +87,10 @@ Index: linux-3.14-rc3/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 */
++ 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 */
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000 /* ETH_RST */
+ >;
+ };
+
@@ -95,13 +105,6 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+};
+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_1>;
-+ phy-mode = "rgmii";
-+ status = "okay";
-+};
-+
+/* Bluetooth */
+&uart2 {
+ pinctrl-names = "default";
@@ -127,7 +130,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,161 @@
+@@ -0,0 +1,172 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -188,6 +191,14 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ status = "okay";
+};
+
++&ecspi1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi1_2>;
++ fsl,spi-num-chipselects = <3>;
++ cs-gpios = <&gpio4 9 0>, <&gpio4 10 0>, <&gpio4 11 0>;
++ status = "okay";
++};
++
+&hdmi {
+ ddc = <&i2c1>;
+ status = "okay";
@@ -217,6 +228,9 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
+ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
++ MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x80000000
++ MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x80000000
++ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x80000000
+ >;
+ };
+
hooks/post-receive
--
armadeus
|
