From patchwork Wed Oct 24 14:45:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12480 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 4463F23F58 for ; Wed, 24 Oct 2012 14:45:56 +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 EA051A187E0 for ; Wed, 24 Oct 2012 14:45:55 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so731028iej.11 for ; Wed, 24 Oct 2012 07:45:55 -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=33Q5Xyy+mFkJ2H07Lrjpl986nblZcbKZQUlwkxo7Rqw=; b=ZGRKgQcn1Wy8oWgKxX2kPVS0LLq+qolmy4Dcso8R1aDmFviy53OZGdClN4IcJMOkO3 IyWFliHc4VWBYWvSgWN2xN+PwuqCWVjG4RAL901YVtkM0JIxWIII42NrlDtndIDT6sxK NqnB7OvzqWQX3kcSvB3H2iHzyH2DylzeY/2ioBSAX9x4NSrA0SeTd4rtedFRoDjn7mJa KOTD9XAtbZMbCXecgBOJ6zSs1i3hsue1/akNTQZbXmNyoZ3nLnzC85wYITJ3Nz6cJfBz jF0e6csImgYPdjrIx3GIQ6RmHp+shHpT/GcoOwoS5d3PCm0iS1pY1NlwM3lJUoTK2qJS FdqA== Received: by 10.42.57.10 with SMTP id b10mr14021675ich.54.1351089955717; Wed, 24 Oct 2012 07:45:55 -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.67.148 with SMTP id n20csp625507igt; Wed, 24 Oct 2012 07:45:55 -0700 (PDT) Received: by 10.216.142.25 with SMTP id h25mr10220821wej.157.1351089954255; Wed, 24 Oct 2012 07:45:54 -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 g17si2293392weo.21.2012.10.24.07.45.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 07:45:53 -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 mail-we0-f178.google.com with SMTP id r6so385587wey.37 for ; Wed, 24 Oct 2012 07:45:52 -0700 (PDT) Received: by 10.216.212.232 with SMTP id y82mr9190754weo.120.1351089952690; Wed, 24 Oct 2012 07:45:52 -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 bn7sm5295273wib.8.2012.10.24.07.45.51 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 07:45:52 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 4/6] ARM: ux500: Specify AMBA Primecell IDs for Nomadik I2C in DT Date: Wed, 24 Oct 2012 15:45:24 +0100 Message-Id: <1351089926-32161-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351089926-32161-1-git-send-email-lee.jones@linaro.org> References: <1351089926-32161-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmYiaewOQiRd2Ng+HrQ9T58V3cXK/4CWUDR7aYliZ614BUe/0BcQ9a8qTYVtSmJEvuFdclS Now the Nomadik I2C driver has been converted to an AMBA one, we are required to provide the Primecell IDs via platform code. When booting with DT enabled these have to be specified in the device nodes. We do that here. Signed-off-by: Lee Jones --- arch/arm/boot/dts/dbx5x0.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 536df5d..4ed1b4b 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -452,6 +452,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80004000 0x1000>; interrupts = <0 21 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>; @@ -463,6 +465,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80122000 0x1000>; interrupts = <0 22 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>; @@ -474,6 +478,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80128000 0x1000>; interrupts = <0 55 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>; @@ -485,6 +491,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80110000 0x1000>; interrupts = <0 12 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>; @@ -496,6 +504,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x8012a000 0x1000>; interrupts = <0 51 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>;