From patchwork Thu May 17 13:45:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 8749 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 6356F23E23 for ; Thu, 17 May 2012 13:46:51 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 247D4A18B63 for ; Thu, 17 May 2012 13:46:51 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so2146812yen.11 for ; Thu, 17 May 2012 06:46:51 -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=qqt5WU2V5CuvfX4DX4a4cB9QNlzYOLJWkk1zYBpOk48=; b=h5jECNsWWgs+iqtOYQEw5hUeI8y8WMcnQXioWz6VV0LDUsQZpwgzIrl2BkUkWizn1/ Z1tyoZiXKx0YwxZxMqAN0fsX3SCEXznlR9MHcV9+T1lYNRvfEQVYW4yzPkjuM++FNTf4 KxsnJZb9f4jECnNuvej1zxLjA2owCviNx5AVFyr1ooc5+atEGhWEfb5sD3pq9LnWCNHL +HIAty1EBfrFcB8l62TVEC2IMeSsNBfZ1cwLu+JY1c3m3eCEWZiqqSGYTyBVrarFg3Hj 4b/22c3LOQlKtiK9FVwnDyRfZWRKzzQxE+QuNMh0dj7YHOOswcvmQyzAqY/LvFTqn0Aw 9ixw== Received: by 10.42.88.135 with SMTP id c7mr4485383icm.57.1337262410655; Thu, 17 May 2012 06:46:50 -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.35.72 with SMTP id o8csp29048ibd; Thu, 17 May 2012 06:46:49 -0700 (PDT) Received: by 10.14.149.145 with SMTP id x17mr1514130eej.4.1337262408945; Thu, 17 May 2012 06:46:48 -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 d3si7393850wed.115.2012.05.17.06.46.48 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 May 2012 06:46:48 -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 e53so1560530wer.37 for ; Thu, 17 May 2012 06:46:48 -0700 (PDT) Received: by 10.216.139.73 with SMTP id b51mr4826833wej.72.1337262407852; Thu, 17 May 2012 06:46:47 -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 h8sm21166277wix.4.2012.05.17.06.46.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 May 2012 06:46:47 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, broonie@opensource.wolfsonmicro.com, sameo@linux.intel.com Cc: Lee Jones Subject: [PATCH 12/18] ARM: ux500: Disable platform setup of the ab8500 when DT is enabled Date: Thu, 17 May 2012 14:45:17 +0100 Message-Id: <1337262323-27692-13-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1337262323-27692-1-git-send-email-lee.jones@linaro.org> References: <1337262323-27692-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkG++hIC76owTQgaLyjAj8yecFnRstIi23rVPiJb6GvnVsl+MBcBZeQ8KecsFX/DEuhZ6sO 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. Acked-by: Linus Walleij 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 46df945..de94b2d 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -601,7 +601,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) @@ -767,6 +766,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"}, { }, }; @@ -802,7 +804,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,