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 0907D78B70; Wed, 21 Feb 2024 13:34:34 +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=1708522474; cv=none; b=Y28StZn6FAg/j1ySSPFmmj8YHr8pXl8nfIeZcKfe2nwRUzIVRWhWSY2DCYFT8xREmmEoW9fJ+KynU74A0tEtgJOCtmP4lrt43z3SR+EMogPO8IjxYdW8tGk/UZCHa9oQawtIdqxYg+80ymyGoLAlK2Vkq95ngqeOxneahdNLKpE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708522474; c=relaxed/simple; bh=jWphhX46sHrgBoSCej0YYla8MMBZYqdYAx9wGHmGXYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fb1KAgnZiRdur/+VX972jXNHZz9q9+sxYkYbDMu3c2lgiVJyNwsz5PA6XSfdnR2lYHWIH5TD3VtYy7VOR7jv4IcxhBOS2i347XOyrfZVXNTNWyXgWABpb/LHV5iMrLeokOd4KBN93fYTzGPXFIYMvW+ZapY5+/r2rfGCmclb8tk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vRPx6Z2T; 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="vRPx6Z2T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81EC9C43394; Wed, 21 Feb 2024 13:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708522473; bh=jWphhX46sHrgBoSCej0YYla8MMBZYqdYAx9wGHmGXYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vRPx6Z2TVKp8jtIqQ1ndxeXIg5gCyNXv0fyb/TOATI32+qX/odMmj+JC1hxQECYTE 5mbWbpSewDgDskKnyiw5Rty7q5rq2Re7n5QknO846YImhaJXIvRF3yFo/eqmmHbeuC QX0FFaKyGZa35dIBdUXputlXwNeU9RBt6kWORj9c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexander Stein , Shawn Guo , Sasha Levin Subject: [PATCH 5.15 173/476] ARM: dts: imx7d: Fix coresight funnel ports Date: Wed, 21 Feb 2024 14:03:44 +0100 Message-ID: <20240221130014.311963801@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221130007.738356493@linuxfoundation.org> References: <20240221130007.738356493@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-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Stein [ Upstream commit 0d4ac04fa7c3f6dc263dba6f575a2ec7a2d4eca8 ] imx7d uses two ports for 'in-ports', so the syntax port@ has to be used. imx7d has both port and port@1 nodes present, raising these error: funnel@30041000: in-ports: More than one condition true in oneOf schema funnel@30041000: Unevaluated properties are not allowed ('in-ports' was unexpected) Fix this by also using port@0 for imx7s as well. Signed-off-by: Alexander Stein Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx7d.dtsi | 3 --- arch/arm/boot/dts/imx7s.dtsi | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi index b0bcfa9094a3..8ad3e60fd7d1 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7d.dtsi @@ -209,9 +209,6 @@ }; &ca_funnel_in_ports { - #address-cells = <1>; - #size-cells = <0>; - port@1 { reg = <1>; ca_funnel_in_port1: endpoint { diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 406e8870c680..6cdaaacd9e36 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -174,7 +174,11 @@ clock-names = "apb_pclk"; ca_funnel_in_ports: in-ports { - port { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; ca_funnel_in_port0: endpoint { remote-endpoint = <&etm0_out_port>; }; -- 2.43.0