Commit 72f2b0b2 authored by Ondrej Zary's avatar Ondrej Zary Committed by Damien Le Moal
Browse files

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: default avatarOndrej Zary <linux@zary.sk>
Acked-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 7750d8b5

drivers/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/

drivers/ata/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/ata/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/block/paride/Kconfig→drivers/ata/pata_parport/Kconfig

+141 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# PARIDE configuration



comment "Parallel IDE protocol modules"

	depends on PATA_PARPORT



config PARIDE_ATEN

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. 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

	  parallel port kits made in Hong Kong.



config PATA_PARPORT_BPCK

	tristate "MicroSolutions backpack (Series 5) protocol"

	depends on PATA_PARPORT

	help
@@ -30,13 +23,7 @@ config PARIDE_BPCK 
	  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

config PATA_PARPORT_BPCK6

	tristate "MicroSolutions backpack (Series 6) protocol"

	depends on (PATA_PARPORT) && !64BIT

	help
@@ -49,165 +36,106 @@ config PARIDE_BPCK6 
	  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

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. 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.

	  protocol from DataStor.



config PARIDE_DSTR

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. 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.

	  protocol from DataStor



config PARIDE_FIT2

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. 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

	  (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. 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.

	  devices.



config PARIDE_EPAT

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. 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

	  Hewlett-Packard, SyQuest, Imation and Avatar.



config PATA_PARPORT_EPATC8

	bool "Support c7/c8 chips"

	depends on PARIDE_EPAT

	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 PARIDE_EPIA

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. 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.

	  found in some no-name kits.



config PARIDE_FRIQ

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.  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.

	  drive.



config PARIDE_FRPW

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. 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.

	  protocol.



config PARIDE_KBIC

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. 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.

	  especially in Europe.



config PARIDE_KTTI

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. 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

	  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). 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.

	  name).



config PARIDE_ON26

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). 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.



#
 
	  name).

drivers/ata/pata_parport/Makefile

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# 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