diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2025-03-19 21:50:17 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-03-19 21:50:17 +0100 |
| commit | 43adf498e91ca9ff5f86aec5a642e1661891ccb3 (patch) | |
| tree | 25a417e0ad9f22380d90294fc387d5b657c11042 | |
| parent | Merge tag 'mvebu-dt64-6.15-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt (diff) | |
| parent | riscv: sophgo: dts: add cooling maps for Milk-V Pioneer (diff) | |
| download | wireguard-linux-43adf498e91ca9ff5f86aec5a642e1661891ccb3.tar.xz wireguard-linux-43adf498e91ca9ff5f86aec5a642e1661891ccb3.zip | |
Merge tag 'riscv-sophgo-dt-for-v6.15' of https://github.com/sophgo/linux into soc/dt
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>
Diffstat (limited to '')
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts | 36 | ||||
| -rw-r--r-- | arch/riscv/boot/dts/sophgo/sg2042.dtsi | 9 |
3 files changed, 48 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index efe0a5e155ea..8b445959657f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts b/arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts index be596d01ff8d..34645a5f6038 100644 --- a/arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts +++ b/arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts @@ -73,6 +73,13 @@ }; / { + 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 @@ 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 @@ type = "active"; }; }; + + cooling-maps { + map4 { + trip = <&board_active>; + cooling-device = <&pwmfan 3 4>; + }; + }; }; }; }; diff --git a/arch/riscv/boot/dts/sophgo/sg2042.dtsi b/arch/riscv/boot/dts/sophgo/sg2042.dtsi index e62ac51ac55a..4449c762d663 100644 --- a/arch/riscv/boot/dts/sophgo/sg2042.dtsi +++ b/arch/riscv/boot/dts/sophgo/sg2042.dtsi @@ -165,6 +165,15 @@ }; }; + 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>; |