From patchwork Wed Mar 20 11:23:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Genoud X-Patchwork-Id: 2306771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 8B1533FC54 for ; Wed, 20 Mar 2013 11:26:46 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIH7c-0007sj-GP; Wed, 20 Mar 2013 11:23:56 +0000 Received: from mail-we0-x22a.google.com ([2a00:1450:400c:c03::22a]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIH7W-0007rN-IV for linux-arm-kernel@lists.infradead.org; Wed, 20 Mar 2013 11:23:53 +0000 Received: by mail-we0-f170.google.com with SMTP id z53so1325705wey.1 for ; Wed, 20 Mar 2013 04:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=Hy3QfZdOFgjceWtRdsxZcV3rgqMowZzgfjBe3jTxvhM=; b=QBZc9A96piUnuXvb+RiL0MlioCOSSOJFVaU5c2U0k6wDX6vtGnRru0Zb7YnXSTmCEq fykQpt20XHYkbcLeBVipDPQ7yPqyI792Us+tw/E70sMcO+IodeI0tOjQ4+lqc7cw4o5c hd1YQsNWrExMivwIAeDr1ELYkVoby6ePvb36oexd5x0KQa6y1KsF1vdo4H6p1RI83Z0T MTZFqL/HQz6KbOJAko23ygAzAFQH+gHpGfYZPlVcxyoKNFXVzGo9HUwZb4js21vPUnax 5TQUiJKg6hEw6RDBM3ADZC07cgTeJK/pJ4HJLadkKbUTUFD90pFVyJLh3r3OO8ZWObdA 0eWw== X-Received: by 10.180.94.69 with SMTP id da5mr3021487wib.30.1363778628844; Wed, 20 Mar 2013 04:23:48 -0700 (PDT) Received: from localhost.localdomain (lyon.paratronic.fr. [213.41.177.106]) by mx.google.com with ESMTPS id ex15sm6272342wid.5.2013.03.20.04.23.47 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 20 Mar 2013 04:23:48 -0700 (PDT) From: Richard Genoud To: Nicolas Ferre Subject: [PATCH] DTS at91sam9x5cm: add 1-wire chip on CM board Date: Wed, 20 Mar 2013 12:23:40 +0100 Message-Id: <1363778620-5213-1-git-send-email-richard.genoud@gmail.com> X-Mailer: git-send-email 1.7.2.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130320_072352_851064_2CE9100D X-CRM114-Status: UNSURE ( 8.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (richard.genoud[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Richard Genoud , Jean-Christophe PLAGNIOL-VILLARD , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This add the 1-wire chip present on the CM board to the DTS. As the pin is also used by leds, tt's disabled by default. If the board really wants it, it can be enabled in the board DTS. Signed-off-by: Richard Genoud Acked-by: Nicolas Ferre --- arch/arm/boot/dts/at91sam9x5cm.dtsi | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi b/arch/arm/boot/dts/at91sam9x5cm.dtsi index 4027ac7..347a74a 100644 --- a/arch/arm/boot/dts/at91sam9x5cm.dtsi +++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi @@ -24,6 +24,16 @@ }; ahb { + apb { + pinctrl@fffff400 { + 1wire_cm { + pinctrl_1wire_cm: 1wire_cm-0 { + atmel,pins = <1 18 0x0 0x2>; /* PB18 multidrive, conflicts with led */ + }; + }; + }; + }; + nand0: nand@40000000 { nand-bus-width = <8>; nand-ecc-mode = "hw"; @@ -74,4 +84,14 @@ gpios = <&pioD 21 0>; }; }; + + 1wire_cm { + compatible = "w1-gpio"; + gpios = <&pioB 18 0>; + linux,open-drain; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_1wire_cm>; + status = "okay"; + }; + };