[PATCH v5 6/7] ptp: ptp_vmclock: remove dependency on CONFIG_ACPI

Chalios, Babis
2026-01-07T13:27:51Z

Now that we added device tree support we can remove dependency on
CONFIG_ACPI.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Babis Chalios <bchalios@amazon.es>
---
drivers/ptp/Kconfig | 2 +-
drivers/ptp/ptp_vmclock.c | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 5f8ea34d11d6..b93640ca08b7 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -134,7 +134,7 @@ config PTP_1588_CLOCK_KVM
config PTP_1588_CLOCK_VMCLOCK
tristate "Virtual machine PTP clock"
depends on X86_TSC || ARM_ARCH_TIMER
- depends on PTP_1588_CLOCK && ACPI && ARCH_SUPPORTS_INT128
+ depends on PTP_1588_CLOCK && ARCH_SUPPORTS_INT128
default PTP_1588_CLOCK_KVM
help
This driver adds support for using a virtual precision clock
diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c
index 80fc7c9e062e..9f17f4a1b2be 100644
--- a/drivers/ptp/ptp_vmclock.c
+++ b/drivers/ptp/ptp_vmclock.c
@@ -501,6 +501,7 @@ static void vmclock_remove(void *data)
misc_deregister(&st->miscdev);
}

+#if IS_ENABLED(CONFIG_ACPI)
static acpi_status vmclock_acpi_resources(struct acpi_resource *ares, void *data)
{
struct vmclock_state *st = data;
@@ -584,6 +585,7 @@ static int vmclock_probe_acpi(struct device *dev, struct vmclock_state *st)

return 0;
}
+#endif /* CONFIG_ACPI */

static irqreturn_t vmclock_of_irq_handler(int __always_unused irq, void *_st)
{
@@ -627,12 +629,11 @@ static int vmclock_setup_notification(struct device *dev,
if (!(le64_to_cpu(st->clk->flags) & VMCLOCK_FLAG_NOTIFICATION_PRESENT))
return 0;

- if (has_acpi_companion(dev)) {
+#if IS_ENABLED(CONFIG_ACPI)
+ if (has_acpi_companion(dev))
return vmclock_setup_acpi_notification(dev);
- } else {
- return vmclock_setup_of_notification(dev);
- }
-
+#endif
+ return vmclock_setup_of_notification(dev);
}

@@ -653,9 +654,11 @@ static int vmclock_probe(struct platform_device *pdev)
if (!st)
return -ENOMEM;

+#if IS_ENABLED(CONFIG_ACPI)
if (has_acpi_companion(dev))
ret = vmclock_probe_acpi(dev, st);
else
+#endif
ret = vmclock_probe_dt(dev, st);

if (ret) {
--
2.34.1