[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-247-g121db0b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-247-g121db0b
|
From: jorasse <jo...@us...> - 2014-05-02 10:37:38
|
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 121db0b2d284e5d8de7bd8cf0c16910eb4f38d97 (commit)
via 77b0b2dda5fdbdcbfee89381fdec3e4655b5cfc6 (commit)
via 894aaff73033e569e74492e0f5e0b1829edf52b3 (commit)
from 7ab179cf3a5e8d224fccfc39089cb97524c4416b (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 121db0b2d284e5d8de7bd8cf0c16910eb4f38d97
Author: Eric Jarrige <eri...@ar...>
Date: Fri May 2 12:02:21 2014 +0200
[LINUX] 3.15: afp51: fix pinctrl
commit 77b0b2dda5fdbdcbfee89381fdec3e4655b5cfc6
Author: Philippe Reynes <tr...@ya...>
Date: Thu May 1 15:53:40 2014 +0200
[LINUX] 3.10: move to 3.10.38
commit 894aaff73033e569e74492e0f5e0b1829edf52b3
Author: Philippe Reynes <tr...@ya...>
Date: Thu May 1 15:53:39 2014 +0200
[LINUX] 3.15: move to 3.15-rc3
-----------------------------------------------------------------------
Summary of changes:
...x-3.10.37.config => apf27-linux-3.10.38.config} | 0
...3.15-rc2.config => apf27-linux-3.15-rc3.config} | 0
...x-3.10.37.config => apf28-linux-3.10.38.config} | 0
...3.15-rc2.config => apf28-linux-3.15-rc3.config} | 0
...x-3.10.37.config => apf51-linux-3.10.38.config} | 0
...3.15-rc2.config => apf51-linux-3.15-rc3.config} | 0
patches/linux/{3.10.37 => 3.10.38} | 0
patches/linux/3.15/0073-armadeus-tsc2102.patch | 3 +-
.../3.15/0400-Add-apf51-basic-dt-support.patch | 48 +++++++++++++++++++-
.../0401-armadeus-add_apf51dev_baseboard.patch | 37 +++++++++++-----
10 files changed, 73 insertions(+), 15 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.37.config => apf27-linux-3.10.38.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15-rc2.config => apf27-linux-3.15-rc3.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.37.config => apf28-linux-3.10.38.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.15-rc2.config => apf28-linux-3.15-rc3.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.37.config => apf51-linux-3.10.38.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.15-rc2.config => apf51-linux-3.15-rc3.config} (100%)
rename patches/linux/{3.10.37 => 3.10.38} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.37.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.38.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.37.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.38.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc3.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.37.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.38.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.37.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.38.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc3.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.37.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.38.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.37.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.38.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc3.config
diff --git a/patches/linux/3.10.37 b/patches/linux/3.10.38
similarity index 100%
rename from patches/linux/3.10.37
rename to patches/linux/3.10.38
diff --git a/patches/linux/3.15/0073-armadeus-tsc2102.patch b/patches/linux/3.15/0073-armadeus-tsc2102.patch
index 90e8154..84b3e7c 100644
--- a/patches/linux/3.15/0073-armadeus-tsc2102.patch
+++ b/patches/linux/3.15/0073-armadeus-tsc2102.patch
@@ -313,7 +313,7 @@ Index: linux-3.8-rc1/drivers/spi/tsc2102.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8-rc1/drivers/spi/tsc2102.c 2013-01-01 21:19:56.000000000 +0100
-@@ -0,0 +1,1311 @@
+@@ -0,0 +1,1310 @@
+/*
+ * drivers/spi/tsc2102.c
+ *
@@ -353,7 +353,6 @@ Index: linux-3.8-rc1/drivers/spi/tsc2102.c
+#include <linux/hwmon-sysfs.h>
+#include <linux/workqueue.h>
+
-+#include <asm/system.h>
+#include <asm/irq.h>
+#include <asm/io.h>
+
diff --git a/patches/linux/3.15/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.15/0400-Add-apf51-basic-dt-support.patch
index 9fb716d..9136025 100644
--- a/patches/linux/3.15/0400-Add-apf51-basic-dt-support.patch
+++ b/patches/linux/3.15/0400-Add-apf51-basic-dt-support.patch
@@ -27,8 +27,52 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
};
&fec {
-@@ -53,3 +66,31 @@
- pinctrl-0 = <&pinctrl_uart3_2>;
+@@ -72,6 +72,43 @@
+ MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
+ >;
+ };
++ usbh1 {
++ pinctrl_usbh1_1: usbh1grp-1 {
++ fsl,pins = <
++ MX51_PAD_USBH1_DATA0__USBH1_DATA0 0x1e5
++ MX51_PAD_USBH1_DATA1__USBH1_DATA1 0x1e5
++ MX51_PAD_USBH1_DATA2__USBH1_DATA2 0x1e5
++ MX51_PAD_USBH1_DATA3__USBH1_DATA3 0x1e5
++ MX51_PAD_USBH1_DATA4__USBH1_DATA4 0x1e5
++ MX51_PAD_USBH1_DATA5__USBH1_DATA5 0x1e5
++ MX51_PAD_USBH1_DATA6__USBH1_DATA6 0x1e5
++ MX51_PAD_USBH1_DATA7__USBH1_DATA7 0x1e5
++ MX51_PAD_USBH1_CLK__USBH1_CLK 0x1e5
++ MX51_PAD_USBH1_DIR__USBH1_DIR 0x1e5
++ MX51_PAD_USBH1_NXT__USBH1_NXT 0x1e5
++ MX51_PAD_USBH1_STP__USBH1_STP 0x1e5
++ >;
++ };
++ };
++
++ usbh2 {
++ pinctrl_usbh2_1: usbh2grp-1 {
++ fsl,pins = <
++ MX51_PAD_EIM_D16__USBH2_DATA0 0x1e5
++ MX51_PAD_EIM_D17__USBH2_DATA1 0x1e5
++ MX51_PAD_EIM_D18__USBH2_DATA2 0x1e5
++ MX51_PAD_EIM_D19__USBH2_DATA3 0x1e5
++ MX51_PAD_EIM_D20__USBH2_DATA4 0x1e5
++ MX51_PAD_EIM_D21__USBH2_DATA5 0x1e5
++ MX51_PAD_EIM_D22__USBH2_DATA6 0x1e5
++ MX51_PAD_EIM_D23__USBH2_DATA7 0x1e5
++ MX51_PAD_EIM_A24__USBH2_CLK 0x1e5
++ MX51_PAD_EIM_A25__USBH2_DIR 0x1e5
++ MX51_PAD_EIM_A27__USBH2_NXT 0x1e5
++ MX51_PAD_EIM_A26__USBH2_STP 0x1e5
++ >;
++ };
++ };
+ };
+ };
+
+@@ -87,3 +100,31 @@
+ pinctrl-0 = <&pinctrl_uart3>;
status = "okay";
};
+
diff --git a/patches/linux/3.15/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.15/0401-armadeus-add_apf51dev_baseboard.patch
index 58067a6..c490052 100644
--- a/patches/linux/3.15/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.15/0401-armadeus-add_apf51dev_baseboard.patch
@@ -7,8 +7,8 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
--- linux-3.14-rc4.orig/arch/arm/boot/dts/imx51-apf51dev.dts
+++ linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -61,6 +61,12 @@
- gpios = <&gpio1 2 0>;
+@@ -66,6 +66,12 @@
+ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
+
@@ -20,9 +20,9 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
};
};
-@@ -78,6 +84,14 @@
- fsl,spi-num-chipselects = <2>;
- cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>;
+@@ -85,6 +91,14 @@
+ cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
+ <&gpio3 27 GPIO_ACTIVE_LOW>;
status = "okay";
+
+ spidev: spidev@1 {
@@ -35,15 +35,15 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
};
&esdhc1 {
-@@ -92,7 +106,6 @@
+@@ -99,7 +113,6 @@
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_esdhc2_1>;
+ pinctrl-0 = <&pinctrl_esdhc2>;
bus-width = <4>;
- non-removable;
status = "okay";
};
-@@ -102,6 +115,13 @@
+@@ -109,6 +122,13 @@
status = "okay";
};
@@ -57,15 +57,15 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
&iomuxc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_hog>;
-@@ -109,6 +129,7 @@
- hog {
+@@ -116,6 +136,7 @@
+ imx51-apf51dev {
pinctrl_hog: hoggrp {
fsl,pins = <
+ MX51_PAD_GPIO1_8__GPIO1_8 0x0C5
MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
MX51_PAD_EIM_EB3__GPIO2_23 0x0C5
MX51_PAD_EIM_CS4__GPIO2_29 0x100
-@@ -118,6 +139,8 @@
+@@ -125,6 +146,8 @@
MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
@@ -73,4 +73,19 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
+ MX51_PAD_EIM_CS3__GPIO2_28 0x0C5
>;
};
+
+@@ -203,6 +203,14 @@
+ MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
+ >;
+ };
++ uart2 {
++ pinctrl_uart2_1: uart2grp-1 {
++ fsl,pins = <
++ MX51_PAD_UART2_RXD__UART2_RXD 0x1c5
++ MX51_PAD_UART2_TXD__UART2_TXD 0x1c5
++ >;
++ };
++ };
};
+ };
+
hooks/post-receive
--
armadeus
|
