Commit 8f29e650 authored by Jordan Crouse's avatar Jordan Crouse Committed by Bartlomiej Zolnierkiewicz
Browse files

[PATCH] ide: AU1200 IDE update 



Changes here include removing all of CONFIG_PM while it is being repeatedly
smacked with a lead pipe, moving the BURSTMODE param to a #define (it should
be defined almost always anyway), fixing the rqsize stuff, pulling ide_ioreg_t,
and general cleanups and whatnot.

Signed-off-by: default avatarJordan Crouse <jordan.crouse@amd.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 65e5f2e3

drivers/ide/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -807,14 +807,6 @@ config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA 
       depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX

endchoice



config BLK_DEV_IDE_AU1XXX_BURSTABLE_ON

        bool "Enable burstable Mode on DbDMA"

        default false

        depends BLK_DEV_IDE_AU1XXX

        help

          This option enable the burstable Flag on DbDMA controller

          (cf. "AMD Alchemy 'Au1200' Processor Data Book - PRELIMINARY").



config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ

       int "Maximum transfer size (KB) per request (up to 128)"

       default "128"

drivers/ide/mips/Makefile

+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_BLK_DEV_IDE_SWARM)		+= swarm.o

obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)	+= au1xxx-ide.o



EXTRA_CFLAGS    := -Idrivers/ide

drivers/ide/mips/au1xxx-ide.c

+532 −966

File changed.

Preview size limit exceeded, changes collapsed.

include/asm-mips/mach-au1x00/au1xxx_ide.h

+8 −9
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ typedef struct 
        u8                      white_list, black_list;

        struct dbdma_cmd        *dma_table_cpu;

        dma_addr_t              dma_table_dma;

        struct scatterlist      *sg_table;

        int                     sg_nents;

        int                     sg_dma_direction;

#endif

        struct device           *dev;

	int			irq;
@@ -162,13 +159,9 @@ int __init auide_probe(void); 
 * Multi-Word DMA + DbDMA functions

 */

#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA



        static int in_drive_list(struct hd_driveid *id,

                                 const struct drive_list_entry *drive_table);

        static int auide_build_sglist(ide_drive_t *drive,  struct request *rq);

        static int auide_build_dmatable(ide_drive_t *drive);

        static int auide_dma_end(ide_drive_t *drive);

        static void auide_dma_start(ide_drive_t *drive );

        ide_startstop_t auide_dma_intr (ide_drive_t *drive);

        static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command);

        static int auide_dma_setup(ide_drive_t *drive);
@@ -183,8 +176,6 @@ int __init auide_probe(void); 
        static void auide_ddma_rx_callback(int irq, void *param,

                                           struct pt_regs *regs);

        static int auide_dma_off_quietly(ide_drive_t *drive);

        static int auide_dma_timeout(ide_drive_t *drive);



#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */



/*******************************************************************************
@@ -294,3 +285,11 @@ int __init auide_probe(void); 
#define SBC_IDE_MDMA2_TPM     (0x00<<6)

#define SBC_IDE_MDMA2_TA      (0x12<<0)



#define SBC_IDE_TIMING(mode) \

         SBC_IDE_##mode##_TWCS | \

         SBC_IDE_##mode##_TCSH | \

         SBC_IDE_##mode##_TCSOFF | \

         SBC_IDE_##mode##_TWP | \

         SBC_IDE_##mode##_TCSW | \

         SBC_IDE_##mode##_TPM | \

         SBC_IDE_##mode##_TA

CRA Git | Maintained and supported by SUSTech CRA and CCSE