|
@@ -181,12 +181,6 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
|
|
{
|
|
{
|
|
int mem_sttime;
|
|
int mem_sttime;
|
|
int mem_stcfg;
|
|
int mem_stcfg;
|
|
- unsigned long mode;
|
|
|
|
-
|
|
|
|
-#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
|
|
|
|
- if (ide_use_dma(drive))
|
|
|
|
- mode = ide_dma_speed(drive, 0);
|
|
|
|
-#endif
|
|
|
|
|
|
|
|
mem_sttime = 0;
|
|
mem_sttime = 0;
|
|
mem_stcfg = au_readl(MEM_STCFG2);
|
|
mem_stcfg = au_readl(MEM_STCFG2);
|
|
@@ -195,7 +189,7 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
|
|
auide_tune_drive(drive, speed - XFER_PIO_0);
|
|
auide_tune_drive(drive, speed - XFER_PIO_0);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
switch(speed) {
|
|
switch(speed) {
|
|
#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
|
|
#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
|
|
case XFER_MW_DMA_2:
|
|
case XFER_MW_DMA_2:
|
|
@@ -207,7 +201,6 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
|
|
mem_stcfg &= ~TOECS_MASK;
|
|
mem_stcfg &= ~TOECS_MASK;
|
|
mem_stcfg |= SBC_IDE_MDMA2_TCSOE | SBC_IDE_MDMA2_TOECS;
|
|
mem_stcfg |= SBC_IDE_MDMA2_TCSOE | SBC_IDE_MDMA2_TOECS;
|
|
|
|
|
|
- mode = XFER_MW_DMA_2;
|
|
|
|
break;
|
|
break;
|
|
case XFER_MW_DMA_1:
|
|
case XFER_MW_DMA_1:
|
|
mem_sttime = SBC_IDE_TIMING(MDMA1);
|
|
mem_sttime = SBC_IDE_TIMING(MDMA1);
|
|
@@ -218,7 +211,6 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
|
|
mem_stcfg &= ~TOECS_MASK;
|
|
mem_stcfg &= ~TOECS_MASK;
|
|
mem_stcfg |= SBC_IDE_MDMA1_TCSOE | SBC_IDE_MDMA1_TOECS;
|
|
mem_stcfg |= SBC_IDE_MDMA1_TCSOE | SBC_IDE_MDMA1_TOECS;
|
|
|
|
|
|
- mode = XFER_MW_DMA_1;
|
|
|
|
break;
|
|
break;
|
|
case XFER_MW_DMA_0:
|
|
case XFER_MW_DMA_0:
|
|
mem_sttime = SBC_IDE_TIMING(MDMA0);
|
|
mem_sttime = SBC_IDE_TIMING(MDMA0);
|
|
@@ -229,14 +221,13 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
|
|
mem_stcfg &= ~TOECS_MASK;
|
|
mem_stcfg &= ~TOECS_MASK;
|
|
mem_stcfg |= SBC_IDE_MDMA0_TCSOE | SBC_IDE_MDMA0_TOECS;
|
|
mem_stcfg |= SBC_IDE_MDMA0_TCSOE | SBC_IDE_MDMA0_TOECS;
|
|
|
|
|
|
- mode = XFER_MW_DMA_0;
|
|
|
|
break;
|
|
break;
|
|
#endif
|
|
#endif
|
|
default:
|
|
default:
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
-
|
|
|
|
- if (ide_config_drive_speed(drive, mode))
|
|
|
|
|
|
+
|
|
|
|
+ if (ide_config_drive_speed(drive, speed))
|
|
return 1;
|
|
return 1;
|
|
|
|
|
|
au_writel(mem_sttime,MEM_STTIME2);
|
|
au_writel(mem_sttime,MEM_STTIME2);
|