From: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/13] ehci-mx5: Fix *PM usage for i.MX53
Date: Mon, 5 Nov 2012 21:11:33 +0100 (CET) [thread overview]
Message-ID: <734732916.587292.1352146293558.JavaMail.root@advansee.com> (raw)
In-Reply-To: <412111025.587245.1352146184216.JavaMail.root@advansee.com>
The MXC_*_UCTRL_*PM_BIT bits are available only on i.MX51.
Signed-off-by: Beno?t Th?baudeau <benoit.thebaudeau@advansee.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
---
.../drivers/usb/host/ehci-mx5.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git u-boot-usb-76454b2.orig/drivers/usb/host/ehci-mx5.c u-boot-usb-76454b2/drivers/usb/host/ehci-mx5.c
index bd1f119..8e42e56 100644
--- u-boot-usb-76454b2.orig/drivers/usb/host/ehci-mx5.c
+++ u-boot-usb-76454b2/drivers/usb/host/ehci-mx5.c
@@ -153,10 +153,12 @@ int mxc_set_usbcontrol(int port, unsigned int flags)
MXC_USB_PHY_CTR_FUNC_OFFSET);
v = __raw_readl(usbother_base + MXC_USBCTRL_OFFSET);
+#ifdef CONFIG_MX51
if (flags & MXC_EHCI_POWER_PINS_ENABLED)
v &= ~MXC_OTG_UCTRL_OPM_BIT;
else
v |= MXC_OTG_UCTRL_OPM_BIT;
+#endif
__raw_writel(v, usbother_base + MXC_USBCTRL_OFFSET);
}
break;
@@ -170,10 +172,12 @@ int mxc_set_usbcontrol(int port, unsigned int flags)
#endif
v = __raw_readl(usbother_base + MXC_USBCTRL_OFFSET);
+#ifdef CONFIG_MX51
if (flags & MXC_EHCI_POWER_PINS_ENABLED)
v &= ~MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask unused */
else
v |= MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask used */
+#endif
__raw_writel(v, usbother_base + MXC_USBCTRL_OFFSET);
v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC_OFFSET);
@@ -186,10 +190,12 @@ int mxc_set_usbcontrol(int port, unsigned int flags)
break;
case 2: /* Host 2 ULPI */
v = __raw_readl(usbother_base + MXC_USBH2CTRL_OFFSET);
+#ifdef CONFIG_MX51
if (flags & MXC_EHCI_POWER_PINS_ENABLED)
v &= ~MXC_H2_UCTRL_H2PM_BIT; /* HOST2 power mask unused */
else
v |= MXC_H2_UCTRL_H2PM_BIT; /* HOST2 power mask used */
+#endif
__raw_writel(v, usbother_base + MXC_USBH2CTRL_OFFSET);
break;
next prev parent reply other threads:[~2012-11-05 20:11 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 20:09 [U-Boot] [PATCH 01/13] mx31: Move EHCI definitions to ehci-fsl.h Benoît Thébaudeau
2012-11-05 20:10 ` [U-Boot] [PATCH 02/13] ehci-mxc: Clean up Benoît Thébaudeau
2012-11-05 20:10 ` [U-Boot] [PATCH 03/13] ehci-mx5: " Benoît Thébaudeau
2012-11-05 20:10 ` [U-Boot] [PATCH 04/13] ehci-mx5: Fix OC_DIS usage Benoît Thébaudeau
2012-11-05 20:11 ` [U-Boot] [PATCH 05/13] ehci-mx5: Fix OPM usage Benoît Thébaudeau
2012-11-05 20:11 ` Benoît Thébaudeau [this message]
2012-11-05 20:11 ` [U-Boot] [PATCH 07/13] ehci-mx5: Add missing OC_DIS for i.MX53 Benoît Thébaudeau
2012-11-05 20:12 ` [U-Boot] [PATCH 08/13] ehci-mxc: Make EHCI power/oc polarities configurable Benoît Thébaudeau
2012-11-05 20:12 ` [U-Boot] [PATCH 09/13] ehci-mxc: Make i.MX25 EHCI configurable Benoît Thébaudeau
2012-11-05 20:12 ` [U-Boot] [PATCH 10/13] ehci-mxc: Define host offsets Benoît Thébaudeau
2012-11-05 20:13 ` [U-Boot] [PATCH 11/13] ehci-mxc: Add support for i.MX35 Benoît Thébaudeau
2012-11-05 20:13 ` [U-Boot] [PATCH 12/13] mx35pdk: Add support for OTG Benoît Thébaudeau
2012-11-07 14:30 ` Stefano Babic
2012-11-07 16:16 ` Stefano Babic
2012-11-07 16:27 ` Benoît Thébaudeau
2012-11-07 16:33 ` Stefano Babic
2012-11-05 20:13 ` [U-Boot] [PATCH 13/13] ehci-mx5: Make board_ehci_hcd_init() optional Benoît Thébaudeau
2012-11-05 22:57 ` Marek Vasut
2012-11-05 23:34 ` Benoît Thébaudeau
2012-11-05 22:55 ` [U-Boot] [PATCH 01/13] mx31: Move EHCI definitions to ehci-fsl.h Marek Vasut
2012-11-07 16:31 ` Stefano Babic
2012-11-08 20:27 ` [U-Boot] [PATCH v2 " Benoît Thébaudeau
2012-11-08 20:28 ` [U-Boot] [PATCH v2 02/13] ehci-mxc: Clean up Benoît Thébaudeau
2012-11-08 20:28 ` [U-Boot] [PATCH v2 03/13] ehci-mx5: " Benoît Thébaudeau
2012-11-08 20:28 ` [U-Boot] [PATCH v2 04/13] ehci-mx5: Fix OC_DIS usage Benoît Thébaudeau
2012-11-08 20:29 ` [U-Boot] [PATCH v2 05/13] ehci-mx5: Fix OPM usage Benoît Thébaudeau
2012-11-08 20:29 ` [U-Boot] [PATCH v2 06/13] ehci-mx5: Fix *PM usage for i.MX53 Benoît Thébaudeau
2012-11-08 20:29 ` [U-Boot] [PATCH v2 07/13] ehci-mx5: Add missing OC_DIS " Benoît Thébaudeau
2012-11-08 20:29 ` [U-Boot] [PATCH v2 08/13] ehci-mxc: Make EHCI power/oc polarities configurable Benoît Thébaudeau
2012-11-08 20:30 ` [U-Boot] [PATCH v2 09/13] ehci-mxc: Make i.MX25 EHCI configurable Benoît Thébaudeau
2012-11-08 20:30 ` [U-Boot] [PATCH v2 10/13] ehci-mxc: Define host offsets Benoît Thébaudeau
2012-11-08 20:30 ` [U-Boot] [PATCH v2 11/13] ehci-mxc: Add support for i.MX35 Benoît Thébaudeau
2012-11-08 20:31 ` [U-Boot] [PATCH v2 12/13] mx35pdk: Add support for OTG Benoît Thébaudeau
2012-11-08 20:31 ` [U-Boot] [PATCH v2 13/13] ehci-mx5/6: Make board_ehci_hcd_init() optional Benoît Thébaudeau
2012-11-10 7:42 ` [U-Boot] [PATCH v2 01/13] mx31: Move EHCI definitions to ehci-fsl.h Stefano Babic
2012-11-10 12:37 ` Benoît Thébaudeau
2012-11-10 12:46 ` Albert ARIBAUD
2012-11-10 12:47 ` Albert ARIBAUD
2012-11-10 13:51 ` Benoît Thébaudeau
2012-11-10 16:45 ` stefano babic
2012-11-13 19:55 ` [U-Boot] [PATCH v3 " Benoît Thébaudeau
2012-11-13 19:55 ` [U-Boot] [PATCH v3 02/13] ehci-mxc: Clean up Benoît Thébaudeau
2012-11-16 8:29 ` Stefano Babic
2012-11-13 19:56 ` [U-Boot] [PATCH v3 03/13] ehci-mx5: " Benoît Thébaudeau
2012-11-13 19:56 ` [U-Boot] [PATCH v3 04/13] ehci-mx5: Fix OC_DIS usage Benoît Thébaudeau
2012-11-13 19:56 ` [U-Boot] [PATCH v3 05/13] ehci-mx5: Fix OPM usage Benoît Thébaudeau
2012-11-13 19:56 ` [U-Boot] [PATCH v3 06/13] ehci-mx5: Fix *PM usage for i.MX53 Benoît Thébaudeau
2012-11-13 19:57 ` [U-Boot] [PATCH v3 07/13] ehci-mx5: Add missing OC_DIS " Benoît Thébaudeau
2012-11-13 19:57 ` [U-Boot] [PATCH v3 08/13] ehci-mxc: Make EHCI power/oc polarities configurable Benoît Thébaudeau
2012-11-13 19:57 ` [U-Boot] [PATCH v3 09/13] ehci-mxc: Make i.MX25 EHCI configurable Benoît Thébaudeau
2012-11-13 19:57 ` [U-Boot] [PATCH v3 10/13] ehci-mxc: Define host offsets Benoît Thébaudeau
2012-11-13 19:58 ` [U-Boot] [PATCH v3 11/13] ehci-mxc: Add support for i.MX35 Benoît Thébaudeau
2012-11-13 19:58 ` [U-Boot] [PATCH v3 12/13] mx35pdk: Add support for OTG Benoît Thébaudeau
2012-11-13 19:58 ` [U-Boot] [PATCH v3 13/13] ehci-mx5/6: Make board_ehci_hcd_init() optional Benoît Thébaudeau
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=734732916.587292.1352146293558.JavaMail.root@advansee.com \
--to=benoit.thebaudeau@advansee.com \
--cc=u-boot@lists.denx.de \
/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