7992fdb045
This reverts commit 1ff5359afa which is
commit c3efcedd272aa6dd5929e20cf902a52ddaa1197a upstream.
The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig")
depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
which is not part of Linux 5.10.y . Revert the aforementioned commit to
prevent breakage in 5.10.y .
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Sasha Levin <sashal@kernel.org>
Cc: <stable@vger.kernel.org> # 5.10.x
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
59 lines
1.5 KiB
Plaintext
59 lines
1.5 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0-only
|
|
#
|
|
# Micrel device configuration
|
|
#
|
|
|
|
config NET_VENDOR_MICREL
|
|
bool "Micrel devices"
|
|
default y
|
|
depends on (HAS_IOMEM && DMA_ENGINE) || SPI || PCI || HAS_IOMEM
|
|
help
|
|
If you have a network (Ethernet) card belonging to this class, say Y.
|
|
|
|
Note that the answer to this question doesn't directly affect the
|
|
kernel: saying N will just cause the configurator to skip all
|
|
the questions about Micrel devices. If you say Y, you will be asked
|
|
for your specific card in the following questions.
|
|
|
|
if NET_VENDOR_MICREL
|
|
|
|
config KS8842
|
|
tristate "Micrel KSZ8841/42 with generic bus interface"
|
|
depends on HAS_IOMEM && DMA_ENGINE
|
|
help
|
|
This platform driver is for KSZ8841(1-port) / KS8842(2-port)
|
|
ethernet switch chip (managed, VLAN, QoS) from Micrel or
|
|
Timberdale(FPGA).
|
|
|
|
config KS8851
|
|
tristate "Micrel KS8851 SPI"
|
|
depends on SPI
|
|
select MII
|
|
select CRC32
|
|
select EEPROM_93CX6
|
|
help
|
|
SPI driver for Micrel KS8851 SPI attached network chip.
|
|
|
|
config KS8851_MLL
|
|
tristate "Micrel KS8851 MLL"
|
|
depends on HAS_IOMEM
|
|
select MII
|
|
select CRC32
|
|
select EEPROM_93CX6
|
|
help
|
|
This platform driver is for Micrel KS8851 Address/data bus
|
|
multiplexed network chip.
|
|
|
|
config KSZ884X_PCI
|
|
tristate "Micrel KSZ8841/2 PCI"
|
|
depends on PCI
|
|
select MII
|
|
select CRC32
|
|
help
|
|
This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
|
|
|
|
To compile this driver as a module, choose M here. The module
|
|
will be called ksz884x.
|
|
|
|
endif # NET_VENDOR_MICREL
|