[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-30-g3243007

[Sébastien S. <ss...@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  324300746d1a4057b06d036aa3ecceefd437780a (commit)
      from  4c8bd09d2ecf01c596cac2e752b38ef11fad5bed (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 324300746d1a4057b06d036aa3ecceefd437780a
Author: Sébastien Szymanski <ss...@us...>
Date:   Tue Dec 3 14:42:06 2013 +0100

    [LINUX] 3.12: apf28dev: add user button to device tree.

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

Summary of changes:
 .../3.12/0420-armadeus-Add-apf28dev-dts.patch      |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/patches/linux/3.12/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.12/0420-armadeus-Add-apf28dev-dts.patch
index dd4f946..e0623af 100644
--- a/patches/linux/3.12/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.12/0420-armadeus-Add-apf28dev-dts.patch
@@ -26,15 +26,16 @@ Index: linux-3.12.2/arch/arm/boot/dts/imx28-apf28dev.dts
  			};
  
  			pinctrl@80018000 {
-@@ -48,6 +55,7 @@
+@@ -48,6 +55,8 @@
  						0x1143 /* MX28_PAD_LCD_D20__GPIO_1_20 */
  						0x1153 /* MX28_PAD_LCD_D21__GPIO_1_21 */
  						0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */
 +						0x1173 /* MX28_PAD_LCD_D23__GPIO_1_23 */
++						0x0113 /* MX28_PAD_GPMI_CE1N__GPIO_0_17 */
  					>;
  					fsl,drive-strength = <0>;
  					fsl,voltage = <1>;
-@@ -157,6 +165,7 @@
+@@ -157,6 +166,7 @@
  			regulator-min-microvolt = <5000000>;
  			regulator-max-microvolt = <5000000>;
  			gpio = <&gpio1 23 1>;
@@ -42,3 +43,18 @@ Index: linux-3.12.2/arch/arm/boot/dts/imx28-apf28dev.dts
  		};
  	};
  
+@@ -177,4 +187,14 @@
+ 		brightness-levels = <0 4 8 16 32 64 128 255>;
+ 		default-brightness-level = <6>;
+ 	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++
++		left-key {
++			label = "Left key";
++			gpios = <&gpio0 17 0>;
++			linux,code = <69>;
++		};
++	};
+ };


hooks/post-receive
-- 
armadeus