1 files changed, 36 insertions, 0 deletions

diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 56cdaa0eeea5..32c044b17d45 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -44,6 +44,36 @@
 int falconide_intr_lock;
 EXPORT_SYMBOL(falconide_intr_lock);
 
+static void falconide_atapi_input_bytes(ide_drive_t *drive, void *buf,
+                                        unsigned int len)
+{
+        insw_swapw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2);
+}
+
+static void falconide_atapi_output_bytes(ide_drive_t *drive, void *buf,
+                                         unsigned int len)
+{
+        outsw_swapw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2);
+}
+
+static void falconide_ata_input_data(ide_drive_t *drive, struct request *rq,
+                                     void *buf, unsigned int wcount)
+{
+        if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS)
+                return insw(drive->hwif->io_ports.data_addr, buf, wcount * 2);
+
+        falconide_atapi_input_bytes(drive, buf, wcount * 4);
+}
+
+static void falconide_ata_output_data(ide_drive_t *drive, struct request *rq,
+                                      void *buf, unsigned int wcount)
+{
+        if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS)
+                return outsw(drive->hwif->io_ports.data_addr, buf, wcount * 2);
+
+        falconide_atapi_output_bytes(drive, buf, wcount * 4);
+}
+
 static void __init falconide_setup_ports(hw_regs_t *hw)
 {
         int i;
@@ -90,6 +120,12 @@ static int __init falconide_init(void)
                 ide_init_port_data(hwif, index);
                 ide_init_port_hw(hwif, &hw);
 
+                /* Atari has a byte-swapped IDE interface */
+                hwif->atapi_input_bytes  = falconide_atapi_input_bytes;
+                hwif->atapi_output_bytes = falconide_atapi_output_bytes;
+                hwif->ata_input_data     = falconide_ata_input_data;
+                hwif->ata_output_data    = falconide_ata_output_data;
+
                 ide_get_lock(NULL, NULL);
                 ide_device_add(idx, NULL);
                 ide_release_lock();