From patchwork Wed May 30 04:47:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9028 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 2F9CC23E58 for ; Wed, 30 May 2012 04:48:31 +0000 (UTC) Received: from mail-gh0-f178.google.com (mail-gh0-f178.google.com [209.85.160.178]) by fiordland.canonical.com (Postfix) with ESMTP id F34F6A185A7 for ; Wed, 30 May 2012 04:48:30 +0000 (UTC) Received: by mail-gh0-f178.google.com with SMTP id f1so2923337ghb.37 for ; Tue, 29 May 2012 21:48:30 -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=cPpVuX+aov5heDFOCRQC9tnZaJMX6DDPuNc49n9+H54=; b=mFinvjs7Ius/apUzXU2YT8BYFGYiSlZZ6fEPw7cq2X5SeLOdAI9Jr1mVwmGJGis/rn DqWBIbe5Im61Nc3Pm5Cuide2iq4LV4Bk72dnQpWEo8Y2FK6cBUrRfYH4fWRY2/Hl+yVH qo5lmh/BmHDftVytGLU0zsTbxUQcghkvUc33y/BtvE80NLXM9kUcE1T7mwnCtC7ei1gc vmifpqLhVFqkO4aefvQ8hz0bCfv/CWbBkvkz9WkAnott6Pvbx0xdzHuvdd9RR6On3mVN /AejE6rs5+Mzwrj+M2FN0LGGlLspnZWcIbDsHJWpOEYtjDVcocLC5DsCyFb4uJ3Fx6On GZnA== Received: by 10.50.203.39 with SMTP id kn7mr9292759igc.53.1338353310461; Tue, 29 May 2012 21:48: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 v20csp170256ibb; Tue, 29 May 2012 21:48:30 -0700 (PDT) Received: by 10.68.221.39 with SMTP id qb7mr24104102pbc.120.1338353309727; Tue, 29 May 2012 21:48:29 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id hv8si23584463pbc.93.2012.05.29.21.48.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.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 mail-pz0-f50.google.com with SMTP id h15so7270491dan.37 for ; Tue, 29 May 2012 21:48:29 -0700 (PDT) Received: by 10.68.236.129 with SMTP id uu1mr45398029pbc.77.1338353309495; Tue, 29 May 2012 21:48:29 -0700 (PDT) Received: from localhost.localdomain ([118.143.64.134]) by mx.google.com with ESMTPS id kd6sm25122557pbc.24.2012.05.29.21.48.26 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:28 -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 10/22] ARM: ux500: Disable platform setup of the ab8500 when DT is enabled Date: Wed, 30 May 2012 12:47:28 +0800 Message-Id: <1338353260-10097-11-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1338353260-10097-1-git-send-email-lee.jones@linaro.org> References: <1338353260-10097-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQk1DMDzYtu+B3Cca0qnTE4jXjp4Hb+pGouuxuCM7o28p1s57nIaquZDzN1tUmqQTXTLrOjW 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index aecb0e1..ea6082a 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -680,7 +680,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = { static struct platform_device *snowball_of_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, - &ab8500_device, }; static void __init mop500_init_machine(void) @@ -841,6 +840,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"}, { }, }; @@ -876,7 +878,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, @@ -888,7 +889,7 @@ static void __init u8500_init_machine(void) * snowball_led_dev = todo * snowball_key_dev = todo * snowball_sbnet_dev = done - * ab8500_device = todo + * ab8500_device = done */ platform_add_devices(snowball_of_platform_devs, ARRAY_SIZE(snowball_of_platform_devs));