linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: anarsoul@gmail.com (Vasily Khoruzhick)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/8] ARM: PXA: Z2: Enable OHCI on Zipit Z2
Date: Fri, 11 Mar 2011 16:56:46 +0200	[thread overview]
Message-ID: <1299855406-22652-1-git-send-email-anarsoul@gmail.com> (raw)
In-Reply-To: <1299839023-16601-2-git-send-email-anarsoul@gmail.com>

This patch is a part of similar mozzwald's patch which was
based on GPSFan and rkdavis work.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
v2: Fix authorship of original patch

 arch/arm/mach-pxa/z2.c |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index 7bad4f7..dde3f1c 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -40,6 +40,8 @@
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
 #include <plat/pxa27x_keypad.h>
+#include <mach/pxa27x-udc.h>
+#include <mach/ohci.h>
 
 #include "generic.h"
 #include "devices.h"
@@ -679,6 +681,27 @@ static inline void z2_pmic_init(void) {}
 #endif
 
 /******************************************************************************
+ * USB Host (OHCI)
+ ******************************************************************************/
+static int z2_ohci_init(struct device *dev)
+{
+	/* Only Port 2 is connected
+	 * Setup USB Port 2 Output Control Register
+	*/
+	UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;
+
+	return 0;
+}
+
+static struct pxaohci_platform_data z2_ohci_platform_data = {
+	.port_mode	= PMM_PERPORT_MODE,
+	.init		= z2_ohci_init,
+	.flags		= ENABLE_PORT2 | NO_OC_PROTECTION,
+	.power_on_delay	= 10,
+	.power_budget	= 500,
+};
+
+/******************************************************************************
  * Machine init
  ******************************************************************************/
 static void __init z2_init(void)
@@ -688,6 +711,7 @@ static void __init z2_init(void)
 	pxa_set_ffuart_info(NULL);
 	pxa_set_btuart_info(NULL);
 	pxa_set_stuart_info(NULL);
+	pxa_set_ohci_info(&z2_ohci_platform_data);
 
 	z2_lcd_init();
 	z2_mmc_init();
-- 
1.7.4.1

  reply	other threads:[~2011-03-11 14:56 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-11 10:23 [PATCH 1/8] ARM: PXA: Z2: Use only power button as wake source Vasily Khoruzhick
2011-03-11 10:23 ` [PATCH 2/8] ARM: PXA: Z2: Enable OHCI on Zipit Z2 Vasily Khoruzhick
2011-03-11 14:56   ` Vasily Khoruzhick [this message]
2011-03-11 21:42     ` [PATCH v2 " Marek Vasut
2011-03-11 21:49       ` Vasily Khoruzhick
2011-03-11 21:50         ` Marek Vasut
2011-03-11 21:55           ` Vasily Khoruzhick
2011-03-11 22:13             ` Marek Vasut
2011-03-11 22:34               ` Vasily Khoruzhick
2011-03-12  0:07                 ` Marek Vasut
2011-03-12 11:32                   ` Vasily Khoruzhick
2011-03-12 13:28                     ` Marek Vasut
2011-03-13 10:18           ` Pavel Machek
2011-03-13 12:29             ` Marek Vasut
2011-03-13 17:10               ` Pavel Machek
2011-03-13 18:34                 ` Marek Vasut
2011-03-13 22:15                   ` Vasily Khoruzhick
2011-03-11 21:41   ` [PATCH " Marek Vasut
2011-03-11 10:23 ` [PATCH 3/8] ARM: PXA: Z2: Fix battery pdata Vasily Khoruzhick
2011-03-11 21:39   ` Marek Vasut
2011-03-11 10:23 ` [PATCH 4/8] ARM: PXA: Z2: Add mtd partition with logo Vasily Khoruzhick
2011-03-11 21:39   ` Marek Vasut
2011-03-11 22:31     ` Vasily Khoruzhick
2011-03-12  0:05       ` Marek Vasut
2011-03-15 14:39         ` Pavel Machek
2011-03-16 14:11           ` Marek Vasut
2011-03-16 16:51             ` Pavel Machek
2011-03-11 10:23 ` [PATCH 5/8] ARM: PXA: Z2: Add poweroff function Vasily Khoruzhick
2011-03-11 21:39   ` Marek Vasut
2011-03-11 21:53     ` Vasily Khoruzhick
2011-03-11 22:08       ` Marek Vasut
2011-03-11 22:12         ` Vasily Khoruzhick
2011-03-11 22:16           ` Marek Vasut
2011-03-11 22:30             ` Vasily Khoruzhick
2011-03-12  0:05               ` Marek Vasut
2011-03-12  2:29                 ` Eric Miao
2011-03-12  8:06                 ` Vasily Khoruzhick
2011-03-12 11:06                   ` Marek Vasut
2011-03-12 11:30                     ` Vasily Khoruzhick
2011-03-12 13:16                       ` Marek Vasut
2011-03-12 20:33                         ` Vasily Khoruzhick
2011-03-12 20:35                           ` Marek Vasut
2011-03-12 20:34                         ` Vasily Khoruzhick
2011-03-12 22:29                           ` Marek Vasut
2011-03-15 15:49                             ` Eric Miao
2011-03-15 15:57                               ` Vasily Khoruzhick
2011-03-15 16:42                                 ` Eric Miao
2011-03-15 20:11                                   ` [PATCH v2] " Vasily Khoruzhick
2011-07-05  6:58                                     ` Eric Miao
2011-03-15 14:41                         ` [PATCH 5/8] " Pavel Machek
2011-03-11 10:23 ` [PATCH 6/8] ARM: PXA: Z2: Fix libertas init/tear down sequences Vasily Khoruzhick
2011-03-11 21:37   ` Marek Vasut
2011-03-11 21:41     ` Vasily Khoruzhick
2011-03-11 21:51       ` Marek Vasut
2011-03-11 10:23 ` [PATCH 7/8] ARM: PXA: Z2: Keep kbd backlight disabled by default Vasily Khoruzhick
2011-03-11 21:36   ` Marek Vasut
2011-03-11 10:23 ` [PATCH 8/8] ARM: PXA: Z2: Add default triggers for LEDs Vasily Khoruzhick
2011-03-11 21:36   ` Marek Vasut
2011-03-11 21:43 ` [PATCH 1/8] ARM: PXA: Z2: Use only power button as wake source Marek Vasut
2011-03-13 10:15 ` Pavel Machek

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=1299855406-22652-1-git-send-email-anarsoul@gmail.com \
    --to=anarsoul@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).