From patchwork Mon Jan 26 19:49:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 5712491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CF3E09F4DC for ; Mon, 26 Jan 2015 19:52:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 047B820123 for ; Mon, 26 Jan 2015 19:52:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2FE5A2010F for ; Mon, 26 Jan 2015 19:52:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YFpgd-00014m-7B; Mon, 26 Jan 2015 19:51:03 +0000 Received: from mail-oi0-x22a.google.com ([2607:f8b0:4003:c06::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YFpgS-0000tY-Ou for linux-arm-kernel@lists.infradead.org; Mon, 26 Jan 2015 19:50:53 +0000 Received: by mail-oi0-f42.google.com with SMTP id i138so8929130oig.1 for ; Mon, 26 Jan 2015 11:50:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=VV7OlnirQ66N7nnRbGXL0+kllRqBXnGb3urCqbgBDaM=; b=gnv6IpdD7NjGDsx4z80iOFVLjgviOvVI16RlpW68TYkJoM7BFNTsVTnSN3qh1jriXB M5L5MEJymhNS5WIRsXl+TYU3LcdITb9tfQGt/d8YW9ejF8fgIfjBVEOysqLA1jW4y+Lr 7vhVROMRqyAZwWogxvS0NFkGQ/AUwfp59236XqfZnhBlbSVQJrj9qmrc0UDFzrydr/FB wrwg64wiqkt0FEM6j8p3+NjrVat1XQNTSRtE7bXB1NeZuewyBtl55dbJ8K8LhivuUua4 by7Ar/N7yIx1aZ5C9/qDZk1NV8iCgP3zRmyuFjCXvOE5rOtq+gArDuWGM7e1tPe8GsnF l8bw== X-Received: by 10.60.133.141 with SMTP id pc13mr14127271oeb.68.1422301831643; Mon, 26 Jan 2015 11:50:31 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id v187sm5718968oie.2.2015.01.26.11.50.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jan 2015 11:50:30 -0800 (PST) From: Soren Brinkmann To: Michal Simek Subject: [PATCH 2/2] ARM: zynq: DT: Add pinctrl information to USB nodes Date: Mon, 26 Jan 2015 11:49:56 -0800 Message-Id: <1422301796-22888-2-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 2.2.2.1.g63c5777 In-Reply-To: <1422301796-22888-1-git-send-email-soren.brinkmann@xilinx.com> References: <1422301796-22888-1-git-send-email-soren.brinkmann@xilinx.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150126_115052_855149_568B106E X-CRM114-Status: UNSURE ( 9.45 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: devicetree@vger.kernel.org, Peter Crosthwaite , Linus Walleij , linux-kernel@vger.kernel.org, Soren Brinkmann , =?UTF-8?q?Andreas=20F=C3=A4rber?= , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Soren Brinkmann --- Hi Michal, This could be squashed into 1643b31658c4 'ARM: zynq: DT: Add USB to device tree' if you decide to rebuild the zynq/dt branch. Sören --- arch/arm/boot/dts/zynq-zc702.dts | 26 ++++++++++++++++++++++++++ arch/arm/boot/dts/zynq-zc706.dts | 26 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 4f8835be4874..483f69ba2cf5 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -312,6 +312,30 @@ bias-disable; }; }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = <0>; + io-standard = <1>; + }; + + conf-rx { + pins = "MIO29", "MIO31", "MIO36"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO28", "MIO30", "MIO32", "MIO33", "MIO34", + "MIO35", "MIO37", "MIO38", "MIO39"; + bias-disable; + }; + }; }; &sdhci0 { @@ -330,4 +354,6 @@ status = "okay"; dr_mode = "host"; usb-phy = <&usb_phy0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; }; diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index 6979ce23175f..3a6260998116 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts @@ -261,6 +261,30 @@ bias-disable; }; }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = <0>; + io-standard = <1>; + }; + + conf-rx { + pins = "MIO29", "MIO31", "MIO36"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO28", "MIO30", "MIO32", "MIO33", "MIO34", + "MIO35", "MIO37", "MIO38", "MIO39"; + bias-disable; + }; + }; }; &sdhci0 { @@ -279,4 +303,6 @@ status = "okay"; dr_mode = "host"; usb-phy = <&usb_phy0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; };