Patchwork [net-next] pch_gbe, ptp_pch: Fix the dependency direction between these drivers

login
register
mail settings
Submitter Ben Hutchings
Date Nov. 17, 2012, 1:43 a.m.
Message ID <1353116639.2743.88.camel@bwh-desktop.uk.solarflarecom.com>
Download mbox | patch
Permalink /patch/199811/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ben Hutchings - Nov. 17, 2012, 1:43 a.m.
In commit a24006ed12616bde1bbdb26868495906a212d8dc ('ptp: Enable clock
drivers along with associated net/PHY drivers') I wrongly made
PTP_1588_CLOCK_PCH depend on PCH_GBE.  The dependency is really the
other way around.  Therefore make PCH_GBE select PTP_1588_CLOCK_PCH
and remove the 'default y' from the latter.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig |    1 +
 drivers/ptp/Kconfig                           |    2 --
 2 files changed, 1 insertions(+), 2 deletions(-)
Randy.Dunlap - Nov. 17, 2012, 2:02 a.m.
On 11/16/2012 05:43 PM, Ben Hutchings wrote:

> In commit a24006ed12616bde1bbdb26868495906a212d8dc ('ptp: Enable clock
> drivers along with associated net/PHY drivers') I wrongly made
> PTP_1588_CLOCK_PCH depend on PCH_GBE.  The dependency is really the
> other way around.  Therefore make PCH_GBE select PTP_1588_CLOCK_PCH
> and remove the 'default y' from the latter.
> 
> Reported-by: Randy Dunlap <rdunlap@xenotime.net>
> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>


Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks.

> ---
>  drivers/net/ethernet/oki-semi/pch_gbe/Kconfig |    1 +
>  drivers/ptp/Kconfig                           |    2 --
>  2 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
> index 00bc4fc..34d05bf 100644
> --- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
> +++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
> @@ -7,6 +7,7 @@ config PCH_GBE
>  	depends on PCI
>  	select NET_CORE
>  	select MII
> +	select PTP_1588_CLOCK_PCH
>  	---help---
>  	  This is a gigabit ethernet driver for EG20T PCH.
>  	  EG20T PCH is the platform controller hub that is used in Intel's
> diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
> index 70c5836..1ea6f1d 100644
> --- a/drivers/ptp/Kconfig
> +++ b/drivers/ptp/Kconfig
> @@ -72,9 +72,7 @@ config DP83640_PHY
>  
>  config PTP_1588_CLOCK_PCH
>  	tristate "Intel PCH EG20T as PTP clock"
> -	depends on PCH_GBE
>  	select PTP_1588_CLOCK
> -	default y
>  	help
>  	  This driver adds support for using the PCH EG20T as a PTP
>  	  clock. The hardware supports time stamping of PTP packets
David Miller - Nov. 18, 2012, 3:12 a.m.
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Fri, 16 Nov 2012 18:02:04 -0800

> On 11/16/2012 05:43 PM, Ben Hutchings wrote:
> 
>> In commit a24006ed12616bde1bbdb26868495906a212d8dc ('ptp: Enable clock
>> drivers along with associated net/PHY drivers') I wrongly made
>> PTP_1588_CLOCK_PCH depend on PCH_GBE.  The dependency is really the
>> other way around.  Therefore make PCH_GBE select PTP_1588_CLOCK_PCH
>> and remove the 'default y' from the latter.
>> 
>> Reported-by: Randy Dunlap <rdunlap@xenotime.net>
>> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
> 
> 
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
index 00bc4fc..34d05bf 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
@@ -7,6 +7,7 @@  config PCH_GBE
 	depends on PCI
 	select NET_CORE
 	select MII
+	select PTP_1588_CLOCK_PCH
 	---help---
 	  This is a gigabit ethernet driver for EG20T PCH.
 	  EG20T PCH is the platform controller hub that is used in Intel's
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 70c5836..1ea6f1d 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -72,9 +72,7 @@  config DP83640_PHY
 
 config PTP_1588_CLOCK_PCH
 	tristate "Intel PCH EG20T as PTP clock"
-	depends on PCH_GBE
 	select PTP_1588_CLOCK
-	default y
 	help
 	  This driver adds support for using the PCH EG20T as a PTP
 	  clock. The hardware supports time stamping of PTP packets