From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/8] pxa/colibri270: Add UHC support
Date: Sat, 22 May 2010 00:29:36 +0200 [thread overview]
Message-ID: <1274480980-10109-5-git-send-email-marek.vasut@gmail.com> (raw)
In-Reply-To: <1274480980-10109-1-git-send-email-marek.vasut@gmail.com>
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
arch/arm/mach-pxa/colibri-pxa270.c | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c
index 18b208a..1cbeb61 100644
--- a/arch/arm/mach-pxa/colibri-pxa270.c
+++ b/arch/arm/mach-pxa/colibri-pxa270.c
@@ -34,6 +34,8 @@
#include <mach/pxa27x.h>
#include <mach/colibri.h>
#include <mach/mmc.h>
+#include <mach/ohci.h>
+#include <mach/pxa27x-udc.h>
#include "generic.h"
#include "devices.h"
@@ -58,6 +60,12 @@ static mfp_cfg_t colibri_pxa270_pin_config[] __initdata = {
/* FFUART */
GPIO39_FFUART_TXD,
GPIO34_FFUART_RXD,
+
+ /* UHC */
+ GPIO88_USBH1_PWR,
+ GPIO89_USBH1_PEN,
+ GPIO119_USBH2_PWR,
+ GPIO120_USBH2_PEN,
};
/******************************************************************************
@@ -172,6 +180,31 @@ static void __init colibri_pxa270_mmc_init(void)
static inline void colibri_pxa270_mmc_init(void) {}
#endif
+/******************************************************************************
+ * USB Host
+ ******************************************************************************/
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+static int colibri_pxa270_ohci_init(struct device *dev)
+{
+ UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;
+ return 0;
+}
+
+static struct pxaohci_platform_data colibri_pxa270_ohci_info = {
+ .port_mode = PMM_PERPORT_MODE,
+ .flags = ENABLE_PORT1 | ENABLE_PORT2 |
+ POWER_CONTROL_LOW | POWER_SENSE_LOW,
+ .init = colibri_pxa270_ohci_init,
+};
+
+static void __init colibri_pxa270_uhc_init(void)
+{
+ pxa_set_ohci_info(&colibri_pxa270_ohci_info);
+}
+#else
+static inline void colibri_pxa270_uhc_init(void) {}
+#endif
+
static void __init colibri_pxa270_init(void)
{
pxa2xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa270_pin_config));
@@ -182,6 +215,7 @@ static void __init colibri_pxa270_init(void)
colibri_pxa270_nor_init();
colibri_pxa270_eth_init();
colibri_pxa270_mmc_init();
+ colibri_pxa270_uhc_init();
}
MACHINE_START(COLIBRI, "Toradex Colibri PXA270")
--
1.7.0
next prev parent reply other threads:[~2010-05-21 22:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-21 22:29 Colibri/PXA270 patchset Marek Vasut
2010-05-21 22:29 ` [PATCH 1/8] pxa/colibri270: Refactor board definition file Marek Vasut
2010-05-26 13:56 ` Eric Miao
2010-05-21 22:29 ` [PATCH 2/8] pxa/colibri270: Add MMC support Marek Vasut
2010-05-26 13:55 ` Eric Miao
2010-05-21 22:29 ` [PATCH 3/8] pxa/colibri270: Add FFUART MFP Marek Vasut
2010-05-26 13:57 ` Eric Miao
2010-05-21 22:29 ` Marek Vasut [this message]
2010-05-26 13:58 ` [PATCH 4/8] pxa/colibri270: Add UHC support Eric Miao
2010-05-21 22:29 ` [PATCH 5/8] pxa/colibri270: Add TSC support Marek Vasut
2010-05-26 14:00 ` Eric Miao
2010-05-21 22:29 ` [PATCH 6/8] ARM: pxa/colibri-pxa270: split module and base board code Marek Vasut
2010-05-26 14:07 ` Eric Miao
2010-05-21 22:29 ` [PATCH 7/8] pxa/income: Add Income SBC support Marek Vasut
2010-05-24 11:01 ` Daniel Mack
2010-05-26 14:18 ` Eric Miao
2010-05-26 14:23 ` Daniel Mack
2010-05-21 22:29 ` [PATCH 8/8] ARM: pxa/colibri-pxa270: update defconfig Marek Vasut
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=1274480980-10109-5-git-send-email-marek.vasut@gmail.com \
--to=marek.vasut@gmail.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).