[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-47-g805d2ce
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-47-g805d2ce
|
From: Sébastien S. <ss...@us...> - 2013-12-19 16:49:31
|
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 805d2ce8557dac3ef8903dfd1c1c7696b903d7d6 (commit)
via 180365c9eb248f5b6c992f39a4df8c3493a6db5c (commit)
from b20b627ab7674230d14338bf05e1aade32f4d5d1 (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 805d2ce8557dac3ef8903dfd1c1c7696b903d7d6
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Dec 19 17:49:52 2013 +0100
[LINUX] 3.13: apf28: add user button to device tree.
commit 180365c9eb248f5b6c992f39a4df8c3493a6db5c
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Dec 19 17:02:40 2013 +0100
[LINUX] 3.13: apf28: add kernel config
-----------------------------------------------------------------------
Summary of changes:
...nux-3.12.config => apf28-linux-3.13-rc2.config} | 7 +----
.../3.13/0420-armadeus-Add-apf28dev-dts.patch | 26 ++++++++++++++++----
2 files changed, 23 insertions(+), 10 deletions(-)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.config => apf28-linux-3.13-rc2.config} (97%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc2.config
similarity index 97%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc2.config
index 137bd12..4ebea21 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc2.config
@@ -18,7 +18,6 @@ CONFIG_BSD_DISKLABEL=y
CONFIG_ARCH_MXS=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CPU_IDLE=y
@@ -58,7 +57,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_M25P80=y
-# CONFIG_M25PXX_USE_FAST_READ is not set
CONFIG_MTD_SST25L=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y
@@ -85,7 +83,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
# CONFIG_SERIO_SERPORT is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
@@ -117,8 +114,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_PWM=y
CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -183,3 +178,5 @@ CONFIG_NLS_ISO8859_1=y
CONFIG_DEBUG_FS=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
diff --git a/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch
index 0af2d54..1f642b1 100644
--- a/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix spidev
Signed-off-by: Julien Boibessot <jul...@ar...>
---
-Index: linux-3.13-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.13-rc2/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
---- linux-3.13-rc1.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.13-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+--- linux-3.13-rc2.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.13-rc2/arch/arm/boot/dts/imx28-apf28dev.dts
@@ -32,6 +32,13 @@
pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>;
@@ -23,15 +23,16 @@ Index: linux-3.13-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
};
pinctrl@80018000 {
-@@ -48,6 +55,7 @@
+@@ -48,6 +55,8 @@
MX28_PAD_LCD_D20__GPIO_1_20
MX28_PAD_LCD_D21__GPIO_1_21
MX28_PAD_LCD_D22__GPIO_1_22
+ MX28_PAD_LCD_D23__GPIO_1_23
++ MX28_PAD_GPMI_CE1N__GPIO_0_17
>;
fsl,drive-strength = <MXS_DRIVE_4mA>;
fsl,voltage = <MXS_VOLTAGE_HIGH>;
-@@ -157,6 +165,7 @@
+@@ -157,6 +166,7 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 23 1>;
@@ -39,3 +40,18 @@ Index: linux-3.13-rc1/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";
++
++ user-button {
++ label = "User button";
++ gpios = <&gpio0 17 0>;
++ linux,code = <0x100>;
++ };
++ };
+ };
hooks/post-receive
--
armadeus
|
