From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B67AD18FC6B; Mon, 28 Oct 2024 06:37:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097467; cv=none; b=RH51bv4/VfbWlA0a4zMH34DLq7t2qaFGtU8PHEIL5KkagtWr4uIBNRqWg8jpE3wAwM6PMctPHAF0UVO2NpBQ1S7f8Y0wO9CEylNsXKhMg/CDWKnwkN8PmUZX21nBg2jFupBSw5wrMzJ/exC8RjmZFMH/3gY78gWzcP5ZUJ+moFM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097467; c=relaxed/simple; bh=BklojR/XcMtreqgXU1Slbtzu+clPFHu2cRgvR3o1dOA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l1Ux+BFj52yp/5hmKAOX8DYZrL3GcwK/i7qcMeD8MYUn2+dbb4yUzgP3Y+zlxzeoR4BmrdjCHSYMipVRSHxjBwL0JXKTKhoEv9TBDr0Ux/EOsA8Z4ju0Z0lpqFb0ztaP7z7TrKCi96aGIIPBXlglkQC6d/EQ1FWYMaLKOcRkVbE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=snpuPFSw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="snpuPFSw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 103A5C4CEC7; Mon, 28 Oct 2024 06:37:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730097467; bh=BklojR/XcMtreqgXU1Slbtzu+clPFHu2cRgvR3o1dOA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=snpuPFSwOsALBFqJD+4ogSpxyOD+7g4PR9IueGFiv3tqqj5jPZw+elo2bH1/udQOl RG1sXecMM7050xBdlvw78Yx9qCHWS78IaFAjYZYB0gWiNuUCTQemxKdRAAwqZ5tvnj hYp1QSRUzHN8HdaIz9kVvsQJp0vPAlABg/lKRxzQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?P=C3=A9ter=20Ujfalusi?= , Miquel Raynal , Krzysztof Kozlowski , Mark Brown , Sasha Levin Subject: [PATCH 6.1 109/137] ASoC: dt-bindings: davinci-mcasp: Fix interrupt properties Date: Mon, 28 Oct 2024 07:25:46 +0100 Message-ID: <20241028062301.761128578@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028062258.708872330@linuxfoundation.org> References: <20241028062258.708872330@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miquel Raynal [ Upstream commit 8380dbf1b9ef66e3ce6c1d660fd7259637c2a929 ] Combinations of "tx" alone, "rx" alone and "tx", "rx" together are supposedly valid (see link below), which is not the case today as "rx" alone is not accepted by the current binding. Let's rework the two interrupt properties to expose all correct possibilities. Cc: Péter Ujfalusi Link: https://lore.kernel.org/linux-sound/20241003102552.2c11840e@xps-13/T/#m277fce1d49c50d94e071f7890aed472fa2c64052 Fixes: 8be90641a0bb ("ASoC: dt-bindings: davinci-mcasp: convert McASP bindings to yaml schema") Signed-off-by: Miquel Raynal Acked-by: Krzysztof Kozlowski Link: https://patch.msgid.link/20241003083611.461894-1-miquel.raynal@bootlin.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- .../bindings/sound/davinci-mcasp-audio.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml index b181f7481a951..fe02773a490a9 100644 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml @@ -102,21 +102,21 @@ properties: default: 2 interrupts: - oneOf: - - minItems: 1 - items: - - description: TX interrupt - - description: RX interrupt - - items: - - description: common/combined interrupt + minItems: 1 + maxItems: 2 interrupt-names: oneOf: - - minItems: 1 + - description: TX interrupt + const: tx + - description: RX interrupt + const: rx + - description: TX and RX interrupts items: - const: tx - const: rx - - const: common + - description: Common/combined interrupt + const: common fck_parent: $ref: /schemas/types.yaml#/definitions/string -- 2.43.0