From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC15CC433E6 for ; Mon, 15 Feb 2021 19:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D133600EF for ; Mon, 15 Feb 2021 19:13:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230349AbhBOTNT (ORCPT ); Mon, 15 Feb 2021 14:13:19 -0500 Received: from smtp1.axis.com ([195.60.68.17]:5355 "EHLO smtp1.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230048AbhBOTNR (ORCPT ); Mon, 15 Feb 2021 14:13:17 -0500 X-Greylist: delayed 509 seconds by postgrey-1.27 at vger.kernel.org; Mon, 15 Feb 2021 14:13:15 EST DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1613416396; x=1644952396; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=wFNT4rSQCM8LHPCDltTRqOCKD9W6vi98OPConvKvLXY=; b=MQ4bh4Ox9dnYXEryFOKVd5d9KjEAu+73/+YTglVvwMUQ1xUAkVVuFZ5O bZPZIjyqES0kLONLIoApks/CKaa81TXpg/SIXaPPx/WZXG8toVuTfL5aL noy2jm0evg/Jo35Qkmw+ZNEXHxB188oeiTDakCo3lz3wD+E9H0EX8hafm zV1FoBpm891YNi/XVaZrfS+2LMQCez6NXevcmAkakoY06k2lY2VBx8h+H 7J8xgSm16VMoX0OsVXUy3hl2wxwazb9j8LhbuBwwv7n/jeD9D34KTuEgW 1v+vu6oFjYN5h4PF4uKHfxiGteO+UvR90h0O9UWowa5oq+uInE1x9cu+a A==; From: =?UTF-8?q?M=C3=A5rten=20Lindahl?= To: Krzysztof Kozlowski CC: , =?UTF-8?q?M=C3=A5rten=20Lindahl?= , , , , Subject: [PATCH] i2c: exynos5: Preserve high speed master code Date: Mon, 15 Feb 2021 20:03:21 +0100 Message-ID: <20210215190322.22094-1-marten.lindahl@axis.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Mårten Lindahl When the controller starts to send a message with the MASTER_ID field set (high speed), the whole I2C_ADDR register is overwritten including MASTER_ID as the SLV_ADDR_MAS field is set. This patch preserves already written fields in I2C_ADDR when writing SLV_ADDR_MAS. Signed-off-by: Mårten Lindahl --- drivers/i2c/busses/i2c-exynos5.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index 20a9881a0d6c..f2d04c241299 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -606,6 +606,7 @@ static void exynos5_i2c_message_start(struct exynos5_i2c *i2c, int stop) u32 i2c_ctl; u32 int_en = 0; u32 i2c_auto_conf = 0; + u32 i2c_addr = 0; u32 fifo_ctl; unsigned long flags; unsigned short trig_lvl; @@ -640,7 +641,12 @@ static void exynos5_i2c_message_start(struct exynos5_i2c *i2c, int stop) int_en |= HSI2C_INT_TX_ALMOSTEMPTY_EN; } - writel(HSI2C_SLV_ADDR_MAS(i2c->msg->addr), i2c->regs + HSI2C_ADDR); + i2c_addr = HSI2C_SLV_ADDR_MAS(i2c->msg->addr); + + if (i2c->op_clock >= I2C_MAX_FAST_MODE_PLUS_FREQ) + i2c_addr |= readl(i2c->regs + HSI2C_ADDR); + + writel(i2c_addr, i2c->regs + HSI2C_ADDR); writel(fifo_ctl, i2c->regs + HSI2C_FIFO_CTL); writel(i2c_ctl, i2c->regs + HSI2C_CTL); -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F7B5C433E0 for ; Mon, 15 Feb 2021 19:05:27 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 67A0360C3D for ; Mon, 15 Feb 2021 19:05:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67A0360C3D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=axis.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=zBZOzTME19t09pG92n6mzO0e/DaqEdELMKRz4MCuwh0=; b=mGZLCzxuU60Nj5nidB2UZPilOd lfNG6NeLm83ypmx8+ZEKl7OLghQFhKfjKyk52Brk52Ri1ukSPNDMjUmFkbeZrPnLrYhzjP+3RsvfB uUKs0+TemgxAn38eWPeJc5hI9WyepFDXo5ZtAUlVs3htY8IM72jzbS8x01JUSai5Vlup6QvDBvsW1 HzblPEMtwhw2MDog3rrBo2EqbT/EDBAfo2jj0n9FSqeTEiYZWU85J6C738sDUEzIRxWwfoKfFWZfN CFOYRT7lUlKC83MwAKwptSS7NSoZIc+ZzVoMFuCItS2oyqIW60fzP2RPelmlMI/NC8v0is5rBXJPi KvnVRtSQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lBjAJ-00078z-Qa; Mon, 15 Feb 2021 19:04:11 +0000 Received: from smtp1.axis.com ([195.60.68.17]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lBjAH-00078I-EY for linux-arm-kernel@lists.infradead.org; Mon, 15 Feb 2021 19:04:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1613415849; x=1644951849; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=wFNT4rSQCM8LHPCDltTRqOCKD9W6vi98OPConvKvLXY=; b=hrobEfW2jz510CGM2rHtHT0JDR0QRqs0w+6/y9M5ypwcVtKSzgJtzoX7 2OBeMo2/ofBW0h1UVZL+p6fOfxVKj/YKCyX5+MeWKPX2kYUrmL1LNgxQP vm3+g6v7yHDs+HTyUmtOWpXzDF/+XVyRawvDrjXFo4+u3dv9HYDWqnBLP f+g5GQvYsgqZgjv/Q61x4/EGJKZGQBWRcqnfoW8N1KCGzdhzSIbeVgoga oAe7W2x930G6JPcN+XhGbR2SsHTccuW5LgqimDp/zCcE4j1GmhXKwC/MG ZTUiTkMZzx6U+CP6pU+cJNN//bc1WytArmrLZkzatVzYcgGTEl4D7iVcB g==; From: =?UTF-8?q?M=C3=A5rten=20Lindahl?= To: Krzysztof Kozlowski Subject: [PATCH] i2c: exynos5: Preserve high speed master code Date: Mon, 15 Feb 2021 20:03:21 +0100 Message-ID: <20210215190322.22094-1-marten.lindahl@axis.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210215_140409_759967_E2185A69 X-CRM114-Status: GOOD ( 10.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?M=C3=A5rten=20Lindahl?= , kernel@axis.com, linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogTcOlcnRlbiBMaW5kYWhsIDxtYXJ0ZW5saUBheGlzLmNvbT4KCldoZW4gdGhlIGNvbnRy b2xsZXIgc3RhcnRzIHRvIHNlbmQgYSBtZXNzYWdlIHdpdGggdGhlIE1BU1RFUl9JRCBmaWVsZApz ZXQgKGhpZ2ggc3BlZWQpLCB0aGUgd2hvbGUgSTJDX0FERFIgcmVnaXN0ZXIgaXMgb3ZlcndyaXR0 ZW4gaW5jbHVkaW5nCk1BU1RFUl9JRCBhcyB0aGUgU0xWX0FERFJfTUFTIGZpZWxkIGlzIHNldC4K ClRoaXMgcGF0Y2ggcHJlc2VydmVzIGFscmVhZHkgd3JpdHRlbiBmaWVsZHMgaW4gSTJDX0FERFIg d2hlbiB3cml0aW5nClNMVl9BRERSX01BUy4KClNpZ25lZC1vZmYtYnk6IE3DpXJ0ZW4gTGluZGFo bCA8bWFydGVubGlAYXhpcy5jb20+Ci0tLQogZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1leHlub3M1 LmMgfCA4ICsrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAxIGRlbGV0 aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1leHlub3M1LmMgYi9k cml2ZXJzL2kyYy9idXNzZXMvaTJjLWV4eW5vczUuYwppbmRleCAyMGE5ODgxYTBkNmMuLmYyZDA0 YzI0MTI5OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1leHlub3M1LmMKKysr IGIvZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1leHlub3M1LmMKQEAgLTYwNiw2ICs2MDYsNyBAQCBz dGF0aWMgdm9pZCBleHlub3M1X2kyY19tZXNzYWdlX3N0YXJ0KHN0cnVjdCBleHlub3M1X2kyYyAq aTJjLCBpbnQgc3RvcCkKIAl1MzIgaTJjX2N0bDsKIAl1MzIgaW50X2VuID0gMDsKIAl1MzIgaTJj X2F1dG9fY29uZiA9IDA7CisJdTMyIGkyY19hZGRyID0gMDsKIAl1MzIgZmlmb19jdGw7CiAJdW5z aWduZWQgbG9uZyBmbGFnczsKIAl1bnNpZ25lZCBzaG9ydCB0cmlnX2x2bDsKQEAgLTY0MCw3ICs2 NDEsMTIgQEAgc3RhdGljIHZvaWQgZXh5bm9zNV9pMmNfbWVzc2FnZV9zdGFydChzdHJ1Y3QgZXh5 bm9zNV9pMmMgKmkyYywgaW50IHN0b3ApCiAJCWludF9lbiB8PSBIU0kyQ19JTlRfVFhfQUxNT1NU RU1QVFlfRU47CiAJfQogCi0Jd3JpdGVsKEhTSTJDX1NMVl9BRERSX01BUyhpMmMtPm1zZy0+YWRk ciksIGkyYy0+cmVncyArIEhTSTJDX0FERFIpOworCWkyY19hZGRyID0gSFNJMkNfU0xWX0FERFJf TUFTKGkyYy0+bXNnLT5hZGRyKTsKKworCWlmIChpMmMtPm9wX2Nsb2NrID49IEkyQ19NQVhfRkFT VF9NT0RFX1BMVVNfRlJFUSkKKwkJaTJjX2FkZHIgfD0gcmVhZGwoaTJjLT5yZWdzICsgSFNJMkNf QUREUik7CisKKwl3cml0ZWwoaTJjX2FkZHIsIGkyYy0+cmVncyArIEhTSTJDX0FERFIpOwogCiAJ d3JpdGVsKGZpZm9fY3RsLCBpMmMtPnJlZ3MgKyBIU0kyQ19GSUZPX0NUTCk7CiAJd3JpdGVsKGky Y19jdGwsIGkyYy0+cmVncyArIEhTSTJDX0NUTCk7Ci0tIAoyLjExLjAKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxp bmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3Rz LmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==