aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2023-12-25 18:38:54 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2024-01-10 18:20:17 +0000
commit2e3507c25e42292b45a5482e116d278f5515d04d (patch)
tree0ed94b77765146834c6185d8a7fae6c8c0215007
parentec2b0ccdeed2cbd3f49b7a992023c351e239389b (diff)
downloadsrc-2e3507c25e42292b45a5482e116d278f5515d04d.tar.gz
src-2e3507c25e42292b45a5482e116d278f5515d04d.zip
pwm: Move rockchip driver into the common directory
No need to keep it under sys/arm64/rockchip It's easier to find which controller we support by looking under one directory. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D43186
-rw-r--r--sys/arm/rockchip/files.rk32xx2
-rw-r--r--sys/conf/files.arm643
-rw-r--r--sys/dev/pwm/controller/rockchip/rk_pwm.c (renamed from sys/arm64/rockchip/rk_pwm.c)0
3 files changed, 3 insertions, 2 deletions
diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx
index e8f838fb186a..5393b7784108 100644
--- a/sys/arm/rockchip/files.rk32xx
+++ b/sys/arm/rockchip/files.rk32xx
@@ -8,7 +8,7 @@ arm64/rockchip/rk_gpio.c standard
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
index 1a141963a37e..c5f8207f01f5 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -380,6 +380,8 @@ dev/psci/psci.c standard
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_usb2phy.c optional fdt rk_usb2phy soc_rockchip_rk3328 | fdt
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
index 260899f15d89..260899f15d89 100644
--- a/sys/arm64/rockchip/rk_pwm.c
+++ b/sys/dev/pwm/controller/rockchip/rk_pwm.c