Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4465461ece2b9249d6c0cf57bc0002100823e361

Authored by Bartlomiej Zolnierkiewicz
1 parent 52913ab2c6

ide: merge ide_arm and ide_generic host drivers 

There is no need for a separate ide_arm host driver nowadays
so merge it into ide_generic one.

While at it:
- return -EBUSY from ide_generic_init() if I/O resources are busy
- scale down ide_generic_check_pci_legacy_iobases() for CONFIG_PCI=n

Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Alexander Schulz <alex@shark-linux.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 4 changed files with 15 additions and 66 deletions Side-by-side Diff

... ... @@ -222,7 +222,8 @@
222 222  
223 223 config IDE_GENERIC
224 224 tristate "generic/default IDE chipset support"
225   - depends on ALPHA || X86 || IA64 || M32R || MIPS
  225 + depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC || ARCH_SHARK
  226 + default ARM && (ARCH_RPC || ARCH_SHARK)
226 227 help
227 228 This is the generic IDE driver. This driver attaches to the
228 229 fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and
... ... @@ -730,11 +731,6 @@
730 731 tristate "Atmel AT91 (SAM9, CAP9, AT572D940HF) IDE support"
731 732 depends on ARM && ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_AT91X40
732 733 select IDE_TIMINGS
733   -
734   -config IDE_ARM
735   - tristate "ARM IDE support"
736   - depends on ARM && (ARCH_RPC || ARCH_SHARK)
737   - default y
738 734  
739 735 config BLK_DEV_IDE_ICSIDE
740 736 tristate "ICS IDE interface support"
drivers/ide/Makefile
Diff comments   View file @ 4465461
... ... @@ -21,8 +21,6 @@
21 21  
22 22 obj-$(CONFIG_IDE) += ide-core.o
23 23  
24   -obj-$(CONFIG_IDE_ARM) += ide_arm.o
25   -
26 24 obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o
27 25 obj-$(CONFIG_BLK_DEV_UMC8672) += umc8672.o
28 26 obj-$(CONFIG_BLK_DEV_DTC2278) += dtc2278.o
drivers/ide/ide-generic.c
Diff comments   View file @ 4465461
... ... @@ -13,7 +13,10 @@
13 13 #include <linux/ide.h>
14 14 #include <linux/pci_ids.h>
15 15  
16   -/* FIXME: convert m32r to use ide_platform host driver */
  16 +/* FIXME: convert arm and m32r to use ide_platform host driver */
  17 +#ifdef CONFIG_ARM
  18 +#include <asm/irq.h>
  19 +#endif
17 20 #ifdef CONFIG_M32R
18 21 #include <asm/m32r.h>
19 22 #endif
20 23  
... ... @@ -28,9 +31,12 @@
28 31 .host_flags = IDE_HFLAG_NO_DMA,
29 32 };
30 33  
31   -#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
32   - || defined(CONFIG_PLAT_OPSPUT)
  34 +#ifdef CONFIG_ARM
33 35 static const u16 legacy_bases[] = { 0x1f0 };
  36 +static const int legacy_irqs[] = { IRQ_HARDDISK };
  37 +#elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) || \
  38 + defined(CONFIG_PLAT_OPSPUT)
  39 +static const u16 legacy_bases[] = { 0x1f0 };
34 40 static const int legacy_irqs[] = { PLD_IRQ_CFIREQ };
35 41 #elif defined(CONFIG_PLAT_MAPPI3)
36 42 static const u16 legacy_bases[] = { 0x1f0, 0x170 };
37 43  
... ... @@ -45,11 +51,11 @@
45 51  
46 52 static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)
47 53 {
  54 +#ifdef CONFIG_PCI
48 55 struct pci_dev *p = NULL;
49 56 u16 val;
50 57  
51 58 for_each_pci_dev(p) {
52   -
53 59 if (pci_resource_start(p, 0) == 0x1f0)
54 60 *primary = 1;
55 61 if (pci_resource_start(p, 2) == 0x170)
... ... @@ -64,7 +70,6 @@
64 70 /* Intel MPIIX - PIO ATA on non PCI side of bridge */
65 71 if (p->vendor == PCI_VENDOR_ID_INTEL &&
66 72 p->device == PCI_DEVICE_ID_INTEL_82371MX) {
67   -
68 73 pci_read_config_word(p, 0x6C, &val);
69 74 if (val & 0x8000) {
70 75 /* ATA port enabled */
... ... @@ -75,6 +80,7 @@
75 80 }
76 81 }
77 82 }
  83 +#endif
78 84 }
79 85  
80 86 static int __init ide_generic_init(void)
... ... @@ -106,6 +112,7 @@
106 112 printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX "
107 113 "not free.\n",
108 114 DRV_NAME, io_addr, io_addr + 7);
  115 + rc = -EBUSY;
109 116 continue;
110 117 }
111 118  
... ... @@ -114,6 +121,7 @@
114 121 "not free.\n",
115 122 DRV_NAME, io_addr + 0x206);
116 123 release_region(io_addr, 8);
  124 + rc = -EBUSY;
117 125 continue;
118 126 }
119 127  
drivers/ide/ide_arm.c
View file @ 4465461
1   -/*
2   - * ARM default IDE host driver
3   - *
4   - * Copyright (C) 2004 Bartlomiej Zolnierkiewicz
5   - * Based on code by: Russell King, Ian Molton and Alexander Schulz.
6   - *
7   - * May be copied or modified under the terms of the GNU General Public License.
8   - */
9   -
10   -#include <linux/kernel.h>
11   -#include <linux/init.h>
12   -#include <linux/ide.h>
13   -
14   -#include <asm/irq.h>
15   -
16   -#define DRV_NAME "ide_arm"
17   -
18   -#define IDE_ARM_IO 0x1f0
19   -#define IDE_ARM_IRQ IRQ_HARDDISK
20   -
21   -static const struct ide_port_info ide_arm_port_info = {
22   - .host_flags = IDE_HFLAG_NO_DMA,
23   -};
24   -
25   -static int __init ide_arm_init(void)
26   -{
27   - unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206;
28   - hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
29   -
30   - if (!request_region(base, 8, DRV_NAME)) {
31   - printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
32   - DRV_NAME, base, base + 7);
33   - return -EBUSY;
34   - }
35   -
36   - if (!request_region(ctl, 1, DRV_NAME)) {
37   - printk(KERN_ERR "%s: I/O resource 0x%lX not free.\n",
38   - DRV_NAME, ctl);
39   - release_region(base, 8);
40   - return -EBUSY;
41   - }
42   -
43   - memset(&hw, 0, sizeof(hw));
44   - ide_std_init_ports(&hw, base, ctl);
45   - hw.irq = IDE_ARM_IRQ;
46   - hw.chipset = ide_generic;
47   -
48   - return ide_host_add(&ide_arm_port_info, hws, NULL);
49   -}
50   -
51   -module_init(ide_arm_init);
52   -
53   -MODULE_LICENSE("GPL");