Merge master.kernel.org:/home/rmk/linux-2.6-arm

3 files changed, 31 insertions, 10 deletions

diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index c3c2f17d030e..a1b153d1626c 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -67,7 +67,7 @@ static void impd1_setvco(struct clk *clk, struct icst525_vco vco)
         }
         writel(0, impd1->base + IMPD1_LOCK);
 
-#if DEBUG
+#ifdef DEBUG
         vco.v = val & 0x1ff;
         vco.r = (val >> 9) & 0x7f;
         vco.s = (val >> 16) & 7;
@@ -427,17 +427,18 @@ static int impd1_probe(struct lm_device *dev)
         return ret;
 }
 
+static int impd1_remove_one(struct device *dev, void *data)
+{
+        device_unregister(dev);
+        return 0;
+}
+
 static void impd1_remove(struct lm_device *dev)
 {
         struct impd1_module *impd1 = lm_get_drvdata(dev);
-        struct list_head *l, *n;
         int i;
 
-        list_for_each_safe(l, n, &dev->dev.children) {
-                struct device *d = list_to_dev(l);
-
-                device_unregister(d);
-        }
+        device_for_each_child(&dev->dev, NULL, impd1_remove_one);
 
         for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++)
                 clk_unregister(&impd1->vcos[i]);
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index d327c127eddb..1d7677669a76 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -250,6 +250,25 @@ void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
         i2c_device.dev.platform_data = info;
 }
 
+static struct resource i2s_resources[] = {
+        {
+                .start  = 0x40400000,
+                .end    = 0x40400083,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_I2S,
+                .end    = IRQ_I2S,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device i2s_device = {
+        .name           = "pxa2xx-i2s",
+        .id             = -1,
+        .resource       = i2c_resources,
+        .num_resources  = ARRAY_SIZE(i2s_resources),
+};
+
 static struct platform_device *devices[] __initdata = {
         &pxamci_device,
         &udc_device,
@@ -258,6 +277,7 @@ static struct platform_device *devices[] __initdata = {
         &btuart_device,
         &stuart_device,
         &i2c_device,
+        &i2s_device,
 };
 
 static int __init pxa_init(void)
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 8ca955984645..7b51bfd0ba6d 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -307,9 +307,9 @@ static void bast_nand_select(struct s3c2410_nand_set *set, int slot)
 }
 
 static struct s3c2410_platform_nand bast_nand_info = {
-        .tacls          = 40,
-        .twrph0         = 80,
-        .twrph1         = 80,
+        .tacls          = 30,
+        .twrph0         = 60,
+        .twrph1         = 60,
         .nr_sets        = ARRAY_SIZE(bast_nand_sets),
         .sets           = bast_nand_sets,
         .select_chip    = bast_nand_select,