From patchwork Mon Nov 19 13:39:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Moll X-Patchwork-Id: 1764801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id EC10ADF264 for ; Mon, 19 Nov 2012 13:42:39 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaRZS-0003ZN-CI; Mon, 19 Nov 2012 13:39:30 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaRZO-0003Z3-Lf for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2012 13:39:27 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Mon, 19 Nov 2012 13:39:20 +0000 Received: from hornet.Cambridge.Arm.com ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 19 Nov 2012 13:39:20 +0000 From: Pawel Moll To: Arnd Bergmann Subject: [PATCH] mfd: vexpress-sysreg: Remove LEDs code Date: Mon, 19 Nov 2012 13:39:04 +0000 Message-Id: <1353332344-16754-1-git-send-email-pawel.moll@arm.com> X-Mailer: git-send-email 1.7.10.4 X-OriginalArrivalTime: 19 Nov 2012 13:39:20.0471 (UTC) FILETIME=[47555270:01CDC65B] X-MC-Unique: 112111913392003501 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121119_083926_920080_6DDE68F9 X-CRM114-Status: GOOD ( 11.86 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [91.220.42.44 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, Pawel Moll , linux-arm-kernel@lists.infradead.org, Stephen Warren X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 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 As the current LEDs code breaks other platform, remove it. It shall be replaced by a generic "MMIO LEDs" driver. Reported-by: Stephen Warren Signed-off-by: Pawel Moll Tested-by: Stephen Warren --- drivers/mfd/vexpress-sysreg.c | 77 ----------------------------------------- 1 file changed, 77 deletions(-) Hi Arnd, As I haven't managed to get any feedback on the generic MMIO LEDs driver so far, I have to postpone it till next cycle and completely remove the LED-related code from the vexpress-sysreg driver, as it breaks other platforms today. Would you be so kind to apply this patch, please? Alternatively you can pull it from here: git://git.linaro.org/people/pawelmoll/linux.git vexpress-soc2 (this branch is based on the vexpress-soc you already have) Cheers! Pawel diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c index 059d6b1..733c06b 100644 --- a/drivers/mfd/vexpress-sysreg.c +++ b/drivers/mfd/vexpress-sysreg.c @@ -473,80 +473,3 @@ static int __init vexpress_sysreg_init(void) return platform_driver_register(&vexpress_sysreg_driver); } core_initcall(vexpress_sysreg_init); - - -#if defined(CONFIG_LEDS_CLASS) - -struct vexpress_sysreg_led { - u32 mask; - struct led_classdev cdev; -} vexpress_sysreg_leds[] = { - { .mask = 1 << 0, .cdev.name = "v2m:green:user1", - .cdev.default_trigger = "heartbeat", }, - { .mask = 1 << 1, .cdev.name = "v2m:green:user2", - .cdev.default_trigger = "mmc0", }, - { .mask = 1 << 2, .cdev.name = "v2m:green:user3", - .cdev.default_trigger = "cpu0", }, - { .mask = 1 << 3, .cdev.name = "v2m:green:user4", - .cdev.default_trigger = "cpu1", }, - { .mask = 1 << 4, .cdev.name = "v2m:green:user5", - .cdev.default_trigger = "cpu2", }, - { .mask = 1 << 5, .cdev.name = "v2m:green:user6", - .cdev.default_trigger = "cpu3", }, - { .mask = 1 << 6, .cdev.name = "v2m:green:user7", - .cdev.default_trigger = "cpu4", }, - { .mask = 1 << 7, .cdev.name = "v2m:green:user8", - .cdev.default_trigger = "cpu5", }, -}; - -static DEFINE_SPINLOCK(vexpress_sysreg_leds_lock); - -static void vexpress_sysreg_led_brightness_set(struct led_classdev *cdev, - enum led_brightness brightness) -{ - struct vexpress_sysreg_led *led = container_of(cdev, - struct vexpress_sysreg_led, cdev); - unsigned long flags; - u32 val; - - spin_lock_irqsave(&vexpress_sysreg_leds_lock, flags); - - val = readl(vexpress_sysreg_base + SYS_LED); - if (brightness == LED_OFF) - val &= ~led->mask; - else - val |= led->mask; - writel(val, vexpress_sysreg_base + SYS_LED); - - spin_unlock_irqrestore(&vexpress_sysreg_leds_lock, flags); -} - -static int __init vexpress_sysreg_init_leds(void) -{ - struct vexpress_sysreg_led *led; - int i; - - /* Clear all user LEDs */ - writel(0, vexpress_sysreg_base + SYS_LED); - - for (i = 0, led = vexpress_sysreg_leds; - i < ARRAY_SIZE(vexpress_sysreg_leds); i++, led++) { - int err; - - led->cdev.brightness_set = vexpress_sysreg_led_brightness_set; - err = led_classdev_register(vexpress_sysreg_dev, &led->cdev); - if (err) { - dev_err(vexpress_sysreg_dev, - "Failed to register LED %d! (%d)\n", - i, err); - while (led--, i--) - led_classdev_unregister(&led->cdev); - return err; - } - } - - return 0; -} -device_initcall(vexpress_sysreg_init_leds); - -#endif