gayle: add "doubler" parameter

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Mar 23, 2008

Subsystems (2)

Documentation libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2008-03-23 20:16 UTC #0 lore raw

PATCH 1/3 gayle: add "doubler" parameter

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

* Obsolete "ide=doubler" kernel parameter.

Cc Geert Uytterhoeven <[email protected]>

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 Documentation/ide/ide.txt  |    9 +++------
 drivers/ide/ide.c          |    2 +-
 drivers/ide/legacy/gayle.c |    2 ++
 3 files changed, 6 insertions(+), 7 deletions(-)

Documentation/ide/ide.txt +3 -6

Index: b/Documentation/ide/ide.txt
===================================================================
@@ -181,12 +181,6 @@ driver using the "options=" keyword to i
 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)
 you need to explicitly enable probing by using "probe" kernel parameter,
 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
 (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
 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:

drivers/ide/ide.c +1 -1

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

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

Index: b/drivers/ide/legacy/gayle.c
===================================================================
@@ -63,6 +63,8 @@
 #define GAYLE_HAS_CONTROL_REG	(!ide_doubler)
 #define GAYLE_IDEREG_SIZE	(ide_doubler ? 0x1000 : 0x2000)
 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 */