Update MAINTAINERS to match the new drivers/ptp/ directory layout after
splitting emulated and IEEE 1588 network-oriented drivers into
subdirectories.

Adjust file patterns and per-driver entries to point to their new
locations, and add a dedicated MAINTAINERS entry for the emulated PTP
clock drivers.

Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
---
 MAINTAINERS | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5d477fd592db..1df4fed77284 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10250,7 +10250,7 @@ F:	Documentation/devicetree/bindings/ptp/fsl,ptp.yaml
 F:	drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp*
 F:	drivers/net/ethernet/freescale/dpaa2/dprtc*
 F:	drivers/net/ethernet/freescale/enetc/enetc_ptp.c
-F:	drivers/ptp/ptp_qoriq.c
+F:	drivers/ptp/ieee1588/ptp_qoriq.c
 F:	include/linux/fsl/ptp_qoriq.h
 
 FREESCALE QUAD SPI DRIVER
@@ -13129,7 +13129,7 @@ INTEL PTP DFL ToD DRIVER
 L:	linux-fpga@vger.kernel.org
 L:	netdev@vger.kernel.org
 S:	Orphan
-F:	drivers/ptp/ptp_dfl_tod.c
+F:	drivers/ptp/ieee1588/ptp_dfl_tod.c
 
 INTEL QUADRATURE ENCODER PERIPHERAL DRIVER
 M:	Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
@@ -18309,7 +18309,10 @@ F:	Documentation/devicetree/bindings/net/
 F:	Documentation/networking/net_cachelines/net_device.rst
 F:	drivers/connector/
 F:	drivers/net/
-F:	drivers/ptp/
+F:	drivers/ptp/Kconfig
+F:	drivers/ptp/Makefile
+F:	drivers/ptp/ieee1588/
+F:	drivers/ptp/ptp*
 F:	drivers/s390/net/
 F:	include/dt-bindings/net/
 F:	include/linux/cn_proc.h
@@ -19092,7 +19095,7 @@ L:	imx@lists.linux.dev
 L:	netdev@vger.kernel.org
 S:	Maintained
 F:	Documentation/devicetree/bindings/ptp/nxp,ptp-netc.yaml
-F:	drivers/ptp/ptp_netc.c
+F:	drivers/ptp/ieee1588/ptp_netc.c
 
 NXP PF5300/PF5301/PF5302 PMIC REGULATOR DEVICE DRIVER
 M:	Woodrow Douglass <wdouglass@carnegierobotics.com>
@@ -19802,7 +19805,7 @@ OPENCOMPUTE PTP CLOCK DRIVER
 M:	Vadim Fedorenko <vadim.fedorenko@linux.dev>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/ptp/ptp_ocp.c
+F:	drivers/ptp/ieee1588/ptp_ocp.c
 
 OPENCORES I2C BUS DRIVER
 M:	Peter Korsgaard <peter@korsgaard.com>
@@ -21238,15 +21241,26 @@ W:	http://linuxptp.sourceforge.net/
 F:	Documentation/ABI/testing/sysfs-ptp
 F:	Documentation/driver-api/ptp.rst
 F:	drivers/net/phy/dp83640*
