linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: richard.zhao@freescale.com (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 10/12] ARM: dts: imx6q-sabrelite: add usb devices
Date: Mon, 21 May 2012 17:23:55 +0800	[thread overview]
Message-ID: <1337592237-5090-11-git-send-email-richard.zhao@freescale.com> (raw)
In-Reply-To: <1337592237-5090-1-git-send-email-richard.zhao@freescale.com>

Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
 arch/arm/boot/dts/imx6q-sabrelite.dts |   18 ++++++++++++-
 arch/arm/boot/dts/imx6q.dtsi          |   44 +++++++++++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 1dd2261..1d28957 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -48,10 +48,26 @@
 					status = "okay";
 				};
 			};
-
+			iomuxc at 020e0000 {
+				gpios {
+					pinctrl_gpio_hog: gpiohog {
+						fsl,pins = <1044 0x80000000
+							   144  0x80000000>;	/* MX6Q_PAD_GPIO_17__GPIO_7_12 */
+					};
+				};
+			};
 		};
 
 		aips-bus at 02100000 { /* AIPS2 */
+			usb at 02184000 { /* USB OTG */
+				fsl,vbus-power-gpios = <&gpio3 22 0>;
+				status = "okay";
+			};
+
+			usb at 02184200 { /* USB1 */
+				status = "okay";
+			};
+
 			ethernet at 02188000 {
 				phy-mode = "rgmii";
 				phy-reset-gpios = <&gpio3 23 0>;
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 8c90cba..f67048e 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -444,12 +444,14 @@
 				};
 			};
 
