| Message ID | 20190625084828.540-2-palmer@sifive.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2,1/2] net: macb: Kconfig: Make MACB depend on COMMON_CLK | expand |
On 25/06/2019 at 10:48, Palmer Dabbelt wrote: > commit c218ad559020 ("macb: Add support for SiFive FU540-C000") added a > dependency on the common clock framework to the macb driver, but didn't > express that dependency in Kconfig. As a result macb now fails to > compile on systems without COMMON_CLK, which specifically causes a build > failure on powerpc allyesconfig. > > This patch adds the dependency, which results in the macb driver no > longer being selectable on systems without the common clock framework. > All known systems that have this device already support the common clock > framework, so this should not cause trouble for any uses. Supporting > both the FU540-C000 and systems without COMMON_CLK is quite ugly. > > I've build tested this on powerpc allyesconfig and RISC-V defconfig > (which selects MACB), but I have not even booted the resulting kernels. > > Fixes: c218ad559020 ("macb: Add support for SiFive FU540-C000") > Signed-off-by: Palmer Dabbelt <palmer@sifive.com> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Thanks! > --- > drivers/net/ethernet/cadence/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig > index 1766697c9c5a..64d8d6ee7739 100644 > --- a/drivers/net/ethernet/cadence/Kconfig > +++ b/drivers/net/ethernet/cadence/Kconfig > @@ -21,7 +21,7 @@ if NET_VENDOR_CADENCE > > config MACB > tristate "Cadence MACB/GEM support" > - depends on HAS_DMA > + depends on HAS_DMA && COMMON_CLK > select PHYLIB > ---help--- > The Cadence MACB ethernet interface is found on many Atmel AT32 and > @@ -42,7 +42,7 @@ config MACB_USE_HWSTAMP > > config MACB_PCI > tristate "Cadence PCI MACB/GEM support" > - depends on MACB && PCI && COMMON_CLK > + depends on MACB && PCI > ---help--- > This is PCI wrapper for MACB driver. > >
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig index 1766697c9c5a..64d8d6ee7739 100644 --- a/drivers/net/ethernet/cadence/Kconfig +++ b/drivers/net/ethernet/cadence/Kconfig @@ -21,7 +21,7 @@ if NET_VENDOR_CADENCE config MACB tristate "Cadence MACB/GEM support" - depends on HAS_DMA + depends on HAS_DMA && COMMON_CLK select PHYLIB ---help--- The Cadence MACB ethernet interface is found on many Atmel AT32 and @@ -42,7 +42,7 @@ config MACB_USE_HWSTAMP config MACB_PCI tristate "Cadence PCI MACB/GEM support" - depends on MACB && PCI && COMMON_CLK + depends on MACB && PCI ---help--- This is PCI wrapper for MACB driver.
commit c218ad559020 ("macb: Add support for SiFive FU540-C000") added a dependency on the common clock framework to the macb driver, but didn't express that dependency in Kconfig. As a result macb now fails to compile on systems without COMMON_CLK, which specifically causes a build failure on powerpc allyesconfig. This patch adds the dependency, which results in the macb driver no longer being selectable on systems without the common clock framework. All known systems that have this device already support the common clock framework, so this should not cause trouble for any uses. Supporting both the FU540-C000 and systems without COMMON_CLK is quite ugly. I've build tested this on powerpc allyesconfig and RISC-V defconfig (which selects MACB), but I have not even booted the resulting kernels. Fixes: c218ad559020 ("macb: Add support for SiFive FU540-C000") Signed-off-by: Palmer Dabbelt <palmer@sifive.com> --- drivers/net/ethernet/cadence/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)