From ce6840da7184043a09dd57d4c201a32ef7b6c083 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sat, 31 Jan 2009 17:24:07 +0000 Subject: Return-Path: Received: from mail.openmoko.org ([unix socket]) by mail.openmoko.org (Cyrus v2.1.18-IPv6-Debian-2.1.18-5.1) with LMTP; Fri, 30 Jan 2009 23:00:03 +0000 X-Sieve: CMU Sieve 2.2 Return-path: Received: from sita.openmoko.org ([88.198.124.203]) by mail.openmoko.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1LT2LD-0001st-Fo for andy@imap.openmoko.org; Fri, 30 Jan 2009 23:00:03 +0000 Received: from localhost ([127.0.0.1] helo=sita.openmoko.org) by sita.openmoko.org with esmtp (Exim 4.63) (envelope-from ) id 1LT2Kb-0001Xw-JH; Fri, 30 Jan 2009 23:59:25 +0100 Received: from mail.openmoko.org ([88.198.124.205]) by sita.openmoko.org with esmtp (Exim 4.63) (envelope-from ) id 1LT2KV-0001Xn-Lv for openmoko-kernel@lists.openmoko.org; Fri, 30 Jan 2009 23:59:22 +0100 Received: from 175-205-16-190.fibertel.com.ar ([190.16.205.175] helo=ws) by mail.openmoko.org with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.63) (envelope-from ) id 1LT2KS-0001Xk-0U for openmoko-kernel@lists.openmoko.org; Fri, 30 Jan 2009 22:59:19 +0000 Received: by ws (sSMTP sendmail emulation); Fri, 30 Jan 2009 22:02:47 -0200 Date: Fri, 30 Jan 2009 22:02:47 -0200 From: Werner Almesberger To: openmoko-kernel@lists.openmoko.org Message-ID: <20090131000247.GF4526@almesberger.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on sita.openmoko.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, UPPERCASE_50_75 autolearn=no version=3.2.3 Subject: [PATCH] back out Android wakelocks breaking suspend X-BeenThere: openmoko-kernel@lists.openmoko.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Discussion regarding the OpenMoko Linux Kernel and boot loader List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openmoko-kernel-bounces@lists.openmoko.org Errors-To: openmoko-kernel-bounces@lists.openmoko.org In current andy-tracking, a resume gets almost immediately followed by another suspend, so we can never really leave suspend. This is somehow caused by the Android wakelocks. I think the most expedite way to deal with this is to back them out of our configurations until they've been properly debugged, which is what this patch does. Signed-off-by: Werner Almesberger --- arch/arm/configs/gta02-moredrivers-defconfig | 12 ++---------- arch/arm/configs/gta02-packaging-defconfig | 14 +++----------- 2 files changed, 5 insertions(+), 21 deletions(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig index 6ab596b99b6..b1a95d197f1 100644 --- a/arch/arm/configs/gta02-moredrivers-defconfig +++ b/arch/arm/configs/gta02-moredrivers-defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-rc2 -# Thu Jan 29 19:52:58 2009 +# Fri Jan 30 21:50:46 2009 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -1779,15 +1779,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y # CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_ANDROID_HAS_WAKELOCK=y -CONFIG_ANDROID_HAS_EARLYSUSPEND=y -CONFIG_ANDROID_WAKELOCK=y -CONFIG_ANDROID_USER_WAKELOCK=y -CONFIG_ANDROID_EARLYSUSPEND=y -# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set -CONFIG_ANDROID_CONSOLE_EARLYSUSPEND=y -# CONFIG_ANDROID_FB_EARLYSUSPEND is not set -CONFIG_ANDROID_POWER_ALARM=y +# CONFIG_ANDROID_WAKELOCK is not set CONFIG_ANDROID_PARANOID_NETWORK=y # diff --git a/arch/arm/configs/gta02-packaging-defconfig b/arch/arm/configs/gta02-packaging-defconfig index 50efc1ec874..8d916b07240 100644 --- a/arch/arm/configs/gta02-packaging-defconfig +++ b/arch/arm/configs/gta02-packaging-defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-rc2 -# Wed Jan 28 20:19:08 2009 +# Fri Jan 30 21:59:03 2009 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -1782,15 +1782,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y # CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_ANDROID_HAS_WAKELOCK=y -CONFIG_ANDROID_HAS_EARLYSUSPEND=y -CONFIG_ANDROID_WAKELOCK=y -CONFIG_ANDROID_USER_WAKELOCK=y -CONFIG_ANDROID_EARLYSUSPEND=y -# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set -CONFIG_ANDROID_CONSOLE_EARLYSUSPEND=y -# CONFIG_ANDROID_FB_EARLYSUSPEND is not set -CONFIG_ANDROID_POWER_ALARM=y +# CONFIG_ANDROID_WAKELOCK is not set CONFIG_ANDROID_PARANOID_NETWORK=y # @@ -2038,6 +2030,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y # CONFIG_BOOT_TRACER is not set # CONFIG_TRACE_BRANCH_PROFILING is not set # CONFIG_STACK_TRACER is not set +# CONFIG_FIND_IRQ_BLOCKERS is not set CONFIG_DYNAMIC_PRINTK_DEBUG=y # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y @@ -2173,4 +2166,3 @@ CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y -# CONFIG_FIND_IRQ_BLOCKERS is not set -- cgit v1.2.3