From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795030733; b=rb/K4THicqpy/XAgv0YhQYyG1euCCAM11JVvviIbFuP8IdBHKQ1Fu39M1EYZqu3Q3oHw Uu/+Xz01Ag2oswU3X8bR2JsWYzah7ndL711g8kI+6mNwiVCg6wgcauOo63Zy5w6uew5Jm +5DRIL7/l31xg0VQQ7gUe6FNfDyHqAL6JpEYXHicXcEtyEgfbdD99SjIpMtNTArI+eDbu CH3H+Q6Rq+ubbfMMsSz9pdEacTp50IEc4n/YiRmg+8q+W6HDu9VXNaV/giPsma5uEjmSw IsqQrhBA6O22HpwkMLfimYdFhw4VaaPhsL+stUCJ0t2lDmoL2EzRK9BGv21k4cm3T5g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030733; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Cr5U9HPLB1+uAQpmDd70L0oKSA8My42nt+mWCoI2HY4=; b=DIbePYpLvjVG70tbwupPlhMb7gRZG4wlaQc1MeBE5EF2YxBlt08KjKV19NPmJW0lL5hY YU5M/dBM8qVMnJojsXgOadPaOcrRBJi2zesyQlfkldxsgEsWMK67bt+Su4XLEM4WCp9bR Rm6PQ0Fcl6huZ/DllnR3C1mtk2P/5uvJwBlHgmwc6oacrJyUgeE1svnTOnvBtox4OsSOU Wdm8EWUzS4w55jtIkErDS4fee4xkIn6+Ir9NyvBMxslMiQUDiIB09mpyDxca6oChnkA2r 1r4GRxDhdpx8bV/Qq+C5J6+5XIVcIj/nc5ifBDfmGfm833l2vDuNt2zZ3i6MwdoaDdA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=K296HXAf; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93342606A333; Wed, 18 Nov 2026 19:38:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=K296HXAf Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDCAC1F000C4; Wed, 18 Nov 2026 19:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795030733; bh=Cr5U9HPLB1+uAQpmDd70L0oKSA8My42nt+mWCoI2HY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=K296HXAfedYNi4yIYVgEeK/flCl45RahqzgozHhQVvgQlaPK6hoEy+hI2ucx9QOJ1 gVmXNUiMlNtXkqM/A8eDAuhlB0a499M6AGTIH8g4CfT7WblGFDhGpQ3RxcJXcSba4F gch9ypiY2e/RGEJFg8D71xtaUa5qkcPYqD0jaqtI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jernej Skrabec , "Rob Herring (Arm)" , Chen-Yu Tsai , Nicolas Dufresne , Hans Verkuil , Sasha Levin Subject: [PATCH 6.12 0809/1756] dt-bindings: media: sun4i-a10-video-engine: Fix IOMMU count for H6 Date: Wed, 18 Nov 2026 15:48:56 +0100 Message-ID: <20261118150041.832127494@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chen-Yu Tsai [ Upstream commit ca9a67831805dc788407a05f276abb6b86b1174d ] On the H6 SoC, the Video Engine has two memory ports, thus two IOMMU connections. The secondary one that is missing is likely used for reading reference frames. The newer H616 is the same. On the other hand, the D1 only has one memory port. Add the missing IOMMU connection for the Video Engine. Fixes: 62a8ccf3a248 ("arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage") Reviewed-by: Jernej Skrabec Acked-by: Rob Herring (Arm) Signed-off-by: Chen-Yu Tsai Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- .../allwinner,sun4i-a10-video-engine.yaml | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml index 01f2afa023f04..932043d7f0cc4 100644 --- a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml +++ b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml @@ -55,7 +55,10 @@ properties: description: Phandle to the device SRAM iommus: - maxItems: 1 + minItems: 1 + items: + - description: VE port on IOMMU + - description: VE_R port on IOMMU memory-region: maxItems: 1 @@ -82,6 +85,22 @@ required: - resets - allwinner,sram +allOf: + - if: + properties: + compatible: + contains: + enum: + - allwinner,sun50i-h6-video-engine + then: + properties: + iommus: + minItems: 2 + else: + properties: + iommus: + maxItems: 1 + additionalProperties: false examples: -- 2.53.0