[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-363-g1fef426

[jorasse <jo...@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  1fef426e339d611a55af2c240800b3d091098fdd (commit)
      from  75ea404046b43a99632421ddd02ed1ce232b8c18 (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 1fef426e339d611a55af2c240800b3d091098fdd
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Jun 12 17:10:32 2012 +0200

    [UBOOT] apf51: restore (fix) clock tree frequencies after FPGA firmware upload

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

Summary of changes:
 patches/u-boot/2011.12/401-apf51.patch |    2 +-
 patches/u-boot/2012.04/401-apf51.patch |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/u-boot/2011.12/401-apf51.patch b/patches/u-boot/2011.12/401-apf51.patch
index b752760..98aaf79 100644
--- a/patches/u-boot/2011.12/401-apf51.patch
+++ b/patches/u-boot/2011.12/401-apf51.patch
@@ -1563,7 +1563,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/fpga.c
 +	struct weim *weim = (struct weim *)WEIM_BASE_ADDR;
 +	PRINTF("%s:%d: FPGA POST \n", __FUNCTION__, __LINE__);
 +	/* restore emi_clk_sel */
-+	writel(temp_clk | EMI_CLK_SEL, &mxc_ccm->cbcdr);
++	writel(temp_clk, &mxc_ccm->cbcdr);
 +	udelay(10);		/* wait a few us after emi_clk_sel change */
 +	writel(temp_rcr1, &weim->cs1rcr1);
 +	writel(temp_wcr1, &weim->cs1wcr1);
diff --git a/patches/u-boot/2012.04/401-apf51.patch b/patches/u-boot/2012.04/401-apf51.patch
index 1f63d9d..6b38aeb 100644
--- a/patches/u-boot/2012.04/401-apf51.patch
+++ b/patches/u-boot/2012.04/401-apf51.patch
@@ -1526,7 +1526,7 @@ index 0000000..52f1869
 +	struct weim *weim = (struct weim *)WEIM_BASE_ADDR;
 +	PRINTF("%s:%d: FPGA POST \n", __FUNCTION__, __LINE__);
 +	/* restore emi_clk_sel */
-+	writel(temp_clk | EMI_CLK_SEL, &mxc_ccm->cbcdr);
++	writel(temp_clk, &mxc_ccm->cbcdr);
 +	udelay(10);		/* wait a few us after emi_clk_sel change */
 +	writel(temp_rcr1, &weim->cs1rcr1);
 +	writel(temp_wcr1, &weim->cs1wcr1);


hooks/post-receive
-- 
armadeus