mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-25 21:00:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'riscv-sophgo-dt-for-v6.15' of https://github.com/sophgo/linux into soc/dt

Browse Source 
RISC-V Devicetrees for v6.15

Sophgo:
Add pwm controller support for SG2042.
Add pwm-fan & cooling maps for Milk-V Pioneer.
Updated MAINTAINERS info for SOPHGO DEVICETREES and DRIVERS.

Signed-off-by: Chen Wang <unicorn_wang@outlook.com>

* tag 'riscv-sophgo-dt-for-v6.15' of https://github.com/sophgo/linux:
  riscv: sophgo: dts: add cooling maps for Milk-V Pioneer
  riscv: sophgo: dts: add pwm-fan for Milk-V Pioneer
  MAINTAINERS: update info for SOPHGO DEVICETREES and DRIVERS
  riscv: sophgo: dts: add pwm controller for SG2042 SoC

Link: https://lore.kernel.org/r/PN0PR01MB10393CEC71B623E0A779E7393FEDF2@PN0PR01MB10393.INDPRD01.PROD.OUTLOOK.COM
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2025-03-19 21:50:17 +01:00
parent 5f3b286a69 f047a9285f
commit 43adf498e9
3 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@@ -22152,7 +22152,9 @@ F: include/linux/sony-laptop.h
SOPHGO DEVICETREES and DRIVERS
M: Chen Wang <unicorn_wang@outlook.com>
M: Inochi Amaoto <inochiama@outlook.com>
M: Inochi Amaoto <inochiama@gmail.com>
L: sophgo@lists.linux.dev
W: https://github.com/sophgo/linux/wiki
T: git https://github.com/sophgo/linux.git
S: Maintained
N: sophgo

36
arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts
View File

@@ -73,6 +73,13 @@ &uart0 {
};
/ {
pwmfan: pwm-fan {
compatible = "pwm-fan";
cooling-levels = <103 128 179 230 255>;
pwms = <&pwm 0 40000 0>;
#cooling-cells = <2>;
};
thermal-zones {
soc-thermal {
polling-delay-passive = <1000>;
@@ -104,6 +111,28 @@ soc_hot: soc-hot {
type = "hot";
};
};
cooling-maps {
map0 {
trip = <&soc_active1>;
cooling-device = <&pwmfan 0 1>;
};
map1 {
trip = <&soc_active2>;
cooling-device = <&pwmfan 1 2>;
};
map2 {
trip = <&soc_active3>;
cooling-device = <&pwmfan 2 3>;
};
map3 {
trip = <&soc_hot>;
cooling-device = <&pwmfan 3 4>;
};
};
};
board-thermal {
@@ -118,6 +147,13 @@ board_active: board-active {
type = "active";
};
};
cooling-maps {
map4 {
trip = <&board_active>;
cooling-device = <&pwmfan 3 4>;
};
};
};
};
};

9
arch/riscv/boot/dts/sophgo/sg2042.dtsi
View File

@@ -165,6 +165,15 @@ port2a: gpio-controller@0 {
};
};
pwm: pwm@703000c000 {
compatible = "sophgo,sg2042-pwm";
reg = <0x70 0x3000c000 0x0 0x20>;
#pwm-cells = <3>;
clocks = <&clkgen GATE_CLK_APB_PWM>;
clock-names = "apb";
resets = <&rstgen RST_PWM>;
};
pllclk: clock-controller@70300100c0 {
compatible = "sophgo,sg2042-pll";
reg = <0x70 0x300100c0 0x0 0x40>;