From patchwork Thu Sep 20 12:12:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11563 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 7E13D1B4E37 for ; Thu, 20 Sep 2012 12:13:51 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id AEE3FA184EA for ; Thu, 20 Sep 2012 12:13:50 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so2722067iej.11 for ; Thu, 20 Sep 2012 05:13:50 -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=3kYNR0sziwuhCRCvniBYhoVkr/nEGvUQMdRy6J7wKhM=; b=Fdeoh1NLKyPXyfaE4CClv0pyFO4ub5D7KPh9XkEmQyM5mShcjePkxOXhJ2MRn/Puq7 3O9REKLRtOtJhMk4XUjjNpsU2iFz4w4EgOIBB5L1bw8ceEetd07e9Sq2yutVFS3NY7rn jwHfy3FQynrmTyTYFCbfjsDyip3ZYs4GW0lxdofekVTSDGO1ra5rgXWkOFnSMl7BzjSH MbAaKj7xmo1MKv/wwclW3oF+xhTjr/OwC42ThXGMdYmB20vCruIedu3CakiDMXX2GA8J wnPwk1hUtl0762E29m4NeMdNZ2/4NQBLmj0LNHPxzaYneMiHsl3jIsq/rJt5WjxxvzON uOcA== Received: by 10.50.217.229 with SMTP id pb5mr1464778igc.28.1348143230460; Thu, 20 Sep 2012 05:13: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.50.184.232 with SMTP id ex8csp71649igc; Thu, 20 Sep 2012 05:13:49 -0700 (PDT) Received: by 10.180.90.201 with SMTP id by9mr5456037wib.5.1348143229072; Thu, 20 Sep 2012 05:13:49 -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 d10si41848223wiy.36.2012.09.20.05.13.48 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:49 -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 mail-wg0-f50.google.com with SMTP id 16so1635552wgi.31 for ; Thu, 20 Sep 2012 05:13:48 -0700 (PDT) Received: by 10.217.1.206 with SMTP id n56mr992438wes.151.1348143228598; Thu, 20 Sep 2012 05:13:48 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPS id w7sm32394460wiz.0.2012.09.20.05.13.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:47 -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, olof.johansson@gmail.com, Lee Jones Subject: [PATCH 26/32] ARM: ux500: Stop registering I2C sub-devices for HREF when DT is enabled Date: Thu, 20 Sep 2012 14:12:44 +0200 Message-Id: <1348143170-2130-27-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> References: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQk/guM0/hXJfY/Nvqo76J/o0CAzPw5uF8KbDq+bztPGkQ8UAK6oG4BVGOSc3xAKPtOCDCsa Here we remove all calls to register I2C sub-devices from platform code when Device Tree is enabled. Instead the I2C driver will parse the Device Tree for them. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 671229e..3faedf0 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -824,15 +824,6 @@ static void __init u8500_init_machine(void) platform_add_devices(mop500_platform_devs, ARRAY_SIZE(mop500_platform_devs)); - hrefv60_sdi_init(parent); - - i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); - i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES; - - i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); - i2c_register_board_info(2, mop500_i2c2_devices, - ARRAY_SIZE(mop500_i2c2_devices)); - mop500_uib_init(); }