[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-2-g0b8f1dd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-2-g0b8f1dd
|
From: Sébastien S. <ss...@us...> - 2013-11-19 13:00:35
|
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 0b8f1ddebb4164e2ad493e597346314b08cf0911 (commit)
from a5f702afe9fe0c6cdb7c845c19843a6b1e810c2c (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 0b8f1ddebb4164e2ad493e597346314b08cf0911
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Nov 19 14:01:10 2013 +0100
[LINUX] 3.10: APF51: Merge patch 0443 (add backlight to device tree) and patch 0401.
-----------------------------------------------------------------------
Summary of changes:
.../0401-armadeus-add_apf51dev_baseboard.patch | 31 +++++++++++++---
.../0443-apf51-add_backlight_to_device_tree.patch | 39 --------------------
2 files changed, 26 insertions(+), 44 deletions(-)
delete mode 100644 patches/linux/3.10/0443-apf51-add_backlight_to_device_tree.patch
diff --git a/patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch
index 362f12c..649c9ed 100644
--- a/patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.10/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.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-3.10/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
---- linux-3.10-rc2.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -51,6 +51,14 @@
+--- linux-3.10.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.10/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.10-rc2/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,3 +43,11 @@ Index: linux-3.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
non-removable;
status = "okay";
};
+@@ -91,6 +106,7 @@
+ MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
+ MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
+ MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
++ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0C5
+ >;
+ };
+ };
diff --git a/patches/linux/3.10/0443-apf51-add_backlight_to_device_tree.patch b/patches/linux/3.10/0443-apf51-add_backlight_to_device_tree.patch
deleted file mode 100644
index 0cfc982..0000000
--- a/patches/linux/3.10/0443-apf51-add_backlight_to_device_tree.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: linux-3.10/arch/arm/boot/dts/imx51-apf51dev.dts
-===================================================================
---- linux-3.10.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.10/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";
-+ };
- };
- };
-
-@@ -86,7 +92,7 @@
-
- &iomuxc {
- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_hog>;
-+ pinctrl-0 = <&pinctrl_hog &pinctrl_backlight_1>;
-
- hog {
- pinctrl_hog: hoggrp {
-@@ -103,4 +109,12 @@
- >;
- };
- };
-+
-+ backlight {
-+ pinctrl_backlight_1: backlightgrp-1 {
-+ fsl,pins = <
-+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0C5
-+ >;
-+ };
-+ };
- };
hooks/post-receive
--
armadeus
|
