Skip to content

Commit 4bd5b4c

Browse files
committed
Merge tag 'riscv-dt-fixes-for-v6.8-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes
RISC-V Devicetree fixes for v6.8-rc6 Two fixes for W=2 issues in devicetrees, which should constitute fixes for all reasonable-to-fix W=2 problems on RISC-V. The others are caused by standard USB and MMC property names containing underscores that are not likely to ever change. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> * tag 'riscv-dt-fixes-for-v6.8-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: riscv: dts: sifive: add missing #interrupt-cells to pmic riscv: dts: starfive: replace underscores in node names Link: https://lore.kernel.org/r/20240221-foil-glade-09dbf1aa3fe2@spud Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents fe514e1 + ce6b6d1 commit 4bd5b4c

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
interrupt-parent = <&gpio>;
124124
interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
125125
interrupt-controller;
126+
#interrupt-cells = <2>;
126127

127128
onkey {
128129
compatible = "dlg,da9063-onkey";

arch/riscv/boot/dts/starfive/jh7100.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@
9696
thermal-sensors = <&sfctemp>;
9797

9898
trips {
99-
cpu_alert0 {
99+
cpu-alert0 {
100100
/* milliCelsius */
101101
temperature = <75000>;
102102
hysteresis = <2000>;
103103
type = "passive";
104104
};
105105

106-
cpu_crit {
106+
cpu-crit {
107107
/* milliCelsius */
108108
temperature = <90000>;
109109
hysteresis = <2000>;
@@ -113,28 +113,28 @@
113113
};
114114
};
115115

116-
osc_sys: osc_sys {
116+
osc_sys: osc-sys {
117117
compatible = "fixed-clock";
118118
#clock-cells = <0>;
119119
/* This value must be overridden by the board */
120120
clock-frequency = <0>;
121121
};
122122

123-
osc_aud: osc_aud {
123+
osc_aud: osc-aud {
124124
compatible = "fixed-clock";
125125
#clock-cells = <0>;
126126
/* This value must be overridden by the board */
127127
clock-frequency = <0>;
128128
};
129129

130-
gmac_rmii_ref: gmac_rmii_ref {
130+
gmac_rmii_ref: gmac-rmii-ref {
131131
compatible = "fixed-clock";
132132
#clock-cells = <0>;
133133
/* Should be overridden by the board when needed */
134134
clock-frequency = <0>;
135135
};
136136

137-
gmac_gr_mii_rxclk: gmac_gr_mii_rxclk {
137+
gmac_gr_mii_rxclk: gmac-gr-mii-rxclk {
138138
compatible = "fixed-clock";
139139
#clock-cells = <0>;
140140
/* Should be overridden by the board when needed */

arch/riscv/boot/dts/starfive/jh7110.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,14 @@
237237
};
238238

239239
trips {
240-
cpu_alert0: cpu_alert0 {
240+
cpu_alert0: cpu-alert0 {
241241
/* milliCelsius */
242242
temperature = <85000>;
243243
hysteresis = <2000>;
244244
type = "passive";
245245
};
246246

247-
cpu_crit {
247+
cpu-crit {
248248
/* milliCelsius */
249249
temperature = <100000>;
250250
hysteresis = <2000>;

0 commit comments

Comments
 (0)