From nobody Tue Jun 23 12:02:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6BECC433F5 for ; Sat, 5 Mar 2022 11:26:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231613AbiCEL1U (ORCPT ); Sat, 5 Mar 2022 06:27:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231582AbiCEL1N (ORCPT ); Sat, 5 Mar 2022 06:27:13 -0500 Received: from mxout2.routing.net (mxout2.routing.net [IPv6:2a03:2900:1:a::b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C06B940A25; Sat, 5 Mar 2022 03:26:22 -0800 (PST) Received: from mxbox2.masterlogin.de (unknown [192.168.10.89]) by mxout2.routing.net (Postfix) with ESMTP id F35BD5FBFE; Sat, 5 Mar 2022 11:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1646479581; 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=TTV1xdOBqDO16+gerFGDl04Vvm4klTkftcSfewYgx6I=; b=CtGvlIRLG7LITJ//B1/j/XOMBJPGpi8rCTzbev1PxxkIEyv6oNo8bXgSPimc9vr1SDn3+X /3XI1H3WTCruxJe4+kS/weCu0OIiITglaW7zdlaGFpq2r6pIHeg5jkccXOHnLG/p/zwefm qsD6dHP3MtwMZeQzyyLcQ5G7FCTHPi0= Received: from localhost.localdomain (fttx-pool-217.61.157.101.bambit.de [217.61.157.101]) by mxbox2.masterlogin.de (Postfix) with ESMTPSA id 031311007BC; Sat, 5 Mar 2022 11:26:19 +0000 (UTC) From: Frank Wunderlich To: devicetree@vger.kernel.org Cc: Frank Wunderlich , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , 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 v5 1/5] dt-bindings: ata: ahci-platform: Convert DT bindings to yaml Date: Sat, 5 Mar 2022 12:26:03 +0100 Message-Id: <20220305112607.257734-2-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220305112607.257734-1-linux@fw-web.de> References: <20220305112607.257734-1-linux@fw-web.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mail-ID: e7dc101d-d7d6-43d3-8dfc-70946311db46 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Frank Wunderlich Create a yaml file for dtbs_check from the old txt binding. Signed-off-by: Frank Wunderlich Reviewed-by: Krzysztof Kozlowski --- v5: - change subject - drop brcm,iproc-ahci from standalone enum - fix reg address in example 2 - move clocknames next to clocks, regnames to reg - drop interrupts description - drop newline from dma-coherent - drop max-items from ports-implemented - min2max in child phys - fix identation for compatible and sata-common - add additionalProperties=3Dfalse for subnodes - pipe for paragraphs and newline after title - add maximum for ports-implemented (found only 0x1 as its value) - add phy-names to sata-ports v4: - fix min vs. max - fix indention of examples - move up sata-common.yaml - reorder compatible - add descriptions/maxitems - fix compatible-structure - fix typo in example achi vs. ahci - add clock-names and reg-names - fix ns2 errors in separate patch v3: - add conversion to sata-series - fix some errors in dt_binding_check and dtbs_check - move to unevaluated properties =3D false --- .../devicetree/bindings/ata/ahci-platform.txt | 79 --------- .../bindings/ata/ahci-platform.yaml | 163 ++++++++++++++++++ 2 files changed, 163 insertions(+), 79 deletions(-) delete mode 100644 Documentation/devicetree/bindings/ata/ahci-platform.txt create mode 100644 Documentation/devicetree/bindings/ata/ahci-platform.yaml diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Docu= mentation/devicetree/bindings/ata/ahci-platform.txt deleted file mode 100644 index 77091a277642..000000000000 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ /dev/null @@ -1,79 +0,0 @@ -* AHCI SATA Controller - -SATA nodes are defined to describe on-chip Serial ATA controllers. -Each SATA controller should have its own node. - -It is possible, but not required, to represent each port as a sub-node. -It allows to enable each port independently when dealing with multiple -PHYs. - -Required properties: -- compatible : compatible string, one of: - - "brcm,iproc-ahci" - - "hisilicon,hisi-ahci" - - "cavium,octeon-7130-ahci" - - "ibm,476gtr-ahci" - - "marvell,armada-380-ahci" - - "marvell,armada-3700-ahci" - - "snps,dwc-ahci" - - "snps,spear-ahci" - - "generic-ahci" -- interrupts : -- reg : - -Please note that when using "generic-ahci" you must also specify a SoC spe= cific -compatible: - compatible =3D "manufacturer,soc-model-ahci", "generic-ahci"; - -Optional properties: -- dma-coherent : Present if dma operations are coherent -- clocks : a list of phandle + clock specifier pairs -- resets : a list of phandle + reset specifier pairs -- target-supply : regulator for SATA target power -- phy-supply : regulator for PHY power -- phys : reference to the SATA PHY node -- phy-names : must be "sata-phy" -- ahci-supply : regulator for AHCI controller -- ports-implemented : Mask that indicates which ports that the HBA supports - are available for software to use. Useful if PORTS_IMPL - is not programmed by the BIOS, which is true with - some embedded SOC's. - -Required properties when using sub-nodes: -- #address-cells : number of cells to encode an address -- #size-cells : number of cells representing the size of an address - -Sub-nodes required properties: -- reg : the port number -And at least one of the following properties: -- phys : reference to the SATA PHY node -- target-supply : regulator for SATA target power - -Examples: - sata@ffe08000 { - compatible =3D "snps,spear-ahci"; - reg =3D <0xffe08000 0x1000>; - interrupts =3D <115>; - }; - -With sub-nodes: - sata@f7e90000 { - compatible =3D "marvell,berlin2q-achi", "generic-ahci"; - reg =3D <0xe90000 0x1000>; - interrupts =3D ; - clocks =3D <&chip CLKID_SATA>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - sata0: sata-port@0 { - reg =3D <0>; - phys =3D <&sata_phy 0>; - target-supply =3D <®_sata0>; - }; - - sata1: sata-port@1 { - reg =3D <1>; - phys =3D <&sata_phy 1>; - target-supply =3D <®_sata1>;; - }; - }; diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.yaml b/Doc= umentation/devicetree/bindings/ata/ahci-platform.yaml new file mode 100644 index 000000000000..fae042539824 --- /dev/null +++ b/Documentation/devicetree/bindings/ata/ahci-platform.yaml @@ -0,0 +1,163 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/ata/ahci-platform.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: AHCI SATA Controller + +description: | + SATA nodes are defined to describe on-chip Serial ATA controllers. + Each SATA controller should have its own node. + + It is possible, but not required, to represent each port as a sub-node. + It allows to enable each port independently when dealing with multiple + PHYs. + +maintainers: + - Hans de Goede + - Jens Axboe + +allOf: + - $ref: "sata-common.yaml#" + +properties: + compatible: + oneOf: + - items: + - enum: + - brcm,iproc-ahci + - marvell,armada-8k-ahci + - marvell,berlin2q-ahci + - const: generic-ahci + - enum: + - cavium,octeon-7130-ahci + - hisilicon,hisi-ahci + - ibm,476gtr-ahci + - marvell,armada-3700-ahci + - marvell,armada-380-ahci + - snps,dwc-ahci + - snps,spear-ahci + + reg: + maxItems: 1 + + reg-names: + maxItems: 1 + + clocks: + description: + Clock IDs array as required by the controller. + minItems: 1 + maxItems: 3 + + clock-names: + description: + Names of clocks corresponding to IDs in the clock property. + minItems: 1 + maxItems: 3 + + interrupts: + maxItems: 1 + + ahci-supply: + description: + regulator for AHCI controller + + dma-coherent: true + + phy-supply: + description: + regulator for PHY power + + phys: + description: + List of all PHYs on this controller + maxItems: 1 + + phy-names: + description: + Name specifier for the PHYs + maxItems: 1 + + ports-implemented: + $ref: '/schemas/types.yaml#/definitions/uint32' + description: | + Mask that indicates which ports that the HBA supports + are available for software to use. Useful if PORTS_IMPL + is not programmed by the BIOS, which is true with + some embedded SoCs. + maximum: 0x1 + + resets: + maxItems: 1 + + target-supply: + description: + regulator for SATA target power + +required: + - compatible + - reg + - interrupts + +patternProperties: + "^sata-port@[0-9a-f]+$": + type: object + additionalProperties: false + description: + Subnode with configuration of the Ports. + + properties: + reg: + maxItems: 1 + + phys: + maxItems: 1 + + phy-names: + maxItems: 1 + + target-supply: + description: + regulator for SATA target power + + required: + - reg + + anyOf: + - required: [ phys ] + - required: [ target-supply ] + +unevaluatedProperties: false + +examples: + - | + sata@ffe08000 { + compatible =3D "snps,spear-ahci"; + reg =3D <0xffe08000 0x1000>; + interrupts =3D <115>; + }; + - | + #include + #include + sata@f7e90000 { + compatible =3D "marvell,berlin2q-ahci", "generic-ahci"; + reg =3D <0xf7e90000 0x1000>; + interrupts =3D ; + clocks =3D <&chip CLKID_SATA>; + #address-cells =3D <1>; + #size-cells =3D <0>; + + sata0: sata-port@0 { + reg =3D <0>; + phys =3D <&sata_phy 0>; + target-supply =3D <®_sata0>; + }; + + sata1: sata-port@1 { + reg =3D <1>; + phys =3D <&sata_phy 1>; + target-supply =3D <®_sata1>; + }; + }; --=20 2.25.1 From nobody Tue Jun 23 12:02:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E237EC433EF for ; Sat, 5 Mar 2022 11:26:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231615AbiCEL11 (ORCPT ); Sat, 5 Mar 2022 06:27:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231589AbiCEL1O (ORCPT ); Sat, 5 Mar 2022 06:27:14 -0500 Received: from mxout1.routing.net (mxout1.routing.net [IPv6:2a03:2900:1:a::a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D734D40E7D; Sat, 5 Mar 2022 03:26:23 -0800 (PST) Received: from mxbox2.masterlogin.de (unknown [192.168.10.89]) by mxout1.routing.net (Postfix) with ESMTP id E386F3FDCC; Sat, 5 Mar 2022 11:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1646479582; 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=h+3kTihjkrAcsYoutmb53vd9PaAyKUnnM/fDjJgZmeU=; b=VOUP0K/Y8IieQ9RLGSHVIjqfexlK0NOVW+gJxqMCj3nbP7PzV/LHv+4ldi++I3y9Up6QZd //+gIMiZbdSn2BG5sAD+CD2OrLHf6K+k1OQTD/ojs6sfIXoTB9PaAsqsuUUUITPmBg4qYJ 6UkNyIOQT6In75XciGtRABJ8vvPs5yE= Received: from localhost.localdomain (fttx-pool-217.61.157.101.bambit.de [217.61.157.101]) by mxbox2.masterlogin.de (Postfix) with ESMTPSA id E16881007DD; Sat, 5 Mar 2022 11:26:20 +0000 (UTC) From: Frank Wunderlich To: devicetree@vger.kernel.org Cc: Frank Wunderlich , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , 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 v5 2/5] arm64: dts: marvell: fix anyOf conditional failed Date: Sat, 5 Mar 2022 12:26:04 +0100 Message-Id: <20220305112607.257734-3-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220305112607.257734-1-linux@fw-web.de> References: <20220305112607.257734-1-linux@fw-web.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mail-ID: 003685f4-bab2-49f1-b8ba-7f9748801efb Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Frank Wunderlich --- 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/bo= ot/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 =3D <&cp0_comphy3 1>; phy-names =3D "cp0-sata0-1-phy"; + status =3D "okay"; }; }; =20 diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/ar= m64/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 =3D <&cp0_comphy2 0>; phy-names =3D "cp0-sata0-0-phy"; + status =3D "okay"; }; =20 /* M.2-2250 B-key (J39) */ sata-port@1 { phys =3D <&cp0_comphy3 1>; phy-names =3D "cp0-sata0-1-phy"; + status =3D "okay"; }; }; =20 diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/a= rch/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 =3D <&cp1_comphy0 1>; phy-names =3D "cp1-sata0-1-phy"; + status =3D "okay"; }; }; =20 diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/bo= ot/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 =3D <&cp0_comphy1 0>; phy-names =3D "cp0-sata0-0-phy"; + status =3D "okay"; }; sata-port@1 { phys =3D <&cp0_comphy3 1>; phy-names =3D "cp0-sata0-1-phy"; + status =3D "okay"; }; }; =20 diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm6= 4/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 =3D <&cp0_comphy5 1>; phy-names =3D "cp0-sata0-1-phy"; + status =3D "okay"; }; }; =20 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 =3D <&cp0_comphy2 0>; phy-names =3D "cp0-sata0-0-phy"; + status =3D "okay"; }; =20 sata-port@1 { phys =3D <&cp0_comphy5 1>; phy-names =3D "cp0-sata0-1-phy"; + status =3D "okay"; }; }; =20 diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boo= t/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 { =20 sata-port@0 { reg =3D <0>; + status =3D "disabled"; }; =20 sata-port@1 { reg =3D <1>; + status =3D "disabled"; }; }; =20 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 =3D "okay"; /* Generic PHY, providing serdes lanes */ phys =3D <&cp0_comphy2 0>; + status =3D "okay"; }; }; =20 diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi b/arch/arm64/boot/d= ts/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 =3D <&cp1_comphy5 1>; + status =3D "okay"; }; }; =20 diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi b/arch/arm64/boot/d= ts/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 =3D <&cp2_comphy2 0>; + status =3D "okay"; }; }; =20 --=20 2.25.1 From nobody Tue Jun 23 12:02:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A3BAC433EF for ; Sat, 5 Mar 2022 11:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231629AbiCEL1Y (ORCPT ); Sat, 5 Mar 2022 06:27:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231591AbiCEL1O (ORCPT ); Sat, 5 Mar 2022 06:27:14 -0500 Received: from mxout3.routing.net (mxout3.routing.net [IPv6:2a03:2900:1:a::8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C1824198B; Sat, 5 Mar 2022 03:26:24 -0800 (PST) Received: from mxbox2.masterlogin.de (unknown [192.168.10.89]) by mxout3.routing.net (Postfix) with ESMTP id D1E8460553; Sat, 5 Mar 2022 11:26:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1646479583; 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=LaZ9VVVTdUWuiSVF1cjUE3Er6qHX9/zyhLT+I9K+wUs=; b=U3R1TRNf7ZE+eG9ixAgIJA2sUh4d0Wdy9zlDlGSoJaw5z2en9wILJMX4PsouLxYZIEMI8E i2ltdtof3dg57wryKPiC0YxvEZe23EH7nOUwZAXarDMHcD9nDox2hDeAei67XxF5auQeYd Yl3/4OzacqGBw6Dmdww4Dbg6uazBZ8Y= Received: from localhost.localdomain (fttx-pool-217.61.157.101.bambit.de [217.61.157.101]) by mxbox2.masterlogin.de (Postfix) with ESMTPSA id D2CBA10040E; Sat, 5 Mar 2022 11:26:21 +0000 (UTC) From: Frank Wunderlich To: devicetree@vger.kernel.org Cc: Frank Wunderlich , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , 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 v5 3/5] dt-bindings: ata: ahci-platform: Add power-domains property Date: Sat, 5 Mar 2022 12:26:05 +0100 Message-Id: <20220305112607.257734-4-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220305112607.257734-1-linux@fw-web.de> References: <20220305112607.257734-1-linux@fw-web.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mail-ID: 088accf3-e553-47cb-a6f8-8e9ee91f3e9a Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Frank Wunderlich Some SoC using power-domains property so add it here Signed-off-by: Frank Wunderlich Reviewed-by: Krzysztof Kozlowski --- changes in v5: added reviewed by changes in v4: none changes in v3: - new patch --- Documentation/devicetree/bindings/ata/ahci-platform.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.yaml b/Doc= umentation/devicetree/bindings/ata/ahci-platform.yaml index fae042539824..82be26ce4384 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.yaml +++ b/Documentation/devicetree/bindings/ata/ahci-platform.yaml @@ -89,6 +89,9 @@ properties: some embedded SoCs. maximum: 0x1 =20 + power-domains: + maxItems: 1 + resets: maxItems: 1 =20 --=20 2.25.1 From nobody Tue Jun 23 12:02:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33CB4C433FE for ; Sat, 5 Mar 2022 11:26:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231643AbiCEL13 (ORCPT ); Sat, 5 Mar 2022 06:27:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231594AbiCEL1O (ORCPT ); Sat, 5 Mar 2022 06:27:14 -0500 Received: from mxout3.routing.net (mxout3.routing.net [IPv6:2a03:2900:1:a::8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DC543F8BE; Sat, 5 Mar 2022 03:26:25 -0800 (PST) Received: from mxbox2.masterlogin.de (unknown [192.168.10.89]) by mxout3.routing.net (Postfix) with ESMTP id AE1CB60564; Sat, 5 Mar 2022 11:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1646479583; 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=fAy+g86pSYjjn5it3aXzVtAlRS9cIWELtqRIuuhnMoM=; b=oaTL491z195TsUb55ZNq26DHCbxbtqD5d/1COKvJ+sVMdta7VNYKI/vAsDLgfBd5YDcBs/ tr06evrij1izBklB2hixVD+b86JLcXh6TqR4duVnpXdo7ONadnVIVa4xC610mfz0mkxwrk qwCb+q4ZTsSAHve9h/YZp/27FcQCtCg= Received: from localhost.localdomain (fttx-pool-217.61.157.101.bambit.de [217.61.157.101]) by mxbox2.masterlogin.de (Postfix) with ESMTPSA id BBE891007BC; Sat, 5 Mar 2022 11:26:22 +0000 (UTC) From: Frank Wunderlich To: devicetree@vger.kernel.org Cc: Frank Wunderlich , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , 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 v5 4/5] dt-bindings: ata: ahci-platform: Add rk3568-dwc3-ahci compatible Date: Sat, 5 Mar 2022 12:26:06 +0100 Message-Id: <20220305112607.257734-5-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220305112607.257734-1-linux@fw-web.de> References: <20220305112607.257734-1-linux@fw-web.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mail-ID: bfb49fcd-9f41-417a-a608-f94191395798 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Frank Wunderlich Add SoC specific compatible for rk3568 ahci controller Signed-off-by: Frank Wunderlich Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/ata/ahci-platform.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.yaml b/Doc= umentation/devicetree/bindings/ata/ahci-platform.yaml index 82be26ce4384..5766941305ef 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.yaml +++ b/Documentation/devicetree/bindings/ata/ahci-platform.yaml @@ -30,6 +30,10 @@ properties: - marvell,armada-8k-ahci - marvell,berlin2q-ahci - const: generic-ahci + - items: + - enum: + - rockchip,rk3568-dwc-ahci + - const: snps,dwc-ahci - enum: - cavium,octeon-7130-ahci - hisilicon,hisi-ahci --=20 2.25.1 From nobody Tue Jun 23 12:02:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 304E4C433F5 for ; Sat, 5 Mar 2022 11:26:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231672AbiCEL1c (ORCPT ); Sat, 5 Mar 2022 06:27:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231600AbiCEL1P (ORCPT ); Sat, 5 Mar 2022 06:27:15 -0500 Received: from mxout2.routing.net (mxout2.routing.net [IPv6:2a03:2900:1:a::b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBBD940E7D; Sat, 5 Mar 2022 03:26:25 -0800 (PST) Received: from mxbox2.masterlogin.de (unknown [192.168.10.89]) by mxout2.routing.net (Postfix) with ESMTP id 8AA445FD5D; Sat, 5 Mar 2022 11:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1646479584; 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=oeojDkbixb+3+AqcShTPnuHWz+1GrcPznWJUJt5Sy3k=; b=v+/pylN7fIi8+EJUtnWzr056KkXzMdaedd8sSSturEfyQOeI/a9pkpI49bIs4yF/Ja939r PGjd/jAyuF/eyz+2yuGft/UJbOOMwn/NJkYAHL3di/Z10AG0fLpyvwGR17sXfiZhtiOV2b w34lFlqgJmc4Nma/5qE68J+88L8z9Mw= Received: from localhost.localdomain (fttx-pool-217.61.157.101.bambit.de [217.61.157.101]) by mxbox2.masterlogin.de (Postfix) with ESMTPSA id 9D40F1007DD; Sat, 5 Mar 2022 11:26:23 +0000 (UTC) From: Frank Wunderlich To: devicetree@vger.kernel.org Cc: Frank Wunderlich , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , 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 v5 5/5] arm64: dts: rockchip: Add sata nodes to rk356x Date: Sat, 5 Mar 2022 12:26:07 +0100 Message-Id: <20220305112607.257734-6-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220305112607.257734-1-linux@fw-web.de> References: <20220305112607.257734-1-linux@fw-web.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mail-ID: 6c0e6171-3ca7-422f-bfb9-56d26079865c Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Frank Wunderlich RK356x supports up to 3 sata controllers which were compatible with the existing snps,dwc-ahci binding. Signed-off-by: Frank Wunderlich --- changes in v4: - drop newline in dts - re-add clock-names - add soc specific compatible changes in v3: - fix combphy error by moving sata0 to rk3568.dtsi - remove clock-names and interrupt-names changes in v2: - added sata0 + 1, but have only tested sata2 --- arch/arm64/boot/dts/rockchip/rk3568.dtsi | 14 ++++++++++++ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 28 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts= /rockchip/rk3568.dtsi index 5b0f528d6818..3e07d9f6a2d1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -8,6 +8,20 @@ / { compatible =3D "rockchip,rk3568"; =20 + sata0: sata@fc000000 { + compatible =3D "rockchip,rk3568-dwc-ahci", "snps,dwc-ahci"; + reg =3D <0 0xfc000000 0 0x1000>; + clocks =3D <&cru ACLK_SATA0>, <&cru CLK_SATA0_PMALIVE>, + <&cru CLK_SATA0_RXOOB>; + clock-names =3D "sata", "pmalive", "rxoob"; + interrupts =3D ; + phys =3D <&combphy0 PHY_TYPE_SATA>; + phy-names =3D "sata-phy"; + ports-implemented =3D <0x1>; + power-domains =3D <&power RK3568_PD_PIPE>; + status =3D "disabled"; + }; + pipe_phy_grf0: syscon@fdc70000 { compatible =3D "rockchip,rk3568-pipe-phy-grf", "syscon"; reg =3D <0x0 0xfdc70000 0x0 0x1000>; diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts= /rockchip/rk356x.dtsi index 7cdef800cb3c..264dd030e703 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -230,6 +230,34 @@ scmi_shmem: sram@0 { }; }; =20 + sata1: sata@fc400000 { + compatible =3D "rockchip,rk3568-dwc-ahci", "snps,dwc-ahci"; + reg =3D <0 0xfc400000 0 0x1000>; + clocks =3D <&cru ACLK_SATA1>, <&cru CLK_SATA1_PMALIVE>, + <&cru CLK_SATA1_RXOOB>; + clock-names =3D "sata", "pmalive", "rxoob"; + interrupts =3D ; + phys =3D <&combphy1 PHY_TYPE_SATA>; + phy-names =3D "sata-phy"; + ports-implemented =3D <0x1>; + power-domains =3D <&power RK3568_PD_PIPE>; + status =3D "disabled"; + }; + + sata2: sata@fc800000 { + compatible =3D "rockchip,rk3568-dwc-ahci", "snps,dwc-ahci"; + reg =3D <0 0xfc800000 0 0x1000>; + clocks =3D <&cru ACLK_SATA2>, <&cru CLK_SATA2_PMALIVE>, + <&cru CLK_SATA2_RXOOB>; + clock-names =3D "sata", "pmalive", "rxoob"; + interrupts =3D ; + phys =3D <&combphy2 PHY_TYPE_SATA>; + phy-names =3D "sata-phy"; + ports-implemented =3D <0x1>; + power-domains =3D <&power RK3568_PD_PIPE>; + status =3D "disabled"; + }; + gic: interrupt-controller@fd400000 { compatible =3D "arm,gic-v3"; reg =3D <0x0 0xfd400000 0 0x10000>, /* GICD */ --=20 2.25.1