[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-158-g0a8d6c3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-158-g0a8d6c3
|
From: jorasse <jo...@us...> - 2011-06-05 20:18:59
|
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 0a8d6c367911d0edb852f5a4e967c2c3fd1c8526 (commit)
via 15b1f551fa6acf81b0099c17fe77eff5d72bb7e7 (commit)
from 172366eb5b5f10c9299f95af6af8fc520f2914e7 (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 0a8d6c367911d0edb852f5a4e967c2c3fd1c8526
Author: jorasse <jo...@ar...>
Date: Sun Jun 5 22:21:33 2011 +0200
[LINUX] apf51: enable cpu frequency scaling : ondemand
commit 15b1f551fa6acf81b0099c17fe77eff5d72bb7e7
Author: jorasse <jo...@ar...>
Date: Sun Jun 5 21:56:23 2011 +0200
[LINUX] apf51_dev: enable gpio_keys driver to support user button
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 14 +++++++-------
.../408-armadeus-add_apf51-dev_baseboard.patch | 9 +++++++--
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index dbcea01..44a29d5 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -406,16 +406,16 @@ CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPU_FREQ_IMX=y
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -979,7 +979,7 @@ CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_MATRIX is not set
# CONFIG_KEYBOARD_LM8323 is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index ba137b8..9d55981 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -49,7 +49,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-05-03 16:42:37.000000000 +0200
-@@ -0,0 +1,486 @@
+@@ -0,0 +1,491 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -85,6 +85,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+#include "../../../drivers/staging/iio/dac/mcp49x2.h"
+#include "devices-imx51.h"
+#include "devices.h"
++#include "cpu_op-mx51.h"
+
+#define APF51_GPIO_SPECIAL_PAD_CTRL (PAD_CTL_DSE_HIGH | PAD_CTL_PKE | PAD_CTL_SRE_FAST | PAD_CTL_PUE)
+
@@ -487,6 +488,10 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+
+void __init apf51_baseboard_init(void)
+{
++#if defined(CONFIG_CPU_FREQ_IMX)
++ get_cpu_op = mx51_get_cpu_op;
++#endif
++
+ mxc_iomux_v3_setup_multiple_pads(apf51dev_pads,
+ ARRAY_SIZE(apf51dev_pads));
+
@@ -499,7 +504,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+
+ init_gpio();
+
-+ imx51_add_gpio_keys(&imx_button_data);
++ imx_add_gpio_keys(&imx_button_data);
+
+ imx51_add_sdhci_esdhc_imx(0, &edshc0_pdata);
+ imx51_add_sdhci_esdhc_imx(1, &edshc1_pdata);
hooks/post-receive
--
armadeus
|
