From patchwork Wed Jul 4 15:29:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1156661 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 306FA3FC36 for ; Wed, 4 Jul 2012 15:43:45 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmRdx-0007P3-1H; Wed, 04 Jul 2012 15:37:29 +0000 Received: from mail-ee0-f49.google.com ([74.125.83.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SmRWK-0005PC-Oh for linux-arm-kernel@lists.infradead.org; Wed, 04 Jul 2012 15:29:37 +0000 Received: by eekd17 with SMTP id d17so2980524eek.36 for ; Wed, 04 Jul 2012 08:29:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=l0nw/Qi1htBb/6ExbRCWRO490hBhXsjRtqIQ5+saBHI=; b=d5CrIhS/ecr9v6YUEgUgVAyVTRFY2TqHfwHnVA5z3QGrVEbG0Z1KHEWQVbkZhI3OX0 BHp8xJ3L/j7Wu12ORMYQkMCF0J4eBL2mnjRqIR60gCPBjlSvCoPrBmM7T/NtI2mfTaB8 I8j7zhGcMnlSaWslib2zUpOP3af+nDWDp9ZKmCcO9U7834VXDpWOTVqEfCQGom7J5emK gHpSdg3RF571lNc77Z/D490YujKn/Zl3VH2jzw9kBZDrWJI8sGp9WFQJBOz7y0G339rJ jUy0xJUA6xqObzrijtXuvKhnAqhhuBCjaGLmJ1GqvftGiMjWjbEPaqc0K+A1OORlhAeH 4ing== Received: by 10.14.127.73 with SMTP id c49mr4022870eei.22.1341415757704; Wed, 04 Jul 2012 08:29:17 -0700 (PDT) Received: from [192.168.0.135] (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id u14sm55018107eem.4.2012.07.04.08.29.13 (version=SSLv3 cipher=OTHER); Wed, 04 Jul 2012 08:29:16 -0700 (PDT) Message-ID: <4FF46148.9000409@linaro.org> Date: Wed, 04 Jul 2012 16:29:12 +0100 From: Lee Jones User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120615 Thunderbird/13.0.1 MIME-Version: 1.0 To: Samuel Ortiz Subject: Re: [PATCH 04/15] mfd: ab8500: Register devices using the newly DT:ed MFD API References: <1340197011-5435-1-git-send-email-lee.jones@linaro.org> <1340197011-5435-5-git-send-email-lee.jones@linaro.org> <20120629150924.GG22806@sortiz-mobl> <4FEDD212.4020209@linaro.org> <20120629185047.GY22806@sortiz-mobl> <4FF17202.9080106@linaro.org> <20120702151437.GO22065@sortiz-mobl> In-Reply-To: <20120702151437.GO22065@sortiz-mobl> X-Gm-Message-State: ALoCoQloobq7XiZQCJw+dMuLT4jIOP0yO9MdROHagdxUQEyfy+K14Zjk9evzjWQZsm9qwt+wGZuF X-Spam-Note: CRM114 invocation failed 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 [74.125.83.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux@arm.linux.org.uk, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, grant.likely@secretlab.ca, linux-arm-kernel@lists.infradead.org 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi Sam, > On Mon, Jul 02, 2012 at 11:03:46AM +0100, Lee Jones wrote: >>>>> This one does not apply properly against my for-next branch. Could you please >>>>> generate a new one for me ? >>>> >>>> Hmm... we have a problem. >>>> >>>> I have the new patch based on -next, but I can't test it, as -next >>>> is broken for Snowball. Hence why I'm still using rc2. Do you want >>>> it anyway? >>> Yes. And once Snowball is working with -next, I'll take a patch fix from you >>> if necessary. >> >> Okay, this one applies on -next: >> >> From: Lee Jones >> Date: Wed, 20 Jun 2012 08:48:33 +0100 >> Subject: [PATCH 1/1] mfd: ab8500: Register devices using the newly DT:ed MFD >> API >> >> Now the MFD API is Device Tree aware we can use it for platform >> registration again, even when booting with DT enabled. To aid in >> Device Node pointer allocation we provide each cell with the >> associative compatible string. >> >> Cc: Samuel Ortiz >> Signed-off-by: Lee Jones >> --- >> arch/arm/mach-ux500/board-mop500.c | 1 - >> drivers/mfd/ab8500-core.c | 64 ++++++++++++++++++++++-------------- >> drivers/mfd/ab8500-debugfs.c | 6 ---- >> drivers/mfd/ab8500-gpadc.c | 6 ---- >> drivers/mfd/ab8500-sysctrl.c | 6 ---- >> drivers/misc/ab8500-pwm.c | 6 ---- >> drivers/regulator/ab8500.c | 6 ---- >> drivers/rtc/rtc-ab8500.c | 7 ---- >> drivers/usb/otg/ab8500-usb.c | 6 ---- >> 9 files changed, 39 insertions(+), 69 deletions(-) > Applied, although rtc-ab8500.c and ab8500-usb.c did not need any changes. > Please check commit 47e1f40fcb12f976e7769f75c04c65828ed5da75 on my for-next > branch to see if I missed anything. Looks like the rtc-ab8500 and ponkey-ab8500 just made it into next. Please use the patch below to complement the one above. Thanks. From: Lee Jones Date: Wed, 20 Jun 2012 08:48:33 +0100 Subject: [PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables A patch was recently submitted to stop all ab8500 devices from being registered through Device Tree. Instead, only the db8500 will be DT:ed and the rest will continue to be registered via the MFD API, as they always were. Two patches have recently been applied which enable Device Tree probing; one for rtc-ab8500 and the other for ponkey-ab8500. These two need to be removed to prevent double-probing these devices with Device Tree is enabled. Cc: Samuel Ortiz Signed-off-by: Lee Jones --- drivers/input/misc/ab8500-ponkey.c | 8 -------- drivers/rtc/rtc-ab8500.c | 6 ------ 2 files changed, 14 deletions(-) diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c index 84ec691..5ceb23e 100644 --- a/drivers/input/misc/ab8500-ponkey.c +++ b/drivers/input/misc/ab8500-ponkey.c @@ -132,18 +132,10 @@ static int __devexit ab8500_ponkey_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_OF -static const struct of_device_id ab8500_ponkey_match[] = { - { .compatible = "stericsson,ab8500-ponkey", }, - {} -}; -#endif - static struct platform_driver ab8500_ponkey_driver = { .driver = { .name = "ab8500-poweron-key", .owner = THIS_MODULE, - .of_match_table = of_match_ptr(ab8500_ponkey_match), }, .probe = ab8500_ponkey_probe, .remove = __devexit_p(ab8500_ponkey_remove), diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c index bf3c2f6..2e5970f 100644 --- a/drivers/rtc/rtc-ab8500.c +++ b/drivers/rtc/rtc-ab8500.c @@ -462,16 +462,10 @@ static int __devexit ab8500_rtc_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id ab8500_rtc_match[] = { - { .compatible = "stericsson,b8500-rtc", }, - {} -}; - static struct platform_driver ab8500_rtc_driver = { .driver = { .name = "ab8500-rtc", .owner = THIS_MODULE, - .of_match_table = ab8500_rtc_match, }, .probe = ab8500_rtc_probe, .remove = __devexit_p(ab8500_rtc_remove),