From patchwork Thu Oct 12 08:15:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13418483 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 8FFABCDB47E for ; Thu, 12 Oct 2023 08:16:26 +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=wRQWBn2XOMhl2Mq35+V58Y6WF/WjIJf/gSg92Kc7sl4=; b=18nAe/tpwDBWtQ AGu2UnH6t2kYH8M9l6t7MYtQPiv403rkN2Tk1PZpEeH7fzjJl+fJARVCmcQPcAP8rI8ZABYEMWBL6 aPHLkXPmA+tqsZcevDrsBew2pafKbSOmwgUjOHvWA2yaCPw8Xshvnn79VfTuFMDaACR1nyhNqRQaJ wmEgqJXHp4ml9ZMzPW5D6xHXXslhQck6kDpes8MUmCixmYu1xgOZHWV+ILaVFcZ6oEs8uGbZWWdul CUOGUluy8kWuTJk0vaI9umdY+Px1rrn+9OOw01xJV0e8budiIsHpdgl+IRprsRoSxZteez9H1Y7QU sDuWygdNSGAQNUw0bFiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qqqrS-0009Pj-2Z; Thu, 12 Oct 2023 08:16:02 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqqrP-0009OH-0X for linux-arm-kernel@lists.infradead.org; Thu, 12 Oct 2023 08:16:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1697098559; x=1728634559; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TP17pVG01o3Wxmka/KFK2OBcd6hRaw9l2zX+LhFjBFE=; b=jGlKNo4VRMJzJ0CooCvohQD64aHpMUPF/Fcz0Jv9McF60OeStZWM+MzT t0DeZYQqnqZIrOGadwbG4ZnKJuboGlItcOCOx8gsXd83BMy78dnxCC4Mk xQIg5cfwV6kN2+94AUgYd7WSFXf7RbZAHIgRmvcPllZuTXHje5iwcLa3B 0aobdMS8iOoMAOh/aaNmb2ylD6rctT5QEAx4p2zy1f4ZET1GRX/zevgjs /orP/W1GjqPMBH3Of1GYIdkv8fsYnzMyGMAL2OKIg1yKroCM/qiMoO5M1 gZuosgQ1pYMZJyM0LQ4aN8JmMtSE1cIh8/1iNKzmikgXOK/Gy40yxxTRg g==; X-IronPort-AV: E=Sophos;i="6.03,218,1694728800"; d="scan'208";a="33423291" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 12 Oct 2023 10:15:56 +0200 Received: from steina-w.tq-net.de (steina-w.tq-net.de [10.123.53.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 85CD6280084; Thu, 12 Oct 2023 10:15:56 +0200 (CEST) From: Alexander Stein To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Alexander Stein , Pengutronix Kernel Team , NXP Linux Team , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/4] ARM: dts: imx7d: Fix coresight funnel ports Date: Thu, 12 Oct 2023 10:15:53 +0200 Message-Id: <20231012081556.2723552-2-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012081556.2723552-1-alexander.stein@ew.tq-group.com> References: <20231012081556.2723552-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231012_011559_505465_317BFCA3 X-CRM114-Status: GOOD ( 11.94 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- arch/arm/boot/dts/nxp/imx/imx7d.dtsi | 3 --- arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx7d.dtsi b/arch/arm/boot/dts/nxp/imx/imx7d.dtsi index 4b94b8afb55d9..0484e349e064e 100644 --- a/arch/arm/boot/dts/nxp/imx/imx7d.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx7d.dtsi @@ -217,9 +217,6 @@ fec2: ethernet@30bf0000 { }; &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/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi index 29b8fd03567a5..8e05ab545213e 100644 --- a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi @@ -190,7 +190,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>; };