[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-381-gb1f085c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-381-gb1f085c
|
From: Sébastien S. <ss...@us...> - 2014-08-11 15:36: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 b1f085cfc744c2dd98805e84095f0fe8c8e93050 (commit)
from 3cbfe63b03b05103b9460a6093fbac54962bb41d (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 b1f085cfc744c2dd98805e84095f0fe8c8e93050
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Aug 11 17:39:28 2014 +0200
[LINUX] APF6 (3.10-legacy): fix ethernet pin muxing
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 64 +++++++++++++-------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 7f755f6..7341c3a 100644
--- a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts 2014-08-08 11:51:35.269075208 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -35,8 +35,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
+*/
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi 2014-08-08 11:51:35.269075208 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -96,8 +96,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -218,7 +218,7 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dt
+
+&fec {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_3>;
++ pinctrl-0 = <&pinctrl_enet_4>;
+ phy-mode = "rgmii";
+ phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ status = "okay";
@@ -283,8 +283,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dt
+
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -312,8 +312,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -351,8 +351,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -399,8 +399,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -438,8 +438,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -486,17 +486,39 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi
===================================================================
---- linux-wandboard_imx_3.10.17_1.0.0_ga.orig/arch/arm/boot/dts/imx6qdl.dtsi 2014-07-11 21:53:12.000000000 +0200
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi 2014-08-08 12:42:33.948242320 +0200
-@@ -1166,6 +1166,7 @@
+--- linux-wandboard_imx_3.10.17_1.0.0_ga.orig/arch/arm/boot/dts/imx6qdl.dtsi
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi
+@@ -1166,6 +1166,29 @@
MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
+ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
++ >;
++ };
++
++ pinctrl_enet_4: enetgrp-4 {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
++ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
++ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030
++ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
++ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
++ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030
++ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030
++ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1f030
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1f030
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
++ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000
>;
};
};
-@@ -1354,6 +1355,12 @@
+@@ -1354,6 +1377,12 @@
MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
>;
};
hooks/post-receive
--
armadeus
|