From patchwork Thu May 17 13:45:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 8740 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 8181223E23 for ; Thu, 17 May 2012 13:46:12 +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 5203CA183E2 for ; Thu, 17 May 2012 13:46:12 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so2146812yen.11 for ; Thu, 17 May 2012 06:46:12 -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=IXd5fg1x2HOgkMJlBXci37IrFsu2sq46DWvTCVTBGJE=; b=XWVmv4H3ogq8wXwRJj1UVKPCEKrDFaTDZUss18uPe74eTHtZrRoWIUdCTLGdne+mN3 /zYFq6s8fAHNb0N5Rk2BslwufqLoFOiHxBYlw5yKukY6osKUIZ9v+I5RL+pjjdyuDUAO 4nEGJqkDFom+1b4a2hmRqGCExAMnyDXV6nFNRxRsgUozMnI5oladqqgFc7Ttd6kJcECP iAisDUMZeamqKanPUU/PbPnJKSsPX2irA+igrJX+uvUeVF9lXVYbL07hHNCbcdfN8Sei W7JKeox9mYJRSJserzQaipxS4XrnYKEOtX/N/jX/VidML8a8JuFnj3XyKVAegXag+5bR KIMw== Received: by 10.50.154.169 with SMTP id vp9mr13289611igb.53.1337262371838; Thu, 17 May 2012 06:46:11 -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 o8csp28993ibd; Thu, 17 May 2012 06:46:10 -0700 (PDT) Received: by 10.180.105.198 with SMTP id go6mr18511018wib.19.1337262370401; Thu, 17 May 2012 06:46:10 -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 j10si7422177wed.69.2012.05.17.06.46.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 May 2012 06:46:10 -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 ds11so1887207wgb.31 for ; Thu, 17 May 2012 06:46:10 -0700 (PDT) Received: by 10.216.207.151 with SMTP id n23mr4741648weo.100.1337262369783; Thu, 17 May 2012 06:46:09 -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.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 May 2012 06:46:09 -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 03/18] ARM: ux500: Provide auxdata to be used as name base clock search for nmk-i2c Date: Thu, 17 May 2012 14:45:08 +0100 Message-Id: <1337262323-27692-4-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: ALoCoQkDt1wygev6ctqDB6mYD+wTDJzJgPES8E9NUq0zgNjChUULmhWXBUjBBCNshB3jyHd3AOs9 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. Acked-by: Linus Walleij 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 4584c74..b8331fe 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -757,6 +757,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), {}, }; @@ -838,7 +843,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();