From patchwork Fri May 4 18:23:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 8414 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 4387B23E20 for ; Fri, 4 May 2012 18:24:42 +0000 (UTC) Received: from mail-gy0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 12EF2A18068 for ; Fri, 4 May 2012 18:24:41 +0000 (UTC) Received: by mail-gy0-f180.google.com with SMTP id z12so974947ghb.11 for ; Fri, 04 May 2012 11:24:41 -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:in-reply-to:references :x-gm-message-state; bh=tf16x9sKtuo3GQZNG2U7iqsgbTTfPnSlTJPisr+gNCc=; b=jWMBqO1XilJO5UQh2HDOv5uIo00443yvl3eEp74cnltZZcsPBUAZ7GAbtKewfA0Fr8 OMM9hZVn2lonW3lJq4fg2FwDDY/jDkQ5rOEhPh7GBEL0wCKdJa+VtkMTH38KSyqqKbJm ZM3EHACZROR92SU7C8sbBvpWWPBsDZ/Tslbr+lceyYJv4pvvm5arvKuqy1FCLHU4rOUz F0ItqKQh7oOkbVuCBf4pQRHgEmLhNM5tSmihx+Nw2fih3/dr9Ko6Wrj2672Gw6RPRoiZ dTc5Xf5ktLeR+R10eG4hpEu/cEBffvo05bCRqqRbHR1qyHaBl0IKot3ghFQRnrgL5nQe bFWQ== Received: by 10.50.220.136 with SMTP id pw8mr3745194igc.1.1336155881699; Fri, 04 May 2012 11:24:41 -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.137.198 with SMTP id x6csp106315ibt; Fri, 4 May 2012 11:24:41 -0700 (PDT) Received: by 10.216.143.139 with SMTP id l11mr4464049wej.104.1336155880656; Fri, 04 May 2012 11:24:40 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id d7si7080116wid.26.2012.05.04.11.24.40 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 May 2012 11:24:40 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f178.google.com with SMTP id a13so2626931wer.37 for ; Fri, 04 May 2012 11:24:40 -0700 (PDT) Received: by 10.180.24.7 with SMTP id q7mr14755068wif.11.1336155880201; Fri, 04 May 2012 11:24:40 -0700 (PDT) Received: from localhost.localdomain ([89.192.128.60]) by mx.google.com with ESMTPS id fn2sm17590123wib.0.2012.05.04.11.24.34 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 May 2012 11:24:39 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, ben-linux@fluff.org, linux-i2c@vger.kernel.org, broonie@opensource.wolfsonmicro.com, sameo@linux.intel.com, Lee Jones Subject: [PATCH 15/15] ARM: ux500: Disable platform setup of the ab8500 when DT is enabled Date: Fri, 4 May 2012 19:23:25 +0100 Message-Id: <1336155805-18554-16-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1336155805-18554-1-git-send-email-lee.jones@linaro.org> References: <1336155805-18554-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkDMTnGeEppGsRS5boPtPRVckngzdoK8BH6ZNJUhOfxhv0Ft5xQLqcgeKKkQ3a3cMxs7Jo8 The final piece of the ab8500 puzzle. Here we prevent any of the ab8500-* drivers from being registered from platform code when Device Tree is enabled, as we expect DT do probe each of these individually. We also provide the relevant compatible strings, so that DT knows which nodes it needs to pay attention to during population. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index bc8a0d7..7bfd8d0 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -580,7 +580,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = { static struct platform_device *snowball_of_platform_devs[] __initdata = { &snowball_key_dev, - &ab8500_device, }; static void __init mop500_init_machine(void) @@ -743,6 +742,9 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { static const struct of_device_id u8500_local_bus_nodes[] = { /* only create devices below soc node */ { .compatible = "stericsson,db8500", }, + { .compatible = "stericsson,db8500-prcmu", }, + { .compatible = "stericsson,ab8500", }, + { .compatible = "stericsson,ab8500-regulator", }, { .compatible = "simple-bus"}, { }, }; @@ -771,7 +773,6 @@ static void __init u8500_init_machine(void) ARRAY_SIZE(mop500_platform_devs)); mop500_sdi_init(parent); - i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); i2c_register_board_info(2, mop500_i2c2_devices,