From patchwork Wed Mar 19 09:25:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fuchs X-Patchwork-Id: 331661 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 A88842C007C for ; Wed, 19 Mar 2014 20:25:48 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C9F6F4B164; Wed, 19 Mar 2014 10:25:45 +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 uC1PSjVPGkt3; Wed, 19 Mar 2014 10:25:45 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A3CA14B576; Wed, 19 Mar 2014 10:25:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8697A4B576 for ; Wed, 19 Mar 2014 10:25:33 +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 oT6G0iQjYdzw for ; Wed, 19 Mar 2014 10:25:30 +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 mxuout02.htp-tel.de (mxu02.htp-tel.de [81.14.242.9]) by theia.denx.de (Postfix) with ESMTPS id 2BC094B164 for ; Wed, 19 Mar 2014 10:25:26 +0100 (CET) Received: from mxuin01.htp-tel.de (a81-14-242-30.net-htp.de [81.14.242.30]) by mxuout02.htp-tel.de with ESMTP id s2J9PN7t005494 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Wed, 19 Mar 2014 10:25:24 +0100 (CET) Received: from esd-s3.esd.eu (a81-14-225-174.net-htp.de [81.14.225.174]) by mxuin01.htp-tel.de with ESMTP id s2J9PNDg011424 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Wed, 19 Mar 2014 10:25:23 +0100 (CET) Received: from localhost.localdomain (10.0.18.4) by esd-s3.esd.local (10.0.0.66) with Microsoft SMTP Server (TLS) id 8.2.176.0; Wed, 19 Mar 2014 10:25:22 +0100 From: Matthias Fuchs To: Date: Wed, 19 Mar 2014 10:25:08 +0100 Message-ID: <1395221108-11144-1-git-send-email-matthias.fuchs@esd.eu> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Cc: Matthias Fuchs Subject: [U-Boot] [PATCH] common, env: Fix support for environment in i2c eeprom 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de When using CONFIG_SYS_I2C i2c needs to be initialized by i2c_init_all(). This is done in some places but not in eeprom_init(). Signed-off-by: Matthias Fuchs --- common/cmd_eeprom.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index 3924805..fad462f 100644 --- a/common/cmd_eeprom.c +++ b/common/cmd_eeprom.c @@ -389,8 +389,13 @@ void eeprom_init (void) #if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) spi_init_f (); #endif -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) - i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); +#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) || \ + defined(CONFIG_SYS_I2C) +#ifdef CONFIG_SYS_I2C + i2c_init_all(); +#else + i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); +#endif #endif }