Skip to content

Commit 1fdff40

Browse files
committed
Merge tag 'riscv-for-linus-5.18-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fix from Palmer Dabbelt: - Fix the RISC-V section of the generic CPU idle bindings to comply with the recently tightened DT schema. * tag 'riscv-for-linus-5.18-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: dt-bindings: Fix phandle-array issues in the idle-states bindings
2 parents 8467b0e + 2524257 commit 1fdff40

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

Documentation/devicetree/bindings/cpu/idle-states.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -719,8 +719,8 @@ examples:
719719
reg = <0x0>;
720720
riscv,isa = "rv64imafdc";
721721
mmu-type = "riscv,sv48";
722-
cpu-idle-states = <&CPU_RET_0_0 &CPU_NONRET_0_0
723-
&CLUSTER_RET_0 &CLUSTER_NONRET_0>;
722+
cpu-idle-states = <&CPU_RET_0_0>, <&CPU_NONRET_0_0>,
723+
<&CLUSTER_RET_0>, <&CLUSTER_NONRET_0>;
724724
725725
cpu_intc0: interrupt-controller {
726726
#interrupt-cells = <1>;
@@ -735,8 +735,8 @@ examples:
735735
reg = <0x1>;
736736
riscv,isa = "rv64imafdc";
737737
mmu-type = "riscv,sv48";
738-
cpu-idle-states = <&CPU_RET_0_0 &CPU_NONRET_0_0
739-
&CLUSTER_RET_0 &CLUSTER_NONRET_0>;
738+
cpu-idle-states = <&CPU_RET_0_0>, <&CPU_NONRET_0_0>,
739+
<&CLUSTER_RET_0>, <&CLUSTER_NONRET_0>;
740740
741741
cpu_intc1: interrupt-controller {
742742
#interrupt-cells = <1>;
@@ -751,8 +751,8 @@ examples:
751751
reg = <0x10>;
752752
riscv,isa = "rv64imafdc";
753753
mmu-type = "riscv,sv48";
754-
cpu-idle-states = <&CPU_RET_1_0 &CPU_NONRET_1_0
755-
&CLUSTER_RET_1 &CLUSTER_NONRET_1>;
754+
cpu-idle-states = <&CPU_RET_1_0>, <&CPU_NONRET_1_0>,
755+
<&CLUSTER_RET_1>, <&CLUSTER_NONRET_1>;
756756
757757
cpu_intc10: interrupt-controller {
758758
#interrupt-cells = <1>;
@@ -767,8 +767,8 @@ examples:
767767
reg = <0x11>;
768768
riscv,isa = "rv64imafdc";
769769
mmu-type = "riscv,sv48";
770-
cpu-idle-states = <&CPU_RET_1_0 &CPU_NONRET_1_0
771-
&CLUSTER_RET_1 &CLUSTER_NONRET_1>;
770+
cpu-idle-states = <&CPU_RET_1_0>, <&CPU_NONRET_1_0>,
771+
<&CLUSTER_RET_1>, <&CLUSTER_NONRET_1>;
772772
773773
cpu_intc11: interrupt-controller {
774774
#interrupt-cells = <1>;

Documentation/devicetree/bindings/riscv/cpus.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ properties:
101101

102102
cpu-idle-states:
103103
$ref: '/schemas/types.yaml#/definitions/phandle-array'
104+
items:
105+
maxItems: 1
104106
description: |
105107
List of phandles to idle state nodes supported
106108
by this hart (see ./idle-states.yaml).

0 commit comments

Comments
 (0)