Răsfoiți Sursa

gayle: add "doubler" parameter

* Add "doubler" parameter to enable support for IDE doublers.

* Obsolete "ide=doubler" kernel parameter.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz 17 ani în urmă
părinte
comite
9dcba7f2b7
3 a modificat fișierele cu 6 adăugiri și 7 ștergeri
  1. 3 6
      Documentation/ide/ide.txt
  2. 1 1
      drivers/ide/ide.c
  3. 2 0
      drivers/ide/legacy/gayle.c

+ 3 - 6
Documentation/ide/ide.txt

@@ -181,12 +181,6 @@ driver using the "options=" keyword to insmod, while replacing any ',' with
 Summary of ide driver parameters for kernel command line
 Summary of ide driver parameters for kernel command line
 --------------------------------------------------------
 --------------------------------------------------------
 
 
- "ide=doubler"		: probe/support IDE doublers on Amiga
-
-There may be more options than shown -- use the source, Luke!
-
-Everything else is rejected with a "BAD OPTION" message.
-
 For legacy IDE VLB host drivers (ali14xx/dtc2278/ht6560b/qd65xx/umc8672)
 For legacy IDE VLB host drivers (ali14xx/dtc2278/ht6560b/qd65xx/umc8672)
 you need to explicitly enable probing by using "probe" kernel parameter,
 you need to explicitly enable probing by using "probe" kernel parameter,
 i.e. to enable probing for ALI M14xx chipsets (ali14xx host driver) use:
 i.e. to enable probing for ALI M14xx chipsets (ali14xx host driver) use:
@@ -203,6 +197,9 @@ are detected automatically).
 You also need to use "probe" kernel parameter for ide-4drives driver
 You also need to use "probe" kernel parameter for ide-4drives driver
 (support for IDE generic chipset with four drives on one port).
 (support for IDE generic chipset with four drives on one port).
 
 
+To enable support for IDE doublers on Amiga use "doubler" kernel parameter
+for gayle host driver (i.e. "gayle.doubler" if the driver is built-in).
+
 To force ignoring cable detection (this should be needed only if you're using
 To force ignoring cable detection (this should be needed only if you're using
 short 40-wires cable which cannot be automatically detected - if this is not
 short 40-wires cable which cannot be automatically detected - if this is not
 a case please report it as a bug instead) use "ignore_cable" kernel parameter:
 a case please report it as a bug instead) use "ignore_cable" kernel parameter:

+ 1 - 1
drivers/ide/ide.c

@@ -866,7 +866,7 @@ static int __init ide_setup(char *s)
 
 
 		printk(" : Enabled support for IDE doublers\n");
 		printk(" : Enabled support for IDE doublers\n");
 		ide_doubler = 1;
 		ide_doubler = 1;
-		return 1;
+		goto obsolete_option;
 	}
 	}
 #endif /* CONFIG_BLK_DEV_IDEDOUBLER */
 #endif /* CONFIG_BLK_DEV_IDEDOUBLER */
 
 

+ 2 - 0
drivers/ide/legacy/gayle.c

@@ -63,6 +63,8 @@
 #define GAYLE_HAS_CONTROL_REG	(!ide_doubler)
 #define GAYLE_HAS_CONTROL_REG	(!ide_doubler)
 #define GAYLE_IDEREG_SIZE	(ide_doubler ? 0x1000 : 0x2000)
 #define GAYLE_IDEREG_SIZE	(ide_doubler ? 0x1000 : 0x2000)
 int ide_doubler = 0;	/* support IDE doublers? */
 int ide_doubler = 0;	/* support IDE doublers? */
+module_param_named(doubler, ide_doubler, bool, 0);
+MODULE_PARM_DESC(doubler, "enable support for IDE doublers");
 #endif /* CONFIG_BLK_DEV_IDEDOUBLER */
 #endif /* CONFIG_BLK_DEV_IDEDOUBLER */