From nobody Tue Jun 23 20:19:51 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 369FDC433F5 for ; Sun, 27 Feb 2022 18:28:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230410AbiB0S3R (ORCPT ); Sun, 27 Feb 2022 13:29:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230351AbiB0S3C (ORCPT ); Sun, 27 Feb 2022 13:29:02 -0500 Received: from mxout4.routing.net (mxout4.routing.net [IPv6:2a03:2900:1:a::9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C33296327; Sun, 27 Feb 2022 10:28:23 -0800 (PST) Received: from mxbox1.masterlogin.de (unknown [192.168.10.88]) by mxout4.routing.net (Postfix) with ESMTP id 59BC410077C; Sun, 27 Feb 2022 18:28:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1645986501; 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=MF0tLgmx2g6E4ZrnpnexpNhjlLSkSnH6Zfy8eS4SQV0=; b=rF33pGDMIdsMH9Qqrsy73+ubpclC9z7Nau538CU2nynr3NrGavczFVv9L7snUhvian8xq4 rZejAAXMSkwQdn8gzttkLzT9iuluC7mVLDRA63mY1qmfVKgQ4kJ4z18kn/CIo9GPCGTxOh Fyhi6o42o97qZPFxmMjuZrYZbyx7IuE= Received: from localhost.localdomain (fttx-pool-80.245.76.205.bambit.de [80.245.76.205]) by mxbox1.masterlogin.de (Postfix) with ESMTPSA id 9E924405AF; Sun, 27 Feb 2022 18:28:20 +0000 (UTC) From: Frank Wunderlich To: "devicetree @ vger . kernel . org Damien Le Moal" , Rob Herring , Krzysztof Kozlowski , Hans de Goede , Jens Axboe , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Heiko Stuebner , Peter Geis , Michael Riesch , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH v3 1/3] dt-bindings: Convert ahci-platform DT bindings to yaml Date: Sun, 27 Feb 2022 19:27:58 +0100 Message-Id: <20220227182800.275572-2-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182800.275572-1-linux@fw-web.de> References: <20220227182800.275572-1-linux@fw-web.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mail-ID: 8a7f4aef-73a8-4cc1-a58c-260611dd9f5c 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 --- v3: - add conversion to sata-series - fix some errors in dt_binding_check and dtbs_check - move to unevaluated properties =3D false --- imho all errors should be fixed in the dts not in the yaml... errors about the subitem requirement that was defined in txt but not fixed = some marvell dts some dts for Marvell SoC bring error 'phys' is a required property 'target-supply' is a required property problem is in arch/arm64/boot/dts/marvell/armada-cp11x.dtsi:331 here the sata-port@0 is defined, but not overridden with phy/target-supply = in any following dts =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D arch/arm64/boot/dts/broadcom/northstar2 ns2-svk.dt.yaml: ns2-xmc.dt.yaml: ahci@663f2000: $nodename:0: 'ahci@663f2000' does not match '^sata(@.*)?$' Unevaluated properties are not allowed ('reg-names', '#address-cells', '#size-cells' were unexpected) --- .../devicetree/bindings/ata/ahci-platform.txt | 79 ---------- .../bindings/ata/ahci-platform.yaml | 140 ++++++++++++++++++ 2 files changed, 140 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..cc246b312c59 --- /dev/null +++ b/Documentation/devicetree/bindings/ata/ahci-platform.yaml @@ -0,0 +1,140 @@ +# 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 + +properties: + compatible: + contains: + enum: + - brcm,iproc-ahci + - cavium,octeon-7130-ahci + - generic-ahci + - hisilicon,hisi-ahci + - ibm,476gtr-ahci + - marvell,armada-380-ahci + - marvell,armada-3700-ahci + - snps,dwc-ahci + - snps,spear-ahci + + reg: + maxItems: 1 + + clocks: + minItems: 1 + maxItems: 3 + + interrupts: + minItems: 1 + + ahci-supply: + description: + regulator for AHCI controller + + dma-coherent: + description: + Present if dma operations are coherent + + phy-supply: + description: + regulator for PHY power + + phys: + minItems: 1 + + phy-names: + minItems: 1 + + ports-implemented: + 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. + minItems: 1 + + resets: + minItems: 1 + + target-supply: + description: + regulator for SATA target power + +required: + - compatible + - reg + - interrupts + +patternProperties: + "^sata-port@[0-9]+$": + type: object + description: + Subnode with configuration of the Ports. + + properties: + reg: + maxItems: 1 + + phys: + minItems: 1 + + target-supply: + description: + regulator for SATA target power + + required: + - reg + + anyOf: + - required: [ phys ] + - required: [ target-supply ] + +allOf: +- $ref: "sata-common.yaml#" + +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-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>; + }; + }; --=20 2.25.1 From nobody Tue Jun 23 20:19:51 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 5171BC433EF for ; Sun, 27 Feb 2022 18:28:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230394AbiB0S3F (ORCPT ); Sun, 27 Feb 2022 13:29:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbiB0S3C (ORCPT ); Sun, 27 Feb 2022 13:29:02 -0500 Received: from mxout3.routing.net (mxout3.routing.net [IPv6:2a03:2900:1:a::8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D431763CF; Sun, 27 Feb 2022 10:28:23 -0800 (PST) Received: from mxbox1.masterlogin.de (unknown [192.168.10.88]) by mxout3.routing.net (Postfix) with ESMTP id 055AB604DF; Sun, 27 Feb 2022 18:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1645986502; 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=oIQHQqWpYDTR34+UZ2EQU8OCgFjoZwuBhLuDbXdN8Pw=; b=NWQ6DYLTPInxte0uI9CJeESL+8IeAVbmDBvKvNpDqpewD3fJO8kj0Mbl+jzfMwovDc5hdz DTo8yONJT88/IDSfnPyuGtnPp2RQb1OTsuElCixo3IRIA2HMmkFFc+fTlbbkNpcRn5uLjz 2I1mA53Je4Ozv81vfMb3zgE8o+g3Nd0= Received: from localhost.localdomain (fttx-pool-80.245.76.205.bambit.de [80.245.76.205]) by mxbox1.masterlogin.de (Postfix) with ESMTPSA id 546444054D; Sun, 27 Feb 2022 18:28:21 +0000 (UTC) From: Frank Wunderlich To: "devicetree @ vger . kernel . org Damien Le Moal" , Rob Herring , Krzysztof Kozlowski , Hans de Goede , Jens Axboe , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Heiko Stuebner , Peter Geis , Michael Riesch , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH v3 2/3] dt-bindings: Add power-domains property to ahci-platform Date: Sun, 27 Feb 2022 19:27:59 +0100 Message-Id: <20220227182800.275572-3-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182800.275572-1-linux@fw-web.de> References: <20220227182800.275572-1-linux@fw-web.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mail-ID: f4cced9d-11f3-4d4c-a033-595f9377fcc2 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 --- 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 cc246b312c59..cc3710fe4fd4 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.yaml +++ b/Documentation/devicetree/bindings/ata/ahci-platform.yaml @@ -67,6 +67,9 @@ properties: some embedded SoCs. minItems: 1 =20 + power-domains: + maxItems: 1 + resets: minItems: 1 =20 --=20 2.25.1 From nobody Tue Jun 23 20:19:51 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 CAF48C433EF for ; Sun, 27 Feb 2022 18:28:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230415AbiB0S3J (ORCPT ); Sun, 27 Feb 2022 13:29:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230270AbiB0S3C (ORCPT ); Sun, 27 Feb 2022 13:29:02 -0500 Received: from mxout1.routing.net (mxout1.routing.net [IPv6:2a03:2900:1:a::a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9345463EA; Sun, 27 Feb 2022 10:28:24 -0800 (PST) Received: from mxbox1.masterlogin.de (unknown [192.168.10.88]) by mxout1.routing.net (Postfix) with ESMTP id A7DBB4013B; Sun, 27 Feb 2022 18:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1645986502; 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=0xLcegYYoVjPeAY4Eq9m0ZZ+KHV0zGkTbYObM28HdIw=; b=r5y1cZtFYgJCq8Ynl9cOib4u03jqoHGOxha2dubGvYEYy6hloM32ODKNuFJZh310rN7VFo BrppjbdWXFPK8Dz1V7NjUeI6cH0Wbyw612un5SN2jPD6TsSAaOYQxMiGgwuKzTExcSVVmV g6r+KRSSDzCAFASb9EQoNhhY+n8/9bQ= Received: from localhost.localdomain (fttx-pool-80.245.76.205.bambit.de [80.245.76.205]) by mxbox1.masterlogin.de (Postfix) with ESMTPSA id EEDDA405AF; Sun, 27 Feb 2022 18:28:21 +0000 (UTC) From: Frank Wunderlich To: "devicetree @ vger . kernel . org Damien Le Moal" , Rob Herring , Krzysztof Kozlowski , Hans de Goede , Jens Axboe , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Heiko Stuebner , Peter Geis , Michael Riesch , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH v3 3/3] arm64: dts: rockchip: Add sata nodes to rk356x Date: Sun, 27 Feb 2022 19:28:00 +0100 Message-Id: <20220227182800.275572-4-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182800.275572-1-linux@fw-web.de> References: <20220227182800.275572-1-linux@fw-web.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mail-ID: fc5c7eba-beac-4129-b3e2-d00c639c3d91 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 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 | 26 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts= /rockchip/rk3568.dtsi index 5b0f528d6818..2a2f65899d47 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -8,6 +8,19 @@ / { compatible =3D "rockchip,rk3568"; =20 + sata0: sata@fc000000 { + compatible =3D "snps,dwc-ahci"; + reg =3D <0 0xfc000000 0 0x1000>; + clocks =3D <&cru ACLK_SATA0>, <&cru CLK_SATA0_PMALIVE>, + <&cru CLK_SATA0_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>; @@ -114,3 +127,4 @@ power-domain@RK3568_PD_PIPE { #power-domain-cells =3D <0>; }; }; + diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts= /rockchip/rk356x.dtsi index 7cdef800cb3c..484c5ace718a 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -230,6 +230,32 @@ scmi_shmem: sram@0 { }; }; =20 + sata1: sata@fc400000 { + compatible =3D "snps,dwc-ahci"; + reg =3D <0 0xfc400000 0 0x1000>; + clocks =3D <&cru ACLK_SATA1>, <&cru CLK_SATA1_PMALIVE>, + <&cru CLK_SATA1_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 "snps,dwc-ahci"; + reg =3D <0 0xfc800000 0 0x1000>; + clocks =3D <&cru ACLK_SATA2>, <&cru CLK_SATA2_PMALIVE>, + <&cru CLK_SATA2_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