[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-141-g399f87d

[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  399f87de9f61b4cd37e8de289a72865ee35e8cde (commit)
       via  dd64cf51c4c7849e30460eda2d8d215c2b0f1293 (commit)
      from  2e8243fe1d2a79c616e55b8d70c938a139f63898 (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 399f87de9f61b4cd37e8de289a72865ee35e8cde
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 30 22:36:01 2013 +0100

    [DEBUG] imx5regs: add M4IF_CR register

commit dd64cf51c4c7849e30460eda2d8d215c2b0f1293
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 30 22:34:39 2013 +0100

    [TEST] Makes test_backlight.sh works on recent kernels (APF27/APF9328)

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

Summary of changes:
 target/linux/debug/imxregs/imx5regs.h |    2 ++
 target/test/test_backlight.sh         |    9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/target/linux/debug/imxregs/imx5regs.h b/target/linux/debug/imxregs/imx5regs.h
index 21b9557..fd151f7 100644
--- a/target/linux/debug/imxregs/imx5regs.h
+++ b/target/linux/debug/imxregs/imx5regs.h
@@ -370,4 +370,6 @@ static struct reg_info regs[] =
 /* IOMUX */
 { "IOMUXC_SW_MUX_CTL_PAD_I2C1_CLK",	0x73FA81F8, 0, 0xffffffff, 'x', "Mux control for I2C1_CLK pad" },
 { "IOMUXC_SW_MUX_CTL_PAD_I2C1_DAT",	0x73FA81FC, 0, 0xffffffff, 'x', "Mux control for I2C1_DAT pad" },
+/* M4IF */
+{ "M4IF_CR",	0x63fd8048, 0, 0xffffffff, 'x', "M4IF Control Register" },
 };
diff --git a/target/test/test_backlight.sh b/target/test/test_backlight.sh
index 6ddbd99..1c145f6 100755
--- a/target/test/test_backlight.sh
+++ b/target/test/test_backlight.sh
@@ -3,7 +3,7 @@
 #
 # Script to test Armadeus Software release
 #
-#  Copyright (C) 2008-2012 The Armadeus Project - Armadeus Systems
+#  Copyright (C) 2008-20123 The Armadeus Project - Armadeus Systems
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,8 +17,13 @@ SYS_DIR=/sys/class/backlight/imx-bl
 
 load_driver()
 {
+        LINUX_VERSION=`uname -r`
 	if [ "$1" == "APF9328" ] || [ "$1" == "APF27" ]; then
-		modprobe imx_bl
+                if [ "$LINUX_VERSION" == "2.6.29.6" ]; then
+			modprobe imx_bl
+		else
+			SYS_DIR=/sys/class/backlight/imxfb-bl
+		fi
 	elif [ "$1" == "APF51" ]; then
 		echo "Not supported yet"
 		exit 0


hooks/post-receive
-- 
armadeus