From patchwork Tue Feb 28 17:48:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Torsten Mehnert X-Patchwork-Id: 143520 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3D3C2B6EE7 for ; Wed, 29 Feb 2012 04:51:26 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1S2RA1-0004Hj-CH; Tue, 28 Feb 2012 17:48:25 +0000 Received: from mail.eckelmann.de ([217.19.183.94]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1S2R9n-0004Fd-DA for linux-arm-kernel@lists.infradead.org; Tue, 28 Feb 2012 17:48:11 +0000 Received: from mail.eckelmann.de (localhost.localdomain [127.0.0.1]) by localhost (Email Security Appliance) with SMTP id 6C880178AF23_F4D135AB; Tue, 28 Feb 2012 17:48:10 +0000 (GMT) Received: from dag.eckelmann.group (ex-dag01.eckelmann.group [192.168.13.8]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "eckelmann.group", Issuer "Eckelmann Root CA" (not verified)) by mail.eckelmann.de (Sophos Email Appliance) with ESMTP id 141ED178AF25_F4D1355F; Tue, 28 Feb 2012 17:48:05 +0000 (GMT) Received: from EX-DAG02.eckelmann.group ([fe80::5d1b:3915:5c51:5117]) by EX-DAG01.eckelmann.group ([fe80::2496:326c:27e8:2b5d%13]) with mapi id 14.01.0355.002; Tue, 28 Feb 2012 18:48:04 +0100 From: "Mehnert, Torsten" To: "linux-arm-kernel@lists.infradead.org" , "s.hauer@pengutronix.de" , "daniel@caiaq.de" Subject: [PATCH 2/2] ehci-imx25.c: use new flags from mxc_ehci.h in usb_hwinit Thread-Topic: [PATCH 2/2] ehci-imx25.c: use new flags from mxc_ehci.h in usb_hwinit Thread-Index: Acz2P/R+9wwoavUQQ/GLZx9KkEzxjg== Date: Tue, 28 Feb 2012 17:48:04 +0000 Message-ID: <3F263ABB4EDE344D974E1983B56807739E4BC6BA@EX-DAG02.eckelmann.group> Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.16.181.0] MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org From: T. Mehnert Date: Thu, 16 Feb 2012 14:39:20 +0100 Subject: [PATCH] ehci-imx25.c adding support of options in mxc_ehci.h This Patch implements the new options in mxc_ehci.h for the hardware initialisation. --- arch/arm/mach-imx/ehci-imx25.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-imx/ehci-imx25.c b/arch/arm/mach-imx/ehci-imx25.c index 865daf0..17f7267 100644 --- a/arch/arm/mach-imx/ehci-imx25.c +++ b/arch/arm/mach-imx/ehci-imx25.c @@ -24,9 +24,14 @@ #define MX25_OTG_SIC_SHIFT 29 #define MX25_OTG_SIC_MASK (0x3 << MX25_OTG_SIC_SHIFT) #define MX25_OTG_PM_BIT (1 << 24) +#define MX25_OTG_PP_BIT (1 << 11) +#define MX25_OTG_XCSO_BIT (1 << 10) #define MX25_H1_SIC_SHIFT 21 #define MX25_H1_SIC_MASK (0x3 << MX25_H1_SIC_SHIFT) +#define MX25_H1_PP_BIT (1 << 18) +#define MX25_H1_HLKEN_BIT (1 << 12) +#define MX25_H1_XCSH_BIT (1 << 9) #define MX25_H1_PM_BIT (1 << 8) #define MX25_H1_IPPUE_UP_BIT (1 << 7) #define MX25_H1_IPPUE_DOWN_BIT (1 << 6) @@ -47,6 +52,9 @@ int mx25_initialize_usb_hw(int port, unsigned int flags) if (!(flags & MXC_EHCI_POWER_PINS_ENABLED)) v |= MX25_OTG_PM_BIT; + if (flags & MXC_EHCI_XCVR_FORCED_INTERNAL) + v |= MX25_OTG_XCSO_BIT; + break; case 1: /* H1 port */ v &= ~(MX25_H1_SIC_MASK | MX25_H1_PM_BIT | MX25_H1_TLL_BIT | @@ -68,6 +76,15 @@ int mx25_initialize_usb_hw(int port, unsigned int flags) if (flags & MXC_EHCI_IPPUE_UP) v |= MX25_H1_IPPUE_UP_BIT; + if (flags & MXC_EHCI_AHB_LOCK_ENABLE) + v |= MX25_H1_HLKEN_BIT; + + if (flags & MXC_EHCI_POWER_POLARITY_HIGH) + v |= MX25_H1_PP_BIT; + + if (flags & MXC_EHCI_XCVR_FORCED_INTERNAL) + v |= MX25_H1_XCSH_BIT; + break; default: return -EINVAL;