From patchwork Thu Sep 20 12:12:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11549 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 08AA71B4E37 for ; Thu, 20 Sep 2012 12:13:27 +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 7A9C63D09905 for ; Thu, 20 Sep 2012 12:13:26 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so2722067iej.11 for ; Thu, 20 Sep 2012 05:13:26 -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=5fs89r27FyEXADeFy6FBGvLQM/ohnvxFXrFPrfVT9DM=; b=UAfNnYkD3SAWUcHCWGRpCmW1bzUj2/Mhg0Gl5ZPRKrXJ27uwB7iENj0FSbFBFBT9j/ KdqWYvI+X2Qk5mHkWvBhgtxzgx1ZExBuxhYpOyRUqVf7qlgAG9+9552FDSGFEJ+nSybE FrLTQU3p9L/NHJLTbQQ+2vKf5rrlvC3nyIw063iwvgM5Akj/f81CDIyJcZ8ACKAHoSaw t+ctj4XZarPvZt8O90HYLLVCdJ4Jc1OKthx7pnt0G7OscsIci3UODRN/niOxF7zIly9n eekPYQDNfVnuEFyhv7/uu74/8EoECTjMP26SBOkPUyHYuzjAWQta0Fwd1DgYxloaCe+c 2kag== Received: by 10.50.7.212 with SMTP id l20mr1438299iga.43.1348143206280; Thu, 20 Sep 2012 05:13:26 -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 ex8csp71610igc; Thu, 20 Sep 2012 05:13:25 -0700 (PDT) Received: by 10.180.84.164 with SMTP id a4mr4139469wiz.12.1348143204614; Thu, 20 Sep 2012 05:13:24 -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 e51si7287379wej.148.2012.09.20.05.13.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:24 -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 mail-wi0-f172.google.com with SMTP id hi8so442456wib.13 for ; Thu, 20 Sep 2012 05:13:24 -0700 (PDT) Received: by 10.180.105.6 with SMTP id gi6mr4177769wib.4.1348143204038; Thu, 20 Sep 2012 05:13:24 -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.22 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:23 -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 12/32] ARM: ux500: Add i2c configurations to the Device Tree for DB8500 based devices Date: Thu, 20 Sep 2012 14:12:30 +0200 Message-Id: <1348143170-2130-13-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: ALoCoQkldtahS9PZW7zULvZ2BhHgmwGWEDJCS0qt+F8hBEWfIWS0v4+eJyG9FR5l1mHWZrln0HPY Since initial support was provided for the Nomadik I2C driver, it has been converted to an AMBA device. AMBA devices are probed in a slightly different way to other devices, so we have to identify them using an "arm,primecell" compatible string. As well as doing just that, this patch specifies which regulators the controller should use and requests a clock-speed. The latter is provided as more of an example, as it's the same as the recently changed default configuration. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/boot/dts/dbx5x0.dtsi | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index dc290d0..cbef6ab 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -474,43 +474,58 @@ }; i2c@80004000 { - compatible = "stericsson,db8500-i2c", "st,nomadik-i2c"; + compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80004000 0x1000>; interrupts = <0 21 0x4>; #address-cells = <1>; #size-cells = <0>; + v-i2c-supply = <&db8500_vape_reg>; + + clock-frequency = <400000>; }; i2c@80122000 { - compatible = "stericsson,db8500-i2c", "st,nomadik-i2c"; + compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80122000 0x1000>; interrupts = <0 22 0x4>; #address-cells = <1>; #size-cells = <0>; + v-i2c-supply = <&db8500_vape_reg>; + + clock-frequency = <400000>; }; i2c@80128000 { - compatible = "stericsson,db8500-i2c", "st,nomadik-i2c"; + compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80128000 0x1000>; interrupts = <0 55 0x4>; #address-cells = <1>; #size-cells = <0>; + v-i2c-supply = <&db8500_vape_reg>; + + clock-frequency = <400000>; }; i2c@80110000 { - compatible = "stericsson,db8500-i2c", "st,nomadik-i2c"; + compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80110000 0x1000>; interrupts = <0 12 0x4>; #address-cells = <1>; #size-cells = <0>; + v-i2c-supply = <&db8500_vape_reg>; + + clock-frequency = <400000>; }; i2c@8012a000 { - compatible = "stericsson,db8500-i2c", "st,nomadik-i2c"; + compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x8012a000 0x1000>; interrupts = <0 51 0x4>; #address-cells = <1>; #size-cells = <0>; + v-i2c-supply = <&db8500_vape_reg>; + + clock-frequency = <400000>; }; ssp@80002000 {