Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.

3 files changed, 116 insertions, 0 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 68dc8d9eb24e..0dae245c6259 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -50,6 +50,15 @@ config HTC_PASIC3
           HTC Magician devices, respectively. Actual functionality is
           handled by the leds-pasic3 and ds1wm drivers.
 
+config UCB1400_CORE
+        tristate "Philips UCB1400 Core driver"
+        help
+          This enables support for the Philips UCB1400 core functions.
+          The UCB1400 is an AC97 audio codec.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ucb1400_core.
+
 config MFD_TMIO
         bool
         default n
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 03ad239ecef0..6abebe364419 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -22,3 +22,4 @@ obj-$(CONFIG_MCP_UCB1200_TS)	+= ucb1x00-ts.o
 ifeq ($(CONFIG_SA1100_ASSABET),y)
 obj-$(CONFIG_MCP_UCB1200)       += ucb1x00-assabet.o
 endif
+obj-$(CONFIG_UCB1400_CORE)      += ucb1400_core.o
diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c
new file mode 100644
index 000000000000..178159e264ce
--- /dev/null
+++ b/drivers/mfd/ucb1400_core.c
@@ -0,0 +1,106 @@
+/*
+ * Core functions for:
+ *  Philips UCB1400 multifunction chip
+ *
+ * Based on ucb1400_ts.c:
+ *  Author:     Nicolas Pitre
+ *  Created:    September 25, 2006
+ *  Copyright:  MontaVista Software, Inc.
+ *
+ * Spliting done by: Marek Vasut <marek.vasut@gmail.com>
+ * If something doesnt work and it worked before spliting, e-mail me,
+ * dont bother Nicolas please ;-)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This code is heavily based on ucb1x00-*.c copyrighted by Russell King
+ * covering the UCB1100, UCB1200 and UCB1300..  Support for the UCB1400 has
+ * been made separate from ucb1x00-core/ucb1x00-ts on Russell's request.
+ */
+
+#include <linux/module.h>
+#include <linux/ucb1400.h>
+
+static int ucb1400_core_probe(struct device *dev)
+{
+        int err;
+        struct ucb1400 *ucb;
+        struct ucb1400_ts ucb_ts;
+        struct snd_ac97 *ac97;
+
+        memset(&ucb_ts, 0, sizeof(ucb_ts));
+
+        ucb = kzalloc(sizeof(struct ucb1400), GFP_KERNEL);
+        if (!ucb) {
+                err = -ENOMEM;
+                goto err;
+        }
+
+        dev_set_drvdata(dev, ucb);
+
+        ac97 = to_ac97_t(dev);
+
+        ucb_ts.id = ucb1400_reg_read(ac97, UCB_ID);
+        if (ucb_ts.id != UCB_ID_1400) {
+                err = -ENODEV;
+                goto err0;
+        }
+
+        /* TOUCHSCREEN */
+        ucb_ts.ac97 = ac97;
+        ucb->ucb1400_ts = platform_device_alloc("ucb1400_ts", -1);
+        if (!ucb->ucb1400_ts) {
+                err = -ENOMEM;
+                goto err0;
+        }
+        err = platform_device_add_data(ucb->ucb1400_ts, &ucb_ts,
+                                        sizeof(ucb_ts));
+        if (err)
+                goto err1;
+        err = platform_device_add(ucb->ucb1400_ts);
+        if (err)
+                goto err1;
+
+        return 0;
+
+err1:
+        platform_device_put(ucb->ucb1400_ts);
+err0:
+        kfree(ucb);
+err:
+        return err;
+}
+
+static int ucb1400_core_remove(struct device *dev)
+{
+        struct ucb1400 *ucb = dev_get_drvdata(dev);
+
+        platform_device_unregister(ucb->ucb1400_ts);
+        kfree(ucb);
+        return 0;
+}
+
+static struct device_driver ucb1400_core_driver = {
+        .name   = "ucb1400_core",
+        .bus    = &ac97_bus_type,
+        .probe  = ucb1400_core_probe,
+        .remove = ucb1400_core_remove,
+};
+
+static int __init ucb1400_core_init(void)
+{
+        return driver_register(&ucb1400_core_driver);
+}
+
+static void __exit ucb1400_core_exit(void)
+{
+        driver_unregister(&ucb1400_core_driver);
+}
+
+module_init(ucb1400_core_init);
+module_exit(ucb1400_core_exit);
+
+MODULE_DESCRIPTION("Philips UCB1400 driver");
+MODULE_LICENSE("GPL");