From patchwork Fri May 4 18:23:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 8402 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 27D6423EAB for ; Fri, 4 May 2012 18:23:51 +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 EB906A18068 for ; Fri, 4 May 2012 18:23:50 +0000 (UTC) Received: by mail-gy0-f180.google.com with SMTP id z12so974947ghb.11 for ; Fri, 04 May 2012 11:23: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=+fab37OxxiH9VKBZEZep3Wdl6atOfrurH+k5g7QCZX8=; b=mQeIM2FItIhdvCP8YSLV+SyHF+PzqDFC4Eki1TZO84w+WtikjqVC5YA2PiVhplz6q7 U2/AQLRorJ+Ksyqk2cP6ARTfG28w84pVAzpn5XAEKCpDybuJGhCdG9iAWtG9Yl/9N2SJ /1oHcHJFo/4a9gtxBPPRGNLJEkfE2Sd3r86SlyXbpQOQVL7jos2tEx8mDXN0TWve7q38 n6pTWEKnI3Yj3+G8GW6akTFxPJL+pZhIMyn3zEESI1kpJh4G4bs7yV9zjtMQGfK3r1IG AAio7Y4nWY1tiM4RZXoMJtSCmy0KHnZC2XxvIpAFwFI7OckwZgX0thT+ywU5c49u2Yp0 MF0Q== Received: by 10.50.41.196 with SMTP id h4mr3674956igl.33.1336155830477; Fri, 04 May 2012 11:23: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.137.198 with SMTP id x6csp106256ibt; Fri, 4 May 2012 11:23:49 -0700 (PDT) Received: by 10.216.199.1 with SMTP id w1mr25465wen.19.1336155829216; Fri, 04 May 2012 11:23:49 -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.23.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 May 2012 11:23:49 -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 wera13 with SMTP id a13so2626931wer.37 for ; Fri, 04 May 2012 11:23:48 -0700 (PDT) Received: by 10.180.91.10 with SMTP id ca10mr8613097wib.17.1336155828574; Fri, 04 May 2012 11:23:48 -0700 (PDT) Received: from localhost.localdomain ([89.192.128.60]) by mx.google.com with ESMTPS id fn2sm17590123wib.0.2012.05.04.11.23.44 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 May 2012 11:23:48 -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 03/15] ARM: ux500: Provide auxdata to be used as name base clock search for nmk-i2c Date: Fri, 4 May 2012 19:23:13 +0100 Message-Id: <1336155805-18554-4-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: ALoCoQnGEfZPGe/yBY9EmsNmN7C+AW2gjIQMNbm1USh9iPLEqKzx6kCGjiEHwTD9J+p0GsQZL6UP This patch provides a way for find_clk() to complete its name-based searches and still find the nmk-i2c clocks. As Device Tree has a different naming structure to that of more traditional initialisation methods, find_clk() not succeed without these bindings. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 215d212..4b847cb 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -733,6 +733,11 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e000, "gpio.6", NULL), OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e080, "gpio.7", NULL), OF_DEV_AUXDATA("st,nomadik-gpio", 0xa03fe000, "gpio.8", NULL), + OF_DEV_AUXDATA("st,nomadik-i2c", 0x80004000, "nmk-i2c.0", NULL), + OF_DEV_AUXDATA("st,nomadik-i2c", 0x80122000, "nmk-i2c.1", NULL), + OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL), + OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), + OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), {}, }; @@ -807,7 +812,6 @@ static void __init u8500_init_machine(void) i2c_register_board_info(2, mop500_i2c2_devices, ARRAY_SIZE(mop500_i2c2_devices)); } - mop500_i2c_init(parent); /* This board has full regulator constraints */ regulator_has_full_constraints();