From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Zhen Lei <thunder.leizhen@huawei.com>
Cc: Wei Xu <xuwei5@hisilicon.com>, Rob Herring <robh+dt@kernel.org>,
devicetree <devicetree@vger.kernel.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Kefeng Wang <wangkefeng.wang@huawei.com>,
Libin <huawei.libin@huawei.com>
Subject: Re: [PATCH v3 08/21] dt-bindings: arm: hisilicon: convert system controller bindings to json-schema
Date: Mon, 28 Sep 2020 10:44:53 +0100 [thread overview]
Message-ID: <20200928104453.00000d0d@Huawei.com> (raw)
In-Reply-To: <20200927062129.4573-9-thunder.leizhen@huawei.com>
On Sun, 27 Sep 2020 14:21:16 +0800
Zhen Lei <thunder.leizhen@huawei.com> wrote:
> Convert the Hisilicon system controller and its variants binding to DT
> schema format using json-schema. All of them are grouped into one yaml
> file, to help users understand differences and avoid repeated
> descriptions.
>
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Hi, one quick comment on indentation inline. Having received some fixes
for this from Rob recently it was still fresh in my mind!
> ---
> .../controller/hi3620/hisilicon,hi6220-sysctrl.txt | 19 ----
> .../controller/hipxx/hisilicon,hip01-sysctrl.txt | 19 ----
> .../arm/hisilicon/controller/hisilicon,sysctrl.txt | 25 -----
> .../hisilicon/controller/hisilicon,sysctrl.yaml | 115 +++++++++++++++++++++
> .../bindings/arm/hisilicon/hi3519-sysctrl.txt | 14 ---
> 5 files changed, 115 insertions(+), 77 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/hi3620/hisilicon,hi6220-sysctrl.txt
> delete mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/hipxx/hisilicon,hip01-sysctrl.txt
> delete mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/hisilicon,sysctrl.txt
> create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/hisilicon,sysctrl.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt
>
...
> diff --git a/Documentation/devicetree/bindings/arm/hisilicon/controller/hisilicon,sysctrl.yaml b/Documentation/devicetree/bindings/arm/hisilicon/controller/hisilicon,sysctrl.yaml
> new file mode 100644
> index 000000000000000..b65807574d92f95
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/hisilicon/controller/hisilicon,sysctrl.yaml
> @@ -0,0 +1,115 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/arm/hisilicon/controller/hisilicon,sysctrl.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Hisilicon system controller
> +
> +maintainers:
> + - Wei Xu <xuwei5@hisilicon.com>
> +
> +description: |
> + The Hisilicon system controller is used on many Hisilicon boards, it can be
> + used to assist the slave core startup, reboot the system, etc.
> +
> + There are some variants of the Hisilicon system controller, such as HiP01,
> + Hi3519, Hi6220 system controller, each of them is mostly compatible with the
> + Hisilicon system controller, but some same registers located at different
> + offset. In addition, the HiP01 system controller has some specific control
> + registers for HIP01 SoC family, such as slave core boot.
> +
> + The compatible names of each system controller are as follows:
> + Hisilicon system controller --> hisilicon,sysctrl
> + HiP01 system controller --> hisilicon,hip01-sysctrl
> + Hi6220 system controller --> hisilicon,hi6220-sysctrl
> + Hi3519 system controller --> hisilicon,hi3519-sysctrl
> +
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: hisilicon,hi6220-sysctrl
> + then:
> + required:
> + - '#clock-cells'
> +
> +properties:
> + compatible:
> + oneOf:
> + - items:
> + - const: hisilicon,sysctrl
I believe indentation is wrt to the keyword not the -
https://lore.kernel.org/lkml/20200812203618.2656699-1-robh@kernel.org/
so should be
- items:
- const: hisilicon,sysctrl.
> + - items:
> + - const: hisilicon,sysctrl
> + - const: syscon
> + - items:
> + - const: hisilicon,hip01-sysctrl
> + - const: hisilicon,sysctrl
> + - items:
> + - const: hisilicon,hi6220-sysctrl
> + - const: syscon
> + - items:
> + - const: hisilicon,hi3519-sysctrl
> + - const: syscon
> +
> + reg:
> + description: Register address and size
> + maxItems: 1
> +
> + smp-offset:
> + description: |
> + offset in sysctrl for notifying slave cpu booting
> + cpu 1, reg;
> + cpu 2, reg + 0x4;
> + cpu 3, reg + 0x8;
> + If reg value is not zero, cpun exit wfi and go
> + $ref: /schemas/types.yaml#/definitions/uint32
> +
> + resume-offset:
> + description: offset in sysctrl for notifying cpu0 when resume
> + $ref: /schemas/types.yaml#/definitions/uint32
> +
> + reboot-offset:
> + description: offset in sysctrl for system reboot
> + $ref: /schemas/types.yaml#/definitions/uint32
> +
> + '#clock-cells':
> + description: the number of cells occupied by one clock ID.
> + const: 1
> +
> +required:
> + - compatible
> + - reg
> +
> +examples:
> + - |
> + /* Hisilicon system controller */
> + system-controller@fc802000 {
> + compatible = "hisilicon,sysctrl";
> + reg = <0xfc802000 0x1000>;
> + smp-offset = <0x31c>;
> + resume-offset = <0x308>;
> + reboot-offset = <0x4>;
> + };
> +
> + /* HiP01 system controller */
> + system-controller@10000000 {
> + compatible = "hisilicon,hip01-sysctrl", "hisilicon,sysctrl";
> + reg = <0x10000000 0x1000>;
> + reboot-offset = <0x4>;
> + };
> +
> + /* Hi6220 system controller */
> + system-controller@f7030000 {
> + compatible = "hisilicon,hi6220-sysctrl", "syscon";
> + reg = <0xf7030000 0x2000>;
> + #clock-cells = <1>;
> + };
> +
> + /* Hi3519 system controller */
> + system-controller@12010000 {
> + compatible = "hisilicon,hi3519-sysctrl", "syscon";
> + reg = <0x12010000 0x1000>;
> + };
> +...
> diff --git a/Documentation/devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt b/Documentation/devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt
> deleted file mode 100644
> index 8defacc44dd5b9e..000000000000000
> --- a/Documentation/devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -* Hisilicon Hi3519 System Controller Block
> -
> -This bindings use the following binding:
> -Documentation/devicetree/bindings/mfd/syscon.yaml
> -
> -Required properties:
> -- compatible: "hisilicon,hi3519-sysctrl".
> -- reg: the register region of this block
> -
> -Examples:
> -sysctrl: system-controller@12010000 {
> - compatible = "hisilicon,hi3519-sysctrl", "syscon";
> - reg = <0x12010000 0x1000>;
> -};
next prev parent reply other threads:[~2020-09-28 9:46 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-27 6:21 [PATCH v3 00/21] add support for Hisilicon SD5203 SoC Zhen Lei
2020-09-27 6:21 ` [PATCH v3 01/21] ARM: dts: remove a unused compatible name in hip01-ca9x2.dts Zhen Lei
2020-09-27 6:21 ` [PATCH v3 02/21] dt-bindings: arm: hisilicon: split the dt-bindings of each controller into a separate file Zhen Lei
2020-09-28 12:37 ` Wei Xu
2020-09-28 12:51 ` Leizhen (ThunderTown)
2020-09-27 6:21 ` [PATCH v3 03/21] dt-bindings: arm: hisilicon: convert Hisilicon board/soc bindings to json-schema Zhen Lei
2020-09-28 12:05 ` Wei Xu
2020-09-28 12:14 ` Leizhen (ThunderTown)
2020-09-27 6:21 ` [PATCH v3 04/21] dt-bindings: arm: hisilicon: add binding for SD5203 SoC Zhen Lei
2020-09-27 6:21 ` [PATCH v3 05/21] ARM: hisi: add support " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 06/21] ARM: debug: add UART early console support for SD5203 Zhen Lei
2020-09-27 6:21 ` [PATCH v3 07/21] ARM: dts: add SD5203 dts Zhen Lei
2020-09-27 6:21 ` [PATCH v3 08/21] dt-bindings: arm: hisilicon: convert system controller bindings to json-schema Zhen Lei
2020-09-28 9:44 ` Jonathan Cameron [this message]
2020-09-28 10:59 ` Leizhen (ThunderTown)
2020-09-27 6:21 ` [PATCH v3 09/21] dt-bindings: arm: hisilicon: convert hisilicon,peri-subctrl " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 10/21] dt-bindings: arm: hisilicon: convert hisilicon,pcie-sas-subctrl " Zhen Lei
2020-09-28 9:46 ` [PATCH v3 10/21] dt-bindings: arm: hisilicon: convert hisilicon, pcie-sas-subctrl " Jonathan Cameron
2020-09-28 11:16 ` Leizhen (ThunderTown)
2020-09-27 6:21 ` [PATCH v3 11/21] dt-bindings: arm: hisilicon: convert hisilicon,cpuctrl " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 12/21] dt-bindings: arm: hisilicon: convert hisilicon,pctrl " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 13/21] dt-bindings: arm: hisilicon: convert hisilicon,hi3798cv200-perictrl " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 14/21] dt-bindings: arm: hisilicon: convert hisilicon,dsa-subctrl " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 15/21] dt-bindings: arm: hisilicon: convert hisilicon,hip04-fabric " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 16/21] dt-bindings: arm: hisilicon: convert hisilicon,hip04-bootwrapper " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 17/21] dt-bindings: arm: hisilicon: convert hisilicon,hi6220-aoctrl " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 18/21] dt-bindings: arm: hisilicon: convert hisilicon,hi6220-mediactrl " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 19/21] dt-bindings: arm: hisilicon: convert hisilicon,hi6220-pmctrl " Zhen Lei
2020-09-27 6:21 ` [PATCH v3 20/21] dt-bindings: arm: hisilicon: convert hisilicon,hi6220-sramctrl " Zhen Lei
2020-09-28 9:50 ` [PATCH v3 20/21] dt-bindings: arm: hisilicon: convert hisilicon, hi6220-sramctrl " Jonathan Cameron
2020-09-28 11:16 ` Leizhen (ThunderTown)
2020-09-27 6:21 ` [PATCH v3 21/21] dt-bindings: arm: hisilicon: convert LPC controller " Zhen Lei
2020-09-28 9:52 ` Jonathan Cameron
2020-09-28 11:19 ` Leizhen (ThunderTown)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928104453.00000d0d@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=devicetree@vger.kernel.org \
--cc=huawei.libin@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=thunder.leizhen@huawei.com \
--cc=wangkefeng.wang@huawei.com \
--cc=xuwei5@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).