This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- keyodi-ti-omap-encore-kernel3-63d6ff0/arch/arm/mach-omap2/board-encore.c 2012-05-30 16:52:45.000000000 -0700 | |
+++ keyodi-ti-omap-encore-kernel3-63d6ff0-1/arch/arm/mach-omap2/board-encore.c 2012-05-31 02:49:59.000000000 -0700 | |
@@ -161,8 +161,7 @@ static void config_wlan_mux(void) | |
static struct wl12xx_platform_data zoom3_wlan_data __initdata = { | |
.irq = OMAP_GPIO_IRQ(ZOOM3_WIFI_IRQ_GPIO), | |
- .board_ref_clock = WL12XX_REFCLOCK_26, | |
- .board_tcxo_clock = WL12XX_TCXOCLOCK_26, | |
+ .board_ref_clock = WL12XX_REFCLOCK_38, | |
}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c | |
index da13f2d..6d6603e 100644 | |
--- a/arch/arm/mach-omap2/cpuidle34xx.c | |
+++ b/arch/arm/mach-omap2/cpuidle34xx.c | |
@@ -47,6 +47,7 @@ | |
static struct cpuidle_params cpuidle_params_table[] = { | |
/* C1 */ | |
{2 + 2, 5, 1}, | |
+#if 0 | |
/* C2 */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- arch/arm/configs/encore_defconfig 2012-06-01 02:32:44.000000000 -0700 | |
+++ .config 2012-06-03 05:37:56.000000000 -0700 | |
@@ -34 +34 @@ | |
-CONFIG_SCHED_BFS=y | |
+# CONFIG_SCHED_BFS is not set | |
@@ -36 +36 @@ | |
-# CONFIG_BROKEN_ON_SMP is not set | |
+CONFIG_BROKEN_ON_SMP=y | |
@@ -70,2 +70,2 @@ | |
-CONFIG_TREE_PREEMPT_RCU=y |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
index 0c22aad..7f86af3 100644 | |
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
@@ -541,9 +541,16 @@ static struct omap_hwmod omap3xxx_l4_per_hwmod = { | |
.flags = HWMOD_NO_IDLEST, | |
}; | |
+static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__gpio1; | |
+static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__timer1; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Global configuration section: lists input and output devices always present on the device | |
# as well as the output device selected by default. | |
# Devices are designated by a string that corresponds to the enum in audio.h | |
global_configuration { | |
attached_output_devices AUDIO_DEVICE_OUT_SPEAKER | |
default_output_device AUDIO_DEVICE_OUT_SPEAKER | |
# attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ALSAControl.cpp b/ALSAControl.cpp | |
index 6e402db..388d580 100644 | |
--- a/ALSAControl.cpp | |
+++ b/ALSAControl.cpp | |
@@ -33,7 +33,7 @@ | |
#include "AudioHardwareALSA.h" | |
-namespace android | |
+namespace android_audio_legacy |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: alsa_omap3.cpp | |
=================================================================== | |
--- alsa_omap3.cpp (revision 480) | |
+++ alsa_omap3.cpp (working copy) | |
@@ -17,6 +17,7 @@ | |
#define LOG_TAG "Omap3ALSA" | |
#include <utils/Log.h> | |
+#include <utils/Mutex.h> | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/mac80211/compat_wl12xx/drivers/net/wireless/ti/wlcore/sdio.c b/mac80211/compat_wl12xx/drivers/net/wireless/ti/wlcore/sdio.c | |
index e4dd562..1c4b593 100644 | |
--- a/mac80211/compat_wl12xx/drivers/net/wireless/ti/wlcore/sdio.c | |
+++ b/mac80211/compat_wl12xx/drivers/net/wireless/ti/wlcore/sdio.c | |
@@ -325,6 +325,8 @@ static int wl1271_suspend(struct device *dev) | |
goto out; | |
} | |
} | |
+ /* XXX Fix suspend/resume on encore? */ | |
+ sdio_release_host(func); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/scripts/driver-select 2012-07-03 17:38:37.000000000 -0700 | |
+++ a/scripts/driver-select 2012-08-01 21:48:57.000000000 -0700 | |
@@ -363,8 +363,7 @@ | |
disable_lib80211 | |
;; | |
ti) | |
- select_drivers CONFIG_WL1251 \ | |
- CONFIG_WL12XX | |
+ select_drivers CONFIG_WL_TI | |
disable_staging |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/opengl/libs/EGL/Loader.cpp 2012-08-13 02:51:04.000000000 -0700 | |
+++ b/opengl/libs/EGL/Loader.cpp 2012-08-13 02:53:58.000000000 -0700 | |
@@ -21,6 +21,7 @@ | |
#include <errno.h> | |
#include <dlfcn.h> | |
#include <limits.h> | |
+#include <unistd.h> | |
#include <cutils/log.h> | |
#include <cutils/properties.h> |
OlderNewer