From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Wed, 26 Oct 2011 10:59:16 +0200 Subject: [U-Boot] [PATCH V2] I2C: Fix mxc_i2c.c problem on imx31_phycore In-Reply-To: <4EA7C410.3080303@denx.de> References: <1319544551-24639-1-git-send-email-marek.vasut@gmail.com> <1319556330-847-1-git-send-email-marek.vasut@gmail.com> <4EA7C410.3080303@denx.de> Message-ID: <4EA7CBE4.60400@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 10/26/2011 10:25 AM, Stefano Babic wrote: > On 10/25/2011 05:25 PM, Marek Vasut wrote: >> The problem was caused by a global variable being used early in the boot >> process. >> >> The symptoms were on imx31_phycore board, reading the environment from I2C >> EEPROM didn't work correctly and causes default environment to be loaded. >> >> Signed-off-by: Marek Vasut >> Cc: Wolfgang Denk >> Cc: Albert ARIBAUD >> Cc: Heiko Schocher >> Cc: Stefano Babic >> Tested-by: Anatolij Gustschin >> --- >> drivers/i2c/mxc_i2c.c | 29 ++++++++++++++++------------- >> 1 files changed, 16 insertions(+), 13 deletions(-) >> >> V2: Fix commit message > > Tested on mx35pdk. > > Tested-by: Stefano Babic I tested (and it works), but there is a problem. I supposed it was a mistake by me, but after some checks I have found the cause. Your patch does not apply on current u-boot-imx. You sent earlier the patch: "I2C: Add i2c_get/set_speed() to mxc_i2c.c" that after Heiko's ACK I have applied to u-boot-imx and then it is already merged into u-boot-arm. The patch you have sent now does not take care of your previous patch and does not apply anymore. Can you rebase your patch ? You can take u-boot-imx als reference, all imx related patches are already applied. Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================