From patchwork Fri Jun 22 04:11:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 166479 X-Patchwork-Delegate: hs@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 D4B33B6EF1 for ; Fri, 22 Jun 2012 14:13:49 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DA7BC280B4; Fri, 22 Jun 2012 06:13:26 +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 a1zjAhVSCXfb; Fri, 22 Jun 2012 06:13:26 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7FF2E280B6; Fri, 22 Jun 2012 06:12:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2C91628087 for ; Fri, 22 Jun 2012 06:12:32 +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 UeRWeHiXNnWC for ; Fri, 22 Jun 2012 06:12:30 +0200 (CEST) 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-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id 33CDF2808A for ; Fri, 22 Jun 2012 06:12:27 +0200 (CEST) Received: by pbcwy7 with SMTP id wy7so2919126pbc.3 for ; Thu, 21 Jun 2012 21:12:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=TIenVFSKypUVtZnc8thaAMQtqLWQdaetilV+9JC/MDI=; b=aY3Vd6W1IwyrvDBTKXlYoseF1LLQNbnQrkoFFRMUYQVL9VJDosa35bKshJ4SXmiVns X+ZIVcENbYRrCiyIhjoX86szRXOpi17TWgjXVRqaIdWS49uIfo+nTDKPDwhNu4NQ8LfY 95P360FvXptxQPj7CbSS4/fXIqfHRGb4Qrjl74xmBQ0Iw30IEO3mIGe1ZYaIOPbv56nZ pP13lYg5fTsYnQePWGWenol2bxNaZ94uEBpx5dp0uXS33BaeaFAZ9yvUOuk9O3vTzTtR k2Y34qa6fhRMd3Uj1L8qhFnW3ssn7j3rP9KbQ+TG3+Ts/ulTeNCDJQPBjTtEfJlV7laC NUkQ== Received: by 10.68.194.4 with SMTP id hs4mr5202170pbc.128.1340338346047; Thu, 21 Jun 2012 21:12:26 -0700 (PDT) Received: from officeserver-2 ([70.96.116.236]) by mx.google.com with ESMTPS id rv9sm37672935pbc.43.2012.06.21.21.12.22 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 21 Jun 2012 21:12:24 -0700 (PDT) Received: from tkisky by officeserver-2 with local (Exim 4.76) (envelope-from ) id 1ShvEK-00032R-Th; Thu, 21 Jun 2012 21:12:20 -0700 From: Troy Kisky To: hs@denx.de, sbabic@denx.de Date: Thu, 21 Jun 2012 21:11:56 -0700 Message-Id: <1340338339-11626-1-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQmHgSdHBdUZr/joUf8oMrCJ/jwZyAmu3LTIn7ocUtD5bVY2KHMnrh9gQ7fW4pX5NHw2pClt Cc: u-boot@lists.denx.de, r49496@freescale.com, jason.hui@linaro.org Subject: [U-Boot] [PATCH 01/24] mxc_i2c: fix i2c_imx_stop 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 Instead of clearing 2 bits, all the other bits were set because '|=' was used instead of '&='. Signed-off-by: Troy Kisky Acked-by: Marek Vasut Acked-by: Stefano Babic --- drivers/i2c/mxc_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Note: All patches in the series are based on the i2c/master branch even though only 1-18 will be applied there. diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index fc68062..c0c45fd 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -264,7 +264,7 @@ void i2c_imx_stop(void) /* Stop I2C transaction */ temp = readb(&i2c_regs->i2cr); - temp |= ~(I2CR_MSTA | I2CR_MTX); + temp &= ~(I2CR_MSTA | I2CR_MTX); writeb(temp, &i2c_regs->i2cr); i2c_imx_bus_busy(0);