[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-65-g67c99a9

[Julien B a. A. <ar...@us...>]

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  67c99a9a1f37c11a95dd0ea178af3e253f761e12 (commit)
      from  fb71824e5dc68a1fa3fac271b23434da31620da5 (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 67c99a9a1f37c11a95dd0ea178af3e253f761e12
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 23 14:44:31 2014 +0100

    [LINUX] apf27: 3.12+: makes VPU firmware loading OK

-----------------------------------------------------------------------

Summary of changes:
 ...-armadeus-fixes-vpu-spll-clock-dependency.patch |   18 ++++++++++++++++++
 ...-armadeus-fixes-vpu-spll-clock-dependency.patch |   18 ++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.12/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
 create mode 100644 patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch

diff --git a/patches/linux/3.12/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.12/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
new file mode 100644
index 0000000..5749479
--- /dev/null
+++ b/patches/linux/3.12/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
@@ -0,0 +1,18 @@
+Otherwise using VPU doesn't activate SPLL (if not already up with USB
+for example) and VPU firmware loading crashes at first coda_write().
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.12.8/arch/arm/mach-imx/clk-imx27.c
+===================================================================
+--- linux-3.12.8.orig/arch/arm/mach-imx/clk-imx27.c	2014-01-23 14:10:09.348774899 +0100
++++ linux-3.12.8/arch/arm/mach-imx/clk-imx27.c	2014-01-23 14:10:48.072966935 +0100
+@@ -49,7 +49,7 @@
+ #define CCM_SPCTL1_LF           (1 << 15)
+ #define CCM_SPCTL1_BRMO         (1 << 6)
+ 
+-static const char *vpu_sel_clks[] = { "spll", "mpll_main2", };
++static const char *vpu_sel_clks[] = { "spll_gate", "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", };
diff --git a/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
new file mode 100644
index 0000000..43d37fa
--- /dev/null
+++ b/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
@@ -0,0 +1,18 @@
+Otherwise using VPU doesn't activate SPLL (if not already up with USB
+for example) and VPU firmware loading crashes at first coda_write().
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.13/arch/arm/mach-imx/clk-imx27.c
+===================================================================
+--- linux-3.13.orig/arch/arm/mach-imx/clk-imx27.c	2014-01-23 14:10:09.348774899 +0100
++++ linux-3.13/arch/arm/mach-imx/clk-imx27.c	2014-01-23 14:10:48.072966935 +0100
+@@ -49,7 +49,7 @@
+ #define CCM_SPCTL1_LF           (1 << 15)
+ #define CCM_SPCTL1_BRMO         (1 << 6)
+ 
+-static const char *vpu_sel_clks[] = { "spll", "mpll_main2", };
++static const char *vpu_sel_clks[] = { "spll_gate", "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", };


hooks/post-receive
-- 
armadeus