Re: [PATCH net-next v4] ethernet: fix PTP_1588_CLOCK dependencies

[Vladimir Oltean]

On Thu, Aug 05, 2021 at 10:13:57AM +0200, Arnd Bergmann wrote:
> diff --git a/drivers/net/dsa/mv88e6xxx/Kconfig b/drivers/net/dsa/mv88e6xxx/Kconfig
> index 634a48e6616b..7a2445a34eb7 100644
> --- a/drivers/net/dsa/mv88e6xxx/Kconfig
> +++ b/drivers/net/dsa/mv88e6xxx/Kconfig
> @@ -2,6 +2,7 @@
>  config NET_DSA_MV88E6XXX
>  	tristate "Marvell 88E6xxx Ethernet switch fabric support"
>  	depends on NET_DSA
> +	depends on PTP_1588_CLOCK_OPTIONAL
>  	select IRQ_DOMAIN
>  	select NET_DSA_TAG_EDSA
>  	select NET_DSA_TAG_DSA
> diff --git a/drivers/net/dsa/ocelot/Kconfig b/drivers/net/dsa/ocelot/Kconfig
> index 932b6b6fe817..9948544ba1c4 100644
> --- a/drivers/net/dsa/ocelot/Kconfig
> +++ b/drivers/net/dsa/ocelot/Kconfig
> @@ -5,6 +5,7 @@ config NET_DSA_MSCC_FELIX
>  	depends on NET_VENDOR_MICROSEMI
>  	depends on NET_VENDOR_FREESCALE
>  	depends on HAS_IOMEM
> +	depends on PTP_1588_CLOCK_OPTIONAL
>  	select MSCC_OCELOT_SWITCH_LIB
>  	select NET_DSA_TAG_OCELOT_8021Q
>  	select NET_DSA_TAG_OCELOT
> @@ -19,6 +20,7 @@ config NET_DSA_MSCC_SEVILLE
>  	depends on NET_DSA
>  	depends on NET_VENDOR_MICROSEMI
>  	depends on HAS_IOMEM
> +	depends on PTP_1588_CLOCK_OPTIONAL
>  	select MSCC_OCELOT_SWITCH_LIB
>  	select NET_DSA_TAG_OCELOT_8021Q
>  	select NET_DSA_TAG_OCELOT
> diff --git a/drivers/net/dsa/sja1105/Kconfig b/drivers/net/dsa/sja1105/Kconfig
> index b29d41e5e1e7..1291bba3f3b6 100644
> --- a/drivers/net/dsa/sja1105/Kconfig
> +++ b/drivers/net/dsa/sja1105/Kconfig
> @@ -2,6 +2,7 @@
>  config NET_DSA_SJA1105
>  tristate "NXP SJA1105 Ethernet switch family support"
>  	depends on NET_DSA && SPI
> +	depends on PTP_1588_CLOCK_OPTIONAL
>  	select NET_DSA_TAG_SJA1105
>  	select PCS_XPCS
>  	select PACKING
> diff --git a/drivers/net/ethernet/mscc/Kconfig b/drivers/net/ethernet/mscc/Kconfig
> index 2d3157e4d081..b07912434560 100644
> --- a/drivers/net/ethernet/mscc/Kconfig
> +++ b/drivers/net/ethernet/mscc/Kconfig
> @@ -13,6 +13,7 @@ if NET_VENDOR_MICROSEMI
>  
>  # Users should depend on NET_SWITCHDEV, HAS_IOMEM, BRIDGE
>  config MSCC_OCELOT_SWITCH_LIB
> +	depends on PTP_1588_CLOCK_OPTIONAL

No, don't make the MSCC_OCELOT_SWITCH_LIB depend on anything please,
since it is always "select"-ed, it shouldn't have dependencies, see
the comment above. If you want, add this to the comment: "Users should
depend on (...), PTP_1588_CLOCK_OPTIONAL".

>  	select NET_DEVLINK
>  	select REGMAP_MMIO
>  	select PACKING
> @@ -24,6 +25,7 @@ config MSCC_OCELOT_SWITCH_LIB
>  
>  config MSCC_OCELOT_SWITCH
>  	tristate "Ocelot switch driver"
> +	depends on PTP_1588_CLOCK_OPTIONAL
>  	depends on BRIDGE || BRIDGE=n
>  	depends on NET_SWITCHDEV
>  	depends on HAS_IOMEM
> @@ -253,6 +254,7 @@ config NATIONAL_PHY
>  
>  config NXP_C45_TJA11XX_PHY
>  	tristate "NXP C45 TJA11XX PHYs"
> +	depends on PTP_1588_CLOCK_OPTIONAL
>  	help
>  	  Enable support for NXP C45 TJA11XX PHYs.
>  	  Currently supports only the TJA1103 PHY.

With that changed:

Reviewed-by: Vladimir Oltean <vladimir.oltean@xxxxxxx>