From patchwork Fri Mar 11 21:03:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 12778570 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 4FAABC433EF for ; Fri, 11 Mar 2022 21:05:59 +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=DQxDLKaOx5J7mYKztVP/z6ej2G7chTpUFgTM/eyx1To=; b=ecPfYc64iiKZ5+ QD8NYKu7KbbfWMmSlI4nbnzgpxsZv0mfCWM4m+8IxmHtdrmldiiVy9lwVGVQkE+O6Gmj05FXLLC4u HPmnmIFb5WG1BH6BfCOVq7QxIzXjqjaAZYtCPnZtJ5+XXytgXCfXY9YfiAQXbSNuiaKZ+y2qGxofw roLPbj8XVcHM76+ULIbcxt7B7hrht5YJx0vKrQaO6k7hwJoY3V2IffBe4so+0SVUSu9UW3bbnApEw tAkhsbHV9VRpL2LqrqUIIre+zSgeG691bpx+4w37mkp6IuBndVr60ZUOB+00ImcEGdonKGS4TduZr zqIrBp/e7+D0xIhLc0fg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSmSR-000HoT-8G; Fri, 11 Mar 2022 21:05:55 +0000 Received: from mxout1.routing.net ([2a03:2900:1:a::a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSmR2-000HBy-LK; Fri, 11 Mar 2022 21:04:32 +0000 Received: from mxbox1.masterlogin.de (unknown [192.168.10.88]) by mxout1.routing.net (Postfix) with ESMTP id B84BC4027B; Fri, 11 Mar 2022 21:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1647032662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZiMmRn9HwyZj81b6GJq46ba2PHtAxIiyMKChZSv7oOg=; b=f5zVhKQQnXIrTukqX8wyVBFy4jC8NOmQPV5R3lrV8rNwGQIYSTO/JHnOMM/CjukFF10bKM jlbcS/RSmKIWdZ9I/2PXDR/w9tAIg+sYPsXcvM29RUEQifpcLnW8YPkZzQCD26Tun7sWE1 WD1L/g/a811wJazmthxL2xXX06iS9W4= Received: from localhost.localdomain (fttx-pool-217.61.144.196.bambit.de [217.61.144.196]) by mxbox1.masterlogin.de (Postfix) with ESMTPSA id A40CF402CA; Fri, 11 Mar 2022 21:04:21 +0000 (UTC) From: Frank Wunderlich To: devicetree@vger.kernel.org Cc: Frank Wunderlich , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , Viresh Kumar , Shiraz Hashim , soc@kernel.org, Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Russell King , Heiko Stuebner , Peter Geis , Michael Riesch , Hans de Goede , Jens Axboe , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH v6 2/6] arm64: dts: marvell: Fix anyOf conditional failed Date: Fri, 11 Mar 2022 22:03:53 +0100 Message-Id: <20220311210357.222830-3-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220311210357.222830-1-linux@fw-web.de> References: <20220311210357.222830-1-linux@fw-web.de> MIME-Version: 1.0 X-Mail-ID: 7c08de59-17de-4366-865d-0a78c6304d65 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220311_130429_037028_380288FA X-CRM114-Status: GOOD ( 11.68 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Frank Wunderlich after converting the ahci-platform binding to yaml the following files reporting "'anyOf' conditional failed" on sata@540000: sata-port@0 armada-7040-db.dts armada-8040-clearfog-gt-8k.dts armada-8040-mcbin.dts armada-8040-mcbin-singleshot.dts cn9130-db.dts cn9130-db-B.dts cn9131-db.dts cn9131-db-B.dts cn9132-db.dts cn9132-db-B.dts the following files reporting 'anyOf' conditional failed on sata@540000: sata-port@1 cn9132-db.dts cn9132-db-B.dts cn9130-crb-B.dts 'phys' is a required property 'target-supply' is a required property From schema: Documentation/devicetree/bindings/ata/ahci-platform.yaml This is caused by defining sata-ports incomplete in armada-cp11x.dtsi and overriding only a subset of ports with the needed phys/target-supply property. Fix this by disabling the node-templates and enabling the needed nodes. Fixes: 47cf40af64c3 ("arm64: dts: marvell: Prepare the introduction of CP115") Signed-off-by: Frank Wunderlich --- v5: add fixes-tag the dtsi uses a macro for the node-label defined in armada-common.dtsi CP11X_LABEL(sata0): sata@540000 { so i hope i catched all right nodes to be enabled... have enabled all cpX_sata0 sata-portY childs --- arch/arm64/boot/dts/marvell/armada-7040-db.dts | 1 + arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts | 1 + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 1 + arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 ++ arch/arm64/boot/dts/marvell/cn9130-crb-B.dts | 1 + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 1 + arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 1 + 10 files changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts index cd326fe224ce..f8b1b46a03b3 100644 --- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts @@ -215,6 +215,7 @@ &cp0_sata0 { sata-port@1 { phys = <&cp0_comphy3 1>; phy-names = "cp0-sata0-1-phy"; + status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts index f3b0d57a24a3..7529018f9b72 100644 --- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts @@ -436,12 +436,14 @@ &cp0_sata0 { sata-port@0 { phys = <&cp0_comphy2 0>; phy-names = "cp0-sata0-0-phy"; + status = "okay"; }; /* M.2-2250 B-key (J39) */ sata-port@1 { phys = <&cp0_comphy3 1>; phy-names = "cp0-sata0-1-phy"; + status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts index 8729c6467303..5bb429abb1de 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts @@ -476,6 +476,7 @@ &cp1_sata0 { sata-port@1 { phys = <&cp1_comphy0 1>; phy-names = "cp1-sata0-1-phy"; + status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts index f2e8e0df8865..b33d64babcd9 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts @@ -146,10 +146,12 @@ &cp0_sata0 { sata-port@0 { phys = <&cp0_comphy1 0>; phy-names = "cp0-sata0-0-phy"; + status = "okay"; }; sata-port@1 { phys = <&cp0_comphy3 1>; phy-names = "cp0-sata0-1-phy"; + status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi index adbfecc678b5..2be4d67cbf16 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi @@ -246,6 +246,7 @@ &cp0_sata0 { sata-port@1 { phys = <&cp0_comphy5 1>; phy-names = "cp0-sata0-1-phy"; + status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts index dac85fa748de..03f9cc3a895f 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts @@ -409,11 +409,13 @@ &cp0_sata0 { sata-port@0 { phys = <&cp0_comphy2 0>; phy-names = "cp0-sata0-0-phy"; + status = "okay"; }; sata-port@1 { phys = <&cp0_comphy5 1>; phy-names = "cp0-sata0-1-phy"; + status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi index 3bd2182817fb..a2cc85d2adce 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi @@ -342,10 +342,12 @@ CP11X_LABEL(sata0): sata@540000 { sata-port@0 { reg = <0>; + status = "disabled"; }; sata-port@1 { reg = <1>; + status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/marvell/cn9130-crb-B.dts b/arch/arm64/boot/dts/marvell/cn9130-crb-B.dts index 0904cb0309ae..34194745f79e 100644 --- a/arch/arm64/boot/dts/marvell/cn9130-crb-B.dts +++ b/arch/arm64/boot/dts/marvell/cn9130-crb-B.dts @@ -28,6 +28,7 @@ sata-port@0 { status = "okay"; /* Generic PHY, providing serdes lanes */ phys = <&cp0_comphy2 0>; + status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi index f995b1bcda01..e6566dac885e 100644 --- a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi +++ b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi @@ -127,6 +127,7 @@ &cp1_sata0 { sata-port@1 { /* Generic PHY, providing serdes lanes */ phys = <&cp1_comphy5 1>; + status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi index 3f1795fb4fe7..5f9614bf2a0f 100644 --- a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi +++ b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi @@ -175,6 +175,7 @@ &cp2_sata0 { sata-port@0 { /* Generic PHY, providing serdes lanes */ phys = <&cp2_comphy2 0>; + status = "okay"; }; };