From patchwork Sat Jun 25 22:10:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 918822 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5PMBp7v019703 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 25 Jun 2011 22:12:12 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qab4j-0004cx-5R; Sat, 25 Jun 2011 22:11:37 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qab4i-0003E1-2Q; Sat, 25 Jun 2011 22:11:36 +0000 Received: from mail-ww0-f49.google.com ([74.125.82.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qab3j-0002yW-O8 for linux-arm-kernel@lists.infradead.org; Sat, 25 Jun 2011 22:10:37 +0000 Received: by mail-ww0-f49.google.com with SMTP id 22so2684877wwf.18 for ; Sat, 25 Jun 2011 15:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=dyjpItn58ulM4Lh/99YiAgJoiLMwXZkHCgtAUqk2up4=; b=tVJjMckZ5xmqU3NpshV8FOcfqEFdgDCv1thOAz0SkNUoh8mpREdgotX+b4JSaGnv/V 5ywODQQu+OrilMaL2jybwmKZb9w6CS8FvgHe3GT7oQc3uisO9PTMt7u7nX1n54qpHcCk mwAS0CpQqj3nnxPDipkUwEP2d8U2DsWz81Pq4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=HuA3aRTT8hrCPnSxZEmRNHszGN3NtT+lw2ZfRxbqj/tqfUy4gWrDAW6lAl94D/IKb8 JFmL0Ozbp1zlWlW2FKKpjNWfZbByR3XddJrkxIJMBd4YosEls4sHHpRbwxmltOPyKMmC URuALHOxjq9NOamPSrWZU+IFKnoUW8/gn7StM= Received: by 10.227.178.135 with SMTP id bm7mr4153295wbb.52.1309039835295; Sat, 25 Jun 2011 15:10:35 -0700 (PDT) Received: from localhost ([89.127.177.74]) by mx.google.com with ESMTPS id fi5sm2976876wbb.22.2011.06.25.15.10.33 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 25 Jun 2011 15:10:34 -0700 (PDT) From: Bryan Wu To: linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org, rpurdie@rpsys.net, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] mach-versatile: retire custom LED code Date: Sun, 26 Jun 2011 06:10:04 +0800 Message-Id: <1309039804-659-5-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309039804-659-1-git-send-email-bryan.wu@canonical.com> References: <1309039804-659-1-git-send-email-bryan.wu@canonical.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110625_181035_981864_D9B67F91 X-CRM114-Status: GOOD ( 14.49 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.6 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [89.127.177.74 listed in dnsbl.sorbs.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (cooloney[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 25 Jun 2011 22:12:12 +0000 (UTC) From: Linus Walleij The CPU activity LED is now handled by the trigger in the leds subsystem, retire this old CONFIG_LEDS-based code. Cc: Richard Purdie Signed-off-by: Linus Walleij Signed-off-by: Bryan Wu --- arch/arm/mach-versatile/core.c | 42 ---------------------------------------- 1 files changed, 0 insertions(+), 42 deletions(-) diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 0c99cf0..b9ff8ff 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -36,7 +36,6 @@ #include #include -#include #include #include #include @@ -646,43 +645,6 @@ static struct amba_device *amba_devs[] __initdata = { &kmi1_device, }; -#ifdef CONFIG_LEDS -#define VA_LEDS_BASE (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_LED_OFFSET) - -static void versatile_leds_event(led_event_t ledevt) -{ - unsigned long flags; - u32 val; - - local_irq_save(flags); - val = readl(VA_LEDS_BASE); - - switch (ledevt) { - case led_idle_start: - val = val & ~VERSATILE_SYS_LED0; - break; - - case led_idle_end: - val = val | VERSATILE_SYS_LED0; - break; - - case led_timer: - val = val ^ VERSATILE_SYS_LED1; - break; - - case led_halted: - val = 0; - break; - - default: - break; - } - - writel(val, VA_LEDS_BASE); - local_irq_restore(flags); -} -#endif /* CONFIG_LEDS */ - /* Early initializations */ void __init versatile_init_early(void) { @@ -707,10 +669,6 @@ void __init versatile_init(void) struct amba_device *d = amba_devs[i]; amba_device_register(d, &iomem_resource); } - -#ifdef CONFIG_LEDS - leds_event = versatile_leds_event; -#endif } /*