ARM: OMAP: Misc changes to compile after sync with mainline

Misc changes to compile after sync with mainline

diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index 8f88ce0abb6b562f7c3cee7f494bcd33d3b1104e..4b292e93fbe23563e2a6d8297cad7a3d68427581 100644 (file)
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -15,7 +15,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>

diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index ec7c4d63f293520c9a838860a1410b4a9ba75cb4..540b20d78cca6838c8e1122d935d019b3bc7a45b 100644 (file)
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -17,7 +17,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/notifier.h>
 
 #include <asm/hardware.h>

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 2184234fa3a668aefb6672255202b73e8790e959..4277eee44ed5cc392a94c390011027f1f379f0b8 100644 (file)
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -607,9 +607,9 @@ static int __init omap1_late_clk_reset(void)
 
                /* Clocks in the DSP domain need api_ck. Just assume bootloader
                 * has not enabled any DSP clocks */
-               if (p->enable_reg == DSP_IDLECT2) {
-                       printk(KERN_INFO "Skipping reset check for DSP domain clock \"%s\"\n",
-                              p->name);
+               if ((u32)p->enable_reg == DSP_IDLECT2) {
+                       printk(KERN_INFO "Skipping reset check for DSP domain "
+                              "clock \"%s\"\n", p->name);
                        continue;
                }
 

diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 81d02e81df60e106fb91f1125dba9ff28b5f06be..f2554469a76a79beb7b7b060a7fe09ac2041e5df 100644 (file)
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -13,7 +13,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 20ab7aafb8de750bf4ce4d01f9d3853ee9e46464..7181edb89352fc21e06d2e4b6ce669c91b075932 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 1a00eb5a3c6375dcef4aed1282c613b1f7fc6bcd..e84fdde6edf8ac680d6ddf5f0821f62f1a6f2ce9 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -120,8 +120,8 @@ config CPU_ARM925T
 
 # ARM926T
 config CPU_ARM926T
-       bool "Support ARM926T processor" if ARCH_INTEGRATOR
-       depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX
+       bool "Support ARM926T processor"
+       depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB
        default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX
        select CPU_32v5
        select CPU_ABRT_EV5TJ
@@ -242,7 +242,7 @@ config CPU_XSCALE
 # ARMv6
 config CPU_V6
        bool "Support ARM V6 processor"
-       depends on ARCH_INTEGRATOR || ARCH_OMAP2
+       depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2
        select CPU_32v6
        select CPU_ABRT_EV6
        select CPU_CACHE_V6
@@ -250,6 +250,18 @@ config CPU_V6
        select CPU_COPY_V6
        select CPU_TLB_V6
 
+# ARMv6k
+config CPU_32v6K
+       bool "Support ARM V6K processor extensions" if !SMP
+       depends on CPU_V6
+       default y if SMP
+       help
+         Say Y here if your ARMv6 processor supports the 'K' extension.
+         This enables the kernel to use some instructions not present
+         on previous processors, and as such a kernel build with this
+         enabled will not boot on processors with do not support these
+         instructions.
+
 # Figure out what processor architecture version we should be using.
 # This defines the compiler instruction set which depends on the machine type.
 config CPU_32v3

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index fe83bb6234bba185ad501ce28d4233e2d6a69b7c..9dcce904b6082c4bb93de5b6e95f4c45aadb538e 100644 (file)
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>

diff --git a/arch/arm/plat-omap/dsp/dsp_common.c b/arch/arm/plat-omap/dsp/dsp_common.c
index c1747f21fa19f4d0e7447056e960134dbe49aa05..88481a1290082acd8e6b4cfa7ad895f5348151fa 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_common.c
+++ b/arch/arm/plat-omap/dsp/dsp_common.c
@@ -58,7 +58,7 @@ struct cpustat {
        void (*mem_rel_cb)(void);
 };
 struct cpustat cpustat = {
-       .sem = __MUTEX_INITIALIZER(cpustat.sem),
+       .sem = __SEMAPHORE_INIT(cpustat.sem, 1),
        .stat = CPUSTAT_RESET,
        .icrmask = 0xffff,
 };

diff --git a/arch/arm/plat-omap/dsp/dsp_core.c b/arch/arm/plat-omap/dsp/dsp_core.c
index b0f62b84ad7ff686d2004cc165cf1fb4e94ab888..d5d8c2296e4cdcba8bd02130c86d65a6451ab108 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_core.c
+++ b/arch/arm/plat-omap/dsp/dsp_core.c
@@ -27,7 +27,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
@@ -696,31 +696,16 @@ static int dsp_drv_remove(struct device *dev)
 }
 
 #ifdef CONFIG_PM
