Skip to content

Commit 53ed127

Browse files
arndbarndb
committed
Merge tag 'riscv-dt-fixes-for-v6.10-rc5+' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes
RISC-V Devicetree fixes for v6.10-rc5+ T-Head: Jisheng hasn't got enough time to look after the platform, so Drew Fustini is going to take over. StarFive: A fix for a regulator voltage range that prevented using low performance SD cards. Canaan: Cleanup for some "over eager" aliases for serial ports that did not exist on some boards and I/O devices disabled on boards where they were not actually in use. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f266106 + e21de65 commit 53ed127

9 files changed

Lines changed: 58 additions & 16 deletions

File tree

‎MAINTAINERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19314,7 +19314,7 @@ F: drivers/perf/riscv_pmu_legacy.c
1931419314
F: drivers/perf/riscv_pmu_sbi.c
1931519315

1931619316
RISC-V THEAD SoC SUPPORT
19317-
M: Jisheng Zhang <jszhang@kernel.org>
19317+
M: Drew Fustini <drew@pdp7.com>
1931819318
M: Guo Ren <guoren@kernel.org>
1931919319
M: Fu Wei <wefu@redhat.com>
1932019320
L: linux-riscv@lists.infradead.org

‎arch/riscv/boot/dts/canaan/canaan_kd233.dts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
model = "Kendryte KD233";
1616
compatible = "canaan,kendryte-kd233", "canaan,kendryte-k210";
1717

