From patchwork Fri Jul 6 12:43:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9887 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DD3AE23E16 for ; Fri, 6 Jul 2012 12:43:32 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id A2ED2A183A9 for ; Fri, 6 Jul 2012 12:43:32 +0000 (UTC) Received: by ghbz12 with SMTP id z12so9151656ghb.11 for ; Fri, 06 Jul 2012 05:43:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=ZRERi7m9SYmwib7Pk9MyIkmxFGFtpOQ+QhLTrwrLVAY=; b=ZTudLLtCnjjOGrDZDfaLGS9JTnibpudKQbH6poKwQTsZWMvaV2CfGuo9oINSAiGg1L QOHusmVl4L+wSJMcK+kZf1vKsvBfrGy52657rKLjeuDOhHnO8DiXuLAI3xUEIdFwNIJn tqRc3isX7ugkiRq3k1BGlEEz+lcfdJt3r/P23UalqqITBquA2l0TKP1+lEj7UZuxELAr 5uvLH1EHdMQtvzDVcvuDELdgUc82i8ktSV5c65A+JfVIlKliSdHYCCaqftECH1j8xy3Y irYKKlW3+gMl4uDDBYbfWPHyMGA/X+BTui7UEL2/eHn9lEad0D7AYAmiD10Zkf2Fob4m wyTg== Received: by 10.50.160.198 with SMTP id xm6mr2483928igb.0.1341578610395; Fri, 06 Jul 2012 05:43:30 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp9875ibb; Fri, 6 Jul 2012 05:43:29 -0700 (PDT) Received: by 10.180.105.6 with SMTP id gi6mr7639539wib.4.1341578608649; Fri, 06 Jul 2012 05:43:28 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id u4si543818wed.25.2012.07.06.05.43.28 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 Jul 2012 05:43:28 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wgbds11 with SMTP id ds11so9118604wgb.31 for ; Fri, 06 Jul 2012 05:43:28 -0700 (PDT) Received: by 10.216.199.167 with SMTP id x39mr4579726wen.148.1341578607844; Fri, 06 Jul 2012 05:43:27 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id fw4sm5573352wib.0.2012.07.06.05.43.26 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 Jul 2012 05:43:27 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, sameo@linux.intel.com, Lee Jones Subject: [PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables Date: Fri, 6 Jul 2012 13:43:18 +0100 Message-Id: <1341578598-9307-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQmphXtcYJgz0/fPxum3dTy2y8ePJwFDvLpc/xmE0WFa2nv2tsySgaauBb5+1oTg2LVmo0X3 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,ab8500-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),