drivers/block: Move PARIDE protocol modules to drivers/ata/pata_parport
Move PARIDE protocol modules out of drivers/block into drivers/ata/pata_parport and update the CONFIG_ symbol names to PATA_PARPORT. [Damien] The pata_parport driver file itsef is also moved together with the protocol modules in drivers/ata/pata_parport. Signed-off-by: Ondrej Zary <linux@zary.sk> Acked-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
This commit is contained in:
Ondrej Zary
Damien Le Moal
parent
7750d8b510
commit
72f2b0b218
|
|
@ -98,7 +98,6 @@ obj-$(CONFIG_DIO) += dio/
|
|||
obj-$(CONFIG_SBUS) += sbus/
|
||||
obj-$(CONFIG_ZORRO) += zorro/
|
||||
obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/
|
||||
obj-y += block/paride/
|
||||
obj-$(CONFIG_TC) += tc/
|
||||
obj-$(CONFIG_USB_PHY) += usb/
|
||||
obj-$(CONFIG_USB) += usb/
|
||||
|
|
|
|||
|
|
@ -1174,7 +1174,7 @@ config PATA_PARPORT
|
|||
Read <file:Documentation/admin-guide/blockdev/paride.rst> for more
|
||||
information.
|
||||
|
||||
Use the old PARIDE protocol modules.
|
||||
source "drivers/ata/pata_parport/Kconfig"
|
||||
|
||||
comment "Generic fallback / legacy drivers"
|
||||
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ obj-$(CONFIG_PATA_SAMSUNG_CF) += pata_samsung_cf.o
|
|||
|
||||
obj-$(CONFIG_PATA_PXA) += pata_pxa.o
|
||||
|
||||
obj-$(CONFIG_PATA_PARPORT) += pata_parport.o
|
||||
obj-$(CONFIG_PATA_PARPORT) += pata_parport/
|
||||
|
||||
# Should be last but two libata driver
|
||||
obj-$(CONFIG_PATA_ACPI) += pata_acpi.o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,141 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
comment "Parallel IDE protocol modules"
|
||||
depends on PATA_PARPORT
|
||||
|
||||
config PATA_PARPORT_ATEN
|
||||
tristate "ATEN EH-100 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the ATEN EH-100 parallel port IDE
|
||||
protocol. This protocol is used in some inexpensive low performance
|
||||
parallel port kits made in Hong Kong.
|
||||
|
||||
config PATA_PARPORT_BPCK
|
||||
tristate "MicroSolutions backpack (Series 5) protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the Micro Solutions BACKPACK
|
||||
parallel port Series 5 IDE protocol. (Most BACKPACK drives made
|
||||
before 1999 were Series 5) Series 5 drives will NOT always have the
|
||||
Series noted on the bottom of the drive. Series 6 drivers will.
|
||||
|
||||
In other words, if your BACKPACK drive doesn't say "Series 6" on the
|
||||
bottom, enable this option.
|
||||
|
||||
config PATA_PARPORT_BPCK6
|
||||
tristate "MicroSolutions backpack (Series 6) protocol"
|
||||
depends on (PATA_PARPORT) && !64BIT
|
||||
help
|
||||
This option enables support for the Micro Solutions BACKPACK
|
||||
parallel port Series 6 IDE protocol. (Most BACKPACK drives made
|
||||
after 1999 were Series 6) Series 6 drives will have the Series noted
|
||||
on the bottom of the drive. Series 5 drivers don't always have it
|
||||
noted.
|
||||
|
||||
In other words, if your BACKPACK drive says "Series 6" on the
|
||||
bottom, enable this option.
|
||||
|
||||
config PATA_PARPORT_COMM
|
||||
tristate "DataStor Commuter protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the Commuter parallel port IDE
|
||||
protocol from DataStor.
|
||||
|
||||
config PATA_PARPORT_DSTR
|
||||
tristate "DataStor EP-2000 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the EP-2000 parallel port IDE
|
||||
protocol from DataStor
|
||||
|
||||
config PATA_PARPORT_FIT2
|
||||
tristate "FIT TD-2000 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the TD-2000 parallel port IDE
|
||||
protocol from Fidelity International Technology. This is a simple
|
||||
(low speed) adapter that is used in some portable hard drives.
|
||||
|
||||
config PATA_PARPORT_FIT3
|
||||
tristate "FIT TD-3000 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the TD-3000 parallel port IDE
|
||||
protocol from Fidelity International Technology. This protocol is
|
||||
used in newer models of their portable disk, CD-ROM and PD/CD
|
||||
devices.
|
||||
|
||||
config PATA_PARPORT_EPAT
|
||||
tristate "Shuttle EPAT/EPEZ protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the EPAT parallel port IDE protocol.
|
||||
EPAT is a parallel port IDE adapter manufactured by Shuttle
|
||||
Technology and widely used in devices from major vendors such as
|
||||
Hewlett-Packard, SyQuest, Imation and Avatar.
|
||||
|
||||
config PATA_PARPORT_EPATC8
|
||||
bool "Support c7/c8 chips"
|
||||
depends on PATA_PARPORT_EPAT
|
||||
help
|
||||
This option enables support for the newer Shuttle EP1284 (aka c7 and
|
||||
c8) chip. You need this if you are using any recent Imation SuperDisk
|
||||
(LS-120) drive.
|
||||
|
||||
config PATA_PARPORT_EPIA
|
||||
tristate "Shuttle EPIA protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the (obsolete) EPIA parallel port
|
||||
IDE protocol from Shuttle Technology. This adapter can still be
|
||||
found in some no-name kits.
|
||||
|
||||
config PATA_PARPORT_FRIQ
|
||||
tristate "Freecom IQ ASIC-2 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for version 2 of the Freecom IQ parallel
|
||||
port IDE adapter. This adapter is used by the Maxell Superdisk
|
||||
drive.
|
||||
|
||||
config PATA_PARPORT_FRPW
|
||||
tristate "FreeCom power protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the Freecom power parallel port IDE
|
||||
protocol.
|
||||
|
||||
config PATA_PARPORT_KBIC
|
||||
tristate "KingByte KBIC-951A/971A protocols"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the KBIC-951A and KBIC-971A parallel
|
||||
port IDE protocols from KingByte Information Corp. KingByte's
|
||||
adapters appear in many no-name portable disk and CD-ROM products,
|
||||
especially in Europe.
|
||||
|
||||
config PATA_PARPORT_KTTI
|
||||
tristate "KT PHd protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the "PHd" parallel port IDE protocol
|
||||
from KT Technology. This is a simple (low speed) adapter that is
|
||||
used in some 2.5" portable hard drives.
|
||||
|
||||
config PATA_PARPORT_ON20
|
||||
tristate "OnSpec 90c20 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the (obsolete) 90c20 parallel port
|
||||
IDE protocol from OnSpec (often marketed under the ValuStore brand
|
||||
name).
|
||||
|
||||
config PATA_PARPORT_ON26
|
||||
tristate "OnSpec 90c26 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the 90c26 parallel port IDE protocol
|
||||
from OnSpec Electronics (often marketed under the ValuStore brand
|
||||
name).
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
obj-$(CONFIG_PATA_PARPORT) += pata_parport.o
|
||||
|
||||
obj-$(CONFIG_PATA_PARPORT_ATEN) += aten.o
|
||||
obj-$(CONFIG_PATA_PARPORT_BPCK) += bpck.o
|
||||
obj-$(CONFIG_PATA_PARPORT_COMM) += comm.o
|
||||
obj-$(CONFIG_PATA_PARPORT_DSTR) += dstr.o
|
||||
obj-$(CONFIG_PATA_PARPORT_KBIC) += kbic.o
|
||||
obj-$(CONFIG_PATA_PARPORT_EPAT) += epat.o
|
||||
obj-$(CONFIG_PATA_PARPORT_EPIA) += epia.o
|
||||
obj-$(CONFIG_PATA_PARPORT_FRPW) += frpw.o
|
||||
obj-$(CONFIG_PATA_PARPORT_FRIQ) += friq.o
|
||||
obj-$(CONFIG_PATA_PARPORT_FIT2) += fit2.o
|
||||
obj-$(CONFIG_PATA_PARPORT_FIT3) += fit3.o
|
||||
obj-$(CONFIG_PATA_PARPORT_ON20) += on20.o
|
||||
obj-$(CONFIG_PATA_PARPORT_ON26) += on26.o
|
||||
obj-$(CONFIG_PATA_PARPORT_KTTI) += ktti.o
|
||||
obj-$(CONFIG_PATA_PARPORT_BPCK6) += bpck6.o
|
||||
|
|
@ -103,8 +103,6 @@ config GDROM
|
|||
Most users will want to say "Y" here.
|
||||
You can also build this as a module which will be called gdrom.
|
||||
|
||||
source "drivers/block/paride/Kconfig"
|
||||
|
||||
source "drivers/block/mtip32xx/Kconfig"
|
||||
|
||||
source "drivers/block/zram/Kconfig"
|
||||
|
|
|
|||
|
|
@ -1,213 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# PARIDE configuration
|
||||
|
||||
comment "Parallel IDE protocol modules"
|
||||
depends on PATA_PARPORT
|
||||
|
||||
config PARIDE_ATEN
|
||||
tristate "ATEN EH-100 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the ATEN EH-100 parallel port IDE
|
||||
protocol. This protocol is used in some inexpensive low performance
|
||||
parallel port kits made in Hong Kong. If you chose to build PARIDE
|
||||
support into your kernel, you may answer Y here to build in the
|
||||
protocol driver, otherwise you should answer M to build it as a
|
||||
loadable module. The module will be called aten. You must also
|
||||
have a high-level driver for the type of device that you want to
|
||||
support.
|
||||
|
||||
config PARIDE_BPCK
|
||||
tristate "MicroSolutions backpack (Series 5) protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the Micro Solutions BACKPACK
|
||||
parallel port Series 5 IDE protocol. (Most BACKPACK drives made
|
||||
before 1999 were Series 5) Series 5 drives will NOT always have the
|
||||
Series noted on the bottom of the drive. Series 6 drivers will.
|
||||
|
||||
In other words, if your BACKPACK drive doesn't say "Series 6" on the
|
||||
bottom, enable this option.
|
||||
|
||||
If you chose to build PARIDE support into your kernel, you may
|
||||
answer Y here to build in the protocol driver, otherwise you should
|
||||
answer M to build it as a loadable module. The module will be
|
||||
called bpck. You must also have a high-level driver for the type
|
||||
of device that you want to support.
|
||||
|
||||
config PARIDE_BPCK6
|
||||
tristate "MicroSolutions backpack (Series 6) protocol"
|
||||
depends on (PATA_PARPORT) && !64BIT
|
||||
help
|
||||
This option enables support for the Micro Solutions BACKPACK
|
||||
parallel port Series 6 IDE protocol. (Most BACKPACK drives made
|
||||
after 1999 were Series 6) Series 6 drives will have the Series noted
|
||||
on the bottom of the drive. Series 5 drivers don't always have it
|
||||
noted.
|
||||
|
||||
In other words, if your BACKPACK drive says "Series 6" on the
|
||||
bottom, enable this option.
|
||||
|
||||
If you chose to build PARIDE support into your kernel, you may
|
||||
answer Y here to build in the protocol driver, otherwise you should
|
||||
answer M to build it as a loadable module. The module will be
|
||||
called bpck6. You must also have a high-level driver for the type
|
||||
of device that you want to support.
|
||||
|
||||
config PARIDE_COMM
|
||||
tristate "DataStor Commuter protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the Commuter parallel port IDE
|
||||
protocol from DataStor. If you chose to build PARIDE support
|
||||
into your kernel, you may answer Y here to build in the protocol
|
||||
driver, otherwise you should answer M to build it as a loadable
|
||||
module. The module will be called comm. You must also have
|
||||
a high-level driver for the type of device that you want to support.
|
||||
|
||||
config PARIDE_DSTR
|
||||
tristate "DataStor EP-2000 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the EP-2000 parallel port IDE
|
||||
protocol from DataStor. If you chose to build PARIDE support
|
||||
into your kernel, you may answer Y here to build in the protocol
|
||||
driver, otherwise you should answer M to build it as a loadable
|
||||
module. The module will be called dstr. You must also have
|
||||
a high-level driver for the type of device that you want to support.
|
||||
|
||||
config PARIDE_FIT2
|
||||
tristate "FIT TD-2000 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the TD-2000 parallel port IDE
|
||||
protocol from Fidelity International Technology. This is a simple
|
||||
(low speed) adapter that is used in some portable hard drives. If
|
||||
you chose to build PARIDE support into your kernel, you may answer Y
|
||||
here to build in the protocol driver, otherwise you should answer M
|
||||
to build it as a loadable module. The module will be called ktti.
|
||||
You must also have a high-level driver for the type of device that
|
||||
you want to support.
|
||||
|
||||
config PARIDE_FIT3
|
||||
tristate "FIT TD-3000 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the TD-3000 parallel port IDE
|
||||
protocol from Fidelity International Technology. This protocol is
|
||||
used in newer models of their portable disk, CD-ROM and PD/CD
|
||||
devices. If you chose to build PARIDE support into your kernel, you
|
||||
may answer Y here to build in the protocol driver, otherwise you
|
||||
should answer M to build it as a loadable module. The module will be
|
||||
called fit3. You must also have a high-level driver for the type
|
||||
of device that you want to support.
|
||||
|
||||
config PARIDE_EPAT
|
||||
tristate "Shuttle EPAT/EPEZ protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the EPAT parallel port IDE protocol.
|
||||
EPAT is a parallel port IDE adapter manufactured by Shuttle
|
||||
Technology and widely used in devices from major vendors such as
|
||||
Hewlett-Packard, SyQuest, Imation and Avatar. If you chose to build
|
||||
PARIDE support into your kernel, you may answer Y here to build in
|
||||
the protocol driver, otherwise you should answer M to build it as a
|
||||
loadable module. The module will be called epat. You must also
|
||||
have a high-level driver for the type of device that you want to
|
||||
support.
|
||||
|
||||
config PARIDE_EPATC8
|
||||
bool "Support c7/c8 chips"
|
||||
depends on PARIDE_EPAT
|
||||
help
|
||||
This option enables support for the newer Shuttle EP1284 (aka c7 and
|
||||
c8) chip. You need this if you are using any recent Imation SuperDisk
|
||||
(LS-120) drive.
|
||||
|
||||
config PARIDE_EPIA
|
||||
tristate "Shuttle EPIA protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the (obsolete) EPIA parallel port
|
||||
IDE protocol from Shuttle Technology. This adapter can still be
|
||||
found in some no-name kits. If you chose to build PARIDE support
|
||||
into your kernel, you may answer Y here to build in the protocol
|
||||
driver, otherwise you should answer M to build it as a loadable
|
||||
module. The module will be called epia. You must also have a
|
||||
high-level driver for the type of device that you want to support.
|
||||
|
||||
config PARIDE_FRIQ
|
||||
tristate "Freecom IQ ASIC-2 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for version 2 of the Freecom IQ parallel
|
||||
port IDE adapter. This adapter is used by the Maxell Superdisk
|
||||
drive. If you chose to build PARIDE support into your kernel, you
|
||||
may answer Y here to build in the protocol driver, otherwise you
|
||||
should answer M to build it as a loadable module. The module will be
|
||||
called friq. You must also have a high-level driver for the type
|
||||
of device that you want to support.
|
||||
|
||||
config PARIDE_FRPW
|
||||
tristate "FreeCom power protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the Freecom power parallel port IDE
|
||||
protocol. If you chose to build PARIDE support into your kernel, you
|
||||
may answer Y here to build in the protocol driver, otherwise you
|
||||
should answer M to build it as a loadable module. The module will be
|
||||
called frpw. You must also have a high-level driver for the type
|
||||
of device that you want to support.
|
||||
|
||||
config PARIDE_KBIC
|
||||
tristate "KingByte KBIC-951A/971A protocols"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the KBIC-951A and KBIC-971A parallel
|
||||
port IDE protocols from KingByte Information Corp. KingByte's
|
||||
adapters appear in many no-name portable disk and CD-ROM products,
|
||||
especially in Europe. If you chose to build PARIDE support into your
|
||||
kernel, you may answer Y here to build in the protocol driver,
|
||||
otherwise you should answer M to build it as a loadable module. The
|
||||
module will be called kbic. You must also have a high-level driver
|
||||
for the type of device that you want to support.
|
||||
|
||||
config PARIDE_KTTI
|
||||
tristate "KT PHd protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the "PHd" parallel port IDE protocol
|
||||
from KT Technology. This is a simple (low speed) adapter that is
|
||||
used in some 2.5" portable hard drives. If you chose to build PARIDE
|
||||
support into your kernel, you may answer Y here to build in the
|
||||
protocol driver, otherwise you should answer M to build it as a
|
||||
loadable module. The module will be called ktti. You must also
|
||||
have a high-level driver for the type of device that you want to
|
||||
support.
|
||||
|
||||
config PARIDE_ON20
|
||||
tristate "OnSpec 90c20 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the (obsolete) 90c20 parallel port
|
||||
IDE protocol from OnSpec (often marketed under the ValuStore brand
|
||||
name). If you chose to build PARIDE support into your kernel, you
|
||||
may answer Y here to build in the protocol driver, otherwise you
|
||||
should answer M to build it as a loadable module. The module will
|
||||
be called on20. You must also have a high-level driver for the
|
||||
type of device that you want to support.
|
||||
|
||||
config PARIDE_ON26
|
||||
tristate "OnSpec 90c26 protocol"
|
||||
depends on PATA_PARPORT
|
||||
help
|
||||
This option enables support for the 90c26 parallel port IDE protocol
|
||||
from OnSpec Electronics (often marketed under the ValuStore brand
|
||||
name). If you chose to build PARIDE support into your kernel, you
|
||||
may answer Y here to build in the protocol driver, otherwise you
|
||||
should answer M to build it as a loadable module. The module will be
|
||||
called on26. You must also have a high-level driver for the type
|
||||
of device that you want to support.
|
||||
|
||||
#
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Makefile for Parallel port IDE device drivers.
|
||||
#
|
||||
# 7 October 2000, Bartlomiej Zolnierkiewicz <bkz@linux-ide.org>
|
||||
# Rewritten to use lists instead of if-statements.
|
||||
#
|
||||
|
||||
obj-$(CONFIG_PARIDE_ATEN) += aten.o
|
||||
obj-$(CONFIG_PARIDE_BPCK) += bpck.o
|
||||
obj-$(CONFIG_PARIDE_COMM) += comm.o
|
||||
obj-$(CONFIG_PARIDE_DSTR) += dstr.o
|
||||
obj-$(CONFIG_PARIDE_KBIC) += kbic.o
|
||||
obj-$(CONFIG_PARIDE_EPAT) += epat.o
|
||||
obj-$(CONFIG_PARIDE_EPIA) += epia.o
|
||||
obj-$(CONFIG_PARIDE_FRPW) += frpw.o
|
||||
obj-$(CONFIG_PARIDE_FRIQ) += friq.o
|
||||
obj-$(CONFIG_PARIDE_FIT2) += fit2.o
|
||||
obj-$(CONFIG_PARIDE_FIT3) += fit3.o
|
||||
obj-$(CONFIG_PARIDE_ON20) += on20.o
|
||||
obj-$(CONFIG_PARIDE_ON26) += on26.o
|
||||
obj-$(CONFIG_PARIDE_KTTI) += ktti.o
|
||||
obj-$(CONFIG_PARIDE_BPCK6) += bpck6.o
|
||||
Loading…
Reference in New Issue