-			usbphy at 020c9000 { /* USBPHY1 */
+			usbphy1: usbphy at 020c9000 {
+				compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
 				reg = <0x020c9000 0x1000>;
 				interrupts = <0 44 0x04>;
 			};
 
-			usbphy at 020ca000 { /* USBPHY2 */
+			usbphy2: usbphy at 020ca000 {
+				compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
 				reg = <0x020ca000 0x1000>;
 				interrupts = <0 45 0x04>;
 			};
@@ -485,6 +487,9 @@
 				compatible = "fsl,imx6q-iomuxc";
 				reg = <0x020e0000 0x4000>;
 
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_gpio_hog>;
+
 				/* shared pinctrl settings */
 				audmux {
 					pinctrl_audmux_1: audmux-1 {
@@ -495,6 +500,11 @@
 					};
 				};
 
+				gpios {
+					pinctrl_gpio_hog: gpiohog {
+					};
+				};
+
 				i2c1 {
 					pinctrl_i2c1_1: i2c1grp-1 {
 						fsl,pins = <137 0x4001b8b1	/* MX6Q_PAD_EIM_D21__I2C1_SCL */
@@ -573,6 +583,36 @@
 				reg = <0x0217c000 0x4000>;
 			};
 
+			usb at 02184000 { /* USB OTG */
+				compatible = "fsl,imx6q-usb", "fsl,imx31-usb";
+				reg = <0x02184000 0x200>;
+				interrupts = <0 43 0x04>;
+				fsl,usbphy = <&usbphy1>;
+				status = "disabled";
+			};
+
+			usb at 02184200 { /* USB1 */
+				compatible = "fsl,imx6q-usb", "fsl,imx31-usb";
+				reg = <0x02184200 0x200>;
+				interrupts = <0 40 0x04>;
+				fsl,usbphy = <&usbphy2>;
+				status = "disabled";
+			};
+
+			usb at 02184400 { /* USB2 */
+				compatible = "fsl,imx6q-usb", "fsl,imx31-usb";
+				reg = <0x02184400 0x200>;
+				interrupts = <0 41 0x04>;
+				status = "disabled";
+			};
+
+			usb at 02184600 { /* USB3 */
+				compatible = "fsl,imx6q-usb", "fsl,imx31-usb";
+				reg = <0x02184600 0x200>;
+				interrupts = <0 42 0x04>;
+				status = "disabled";
+			};
+
 			ethernet at 02188000 {
 				compatible = "fsl,imx6q-fec";
 				reg = <0x02188000 0x4000>;
-- 
1.7.5.4

  parent reply	other threads:[~2012-05-21  9:23 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-21  9:23 [PATCH v2 00/12] add imx usb driver for mx28/6x Richard Zhao
2012-05-21  9:23 ` [PATCH v2 01/12] usb: otg: add notify_connect_change callback Richard Zhao
2012-05-21  9:26   ` Felipe Balbi
2012-05-21  9:36     ` Richard Zhao
2012-05-21  9:38       ` Felipe Balbi
2012-05-21 10:19         ` Richard Zhao
2012-05-21 13:03         ` Greg KH
2012-05-21 13:05   ` Greg KH
2012-05-21 17:36     ` Marek Vasut
2012-05-21 17:47       ` Greg KH
2012-05-21 18:32         ` Marek Vasut
2012-05-21 18:40           ` Greg KH
2012-05-21 19:27             ` Marek Vasut
2012-05-22  0:27               ` Richard Zhao
2012-05-21  9:23 ` [PATCH v2 02/12] usb: chipidea: permit driver bindings pass phy pointer Richard Zhao
2012-05-22  4:22   ` Marek Vasut
2012-05-22  9:59   ` Alexander Shishkin
2012-05-22 14:07     ` Marek Vasut
2012-05-22 15:14       ` Richard Zhao
2012-05-23  1:35         ` Chen Peter-B29397
2012-05-23  8:08       ` Alexander Shishkin
2012-05-21  9:23 ` [PATCH v2 03/12] usb: ehci-hcd: notify phy when connect change Richard Zhao
2012-05-22  4:23   ` Marek Vasut
2012-05-22  4:36     ` Richard Zhao
2012-05-21  9:23 ` [PATCH v2 04/12] usb: otg: add basic mxs phy driver support Richard Zhao
2012-05-21  9:23 ` [PATCH v2 05/12] usb: chipidea: add imx driver binding Richard Zhao
2012-05-22  4:30   ` Marek Vasut
2012-05-22  4:51     ` Richard Zhao
2012-05-22  9:56       ` Alexander Shishkin
2012-05-22 10:06         ` Felipe Balbi
2012-05-22 10:31           ` Richard Zhao
2012-05-22 10:35             ` Felipe Balbi
2012-05-22 10:41               ` Alexander Shishkin
2012-05-22 15:06                 ` Richard Zhao
2012-05-23 13:02                   ` Alexander Shishkin
2012-05-23 13:09                     ` Felipe Balbi
2012-05-23 13:13                       ` Alexander Shishkin
2012-05-22 13:52               ` Shawn Guo
2012-05-22 13:55                 ` Felipe Balbi
2012-05-22 10:21   ` Alexander Shishkin
2012-05-22 10:24     ` Alexander Shishkin
2012-05-22 15:30       ` Richard Zhao
2012-05-22 15:28     ` Richard Zhao
2012-05-21  9:23 ` [PATCH v2 06/12] ARM: imx6q: correct device name of usbphy and usb controller clock export Richard Zhao
2012-05-22  4:31   ` Marek Vasut
2012-05-22  4:56     ` Richard Zhao
2012-05-21  9:23 ` [PATCH v2 07/12] ARM: imx6q: add config-on-boot gpios Richard Zhao
2012-05-22  3:17   ` Shawn Guo
2012-05-22  3:25     ` Marek Vasut
2012-05-22  3:32       ` Shawn Guo
2012-05-22  4:20         ` Marek Vasut
2012-05-22  4:42           ` Shawn Guo
2012-05-22  5:22             ` Marek Vasut
2012-05-22  5:25               ` Shawn Guo
2012-05-22  5:27                 ` Marek Vasut
2012-05-22  6:07                   ` Richard Zhao
2012-05-22  3:38     ` Richard Zhao
2012-05-21  9:23 ` [PATCH v2 08/12] ARM: imx6q: add usbphy clocks Richard Zhao
2012-05-22  4:32   ` Marek Vasut
2012-05-22  4:45     ` Shawn Guo
2012-05-22  5:22       ` Marek Vasut
2012-05-22  4:59     ` Richard Zhao
2012-05-22  5:37   ` Shawn Guo
2012-05-22  6:08     ` Richard Zhao
2012-05-21  9:23 ` [PATCH v2 09/12] ARM: imx6q: disable usb charger detector Richard Zhao
2012-05-22  3:48   ` Shawn Guo
2012-05-22  4:32     ` Richard Zhao
2012-05-21  9:23 ` Richard Zhao [this message]
2012-05-22  5:10   ` [PATCH v2 10/12] ARM: dts: imx6q-sabrelite: add usb devices Shawn Guo
2012-05-22  5:59     ` Richard Zhao
2012-05-22  6:08       ` Shawn Guo
2012-05-22  6:19         ` Richard Zhao
2012-05-21  9:23 ` [PATCH v2 11/12] ARM: mxs: clk_register_clkdev mx28 usb clocks Richard Zhao
2012-05-22  4:48   ` Shawn Guo
2012-05-22  5:01     ` Richard Zhao
2012-05-21  9:23 ` [PATCH v2 12/12] ARM: dts: imx28-evk: add usb devices Richard Zhao
2012-05-22  4:52   ` Shawn Guo
2012-05-22  5:03     ` Richard Zhao
2012-05-22  5:24       ` Marek Vasut
2012-05-21 19:34 ` [PATCH v2 00/12] add imx usb driver for mx28/6x Fabio Estevam
2012-05-21 19:41   ` Marek Vasut
2012-05-21 19:47     ` Subodh Nijsure
2012-05-21 20:07       ` Marek Vasut
2012-05-22  1:38         ` Chen Peter-B29397
2012-05-22  1:41           ` Richard Zhao
2012-05-22  1:44             ` Chen Peter-B29397
2012-05-22  1:51               ` Richard Zhao
2012-05-22  2:00               ` Shawn Guo
2012-05-22  5:08   ` Richard Zhao
2012-05-22 13:13     ` Dirk Behme
2012-05-24  3:38     ` Richard Zhao

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=1337592237-5090-11-git-send-email-richard.zhao@freescale.com \
    --to=richard.zhao@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).