mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Roger Quadros <rogerq@ti.com>
To: <balbi@ti.com>
Cc: <tony@atomide.com>, <kishon@ti.com>, <george.cherian@ti.com>,
	<dmurphy@ti.com>, <linux-usb@vger.kernel.org>,
	<linux-omap@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, Roger Quadros <rogerq@ti.com>,
	Benoit Cousson <benoit.cousson@linaro.org>
Subject: [PATCH 6/7] ARM: dts: omap4: update omap-control-usb nodes
Date: Thu, 1 Aug 2013 17:05:14 +0300	[thread overview]
Message-ID: <1375365915-21380-7-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1375365915-21380-1-git-send-email-rogerq@ti.com>

Split otghs_ctrl and USB2 PHY power down into separate
omap-control-usb nodes. Update ti,mode property.

CC: Benoit Cousson <benoit.cousson@linaro.org>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/omap4.dtsi |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 22d9f2b..9a6fa27 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -519,7 +519,7 @@
 			usb2_phy: usb2phy@4a0ad080 {
 				compatible = "ti,omap-usb2";
 				reg = <0x4a0ad080 0x58>;
-				ctrl-module = <&omap_control_usb>;
+				ctrl-module = <&omap_control_usb2phy>;
 			};
 		};
 
@@ -643,11 +643,17 @@
 			};
 		};
 
-		omap_control_usb: omap-control-usb@4a002300 {
+		omap_control_usb2phy: omap-control-usb@4a002300 {
 			compatible = "ti,omap-control-usb";
-			reg = <0x4a002300 0x4>,
-			      <0x4a00233c 0x4>;
-			reg-names = "control_dev_conf", "otghs_control";
+			reg = <0x4a002300 0x4>;
+			reg-names = "power";
+			ti,type = <2>;
+		};
+
+		omap_control_usbotg: omap-control-usb@4a00233c {
+			compatible = "ti,omap-control-usb";
+			reg = <0x4a00233c 0x4>;
+			reg-names = "otghs_control";
 			ti,type = <1>;
 		};
 
@@ -662,6 +668,7 @@
 			num-eps = <16>;
 			ram-bits = <12>;
 			ti,has-mailbox;
+			ctrl-module = <&omap_control_usbotg>;
 		};
 	};
 };
-- 
1.7.4.1


  parent reply	other threads:[~2013-08-01 14:05 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-01 14:05 [PATCH 0/7] phy: omap-usb: Support multiple instances and new types Roger Quadros
2013-08-01 14:05 ` [PATCH 1/7] usb: phy: omap: Add new PHY types and remove omap_control_usb3_phy_power() Roger Quadros
2013-08-06 11:45   ` Kishon Vijay Abraham I
2013-08-06 13:26     ` Roger Quadros
2013-08-01 14:05 ` [PATCH 2/7] usb: phy: omap-usb2: Don't use omap_get_control_dev() Roger Quadros
2013-08-06 11:47   ` Kishon Vijay Abraham I
2013-08-01 14:05 ` [PATCH 3/7] usb: phy: omap-usb3: " Roger Quadros
2013-08-06 11:48   ` Kishon Vijay Abraham I
2013-08-01 14:05 ` [PATCH 4/7] usb: musb: omap2430: " Roger Quadros
2013-08-06 11:51   ` Kishon Vijay Abraham I
2013-08-06 13:27     ` Roger Quadros
2013-08-01 14:05 ` [PATCH 5/7] usb: phy: omap: get rid of omap_get_control_dev() Roger Quadros
2013-08-06 11:52   ` Kishon Vijay Abraham I
2013-08-01 14:05 ` Roger Quadros [this message]
2013-08-14  7:45   ` [PATCH 6/7] ARM: dts: omap4: update omap-control-usb nodes Roger Quadros
2013-08-14  8:41   ` Benoit Cousson
2013-08-14  9:04     ` Roger Quadros
2013-08-01 14:05 ` [PATCH 7/7] ARM: dts: omap5: update omap-control-usb node Roger Quadros
2013-08-14  7:45   ` Roger Quadros
2013-08-14  7:44 ` [PATCH 0/7] phy: omap-usb: Support multiple instances and new types Roger Quadros

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=1375365915-21380-7-git-send-email-rogerq@ti.com \
    --to=rogerq@ti.com \
    --cc=balbi@ti.com \
    --cc=benoit.cousson@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dmurphy@ti.com \
    --cc=george.cherian@ti.com \
    --cc=kishon@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=tony@atomide.com \
    /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

all inboxes | Powered by JetHome®