From patchwork Fri Sep 7 11:14:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11238 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 D2B2423F25 for ; Fri, 7 Sep 2012 11:15:24 +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 76195A18DA9 for ; Fri, 7 Sep 2012 11:15:24 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so4488374iea.11 for ; Fri, 07 Sep 2012 04:15:24 -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=uXr26+GGRIzUBssKbne0IyioJyYEWAe0brGYLcmobmI=; b=a+R4a5D+BLYSXVM7PT8RaQqGgAvoOdtl3lGcdQEoWs7UPI+O9QuMfHitrgxO+RIYmK xmBcKNDs/X02kLZZsRGl2QkSi5WrUIC6khNEPKCwnuyY5abTcsrt/mOBk9pSTGWRlCU/ /QFBo7b3InCRUCxG2mzlGuNxN7ueN7+icVioZnHGXGtEAZchNFSOfQ30DJw6GBbJ3USA N1q7nZfHUM35VqGjQJEPuowDcIR5urQgzJy0i5JqwRDOATUycyYDa/atFFacQTgNHPmy tL3w6qOaIuHTrJkHdw9j9kdq+aChPY3dp0Cr0LLtZGSeJwolQJv1WzP6d6LZN6y7ieuk hfzw== Received: by 10.50.242.3 with SMTP id wm3mr15960166igc.0.1347016524271; Fri, 07 Sep 2012 04:15:24 -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 ex8csp373424igc; Fri, 7 Sep 2012 04:15:23 -0700 (PDT) Received: by 10.180.109.166 with SMTP id ht6mr11549827wib.11.1347016522748; Fri, 07 Sep 2012 04:15:22 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id bd3si12701943wib.22.2012.09.07.04.15.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 04:15:22 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wibhi8 with SMTP id hi8so1262848wib.13 for ; Fri, 07 Sep 2012 04:15:22 -0700 (PDT) Received: by 10.180.98.138 with SMTP id ei10mr11591616wib.1.1347016522239; Fri, 07 Sep 2012 04:15:22 -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 k20sm9151505wiv.11.2012.09.07.04.15.20 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 04:15:21 -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, Lee Jones Subject: [PATCH 05/19] ARM: ux500: Stop registering HREF's SDI devices from platform data Date: Fri, 7 Sep 2012 12:14:45 +0100 Message-Id: <1347016499-29354-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347016499-29354-1-git-send-email-lee.jones@linaro.org> References: <1347016499-29354-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQl1Qoii+5CVodt6zaE6yNSNJCka9Kz3S9gnX4tlWuBMpWyPlzQhFBBH6BAem5fNEXbZqv+l The HREF Device Tree now has support for its four SDIs. So, if we continue registering them from platform code when Device Tree is enabled we'll cause a double probe of the same devices. To prevent that we'll just remove registration. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 9575150..a42418b 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -840,7 +840,6 @@ static void __init u8500_init_machine(void) platform_add_devices(mop500_platform_devs, ARRAY_SIZE(mop500_platform_devs)); - hrefv60_sdi_init(parent); mop500_audio_init(parent); i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);