18+
aliases {
19+
serial0 = &uarths0;
20+
};
21+
1822
chosen {
1923
bootargs = "earlycon console=ttySIF0";
2024
stdout-path = "serial0:115200n8";
@@ -46,7 +50,6 @@
4650
&fpioa {
4751
pinctrl-0 = <&jtag_pinctrl>;
4852
pinctrl-names = "default";
49-
status = "okay";
5053

5154
jtag_pinctrl: jtag-pinmux {
5255
pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,
@@ -118,13 +121,15 @@
118121
#sound-dai-cells = <1>;
119122
pinctrl-0 = <&i2s0_pinctrl>;
120123
pinctrl-names = "default";
124+
status = "okay";
121125
};
122126

123127
&spi0 {
124128
pinctrl-0 = <&spi0_pinctrl>;
125129
pinctrl-names = "default";
126130
num-cs = <1>;
127131
cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
132+
status = "okay";
128133

129134
panel@0 {
130135
compatible = "canaan,kd233-tft", "ilitek,ili9341";

‎arch/riscv/boot/dts/canaan/k210.dtsi‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616
#size-cells = <1>;
1717
compatible = "canaan,kendryte-k210";
1818

19-
aliases {
20-
serial0 = &uarths0;
21-
serial1 = &uart1;
22-
serial2 = &uart2;
23-
serial3 = &uart3;
24-
};
25-
2619
/*
2720
* The K210 has an sv39 MMU following the privileged specification v1.9.
2821
* Since this is a non-ratified draft specification, the kernel does not
@@ -137,6 +130,7 @@
137130
reg = <0x38000000 0x1000>;
138131
interrupts = <33>;
139132
clocks = <&sysclk K210_CLK_CPU>;
133+
status = "disabled";
140134
};
141135

142136
gpio0: gpio-controller@38001000 {
@@ -152,6 +146,7 @@
152146
<62>, <63>, <64>, <65>;
153147
gpio-controller;
154148
ngpios = <32>;
149+
status = "disabled";
155150
};
156151

157152
dmac0: dma-controller@50000000 {
@@ -187,6 +182,7 @@
187182
<&sysclk K210_CLK_GPIO>;
188183
clock-names = "bus", "db";
189184
resets = <&sysrst K210_RST_GPIO>;
185+
status = "disabled";
190186

191187
gpio1_0: gpio-port@0 {
192188
#gpio-cells = <2>;
@@ -214,6 +210,7 @@
214210
dsr-override;
215211
cts-override;
216212
ri-override;
213+
status = "disabled";
217214
};
218215

219216
uart2: serial@50220000 {
@@ -230,6 +227,7 @@
230227
dsr-override;
231228
cts-override;
232229
ri-override;
230+
status = "disabled";
233231
};
234232

235233
uart3: serial@50230000 {
@@ -246,6 +244,7 @@
246244
dsr-override;
247245
cts-override;
248246
ri-override;
247+
status = "disabled";
249248
};
250249

251250
spi2: spi@50240000 {
@@ -259,6 +258,7 @@
259258
<&sysclk K210_CLK_APB0>;
260259
clock-names = "ssi_clk", "pclk";
261260
resets = <&sysrst K210_RST_SPI2>;
261+
status = "disabled";
262262
};
263263

264264
i2s0: i2s@50250000 {
@@ -268,6 +268,7 @@
268268
clocks = <&sysclk K210_CLK_I2S0>;
269269
clock-names = "i2sclk";
270270
resets = <&sysrst K210_RST_I2S0>;
271+
status = "disabled";
271272
};
272273

273274
i2s1: i2s@50260000 {
@@ -277,6 +278,7 @@
277278
clocks = <&sysclk K210_CLK_I2S1>;
278279
clock-names = "i2sclk";
279280
resets = <&sysrst K210_RST_I2S1>;
281+
status = "disabled";
280282
};
281283

282284
i2s2: i2s@50270000 {
@@ -286,6 +288,7 @@
286288
clocks = <&sysclk K210_CLK_I2S2>;
287289
clock-names = "i2sclk";
288290
resets = <&sysrst K210_RST_I2S2>;
291+
status = "disabled";
289292
};
290293

291294
i2c0: i2c@50280000 {
@@ -296,6 +299,7 @@
296299
<&sysclk K210_CLK_APB0>;
297300
clock-names = "ref", "pclk";
298301
resets = <&sysrst K210_RST_I2C0>;
302+
status = "disabled";
299303
};
300304

301305
i2c1: i2c@50290000 {
@@ -306,6 +310,7 @@
306310
<&sysclk K210_CLK_APB0>;
307311
clock-names = "ref", "pclk";
308312
resets = <&sysrst K210_RST_I2C1>;
313+
status = "disabled";
309314
};
310315

311316
i2c2: i2c@502a0000 {
@@ -316,6 +321,7 @@
316321
<&sysclk K210_CLK_APB0>;
317322
clock-names = "ref", "pclk";
318323
resets = <&sysrst K210_RST_I2C2>;
324+
status = "disabled";
319325
};
320326

321327
fpioa: pinmux@502b0000 {
@@ -464,6 +470,7 @@
464470
reset-names = "spi";
465471
num-cs = <4>;
466472
reg-io-width = <4>;
473+
status = "disabled";
467474
};
468475

469476
spi1: spi@53000000 {
@@ -479,6 +486,7 @@
479486
reset-names = "spi";
480487
num-cs = <4>;
481488
reg-io-width = <4>;
489+
status = "disabled";
482490
};
483491

484492
spi3: spi@54000000 {
@@ -495,6 +503,7 @@
495503

496504
num-cs = <4>;
497505
reg-io-width = <4>;
506+
status = "disabled";
498507
};
499508
};
500509
};

‎arch/riscv/boot/dts/canaan/k210_generic.dts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
model = "Kendryte K210 generic";
1616
compatible = "canaan,kendryte-k210";
1717

18+
aliases {
19+
serial0 = &uarths0;
20+
};
21+
1822
chosen {
1923
bootargs = "earlycon console=ttySIF0";
2024
stdout-path = "serial0:115200n8";
@@ -24,7 +28,6 @@
2428
&fpioa {
2529
pinctrl-0 = <&jtag_pins>;
2630
pinctrl-names = "default";
27-
status = "okay";
2831

2932
jtag_pins: jtag-pinmux {
3033
pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,

‎arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
compatible = "sipeed,maix-bit", "sipeed,maix-bitm",
1818
"canaan,kendryte-k210";
1919

20+
aliases {
21+
serial0 = &uarths0;
22+
};
23+
2024
chosen {
2125
bootargs = "earlycon console=ttySIF0";
2226
stdout-path = "serial0:115200n8";
@@ -58,7 +62,6 @@
5862
&fpioa {
5963
pinctrl-names = "default";
6064
pinctrl-0 = <&jtag_pinctrl>;
61-
status = "okay";
6265

6366
jtag_pinctrl: jtag-pinmux {
6467
pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,
@@ -156,6 +159,7 @@
156159
#sound-dai-cells = <1>;
157160
pinctrl-0 = <&i2s0_pinctrl>;
158161
pinctrl-names = "default";
162+
status = "okay";
159163
};
160164

161165
&i2c1 {
@@ -170,6 +174,7 @@
170174
pinctrl-names = "default";
171175
num-cs = <1>;
172176
cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
177+
status = "okay";
173178

174179
panel@0 {
175180
compatible = "sitronix,st7789v";
@@ -199,6 +204,8 @@
199204
};
200205

201206
&spi3 {
207+
status = "okay";
208+
202209
flash@0 {
203210
compatible = "jedec,spi-nor";
204211
reg = <0>;

‎arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
compatible = "sipeed,maix-dock-m1", "sipeed,maix-dock-m1w",
1818
"canaan,kendryte-k210";
1919

20+
aliases {
21+
serial0 = &uarths0;
22+
};
23+
2024
chosen {
2125
bootargs = "earlycon console=ttySIF0";
2226
stdout-path = "serial0:115200n8";
@@ -63,7 +67,6 @@
6367
&fpioa {
6468
pinctrl-0 = <&jtag_pinctrl>;
6569
pinctrl-names = "default";
66-
status = "okay";
6770

6871
jtag_pinctrl: jtag-pinmux {
6972
pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,
@@ -159,6 +162,7 @@
159162
#sound-dai-cells = <1>;
160163
pinctrl-0 = <&i2s0_pinctrl>;
161164
pinctrl-names = "default";
165+
status = "okay";
162166
};
163167

164168
&i2c1 {
@@ -173,6 +177,7 @@
173177
pinctrl-names = "default";
174178
num-cs = <1>;
175179
cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
180+
status = "okay";
176181

177182
panel@0 {
178183
compatible = "sitronix,st7789v";

‎arch/riscv/boot/dts/canaan/sipeed_maix_go.dts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
model = "SiPeed MAIX GO";
1717
compatible = "sipeed,maix-go", "canaan,kendryte-k210";
1818

19+
aliases {
20+
serial0 = &uarths0;
21+
};
22+
1923
chosen {
2024
bootargs = "earlycon console=ttySIF0";
2125
stdout-path = "serial0:115200n8";
@@ -69,7 +73,6 @@
6973
&fpioa {
7074
pinctrl-0 = <&jtag_pinctrl>;
7175
pinctrl-names = "default";
72-
status = "okay";
7376

7477
jtag_pinctrl: jtag-pinmux {
7578
pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,
@@ -167,6 +170,7 @@
167170
#sound-dai-cells = <1>;
168171
pinctrl-0 = <&i2s0_pinctrl>;
169172
pinctrl-names = "default";
173+
status = "okay";
170174
};
171175

172176
&i2c1 {
@@ -181,6 +185,7 @@
181185
pinctrl-names = "default";
182186
num-cs = <1>;
183187
cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
188+
status = "okay";
184189

185190
panel@0 {
186191
compatible = "sitronix,st7789v";
@@ -209,6 +214,8 @@
209214
};
210215

211216
&spi3 {
217+
status = "okay";
218+
212219
flash@0 {
213220
compatible = "jedec,spi-nor";
214221
reg = <0>;

‎arch/riscv/boot/dts/canaan/sipeed_maixduino.dts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
model = "SiPeed MAIXDUINO";
1616
compatible = "sipeed,maixduino", "canaan,kendryte-k210";
1717

18+
aliases {
19+
serial0 = &uarths0;
20+
};
21+
1822
chosen {
1923
bootargs = "earlycon console=ttySIF0";
2024
stdout-path = "serial0:115200n8";
@@ -39,8 +43,6 @@
3943
};
4044

4145
&fpioa {
42-
status = "okay";
43-
4446
uarths_pinctrl: uarths-pinmux {
4547
pinmux = <K210_FPIOA(4, K210_PCF_UARTHS_RX)>, /* Header "0" */
4648
<K210_FPIOA(5, K210_PCF_UARTHS_TX)>; /* Header "1" */
@@ -132,6 +134,7 @@
132134
#sound-dai-cells = <1>;
133135
pinctrl-0 = <&i2s0_pinctrl>;
134136
pinctrl-names = "default";
137+
status = "okay";
135138
};
136139

137140
&i2c1 {
@@ -146,6 +149,7 @@
146149
pinctrl-names = "default";
147150
num-cs = <1>;
148151
cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
152+
status = "okay";
149153

150154
panel@0 {
151155
compatible = "sitronix,st7789v";
@@ -174,6 +178,8 @@
174178
};
175179

176180
&spi3 {
181+
status = "okay";
182+
177183
flash@0 {
178184
compatible = "jedec,spi-nor";
179185
reg = <0>;

‎arch/riscv/boot/dts/starfive/jh7110-common.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
regulator-boot-on;
245245
regulator-always-on;
246246
regulator-min-microvolt = <1800000>;
247-
regulator-max-microvolt = <1800000>;
247+
regulator-max-microvolt = <3300000>;
248248
regulator-name = "emmc_vdd";
249249
};
250250
};

0 commit comments

Comments
 (0)