LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Michal Simek <michal.simek@xilinx.com>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, "Andreas Färber" <afaerber@suse.de>,
	"Peter Crosthwaite" <peter.crosthwaite@xilinx.com>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	"Soren Brinkmann" <soren.brinkmann@xilinx.com>
Subject: [PATCH 2/2] ARM: zynq: DT: Add pinctrl information to USB nodes
Date: Mon, 26 Jan 2015 11:49:56 -0800	[thread overview]
Message-ID: <1422301796-22888-2-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1422301796-22888-1-git-send-email-soren.brinkmann@xilinx.com>

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
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>;
 };
-- 
2.2.2.1.g63c5777


  reply	other threads:[~2015-01-26 19:50 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-26 19:49 [PATCH 1/2] ARM: zynq: Remove bogus value from 'bias-disable' property Soren Brinkmann
2015-01-26 19:49 ` Soren Brinkmann [this message]
2015-01-27  0:38 ` Andreas Färber
2015-01-28 14:21   ` Michal Simek
2015-01-28 15:41     ` Sören Brinkmann
     [not found]     ` <20150128154139.GK13057@xsjandreislx>
2015-01-29 14:35       ` Michal Simek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1422301796-22888-2-git-send-email-soren.brinkmann@xilinx.com \
    --to=soren.brinkmann@xilinx.com \
    --cc=afaerber@suse.de \
    --cc=devicetree@vger.kernel.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michal.simek@xilinx.com \
    --cc=peter.crosthwaite@xilinx.com \
    --subject='Re: [PATCH 2/2] ARM: zynq: DT: Add pinctrl information to USB nodes' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).