Skip to content

Commit 504926d

Browse files
arndbdavem330
authored andcommitted
cpsw/netcp: refine cpts dependency
Tony Lindgren reports a kernel oops that resulted from my compile-time fix on the default config. This shows two problems: a) configurations that did not already enable PTP_1588_CLOCK will now miss the cpts driver b) when cpts support is disabled, the driver crashes. This is a preexisting problem that we did not notice before my patch. While the second problem is still being investigated, this modifies the dependencies again, getting us back to the original state, with another 'select NET_PTP_CLASSIFY' added in to avoid the original link error we got, and the 'depends on POSIX_TIMERS' to hide the CPTS support when turning it on would be useless. Cc: [email protected] # 4.11 needs this Fixes: 07fef36 ("cpsw/netcp: cpts depends on posix_timers") Signed-off-by: Arnd Bergmann <[email protected]> Tested-by: Tony Lindgren <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5577e67 commit 504926d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/net/ethernet/ti/Kconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ config TI_CPSW
7676
config TI_CPTS
7777
bool "TI Common Platform Time Sync (CPTS) Support"
7878
depends on TI_CPSW || TI_KEYSTONE_NETCP
79-
depends on PTP_1588_CLOCK
79+
depends on POSIX_TIMERS
8080
---help---
8181
This driver supports the Common Platform Time Sync unit of
8282
the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.
@@ -87,6 +87,8 @@ config TI_CPTS_MOD
8787
tristate
8888
depends on TI_CPTS
8989
default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y
90+
select NET_PTP_CLASSIFY
91+
imply PTP_1588_CLOCK
9092
default m
9193

9294
config TI_KEYSTONE_NETCP

0 commit comments

Comments
 (0)