[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-438-gcd8f9fb
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-438-gcd8f9fb
|
From: Julien B a. A. <ar...@us...> - 2012-07-09 07:35:59
|
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 cd8f9fb63a794fd62a08013bf0b4413db90d481c (commit)
via 2cf580bb039ba2f8418c38cc6cd0a8179b6fadf0 (commit)
from c6f615585034a937078a44cbb5d06eecfc7f5d8f (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 cd8f9fb63a794fd62a08013bf0b4413db90d481c
Merge: 2cf580b c6f6155
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jul 9 09:35:16 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 2cf580bb039ba2f8418c38cc6cd0a8179b6fadf0
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jul 9 09:34:41 2012 +0200
[LINUX] Add 3.5 with device tree support for APF28 (preliminary)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-3.5-rc5.config | 1 +
...f28-linux-3.4.config => apf28-linux-3.5.config} | 7 +-
patches/linux/{3.5-rc4 => 3.5-rc5} | 0
...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 +++++++++
.../3.5/0403-armadeus-Add-apf28-dts-files.patch | 57 ++++++++++
7 files changed, 318 insertions(+), 4 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.4.config => apf28-linux-3.5.config} (99%)
copy patches/linux/{3.5-rc4 => 3.5-rc5} (100%)
create mode 100644 patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch
create mode 100644 patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch
create mode 100644 patches/linux/3.5/0402-free-electrons-ARM-dts-imx28-Add-additionnal-muxing-options-to-iMX28-DTSI.patch
create mode 100644 patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch
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
new file mode 120000
index 0000000..d95fa64
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config
@@ -0,0 +1 @@
+apf28-linux-3.5.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
similarity index 99%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
index 3ac10f1..2fbedd1 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
@@ -3,6 +3,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_EMBEDDED=y
# CONFIG_COMPAT_BRK is not set
@@ -16,11 +18,8 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MXS=y
+CONFIG_MACH_MXS_DT=y
CONFIG_MACH_MX28EVK=y
-CONFIG_MACH_APF28=y
-CONFIG_MACH_APF28_DEV=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
diff --git a/patches/linux/3.5-rc4 b/patches/linux/3.5-rc5
similarity index 100%
copy from patches/linux/3.5-rc4
copy to patches/linux/3.5-rc5
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
new file mode 100644
index 0000000..3361c3f
--- /dev/null
+++ b/patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch
@@ -0,0 +1,90 @@
+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
new file mode 100644
index 0000000..dde4267
--- /dev/null
+++ b/patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch
@@ -0,0 +1,116 @@
+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 = &auart4;
+ };
+
+ cpus {
+@@ -184,6 +189,22 @@
+ fsl,drive-strength = <2>;
+ };
+
++ auart0_pins_a: auart0@0 {
++ reg = <0>;
++ fsl,pinmux-ids = <0x3000 0x3010 0x3020 0x3030>;
++ fsl,drive-strength = <0>;
++ fsl,voltage = <1>;
++ fsl,pull-up = <0>;
++ };
++
++ auart3_pins_a: auart3@0 {
++ reg = <0>;
++ fsl,pinmux-ids = <0x30c0 0x30d0 0x30e0 0x30f0>;
++ fsl,drive-strength = <0>;
++ fsl,voltage = <1>;
++ fsl,pull-up = <0>;
++ };
++
+ mac0_pins_a: mac0@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <0x4000 0x4010 0x4020
+@@ -421,30 +442,35 @@
+ };
+
+ auart0: serial@8006a000 {
++ compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ reg = <0x8006a000 0x2000>;
+ interrupts = <112 70 71>;
+ status = "disabled";
+ };
+
+ auart1: serial@8006c000 {
++ compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ reg = <0x8006c000 0x2000>;
+ interrupts = <113 72 73>;
+ status = "disabled";
+ };
+
+ auart2: serial@8006e000 {
++ compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ reg = <0x8006e000 0x2000>;
+ interrupts = <114 74 75>;
+ status = "disabled";
+ };
+
+ auart3: serial@80070000 {
++ compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ reg = <0x80070000 0x2000>;
+ interrupts = <115 76 77>;
+ status = "disabled";
+ };
+
+ auart4: serial@80072000 {
++ compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ reg = <0x80072000 0x2000>;
+ interrupts = <116 78 79>;
+ status = "disabled";
+--
+1.7.0.4
+
diff --git a/patches/linux/3.5/0402-free-electrons-ARM-dts-imx28-Add-additionnal-muxing-options-to-iMX28-DTSI.patch b/patches/linux/3.5/0402-free-electrons-ARM-dts-imx28-Add-additionnal-muxing-options-to-iMX28-DTSI.patch
new file mode 100644
index 0000000..fa8b9f1
--- /dev/null
+++ b/patches/linux/3.5/0402-free-electrons-ARM-dts-imx28-Add-additionnal-muxing-options-to-iMX28-DTSI.patch
@@ -0,0 +1,51 @@
+From 3e04b45679625db2804e5edabe55d45b603664e9 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <max...@fr...>
+Date: Wed, 27 Jun 2012 10:18:11 +0200
+Subject: [PATCH] ARM: dts: imx28: Add additionnal muxing options to iMX28 DTSI
+
+Signed-off-by: Maxime Ripard <max...@fr...>
+Cc: Brian Lily <br...@cr...>
+Reviewed-by: Marek Vasut <ma...@de...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/boot/dts/imx28.dtsi | 17 +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
+index ee3778a..65d6a53 100644
+--- a/arch/arm/boot/dts/imx28.dtsi
++++ b/arch/arm/boot/dts/imx28.dtsi
+@@ -172,6 +172,14 @@
+ fsl,pull-up = <0>;
+ };
+
++ duart_pins_b: duart@1 {
++ reg = <1>;
++ fsl,pinmux-ids = <0x3022 0x3032>;
++ fsl,drive-strength = <0>;
++ fsl,voltage = <1>;
++ fsl,pull-up = <0>;
++ };
++
+ gpmi_pins_a: gpmi-nand@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <0x0000 0x0010 0x0020
+@@ -234,6 +242,15 @@
+ fsl,pull-up = <1>;
+ };
+
++ mmc0_4bit_pins_a: mmc0-4bit@0 {
++ reg = <0>;
++ fsl,pinmux-ids = <0x2000 0x2010 0x2020
++ 0x2030 0x2080 0x2090 0x20a0>;
++ fsl,drive-strength = <1>;
++ fsl,voltage = <1>;
++ fsl,pull-up = <1>;
++ };
++
+ mmc0_cd_cfg: mmc0-cd-cfg {
+ fsl,pinmux-ids = <0x2090>;
+ fsl,pull-up = <0>;
+--
+1.7.0.4
+
diff --git a/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch b/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch
new file mode 100644
index 0000000..8e1a561
--- /dev/null
+++ b/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch
@@ -0,0 +1,57 @@
+Index: linux-3.5-rc5/arch/arm/boot/dts/imx28-apf28.dts
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.5-rc5/arch/arm/boot/dts/imx28-apf28.dts 2012-07-09 08:29:09.000000000 +0200
+@@ -0,0 +1,52 @@
++/*
++ * Copyright 2012 Armadeus Systems - <su...@ar...>
++ *
++ * Based on code which is:
++ * Copyright 2012 Freescale Semiconductor, Inc.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "imx28.dtsi"
++
++/ {
++ model = "Armadeus Systems APF28 module";
++ compatible = "armadeus,imx28-apf28", "fsl,imx28";
++
++ memory {
++ reg = <0x40000000 0x08000000>;
++ };
++
++ apb@80000000 {
++ apbh@80000000 {
++ gpmi-nand@8000c000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
++ status = "okay";
++ };
++ };
++
++ apbx@80040000 {
++ duart: serial@80074000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&duart_pins_a>;
++ status = "okay";
++ };
++ };
++ };
++
++ ahb@80080000 {
++ mac0: ethernet@800f0000 {
++ phy-mode = "rmii";
++ pinctrl-names = "default";
++ pinctrl-0 = <&mac0_pins_a>;
++ status = "okay";
++ };
++ };
++};
hooks/post-receive
--
armadeus
|
