From patchwork Tue Feb 2 13:37:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 374667 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp508350jah; Tue, 2 Feb 2021 11:56:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLOzoTtdr9Xw6V7Kkq9HU8SgcPerNUwSFi20n8GZ2ojno8JmZvxnhUltbA5PTMjOFFyDPX X-Received: by 2002:a17:906:ca0d:: with SMTP id jt13mr23112229ejb.170.1612295772085; Tue, 02 Feb 2021 11:56:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612295772; cv=none; d=google.com; s=arc-20160816; b=t5m8xxEj7srB+jWKtOGyb8ex673ADY+peKLF2OlMvEzQxenWLQEGLMWdrSXZ9xYZ0A o0KcPp65xh+MnsP7ZK9Ptm/ExQ1DTBuZ5eESjAGOkSHhZaPZ9rx/LTAdXlPo07caqzYO FgJBQp09OigMZtMgj3nTMHyEiZR1KSg94BL/Pjp6Msjo7wFsBny7zX01AlbHvCw4dlOj XHsM9GMfjc0j5P4XOyVNbxg6UyyVvCPsCppCznsF7MWGQUrWxjc0k7pAm+95fiezzbwl YvI46ybW1xOav4d5L7dDRKV/kqYNepu14c32bbn0jhm8SMtr3NnimDf6u5X4hq0rldSp 2xPw== 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=97ImpQwHFps7KAMrFgAs8oPr/ZIG3W2x5MzbdGvD8do=; b=lWBHMBlzRI6yEw3X9GUbW1Vnald2BHOu87L2jv28oF/+4AEtxVnyvA3OV+AxPnDTcf dlbcswd2AL3j++SrAA9SANMRYMT8f0w39WAkDGUxlUVByuvzthOOn/JtOH9HjCL4gNms 23npQ8MZzjIEAiYeD/hlYaq10PELxYxo2RxyjJs9cNvv/ilJ63c7eO9/nR60unnXhlR9 twKvUfpHA7Z5ywvMtu5H+sAn2TTetqrAHlhFcIPvXNh4uYGeL89ZUVEOnnY+WUrBpmaw BZtURcDogfLWPPeRDUtI7pF+HOx/G9cOLCBCAHDFZeA1L2tYsDCFcOLULVkCnLvwkJ// RGVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NXLm166v; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 u22si6739074ejf.705.2021.02.02.11.56.11; Tue, 02 Feb 2021 11:56:12 -0800 (PST) Received-SPF: pass (google.com: domain of stable-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=NXLm166v; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S240206AbhBBTzD (ORCPT + 13 others); Tue, 2 Feb 2021 14:55:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:42038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233097AbhBBNva (ORCPT ); Tue, 2 Feb 2021 08:51:30 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7C59364FB4; Tue, 2 Feb 2021 13:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1612273389; bh=/oxlEIfmU57N6kcLOcmTfCQxXgj9arOTSSj3O7Lvp5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NXLm166vEdm2kvD2G2NKstDzjCOqpxF5kXP3q21YBwENQ/qzee1mikyknm0FxtYig i/QojHdJbsPqqrpP6b1Q06EYB3CQyce0d7gXZa/4Zyy9HkGlgRvk0RD8bKX2DG+kgn ECzqHq2evz/evzMwqoboHlrQVEkh6BanWLTsCuLw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jun Nie , Stephan Gerhold , Srinivasa Rao , Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 5.10 089/142] ASoC: dt-bindings: lpass: Fix and common up lpass dai ids Date: Tue, 2 Feb 2021 14:37:32 +0100 Message-Id: <20210202133001.375135742@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210202132957.692094111@linuxfoundation.org> References: <20210202132957.692094111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit 09a4f6f5d21cb1f2633f4e8b893336b60eee9a01 ] Existing header file design of having separate SoC specific header files for the common lpass driver has mutiple issues. This design is prone to break as an when new SoC header is added as the common DAI ids of other SoCs will be overwritten by the new ones. One of them surfaced by recent patch that adds support to sc7180, this one totally broke LPASS drivers on other Qualcomm SoCs. Before this gets worst, fix this by having a common header qcom,lpass.h. This should fix the issue and any new DAI ids should be added to the common header. This will be more sustainable then the existing design! Fixes: 12fbfc4cabec6595 ("ASoC: Add sc7180-lpass binding header hdmi define") Reported-by: Jun Nie Reported-by: Stephan Gerhold Tested-by: Srinivasa Rao Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20210119171527.32145-2-srinivas.kandagatla@linaro.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- include/dt-bindings/sound/apq8016-lpass.h | 7 +++---- include/dt-bindings/sound/qcom,lpass.h | 15 +++++++++++++++ include/dt-bindings/sound/sc7180-lpass.h | 6 ++---- 3 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 include/dt-bindings/sound/qcom,lpass.h -- 2.27.0 diff --git a/include/dt-bindings/sound/apq8016-lpass.h b/include/dt-bindings/sound/apq8016-lpass.h index 3c3e16c0aadbf..dc605c4bc2249 100644 --- a/include/dt-bindings/sound/apq8016-lpass.h +++ b/include/dt-bindings/sound/apq8016-lpass.h @@ -2,9 +2,8 @@ #ifndef __DT_APQ8016_LPASS_H #define __DT_APQ8016_LPASS_H -#define MI2S_PRIMARY 0 -#define MI2S_SECONDARY 1 -#define MI2S_TERTIARY 2 -#define MI2S_QUATERNARY 3 +#include + +/* NOTE: Use qcom,lpass.h to define any AIF ID's for LPASS */ #endif /* __DT_APQ8016_LPASS_H */ diff --git a/include/dt-bindings/sound/qcom,lpass.h b/include/dt-bindings/sound/qcom,lpass.h new file mode 100644 index 0000000000000..7b0b80b38699e --- /dev/null +++ b/include/dt-bindings/sound/qcom,lpass.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_QCOM_LPASS_H +#define __DT_QCOM_LPASS_H + +#define MI2S_PRIMARY 0 +#define MI2S_SECONDARY 1 +#define MI2S_TERTIARY 2 +#define MI2S_QUATERNARY 3 +#define MI2S_QUINARY 4 + +#define LPASS_DP_RX 5 + +#define LPASS_MCLK0 0 + +#endif /* __DT_QCOM_LPASS_H */ diff --git a/include/dt-bindings/sound/sc7180-lpass.h b/include/dt-bindings/sound/sc7180-lpass.h index 56ecaafd2dc68..5c1ee8b36b197 100644 --- a/include/dt-bindings/sound/sc7180-lpass.h +++ b/include/dt-bindings/sound/sc7180-lpass.h @@ -2,10 +2,8 @@ #ifndef __DT_SC7180_LPASS_H #define __DT_SC7180_LPASS_H -#define MI2S_PRIMARY 0 -#define MI2S_SECONDARY 1 -#define LPASS_DP_RX 2 +#include -#define LPASS_MCLK0 0 +/* NOTE: Use qcom,lpass.h to define any AIF ID's for LPASS */ #endif /* __DT_APQ8016_LPASS_H */