aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:09 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:09 -0500
commitc99c92c58757985096e2d195dc1631246d99d686 (patch)
treec1663bd62c4fbc8ebf6020ea189c74a9c5523be6
parent81ca691981da718727281238b435dcf1528d2fda (diff)
ide: print banner message once per controller in m68k host drivers
* Print banner message once per controller in m68k host drivers. * Change printk() level to KERN_INFO in buddha, falconide and gayle. * Add banner message to q40ide. This is basically a preparation for the future IDE layer changes. Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/legacy/buddha.c19
-rw-r--r--drivers/ide/legacy/falconide.c4
-rw-r--r--drivers/ide/legacy/gayle.c18
-rw-r--r--drivers/ide/legacy/macide.c14
-rw-r--r--drivers/ide/legacy/q40ide.c2
5 files changed, 22 insertions, 35 deletions
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index e97766aef374..74d28e058f55 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -112,6 +112,7 @@ typedef enum BuddhaType_Enum {
112 BOARD_BUDDHA, BOARD_CATWEASEL, BOARD_XSURF 112 BOARD_BUDDHA, BOARD_CATWEASEL, BOARD_XSURF
113} BuddhaType; 113} BuddhaType;
114 114
115static const char *buddha_board_name[] = { "Buddha", "Catweasel", "X-Surf" };
115 116
116 /* 117 /*
117 * Check and acknowledge the interrupt status 118 * Check and acknowledge the interrupt status
@@ -197,7 +198,10 @@ fail_base2:
197 /* X-Surf doesn't have this. IRQs are always on */ 198 /* X-Surf doesn't have this. IRQs are always on */
198 if (type != BOARD_XSURF) 199 if (type != BOARD_XSURF)
199 z_writeb(0, buddha_board+BUDDHA_IRQ_MR); 200 z_writeb(0, buddha_board+BUDDHA_IRQ_MR);
200 201
202 printk(KERN_INFO "ide: %s IDE controller\n",
203 buddha_board_name[type]);
204
201 for(i=0;i<buddha_num_hwifs;i++) { 205 for(i=0;i<buddha_num_hwifs;i++) {
202 if(type != BOARD_XSURF) { 206 if(type != BOARD_XSURF) {
203 ide_setup_ports(&hw, (buddha_board+buddha_bases[i]), 207 ide_setup_ports(&hw, (buddha_board+buddha_bases[i]),
@@ -223,19 +227,6 @@ fail_base2:
223 ide_init_port_hw(hwif, &hw); 227 ide_init_port_hw(hwif, &hw);
224 228
225 hwif->mmio = 1; 229 hwif->mmio = 1;
226 printk("ide%d: ", index);
227 switch(type) {
228 case BOARD_BUDDHA:
229 printk("Buddha");
230 break;
231 case BOARD_CATWEASEL:
232 printk("Catweasel");
233 break;
234 case BOARD_XSURF:
235 printk("X-Surf");
236 break;
237 }
238 printk(" IDE interface\n");
239 230
240 idx[i] = index; 231 idx[i] = index;
241 } 232 }
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index dec2ef99c778..2860956bdcb0 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -67,6 +67,8 @@ static int __init falconide_init(void)
67 if (MACH_IS_ATARI && ATARIHW_PRESENT(IDE)) { 67 if (MACH_IS_ATARI && ATARIHW_PRESENT(IDE)) {
68 hw_regs_t hw; 68 hw_regs_t hw;
69 69
70 printk(KERN_INFO "ide: Falcon IDE controller\n");
71
70 ide_setup_ports(&hw, ATA_HD_BASE, falconide_offsets, 72 ide_setup_ports(&hw, ATA_HD_BASE, falconide_offsets,
71 0, 0, NULL, 73 0, 0, NULL,
72// falconide_iops, 74// falconide_iops,
@@ -80,8 +82,6 @@ static int __init falconide_init(void)
80 ide_init_port_data(hwif, index); 82 ide_init_port_data(hwif, index);
81 ide_init_port_hw(hwif, &hw); 83 ide_init_port_hw(hwif, &hw);
82 84
83 printk("ide%d: Falcon IDE interface\n", index);
84
85 ide_device_add(idx); 85 ide_device_add(idx);
86 } 86 }
87 } 87 }
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index e21ef75c9055..492fa047efc0 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -129,6 +129,13 @@ static int __init gayle_init(void)
129 return -ENODEV; 129 return -ENODEV;
130 130
131found: 131found:
132 printk(KERN_INFO "ide: Gayle IDE controller (A%d style%s)\n",
133 a4000 ? 4000 : 1200,
134#ifdef CONFIG_BLK_DEV_IDEDOUBLER
135 ide_doubler ? ", IDE doubler" :
136#endif
137 "");
138
132 for (i = 0; i < GAYLE_NUM_PROBE_HWIFS; i++) { 139 for (i = 0; i < GAYLE_NUM_PROBE_HWIFS; i++) {
133 unsigned long base, ctrlport, irqport; 140 unsigned long base, ctrlport, irqport;
134 ide_ack_intr_t *ack_intr; 141 ide_ack_intr_t *ack_intr;
@@ -173,17 +180,6 @@ found:
173 ide_init_port_hw(hwif, &hw); 180 ide_init_port_hw(hwif, &hw);
174 181
175 hwif->mmio = 1; 182 hwif->mmio = 1;
176 switch (i) {
177 case 0:
178 printk("ide%d: Gayle IDE interface (A%d style)\n", index,
179 a4000 ? 4000 : 1200);
180 break;
181#ifdef CONFIG_BLK_DEV_IDEDOUBLER
182 case 1:
183 printk("ide%d: IDE doubler\n", index);
184 break;
185#endif /* CONFIG_BLK_DEV_IDEDOUBLER */
186 }
187 183
188 idx[i] = index; 184 idx[i] = index;
189 } else 185 } else
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 6b3e960350aa..782d4c76c0e5 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -77,6 +77,9 @@ int macide_ack_intr(ide_hwif_t* hwif)
77 return 0; 77 return 0;
78} 78}
79 79
80static const char *mac_ide_name[] =
81 { "Quadra", "Powerbook", "Powerbook Baboon" };
82
80/* 83/*
81 * Probe for a Macintosh IDE interface 84 * Probe for a Macintosh IDE interface
82 */ 85 */
@@ -109,6 +112,9 @@ static int __init macide_init(void)
109 return -ENODEV; 112 return -ENODEV;
110 } 113 }
111 114
115 printk(KERN_INFO "ide: Macintosh %s IDE controller\n",
116 mac_ide_name[macintosh_config->ide_type - 1]);
117
112 hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]); 118 hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
113 if (hwif) { 119 if (hwif) {
114 u8 index = hwif->index; 120 u8 index = hwif->index;
@@ -128,14 +134,6 @@ static int __init macide_init(void)
128 } 134 }
129 135
130 hwif->mmio = 1; 136 hwif->mmio = 1;
131 if (macintosh_config->ide_type == MAC_IDE_QUADRA)
132 printk(KERN_INFO "ide%d: Macintosh Quadra IDE interface\n", index);
133 else if (macintosh_config->ide_type == MAC_IDE_PB)
134 printk(KERN_INFO "ide%d: Macintosh Powerbook IDE interface\n", index);
135 else if (macintosh_config->ide_type == MAC_IDE_BABOON)
136 printk(KERN_INFO "ide%d: Macintosh Powerbook Baboon IDE interface\n", index);
137 else
138 printk(KERN_INFO "ide%d: Unknown Macintosh IDE interface\n", index);
139 137
140 ide_device_add(idx); 138 ide_device_add(idx);
141 } 139 }
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 0154c91ee4b1..f5329730df99 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -121,6 +121,8 @@ static int __init q40ide_init(void)
121 if (!MACH_IS_Q40) 121 if (!MACH_IS_Q40)
122 return -ENODEV; 122 return -ENODEV;
123 123
124 printk(KERN_INFO "ide: Q40 IDE controller\n");
125
124 for (i = 0; i < Q40IDE_NUM_HWIFS; i++) { 126 for (i = 0; i < Q40IDE_NUM_HWIFS; i++) {
125 hw_regs_t hw; 127 hw_regs_t hw;
126 128