* [PATCH net-next] pch_gbe, ptp_pch: Fix the dependency direction between these drivers
@ 2012-11-17 1:43 Ben Hutchings
0 siblings, 0 replies; 4+ messages in thread
From: Ben Hutchings @ 2012-11-17 1:43 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Randy Dunlap, Takahiro Shimizu, Richard Cochran
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.
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(-)
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
--
1.7.7.6
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next] pch_gbe, ptp_pch: Fix the dependency direction between these drivers
@ 2012-11-17 1:43 Ben Hutchings
2012-11-17 2:02 ` Randy Dunlap
0 siblings, 1 reply; 4+ messages in thread
From: Ben Hutchings @ 2012-11-17 1:43 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Randy Dunlap, Takahiro Shimizu, Richard Cochran
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(-)
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
--
1.7.7.6
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] pch_gbe, ptp_pch: Fix the dependency direction between these drivers
2012-11-17 1:43 [PATCH net-next] pch_gbe, ptp_pch: Fix the dependency direction between these drivers Ben Hutchings
@ 2012-11-17 2:02 ` Randy Dunlap
2012-11-18 3:12 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2012-11-17 2:02 UTC (permalink / raw)
To: Ben Hutchings
Cc: David Miller, netdev, Randy Dunlap, Takahiro Shimizu,
Richard Cochran
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
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] pch_gbe, ptp_pch: Fix the dependency direction between these drivers
2012-11-17 2:02 ` Randy Dunlap
@ 2012-11-18 3:12 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2012-11-18 3:12 UTC (permalink / raw)
To: rdunlap; +Cc: bhutchings, netdev, tshimizu818, richardcochran
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-18 3:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-17 1:43 [PATCH net-next] pch_gbe, ptp_pch: Fix the dependency direction between these drivers Ben Hutchings
2012-11-17 2:02 ` Randy Dunlap
2012-11-18 3:12 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2012-11-17 1:43 Ben Hutchings
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).