Skip to content

Commit 8d94a74

Browse files
committed
Merge branch 'add-rds-ptp-library-for-microchip-phys'
Divya Koppera says: ==================== Add rds ptp library for Microchip phys Adds support for rds ptp library in Microchip phys, where rds is internal code name for ptp IP or hardware. This library will be re-used in Microchip phys where same ptp hardware is used. Register base addresses and mmd may changes, due to which base addresses and mmd is made variable in this library. ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents b4cbbf0 + 9fc3d6f commit 8d94a74

File tree

5 files changed

+1309
-4
lines changed

5 files changed

+1309
-4
lines changed

drivers/net/phy/Kconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,15 @@ config MICROCHIP_PHY
287287

288288
config MICROCHIP_T1_PHY
289289
tristate "Microchip T1 PHYs"
290+
select MICROCHIP_PHY_RDS_PTP if NETWORK_PHY_TIMESTAMPING && \
291+
PTP_1588_CLOCK_OPTIONAL
290292
help
291-
Supports the LAN87XX PHYs.
293+
Supports the LAN8XXX PHYs.
294+
295+
config MICROCHIP_PHY_RDS_PTP
296+
tristate
297+
help
298+
Currently supports LAN887X T1 PHY
292299

293300
config MICROSEMI_PHY
294301
tristate "Microsemi PHYs"

drivers/net/phy/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ obj-$(CONFIG_MESON_GXL_PHY) += meson-gxl.o
7979
obj-$(CONFIG_MICREL_KS8995MA) += spi_ks8995.o
8080
obj-$(CONFIG_MICREL_PHY) += micrel.o
8181
obj-$(CONFIG_MICROCHIP_PHY) += microchip.o
82+
obj-$(CONFIG_MICROCHIP_PHY_RDS_PTP) += microchip_rds_ptp.o
8283
obj-$(CONFIG_MICROCHIP_T1_PHY) += microchip_t1.o
8384
obj-$(CONFIG_MICROCHIP_T1S_PHY) += microchip_t1s.o
8485
obj-$(CONFIG_MICROSEMI_PHY) += mscc/

0 commit comments

Comments
 (0)