-static int dsp_drv_suspend(struct device *dev, pm_message_t state, u32 level)
+static int dsp_drv_suspend(struct device *dev, pm_message_t state)
 {
-       switch(level) {
-       case SUSPEND_NOTIFY:
-       case SUSPEND_DISABLE:
-       case SUSPEND_SAVE_STATE:
-               break;
-       case SUSPEND_POWER_DOWN:
-               dsp_suspend();
-               break;
-       }
+       dsp_suspend();
 
        return 0;
 }
 
-static int dsp_drv_resume(struct device *dev, u32 level)
+static int dsp_drv_resume(struct device *dev)
 {
-       switch(level) {
-       case RESUME_POWER_ON:
-               dsp_resume();
-               break;
-       case RESUME_RESTORE_STATE:
-       case RESUME_ENABLE:
-               break;
-       }
+       dsp_resume();
 
        return 0;
 }

diff --git a/arch/arm/plat-omap/dsp/dsp_ctl.c b/arch/arm/plat-omap/dsp/dsp_ctl.c
index 4031cf8e85c0d7ffb58665697697fbdb7ab5fd32..5738d143b736b3b129e7489f9fa0ad592eb6d786 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_ctl.c
+++ b/arch/arm/plat-omap/dsp/dsp_ctl.c
@@ -33,6 +33,7 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/delay.h>
+#include <linux/platform_device.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/ioctls.h>

