[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-38-gb0632bf
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-38-gb0632bf
|
From: Julien B a. A. <ar...@us...> - 2012-09-22 16:57:36
|
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 b0632bf57d4774fbc6a7d642cb0fa6616d5fc96f (commit)
via ed73c9c214a49e0e5e38b2a784481b6427d74138 (commit)
via 82460a11c6ab78ed6759bfdb4e73a006fe99d594 (commit)
from ea1a5ff76b8d8da7845c6cf541d51ee6a78e00d9 (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 b0632bf57d4774fbc6a7d642cb0fa6616d5fc96f
Merge: ed73c9c ea1a5ff
Author: Julien Boibessot <jul...@ar...>
Date: Sat Sep 22 18:54:34 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit ed73c9c214a49e0e5e38b2a784481b6427d74138
Author: Julien Boibessot <jul...@ar...>
Date: Sat Sep 22 18:53:00 2012 +0200
[LINUX] Move 3.x support to 3.6-rc6 (part 2)
commit 82460a11c6ab78ed6759bfdb4e73a006fe99d594
Author: Julien Boibessot <jul...@ar...>
Date: Fri Sep 21 22:22:33 2012 +0200
[LINUX] Move 3.x support to 3.6-rc6 (part 1)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-3.5-rc5.config | 1 -
.../armadeus/apf28/apf28-linux-3.6-rc6.config | 1 +
...f28-linux-3.5.config => apf28-linux-3.6.config} | 0
patches/linux/3.5-rc4 | 1 -
patches/linux/3.5-rc5 | 1 -
...0400-freescale-mx28_add_gpmi-nand_support.patch | 90 ---------------
...dts-mx28evk-Add-auart0-and-auart3-support.patch | 116 --------------------
...-additionnal-muxing-options-to-iMX28-DTSI.patch | 51 ---------
patches/linux/3.6-rc6 | 1 +
...002-Add-nand-platform-on-imx27-devicetree.patch | 4 +-
...d-device-tree-file-for-the-armadeus-apf27.patch | 0
.../0403-armadeus-Add-apf28-dts-files.patch | 0
...04-armadeus-mx28_Initialize_fec_phy_clock.patch | 0
...0405-armadeus-mx28_rename_gpmi_nand_clock.patch | 0
14 files changed, 4 insertions(+), 262 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.6-rc6.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.5.config => apf28-linux-3.6.config} (100%)
delete mode 120000 patches/linux/3.5-rc4
delete mode 120000 patches/linux/3.5-rc5
delete mode 100644 patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch
delete mode 100644 patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch
delete mode 100644 patches/linux/3.5/0402-free-electrons-ARM-dts-imx28-Add-additionnal-muxing-options-to-iMX28-DTSI.patch
create mode 120000 patches/linux/3.6-rc6
rename patches/linux/{3.5 => 3.6}/0002-Add-nand-platform-on-imx27-devicetree.patch (92%)
rename patches/linux/{3.5 => 3.6}/0003-Add-device-tree-file-for-the-armadeus-apf27.patch (100%)
rename patches/linux/{3.5 => 3.6}/0403-armadeus-Add-apf28-dts-files.patch (100%)
rename patches/linux/{3.5 => 3.6}/0404-armadeus-mx28_Initialize_fec_phy_clock.patch (100%)
rename patches/linux/{3.5 => 3.6}/0405-armadeus-mx28_rename_gpmi_nand_clock.patch (100%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config
deleted file mode 120000
index d95fa64..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.5.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6-rc6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.6-rc6.config
new file mode 120000
index 0000000..84bcecd
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.6-rc6.config
@@ -0,0 +1 @@
+apf28-linux-3.6.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
diff --git a/patches/linux/3.5-rc4 b/patches/linux/3.5-rc4
deleted file mode 120000
index 56e972a..0000000
--- a/patches/linux/3.5-rc4
+++ /dev/null
@@ -1 +0,0 @@
-3.5
\ No newline at end of file
diff --git a/patches/linux/3.5-rc5 b/patches/linux/3.5-rc5
deleted file mode 120000
index 56e972a..0000000
--- a/patches/linux/3.5-rc5
+++ /dev/null
@@ -1 +0,0 @@
-3.5
\ No newline at end of file
diff --git a/patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch b/patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch
deleted file mode 100644
index 3361c3f..0000000
--- a/patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 5ed18fcf1309b9c62f56993371c63ba462d422d6 Mon Sep 17 00:00:00 2001
-From: Huang Shijie <b3...@fr...>
-Date: Fri, 25 May 2012 17:25:35 +0800
-Subject: [PATCH] ARM: mx28: add gpmi-nand support
-
-add gpmi-nand device tree support.
-add gpmi-nand pinctrl support.
-
-Also enable the gpmi support for mx28-evk board.
-
-Signed-off-by: Huang Shijie <b3...@fr...>
-Signed-off-by: Shawn Guo <sha...@li...>
----
- arch/arm/boot/dts/imx28-evk.dts | 6 ++++++
- arch/arm/boot/dts/imx28.dtsi | 35 ++++++++++++++++++++++++++---------
- 2 files changed, 32 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
-index ee520a5..e53cf67 100644
---- a/arch/arm/boot/dts/imx28-evk.dts
-+++ b/arch/arm/boot/dts/imx28-evk.dts
-@@ -22,6 +22,12 @@
-
- apb@80000000 {
- apbh@80000000 {
-+ gpmi-nand@8000c000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
-+ status = "okay";
-+ };
-+
- ssp0: ssp@80010000 {
- compatible = "fsl,imx28-mmc";
- pinctrl-names = "default";
-diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
-index 4634cb8..a89da5a 100644
---- a/arch/arm/boot/dts/imx28.dtsi
-+++ b/arch/arm/boot/dts/imx28.dtsi
-@@ -68,15 +68,15 @@
- status = "disabled";
- };
-
-- bch@8000a000 {
-- reg = <0x8000a000 2000>;
-- interrupts = <41>;
-- status = "disabled";
-- };
--
-- gpmi@8000c000 {
-- reg = <0x8000c000 2000>;
-- interrupts = <42 88>;
-+ gpmi-nand@8000c000 {
-+ compatible = "fsl,imx28-gpmi-nand";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ reg = <0x8000c000 2000>, <0x8000a000 2000>;
-+ reg-names = "gpmi-nand", "bch";
-+ interrupts = <88>, <41>;
-+ interrupt-names = "gpmi-dma", "bch";
-+ fsl,gpmi-dma-channel = <4>;
- status = "disabled";
- };
-
-@@ -167,6 +167,23 @@
- fsl,pull-up = <0>;
- };
-
-+ gpmi_pins_a: gpmi-nand@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <0x0000 0x0010 0x0020
-+ 0x0030 0x0040 0x0050 0x0060
-+ 0x0070 0x0100 0x0110 0x0140
-+ 0x0150 0x0180 0x0190 0x01a0
-+ 0x01b0 0x01c0>;
-+ fsl,drive-strength = <0>;
-+ fsl,voltage = <1>;
-+ fsl,pull-up = <0>;
-+ };
-+
-+ gpmi_status_cfg: gpmi-status-cfg {
-+ fsl,pinmux-ids = <0x0180 0x0190 0x01c0>;
-+ fsl,drive-strength = <2>;
-+ };
-+
- mac0_pins_a: mac0@0 {
- reg = <0>;
- fsl,pinmux-ids = <0x4000 0x4010 0x4020
---
-1.7.0.4
-
diff --git a/patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch b/patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch
deleted file mode 100644
index dde4267..0000000
--- a/patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 65513dde63e0c7633aefd30d8fa69fd571b84d5b Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <fab...@fr...>
-Date: Fri, 15 Jun 2012 12:35:56 -0300
-Subject: [PATCH] ARM: dts: mx28evk: Add auart0 and auart3 support
-
-Add auart0 and auart3 support.
-
-Signed-off-by: Fabio Estevam <fab...@fr...>
-Reviewed-by: Marek Vasut <ma...@de...>
-Signed-off-by: Shawn Guo <sha...@li...>
----
- arch/arm/boot/dts/imx28-evk.dts | 12 ++++++++++++
- arch/arm/boot/dts/imx28.dtsi | 26 ++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
-index e53cf67..319c75a 100644
---- a/arch/arm/boot/dts/imx28-evk.dts
-+++ b/arch/arm/boot/dts/imx28-evk.dts
-@@ -79,6 +79,18 @@
- pinctrl-0 = <&duart_pins_a>;
- status = "okay";
- };
-+
-+ auart0: serial@8006a000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&auart0_pins_a>;
-+ status = "okay";
-+ };
-+
-+ auart3: serial@80070000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&auart3_pins_a>;
-+ status = "okay";
-+ };
- };
- };
-
-diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
-index a89da5a..ee3778a 100644
---- a/arch/arm/boot/dts/imx28.dtsi
-+++ b/arch/arm/boot/dts/imx28.dtsi
-@@ -22,6 +22,11 @@
- gpio4 = &gpio4;
- saif0 = &saif0;
- saif1 = &saif1;
-+ serial0 = &auart0;
-+ serial1 = &auart1;
-+ serial2 = &auart2;
-+ serial3 = &auart3;
-+ serial4 = &auart |
