From patchwork Fri Sep 20 03:29:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 276196 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 2B9B02C0112 for ; Fri, 20 Sep 2013 13:35:12 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B3AAD4A162; Fri, 20 Sep 2013 05:35:10 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oPg3Uc0fpH7T; Fri, 20 Sep 2013 05:35:10 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B4CB44A166; Fri, 20 Sep 2013 05:35:07 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6AB8F4A166 for ; Fri, 20 Sep 2013 05:35:02 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3RduTczBxLyE for ; Fri, 20 Sep 2013 05:34:56 +0200 (CEST) X-Greylist: delayed 311 seconds by postgrey-1.27 at theia; Fri, 20 Sep 2013 05:34:46 CEST X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=ERR(-1.5) (only DNSBL check requested) Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by theia.denx.de (Postfix) with ESMTPS id 122704A162 for ; Fri, 20 Sep 2013 05:34:46 +0200 (CEST) Received: by mail-pa0-f47.google.com with SMTP id kl13so196325pab.20 for ; Thu, 19 Sep 2013 20:34:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VPq6fcN/oIHQh9PaXHtvTV+GFzbVHrADom7wBf0Y16U=; b=VdKFFYJ7XN5der+pSeqqhJQmI1RglaP7ObtV+lbAU1G6lgLwqx2KCJjdRiafz95BA0 sh9leqhMVyHWIX/teCB0l7UC9AJj3Rth4iD8uXiiGLxUPkJhhr55pv88aGyVxFq0go4V CLtpoix6u4o7luuehfYbdjb2f26icPWRKawKoPBm/9yE+2lAetCaeqE0G0F4JWgvNKSF WJXASDzstBEXqAPMIGX31eM1TP9oHdHw6AEY4ghppiPGrWBMJcBKCQanKLl7did/PYRA NKA6SjdSefQ9G+gW8/VnZNXSvkUNXmPuqkH10/YOjyJ5sgiOacLBdtMksUfJI7YWwbtH jSnw== X-Gm-Message-State: ALoCoQmV4l4H5VbW0D81qQOQFdS0bRhTjYzGevW/c58zUZDwZzO7Yvu+/EtaoE5/vsxNGDH++1ik X-Received: by 10.68.87.98 with SMTP id w2mr5472631pbz.109.1379647776150; Thu, 19 Sep 2013 20:29:36 -0700 (PDT) Received: from officeserver-2 ([70.96.116.236]) by mx.google.com with ESMTPSA id ia5sm12582587pbc.42.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 19 Sep 2013 20:29:34 -0700 (PDT) Received: from tkisky by officeserver-2 with local (Exim 4.80) (envelope-from ) id 1VMrPe-0000iE-Ov; Thu, 19 Sep 2013 20:29:46 -0700 From: Troy Kisky To: marek.vasut@gmail.com Date: Thu, 19 Sep 2013 20:29:38 -0700 Message-Id: <1379647780-2623-16-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1379647780-2623-1-git-send-email-troy.kisky@boundarydevices.com> References: <1379647780-2623-1-git-send-email-troy.kisky@boundarydevices.com> Cc: fabio.estevam@freescale.com, otavio@ossystems.com.br, leiwen@marvell.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH V4 15/17] mx6: iomux: add GPR1 defines for use with nitrogen6x X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Select GPIO1 as the USB OTG ID pin for Nitrogen6x Signed-off-by: Troy Kisky --- v4: move the Nitrogen6x bits into this patch as well --- arch/arm/include/asm/arch-mx6/iomux.h | 6 ++++++ board/boundary/nitrogen6x/nitrogen6x.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm/include/asm/arch-mx6/iomux.h b/arch/arm/include/asm/arch-mx6/iomux.h index f4cfd4f..9e6d40f 100644 --- a/arch/arm/include/asm/arch-mx6/iomux.h +++ b/arch/arm/include/asm/arch-mx6/iomux.h @@ -10,6 +10,12 @@ #define MX6_IOMUXC_GPR7 0x020e001c /* + * IOMUXC_GPR1 bit fields + */ +#define IOMUXC_GPR1_OTG_ID_ENET_RX_ERR (0<<13) +#define IOMUXC_GPR1_OTG_ID_GPIO1 (1<<13) +#define IOMUXC_GPR1_OTG_ID_MASK (1<<13) +/* * IOMUXC_GPR13 bit fields */ #define IOMUXC_GPR13_SDMA_STOP_REQ (1<<30) diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index f664f6d..c6efafc 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -704,6 +704,13 @@ int overwrite_console(void) int board_init(void) { + struct iomuxc_base_regs *const iomuxc_regs + = (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR; + + clrsetbits_le32(&iomuxc_regs->gpr[1], + IOMUXC_GPR1_OTG_ID_MASK, + IOMUXC_GPR1_OTG_ID_GPIO1); + /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;