diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx
--- a/sys/arm/rockchip/files.rk32xx
+++ b/sys/arm/rockchip/files.rk32xx
@@ -8,7 +8,7 @@
 arm64/rockchip/rk_grf.c			standard
 arm64/rockchip/rk_pinctrl.c		standard
 arm64/rockchip/rk_pmu.c			standard
-arm64/rockchip/rk_pwm.c			standard
+dev/pwm/controller/rockchip/rk_pwm.c	standard
 arm64/rockchip/rk_tsadc.c		standard
 arm64/rockchip/rk_tsadc_if.m		standard
 arm64/rockchip/rk_usbphy.c		standard
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -380,6 +380,8 @@
 dev/psci/smccc_arm64.S				standard
 dev/psci/smccc.c				standard
 
+dev/pwm/controller//rockchip/rk_pwm.c		optional fdt rk_pwm
+
 dev/random/armv8rng.c				optional armv8_rng !random_loadable
 
 dev/safexcel/safexcel.c				optional safexcel fdt
@@ -681,7 +683,6 @@
 arm64/rockchip/rk_typec_phy.c			optional fdt rk_typec_phy soc_rockchip_rk3399
 arm64/rockchip/rk_tsadc_if.m			optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
 arm64/rockchip/rk_tsadc.c			optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/rk_pwm.c				optional fdt rk_pwm
 arm64/rockchip/rk_pcie.c			optional fdt pci soc_rockchip_rk3399
 arm64/rockchip/rk_pcie_phy.c			optional fdt pci soc_rockchip_rk3399
 
diff --git a/sys/arm64/rockchip/rk_pwm.c b/sys/dev/pwm/controller/rockchip/rk_pwm.c
rename from sys/arm64/rockchip/rk_pwm.c
rename to sys/dev/pwm/controller/rockchip/rk_pwm.c