Skip to content

Commit 80ade22

Browse files
sudeepduttgregkh
authored andcommitted
misc: mic: remove the MIC drivers
This patch removes the MIC drivers from the kernel tree since the corresponding devices have been discontinued. Removing the dma and char-misc changes in one patch and merging via the char-misc tree is best to avoid any potential build breakage. Cc: Nikhil Rao <[email protected]> Reviewed-by: Ashutosh Dixit <[email protected]> Signed-off-by: Sudeep Dutt <[email protected]> Acked-By: Vinod Koul <[email protected]> Reviewed-by: Sherry Sun <[email protected]> Link: https://lore.kernel.org/r/8c1443136563de34699d2c084df478181c205db4.1603854416.git.sudeep.dutt@intel.com Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 3650b22 commit 80ade22

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+0
-26779
lines changed

Documentation/misc-devices/mic/index.rst

Lines changed: 0 additions & 16 deletions
This file was deleted.

Documentation/misc-devices/mic/mic_overview.rst

Lines changed: 0 additions & 85 deletions
This file was deleted.

Documentation/misc-devices/mic/scif_overview.rst

Lines changed: 0 additions & 108 deletions
This file was deleted.

MAINTAINERS

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8976,22 +8976,6 @@ S: Supported
89768976
W: https://01.org/linux-acpi
89778977
F: drivers/platform/x86/intel_menlow.c
89788978

8979-
INTEL MIC DRIVERS (mic)
8980-
M: Sudeep Dutt <[email protected]>
8981-
M: Ashutosh Dixit <[email protected]>
8982-
S: Supported
8983-
W: https://github.com/sudeepdutt/mic
8984-
W: http://software.intel.com/en-us/mic-developer
8985-
F: Documentation/misc-devices/mic/
8986-
F: drivers/dma/mic_x100_dma.c
8987-
F: drivers/dma/mic_x100_dma.h
8988-
F: drivers/misc/mic/
8989-
F: include/linux/mic_bus.h
8990-
F: include/linux/scif.h
8991-
F: include/uapi/linux/mic_common.h
8992-
F: include/uapi/linux/mic_ioctl.h
8993-
F: include/uapi/linux/scif_ioctl.h
8994-
89958979
INTEL P-Unit IPC DRIVER
89968980
M: Zha Qipeng <[email protected]>
89978981

drivers/dma/Kconfig

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -318,24 +318,6 @@ config INTEL_IOP_ADMA
318318
help
319319
Enable support for the Intel(R) IOP Series RAID engines.
320320

321-
config INTEL_MIC_X100_DMA
322-
tristate "Intel MIC X100 DMA Driver"
323-
depends on 64BIT && X86 && INTEL_MIC_BUS
324-
select DMA_ENGINE
325-
help
326-
This enables DMA support for the Intel Many Integrated Core
327-
(MIC) family of PCIe form factor coprocessor X100 devices that
328-
run a 64 bit Linux OS. This driver will be used by both MIC
329-
host and card drivers.
330-
331-
If you are building host kernel with a MIC device or a card
332-
kernel for a MIC device, then say M (recommended) or Y, else
333-
say N. If unsure say N.
334-
335-
More information about the Intel MIC family as well as the Linux
336-
OS and tools for MIC to use with this driver are available from
337-
<http://software.intel.com/en-us/mic-developer>.
338-
339321
config K3_DMA
340322
tristate "Hisilicon K3 DMA support"
341323
depends on ARCH_HI3xxx || ARCH_HISI || COMPILE_TEST

drivers/dma/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ obj-$(CONFIG_INTEL_IDMA64) += idma64.o
4444
obj-$(CONFIG_INTEL_IOATDMA) += ioat/
4545
obj-$(CONFIG_INTEL_IDXD) += idxd/
4646
obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o
47-
obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o
4847
obj-$(CONFIG_K3_DMA) += k3dma.o
4948
obj-$(CONFIG_LPC18XX_DMAMUX) += lpc18xx-dmamux.o
5049
obj-$(CONFIG_MILBEAUT_HDMAC) += milbeaut-hdmac.o

0 commit comments

Comments
 (0)