[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-276-g30d0a00
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-276-g30d0a00
|
From: Sébastien S. <ss...@us...> - 2014-06-11 08:22:03
|
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 30d0a009be4caa37ac33b25d368d30aafbff2ecf (commit)
via 1d045049055b294d39379472f6ec74f2e933caeb (commit)
from 96af776e04caa35cbd327233364a94d43c8037f5 (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 30d0a009be4caa37ac33b25d368d30aafbff2ecf
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jun 11 10:17:19 2014 +0200
[LINUX] 3.15: move to 3.15
commit 1d045049055b294d39379472f6ec74f2e933caeb
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jun 11 10:07:47 2014 +0200
[LINUX] 3.15: apf6: dts: fix gsm muxing and add gpios node
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
.../armadeus/apf27/apf27-linux-3.15-rc8.config | 1 -
.../armadeus/apf28/apf28-linux-3.15-rc8.config | 1 -
.../armadeus/apf51/apf51-linux-3.15-rc8.config | 1 -
patches/linux/3.15-rc8 | 1 -
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 62 +++++++++++---------
6 files changed, 35 insertions(+), 33 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc8.config
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc8.config
delete mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc8.config
delete mode 120000 patches/linux/3.15-rc8
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index a1e3d67..9919cbe 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -22,7 +22,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15-rc8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc8.config
deleted file mode 120000
index badcea0..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.15.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc8.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc8.config
deleted file mode 120000
index 3ba4223..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.15.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc8.config
deleted file mode 120000
index 4865fee..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf51-linux-3.15.config
\ No newline at end of file
diff --git a/patches/linux/3.15-rc8 b/patches/linux/3.15-rc8
deleted file mode 120000
index 230693c..0000000
--- a/patches/linux/3.15-rc8
+++ /dev/null
@@ -1 +0,0 @@
-3.15
\ No newline at end of file
diff --git a/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index fdf1e6b..e6f4a52 100644
--- a/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.15-rc5/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.15-rc8/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc5/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.15-rc8/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,10 +31,10 @@ Index: linux-3.15-rc5/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -167,11 +167,11 @@ Index: linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,445 @@
++++ linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,451 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -396,7 +396,8 @@ Index: linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+/* GSM */
+&uart3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
++ pinctrl-0 = <&pinctrl_uart3 &pinctrl_gsm>;
++ fsl,uart-has-rtscts;
+ status = "okay";
+};
+
@@ -444,24 +445,7 @@ Index: linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+
+&iomuxc {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ hog {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x80000000
-+ MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x80000000
-+ MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x80000000
-+ MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000
-+ MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 0x80000000
-+ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000
-+ MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x80000000
-+ MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19 0x80000000
-+ MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x80000000
-+ MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x80000000
-+ >;
-+ };
-+ };
++ pinctrl-0 = <&pinctrl_gpios>;
+
+ apf6dev {
+ pinctrl_audmux: audmuxgrp {
@@ -503,6 +487,28 @@ Index: linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ >;
+ };
+
++ pinctrl_gpios: gpiosgrp {
++ fsl,pins = <
++ MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x80000000
++ MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x80000000
++ MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x80000000
++ MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000
++ MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 0x80000000
++ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000
++ MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x80000000
++ MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19 0x80000000
++ MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x80000000
++ MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x80000000
++ >;
++ };
++
++ pinctrl_gsm: gsmgrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 /* GSM_POKIN */
++ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x80000000 /* GSM_PWR_EN */
++ >;
++ };
++
+ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
@@ -617,10 +623,10 @@ Index: linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+};
-Index: linux-3.15-rc5/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.15-rc8/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc5/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.15-rc8/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
hooks/post-receive
--
armadeus
|