diff --git a/arch/arm/plat-omap/dsp/dsp_ctl_core.c b/arch/arm/plat-omap/dsp/dsp_ctl_core.c
index 6eb85920b6ec6ff8ac86d7d804378b2ac57ef258..8207441096b282725cf1dda5a9fce5cb732b1f0f 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_ctl_core.c
+++ b/arch/arm/plat-omap/dsp/dsp_ctl_core.c
@@ -86,6 +86,7 @@ int __init dsp_ctl_core_init(void)
 {
        int retval;
        int i;
+       struct class_device *cdev;
 
        retval = register_chrdev(OMAP_DSP_CTL_MAJOR, "dspctl",
                                 &dsp_ctl_core_fops);
@@ -98,7 +99,7 @@ int __init dsp_ctl_core_init(void)
 
        dsp_ctl_class = class_create(THIS_MODULE, "dspctl");
        for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
-               class_device_create(dsp_ctl_class,
+               cdev = class_device_create(dsp_ctl_class, NULL,
                                    MKDEV(OMAP_DSP_CTL_MAJOR,
                                          dev_list[i].minor),
                                    NULL, dev_list[i].devname);

diff --git a/arch/arm/plat-omap/dsp/dsp_mem.c b/arch/arm/plat-omap/dsp/dsp_mem.c
index 7ad0c05491ff1026c9d04f6c8ad903955ee69a7c..fbce6eb9694c89a893125820db8ee5c761fb7b8c 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_mem.c
+++ b/arch/arm/plat-omap/dsp/dsp_mem.c
@@ -33,6 +33,7 @@
 #include <linux/fb.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/platform_device.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/ioctls.h>
@@ -187,7 +188,7 @@ struct kmem_pool {
 
 #define KMEM_POOL_INIT(name) \
 { \
-       .sem = __MUTEX_INITIALIZER((name).sem), \
+       .sem = __SEMAPHORE_INIT((name).sem, 1), \
 }
 #define DECLARE_KMEM_POOL(name) \
        struct kmem_pool name = KMEM_POOL_INIT(name)

diff --git a/arch/arm/plat-omap/dsp/mblog.c b/arch/arm/plat-omap/dsp/mblog.c
index a4e7cd05417f5cd8e5da12c53ce251d8151b5de9..0edf07079edffc28c40101a54554b06c0370c392 100644 (file)
--- a/arch/arm/plat-omap/dsp/mblog.c
+++ b/arch/arm/plat-omap/dsp/mblog.c
@@ -26,7 +26,7 @@
 
 #include <linux/module.h>
 #include <linux/sched.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/init.h>
 #include <asm/irq.h>
 #include <asm/arch/dsp.h>

diff --git a/arch/arm/plat-omap/dsp/task.c b/arch/arm/plat-omap/dsp/task.c
index e5c60dde43756678ae2e1972b4db6af29b4c93c5..be6cdce1d29500a496c1e649a5d07e82ee5ccf05 100644 (file)
--- a/arch/arm/plat-omap/dsp/task.c
+++ b/arch/arm/plat-omap/dsp/task.c
@@ -31,7 +31,7 @@
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/poll.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -1738,6 +1738,8 @@ static void dsptask_dev_release(struct device *dev)
 
 static int taskdev_init(struct taskdev *dev, char *name, unsigned char minor)
 {
+       struct class_device *cdev;
+
        taskdev[minor] = dev;
 
        INIT_LIST_HEAD(&dev->proc_list);
@@ -1765,8 +1767,9 @@ static int taskdev_init(struct taskdev *dev, char *name, unsigned char minor)
        device_create_file(&dev->dev, &dev_attr_devname);
        device_create_file(&dev->dev, &dev_attr_devstate);
        device_create_file(&dev->dev, &dev_attr_proc_list);
-       class_device_create(dsp_task_class, MKDEV(OMAP_DSP_TASK_MAJOR, minor),
-                           NULL, "dsptask%d", minor);
+       cdev = class_device_create(dsp_task_class, NULL,
+                                  MKDEV(OMAP_DSP_TASK_MAJOR, minor),
+                                  NULL, "dsptask%d", minor);
 
        init_waitqueue_head(&dev->state_wait_q);
        spin_lock_init(&dev->state_lock);

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index f64526b930e3ed3c531371dc17d73b7525339a5b..792f66375830d11b607fffe69daa6a8945414144 100644 (file)
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -54,15 +54,8 @@ void __init omap_detect_sram(void)
                omap_sram_size = 0x4000;        /* 16K */
        else if (cpu_is_omap1611())
                omap_sram_size = 0x3e800;       /* 250K */
-#if 0  /* FIXME: Enable after adding 24xx cpu detection */
-       else if (cpu_is_omap2410())
-               omap_sram_size = 0x10000;       /* 64K */
        else if (cpu_is_omap2420())
                omap_sram_size = 0xa0014;       /* 640K */
-#else
-       else if (cpu_is_omap24xx())
-               omap_sram_size = 0x10000;       /* 64K */
-#endif
        else {
                printk(KERN_ERR "Could not detect SRAM size\n");
                omap_sram_size = 0x4000;
@@ -72,7 +65,11 @@ void __init omap_detect_sram(void)
 }
 
 static struct map_desc omap_sram_io_desc[] __initdata = {
-       { OMAP1_SRAM_VA, OMAP1_SRAM_PA, 0, MT_DEVICE }
+       {       /* .length gets filled in at runtime */
+               .virtual        = OMAP1_SRAM_VA,
+               .pfn            = __phys_to_pfn(OMAP1_SRAM_PA),
+               .type           = MT_DEVICE
+       }
 };
 
 /*
@@ -87,7 +84,7 @@ void __init omap_map_sram(void)
 
        if (cpu_is_omap24xx()) {
                omap_sram_io_desc[0].virtual = OMAP2_SRAM_VA;
-               omap_sram_io_desc[0].physical = OMAP2_SRAM_PA;
+               omap_sram_io_desc[0].pfn = __phys_to_pfn(OMAP2_SRAM_PA);
        }
 
        omap_sram_io_desc[0].length = (omap_sram_size + PAGE_SIZE-1)/PAGE_SIZE;
@@ -95,7 +92,7 @@ void __init omap_map_sram(void)
        iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc));
 
        printk(KERN_INFO "SRAM: Mapped pa 0x%08lx to va 0x%08lx size: 0x%lx\n",
-              omap_sram_io_desc[0].physical, omap_sram_io_desc[0].virtual,
+              omap_sram_io_desc[0].pfn, omap_sram_io_desc[0].virtual,
               omap_sram_io_desc[0].length);
 
        /*

diff --git a/drivers/char/omap-rtc.c b/drivers/char/omap-rtc.c
index 943fc1f99c845e954e194be0b48c4195cfece4cd..814b6144d607587b3d43accf22668cde8df573d2 100644 (file)
--- a/drivers/char/omap-rtc.c
+++ b/drivers/char/omap-rtc.c
@@ -54,7 +54,7 @@
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/rtc.h>
 #include <linux/bcd.h>
@@ -709,36 +709,30 @@ static void set_rtc_irq_bit(unsigned char bit)
 #ifdef CONFIG_PM
 static struct timespec rtc_delta;
 
-static int rtc_suspend(struct device *dev, pm_message_t message, u32 level)
+static int rtc_suspend(struct device *dev, pm_message_t state)
 {
        struct rtc_time rtc_tm;
        struct timespec time;
 
-       if (level == SUSPEND_POWER_DOWN)
-       {
-               time.tv_nsec = 0;
-               get_rtc_time(&rtc_tm);
-               rtc_tm_to_time(&rtc_tm, &time.tv_sec);
+       time.tv_nsec = 0;
+       get_rtc_time(&rtc_tm);
+       rtc_tm_to_time(&rtc_tm, &time.tv_sec);
 
-               save_time_delta(&rtc_delta, &time);
-       }
+       save_time_delta(&rtc_delta, &time);
 
        return 0;
 }
 
-static int rtc_resume(struct device *dev, u32 level)
+static int rtc_resume(struct device *dev)
 {
        struct rtc_time rtc_tm;
        struct timespec time;
 
-       if (level == RESUME_POWER_ON)
-       {
-               time.tv_nsec = 0;
-               get_rtc_time(&rtc_tm);
-               rtc_tm_to_time(&rtc_tm, &time.tv_sec);
+       time.tv_nsec = 0;
+       get_rtc_time(&rtc_tm);
+       rtc_tm_to_time(&rtc_tm, &time.tv_sec);
 
-               restore_time_delta(&rtc_delta, &time);
-       }
+       restore_time_delta(&rtc_delta, &time);
 
        return 0;
 }

diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c
index 9f6369649223027a90860ae8c88feb4620255882..2c28307b28bd47c5a8bd83581660f065f568393d 100644 (file)
--- a/drivers/char/watchdog/omap_wdt.c
+++ b/drivers/char/watchdog/omap_wdt.c
@@ -38,7 +38,7 @@
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/err.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/moduleparam.h>
 
 #include <asm/io.h>
@@ -335,16 +335,16 @@ static int __exit omap_wdt_remove(struct device *dev)
  * may not play well enough with NOWAYOUT...
  */
 
-static int omap_wdt_suspend(struct device *dev, pm_message_t mesg, u32 level)
+static int omap_wdt_suspend(struct device *dev, pm_message_t state)
 {
-       if (level == SUSPEND_POWER_DOWN && omap_wdt_users)
+       if (omap_wdt_users)
                omap_wdt_disable();
        return 0;
 }
 
-static int omap_wdt_resume(struct device *dev, u32 level)
+static int omap_wdt_resume(struct device *dev)
 {
-       if (level == RESUME_POWER_ON && omap_wdt_users) {
+       if (omap_wdt_users) {
                omap_wdt_enable();
                omap_wdt_ping();
        }

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 4050480790fbd0d89b25a4802dbe33541d24d3aa..826b10cd1ef2a8d6d840fc42c8c2f05dce0ebbf7 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -39,6 +39,7 @@
 #include <linux/i2c.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
+#include <linux/platform_device.h>
 
 #include <asm/io.h>
 #include <asm/hardware/clock.h>

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index d56f09b4ea38988f709a0b039298dc632da185d8..316b67d9a735bdefee8f1d14d7b943216985d973 100644 (file)
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_TPS65010)                += tps65010.o
 obj-$(CONFIG_SENSORS_TLV320AIC23) += tlv320aic23.o
 obj-$(CONFIG_GPIOEXPANDER_OMAP)        += gpio_expander_omap.o
 obj-$(CONFIG_MENELAUS)         += menelaus.o
+obj-$(CONFIG_RTC_X1205_I2C)    += x1205.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
 EXTRA_CFLAGS += -DDEBUG

diff --git a/drivers/input/keyboard/innovator_ps2.c b/drivers/input/keyboard/innovator_ps2.c
index de07ce99a8beb563af0a51f5bdd274aa081d872a..c0889dcd5b96f6827fcc0baf93081add38c8e400 100644 (file)
--- a/drivers/input/keyboard/innovator_ps2.c
+++ b/drivers/input/keyboard/innovator_ps2.c
@@ -93,7 +93,7 @@
 #include <linux/poll.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <asm/io.h>
 #include <asm/hardware.h>
@@ -1148,57 +1148,45 @@ static void innovator_ps2_device_release(struct device *dev)
        /* Nothing */
 }
 
-static int innovator_ps2_suspend(struct device *dev, u32 state, u32 level)
+static int innovator_ps2_suspend(struct device *dev, pm_message_t state)
 {
        u8 pmcomm;
 
-       
-       switch(level) {
-       case SUSPEND_DISABLE:
-
-               /*
-                * Set SUS_STATE in REG_PM_COMM (Page 0 R0).  This will cause
-                * PM_MOD bits of REG_PM_STATUS to show suspended state,
-                * but the SUS_STAT bit of REG_PM_STATUS will continue to
-                * reflect the state of the _HSUS pin.
-                */
+       /*
+        * Set SUS_STATE in REG_PM_COMM (Page 0 R0).  This will cause
+        * PM_MOD bits of REG_PM_STATUS to show suspended state,
+        * but the SUS_STAT bit of REG_PM_STATUS will continue to
+        * reflect the state of the _HSUS pin.
+        */
 
-               if (write_reg(REG_PAGENO, 0) < 0)
-                       printk("ps2 suspend: write_reg REG_PAGENO error\n");
+       if (write_reg(REG_PAGENO, 0) < 0)
+               printk("ps2 suspend: write_reg REG_PAGENO error\n");
 
-               if (read_reg(REG_PM_COMM, &pmcomm) < 0)
-                       printk("ps2 suspend: read_reg REG_PM_COMM error\n");
+       if (read_reg(REG_PM_COMM, &pmcomm) < 0)
+               printk("ps2 suspend: read_reg REG_PM_COMM error\n");
                
-               if (write_reg(REG_PM_COMM, pmcomm | SUS_STATE) < 0)
-                       printk("ps2 suspend: write_reg REG_PM_COMM error\n");
-               break;
-       }
+       if (write_reg(REG_PM_COMM, pmcomm | SUS_STATE) < 0)
+               printk("ps2 suspend: write_reg REG_PM_COMM error\n");
 
        return 0;
 }
 
-static int innovator_ps2_resume(struct device *dev, u32 level)
+static int innovator_ps2_resume(struct device *dev)
 {
        u8 pmcomm;
 
-       switch(level) {
-       case RESUME_ENABLE:
-
-               /*
-                * Clear SUS_STATE from REG_PM_COMM (Page 0 R0).
-                */
+       /*
+        * Clear SUS_STATE from REG_PM_COMM (Page 0 R0).
+        */
 
-               if (write_reg(REG_PAGENO, 0) < 0)
-                       printk("ps2 resume: write_reg REG_PAGENO error\n");
-               
-               if (read_reg(REG_PM_COMM, &pmcomm) < 0)
-                       printk("ps2 resume: read_reg REG_PM_COMM error\n");
+       if (write_reg(REG_PAGENO, 0) < 0)
+               printk("ps2 resume: write_reg REG_PAGENO error\n");
 
-               if (write_reg(REG_PM_COMM, pmcomm & ~SUS_STATE) < 0)
-                       printk("ps2 resume: write_reg REG_PM_COMM error\n");
+       if (read_reg(REG_PM_COMM, &pmcomm) < 0)
+               printk("ps2 resume: read_reg REG_PM_COMM error\n");
 
-               break;
-       }
+       if (write_reg(REG_PM_COMM, pmcomm & ~SUS_STATE) < 0)
+               printk("ps2 resume: write_reg REG_PM_COMM error\n");
 
        return 0;
 }

diff --git a/drivers/input/touchscreen/omap/omap_ts.c b/drivers/input/touchscreen/omap/omap_ts.c
index 8d6a1d550d1e891b2bffa76f243c00feb297dfce..269ffc75ef0262b1a4888d473beed40c9fad17f6 100644 (file)
--- a/drivers/input/touchscreen/omap/omap_ts.c
+++ b/drivers/input/touchscreen/omap/omap_ts.c
@@ -196,22 +196,14 @@ static int __exit omap_ts_remove(struct device *dev)
        return 0;
 }
 
-static int omap_ts_suspend(struct device *dev, pm_message_t mesg, u32 level)
+static int omap_ts_suspend(struct device *dev, pm_message_t state)
 {
-       if (level != SUSPEND_POWER_DOWN) {
-               return 0;
-       }
-
        ts_omap.dev->disable();
        return 0;
 }
 
-static int omap_ts_resume(struct device *dev, u32 level)
+static int omap_ts_resume(struct device *dev)
 {
-       if (level != RESUME_POWER_ON) {
-               return 0;
-       }
-
        ts_omap.dev->enable();
        return 0;
 }

diff --git a/drivers/media/video/omap/camera_core.c b/drivers/media/video/omap/camera_core.c
index 57e05ee5ec4ce9935bbe321c069a73e7b4a5217d..077d2b0b3a93b94c876391708c3320514faf0c02 100644 (file)
--- a/drivers/media/video/omap/camera_core.c
+++ b/drivers/media/video/omap/camera_core.c
@@ -914,48 +914,39 @@ camera_core_open(struct inode *inode, struct file *file)
 }
 
 #ifdef CONFIG_PM
-static int camera_core_suspend(struct device *dev, u32 state, u32 level)
+static int camera_core_suspend(struct device *dev, pm_message_t state)
 {
        struct camera_device *cam = dev_get_drvdata(dev);
        int ret = 0;
 
        spin_lock(&cam->img_lock);
-       switch (level) {
-       case SUSPEND_POWER_DOWN:
-               if (cam->active) {
-                       cam->cam_hardware->close(cam->hardware_data);
-               }
-               cam->cam_sensor->power_off(cam->sensor_data);
-               break;
+       if (cam->active) {
+               cam->cam_hardware->close(cam->hardware_data);
        }
-
+       cam->cam_sensor->power_off(cam->sensor_data);
        spin_unlock(&cam->img_lock);
        return ret;
 }
 
-static int camera_core_resume(struct device *dev, u32 level)
+static int camera_core_resume(struct device *dev)
 {
        struct camera_device *cam = dev_get_drvdata(dev);
        int ret = 0;
 
        spin_lock(&cam->img_lock);
-       switch (level) {
-       case RESUME_POWER_ON:
-               cam->cam_sensor->power_on(cam->sensor_data);
-               if (cam->active) {
-                       cam->capture_completed = 1;
-                       cam->cam_hardware->open(cam->hardware_data);
-                       cam->cam_hardware->set_xclk(cam->xclk, cam->hardware_data);
-
-                       cam->cam_sensor->configure(&cam->pix, cam->xclk,
-                               &cam->cparm.timeperframe, cam->sensor_data);
-
-                       camera_core_sgdma_process(cam);
-               }
-               break;
-       }
+       cam->cam_sensor->power_on(cam->sensor_data);
+       if (cam->active) {
+               cam->capture_completed = 1;
+               cam->cam_hardware->open(cam->hardware_data);
+               cam->cam_hardware->set_xclk(cam->xclk, cam->hardware_data);
 
+               cam->cam_sensor->configure(&cam->pix, cam->xclk,
+                                          &cam->cparm.timeperframe,
+                                          cam->sensor_data);
+               camera_core_sgdma_process(cam);
+       }
        spin_unlock(&cam->img_lock);
+
        return ret;
 }
 #endif /* CONFIG_PM */

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 1dcb234b065c2c87a41a538b83ebf4308a2f2d90..27cbef71ffc7fd90f95a36197defcf0afccf64a8 100644 (file)
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_MMC_BLOCK)               += mmc_block.o
 obj-$(CONFIG_MMC_ARMMMCI)      += mmci.o
 obj-$(CONFIG_MMC_PXA)          += pxamci.o
 obj-$(CONFIG_MMC_WBSD)         += wbsd.o
+obj-$(CONFIG_MMC_AU1X)         += au1xmmc.o
 obj-$(CONFIG_MMC_OMAP)         += omap.o
 
 mmc_core-y := mmc.o mmc_queue.o mmc_sysfs.o

diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index 43a912f41bcd8c0bca514fe71278b1aedc9f1515..62de54a3d3d91bb1d152741009ae85f687e89f6f 100644 (file)
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -87,6 +87,12 @@ static void mmc_blk_put(struct mmc_blk_data *md)
        up(&open_lock);
 }
 
+static inline int mmc_blk_readonly(struct mmc_card *card)
+{
+       return mmc_card_readonly(card) ||
+              !(card->csd.cmdclass & CCC_BLOCK_WRITE);
+}
+
 static int mmc_blk_open(struct inode *inode, struct file *filp)
 {
        struct mmc_blk_data *md;
@@ -99,7 +105,7 @@ static int mmc_blk_open(struct inode *inode, struct file *filp)
                ret = 0;
 
                if ((filp->f_mode & FMODE_WRITE) &&
-                       mmc_card_readonly(md->queue.card))
+                       mmc_blk_readonly(md->queue.card))
                        ret = -EROFS;
        }
 
