Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2026224imu; Fri, 14 Dec 2018 04:43:13 -0800 (PST) X-Google-Smtp-Source: AFSGD/XYMJ8tq6IMM6g8hb+Gt5Q7IkAXjizjo1kYs7u1rMBnuKeECiRgqzhSc080S2VJpgfWua2d X-Received: by 2002:a63:5b1f:: with SMTP id p31mr2608479pgb.56.1544791393463; Fri, 14 Dec 2018 04:43:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544791393; cv=none; d=google.com; s=arc-20160816; b=G5AlnIPT0xXbvTE/em7wtSShyIiMhfEXHUpDezmfug6DOaTlaMqYNA1WvPPuCo91vu IRj1V6NTv8BN5d3g3jiPTgNW4BqGv5RLYnxXqiic7ovkfCr6VcKNlCc50Vr8e15LxfJR cuc1uFDYQj5I8iWyOUJsiAhoETDusPtYC3fV3q3T/areUkzcuNyOcZoiS/R3B33bZ+J8 7uuIJnYiXqa+D6UhtLvKfrLc82tw2sLJSd55297ty0Fc26bOXEneVhJX9qSgWI2i8wSm LKGEiHHOILSw0Gi08ifz0TfKnxy93muqSqxoufQe9Ow8KdUdf6+C3nnutPlLWLlg4tUx QSEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=d1p9IyI5PyjZ5hrReaXgYNDUldsBhwFEJ0tARc8+1hQ=; b=yVWvpPA36gA+gUQZCiWAtSOlHbvDHmej5LKwMIKc0hc2VKzxLil8B7dF/LZonBhHD2 2Gm0u+RXWRyH7EniU2X3/0F/2iXxLx/quKcNMy/oLcSzGP3JKrEFKkc3Xn312IKXDuTm VwTZDjnBpMpJMy/Hc3aEunQP4l1bRdP5Ar9zkWEBkHa4UFxN4llQTAakkLY2ecDDoX8p pHD0alm4lAS7KDZoBPr2wkvN4kQPB11PYT6cLrfDe9U55BVMQkPEMGBIup8PysZgksKo woX+vpPxxDSPMcIc5yXX8oPzT9MuxbCUL4s4+XNK3bkwn9USwk6YXeu9/WDjaGgap1EQ HPmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZoxWYpHR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k62si4071553pfc.208.2018.12.14.04.42.58; Fri, 14 Dec 2018 04:43:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZoxWYpHR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730213AbeLNMDB (ORCPT + 99 others); Fri, 14 Dec 2018 07:03:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:46158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730174AbeLNMC7 (ORCPT ); Fri, 14 Dec 2018 07:02:59 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7064A2146E; Fri, 14 Dec 2018 12:02:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544788978; bh=sop109yJMNkbR5OGy9G0gu49s8zgeeg4dQhjgreBL8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZoxWYpHR4a/DsRFPy/6gdnbClztjpQcrHsNJdPguyStnWVpxw951jk4xDpc7Lg2L3 mJkIJ/1Y1YF0qH05Jbx3v9HLkh1/TtlOBis2XPKsQmZWZj+qJMNEbi3ZnrjUSLqgVN zxtS4ZIksHwg0WUwIHDEHgzotZIYWdfc1ar/oBlM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rohit kumar , Mark Brown , Sasha Levin Subject: [PATCH 4.19 024/142] ASoC: qdsp6: q6afe: Fix wrong MI2S SD line mask Date: Fri, 14 Dec 2018 12:58:29 +0100 Message-Id: <20181214115748.022808665@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214115747.053633987@linuxfoundation.org> References: <20181214115747.053633987@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 112b57fa737445b2361be332ce8cc0fd3e2b994e ] SD line mask for MI2S starts from BIT 0 instead of BIT 1. Fix all bit mask for MI2S SD lines. Signed-off-by: Rohit kumar Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/qcom/qdsp6/q6afe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c index 000775b4bba8..829b5e987b2a 100644 --- a/sound/soc/qcom/qdsp6/q6afe.c +++ b/sound/soc/qcom/qdsp6/q6afe.c @@ -49,14 +49,14 @@ #define AFE_PORT_I2S_SD1 0x2 #define AFE_PORT_I2S_SD2 0x3 #define AFE_PORT_I2S_SD3 0x4 -#define AFE_PORT_I2S_SD0_MASK BIT(0x1) -#define AFE_PORT_I2S_SD1_MASK BIT(0x2) -#define AFE_PORT_I2S_SD2_MASK BIT(0x3) -#define AFE_PORT_I2S_SD3_MASK BIT(0x4) -#define AFE_PORT_I2S_SD0_1_MASK GENMASK(2, 1) -#define AFE_PORT_I2S_SD2_3_MASK GENMASK(4, 3) -#define AFE_PORT_I2S_SD0_1_2_MASK GENMASK(3, 1) -#define AFE_PORT_I2S_SD0_1_2_3_MASK GENMASK(4, 1) +#define AFE_PORT_I2S_SD0_MASK BIT(0x0) +#define AFE_PORT_I2S_SD1_MASK BIT(0x1) +#define AFE_PORT_I2S_SD2_MASK BIT(0x2) +#define AFE_PORT_I2S_SD3_MASK BIT(0x3) +#define AFE_PORT_I2S_SD0_1_MASK GENMASK(1, 0) +#define AFE_PORT_I2S_SD2_3_MASK GENMASK(3, 2) +#define AFE_PORT_I2S_SD0_1_2_MASK GENMASK(2, 0) +#define AFE_PORT_I2S_SD0_1_2_3_MASK GENMASK(3, 0) #define AFE_PORT_I2S_QUAD01 0x5 #define AFE_PORT_I2S_QUAD23 0x6 #define AFE_PORT_I2S_6CHS 0x7 -- 2.19.1