diff -urpN -X dontdiff linux-2.6.15-git9/drivers/mtd/nand/Kconfig linux-2.6.15-git9-bjd1/drivers/mtd/nand/Kconfig
--- linux-2.6.15-git9/drivers/mtd/nand/Kconfig	2006-01-03 03:21:10.000000000 +0000
+++ linux-2.6.15-git9-bjd1/drivers/mtd/nand/Kconfig	2006-01-14 09:51:13.732955984 +0000
@@ -109,6 +109,16 @@ config MTD_NAND_S3C2410_HWECC
 	  currently not be able to switch to software, as there is no
 	  implementation for ECC method used by the S3C2410
 
+config MTD_NAND_S3C2410_CLKSTOP
+	bool "S3C2410 NAND IDLE clock stop"
+	depends on MTD_NAND_S3C2410
+	default n
+	help
+	  Stop the clock to the NAND controller when there is no chip
+	  selected to save power. This will mean there is a small delay
+	  when the is NAND chip selected or released, but will save
+	  approximately 5mA of power when there is nothing happening.
+
 config MTD_NAND_DISKONCHIP
 	tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
 	depends on MTD_NAND && EXPERIMENTAL
diff -urpN -X dontdiff linux-2.6.15-git9/drivers/mtd/nand/s3c2410.c linux-2.6.15-git9-bjd1/drivers/mtd/nand/s3c2410.c
--- linux-2.6.15-git9/drivers/mtd/nand/s3c2410.c	2006-01-14 08:18:17.084735376 +0000
+++ linux-2.6.15-git9-bjd1/drivers/mtd/nand/s3c2410.c	2006-01-14 10:07:18.794244368 +0000
@@ -18,6 +18,7 @@
  *	20-Jun-2005  BJD  Updated s3c2440 support, fixed timing bug
  *	08-Jul-2005  BJD  Fix OOPS when no platform data supplied
  *	20-Oct-2005  BJD  Fix timing calculation bug
+ *	14-Jan-2006  BJD  Allow clock to be stopped when idle
  *
  * $Id: s3c2410.c,v 1.20 2005/11/07 11:14:31 gleixner Exp $
  *
@@ -73,6 +74,13 @@ static int hardware_ecc = 1;
 static int hardware_ecc = 0;
 #endif
 
+#ifdef CONFIG_MTD_NAND_S3C2410_CLKSTP
+static int clock_stop = 1;
+#else
+static const int clock_stop = 0;
+#endif
+
+
 /* new oob placement block for use with hardware ecc generation
  */
 
@@ -135,6 +143,11 @@ static struct s3c2410_platform_nand *to_
 	return dev->dev.platform_data;
 }
 
+static int allow_clk_stop(struct s3c2410_nand_info *info)
+{
+	return clock_stop;
+}
+
 /* timing calculations */
 
 #define NS_IN_KHZ 1000000
@@ -231,6 +244,9 @@ static void s3c2410_nand_select_chip(str
 	bit = (info->is_s3c2440) ? S3C2440_NFCONT_nFCE : S3C2410_NFCONF_nFCE;
 	reg = info->regs+((info->is_s3c2440) ? S3C2440_NFCONT:S3C2410_NFCONF);
 
+	if (chip != -1 && allow_clk_stop(info))
+		clk_enable(info->clk);
+
 	cur = readl(reg);
 
 	if (chip == -1) {
@@ -250,6 +266,9 @@ static void s3c2410_nand_select_chip(str
 	}
 
 	writel(cur, reg);
+
+	if (chip == -1 && allow_clk_stop(info))
+		clk_disable(info->clk);
 }
 
 /* command and control functions
@@ -670,6 +689,9 @@ static int s3c24xx_nand_probe(struct pla
 			sets++;
 	}
 
+	if (allow_clk_stop(info))
+		clk_disable(info->clk);
+
 	pr_debug("initialised ok\n");
 	return 0;
 
@@ -681,6 +703,41 @@ static int s3c24xx_nand_probe(struct pla
 	return err;
 }
 
+/* PM Support */
+#ifdef CONFIG_PM
+
+static int s3c24xx_nand_suspend(struct platform_device *dev, pm_message_t pmsg)
+{
+	struct s3c2410_nand_info *info = platform_get_drvdata(dev);
+
+	if (info) {
+		if (!allow_clk_stop(info))
+			clk_disable(info->clk);
+	}
+
+	return 0;
+}
+
+static int s3c24xx_nand_resume(struct platform_device *dev)
+{
+	struct s3c2410_nand_info *info = platform_get_drvdata(dev);
+
+	if (info) {
+		clk_enable(info->clk);
+		s3c2410_nand_inithw(info, dev);
+
+		if (allow_clk_stop(info))
+			clk_disable(info->clk);
+	}
+
+	return 0;
+}
+
+#else
+#define s3c24xx_nand_suspend NULL
+#define s3c24xx_nand_resume NULL
+#endif
+
 /* driver device registration */
 
 static int s3c2410_nand_probe(struct platform_device *dev)
@@ -696,6 +753,8 @@ static int s3c2440_nand_probe(struct pla
 static struct platform_driver s3c2410_nand_driver = {
 	.probe		= s3c2410_nand_probe,
 	.remove		= s3c2410_nand_remove,
+	.suspend	= s3c24xx_nand_suspend,
+	.resume		= s3c24xx_nand_resume,
 	.driver		= {
 		.name	= "s3c2410-nand",
 		.owner	= THIS_MODULE,
@@ -705,6 +764,8 @@ static struct platform_driver s3c2410_na
 static struct platform_driver s3c2440_nand_driver = {
 	.probe		= s3c2440_nand_probe,
 	.remove		= s3c2410_nand_remove,
+	.suspend	= s3c24xx_nand_suspend,
+	.resume		= s3c24xx_nand_resume,
 	.driver		= {
 		.name	= "s3c2440-nand",
 		.owner	= THIS_MODULE,