-F:	drivers/ptp/*
+F:	drivers/ptp/Kconfig
+F:	drivers/ptp/Makefile
+F:	drivers/ptp/ieee1588/
+F:	drivers/ptp/ptp*
 F:	include/linux/ptp_cl*
 K:	(?:\b|_)ptp(?:\b|_)
 
+PTP EMULATED CLOCK SUPPORT
+M:	Wen Gu <guwen@linux.alibaba.com>
+M:	Xuan Zhuo <xuanzhuo@linux.alibaba.com>
+L:	linux-kernel@vger.kernel.org
+S:	Maintained
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
+F:	drivers/ptp/emulated/
+
 PTP MOCKUP CLOCK SUPPORT
 M:	Vladimir Oltean <vladimir.oltean@nxp.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/ptp/ptp_mock.c
+F:	drivers/ptp/ieee1588/ptp_mock.c
 F:	include/linux/ptp_mock.h
 
 PTP VIRTUAL CLOCK SUPPORT
@@ -21258,10 +21272,10 @@ F:	net/ethtool/phc_vclocks.c
 
 PTP VMCLOCK SUPPORT
 M:	David Woodhouse <dwmw2@infradead.org>
-L:	netdev@vger.kernel.org
+L:	linux-kernel@vger.kernel.org
 S:	Maintained
 F:	Documentation/devicetree/bindings/ptp/amazon,vmclock.yaml
-F:	drivers/ptp/ptp_vmclock.c
+F:	drivers/ptp/emulated/ptp_vmclock.c
 F:	include/uapi/linux/vmclock-abi.h
 
 PTRACE SUPPORT
@@ -23320,7 +23334,7 @@ S390 PTP DRIVER
 M:	Sven Schnelle <svens@linux.ibm.com>
 L:	linux-s390@vger.kernel.org
 S:	Supported
-F:	drivers/ptp/ptp_s390.c
+F:	drivers/ptp/emulated/ptp_s390.c
 
 S390 SCM DRIVER
 M:	Vineeth Vijayan <vneethv@linux.ibm.com>
@@ -28216,9 +28230,9 @@ M:	Nick Shi <nick.shi@broadcom.com>
 R:	Ajay Kaher <ajay.kaher@broadcom.com>
 R:	Alexey Makhalov <alexey.makhalov@broadcom.com>
 R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
-L:	netdev@vger.kernel.org
+L:	linux-kernel@vger.kernel.org
 S:	Supported
-F:	drivers/ptp/ptp_vmw.c
+F:	drivers/ptp/emulated/ptp_vmw.c
 
 VMWARE VMCI DRIVER
 M:	Bryan Tan <bryan-bt.tan@broadcom.com>
-- 
2.43.5

On Wed, 18 Mar 2026 15:33:30 +0800 Wen Gu wrote:
> +PTP EMULATED CLOCK SUPPORT
> +M:	Wen Gu <guwen@linux.alibaba.com>
> +M:	Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> +L:	linux-kernel@vger.kernel.org
> +S:	Maintained

I thought David W was supposed to be the main maintainer?
Two moderately known developers from a single vendor/company
is not enough to delegate this IMO.

On 2026/3/24 10:22, Jakub Kicinski wrote:
> On Wed, 18 Mar 2026 15:33:30 +0800 Wen Gu wrote:
>> +PTP EMULATED CLOCK SUPPORT
>> +M:	Wen Gu <guwen@linux.alibaba.com>
>> +M:	Xuan Zhuo <xuanzhuo@linux.alibaba.com>
>> +L:	linux-kernel@vger.kernel.org
>> +S:	Maintained
> 
> I thought David W was supposed to be the main maintainer?
> Two moderately known developers from a single vendor/company
> is not enough to delegate this IMO.


Thanks for pointing this out.

We would also very much prefer for this area to be maintained
by people with deeper expertise in the clock/timekeeping domain
(such as David). The reason David was not listed in this version
is that an earlier attempt to ask about maintainership did not
receive a reply[1]. So we avoided adding without confirmation.

If David has no objections to being listed here, that would
definitely be preferable from our perspective. Other suggested
clock/timekeeping experts would also be very welcome.

[1] https://lore.kernel.org/all/78489ff1-c2fa-47dc-beb4-54e9410f7d5c@linux.alibaba.com/

On Tue, 2026-03-24 at 11:46 +0800, Wen Gu wrote:
> 
> 
> On 2026/3/24 10:22, Jakub Kicinski wrote:
> > On Wed, 18 Mar 2026 15:33:30 +0800 Wen Gu wrote:
> > > +PTP EMULATED CLOCK SUPPORT
> > > +M:	Wen Gu <guwen@linux.alibaba.com>
> > > +M:	Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > +L:	linux-kernel@vger.kernel.org
> > > +S:	Maintained
> > 
> > I thought David W was supposed to be the main maintainer?
> > Two moderately known developers from a single vendor/company
> > is not enough to delegate this IMO.
> 
> 
> Thanks for pointing this out.
> 
> We would also very much prefer for this area to be maintained
> by people with deeper expertise in the clock/timekeeping domain
> (such as David). The reason David was not listed in this version
> is that an earlier attempt to ask about maintainership did not
> receive a reply[1]. So we avoided adding without confirmation.
> 
> If David has no objections to being listed here, that would
> definitely be preferable from our perspective. Other suggested
> clock/timekeeping experts would also be very welcome.
> 
> [1]
> https://lore.kernel.org/all/78489ff1-c2fa-47dc-beb4-54e9410f7d5c@linux.alibaba.com/

Apologies for missing that; yes I'm perfectly happy to be listed as a
maintainer. Thanks for checking.

Still mildly uncomfortable with 'emulated' as the word we chose for the
non-ieee1588 clocks, although there's only so much bikeshedding we can
do and it's ultimately cosmetic.

I see it more as precision RTCs which provide accurate CLOCK_REALTIME
(ideally including UTC not just TAI) — largely to virtual guests but
also on bare metal.

But as long as that's just a nitpick about what the directory is
called, and not an ongoing disagreement about which drivers land where,
I guess it doesn't matter much?

I don't actually want to see many new drivers added here. Going back to
what someone (Jakub?) said in a thread a while back about a pile of
cloud vendors' NIH cruft... I built the vmclock specification
deliberately to be vendor-agnostic and (I think) even implementable in
hardware with PCIe PTM, and I hope that we can consolidate on that and
stop inventing new crap.

https://uapi-group.org/specifications/specs/vmclock/

The next thing I want to do is make the kernel's timekeeping sync from
that as a proper feed-forward clock based on counter readings, instead
of the feedback adjustment that the current NTP hooks permit. And make
it possible to *export* the host's CLOCK_REALTIME to guests in vmclock
form.