[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-4-gac1cbee
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2013-11-21 16:18:34
|
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 ac1cbee6efd2a366328f5405e9585ced0f51a684 (commit)
from 75b7ac44ffe2925357fe909371293a267dcf96ea (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 ac1cbee6efd2a366328f5405e9585ced0f51a684
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Nov 21 17:19:17 2013 +0100
[LINUX] 3.12: APF51: add backlight to device tree.
-----------------------------------------------------------------------
Summary of changes:
.../0401-armadeus-add_apf51dev_baseboard.patch | 28 +++++++++++++++-----
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
index 3ca64a1..6619f2e 100644
--- a/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
@@ -3,11 +3,24 @@ The APF51Dev is a docking board for an APF51 SOM
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Signed-off-by: Laurent Cans <lau...@gm...>
---
-Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
---- linux-3.11-rc4.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -51,6 +51,14 @@
+--- linux-3.12.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.12/arch/arm/boot/dts/imx51-apf51dev.dts
+@@ -34,6 +34,12 @@
+ gpios = <&gpio1 2 0>;
+ linux,default-trigger = "heartbeat";
+ };
++
++ backlight {
++ label = "Backlight";
++ gpios = <&gpio3 4 0>;
++ default-state = "on";
++ };
+ };
+ };
+
+@@ -51,6 +57,14 @@
fsl,spi-num-chipselects = <2>;
cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>;
status = "okay";
@@ -22,7 +35,7 @@ Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
};
&esdhc1 {
-@@ -65,6 +73,7 @@
+@@ -65,6 +79,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esdhc2_1>;
bus-width = <4>;
@@ -30,11 +43,12 @@ Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
non-removable;
status = "okay";
};
-@@ -91,6 +100,7 @@
+@@ -91,6 +106,8 @@
MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
-+ MX51_PAD_DI1_PIN12__GPIO3_1 0x80000000
++ MX51_PAD_DI1_PIN12__GPIO3_1 0x80000000
++ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0C5
>;
};
};
hooks/post-receive
--
armadeus
|