Skip to content

Commit f9c59f2

Browse files
committed
Merge tag 'riscv-sophgo-dt-for-v6.9' of https://github.com/sophgo/linux into soc/dt
RISC-V Devicetrees for v6.9 Sophgo: Added reset support for SG2042. Also updated maintainer information for SOPHGO vendor support. Signed-off-by: Chen Wang <unicorn_wang@outlook.com> * tag 'riscv-sophgo-dt-for-v6.9' of https://github.com/sophgo/linux: MAINTAINERS: Setup proper info for SOPHGO vendor support riscv: dts: add resets property for uart node riscv: dts: add reset generator for Sophgo SG2042 SoC Link: https://lore.kernel.org/r/MA0P287MB2822315119DA51FF95EE3071FE5D2@MA0P287MB2822.INDP287.PROD.OUTLOOK.COM Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 3a591d5 + 0f46e13 commit f9c59f2

2 files changed

Lines changed: 15 additions & 4 deletions

File tree

MAINTAINERS

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18859,6 +18859,7 @@ F: Documentation/devicetree/bindings/riscv/
1885918859
F: arch/riscv/boot/dts/
1886018860
X: arch/riscv/boot/dts/allwinner/
1886118861
X: arch/riscv/boot/dts/renesas/
18862+
X: arch/riscv/boot/dts/sophgo/
1886218863

1886318864
RISC-V PMU DRIVERS
1886418865
M: Atish Patra <atishp@atishpatra.org>
@@ -20457,12 +20458,13 @@ F: drivers/char/sonypi.c
2045720458
F: drivers/platform/x86/sony-laptop.c
2045820459
F: include/linux/sony-laptop.h
2045920460

20460-
SOPHGO DEVICETREES
20461-
M: Chao Wei <chao.wei@sophgo.com>
20461+
SOPHGO DEVICETREES and DRIVERS
2046220462
M: Chen Wang <unicorn_wang@outlook.com>
20463+
M: Inochi Amaoto <inochiama@outlook.com>
20464+
T: git https://github.com/sophgo/linux.git
2046320465
S: Maintained
20464-
F: arch/riscv/boot/dts/sophgo/
20465-
F: Documentation/devicetree/bindings/riscv/sophgo.yaml
20466+
N: sophgo
20467+
K: sophgo
2046620468

2046720469
SOUND
2046820470
M: Jaroslav Kysela <perex@perex.cz>

arch/riscv/boot/dts/sophgo/sg2042.dtsi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
/dts-v1/;
77
#include <dt-bindings/interrupt-controller/irq.h>
88

9+
#include <dt-bindings/reset/sophgo,sg2042-reset.h>
10+
911
#include "sg2042-cpus.dtsi"
1012

1113
/ {
@@ -327,6 +329,12 @@
327329
riscv,ndev = <224>;
328330
};
329331

332+
rstgen: reset-controller@7030013000 {
333+
compatible = "sophgo,sg2042-reset";
334+
reg = <0x00000070 0x30013000 0x00000000 0x0000000c>;
335+
#reset-cells = <1>;
336+
};
337+
330338
uart0: serial@7040000000 {
331339
compatible = "snps,dw-apb-uart";
332340
reg = <0x00000070 0x40000000 0x00000000 0x00001000>;
@@ -335,6 +343,7 @@
335343
clock-frequency = <500000000>;
336344
reg-shift = <2>;
337345
reg-io-width = <4>;
346+
resets = <&rstgen RST_UART0>;
338347
status = "disabled";
339348
};
340349
};

0 commit comments

Comments
 (0)