From patchwork Thu Aug 23 15:01:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10906 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 9EACF23F27 for ; Thu, 23 Aug 2012 15:01:42 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 820C9A19044 for ; Thu, 23 Aug 2012 15:01:27 +0000 (UTC) Received: by iadj38 with SMTP id j38so1408304iad.11 for ; Thu, 23 Aug 2012 08:01:41 -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:x-gm-message-state; bh=/9XUU+DUdZk08z0kTGrX4smjm89waABrjuVpfcvaLqg=; b=EsvRZLeXfpMluL9Ae7G54LdxcEoj6tU6YVz48SyIXm/JmM+296ehgb3LuN5r/khbBi OFG1434zmqXHMCJOcVxl2YMCvAkZQKHMQlPG1S997SgIh8ouFxZznkU2ljQkjOZZsx1w IfBjSB69sYgvLG2dIwJX+ionAB7/r05JQMz9XSCe+LeySBuoD2D9uWIPy6gVHatw2+Yx 1XLLjb0+7QpXx3kDtdt/gtMutvfrI0zC4yY1qUZEHNYgsKPjn9np9Mm9Vf6q7LAV2S3u yKceZpRBt6LInNHEjFAPEabAQqxaQiAKWzwuhvy+U0Gz+qKoNZzujKk6CnUnEzd/kal1 xVFg== Received: by 10.50.217.227 with SMTP id pb3mr6299145igc.28.1345734101595; Thu, 23 Aug 2012 08:01:41 -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 ex8csp266882igc; Thu, 23 Aug 2012 08:01:40 -0700 (PDT) Received: by 10.180.75.209 with SMTP id e17mr7630169wiw.0.1345734099849; Thu, 23 Aug 2012 08:01:39 -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 m51si10443202wea.41.2012.08.23.08.01.39 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 08:01:39 -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 wgbds11 with SMTP id ds11so602145wgb.31 for ; Thu, 23 Aug 2012 08:01:39 -0700 (PDT) Received: by 10.180.81.165 with SMTP id b5mr15639412wiy.17.1345734099056; Thu, 23 Aug 2012 08:01:39 -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 dv1sm3371017wib.10.2012.08.23.08.01.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 08:01:36 -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, w.sang@pengutronix.de, Lee Jones Subject: [PATCH 1/3] ARM: ux500: Add i2c configurations to the Device Tree for DB8500 based devices Date: Thu, 23 Aug 2012 16:01:25 +0100 Message-Id: <1345734087-21803-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQnEOMweylvNnk0VLObHAcqWbXToMDbuY54jNe3WlOCuHVxlRghx6DjVXYo3k65gVF06ozMf 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 51209a8..3708a6b 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -480,43 +480,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 {