[RFC,v2,3/5] dt-bindings: clock: merge all hisilicon clock bindings to hisilicon,clock-reset-generator
Commit Message
From: Yang Xiwen <forbidden405@outlook.com>
We don't need so many separated and duplicated dt-binding files. Merge
them all and convert them to YAML.
Signed-off-by: Yang Xiwen <forbidden405@outlook.com>
---
.../devicetree/bindings/clock/hi3660-clock.txt | 47 -------
.../devicetree/bindings/clock/hi3670-clock.txt | 43 -------
.../devicetree/bindings/clock/hi6220-clock.txt | 52 --------
.../devicetree/bindings/clock/hisi-crg.txt | 50 --------
.../clock/hisilicon,clock-reset-generator.yaml | 139 +++++++++++++++++++++
.../clock/hisilicon,hi3559av100-clock.yaml | 59 ---------
6 files changed, 139 insertions(+), 251 deletions(-)
Comments
On 17/02/2024 13:52, Yang Xiwen via B4 Relay wrote:
> From: Yang Xiwen <forbidden405@outlook.com>
>
> We don't need so many separated and duplicated dt-binding files. Merge
> them all and convert them to YAML.
What was exactly duplicated? You created unspecific, lose binding...
Why this is RFC? RFC means we should not review.
>
> Signed-off-by: Yang Xiwen <forbidden405@outlook.com>
> ---
> .../devicetree/bindings/clock/hi3660-clock.txt | 47 -------
> .../devicetree/bindings/clock/hi3670-clock.txt | 43 -------
> .../devicetree/bindings/clock/hi6220-clock.txt | 52 --------
> .../devicetree/bindings/clock/hisi-crg.txt | 50 --------
> .../clock/hisilicon,clock-reset-generator.yaml | 139 +++++++++++++++++++++
> .../clock/hisilicon,hi3559av100-clock.yaml | 59 ---------
> 6 files changed, 139 insertions(+), 251 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/clock/hisilicon,clock-reset-generator.yaml b/Documentation/devicetree/bindings/clock/hisilicon,clock-reset-generator.yaml
> new file mode 100644
> index 000000000000..d37cd892473e
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/clock/hisilicon,clock-reset-generator.yaml
> @@ -0,0 +1,139 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/clock/hisilicon,clock-reset-generator.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Hisilicon SOC Clock and Reset Generator (CRG) module
> +
> +maintainers:
> + - Yang Xiwen <forbidden405@foxmail.com>
> +
> +description: |
> + Hisilicon SOC clock control module which supports the clocks, resets and
> + power domains on various SoCs.
> +
> +properties:
> + compatible:
> + minItems: 1
No, it does not work like that. Compatibles are fixed, not fluid. It's
quite a hint that your merging is wrong approach.
> + items:
> + - enum:
> + - hisilicon,hi3559av100-clock
> + - hisilicon,hi3559av100-shub-clock
> + - hisilicon,hi3660-crgctrl
> + - hisilicon,hi3660-pctrl
> + - hisilicon,hi3660-pmuctrl
> + - hisilicon,hi3660-sctrl
> + - hisilicon,hi3660-iomcu
> + - hisilicon,hi3660-stub-clk
> + - hisilicon,hi3670-crgctrl
> + - hisilicon,hi3670-pctrl
> + - hisilicon,hi3670-pmuctrl
> + - hisilicon,hi3670-sctrl
> + - hisilicon,hi3670-iomcu
> + - hisilicon,hi3670-media1-crg
> + - hisilicon,hi3670-media2-crg
> + - hisilicon,hi6220-acpu-sctrl
> + - hisilicon,hi6220-aoctrl
> + - hisilicon,hi6220-sysctrl
> + - hisilicon,hi6220-mediactrl
> + - hisilicon,hi6220-pmctrl
> + - hisilicon,hi6220-stub-clk
> + - hisilicon,hi3516cv300-crg
> + - hisilicon,hi3516cv300-sysctrl
> + - hisilicon,hi3519-crg
> + - hisilicon,hi3798cv200-crg
> + - hisilicon,hi3798cv200-sysctrl
> + - const: syscon
> + - const: simple-mfd
> +
> + reg:
> + maxItems: 1
> +
> + '#clock-cells':
> + const: 1
> +
> + '#reset-cells':
> + enum: [1, 2]
> + description: |
Previous bindings has only 2. Your patch is difficult to review and
understand.
> + First cell is reset request register offset.
> + Second cell is bit offset in reset request register.
All of these are reset controllers? I doubt.
> +
> + '#address-cells':
> + const: 1
> +
> + '#size-cells':
> + const: 1
All of these have children? No, sorry, but this merging does not make
any sense.
> +
> + mboxes:
> + $ref: /schemas/types.yaml#/definitions/phandle-array
> + description: |
> + Phandle to the mailbox for sending msg to MCU
> + (See ../mailbox/hisilicon,hi3660-mailbox.txt for more info)
> +
> + mbox-names:
> + $ref: /schemas/types.yaml#/definitions/string-array
> + description: |
> + Names of the mailboxes.
> +
> + hisilicon,hi6220-clk-sram:
> + $ref: /schemas/types.yaml#/definitions/phandle
> + description: |
> + Phandle to the syscon managing the SoC internal sram
> + the driver needs using the sram to pass parameters for frequency change.
> +
> + reset-controller:
> + type: object
> + description: |
> + Reset controller for Hi3798CV200 GMAC module
> +
> +required:
> + - compatible
> + - '#clock-cells'
> +
> +allOf:
> + - if:
> + properties:
> + compatible:
> + not:
> + contains:
> + enum:
> + - hisilicon,hi3798cv200-crg
> + then:
> + properties:
> + reset-controller: false
> + - oneOf:
> + - required:
> + - hisilicon,hi6220-clk-sram
> + - required:
> + - reg
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/clock/hi3559av100-clock.h>
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
> +
> + clock-controller@12010000 {
> + compatible = "hisilicon,hi3559av100-clock";
> + #clock-cells = <1>;
> + #reset-cells = <2>;
> + reg = <0x0 0x12010000 0x0 0x10000>;
> + };
> + };
> + - |
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + #include <dt-bindings/clock/hi3660-clock.h>
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
> +
> + clock-controller@fff35000 {
> + compatible = "hisilicon,hi3660-crgctrl", "syscon";
> + reg = <0x0 0xfff35000 0x0 0x1000>;
> + #clock-cells = <1>;
> + };
> + };
> diff --git a/Documentation/devicetree/bindings/clock/hisilicon,hi3559av100-clock.yaml b/Documentation/devicetree/bindings/clock/hisilicon,hi3559av100-clock.yaml
> deleted file mode 100644
> index 3ceb29cec704..000000000000
> --- a/Documentation/devicetree/bindings/clock/hisilicon,hi3559av100-clock.yaml
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> -%YAML 1.2
> ----
> -$id: http://devicetree.org/schemas/clock/hisilicon,hi3559av100-clock.yaml#
> -$schema: http://devicetree.org/meta-schemas/core.yaml#
NAK, not related patch.
Please split all your patches into logical chunks.
Please read submitting-patches *BEFORE SENDING* further submissions.
Best regards,
Krzysztof
On 2/20/2024 6:14 PM, Krzysztof Kozlowski wrote:
> On 17/02/2024 13:52, Yang Xiwen via B4 Relay wrote:
>> From: Yang Xiwen <forbidden405@outlook.com>
>>
>> We don't need so many separated and duplicated dt-binding files. Merge
>> them all and convert them to YAML.
> What was exactly duplicated? You created unspecific, lose binding...
You can take at the drivers at drivers/clk/hisilicon. All of them use
the same sets of APIs to register a few clocks and resets. That's why i
think they should be merged.
>
> Why this is RFC? RFC means we should not review.
>
>> Signed-off-by: Yang Xiwen <forbidden405@outlook.com>
>> ---
>> .../devicetree/bindings/clock/hi3660-clock.txt | 47 -------
>> .../devicetree/bindings/clock/hi3670-clock.txt | 43 -------
>> .../devicetree/bindings/clock/hi6220-clock.txt | 52 --------
>> .../devicetree/bindings/clock/hisi-crg.txt | 50 --------
>> .../clock/hisilicon,clock-reset-generator.yaml | 139 +++++++++++++++++++++
>> .../clock/hisilicon,hi3559av100-clock.yaml | 59 ---------
>> 6 files changed, 139 insertions(+), 251 deletions(-)
>>
>
>> diff --git a/Documentation/devicetree/bindings/clock/hisilicon,clock-reset-generator.yaml b/Documentation/devicetree/bindings/clock/hisilicon,clock-reset-generator.yaml
>> new file mode 100644
>> index 000000000000..d37cd892473e
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/clock/hisilicon,clock-reset-generator.yaml
>> @@ -0,0 +1,139 @@
>> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/clock/hisilicon,clock-reset-generator.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Hisilicon SOC Clock and Reset Generator (CRG) module
>> +
>> +maintainers:
>> + - Yang Xiwen <forbidden405@foxmail.com>
>> +
>> +description: |
>> + Hisilicon SOC clock control module which supports the clocks, resets and
>> + power domains on various SoCs.
>> +
>> +properties:
>> + compatible:
>> + minItems: 1
> No, it does not work like that. Compatibles are fixed, not fluid. It's
> quite a hint that your merging is wrong approach.
>
>
>> + items:
>> + - enum:
>> + - hisilicon,hi3559av100-clock
>> + - hisilicon,hi3559av100-shub-clock
>> + - hisilicon,hi3660-crgctrl
>> + - hisilicon,hi3660-pctrl
>> + - hisilicon,hi3660-pmuctrl
>> + - hisilicon,hi3660-sctrl
>> + - hisilicon,hi3660-iomcu
>> + - hisilicon,hi3660-stub-clk
>> + - hisilicon,hi3670-crgctrl
>> + - hisilicon,hi3670-pctrl
>> + - hisilicon,hi3670-pmuctrl
>> + - hisilicon,hi3670-sctrl
>> + - hisilicon,hi3670-iomcu
>> + - hisilicon,hi3670-media1-crg
>> + - hisilicon,hi3670-media2-crg
>> + - hisilicon,hi6220-acpu-sctrl
>> + - hisilicon,hi6220-aoctrl
>> + - hisilicon,hi6220-sysctrl
>> + - hisilicon,hi6220-mediactrl
>> + - hisilicon,hi6220-pmctrl
>> + - hisilicon,hi6220-stub-clk
>> + - hisilicon,hi3516cv300-crg
>> + - hisilicon,hi3516cv300-sysctrl
>> + - hisilicon,hi3519-crg
>> + - hisilicon,hi3798cv200-crg
>> + - hisilicon,hi3798cv200-sysctrl
>> + - const: syscon
>> + - const: simple-mfd
>> +
>> + reg:
>> + maxItems: 1
>> +
>> + '#clock-cells':
>> + const: 1
>> +
>> + '#reset-cells':
>> + enum: [1, 2]
>> + description: |
> Previous bindings has only 2. Your patch is difficult to review and
> understand.
>
>> + First cell is reset request register offset.
>> + Second cell is bit offset in reset request register.
> All of these are reset controllers? I doubt.
>
>> +
>> + '#address-cells':
>> + const: 1
>> +
>> + '#size-cells':
>> + const: 1
> All of these have children? No, sorry, but this merging does not make
> any sense.
>
>> +
>> + mboxes:
>> + $ref: /schemas/types.yaml#/definitions/phandle-array
>> + description: |
>> + Phandle to the mailbox for sending msg to MCU
>> + (See ../mailbox/hisilicon,hi3660-mailbox.txt for more info)
>> +
>> + mbox-names:
>> + $ref: /schemas/types.yaml#/definitions/string-array
>> + description: |
>> + Names of the mailboxes.
>> +
>> + hisilicon,hi6220-clk-sram:
>> + $ref: /schemas/types.yaml#/definitions/phandle
>> + description: |
>> + Phandle to the syscon managing the SoC internal sram
>> + the driver needs using the sram to pass parameters for frequency change.
>> +
>> + reset-controller:
>> + type: object
>> + description: |
>> + Reset controller for Hi3798CV200 GMAC module
>> +
>> +required:
>> + - compatible
>> + - '#clock-cells'
>> +
>> +allOf:
>> + - if:
>> + properties:
>> + compatible:
>> + not:
>> + contains:
>> + enum:
>> + - hisilicon,hi3798cv200-crg
>> + then:
>> + properties:
>> + reset-controller: false
>> + - oneOf:
>> + - required:
>> + - hisilicon,hi6220-clk-sram
>> + - required:
>> + - reg
>> +
>> +additionalProperties: false
>> +
>> +examples:
>> + - |
>> + #include <dt-bindings/clock/hi3559av100-clock.h>
>> + soc {
>> + #address-cells = <2>;
>> + #size-cells = <2>;
>> +
>> + clock-controller@12010000 {
>> + compatible = "hisilicon,hi3559av100-clock";
>> + #clock-cells = <1>;
>> + #reset-cells = <2>;
>> + reg = <0x0 0x12010000 0x0 0x10000>;
>> + };
>> + };
>> + - |
>> + #include <dt-bindings/interrupt-controller/arm-gic.h>
>> + #include <dt-bindings/clock/hi3660-clock.h>
>> + soc {
>> + #address-cells = <2>;
>> + #size-cells = <2>;
>> +
>> + clock-controller@fff35000 {
>> + compatible = "hisilicon,hi3660-crgctrl", "syscon";
>> + reg = <0x0 0xfff35000 0x0 0x1000>;
>> + #clock-cells = <1>;
>> + };
>> + };
>> diff --git a/Documentation/devicetree/bindings/clock/hisilicon,hi3559av100-clock.yaml b/Documentation/devicetree/bindings/clock/hisilicon,hi3559av100-clock.yaml
>> deleted file mode 100644
>> index 3ceb29cec704..000000000000
>> --- a/Documentation/devicetree/bindings/clock/hisilicon,hi3559av100-clock.yaml
>> +++ /dev/null
>> @@ -1,59 +0,0 @@
>> -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>> -%YAML 1.2
>> ----
>> -$id: http://devicetree.org/schemas/clock/hisilicon,hi3559av100-clock.yaml#
>> -$schema: http://devicetree.org/meta-schemas/core.yaml#
> NAK, not related patch.
Okay. I'll revert most of the changes here. Maybe i should only convert
hisi-crg.txt to yaml. That's what i really cares.
>
> Please split all your patches into logical chunks.
>
> Please read submitting-patches *BEFORE SENDING* further submissions.
>
> Best regards,
> Krzysztof
>
On 20/02/2024 11:52, Yang Xiwen wrote:
> On 2/20/2024 6:14 PM, Krzysztof Kozlowski wrote:
>> On 17/02/2024 13:52, Yang Xiwen via B4 Relay wrote:
>>> From: Yang Xiwen <forbidden405@outlook.com>
>>>
>>> We don't need so many separated and duplicated dt-binding files. Merge
>>> them all and convert them to YAML.
>> What was exactly duplicated? You created unspecific, lose binding...
>
> You can take at the drivers at drivers/clk/hisilicon. All of them use
> the same sets of APIs to register a few clocks and resets. That's why i
> think they should be merged.
Drivers don't really matter for bindings. That's not a valid argument.
Creating invalid combinations and lose bindings is not the answer to
duplication of few parts.
Best regards,
Krzysztof
deleted file mode 100644
@@ -1,47 +0,0 @@
-* Hisilicon Hi3660 Clock Controller
-
-The Hi3660 clock controller generates and supplies clock to various
-controllers within the Hi3660 SoC.
-
-Required Properties:
-
-- compatible: the compatible should be one of the following strings to
- indicate the clock controller functionality.
-
- - "hisilicon,hi3660-crgctrl"
- - "hisilicon,hi3660-pctrl"
- - "hisilicon,hi3660-pmuctrl"
- - "hisilicon,hi3660-sctrl"
- - "hisilicon,hi3660-iomcu"
- - "hisilicon,hi3660-stub-clk"
-
-- reg: physical base address of the controller and length of memory mapped
- region.
-
-- #clock-cells: should be 1.
-
-Optional Properties:
-
-- mboxes: Phandle to the mailbox for sending message to MCU.
- (See: ../mailbox/hisilicon,hi3660-mailbox.txt for more info)
-
-Each clock is assigned an identifier and client nodes use this identifier
-to specify the clock which they consume.
-
-All these identifier could be found in <dt-bindings/clock/hi3660-clock.h>.
-
-Examples:
- crg_ctrl: clock-controller@fff35000 {
- compatible = "hisilicon,hi3660-crgctrl", "syscon";
- reg = <0x0 0xfff35000 0x0 0x1000>;
- #clock-cells = <1>;
- };
-
- uart0: serial@fdf02000 {
- compatible = "arm,pl011", "arm,primecell";
- reg = <0x0 0xfdf02000 0x0 0x1000>;
- interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&crg_ctrl HI3660_CLK_MUX_UART0>,
- <&crg_ctrl HI3660_PCLK>;
- clock-names = "uartclk", "apb_pclk";
- };
deleted file mode 100644
@@ -1,43 +0,0 @@
-* Hisilicon Hi3670 Clock Controller
-
-The Hi3670 clock controller generates and supplies clock to various
-controllers within the Hi3670 SoC.
-
-Required Properties:
-
-- compatible: the compatible should be one of the following strings to
- indicate the clock controller functionality.
-
- - "hisilicon,hi3670-crgctrl"
- - "hisilicon,hi3670-pctrl"
- - "hisilicon,hi3670-pmuctrl"
- - "hisilicon,hi3670-sctrl"
- - "hisilicon,hi3670-iomcu"
- - "hisilicon,hi3670-media1-crg"
- - "hisilicon,hi3670-media2-crg"
-
-- reg: physical base address of the controller and length of memory mapped
- region.
-
-- #clock-cells: should be 1.
-
-Each clock is assigned an identifier and client nodes use this identifier
-to specify the clock which they consume.
-
-All these identifier could be found in <dt-bindings/clock/hi3670-clock.h>.
-
-Examples:
- crg_ctrl: clock-controller@fff35000 {
- compatible = "hisilicon,hi3670-crgctrl", "syscon";
- reg = <0x0 0xfff35000 0x0 0x1000>;
- #clock-cells = <1>;
- };
-
- uart0: serial@fdf02000 {
- compatible = "arm,pl011", "arm,primecell";
- reg = <0x0 0xfdf02000 0x0 0x1000>;
- interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&crg_ctrl HI3670_CLK_GATE_UART0>,
- <&crg_ctrl HI3670_PCLK>;
- clock-names = "uartclk", "apb_pclk";
- };
deleted file mode 100644
@@ -1,52 +0,0 @@
-* Hisilicon Hi6220 Clock Controller
-
-Clock control registers reside in different Hi6220 system controllers,
-please refer the following document to know more about the binding rules
-for these system controllers:
-
-Documentation/devicetree/bindings/arm/hisilicon/hisilicon.yaml
-
-Required Properties:
-
-- compatible: the compatible should be one of the following strings to
- indicate the clock controller functionality.
-
- - "hisilicon,hi6220-acpu-sctrl"
- - "hisilicon,hi6220-aoctrl"
- - "hisilicon,hi6220-sysctrl"
- - "hisilicon,hi6220-mediactrl"
- - "hisilicon,hi6220-pmctrl"
- - "hisilicon,hi6220-stub-clk"
-
-- reg: physical base address of the controller and length of memory mapped
- region.
-
-- #clock-cells: should be 1.
-
-Optional Properties:
-
-- hisilicon,hi6220-clk-sram: phandle to the syscon managing the SoC internal sram;
- the driver need use the sram to pass parameters for frequency change.
-
-- mboxes: use the label reference for the mailbox as the first parameter, the
- second parameter is the channel number.
-
-Example 1:
- sys_ctrl: sys_ctrl@f7030000 {
- compatible = "hisilicon,hi6220-sysctrl", "syscon";
- reg = <0x0 0xf7030000 0x0 0x2000>;
- #clock-cells = <1>;
- };
-
-Example 2:
- stub_clock: stub_clock {
- compatible = "hisilicon,hi6220-stub-clk";
- hisilicon,hi6220-clk-sram = <&sram>;
- #clock-cells = <1>;
- mboxes = <&mailbox 1>;
- };
-
-Each clock is assigned an identifier and client nodes use this identifier
-to specify the clock which they consume.
-
-All these identifier could be found in <dt-bindings/clock/hi6220-clock.h>.
deleted file mode 100644
@@ -1,50 +0,0 @@
-* HiSilicon Clock and Reset Generator(CRG)
-
-The CRG module provides clock and reset signals to various
-modules within the SoC.
-
-This binding uses the following bindings:
- Documentation/devicetree/bindings/clock/clock-bindings.txt
- Documentation/devicetree/bindings/reset/reset.txt
-
-Required Properties:
-
-- compatible: should be one of the following.
- - "hisilicon,hi3516cv300-crg"
- - "hisilicon,hi3516cv300-sysctrl"
- - "hisilicon,hi3519-crg"
- - "hisilicon,hi3798cv200-crg"
- - "hisilicon,hi3798cv200-sysctrl"
-
-- reg: physical base address of the controller and length of memory mapped
- region.
-
-- #clock-cells: should be 1.
-
-Each clock is assigned an identifier and client nodes use this identifier
-to specify the clock which they consume.
-
-All these identifier could be found in <dt-bindings/clock/hi3519-clock.h>.
-
-- #reset-cells: should be 2.
-
-A reset signal can be controlled by writing a bit register in the CRG module.
-The reset specifier consists of two cells. The first cell represents the
-register offset relative to the base address. The second cell represents the
-bit index in the register.
-
-Example: CRG nodes
-CRG: clock-reset-controller@12010000 {
- compatible = "hisilicon,hi3519-crg";
- reg = <0x12010000 0x10000>;
- #clock-cells = <1>;
- #reset-cells = <2>;
-};
-
-Example: consumer nodes
-i2c0: i2c@12110000 {
- compatible = "hisilicon,hi3519-i2c";
- reg = <0x12110000 0x1000>;
- clocks = <&CRG HI3519_I2C0_RST>;
- resets = <&CRG 0xe4 0>;
-};
new file mode 100644
@@ -0,0 +1,139 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/hisilicon,clock-reset-generator.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Hisilicon SOC Clock and Reset Generator (CRG) module
+
+maintainers:
+ - Yang Xiwen <forbidden405@foxmail.com>
+
+description: |
+ Hisilicon SOC clock control module which supports the clocks, resets and
+ power domains on various SoCs.
+
+properties:
+ compatible:
+ minItems: 1
+ items:
+ - enum:
+ - hisilicon,hi3559av100-clock
+ - hisilicon,hi3559av100-shub-clock
+ - hisilicon,hi3660-crgctrl
+ - hisilicon,hi3660-pctrl
+ - hisilicon,hi3660-pmuctrl
+ - hisilicon,hi3660-sctrl
+ - hisilicon,hi3660-iomcu
+ - hisilicon,hi3660-stub-clk
+ - hisilicon,hi3670-crgctrl
+ - hisilicon,hi3670-pctrl
+ - hisilicon,hi3670-pmuctrl
+ - hisilicon,hi3670-sctrl
+ - hisilicon,hi3670-iomcu
+ - hisilicon,hi3670-media1-crg
+ - hisilicon,hi3670-media2-crg
+ - hisilicon,hi6220-acpu-sctrl
+ - hisilicon,hi6220-aoctrl
+ - hisilicon,hi6220-sysctrl
+ - hisilicon,hi6220-mediactrl
+ - hisilicon,hi6220-pmctrl
+ - hisilicon,hi6220-stub-clk
+ - hisilicon,hi3516cv300-crg
+ - hisilicon,hi3516cv300-sysctrl
+ - hisilicon,hi3519-crg
+ - hisilicon,hi3798cv200-crg
+ - hisilicon,hi3798cv200-sysctrl
+ - const: syscon
+ - const: simple-mfd
+
+ reg:
+ maxItems: 1
+
+ '#clock-cells':
+ const: 1
+
+ '#reset-cells':
+ enum: [1, 2]
+ description: |
+ First cell is reset request register offset.
+ Second cell is bit offset in reset request register.
+
+ '#address-cells':
+ const: 1
+
+ '#size-cells':
+ const: 1
+
+ mboxes:
+ $ref: /schemas/types.yaml#/definitions/phandle-array
+ description: |
+ Phandle to the mailbox for sending msg to MCU
+ (See ../mailbox/hisilicon,hi3660-mailbox.txt for more info)
+
+ mbox-names:
+ $ref: /schemas/types.yaml#/definitions/string-array
+ description: |
+ Names of the mailboxes.
+
+ hisilicon,hi6220-clk-sram:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description: |
+ Phandle to the syscon managing the SoC internal sram
+ the driver needs using the sram to pass parameters for frequency change.
+
+ reset-controller:
+ type: object
+ description: |
+ Reset controller for Hi3798CV200 GMAC module
+
+required:
+ - compatible
+ - '#clock-cells'
+
+allOf:
+ - if:
+ properties:
+ compatible:
+ not:
+ contains:
+ enum:
+ - hisilicon,hi3798cv200-crg
+ then:
+ properties:
+ reset-controller: false
+ - oneOf:
+ - required:
+ - hisilicon,hi6220-clk-sram
+ - required:
+ - reg
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/hi3559av100-clock.h>
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ clock-controller@12010000 {
+ compatible = "hisilicon,hi3559av100-clock";
+ #clock-cells = <1>;
+ #reset-cells = <2>;
+ reg = <0x0 0x12010000 0x0 0x10000>;
+ };
+ };
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/hi3660-clock.h>
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ clock-controller@fff35000 {
+ compatible = "hisilicon,hi3660-crgctrl", "syscon";
+ reg = <0x0 0xfff35000 0x0 0x1000>;
+ #clock-cells = <1>;
+ };
+ };
deleted file mode 100644
@@ -1,59 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/clock/hisilicon,hi3559av100-clock.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: Hisilicon SOC Clock for HI3559AV100
-
-maintainers:
- - Dongjiu Geng <gengdongjiu@huawei.com>
-
-description: |
- Hisilicon SOC clock control module which supports the clocks, resets and
- power domains on HI3559AV100.
-
- See also:
- dt-bindings/clock/hi3559av100-clock.h
-
-properties:
- compatible:
- enum:
- - hisilicon,hi3559av100-clock
- - hisilicon,hi3559av100-shub-clock
-
- reg:
- minItems: 1
- maxItems: 2
-
- '#clock-cells':
- const: 1
-
- '#reset-cells':
- const: 2
- description: |
- First cell is reset request register offset.
- Second cell is bit offset in reset request register.
-
-required:
- - compatible
- - reg
- - '#clock-cells'
- - '#reset-cells'
-
-additionalProperties: false
-
-examples:
- - |
- soc {
- #address-cells = <2>;
- #size-cells = <2>;
-
- clock-controller@12010000 {
- compatible = "hisilicon,hi3559av100-clock";
- #clock-cells = <1>;
- #reset-cells = <2>;
- reg = <0x0 0x12010000 0x0 0x10000>;
- };
- };
-...