Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
it821x: do not describe noraid parameter with its value
Pb1200/DBAu1200: fix bad IDE resource size
Au1200: IDE driver build fix
Au1200: kill IDE driver function prototypes
avr32 mustn't select HAVE_IDE
+13
-36
-1
arch/avr32/Kconfig
-1
arch/avr32/Kconfig
+1
-1
arch/mips/au1000/common/platform.c
+1
-1
arch/mips/au1000/common/platform.c
+7
-11
drivers/ide/mips/au1xxx-ide.c
+7
-11
drivers/ide/mips/au1xxx-ide.c
···
32
32
#include <linux/kernel.h>
33
33
#include <linux/delay.h>
34
34
#include <linux/platform_device.h>
35
-
36
35
#include <linux/init.h>
37
36
#include <linux/ide.h>
38
-
#include <linux/sysdev.h>
37
+
#include <linux/scatterlist.h>
39
38
40
-
#include <linux/dma-mapping.h>
41
-
42
-
#include "ide-timing.h"
43
-
44
-
#include <asm/io.h>
45
39
#include <asm/mach-au1x00/au1xxx.h>
46
40
#include <asm/mach-au1x00/au1xxx_dbdma.h>
47
-
48
41
#include <asm/mach-au1x00/au1xxx_ide.h>
49
42
50
43
#define DRV_NAME "au1200-ide"
···
48
55
49
56
static _auide_hwif auide_hwif;
50
57
static int dbdma_init_done;
58
+
59
+
static int auide_ddma_init(_auide_hwif *auide);
51
60
52
61
#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA)
53
62
···
586
591
goto out;
587
592
}
588
593
589
-
if (!request_mem_region (res->start, res->end-res->start, pdev->name)) {
594
+
if (!request_mem_region(res->start, res->end - res->start + 1,
595
+
pdev->name)) {
590
596
pr_debug("%s: request_mem_region failed\n", DRV_NAME);
591
597
ret = -EBUSY;
592
598
goto out;
593
599
}
594
600
595
-
ahwif->regbase = (u32)ioremap(res->start, res->end-res->start);
601
+
ahwif->regbase = (u32)ioremap(res->start, res->end - res->start + 1);
596
602
if (ahwif->regbase == 0) {
597
603
ret = -ENOMEM;
598
604
goto out;
···
678
682
iounmap((void *)ahwif->regbase);
679
683
680
684
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
681
-
release_mem_region(res->start, res->end - res->start);
685
+
release_mem_region(res->start, res->end - res->start + 1);
682
686
683
687
return 0;
684
688
}
+1
-1
drivers/ide/pci/it821x.c
+1
-1
drivers/ide/pci/it821x.c
···
667
667
module_init(it821x_ide_init);
668
668
669
669
module_param_named(noraid, it8212_noraid, int, S_IRUGO);
670
-
MODULE_PARM_DESC(it8212_noraid, "Force card into bypass mode");
670
+
MODULE_PARM_DESC(noraid, "Force card into bypass mode");
671
671
672
672
MODULE_AUTHOR("Alan Cox");
673
673
MODULE_DESCRIPTION("PCI driver module for the ITE 821x");
-18
include/asm-mips/mach-au1x00/au1xxx_ide.h
-18
include/asm-mips/mach-au1x00/au1xxx_ide.h
···
122
122
};
123
123
#endif
124
124
125
-
/* function prototyping */
126
-
u8 auide_inb(unsigned long port);
127
-
u16 auide_inw(unsigned long port);
128
-
u32 auide_inl(unsigned long port);
129
-
void auide_insw(unsigned long port, void *addr, u32 count);
130
-
void auide_insl(unsigned long port, void *addr, u32 count);
131
-
void auide_outb(u8 addr, unsigned long port);
132
-
void auide_outbsync(ide_drive_t *drive, u8 addr, unsigned long port);
133
-
void auide_outw(u16 addr, unsigned long port);
134
-
void auide_outl(u32 addr, unsigned long port);
135
-
void auide_outsw(unsigned long port, void *addr, u32 count);
136
-
void auide_outsl(unsigned long port, void *addr, u32 count);
137
-
static void auide_tune_drive(ide_drive_t *drive, byte pio);
138
-
static int auide_tune_chipset(ide_drive_t *drive, u8 speed);
139
-
static int auide_ddma_init( _auide_hwif *auide );
140
-
static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif);
141
-
int __init auide_probe(void);
142
-
143
125
/*******************************************************************************
144
126
* PIO Mode timing calculation : *
145
127
* *
+2
-2
include/asm-mips/mach-db1x00/db1200.h
+2
-2
include/asm-mips/mach-db1x00/db1200.h
···
173
173
#define AU1XXX_SMC91111_IRQ DB1200_ETH_INT
174
174
175
175
#define AU1XXX_ATA_PHYS_ADDR (0x18800000)
176
-
#define AU1XXX_ATA_PHYS_LEN (0x100)
177
-
#define AU1XXX_ATA_REG_OFFSET (5)
176
+
#define AU1XXX_ATA_REG_OFFSET (5)
177
+
#define AU1XXX_ATA_PHYS_LEN (16 << AU1XXX_ATA_REG_OFFSET)
178
178
#define AU1XXX_ATA_INT DB1200_IDE_INT
179
179
#define AU1XXX_ATA_DDMA_REQ DSCR_CMD0_DMA_REQ1;
180
180
#define AU1XXX_ATA_RQSIZE 128
+2
-2
include/asm-mips/mach-pb1x00/pb1200.h
+2
-2
include/asm-mips/mach-pb1x00/pb1200.h
···
186
186
#define AU1XXX_SMC91111_IRQ PB1200_ETH_INT
187
187
188
188
#define AU1XXX_ATA_PHYS_ADDR (0x0C800000)
189
-
#define AU1XXX_ATA_PHYS_LEN (0x100)
190
-
#define AU1XXX_ATA_REG_OFFSET (5)
189
+
#define AU1XXX_ATA_REG_OFFSET (5)
190
+
#define AU1XXX_ATA_PHYS_LEN (16 << AU1XXX_ATA_REG_OFFSET)
191
191
#define AU1XXX_ATA_INT PB1200_IDE_INT
192
192
#define AU1XXX_ATA_DDMA_REQ DSCR_CMD0_DMA_REQ1;
193
193
#define AU1XXX_ATA_RQSIZE 128