@@ -496,7 +502,7 @@ static int mmc_blk_probe(struct mmc_card *card)
        printk(KERN_INFO "%s: %s %s %dKiB %s\n",
                md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
                (card->csd.capacity << card->csd.read_blkbits) / 1024,
-               mmc_card_readonly(card)?"(ro)":"");
+               mmc_blk_readonly(card)?"(ro)":"");
 
        mmc_set_drvdata(card, md);
        add_disk(md->disk);

diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index f39464b266791234272a290d05efcad61e3d0a56..8294008f2b3e3d38447265bee4fc8d7975479899 100644 (file)
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -22,7 +22,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
@@ -618,8 +618,6 @@ static void mmc_omap_switch_timer(unsigned long arg)
  * for MMC state? */
 static void mmc_omap_switch_callback(unsigned long data, u8 mmc_mask)
 {
-       struct mmc_omap_host *host = (struct mmc_omap_host *) data;
-
        if (machine_is_omap_h4()) {
                if (mmc_mask & 0x1)
                        printk("XXX card in slot 1\n");
@@ -683,7 +681,7 @@ mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data)
 
        data_addr = io_v2p((void __force *) host->base) + OMAP_MMC_REG_DATA;
        frame = 1 << data->blksz_bits;
-       count = sg_dma_len(sg);
+       count = (u32)sg_dma_len(sg);
 
        /* the MMC layer is confused about single block writes... */
        if ((data->blocks == 1) && (count > (1 << data->blksz_bits))) {
@@ -1367,7 +1365,7 @@ static int __exit mmc_omap_remove(struct device *dev)
 }
 
 #ifdef CONFIG_PM
-static int mmc_omap_suspend(struct device *dev, pm_message_t mesg, u32 level)
+static int mmc_omap_suspend(struct device *dev, pm_message_t mesg)
 {
        int ret = 0;
        struct mmc_omap_host *host = dev_get_drvdata(dev);
@@ -1386,7 +1384,7 @@ static int mmc_omap_suspend(struct device *dev, pm_message_t mesg, u32 level)
        return ret;
 }
 
-static int mmc_omap_resume(struct device *dev, u32 level)
+static int mmc_omap_resume(struct device *dev)
 {
        int ret = 0;
        struct mmc_omap_host *host = dev_get_drvdata(dev);

diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index 5fd4aa5c202800f9e6e37714f6b41c5d3ab6bda8..3bf5df736ba64d638d65d94ac68eeaafa89ceb6d 100644 (file)
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -1,7 +1,6 @@
 config FB_OMAP
        tristate "OMAP frame buffer support (EXPERIMENTAL)"
         depends on FB
-       select FB_SOFT_CURSOR
         help
           Frame buffer driver for OMAP based boards.
 

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index bded2548b2a7811ec9bff5808e368e05fc49b630..58af600a72c05dd3721b8caf653fd3d3c37f85eb 100644 (file)
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -32,7 +32,7 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
 #include <asm/uaccess.h>
@@ -873,7 +873,6 @@ static struct fb_ops omapfb_ops = {
        .fb_fillrect    = cfb_fillrect,
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
-       .fb_cursor      = soft_cursor,
        .fb_blank       = omapfb_blank,
        .fb_ioctl       = omapfb_ioctl,
        .fb_check_var   = omapfb_check_var,
@@ -1365,7 +1364,7 @@ static int omapfb_remove(struct device *dev)
 }
 
 /* PM suspend */
-static int omapfb_suspend(struct device *dev, pm_message_t mesg, u32 level)
+static int omapfb_suspend(struct device *dev, pm_message_t mesg)
 {
        struct omapfb_device *fbdev = dev_get_drvdata(dev);
 
@@ -1379,7 +1378,7 @@ static int omapfb_suspend(struct device *dev, pm_message_t mesg, u32 level)
 }
 
 /* PM resume */
-static int omapfb_resume(struct device *dev, u32 level)
+static int omapfb_resume(struct device *dev)
 {
        struct omapfb_device *fbdev = dev_get_drvdata(dev);