[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-31-gf7750a0
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-31-gf7750a0
|
From: jorasse <jo...@us...> - 2012-10-31 20:41:07
|
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 f7750a020b402b0a67815d3d4e6967e057162a48 (commit)
from 81c54ed902086d880cfc6ae1ca82699304ae7f74 (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 f7750a020b402b0a67815d3d4e6967e057162a48
Author: Philippe Reynes <tr...@ya...>
Date: Wed Oct 31 19:07:20 2012 +0100
kernel: add support for the kernel 3.7-rc3
This is a minimal support, only the board apf27 is supported.
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.7-rc3.config | 1 +
...f27-linux-3.6.config => apf27-linux-3.7.config} | 0
patches/linux/3.7-rc3 | 1 +
...02-arm-imx27-fix-low-reference-clock-path.patch | 43 ++++++++++++++++++++
...d-device-tree-file-for-the-armadeus-apf27.patch | 37 ++++++++++-------
5 files changed, 66 insertions(+), 16 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.6.config => apf27-linux-3.7.config} (100%)
create mode 120000 patches/linux/3.7-rc3
create mode 100644 patches/linux/3.7/0002-arm-imx27-fix-low-reference-clock-path.patch
copy patches/linux/{3.6 => 3.7}/0003-Add-device-tree-file-for-the-armadeus-apf27.patch (78%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config
new file mode 120000
index 0000000..2a64a30
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config
@@ -0,0 +1 @@
+apf27-linux-3.7.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
diff --git a/patches/linux/3.7-rc3 b/patches/linux/3.7-rc3
new file mode 120000
index 0000000..548d713
--- /dev/null
+++ b/patches/linux/3.7-rc3
@@ -0,0 +1 @@
+3.7
\ No newline at end of file
diff --git a/patches/linux/3.7/0002-arm-imx27-fix-low-reference-clock-path.patch b/patches/linux/3.7/0002-arm-imx27-fix-low-reference-clock-path.patch
new file mode 100644
index 0000000..1c90423
--- /dev/null
+++ b/patches/linux/3.7/0002-arm-imx27-fix-low-reference-clock-path.patch
@@ -0,0 +1,43 @@
+diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c
+index 3b6b640..f8d9129 100644
+--- a/arch/arm/mach-imx/clk-imx27.c
++++ b/arch/arm/mach-imx/clk-imx27.c
+@@ -51,8 +51,10 @@
+
+ static const char *vpu_sel_clks[] = { "spll", "mpll_main2", };
+ static const char *cpu_sel_clks[] = { "mpll_main2", "mpll", };
++static const char *mpll_sel_clks[] = { "fpm", "mpll_osc_sel", };
++static const char *mpll_osc_sel_clks[] = { "ckih", "ckih_div1p5", };
+ static const char *clko_sel_clks[] = {
+- "ckil", "prem", "ckih", "ckih",
++ "ckil", "fpm", "ckih", "ckih",
+ "ckih", "mpll", "spll", "cpu_div",
+ "ahb", "ipg", "per1_div", "per2_div",
+ "per3_div", "per4_div", "ssi1_div", "ssi2_div",
+@@ -79,7 +81,8 @@ enum mx27_clks {
+ vpu_ahb_gate, fec_ahb_gate, emma_ahb_gate, emi_ahb_gate, dma_ahb_gate,
+ csi_ahb_gate, brom_ahb_gate, ata_ahb_gate, wdog_ipg_gate, usb_ipg_gate,
+ uart6_ipg_gate, uart5_ipg_gate, uart4_ipg_gate, uart3_ipg_gate,
+- uart2_ipg_gate, uart1_ipg_gate, clk_max
++ uart2_ipg_gate, uart1_ipg_gate, ckih_div1p5, fpm, mpll_osc_sel,
++ mpll_sel, clk_max
+ };
+
+ static struct clk *clk[clk_max];
+@@ -91,7 +94,15 @@ int __init mx27_clocks_init(unsigned long fref)
+ clk[dummy] = imx_clk_fixed("dummy", 0);
+ clk[ckih] = imx_clk_fixed("ckih", fref);
+ clk[ckil] = imx_clk_fixed("ckil", 32768);
+- clk[mpll] = imx_clk_pllv1("mpll", "ckih", CCM_MPCTL0);
++ clk[fpm] = imx_clk_fixed_factor("fpm", "ckil", 1024, 1);
++ clk[ckih_div1p5] = imx_clk_fixed_factor("ckih_div1p5", "ckih", 2, 3);
++
++ clk[mpll_osc_sel] = imx_clk_mux("mpll_osc_sel", CCM_CSCR, 4, 1,
++ mpll_osc_sel_clks,
++ ARRAY_SIZE(mpll_osc_sel_clks));
++ clk[mpll_sel] = imx_clk_mux("mpll_sel", CCM_CSCR, 16, 1, mpll_sel_clks,
++ ARRAY_SIZE(mpll_sel_clks));
++ clk[mpll] = imx_clk_pllv1("mpll", "mpll_sel", CCM_MPCTL0);
+ clk[spll] = imx_clk_pllv1("spll", "ckih", CCM_SPCTL0);
+ clk[mpll_main2] = imx_clk_fixed_factor("mpll_main2", "mpll", 2, 3);
+
diff --git a/patches/linux/3.6/0003-Add-device-tree-file-for-the-armadeus-apf27.patch b/patches/linux/3.7/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
similarity index 78%
copy from patches/linux/3.6/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
copy to patches/linux/3.7/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
index 3f87a27..39f70f2 100644
--- a/patches/linux/3.6/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
+++ b/patches/linux/3.7/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
@@ -1,26 +1,30 @@
-From 3268e6cafbdd935d42ace97328b2e8c4b2250c4b Mon Sep 17 00:00:00 2001
+From a0f1721d6b83bfd8a97775adcd81bde5e6c203d5 Mon Sep 17 00:00:00 2001
From: Philippe Reynes <tr...@ya...>
Date: Thu, 28 Jun 2012 20:16:05 +0200
-Subject: [PATCH 3/3] Add device tree file for the armadeus apf27
+Subject: [PATCH v3] Add device tree file for the armadeus apf27
Signed-off-by: Philippe Reynes <tr...@ya...>
Signed-off-by: Eric Jarrige <eri...@ar...>
---
- arch/arm/boot/dts/imx27-apf27.dts | 89 +++++++++++++++++++++++++++++++++++++
- 1 files changed, 89 insertions(+), 0 deletions(-)
+
+v3: set 26M clock to 0 (not used)
+v2: avoid enable again the watchdog
+
+ arch/arm/boot/dts/imx27-apf27.dts | 92 +++++++++++++++++++++++++++++++++++++
+ 1 files changed, 92 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/boot/dts/imx27-apf27.dts
diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
new file mode 100644
-index 0000000..d0d0793
+index 0000000..bf07d8d
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-apf27.dts
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,92 @@
+/*
+ * Copyright 2012 Philippe Reynes <tr...@ya...>
++ * Copyright 2012 Armadeus Systems <su...@ar...>
+ *
-+ * Based on imx27-phytec-phycore.dts
-+ * Copyright 2012 Sascha Hauer, Pengutronix
++ * Based on code which is: Copyright 2012 Sascha Hauer, Pengutronix
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
@@ -47,17 +51,12 @@ index 0000000..d0d0793
+
+ osc26m {
+ compatible = "fsl,imx-osc26m", "fixed-clock";
-+ clock-frequency = <33554432>;
++ clock-frequency = <0>;
+ };
+ };
+
+ soc {
-+ aipi@10000000 { /* aipi */
-+
-+ wdog@10002000 {
-+ status = "okay";
-+ };
-+
++ aipi@10000000 {
+ serial@1000a000 {
+ status = "okay";
+ };
@@ -78,26 +77,32 @@ index 0000000..d0d0793
+ label = "u-boot";
+ reg = <0x0 0x100000>;
+ };
++
+ partition@100000 {
+ label = "env";
+ reg = <0x100000 0x80000>;
+ };
++
+ partition@180000 {
+ label = "env2";
+ reg = <0x180000 0x80000>;
+ };
++
+ partition@200000 {
+ label = "firmware";
+ reg = <0x200000 0x80000>;
+ };
++
+ partition@280000 {
+ label = "dtb";
+ reg = <0x280000 0x80000>;
+ };
++
+ partition@300000 {
+ label = "kernel";
+ reg = <0x300000 0x500000>;
+ };
++
+ partition@800000 {
+ label = "rootfs";
+ reg = <0x800000 0xf800000>;
@@ -108,5 +113,5 @@ index 0000000..d0d0793
+
+};
--
-1.7.1
+1.7.4.4
hooks/post-receive
--
armadeus
|
