[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-3-gcae7e48
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-3-gcae7e48
|
From: Sébastien S. <ss...@us...> - 2015-09-03 07:55:28
|
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 cae7e4853564f5df847607d9153ca6c3ef349465 (commit)
from 5323f3513b881f4f51a21a084d74f9fee7538161 (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 cae7e4853564f5df847607d9153ca6c3ef349465
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Sep 3 10:01:13 2015 +0200
[LINUX] 3.19 / 4.0: apf28: fix gpio-key polarity.
-----------------------------------------------------------------------
Summary of changes:
.../3.19/0420-armadeus-Improve-apf28dev-dts.patch | 35 +++++++++--------
.../4.0/0420-armadeus-Improve-apf28dev-dts.patch | 41 ++++++++++---------
2 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
index 6c29d62..b895f47 100644
--- a/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
+++ b/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
@@ -21,9 +21,9 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
};
lcdif@80030000 {
- pinctrl-names = "default";
- pinctrl-0 = <&lcdif_16bit_pins_a
- &lcdif_pins_apf28dev>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&lcdif_16bit_pins_a
+ &lcdif_pins_apf28dev>;
- display = <&display0>;
+ display = <&st0700>;
+ /*
@@ -31,22 +31,22 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
+ * and uncomment the line below.
+ */
+ //display = <&tm035>;
- status = "okay";
-
+ status = "okay";
+
- display0: display0 {
+ st0700: st0700 {
- bits-per-pixel = <16>;
- bus-width = <16>;
-
- display-timings {
+ bits-per-pixel = <16>;
+ bus-width = <16>;
+
+ display-timings {
- native-mode = <&timing0>;
- timing0: timing0 {
+ timing {
- clock-frequency = <33000033>;
- hactive = <800>;
- vactive = <480>;
+ clock-frequency = <33000033>;
+ hactive = <800>;
+ vactive = <480>;
@@ -109,6 +122,37 @@
- };
+ };
};
};
+
@@ -80,7 +80,7 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
+ pinctrl-0 = <&can0_pins_a>;
+ xceiver-supply = <®_can0_vcc>;
+ status = "okay";
- };
+ };
};
@@ -130,6 +174,13 @@
@@ -122,9 +122,12 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
};
leds {
-@@ -202,6 +262,7 @@
+@@ -200,8 +260,9 @@
+
+ user-button {
label = "User button";
- gpios = <&gpio0 17 0>;
+- gpios = <&gpio0 17 0>;
++ gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
linux,code = <0x100>;
+ gpio-key,wakeup;
};
diff --git a/patches/linux/4.0/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/4.0/0420-armadeus-Improve-apf28dev-dts.patch
index 6c29d62..98d641e 100644
--- a/patches/linux/4.0/0420-armadeus-Improve-apf28dev-dts.patch
+++ b/patches/linux/4.0/0420-armadeus-Improve-apf28dev-dts.patch
@@ -1,10 +1,10 @@
Remaining Armadeus tweaks for APF28Dev device tree.
---
-Index: linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-4.0.9/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
---- linux-3.19.8.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
+--- linux-4.0.9.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-4.0.9/arch/arm/boot/dts/imx28-apf28dev.dts
@@ -77,22 +77,35 @@
fsl,voltage = <MXS_VOLTAGE_HIGH>;
fsl,pull-up = <MXS_PULL_DISABLE>;
@@ -21,9 +21,9 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
};
lcdif@80030000 {
- pinctrl-names = "default";
- pinctrl-0 = <&lcdif_16bit_pins_a
- &lcdif_pins_apf28dev>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&lcdif_16bit_pins_a
+ &lcdif_pins_apf28dev>;
- display = <&display0>;
+ display = <&st0700>;
+ /*
@@ -31,22 +31,22 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
+ * and uncomment the line below.
+ */
+ //display = <&tm035>;
- status = "okay";
-
+ status = "okay";
+
- display0: display0 {
+ st0700: st0700 {
- bits-per-pixel = <16>;
- bus-width = <16>;
-
- display-timings {
+ bits-per-pixel = <16>;
+ bus-width = <16>;
+
+ display-timings {
- native-mode = <&timing0>;
- timing0: timing0 {
+ timing {
- clock-frequency = <33000033>;
- hactive = <800>;
- vactive = <480>;
+ clock-frequency = <33000033>;
+ hactive = <800>;
+ vactive = <480>;
@@ -109,6 +122,37 @@
- };
+ };
};
};
+
@@ -80,7 +80,7 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
+ pinctrl-0 = <&can0_pins_a>;
+ xceiver-supply = <®_can0_vcc>;
+ status = "okay";
- };
+ };
};
@@ -130,6 +174,13 @@
@@ -122,9 +122,12 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx28-apf28dev.dts
};
leds {
-@@ -202,6 +262,7 @@
+@@ -200,8 +260,9 @@
+
+ user-button {
label = "User button";
- gpios = <&gpio0 17 0>;
+- gpios = <&gpio0 17 0>;
++ gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
linux,code = <0x100>;
+ gpio-key,wakeup;
};
hooks/post-receive
--
armadeus
|