From patchwork Tue Dec 13 15:54:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Weber X-Patchwork-Id: 131125 X-Patchwork-Delegate: trini@ti.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 CCB4D1007D4 for ; Wed, 14 Dec 2011 02:54:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 186A4283F3; Tue, 13 Dec 2011 16:54:42 +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 xYqUBjru8LJX; Tue, 13 Dec 2011 16:54:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9BE61283D2; Tue, 13 Dec 2011 16:54:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A90B2283D2 for ; Tue, 13 Dec 2011 16:54:39 +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 l8J+v2Ch808n for ; Tue, 13 Dec 2011 16:54:39 +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 moutng.kundenserver.de (moutng.kundenserver.de [212.227.17.9]) by theia.denx.de (Postfix) with ESMTP id 41957283D1 for ; Tue, 13 Dec 2011 16:54:39 +0100 (CET) Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0MWBdh-1RGJ7s0wZN-00XMx9; Tue, 13 Dec 2011 16:54:37 +0100 Received: from lupus.er.corscience.de (lupus.2og.er.corscience.de [192.168.102.101]) by corscience.de (Postfix) with ESMTP id C61E451E44; Tue, 13 Dec 2011 16:54:36 +0100 (CET) From: Thomas Weber To: u-boot@lists.denx.de Date: Tue, 13 Dec 2011 16:54:17 +0100 Message-Id: <1323791657-17667-1-git-send-email-weber@corscience.de> X-Mailer: git-send-email 1.7.8 X-Provags-ID: V02:K0:MbHEtThEzJz+ky8G1uBf7FhNNOEg6zqTquYZu3gOnxt pbP//PSuERDU+zCXm31NP/nv4GBWygV6KTxXHNYd7kNaxz1Dyo U6+p/GzM1MsY1DanyBsiyjJ3FuUhpzVICTdbgc39Stmgb6Ay0l uZ23o1ClT2LFqqGFdd14T7zn+jEh1nAD9r+d8TDERdveF/7Zga z6TufZfImFWeaBg72h0f2U0tuYdSyVKoVxhdfiu1FmDXPkGMYw UPU2UThpYt0KjdN+UR6XViZx/WJWTn/Cn2kFtxgZlOuosgefVW UnZuruxYbm4mG+dffKYhfjg8vT5s64YabPmTOY7aCIr/xXH3Qi 3N2HKN1dCdYuZVzEGD9Hm/iJkt0xlGAFGgug6ERimLgkyUNOEv 9gFUrAH+Qkx5g== Cc: Thomas Weber Subject: [U-Boot] [PATCH v2] Devkit8000: Switch over to enable_gpmc_cs_config 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 Use enable_gpmc_cs_config instead of local writing timing configuration for GPMC. Signed-off-by: Thomas Weber --- Changelog v2: Change gpmc_net_config[6] to 0, because it is calculated in enable_gpmc_cs_config board/timll/devkit8000/devkit8000.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index b06aab6..10f189e 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -48,6 +48,16 @@ DECLARE_GLOBAL_DATA_PTR; +static u32 gpmc_net_config[GPMC_MAX_REG] = { + NET_GPMC_CONFIG1, + NET_GPMC_CONFIG2, + NET_GPMC_CONFIG3, + NET_GPMC_CONFIG4, + NET_GPMC_CONFIG5, + NET_GPMC_CONFIG6, + 0 +}; + /* * Routine: board_init * Description: Early hardware init. @@ -82,13 +92,8 @@ int misc_init_r(void) #ifdef CONFIG_DRIVER_DM9000 /* Configure GPMC registers for DM9000 */ - writel(NET_GPMC_CONFIG1, &gpmc_cfg->cs[6].config1); - writel(NET_GPMC_CONFIG2, &gpmc_cfg->cs[6].config2); - writel(NET_GPMC_CONFIG3, &gpmc_cfg->cs[6].config3); - writel(NET_GPMC_CONFIG4, &gpmc_cfg->cs[6].config4); - writel(NET_GPMC_CONFIG5, &gpmc_cfg->cs[6].config5); - writel(NET_GPMC_CONFIG6, &gpmc_cfg->cs[6].config6); - writel(NET_GPMC_CONFIG7, &gpmc_cfg->cs[6].config7); + enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6], + CONFIG_DM9000_BASE, GPMC_SIZE_16M); /* Use OMAP DIE_ID as MAC address */ if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {