Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4748891pxj; Wed, 12 May 2021 12:19:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyf7trsoGkQXLOGunIfiZIolNabaH7ra4bjpZSQ8ebTipjw2clXFJFZ1p81GH2qCouZREpn X-Received: by 2002:aa7:d1d9:: with SMTP id g25mr46585189edp.30.1620847195746; Wed, 12 May 2021 12:19:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620847195; cv=none; d=google.com; s=arc-20160816; b=ukRw6bRrgn+DIpOqa15dxGy/sKu5rYHTWYF8hjvzP2s8qiufUOpn++8IARUDisiPxw 2WPvbi0+lS87EmvTfSPoGV+lFCqwmOGLuim47HW+ssKMWYMMvNQB3mfKIh0FtpJp94+F LCV31uUAcnGOJf6cDjmBJOS9ENPpYyx/UL6bRxlXuuFMKb8v/ZhSl1Q8HL/zz78l4CKQ kKeuogNsfhNQbjvQ4Ajl4djbqvZJXr42gXUCxN/6079ZY60GFcv2bfzev2NgVbty98Y4 NiFbD90FesF0jsvNpnLg8qduvIbl1WyEcYWPdpnipUZEOnrZQP/gQmH3ObmkRgL/0Ghn R0QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q0e+drNmpSIC4SzCauxmKk3sva0aNuyHRD2LRVWJ5o0=; b=Z/24bIregz1Cjlhp2TxfH3zzJ2thB37d4ParZwf8b8AgJDRURH5cAoxzsVBaU4odbU viftBaDtJvB2+/sS2y413q1egpRb9r5Pja0MKVPAAD9CYJTi2OA4nFDzSjKJArR/JF3d OGgh+ZrNuJNnBXZHsCoud6xhMq17ybBtc0B9Uqi7WHCZlYTQ7IG3ic/1g5usZOzbBHCD U6bLuG+LNiQCnJAbLgPjIYtrywP/g7tk9fYqOEHvNGjrQqAU+s+nsDoZ4iqFy0RTh5cw WOXViqKcWStOwA+uR8U2bxnLjvRA1Tj6JIFL2ru8QDEia/m4zzHy2WgEpqBHvBi9rNZr 72+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kuoW0UNT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m21si581520edc.194.2021.05.12.12.19.28; Wed, 12 May 2021 12:19:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kuoW0UNT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244295AbhELTMt (ORCPT + 99 others); Wed, 12 May 2021 15:12:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:37576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238256AbhELQow (ORCPT ); Wed, 12 May 2021 12:44:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 48AD761E69; Wed, 12 May 2021 16:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620836064; bh=cBtYXJ/ed3+R8re53TUA0HqSCkwS+TTEGW/GYTTRJEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kuoW0UNTawfTG42kzF4H8o/l1sDZzDG0U9ABxWBtVcvc1MZ2DMxaGAg7feSQxuqm6 x09qOjnTijlZqbVgqnlqBSO8XAIEzexYVzV4xRiQz9CpwU9aH4zh44QzequzRtPIbI 6eQB3fyUYFKc+BjeMo9RZUqH7VO3CmVJerW6iiHY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qii Wang , Wolfram Sang , Sasha Levin Subject: [PATCH 5.12 594/677] i2c: mediatek: Fix wrong dma sync flag Date: Wed, 12 May 2021 16:50:40 +0200 Message-Id: <20210512144857.113236658@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qii Wang [ Upstream commit 3186b880447ad3cc9b6487fa626a71d64b831524 ] The right flag is apdma_sync when apdma remove hand-shake signel. Fixes: 05f6f7271a38 ("i2c: mediatek: Fix apdma and i2c hand-shake timeout") Signed-off-by: Qii Wang Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-mt65xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c index 2ffd2f354d0a..86f70c751319 100644 --- a/drivers/i2c/busses/i2c-mt65xx.c +++ b/drivers/i2c/busses/i2c-mt65xx.c @@ -479,7 +479,7 @@ static void mtk_i2c_init_hw(struct mtk_i2c *i2c) { u16 control_reg; - if (i2c->dev_comp->dma_sync) { + if (i2c->dev_comp->apdma_sync) { writel(I2C_DMA_WARM_RST, i2c->pdmabase + OFFSET_RST); udelay(10); writel(I2C_DMA_CLR_FLAG, i2c->pdmabase + OFFSET_RST); -- 2.30.2