From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D54A3C47258 for ; Tue, 16 Jan 2024 20:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YvFSuMre/JPFIx3fnSKBx79dOrUOk6WNR44fHUqkMwM=; b=k0bZHAvsBRLqJP LjBigYjuoB2AMqIzKSDpH3dgKM/dcUUBPJI4jGhNbHQus6dQCmWc0BcmUBY8/gEkmhkUicbqJCVnw OJWP9AbTc2BHKVMi/ym8E/Oz1QxodYHqNKEqkV/eAPcqtM1qbGihTCDBftTTTP/XlMZqjxRfn08H6 kH5wfSVZJ46oYgnivkvUQRrL2OBeVfE+SPOvBbHfdEfxFBsj7E7HqCE99lgsR9L5FVFjeGcmKrm3S w96ZRyqGsp3Jhan5WHFLyByYDNq8ee/5GVzByrMYp/Zh33CVcUqItzw8jczMLGI9O8nuvKk7VDvk9 UpzRCLfEgDFb13ZlXeZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rPpcc-00DJxk-0p; Tue, 16 Jan 2024 20:01:18 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rPpcZ-00DJw6-25 for linux-arm-kernel@lists.infradead.org; Tue, 16 Jan 2024 20:01:17 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 3C079B80F98; Tue, 16 Jan 2024 20:01:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81CAAC433C7; Tue, 16 Jan 2024 20:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705435270; bh=blobv814s8oZkTscCnm9M4NhxxzuGHApQAHu63YKAZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sPvSKwmnvznY1j/15rUVsrSsBrP+14LlF2tjFLNjqBlO2w6pCGsHKuRqvOAMsO9zA DxIS1ylKBKrV69LZ3GYjIXADlhBY+OMTt7qig4C2XbuVDMoX8inX+PS+zbLLuJoESR IiCrulaWSQkrLj5VEedFHlH2huy+0x6wkd+fPWbzRgTHoKEnrJczd1znbua4aDL+tf yFMwxSr5z7lKp2vFFSd3sSAHcKyLmKkwaEXLBU5khBPP9NE1g6+IyjAInQaFj1Naqn CKRpIvMn6kKCdh7jAdpmgOA6W/JIdohCxg4iJT4XHTBu/itI/x+DqI4lT8GyY1Qfd8 LcRr6/nYuDGGw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Stein , Shawn Guo , Sasha Levin , robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.10 09/44] ARM: dts: imx7d: Fix coresight funnel ports Date: Tue, 16 Jan 2024 14:59:38 -0500 Message-ID: <20240116200044.258335-9-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116200044.258335-1-sashal@kernel.org> References: <20240116200044.258335-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.208 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240116_120115_812565_FF80F19F X-CRM114-Status: GOOD ( 10.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 @@ pcie: pcie@33800000 { }; &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 03bde2fb9bb1..622c60bd8b75 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -173,7 +173,11 @@ funnel@30041000 { 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel