linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ajay Kumar Gupta <ajay.gupta@ti.com>
To: linux-usb@vger.kernel.org
Cc: linux-omap@vger.kernel.org, balbi@ti.com, tony@atomide.com,
	Ajay Kumar Gupta <ajay.gupta@ti.com>
Subject: [PATCH 2/3 v5] arm: omap: am335x: enable phy controls
Date: Wed, 8 Feb 2012 09:56:51 +0530	[thread overview]
Message-ID: <1328675212-29693-2-git-send-email-ajay.gupta@ti.com> (raw)
In-Reply-To: <1328675212-29693-1-git-send-email-ajay.gupta@ti.com>

Switch on the phy for am335x.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
 arch/arm/mach-omap2/omap_phy_internal.c |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c
index 4c90477..7129408 100644
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -266,7 +266,11 @@ void ti81xx_musb_phy_power(u8 on)
 	void __iomem *scm_base = NULL;
 	u32 usbphycfg;
 
-	scm_base = ioremap(TI81XX_SCM_BASE, SZ_2K);
+	if (cpu_is_ti81xx())
+		scm_base = ioremap(TI81XX_SCM_BASE, SZ_2K);
+	else if (cpu_is_am33xx())
+		scm_base = ioremap(AM33XX_SCM_BASE, SZ_2K);
+
 	if (!scm_base) {
 		pr_err("system control module ioremap failed\n");
 		return;
@@ -278,16 +282,19 @@ void ti81xx_musb_phy_power(u8 on)
 		if (cpu_is_ti816x()) {
 			usbphycfg |= TI816X_USBPHY0_NORMAL_MODE;
 			usbphycfg &= ~TI816X_USBPHY_REFCLK_OSC;
-		} else if (cpu_is_ti814x()) {
-			usbphycfg &= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN
-				| USBPHY_DPINPUT | USBPHY_DMINPUT);
-			usbphycfg |= (USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN
-				| USBPHY_DPOPBUFCTL | USBPHY_DMOPBUFCTL);
+		} else if (cpu_is_ti814x() || cpu_is_am33xx()) {
+			usbphycfg &= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN);
+			usbphycfg |= USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN;
+			if (cpu_is_ti814x()) {
+				usbphycfg &= ~(USBPHY_DPINPUT | USBPHY_DMINPUT);
+				usbphycfg |= USBPHY_DPOPBUFCTL
+					| USBPHY_DMOPBUFCTL;
+			}
 		}
 	} else {
 		if (cpu_is_ti816x())
 			usbphycfg &= ~TI816X_USBPHY0_NORMAL_MODE;
-		else if (cpu_is_ti814x())
+		else if (cpu_is_ti814x() || cpu_is_am33xx())
 			usbphycfg |= USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN;
 
 	}
-- 
1.7.0.4


  reply	other threads:[~2012-02-08  4:26 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-08  4:26 [PATCH 1/3 v5] usb: musb: Add support for ti81xx platform Ajay Kumar Gupta
2012-02-08  4:26 ` Ajay Kumar Gupta [this message]
     [not found]   ` <1328675212-29693-2-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
2012-02-10 18:31     ` [PATCH 2/3 v5] arm: omap: am335x: enable phy controls Tony Lindgren
     [not found]       ` <20120210183143.GS1426-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2012-02-13  4:26         ` Gupta, Ajay Kumar
2012-02-13  6:49           ` Felipe Balbi
2012-02-13  9:40             ` Gupta, Ajay Kumar
2012-02-13 10:11               ` Felipe Balbi
2012-02-08  4:26 ` [PATCH 3/3 v5] usb: musb: enable support for am335x Ajay Kumar Gupta
     [not found] ` <1328675212-29693-1-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
2012-02-08  6:16   ` [PATCH 1/3 v5] usb: musb: Add support for ti81xx platform Shubhrajyoti
2012-02-09  8:08     ` Felipe Balbi
2012-02-09 11:30       ` Gupta, Ajay Kumar
     [not found]         ` <47CEF8C4B26E8C44B22B028A650E0EA9317F03C8-Er742YJ7I/eIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2012-02-13  7:05           ` Gupta, Ajay Kumar
  -- strict thread matches above, loose matches on Subject: below --
2012-02-08  7:41 Ajay Kumar Gupta
2012-02-08  7:41 ` [PATCH 2/3 v5] arm: omap: am335x: enable phy controls Ajay Kumar Gupta
2012-03-05 22:50   ` Tony Lindgren
2012-03-12 12:52     ` Gupta, Ajay Kumar

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=1328675212-29693-2-git-send-email-ajay.gupta@ti.com \
    --to=ajay.gupta@ti.com \
    --cc=balbi@ti.com \
    --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;
as well as URLs for NNTP newsgroup(s).