From patchwork Mon Mar 19 22:36:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 147669 X-Patchwork-Delegate: sbabic@denx.de 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 6E03DB6FE1 for ; Tue, 20 Mar 2012 09:36:35 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D44FA28084; Mon, 19 Mar 2012 23:36:32 +0100 (CET) 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 dg76TdDNEAwT; Mon, 19 Mar 2012 23:36:32 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4991D28087; Mon, 19 Mar 2012 23:36:29 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4605C28087 for ; Mon, 19 Mar 2012 23:36:27 +0100 (CET) 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 cQjUe6cL4oJ1 for ; Mon, 19 Mar 2012 23:36:26 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-gy0-f172.google.com (mail-gy0-f172.google.com [209.85.160.172]) by theia.denx.de (Postfix) with ESMTPS id 901B228084 for ; Mon, 19 Mar 2012 23:36:25 +0100 (CET) Received: by ghbg16 with SMTP id g16so5786591ghb.3 for ; Mon, 19 Mar 2012 15:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=AWGsemDUihizz+hhT7AAnr+WNNgZXDaZbc/183jK4YI=; b=Zqjge5rt8ahdutPu2EEUzAAHQzq27H+RdB23ZSPhdE+CnjsPxVSHZzIf7Rlg1N0bZD bFwaEJ8X2b3/sC1PD8K/7LXcvxJ3u2Uex6my7ktHqZA9eH/jsjfgiET133Qk0+rcgb45 vFXs7a4ml+AdUUwezC96+zgYx05F7tvArWAx/RqKm97g73KUudEs2tQ+Mcbb0Cg8zbVy YgGCozyZID+9zKdepIOhHPp6ffsCXhbk2MAIjGO/slWY/iH2WJe1W+LDaIT6RQzFNwwV 1YJSjh0H+tPVNUQ2/O54sPSQT8dd40g4jyf92Nk+tw7b58kcSS0jGpML4eSgRKaueXCr PTjw== Received: by 10.236.161.73 with SMTP id v49mr13903579yhk.89.1332196584020; Mon, 19 Mar 2012 15:36:24 -0700 (PDT) Received: from localhost.localdomain ([201.82.161.72]) by mx.google.com with ESMTPS id p18sm18529153ano.20.2012.03.19.15.36.21 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Mar 2012 15:36:23 -0700 (PDT) From: Fabio Estevam To: u-boot@lists.denx.de Date: Mon, 19 Mar 2012 19:36:10 -0300 Message-Id: <1332196570-31872-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 Cc: marex@denx.de, Fabio Estevam , wg@denx.de Subject: [U-Boot] [PATCH] USB: ehci-mx6: Add proper IO accessors 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 Add proper IO accessors for mx6 usb registers. Signed-off-by: Fabio Estevam Acked-by: Stefano Babic Acked-by: Marek Vasut Acked-by: Jason Liu --- This patch depends on "[PATCH v5] mx6: Read silicon revision from register" drivers/usb/host/ehci-mx6.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index b7bf49d..5dec673 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -46,13 +46,9 @@ #define USBPHY_CTRL_ENUTMILEVEL3 0x00008000 #define USBPHY_CTRL_ENUTMILEVEL2 0x00004000 -#define ANADIG_USB2_CHRG_DETECT 0x00000210 #define ANADIG_USB2_CHRG_DETECT_EN_B 0x00100000 #define ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B 0x00080000 -#define ANADIG_USB2_PLL_480_CTRL 0x00000020 -#define ANADIG_USB2_PLL_480_CTRL_SET 0x00000024 -#define ANADIG_USB2_PLL_480_CTRL_CLR 0x00000028 #define ANADIG_USB2_PLL_480_CTRL_BYPASS 0x00010000 #define ANADIG_USB2_PLL_480_CTRL_ENABLE 0x00002000 #define ANADIG_USB2_PLL_480_CTRL_POWER 0x00001000 @@ -77,8 +73,7 @@ static void usbh1_internal_phy_clock_gate(int on) static void usbh1_power_config(void) { - void __iomem *anatop_base = (void __iomem *)ANATOP_BASE_ADDR; - + struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR; /* * Some phy and power's special controls for host1 * 1. The external charger detector needs to be disabled @@ -89,15 +84,15 @@ static void usbh1_power_config(void) */ __raw_writel(ANADIG_USB2_CHRG_DETECT_EN_B | ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B, - anatop_base + ANADIG_USB2_CHRG_DETECT); + &anatop->usb2_chrg_detect); __raw_writel(ANADIG_USB2_PLL_480_CTRL_BYPASS, - anatop_base + ANADIG_USB2_PLL_480_CTRL_CLR); + &anatop->usb2_pll_480_ctrl); __raw_writel(ANADIG_USB2_PLL_480_CTRL_ENABLE | ANADIG_USB2_PLL_480_CTRL_POWER | ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS, - anatop_base + ANADIG_USB2_PLL_480_CTRL_SET); + &anatop->usb2_pll_480_ctrl_set); } static int usbh1_phy_enable(void)